From 5f32bc91d33c5575eb7ae7021875cf379672524c Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Mon, 23 May 2022 20:32:43 +0300 Subject: [PATCH 01/90] Move aspen and baobab --- .gitignore | 5 +- Common/src/generated/resources/.cache/cache | 144 ++++++++++++ .../recipes/byg.byg/wood/aspen/boat.json | 34 +++ .../recipes/byg.byg/wood/aspen/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/aspen/button.json | 34 +++ .../byg.byg/wood/aspen/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/aspen/door.json | 34 +++ .../recipes/byg.byg/wood/baobab/boat.json | 34 +++ .../byg.byg/wood/baobab/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/baobab/button.json | 34 +++ .../byg.byg/wood/baobab/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/baobab/door.json | 34 +++ .../data/byg/recipes/wood/aspen/boat.json} | 7 +- .../byg/recipes/wood/aspen/bookshelf.json} | 10 +- .../data/byg/recipes/wood/aspen/button.json} | 1 - .../recipes/wood/aspen/crafting_table.json} | 6 +- .../data/byg/recipes/wood/aspen/door.json} | 9 +- .../data/byg/recipes/wood/baobab/boat.json} | 7 +- .../byg/recipes/wood/baobab/bookshelf.json} | 10 +- .../data/byg/recipes/wood/baobab/button.json} | 1 - .../recipes/wood/baobab/crafting_table.json} | 6 +- .../data/byg/recipes/wood/baobab/door.json} | 9 +- .../data/byg/tags/blocks/end_stone.json | 12 + .../resources/data/byg/tags/blocks/lush.json | 0 .../may_place_on/allium_flower_bush.json | 6 + .../may_place_on/alpine_bellflower.json | 6 + .../tags/blocks/may_place_on/amaranth.json | 6 + .../tags/blocks/may_place_on/angelica.json | 6 + .../may_place_on/araucaria_sapling.json | 6 + .../blocks/may_place_on/aspen_sapling.json | 6 + .../blocks/may_place_on/baobab_sapling.json | 6 + .../tags/blocks/may_place_on/beach_grass.json | 6 + .../byg/tags/blocks/may_place_on/begonia.json | 6 + .../byg/tags/blocks/may_place_on/bistort.json | 6 + .../tags/blocks/may_place_on/black_rose.json | 6 + .../may_place_on/blue_enchanted_sapling.json | 6 + .../tags/blocks/may_place_on/blue_sage.json | 6 + .../may_place_on/blue_spruce_sapling.json | 6 + .../may_place_on/brown_birch_sapling.json | 6 + .../may_place_on/brown_oak_sapling.json | 6 + .../may_place_on/brown_zelkova_sapling.json | 6 + .../blocks/may_place_on/bulbis_oddity.json | 15 ++ .../blocks/may_place_on/california_poppy.json | 6 + .../blocks/may_place_on/cika_sapling.json | 6 + .../blocks/may_place_on/clover_patch.json | 6 + .../byg/tags/blocks/may_place_on/crocus.json | 6 + .../blocks/may_place_on/cyan_amaranth.json | 6 + .../blocks/may_place_on/cypress_sapling.json | 6 + .../tags/blocks/may_place_on/death_cap.json | 8 + .../tags/blocks/may_place_on/delphinium.json | 6 + .../blocks/may_place_on/ebony_sapling.json | 6 + .../tags/blocks/may_place_on/embur_wart.json | 8 + .../blocks/may_place_on/ether_sapling.json | 6 + .../blocks/may_place_on/fairy_slipper.json | 7 + .../tags/blocks/may_place_on/fir_sapling.json | 6 + .../may_place_on/firecracker_flower_bush.json | 6 + .../blocks/may_place_on/flower_patch.json | 6 + .../flowering_indigo_jacaranda_bush.json | 6 + .../flowering_jacaranda_bush.json | 6 + .../tags/blocks/may_place_on/foxglove.json | 6 + .../blocks/may_place_on/fungal_imparius.json | 15 ++ .../may_place_on/golden_spined_cactus.json | 6 + .../may_place_on/green_enchanted_sapling.json | 6 + .../blocks/may_place_on/green_mushroom.json | 8 + .../tags/blocks/may_place_on/green_tulip.json | 6 + .../tags/blocks/may_place_on/guzmania.json | 6 + .../blocks/may_place_on/holly_sapling.json | 6 + .../tags/blocks/may_place_on/horseweed.json | 6 + .../blocks/may_place_on/hydrangea_bush.json | 6 + .../may_place_on/imparius_mushroom.json | 15 ++ .../tags/blocks/may_place_on/incan_lily.json | 6 + .../indigo_jacaranda_sapling.json | 6 + .../byg/tags/blocks/may_place_on/iris.json | 6 + .../may_place_on/jacaranda_sapling.json | 6 + .../blocks/may_place_on/japanese_orchid.json | 6 + .../blocks/may_place_on/joshua_sapling.json | 6 + .../blocks/may_place_on/kovan_flower.json | 6 + .../blocks/may_place_on/lament_sapling.json | 6 + .../may_place_on/lazarus_bellflower.json | 6 + .../blocks/may_place_on/lollipop_flower.json | 6 + .../blocks/may_place_on/magenta_amaranth.json | 6 + .../blocks/may_place_on/magenta_tulip.json | 6 + .../blocks/may_place_on/mahogany_sapling.json | 6 + .../blocks/may_place_on/mangrove_sapling.json | 6 + .../blocks/may_place_on/mangrove_tree.json | 10 + .../blocks/may_place_on/maple_sapling.json | 6 + .../tags/blocks/may_place_on/mini_cactus.json | 6 + .../may_place_on/nightshade_sapling.json | 6 + .../blocks/may_place_on/orange_amaranth.json | 6 + .../may_place_on/orange_birch_sapling.json | 6 + .../blocks/may_place_on/orange_daisy.json | 6 + .../may_place_on/orange_oak_sapling.json | 6 + .../may_place_on/orange_spruce_sapling.json | 6 + .../blocks/may_place_on/orchard_sapling.json | 6 + .../tags/blocks/may_place_on/osiria_rose.json | 6 + .../blocks/may_place_on/palm_sapling.json | 7 + .../may_place_on/palo_verde_sapling.json | 6 + .../may_place_on/peach_leather_flower.json | 6 + .../blocks/may_place_on/pine_sapling.json | 6 + .../tags/blocks/may_place_on/pink_allium.json | 6 + .../blocks/may_place_on/pink_allium_bush.json | 6 + .../blocks/may_place_on/pink_anemone.json | 6 + .../may_place_on/pink_cherry_sapling.json | 6 + .../blocks/may_place_on/pink_daffodil.json | 6 + .../blocks/may_place_on/prairie_grass.json | 6 + .../may_place_on/prickly_pear_cactus.json | 6 + .../blocks/may_place_on/protea_flower.json | 6 + .../blocks/may_place_on/purple_amaranth.json | 6 + .../may_place_on/purple_bulbis_oddity.json | 15 ++ .../tags/blocks/may_place_on/purple_sage.json | 6 + .../blocks/may_place_on/purple_tulip.json | 6 + .../rainbow_eucalyptus_sapling.json | 6 + .../may_place_on/red_birch_sapling.json | 6 + .../may_place_on/red_maple_sapling.json | 6 + .../blocks/may_place_on/red_oak_sapling.json | 6 + .../may_place_on/red_spruce_sapling.json | 6 + .../blocks/may_place_on/redwood_sapling.json | 6 + .../byg/tags/blocks/may_place_on/richea.json | 6 + .../byg/tags/blocks/may_place_on/rose.json | 6 + .../blocks/may_place_on/shulkren_fungus.json | 15 ++ .../may_place_on/silver_maple_sapling.json | 6 + .../may_place_on/silver_vase_flower.json | 6 + .../blocks/may_place_on/skyris_sapling.json | 6 + .../tags/blocks/may_place_on/soul_shroom.json | 8 + .../blocks/may_place_on/sythian_fungus.json | 8 + .../tags/blocks/may_place_on/tall_allium.json | 6 + .../blocks/may_place_on/tall_beach_grass.json | 6 + .../blocks/may_place_on/tall_pink_allium.json | 6 + .../may_place_on/tall_prairie_grass.json | 6 + .../blocks/may_place_on/torch_ginger.json | 6 + .../may_place_on/violet_leather_flower.json | 6 + .../blocks/may_place_on/weeping_milk_cap.json | 8 + .../blocks/may_place_on/white_anemone.json | 6 + .../may_place_on/white_cherry_sapling.json | 6 + .../tags/blocks/may_place_on/white_sage.json | 6 + .../blocks/may_place_on/willow_sapling.json | 6 + .../blocks/may_place_on/winter_succulent.json | 6 + .../may_place_on/witch_hazel_sapling.json | 6 + .../may_place_on/withering_oak_sapling.json | 8 + .../tags/blocks/may_place_on/wood_blewit.json | 8 + .../may_place_on/yellow_birch_sapling.json | 6 + .../blocks/may_place_on/yellow_daffodil.json | 6 + .../may_place_on/yellow_spruce_sapling.json | 6 + .../blocks/may_place_on/yellow_tulip.json | 6 + .../blocks/may_place_on/zelkova_sapling.json | 6 + .../resources/data/byg/tags/blocks/slabs.json | 0 .../textures/renders/BYGRenderTypes.java | 13 +- .../byg/common/BYGCompostables.java | 10 +- .../byg/common/BYGFlammables.java | 35 ++- .../byg/common/BYGStrippables.java | 10 +- .../byg/common/block/BYGBlocks.java | 75 ++---- .../byg/common/block/BYGWoodType.java | 3 +- .../byg/common/block/BYGWoodTypes.java | 214 ++++++++++++++++++ .../byg/common/block/BaobabFruitBlock.java | 2 +- .../byg/common/entity/boat/BYGBoatEntity.java | 9 +- .../byg/common/item/BYGItems.java | 50 +--- .../overworld/BYGOverworldTreeFeatures.java | 33 +-- .../trees/util/BYGAbstractTreeFeature.java | 3 +- .../potionstudios/byg/datagen/BYGDataGen.java | 2 + .../datagen/providers/BYGRecipeProviders.java | 55 +++++ build.gradle | 2 +- 161 files changed, 1680 insertions(+), 196 deletions(-) create mode 100644 Common/src/generated/resources/.cache/cache create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json rename Common/src/{main/resources/data/byg/recipes/aspen_boat.json => generated/resources/data/byg/recipes/wood/aspen/boat.json} (76%) rename Common/src/{main/resources/data/byg/recipes/aspen_bookshelf.json => generated/resources/data/byg/recipes/wood/aspen/bookshelf.json} (79%) rename Common/src/{main/resources/data/byg/recipes/aspen_button.json => generated/resources/data/byg/recipes/wood/aspen/button.json} (85%) rename Common/src/{main/resources/data/byg/recipes/aspen_crafting_table.json => generated/resources/data/byg/recipes/wood/aspen/crafting_table.json} (85%) rename Common/src/{main/resources/data/byg/recipes/aspen_door.json => generated/resources/data/byg/recipes/wood/aspen/door.json} (73%) rename Common/src/{main/resources/data/byg/recipes/baobab_boat.json => generated/resources/data/byg/recipes/wood/baobab/boat.json} (76%) rename Common/src/{main/resources/data/byg/recipes/baobab_bookshelf.json => generated/resources/data/byg/recipes/wood/baobab/bookshelf.json} (79%) rename Common/src/{main/resources/data/byg/recipes/baobab_button.json => generated/resources/data/byg/recipes/wood/baobab/button.json} (85%) rename Common/src/{main/resources/data/byg/recipes/baobab_crafting_table.json => generated/resources/data/byg/recipes/wood/baobab/crafting_table.json} (85%) rename Common/src/{main/resources/data/byg/recipes/baobab_door.json => generated/resources/data/byg/recipes/wood/baobab/door.json} (73%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/end_stone.json rename Common/src/{main => generated}/resources/data/byg/tags/blocks/lush.json (100%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json rename Common/src/{main => generated}/resources/data/byg/tags/blocks/slabs.json (100%) create mode 100644 Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java create mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java diff --git a/.gitignore b/.gitignore index 4e4c566a25..322e5e18cf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,4 @@ build # other eclipse -run -/Forge/src/generated/ -/Common/src/generated/ -/Fabric/src/generated/ \ No newline at end of file +run \ No newline at end of file diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache new file mode 100644 index 0000000000..3413b12675 --- /dev/null +++ b/Common/src/generated/resources/.cache/cache @@ -0,0 +1,144 @@ +7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json +0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json +d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json +1839dad0677af5c73450e0161ca3191bd546b488 data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json +db985793fdd315c02ba0d3be4cb1764ac320e387 data/byg/advancements/recipes/byg.byg/wood/aspen/door.json +5ad16716e1d1ef1a264f92a4520d0d4054a6eeff data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json +24fba2b2cbc207d1d51e10d59d7c23f12ad39e76 data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json +e7dae4923c93313f898cf8769280740d3d73bb1c data/byg/advancements/recipes/byg.byg/wood/baobab/button.json +753f5b4d4e0fc6318a30581f6c6bf440dd109342 data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json +75f2d1cacb11e14a46fc3d5a84bce3240c72374b data/byg/advancements/recipes/byg.byg/wood/baobab/door.json +ba9970d23f3555577955246bca87be8f6071bdc2 data/byg/recipes/wood/aspen/boat.json +ac5c4dd5c571afcbb078a6f99da8dd878cc1427c data/byg/recipes/wood/aspen/bookshelf.json +e05679f10897a69f8bdbdf08f8369fd717630b00 data/byg/recipes/wood/aspen/button.json +675e989f1a7e69ab0c3c012122be559d8956f829 data/byg/recipes/wood/aspen/crafting_table.json +4e4cc07ab70fdff3c21de66af969c17e72d2a5c4 data/byg/recipes/wood/aspen/door.json +0359be132c17434db804ce87dc3235fc6316ccf4 data/byg/recipes/wood/baobab/boat.json +3e344d7915de08e29c5eb1a7f83d6ad82bfe8a11 data/byg/recipes/wood/baobab/bookshelf.json +e0cc0e3fdf31ac5fc31edb7d79ba8ed60eb71ad9 data/byg/recipes/wood/baobab/button.json +ca98a54f773ff6d262bf7d98b2b8851af4b0fb98 data/byg/recipes/wood/baobab/crafting_table.json +71649648fff33d70dd3130aaa699c11e154402fc data/byg/recipes/wood/baobab/door.json +d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json +dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/alpine_bellflower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/amaranth.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/angelica.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/araucaria_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/aspen_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/baobab_sapling.json +df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/beach_grass.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/begonia.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/bistort.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/black_rose.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_sage.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_birch_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_oak_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json +ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/bulbis_oddity.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/california_poppy.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cika_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/clover_patch.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/crocus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cyan_amaranth.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cypress_sapling.json +56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/death_cap.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/delphinium.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/ebony_sapling.json +56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/embur_wart.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/ether_sapling.json +c4fbfdfc41fc02b0de7ad2977ceb0b382569ea6e data/byg/tags/blocks/may_place_on/fairy_slipper.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/fir_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flower_patch.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/foxglove.json +ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/fungal_imparius.json +df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/golden_spined_cactus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json +830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/green_mushroom.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/green_tulip.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/guzmania.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/holly_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/horseweed.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/hydrangea_bush.json +ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/imparius_mushroom.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/incan_lily.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/iris.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/jacaranda_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/japanese_orchid.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/joshua_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/kovan_flower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lament_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lazarus_bellflower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lollipop_flower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/magenta_amaranth.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/magenta_tulip.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/mahogany_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/mangrove_sapling.json +d6deac24c1e4346c0f356b2a1d458a72266b01f3 data/byg/tags/blocks/may_place_on/mangrove_tree.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/maple_sapling.json +df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/mini_cactus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/nightshade_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_amaranth.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_birch_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_daisy.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_oak_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orchard_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/osiria_rose.json +f753439c558e9415a3d7196b46128d14cea5c9b1 data/byg/tags/blocks/may_place_on/palm_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/palo_verde_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/peach_leather_flower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pine_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_allium.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_allium_bush.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_anemone.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_daffodil.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/prairie_grass.json +df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/protea_flower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_amaranth.json +ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_sage.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_tulip.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_birch_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_maple_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_oak_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_spruce_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/redwood_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/richea.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/rose.json +ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/shulkren_fungus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/silver_maple_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/silver_vase_flower.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/skyris_sapling.json +56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/soul_shroom.json +56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/sythian_fungus.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_allium.json +df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_beach_grass.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_pink_allium.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_prairie_grass.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/torch_ginger.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/violet_leather_flower.json +830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/weeping_milk_cap.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_anemone.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_cherry_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_sage.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/willow_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/winter_succulent.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json +56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/withering_oak_sapling.json +830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/wood_blewit.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_daffodil.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json +7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json +7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json new file mode 100644 index 0000000000..04243303f6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json new file mode 100644 index 0000000000..398ca0c4fa --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json new file mode 100644 index 0000000000..79df111673 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json new file mode 100644 index 0000000000..a6f88cc0a4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json new file mode 100644 index 0000000000..0c32624071 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json new file mode 100644 index 0000000000..54588d743a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json new file mode 100644 index 0000000000..d3958e7bef --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json new file mode 100644 index 0000000000..a17b9d3029 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json new file mode 100644 index 0000000000..2e0a2436b1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json new file mode 100644 index 0000000000..99ff283ca9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/aspen_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json similarity index 76% rename from Common/src/main/resources/data/byg/recipes/aspen_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json index 9da9ef195b..701961abb6 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json @@ -1,12 +1,11 @@ { "type": "minecraft:crafting_shaped", - "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json similarity index 79% rename from Common/src/main/resources/data/byg/recipes/aspen_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json index 8e31917bec..5b75c48daa 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_button.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/aspen_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json index 000b885256..265ed3fca2 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_button.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json @@ -1,6 +1,5 @@ { "type": "minecraft:crafting_shapeless", - "group": "wooden_button", "ingredients": [ { "item": "byg:aspen_planks" diff --git a/Common/src/main/resources/data/byg/recipes/aspen_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/aspen_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json index 04ad8be8b5..4715f64d08 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json @@ -1,11 +1,11 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_door.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json similarity index 73% rename from Common/src/main/resources/data/byg/recipes/aspen_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json index 0d325081b7..7b625d859b 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json similarity index 76% rename from Common/src/main/resources/data/byg/recipes/baobab_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json index 3d1f4b44ac..01f57128bb 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json @@ -1,12 +1,11 @@ { "type": "minecraft:crafting_shaped", - "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json similarity index 79% rename from Common/src/main/resources/data/byg/recipes/baobab_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json index 9df774e7f6..368ad4f7e5 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_button.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/baobab_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json index b25b3dd1a4..ff854e3b18 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_button.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json @@ -1,6 +1,5 @@ { "type": "minecraft:crafting_shapeless", - "group": "wooden_button", "ingredients": [ { "item": "byg:baobab_planks" diff --git a/Common/src/main/resources/data/byg/recipes/baobab_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/baobab_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json index 8ec705a76b..915c02f209 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json @@ -1,11 +1,11 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_door.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json similarity index 73% rename from Common/src/main/resources/data/byg/recipes/baobab_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json index 60b54301db..af0a73b820 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json @@ -1,13 +1,12 @@ { "type": "minecraft:crafting_shaped", - "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json b/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json new file mode 100644 index 0000000000..064f2d1eb2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "byg:bulbis_phycelium", + "byg:ether_stone", + "byg:imparius_phylium", + "byg:ivis_phylium", + "byg:nightshade_phylium", + "byg:shulkren_phylium", + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/lush.json b/Common/src/generated/resources/data/byg/tags/blocks/lush.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/blocks/lush.json rename to Common/src/generated/resources/data/byg/tags/blocks/lush.json diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json new file mode 100644 index 0000000000..3eb4811f63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json new file mode 100644 index 0000000000..761a921370 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#byg:end_stone", + { + "id": "#c:end_stones", + "required": false + }, + { + "id": "#forge:end_stones", + "required": false + }, + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json new file mode 100644 index 0000000000..2dc3d3d493 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:nylium", + "minecraft:mycelium", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json new file mode 100644 index 0000000000..2dc3d3d493 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:nylium", + "minecraft:mycelium", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json new file mode 100644 index 0000000000..963c874b02 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt", + "#minecraft:logs" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json new file mode 100644 index 0000000000..761a921370 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#byg:end_stone", + { + "id": "#c:end_stones", + "required": false + }, + { + "id": "#forge:end_stones", + "required": false + }, + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json new file mode 100644 index 0000000000..3eb4811f63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json new file mode 100644 index 0000000000..cf820055e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:base_stone_overworld", + "#minecraft:dirt", + "#minecraft:mushroom_grow_block" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json new file mode 100644 index 0000000000..761a921370 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#byg:end_stone", + { + "id": "#c:end_stones", + "required": false + }, + { + "id": "#forge:end_stones", + "required": false + }, + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json new file mode 100644 index 0000000000..8267be7dcd --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt", + "#minecraft:sand", + "#minecraft:sand", + "byg:mud_block", + "minecraft:clay" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json new file mode 100644 index 0000000000..3eb4811f63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json new file mode 100644 index 0000000000..b0380bf71b --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt", + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json new file mode 100644 index 0000000000..3eb4811f63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json new file mode 100644 index 0000000000..761a921370 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#byg:end_stone", + { + "id": "#c:end_stones", + "required": false + }, + { + "id": "#forge:end_stones", + "required": false + }, + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json new file mode 100644 index 0000000000..761a921370 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#byg:end_stone", + { + "id": "#c:end_stones", + "required": false + }, + { + "id": "#forge:end_stones", + "required": false + }, + "minecraft:end_stone" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json new file mode 100644 index 0000000000..2dc3d3d493 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:nylium", + "minecraft:mycelium", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json new file mode 100644 index 0000000000..2dc3d3d493 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:nylium", + "minecraft:mycelium", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json new file mode 100644 index 0000000000..3eb4811f63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:sand" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json new file mode 100644 index 0000000000..cf820055e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:base_stone_overworld", + "#minecraft:dirt", + "#minecraft:mushroom_grow_block" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json new file mode 100644 index 0000000000..2dc3d3d493 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:nylium", + "minecraft:mycelium", + "minecraft:soul_soil" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json new file mode 100644 index 0000000000..cf820055e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#minecraft:base_stone_overworld", + "#minecraft:dirt", + "#minecraft:mushroom_grow_block" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json new file mode 100644 index 0000000000..cb2c7cab6d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:dirt" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/slabs.json b/Common/src/generated/resources/data/byg/tags/blocks/slabs.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/blocks/slabs.json rename to Common/src/generated/resources/data/byg/tags/blocks/slabs.json diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 565484a8b7..bd1ccb4424 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -4,6 +4,7 @@ import net.minecraft.world.level.block.Block; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import java.util.HashMap; import java.util.Map; @@ -14,6 +15,12 @@ public static void renderTypes(Consumer> mapConsumer) { BYG.LOGGER.debug("BYG: Rendering Texture Cutouts..."); Map map = new HashMap<>(); + for (BYGWoodTypes type : BYGWoodTypes.values()) { + map.put(type.door().get(), RenderType.translucent()); + map.put(type.trapdoor().get(), RenderType.translucent()); + map.put(type.sapling().get(), RenderType.translucent()); + } + map.put(BYGBlocks.WITCH_HAZEL_BLOSSOM.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WITCH_HAZEL_BRANCH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ALOE_VERA.get(), RenderType.cutoutMipped()); @@ -130,8 +137,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.ASPEN_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.BAOBAB_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BLUE_ENCHANTED_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CHERRY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_DOOR.get(), RenderType.cutoutMipped()); @@ -161,8 +166,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.ASPEN_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.BAOBAB_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BLUE_ENCHANTED_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CHERRY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -203,8 +206,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Saplings - map.put(BYGBlocks.ASPEN_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.BAOBAB_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BLUE_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BLUE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 3b0273b76d..74f474086e 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -3,6 +3,7 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.ComposterBlock; import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; public class BYGCompostables { @@ -13,9 +14,12 @@ public static void compostibleBlocks(float chance, ItemLike item) { public static void compostablesBYG() { BYG.LOGGER.debug("BYG: Adding Compostible Blocks..."); + for (BYGWoodTypes type : BYGWoodTypes.values()) { + compostibleBlocks(0.3f, type.leaves().get()); + compostibleBlocks(0.3f, type.sapling().get()); + } + //Leaves - compostibleBlocks(0.3f, BYGItems.ASPEN_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.BAOBAB_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BLOOMING_WITCH_HAZEL_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BLUE_ENCHANTED_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); @@ -65,8 +69,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.FIRECRACKER_LEAVES.get()); //Saplings - compostibleBlocks(0.3f, BYGItems.ASPEN_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.BAOBAB_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BLUE_ENCHANTED_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 564984827f..47c25ea2ff 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -5,6 +5,7 @@ import net.minecraft.world.level.block.FireBlock; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.FireBlockAccess; public class BYGFlammables { @@ -15,9 +16,21 @@ public static void flammableBlock(Block block, int flameOdds, int burnOdds) { public static void flammablesBYG() { BYG.LOGGER.debug("BYG: Adding Flammables..."); + + for (BYGWoodTypes type : BYGWoodTypes.values()) { + flammableBlock(type.log().get(), 5, 5); + flammableBlock(type.strippedLog().get(), 5, 5); + flammableBlock(type.wood().get(), 5, 5); + flammableBlock(type.strippedWood().get(), 5, 5); + flammableBlock(type.bookshelf().get(), 5, 20); + flammableBlock(type.slab().get(), 5, 20); + flammableBlock(type.stairs().get(), 5, 20); + flammableBlock(type.planks().get(), 5, 20); + flammableBlock(type.fence().get(), 5, 20); + flammableBlock(type.leaves().get(), 30, 60); + } + //Logs - flammableBlock(BYGBlocks.ASPEN_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.BAOBAB_LOG.get(), 5, 5); flammableBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_LOG.get(), 5, 5); @@ -39,8 +52,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_ASPEN_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_BAOBAB_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_BLUE_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_LOG.get(), 5, 5); @@ -62,8 +73,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.ASPEN_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.BAOBAB_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.BLUE_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_WOOD.get(), 5, 5); @@ -85,8 +94,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_ASPEN_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_BAOBAB_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_BLUE_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_WOOD.get(), 5, 5); @@ -108,8 +115,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.ASPEN_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.BAOBAB_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.BLUE_ENCHANTED_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_BOOKSHELF.get(), 5, 20); @@ -132,8 +137,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.ASPEN_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.BAOBAB_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.BLUE_ENCHANTED_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_SLAB.get(), 5, 20); @@ -156,8 +159,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.ASPEN_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.BAOBAB_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.BLUE_ENCHANTED_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_STAIRS.get(), 5, 20); @@ -180,8 +181,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.ASPEN_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.BAOBAB_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.BLUE_ENCHANTED_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_PLANKS.get(), 5, 20); @@ -204,8 +203,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.ASPEN_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.BAOBAB_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.BLUE_ENCHANTED_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_FENCE.get(), 5, 20); @@ -228,8 +225,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_FENCE.get(), 5, 20); //Leaves - flammableBlock(BYGBlocks.ASPEN_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.BAOBAB_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 4d984abf59..5d0c467eef 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -4,6 +4,7 @@ import net.minecraft.world.level.block.Blocks; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.AxeItemAccess; import java.util.IdentityHashMap; @@ -16,8 +17,11 @@ public static void strippableLogsBYG() { Map stripables = new IdentityHashMap<>(AxeItemAccess.byg_getStrippables()); - stripables.put(BYGBlocks.ASPEN_LOG.get(), BYGBlocks.STRIPPED_ASPEN_LOG.get()); - stripables.put(BYGBlocks.BAOBAB_LOG.get(), BYGBlocks.STRIPPED_BAOBAB_LOG.get()); + for (final BYGWoodTypes type : BYGWoodTypes.values()) { + stripables.put(type.log().get(), type.strippedLog().get()); + stripables.put(type.wood().get(), type.strippedWood().get()); + } + stripables.put(BYGBlocks.BLUE_ENCHANTED_LOG.get(), BYGBlocks.STRIPPED_BLUE_ENCHANTED_LOG.get()); stripables.put(BYGBlocks.CHERRY_LOG.get(), BYGBlocks.STRIPPED_CHERRY_LOG.get()); stripables.put(BYGBlocks.CIKA_LOG.get(), BYGBlocks.STRIPPED_CIKA_LOG.get()); @@ -48,8 +52,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.ASPEN_WOOD.get(), BYGBlocks.STRIPPED_ASPEN_WOOD.get()); - stripables.put(BYGBlocks.BAOBAB_WOOD.get(), BYGBlocks.STRIPPED_BAOBAB_WOOD.get()); stripables.put(BYGBlocks.BLUE_ENCHANTED_WOOD.get(), BYGBlocks.STRIPPED_BLUE_ENCHANTED_WOOD.get()); stripables.put(BYGBlocks.CHERRY_WOOD.get(), BYGBlocks.STRIPPED_CHERRY_WOOD.get()); stripables.put(BYGBlocks.CIKA_WOOD.get(), BYGBlocks.STRIPPED_CIKA_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 12785c7765..81b3d99b3d 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -50,6 +50,7 @@ import potionstudios.byg.reg.BlockRegistryObject; import potionstudios.byg.reg.RegistrationProvider; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; @@ -61,8 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject ASPEN_PLANKS = createPlanks("aspen_planks"); - public static final BlockRegistryObject BAOBAB_PLANKS = createPlanks("baobab_planks"); public static final BlockRegistryObject BLUE_ENCHANTED_PLANKS = createPlanks("blue_enchanted_planks"); public static final BlockRegistryObject CHERRY_PLANKS = createPlanks("cherry_planks"); public static final BlockRegistryObject CIKA_PLANKS = createPlanks("cika_planks"); @@ -91,8 +90,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject ASPEN_BOOKSHELF = createBookshelf("aspen_bookshelf"); - public static final BlockRegistryObject BAOBAB_BOOKSHELF = createBookshelf("baobab_bookshelf"); public static final BlockRegistryObject BLUE_ENCHANTED_BOOKSHELF = createBookshelf("blue_enchanted_bookshelf"); public static final BlockRegistryObject CHERRY_BOOKSHELF = createBookshelf("cherry_bookshelf"); public static final BlockRegistryObject CIKA_BOOKSHELF = createBookshelf("cika_bookshelf"); @@ -121,8 +118,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject ASPEN_DOOR = createDoor("aspen_door"); - public static final BlockRegistryObject BAOBAB_DOOR = createDoor("baobab_door"); public static final BlockRegistryObject BLUE_ENCHANTED_DOOR = createDoor("blue_enchanted_door"); public static final BlockRegistryObject CHERRY_DOOR = createDoor("cherry_door"); public static final BlockRegistryObject CIKA_DOOR = createDoor("cika_door"); @@ -151,8 +146,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject ASPEN_PRESSURE_PLATE = createWoodPressurePlate("aspen_pressure_plate"); - public static final BlockRegistryObject BAOBAB_PRESSURE_PLATE = createWoodPressurePlate("baobab_pressure_plate"); public static final BlockRegistryObject BLUE_ENCHANTED_PRESSURE_PLATE = createWoodPressurePlate("blue_enchanted_pressure_plate"); public static final BlockRegistryObject CHERRY_PRESSURE_PLATE = createWoodPressurePlate("cherry_pressure_plate"); public static final BlockRegistryObject CIKA_PRESSURE_PLATE = createWoodPressurePlate("cika_pressure_plate"); @@ -181,8 +174,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject ASPEN_BUTTON = createWoodButton("aspen_button"); - public static final BlockRegistryObject BAOBAB_BUTTON = createWoodButton("baobab_button"); public static final BlockRegistryObject BLUE_ENCHANTED_BUTTON = createWoodButton("blue_enchanted_button"); public static final BlockRegistryObject CHERRY_BUTTON = createWoodButton("cherry_button"); public static final BlockRegistryObject CIKA_BUTTON = createWoodButton("cika_button"); @@ -211,8 +202,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject ASPEN_TRAPDOOR = createTrapDoor("aspen_trapdoor"); - public static final BlockRegistryObject BAOBAB_TRAPDOOR = createTrapDoor("baobab_trapdoor"); public static final BlockRegistryObject BLUE_ENCHANTED_TRAPDOOR = createTrapDoor("blue_enchanted_trapdoor"); public static final BlockRegistryObject CHERRY_TRAPDOOR = createTrapDoor("cherry_trapdoor"); public static final BlockRegistryObject CIKA_TRAPDOOR = createTrapDoor("cika_trapdoor"); @@ -241,8 +230,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject ASPEN_CRAFTING_TABLE = createCraftingTable("aspen_crafting_table"); - public static final BlockRegistryObject BAOBAB_CRAFTING_TABLE = createCraftingTable("baobab_crafting_table"); public static final BlockRegistryObject BLUE_ENCHANTED_CRAFTING_TABLE = createCraftingTable("blue_enchanted_crafting_table"); public static final BlockRegistryObject CHERRY_CRAFTING_TABLE = createCraftingTable("cherry_crafting_table"); public static final BlockRegistryObject CIKA_CRAFTING_TABLE = createCraftingTable("cika_crafting_table"); @@ -271,8 +258,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject ASPEN_FENCE_GATE = createFenceGate("aspen_fence_gate"); - public static final BlockRegistryObject BAOBAB_FENCE_GATE = createFenceGate("baobab_fence_gate"); public static final BlockRegistryObject BLUE_ENCHANTED_FENCE_GATE = createFenceGate("blue_enchanted_fence_gate"); public static final BlockRegistryObject CHERRY_FENCE_GATE = createFenceGate("cherry_fence_gate"); public static final BlockRegistryObject CIKA_FENCE_GATE = createFenceGate("cika_fence_gate"); @@ -301,8 +286,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject ASPEN_SLAB = createWoodSlab("aspen_slab"); - public static final BlockRegistryObject BAOBAB_SLAB = createWoodSlab("baobab_slab"); public static final BlockRegistryObject BLUE_ENCHANTED_SLAB = createWoodSlab("blue_enchanted_slab"); public static final BlockRegistryObject CHERRY_SLAB = createWoodSlab("cherry_slab"); public static final BlockRegistryObject CIKA_SLAB = createWoodSlab("cika_slab"); @@ -331,8 +314,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject ASPEN_STAIRS = createWoodStairs("aspen_stairs"); - public static final BlockRegistryObject BAOBAB_STAIRS = createWoodStairs("baobab_stairs"); public static final BlockRegistryObject BLUE_ENCHANTED_STAIRS = createWoodStairs("blue_enchanted_stairs"); public static final BlockRegistryObject CHERRY_STAIRS = createWoodStairs("cherry_stairs"); public static final BlockRegistryObject CIKA_STAIRS = createWoodStairs("cika_stairs"); @@ -361,8 +342,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject ASPEN_FENCE = createFence("aspen_fence"); - public static final BlockRegistryObject BAOBAB_FENCE = createFence("baobab_fence"); public static final BlockRegistryObject BLUE_ENCHANTED_FENCE = createFence("blue_enchanted_fence"); public static final BlockRegistryObject CHERRY_FENCE = createFence("cherry_fence"); public static final BlockRegistryObject CIKA_FENCE = createFence("cika_fence"); @@ -391,8 +370,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject ASPEN_SIGN = createSign("aspen_sign", BYGWoodType.ASPEN, ASPEN_PLANKS); - public static final BlockRegistryObject BAOBAB_SIGN = createSign("baobab_sign", BYGWoodType.BAOBAB, BAOBAB_PLANKS); public static final BlockRegistryObject BLUE_ENCHANTED_SIGN = createSign("blue_enchanted_sign", BYGWoodType.BLUE_ENCHANTED, BLUE_ENCHANTED_PLANKS); public static final BlockRegistryObject CHERRY_SIGN = createSign("cherry_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_SIGN = createSign("cika_sign", BYGWoodType.CIKA, CIKA_PLANKS); @@ -421,8 +398,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject ASPEN_WALL_SIGN = createWallSign("aspen_wall_sign", BYGWoodType.ASPEN, ASPEN_PLANKS); - public static final BlockRegistryObject BAOBAB_WALL_SIGN = createWallSign("baobab_wall_sign", BYGWoodType.BAOBAB, BAOBAB_PLANKS); public static final BlockRegistryObject BLUE_ENCHANTED_WALL_SIGN = createWallSign("blue_enchanted_wall_sign", BYGWoodType.BLUE_ENCHANTED, BLUE_ENCHANTED_PLANKS); public static final BlockRegistryObject CHERRY_WALL_SIGN = createWallSign("cherry_wall_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_WALL_SIGN = createWallSign("cika_wall_sign", BYGWoodType.CIKA, CIKA_PLANKS); @@ -463,8 +438,6 @@ public class BYGBlocks { public static final BlockRegistryObject MUD_BRICKS = createDirt("mud_bricks"); public static final BlockRegistryObject ARAUCARIA_SAPLING = createSapling(BYGBlockTags.GROUND_ARAUCARIA_SAPLING, "araucaria_sapling"); - public static final BlockRegistryObject ASPEN_SAPLING = createSapling(BYGBlockTags.GROUND_ASPEN_SAPLING, "aspen_sapling"); - public static final BlockRegistryObject BAOBAB_SAPLING = createSapling(BYGBlockTags.GROUND_BAOBAB_SAPLING, "baobab_sapling"); public static final BlockRegistryObject BLUE_ENCHANTED_SAPLING = createSapling(BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, "blue_enchanted_sapling"); public static final BlockRegistryObject BLUE_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_BLUE_SPRUCE_SAPLING, "blue_spruce_sapling"); public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); @@ -519,8 +492,6 @@ public class BYGBlocks { public static final BlockRegistryObject WITCH_HAZEL_BLOSSOM = createWitchHazelBlossomBlock(MaterialColor.COLOR_YELLOW, "witch_hazel_blossom"); public static final BlockRegistryObject ARAUCARIA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "araucaria_leaves"); - public static final BlockRegistryObject ASPEN_LEAVES = createLeaves(MaterialColor.TERRACOTTA_YELLOW, "aspen_leaves"); - public static final BlockRegistryObject BAOBAB_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "baobab_leaves"); public static final BlockRegistryObject BLOOMING_WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "blooming_witch_hazel_leaves"); public static final BlockRegistryObject BLUE_ENCHANTED_LEAVES = createGlowingLeaves(MaterialColor.COLOR_BLUE, 15, "blue_enchanted_leaves"); public static final BlockRegistryObject BLUE_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_BLUE, "blue_spruce_leaves"); @@ -856,8 +827,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject ASPEN_LOG = createLog("aspen_log"); - public static final BlockRegistryObject BAOBAB_LOG = createLog("baobab_log"); public static final BlockRegistryObject BLUE_ENCHANTED_LOG = createLog("blue_enchanted_log"); public static final BlockRegistryObject CHERRY_LOG = createLog("cherry_log"); public static final BlockRegistryObject CIKA_LOG = createLog("cika_log"); @@ -891,8 +860,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject ASPEN_WOOD = createWood("aspen_wood"); - public static final BlockRegistryObject BAOBAB_WOOD = createWood("baobab_wood"); public static final BlockRegistryObject BLUE_ENCHANTED_WOOD = createWood("blue_enchanted_wood"); public static final BlockRegistryObject CHERRY_WOOD = createWood("cherry_wood"); public static final BlockRegistryObject CIKA_WOOD = createWood("cika_wood"); @@ -1051,8 +1018,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_ASPEN_LOG = createStrippedLog("stripped_aspen_log"); - public static final BlockRegistryObject STRIPPED_BAOBAB_LOG = createStrippedLog("stripped_baobab_log"); public static final BlockRegistryObject STRIPPED_BLUE_ENCHANTED_LOG = createStrippedLog("stripped_blue_enchanted_log"); public static final BlockRegistryObject STRIPPED_CHERRY_LOG = createStrippedLog("stripped_cherry_log"); public static final BlockRegistryObject STRIPPED_CIKA_LOG = createStrippedLog("stripped_cika_log"); @@ -1081,8 +1046,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_ASPEN_WOOD = createWood("stripped_aspen_wood"); - public static final BlockRegistryObject STRIPPED_BAOBAB_WOOD = createWood("stripped_baobab_wood"); public static final BlockRegistryObject STRIPPED_BLUE_ENCHANTED_WOOD = createWood("stripped_blue_enchanted_wood"); public static final BlockRegistryObject STRIPPED_CHERRY_WOOD = createWood("stripped_cherry_wood"); public static final BlockRegistryObject STRIPPED_CIKA_WOOD = createWood("stripped_cika_wood"); @@ -1337,11 +1300,11 @@ private static BlockRegistryObject createShinyChiseledTheriumWall(String return createBlock(() -> new WallBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).requiresCorrectToolForDrops().sound(SoundType.GLASS).lightLevel((state) -> 12).strength(1.5f, 9.0f)), id); } - private static BlockRegistryObject createFence(String id) { + static BlockRegistryObject createFence(String id) { return createBlock(() -> new FenceBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } - private static BlockRegistryObject createFenceGate(String id) { + static BlockRegistryObject createFenceGate(String id) { return createBlock(() -> new FenceGateBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } @@ -1369,7 +1332,7 @@ private static BlockRegistryObject createSandstonePillar(MaterialColor co return createBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.STONE, color).requiresCorrectToolForDrops().strength(0.8F).sound(SoundType.STONE)), id); } - private static BlockRegistryObject createWoodSlab(String id) { + static BlockRegistryObject createWoodSlab(String id) { return createBlock(() -> new SlabBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } @@ -1381,47 +1344,47 @@ private static BlockRegistryObject createStoneWall(String id) { return createBlock(() -> new WallBlock(BlockBehaviour.Properties.of(Material.STONE).sound(SoundType.STONE).strength(2.0f, 6.0f).requiresCorrectToolForDrops()), id); } - private static BlockRegistryObject createWoodPressurePlate(String id) { + static BlockRegistryObject createWoodPressurePlate(String id) { return createBlock(() -> PressurePlateBlockAccess.byg_create(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).noCollission().strength(0.5F)), id); } - private static BlockRegistryObject createWoodStairs(String id) { + static BlockRegistryObject createWoodStairs(String id) { return createBlock(() -> StairBlockAccess.byg_create(Registry.BLOCK.get(BYG.createLocation(id.replace("_stairs", "planks"))).defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } - private static BlockRegistryObject createTrapDoor(String id) { + static BlockRegistryObject createTrapDoor(String id) { return createBlock(() -> TrapDoorBlockAccess.byg_create(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2.0f, 3.0f).noOcclusion()), id); } - private static BlockRegistryObject createCraftingTable(String id) { + static BlockRegistryObject createCraftingTable(String id) { return createBlock(() -> new BYGCraftingTableBlock(BlockBehaviour.Properties.copy(Blocks.CRAFTING_TABLE)), id); } - private static BlockRegistryObject createWoodButton(String id) { + static BlockRegistryObject createWoodButton(String id) { return createBlock(() -> WoodButtonBlockAccess.byg_create(BlockBehaviour.Properties.of(Material.DECORATION).sound(SoundType.WOOD).noCollission().strength(0.5F)), id); } - private static BlockRegistryObject createBookshelf(String id) { + static BlockRegistryObject createBookshelf(String id) { return createBlock(() -> new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } - private static BlockRegistryObject createDoor(String id) { + static BlockRegistryObject createDoor(String id) { return createBlock(() -> DoorBlockAccess.byg_create(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2.0f, 3.0f).noOcclusion()), id); } - private static BlockRegistryObject createPlanks(String id) { + static BlockRegistryObject createPlanks(String id) { return createBlock(() -> new Block(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.COLOR_BROWN).sound(SoundType.WOOD).strength(2.0f, 3.0f)), id); } - private static BlockRegistryObject createWood(String id) { + static BlockRegistryObject createWood(String id) { return createBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0f)), id); } - private static BlockRegistryObject createStrippedLog(String id) { + static BlockRegistryObject createStrippedLog(String id) { return createBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).sound(SoundType.WOOD).strength(2.0f)), id); } - private static BlockRegistryObject createLog(String id) { + static BlockRegistryObject createLog(String id) { return createBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of(Material.WOOD).sound(SoundType.WOOD).strength(2.0f)), id); } @@ -1692,7 +1655,7 @@ private static BlockRegistryObject createNightshadeBerryBush(int lightLev return createBlock(() -> new NightshadeBerryBushBlock(BlockBehaviour.Properties.of(Material.PLANT).sound(SoundType.SWEET_BERRY_BUSH).lightLevel((state) -> lightLevel).randomTicks().instabreak().noCollission()), id); } - private static BlockRegistryObject createSapling(TagKey groundTag, String id) { + static BlockRegistryObject createSapling(TagKey groundTag, String id) { final Supplier createBlock = () -> new BYGSaplingBlock(BlockBehaviour.Properties.of(Material.PLANT).sound(SoundType.GRASS).strength(0.0f).noCollission().randomTicks(), groundTag); final var blockRo = createPottedBlock(createBlock, id); return blockRo; @@ -1773,7 +1736,7 @@ private static BlockRegistryObject createShulkrenVinePlant(String id) { return createBlock(() -> new ShulkrenVinePlantBlock(BlockBehaviour.Properties.of(Material.LEAVES).instabreak().randomTicks().sound(SoundType.WEEPING_VINES).noCollission()), id); } - private static BlockRegistryObject createLeaves(MaterialColor color, String id) { + static BlockRegistryObject createLeaves(MaterialColor color, String id) { return createBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of(Material.LEAVES, color).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isViewBlocking((state, world, pos) -> false).isSuffocating((state, world, pos) -> false)), id); } @@ -1825,7 +1788,7 @@ private static BlockRegistryObject createNetherStoneSpreadable(Block bloc return createBlock(() -> new BYGNylium(BlockBehaviour.Properties.of(Material.STONE, color).sound(SoundType.NYLIUM).strength(0.4f).randomTicks().requiresCorrectToolForDrops(), feature, blockToSpreadToo), id); } - private static BlockRegistryObject createSign(String id, WoodType type, Supplier color) { + static BlockRegistryObject createSign(String id, @Nullable WoodType type, Supplier color) { return createSignSpecificColor(id, type, () -> color.get().defaultMaterialColor()); } @@ -1833,7 +1796,7 @@ private static BlockRegistryObject createSignSpecificColor(String id, Woo return BYGConstants.SIGNS ? createBlock(() -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null; } - private static BlockRegistryObject createWallSign(String id, WoodType type, Supplier color) { + static BlockRegistryObject createWallSign(String id, @Nullable WoodType type, Supplier color) { return BYGConstants.SIGNS ? createSignSpecificColor(id, type, () -> color.get().defaultMaterialColor()) : null; } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 233b8cb4c9..853cb44d8d 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -7,10 +7,9 @@ import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; +// TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType ASPEN = register("aspen"); - public static final WoodType BAOBAB = register("baobab"); public static final WoodType BLUE_ENCHANTED = register("blue_enchanted"); public static final WoodType CHERRY = register("cherry"); public static final WoodType CIKA = register("cika"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java new file mode 100644 index 0000000000..83c5513f86 --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -0,0 +1,214 @@ +package potionstudios.byg.common.block; + +import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; +import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.SignItem; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.properties.WoodType; +import net.minecraft.world.level.material.MaterialColor; +import potionstudios.byg.BYG; +import potionstudios.byg.BYGConstants; +import potionstudios.byg.common.entity.boat.BYGBoatEntity; +import potionstudios.byg.common.item.BYGBoatItem; +import potionstudios.byg.common.item.BYGCreativeTab; +import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.reg.BlockRegistryObject; +import potionstudios.byg.reg.RegistryObject; + +@MethodsReturnNonnullByDefault +public enum BYGWoodTypes { + ASPEN("aspen", BYGBlockTags.GROUND_ASPEN_SAPLING, MaterialColor.TERRACOTTA_YELLOW, BYGBoatEntity.BYGType.ASPEN), + BAOBAB("baobab", BYGBlockTags.GROUND_BAOBAB_SAPLING, MaterialColor.TERRACOTTA_GREEN, BYGBoatEntity.BYGType.BAOBAB); + + private final String name; + private final WoodType woodType; + private final TagKey saplingGroundTag; + private final MaterialColor materialColor; + private final BYGBoatEntity.BYGType boatType; + private boolean initialized; + + private BlockRegistryObject sapling; + private BlockRegistryObject leaves; + + private BlockRegistryObject log; + private BlockRegistryObject wood; + private BlockRegistryObject strippedLog; + private BlockRegistryObject strippedWood; + + private BlockRegistryObject planks; + private BlockRegistryObject bookshelf; + private BlockRegistryObject craftingTable; + private BlockRegistryObject stairs; + private BlockRegistryObject slab; + + private BlockRegistryObject fence; + private BlockRegistryObject fenceGate; + + private BlockRegistryObject door; + private BlockRegistryObject trapdoor; + + private BlockRegistryObject pressurePlate; + private BlockRegistryObject button; + + private BlockRegistryObject sign; + private BlockRegistryObject wallSign; + private RegistryObject signItem; + + private RegistryObject boat; + + BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, BYGBoatEntity.BYGType boatType) { + this.name = name; + this.saplingGroundTag = saplingGroundTag; + this.materialColor = materialColor; + this.boatType = boatType; + this.woodType = BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(name).toString().replace(":", "/"))) : null; + } + + public void init() { + if (initialized) + return; + this.sapling = BYGBlocks.createSapling(saplingGroundTag, name + "_sapling"); + BYGItems.createSaplingItem(sapling); + this.leaves = BYGBlocks.createLeaves(materialColor, name + "leaves"); + BYGItems.createItem(leaves); + + this.log = BYGBlocks.createLog(name + "_log"); + BYGItems.createItem(log); + this.wood = BYGBlocks.createWood(name + "_wood"); + BYGItems.createItem(wood); + this.strippedLog = BYGBlocks.createStrippedLog("stripped_" + name + "_log"); + BYGItems.createItem(strippedLog); + this.strippedWood = BYGBlocks.createWood("stripped_" + name + "_wood"); + BYGItems.createItem(strippedWood); + + this.planks = BYGBlocks.createPlanks(name + "_planks"); + BYGItems.createItem(planks); + this.bookshelf = BYGBlocks.createBookshelf(name + "_bookshelf"); + BYGItems.createItem(bookshelf); + this.craftingTable = BYGBlocks.createCraftingTable(name + "_crafting_table"); + BYGItems.createItem(craftingTable); + this.stairs = BYGBlocks.createWoodStairs(name + "_stairs"); + BYGItems.createItem(stairs); + this.slab = BYGBlocks.createWoodSlab(name + "_slab"); + BYGItems.createItem(slab); + + this.fence = BYGBlocks.createFence(name + "_fence"); + BYGItems.createItem(fence); + this.fenceGate = BYGBlocks.createFenceGate(name + "_fence_gate"); + BYGItems.createItem(fenceGate); + + this.door = BYGBlocks.createDoor(name + "_door"); + BYGItems.createItem(door); + this.trapdoor = BYGBlocks.createTrapDoor(name + "_trapdoor"); + BYGItems.createItem(trapdoor); + + this.pressurePlate = BYGBlocks.createWoodPressurePlate(name + "_pressure_plate"); + BYGItems.createItem(pressurePlate); + this.button = BYGBlocks.createWoodButton(name + "_button"); + BYGItems.createItem(button); + + // TODO fix type + this.sign = BYGBlocks.createSign(name + "_sign", woodType, planks); + this.wallSign = BYGBlocks.createWallSign(name + "_wall_sign", woodType, planks); + this.signItem = BYGItems.createSign(name + "_sign", sign, wallSign); + + this.boat = BYGItems.createItem(() -> new BYGBoatItem(boatType, new Item.Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), name + "_boat"); + initialized = true; + } + + @Override + public String toString() { + return name; + } + + public BlockRegistryObject planks() { + return planks; + } + public BlockRegistryObject sapling() { + return sapling; + } + public WoodType woodType() { + return woodType; + } + + public BlockRegistryObject leaves() { + return leaves; + } + + public BlockRegistryObject log() { + return log; + } + + public BlockRegistryObject wood() { + return wood; + } + + public BlockRegistryObject strippedLog() { + return strippedLog; + } + + public BlockRegistryObject strippedWood() { + return strippedWood; + } + + public BlockRegistryObject bookshelf() { + return bookshelf; + } + + public BlockRegistryObject craftingTable() { + return craftingTable; + } + + public BlockRegistryObject stairs() { + return stairs; + } + + public BlockRegistryObject slab() { + return slab; + } + + public BlockRegistryObject fence() { + return fence; + } + + public BlockRegistryObject fenceGate() { + return fenceGate; + } + + public BlockRegistryObject door() { + return door; + } + + public BlockRegistryObject trapdoor() { + return trapdoor; + } + + public BlockRegistryObject pressurePlate() { + return pressurePlate; + } + + public BlockRegistryObject button() { + return button; + } + + public BlockRegistryObject sign() { + return sign; + } + + public BlockRegistryObject wallSign() { + return wallSign; + } + + public RegistryObject signItem() { + return signItem; + } + + public RegistryObject boat() { + return boat; + } + + public static void loadClass() {} +} diff --git a/Common/src/main/java/potionstudios/byg/common/block/BaobabFruitBlock.java b/Common/src/main/java/potionstudios/byg/common/block/BaobabFruitBlock.java index b1c24bf836..9cd4252e4e 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BaobabFruitBlock.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BaobabFruitBlock.java @@ -64,7 +64,7 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) { BlockPos blockpos = pos.above(); BlockState blockstate = worldIn.getBlockState(blockpos); Block block = blockstate.getBlock(); - return block == BYGBlocks.BAOBAB_LEAVES.get(); + return block == BYGWoodTypes.BAOBAB.leaves().get(); } @Override diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index fa8639d1f3..bf8abf6e7c 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -22,6 +22,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.entity.BYGEntities; import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.mixin.access.BoatEntityAccess; @@ -47,8 +48,8 @@ public BYGBoatEntity(EntityType boatEntityType, Level worldType) @Override public Item getDropItem() { return switch (this.getBYGBoatType()) { - default -> BYGItems.ASPEN_BOAT.get(); - case BAOBAB -> BYGItems.BAOBAB_BOAT.get(); + default -> BYGWoodTypes.ASPEN.boat().get(); + case BAOBAB -> BYGWoodTypes.BAOBAB.boat().get(); case BLUE_ENCHANTED -> BYGItems.BLUE_ENCHANTED_BOAT.get(); case CHERRY -> BYGItems.CHERRY_BOAT.get(); case CIKA -> BYGItems.CIKA_BOAT.get(); @@ -74,8 +75,8 @@ public Item getDropItem() { public Block getPlanks() { return switch (this.getBYGBoatType()) { - default -> BYGBlocks.ASPEN_PLANKS.get(); - case BAOBAB -> BYGBlocks.BAOBAB_PLANKS.get(); + default -> BYGWoodTypes.ASPEN.planks().get(); + case BAOBAB -> BYGWoodTypes.BAOBAB.planks().get(); case BLUE_ENCHANTED -> BYGBlocks.BLUE_ENCHANTED_PLANKS.get(); case CHERRY -> BYGBlocks.CHERRY_PLANKS.get(); case CIKA -> BYGBlocks.CIKA_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index c5f239240e..811074fdbb 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -11,6 +11,7 @@ import potionstudios.byg.BYG; import potionstudios.byg.BYGConstants; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.entity.boat.BYGBoatEntity; import potionstudios.byg.mixin.access.AxeItemAccess; import potionstudios.byg.mixin.access.HoeItemAccess; @@ -241,48 +242,15 @@ public class BYGItems { public static final RegistryObject CRACKED_RED_SAND = createItem(BYGBlocks.CRACKED_RED_SAND); - //Aspen Woodtype - public static final RegistryObject ASPEN_SAPLING = createSaplingItem(BYGBlocks.ASPEN_SAPLING); - public static final RegistryObject ASPEN_LEAVES = createItem(BYGBlocks.ASPEN_LEAVES); - public static final RegistryObject ASPEN_LOG = createItem(BYGBlocks.ASPEN_LOG); - public static final RegistryObject ASPEN_WOOD = createItem(BYGBlocks.ASPEN_WOOD); - public static final RegistryObject STRIPPED_ASPEN_LOG = createItem(BYGBlocks.STRIPPED_ASPEN_LOG); - public static final RegistryObject STRIPPED_ASPEN_WOOD = createItem(BYGBlocks.STRIPPED_ASPEN_WOOD); - public static final RegistryObject ASPEN_PLANKS = createItem(BYGBlocks.ASPEN_PLANKS); - public static final RegistryObject ASPEN_BOOKSHELF = createItem(BYGBlocks.ASPEN_BOOKSHELF); - public static final RegistryObject ASPEN_CRAFTING_TABLE = createItem(BYGBlocks.ASPEN_CRAFTING_TABLE); - public static final RegistryObject ASPEN_STAIRS = createItem(BYGBlocks.ASPEN_STAIRS); - public static final RegistryObject ASPEN_SLAB = createItem(BYGBlocks.ASPEN_SLAB); - public static final RegistryObject ASPEN_FENCE = createItem(BYGBlocks.ASPEN_FENCE); - public static final RegistryObject ASPEN_FENCE_GATE = createItem(BYGBlocks.ASPEN_FENCE_GATE); - public static final RegistryObject ASPEN_DOOR = createItem(BYGBlocks.ASPEN_DOOR); - public static final RegistryObject ASPEN_TRAPDOOR = createItem(BYGBlocks.ASPEN_TRAPDOOR); - public static final RegistryObject ASPEN_PRESSURE_PLATE = createItem(BYGBlocks.ASPEN_PRESSURE_PLATE); - public static final RegistryObject ASPEN_BUTTON = createItem(BYGBlocks.ASPEN_BUTTON); - public static final RegistryObject ASPEN_SIGN = createSign("aspen_sign", BYGBlocks.ASPEN_SIGN, BYGBlocks.ASPEN_WALL_SIGN); - public static final RegistryObject ASPEN_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.ASPEN, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "aspen_boat"); - //Baobab Woodtype - public static final RegistryObject BAOBAB_FRUIT = createItem(() -> new BaobabFruitItem(BYGBlocks.BAOBAB_FRUIT_BLOCK.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(3).saturationMod(0.5f).alwaysEat().build())), "baobab_fruit"); - public static final RegistryObject BAOBAB_SAPLING = createSaplingItem(BYGBlocks.BAOBAB_SAPLING); - public static final RegistryObject BAOBAB_LEAVES = createItem(BYGBlocks.BAOBAB_LEAVES); - public static final RegistryObject BAOBAB_LOG = createItem(BYGBlocks.BAOBAB_LOG); - public static final RegistryObject BAOBAB_WOOD = createItem(BYGBlocks.BAOBAB_WOOD); - public static final RegistryObject STRIPPED_BAOBAB_LOG = createItem(BYGBlocks.STRIPPED_BAOBAB_LOG); - public static final RegistryObject STRIPPED_BAOBAB_WOOD = createItem(BYGBlocks.STRIPPED_BAOBAB_WOOD); - public static final RegistryObject BAOBAB_PLANKS = createItem(BYGBlocks.BAOBAB_PLANKS); - public static final RegistryObject BAOBAB_BOOKSHELF = createItem(BYGBlocks.BAOBAB_BOOKSHELF); - public static final RegistryObject BAOBAB_CRAFTING_TABLE = createItem(BYGBlocks.BAOBAB_CRAFTING_TABLE); - public static final RegistryObject BAOBAB_STAIRS = createItem(BYGBlocks.BAOBAB_STAIRS); - public static final RegistryObject BAOBAB_SLAB = createItem(BYGBlocks.BAOBAB_SLAB); - public static final RegistryObject BAOBAB_FENCE = createItem(BYGBlocks.BAOBAB_FENCE); - public static final RegistryObject BAOBAB_FENCE_GATE = createItem(BYGBlocks.BAOBAB_FENCE_GATE); - public static final RegistryObject BAOBAB_DOOR = createItem(BYGBlocks.BAOBAB_DOOR); - public static final RegistryObject BAOBAB_TRAPDOOR = createItem(BYGBlocks.BAOBAB_TRAPDOOR); - public static final RegistryObject BAOBAB_PRESSURE_PLATE = createItem(BYGBlocks.BAOBAB_PRESSURE_PLATE); - public static final RegistryObject BAOBAB_BUTTON = createItem(BYGBlocks.BAOBAB_BUTTON); - public static final RegistryObject BAOBAB_SIGN = createSign("baobab_sign", BYGBlocks.BAOBAB_SIGN, BYGBlocks.BAOBAB_WALL_SIGN); - public static final RegistryObject BAOBAB_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.BAOBAB, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "baobab_boat"); + public static final RegistryObject BAOBAB_FRUIT; + + static { + BYGWoodTypes.ASPEN.init(); + + BAOBAB_FRUIT = createItem(() -> new BaobabFruitItem(BYGBlocks.BAOBAB_FRUIT_BLOCK.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(3).saturationMod(0.5f).alwaysEat().build())), "baobab_fruit"); + BYGWoodTypes.BAOBAB.init(); + } //Blue Enchanted Woodtype public static final RegistryObject BLUE_ENCHANTED_SAPLING = createSaplingItem(BYGBlocks.BLUE_ENCHANTED_SAPLING); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index adbd77aabb..3daff75cef 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -28,6 +28,7 @@ import java.util.function.Supplier; import static potionstudios.byg.common.world.feature.placement.BYGPlacedFeaturesUtil.createPlacedFeature; +import static potionstudios.byg.common.block.BYGWoodTypes.*; public class BYGOverworldTreeFeatures { public static final Holder> ARAUCARIA_TREE1 = createConfiguredFeature("araucaria_tree1", @@ -81,24 +82,24 @@ public class BYGOverworldTreeFeatures { public static final Holder> ASPEN_SHRUB1 = createConfiguredFeature("aspen_shrub1", BYGFeatures.SHRUB1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ASPEN_LOG.get()) - .setLeavesBlock(BYGBlocks.ASPEN_LEAVES.get()) + .setTrunkBlock(ASPEN.log().get()) + .setLeavesBlock(ASPEN.leaves().get()) .setMinHeight(2) .build() ); public static final Holder> ASPEN_SHRUB2 = createConfiguredFeature("aspen_shrub2", BYGFeatures.SHRUB2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ASPEN_LOG.get()) - .setLeavesBlock(BYGBlocks.ASPEN_LEAVES.get()) + .setTrunkBlock(ASPEN.log().get()) + .setLeavesBlock(ASPEN.leaves().get()) .setMinHeight(1) .build() ); public static final Holder> ASPEN_TREE1 = createConfiguredFeature("aspen_tree1", BYGFeatures.ASPEN_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ASPEN_LOG.get()) - .setLeavesBlock(BYGBlocks.ASPEN_LEAVES.get()) + .setTrunkBlock(ASPEN.log().get()) + .setLeavesBlock(ASPEN.leaves().get()) .setMaxHeight(10) .setMinHeight(7) .build() @@ -106,15 +107,15 @@ public class BYGOverworldTreeFeatures { public static final Holder> ASPEN_TREE2 = createConfiguredFeature("aspen_tree2", BYGFeatures.ASPEN_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ASPEN_LOG.get()) - .setLeavesBlock(BYGBlocks.ASPEN_LEAVES.get()) + .setTrunkBlock(ASPEN.log().get()) + .setLeavesBlock(ASPEN.leaves().get()) .setMaxHeight(19).setMinHeight(14).build() ); public static final Holder> ASPEN_TREE3 = createConfiguredFeature("aspen_tree3", BYGFeatures.ASPEN_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ASPEN_LOG.get()) - .setLeavesBlock(BYGBlocks.ASPEN_LEAVES.get()) + .setTrunkBlock(ASPEN.log().get()) + .setLeavesBlock(ASPEN.leaves().get()) .setMaxHeight(18) .setMinHeight(11) .build() @@ -123,8 +124,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> BAOBAB_TREE1 = createConfiguredFeature("baobab_tree1", BYGFeatures.BAOBAB_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BAOBAB_LOG.get()) - .setLeavesBlock(BYGBlocks.BAOBAB_LEAVES.get()) + .setTrunkBlock(BAOBAB.log().get()) + .setLeavesBlock(BAOBAB.leaves().get()) .setMaxHeight(28) .setMinHeight(20) .build() @@ -132,8 +133,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> BAOBAB_TREE2 = createConfiguredFeature("baobab_tree2", BYGFeatures.BAOBAB_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BAOBAB_LOG.get()) - .setLeavesBlock(BYGBlocks.BAOBAB_LEAVES.get()) + .setTrunkBlock(BAOBAB.log().get()) + .setLeavesBlock(BAOBAB.leaves().get()) .setMaxHeight(28) .setMinHeight(20) .build() @@ -141,8 +142,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> BAOBAB_TREE3 = createConfiguredFeature("baobab_tree3", BYGFeatures.BAOBAB_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BAOBAB_LOG.get()) - .setLeavesBlock(BYGBlocks.BAOBAB_LEAVES.get()) + .setTrunkBlock(BAOBAB.log().get()) + .setLeavesBlock(BAOBAB.leaves().get()) .setMaxHeight(28) .setMinHeight(20) .build() diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/gen/overworld/trees/util/BYGAbstractTreeFeature.java b/Common/src/main/java/potionstudios/byg/common/world/feature/gen/overworld/trees/util/BYGAbstractTreeFeature.java index 677d5f8a89..c06f2e8494 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/gen/overworld/trees/util/BYGAbstractTreeFeature.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/gen/overworld/trees/util/BYGAbstractTreeFeature.java @@ -30,6 +30,7 @@ import net.minecraft.world.phys.shapes.DiscreteVoxelShape; import potionstudios.byg.BYGConstants; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.block.BaobabFruitBlock; import potionstudios.byg.common.block.EtherBulbsBlock; import potionstudios.byg.common.world.feature.config.BYGTreeConfig; @@ -124,7 +125,7 @@ public void etherBulbs(BlockPos startPos, BYGTreeConfig config, Random random, S public void baobabFruit(BlockPos startPos, BYGTreeConfig config, Random random, Set blockSet, WorldGenLevel reader, BlockPos pos, BoundingBox boundingBox) { pos = getTransformedPos(config, startPos, pos); - if (isAir(reader, pos) && reader.getBlockState(pos.above()).getBlock() == BYGBlocks.BAOBAB_LEAVES.get()) { + if (isAir(reader, pos) && reader.getBlockState(pos.above()).getBlock() == BYGWoodTypes.BAOBAB.leaves().get()) { this.setFinalBlockState(blockSet, reader, pos, BYGBlocks.BAOBAB_FRUIT_BLOCK.defaultBlockState().setValue(BaobabFruitBlock.AGE, random.nextInt(4)), boundingBox); } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java index 662f46c7f0..998329b362 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java @@ -5,6 +5,7 @@ import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; +import potionstudios.byg.datagen.providers.BYGRecipeProviders; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = BYG.MOD_ID) public class BYGDataGen { @@ -14,6 +15,7 @@ static void onDatagen(final GatherDataEvent event) { final var gen = event.getGenerator(); final var existingFileHelper = event.getExistingFileHelper(); gen.addProvider(new BYGBlockTagsProvider(gen, existingFileHelper)); + gen.addProvider(new BYGRecipeProviders(gen)); } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java new file mode 100644 index 0000000000..9db3547b08 --- /dev/null +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -0,0 +1,55 @@ +package potionstudios.byg.datagen.providers; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.world.item.Items; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGWoodTypes; + +import java.util.function.Consumer; + +public class BYGRecipeProviders extends RecipeProvider { + public BYGRecipeProviders(DataGenerator pGenerator) { + super(pGenerator); + } + + @Override + protected void buildCraftingRecipes(Consumer consumer) { + for (BYGWoodTypes type : BYGWoodTypes.values()) { + ShapedRecipeBuilder.shaped(type.door().get(), 3) + .pattern("PP") + .pattern("PP") + .pattern("PP") + .define('P', type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/door")); + ShapedRecipeBuilder.shaped(type.boat().get()) + .pattern("P P") + .pattern("PPP") + .define('P', type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/boat")); + ShapedRecipeBuilder.shaped(type.bookshelf().get()) + .pattern("PPP") + .pattern("BBB") + .pattern("PPP") + .define('P', type.planks().get()) + .define('B', Items.BOOK) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/bookshelf")); + ShapelessRecipeBuilder.shapeless(type.button().get()) + .requires(type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/button")); + ShapedRecipeBuilder.shaped(type.craftingTable()) + .pattern("PP") + .pattern("PP") + .define('P', type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/crafting_table")); + } + } +} diff --git a/build.gradle b/build.gradle index fd039c0c4e..4c86deffb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.matyrobbrt.mc.registrationutils' version '0.2.3' + id 'com.matyrobbrt.mc.registrationutils' version '0.2.6' } registrationUtils { From 270556a4336f5779eabb0d5bf269a30075715f37 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Mon, 23 May 2022 21:04:27 +0300 Subject: [PATCH 02/90] Move blue enchanted - Finish datagen for wood --- Common/src/generated/resources/.cache/cache | 78 ++++++++++++++++--- .../recipes/byg.byg/wood/aspen/fence.json | 34 ++++++++ .../byg.byg/wood/aspen/fence_gate.json | 34 ++++++++ .../recipes/byg.byg/wood/aspen/planks.json | 34 ++++++++ .../byg.byg/wood/aspen/pressure_plate.json | 34 ++++++++ .../recipes/byg.byg/wood/aspen/slab.json | 34 ++++++++ .../recipes/byg.byg/wood/aspen/stairs.json | 34 ++++++++ .../recipes/byg.byg/wood/aspen/trapdoor.json | 34 ++++++++ .../recipes/byg.byg/wood/aspen/wood.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/fence.json | 34 ++++++++ .../byg.byg/wood/baobab/fence_gate.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/planks.json | 34 ++++++++ .../byg.byg/wood/baobab/pressure_plate.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/slab.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/stairs.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/trapdoor.json | 34 ++++++++ .../recipes/byg.byg/wood/baobab/wood.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/boat.json | 34 ++++++++ .../wood/blue_enchanted/bookshelf.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/button.json | 34 ++++++++ .../wood/blue_enchanted/crafting_table.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/door.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/fence.json | 34 ++++++++ .../wood/blue_enchanted/fence_gate.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/planks.json | 34 ++++++++ .../wood/blue_enchanted/pressure_plate.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/slab.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/stairs.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/trapdoor.json | 34 ++++++++ .../byg.byg/wood/blue_enchanted/wood.json | 34 ++++++++ .../data/byg/recipes/wood/aspen/boat.json | 1 + .../byg/recipes/wood/aspen/bookshelf.json | 1 + .../data/byg/recipes/wood/aspen/button.json | 1 + .../recipes/wood/aspen/crafting_table.json | 1 + .../data/byg/recipes/wood/aspen/door.json | 1 + .../data/byg/recipes/wood/aspen/fence.json} | 0 .../byg/recipes/wood/aspen/fence_gate.json} | 0 .../data/byg/recipes/wood/aspen/planks.json} | 4 +- .../recipes/wood/aspen/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/aspen/slab.json} | 4 +- .../data/byg/recipes/wood/aspen/stairs.json} | 10 +-- .../byg/recipes/wood/aspen/trapdoor.json} | 6 +- .../data/byg/recipes/wood/aspen/wood.json} | 7 +- .../data/byg/recipes/wood/baobab/boat.json | 1 + .../byg/recipes/wood/baobab/bookshelf.json | 1 + .../data/byg/recipes/wood/baobab/button.json | 1 + .../recipes/wood/baobab/crafting_table.json | 1 + .../data/byg/recipes/wood/baobab/door.json | 1 + .../data/byg/recipes/wood/baobab/fence.json} | 0 .../byg/recipes/wood/baobab/fence_gate.json} | 0 .../data/byg/recipes/wood/baobab/planks.json} | 4 +- .../recipes/wood/baobab/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/baobab/slab.json} | 4 +- .../data/byg/recipes/wood/baobab/stairs.json} | 10 +-- .../byg/recipes/wood/baobab/trapdoor.json} | 6 +- .../data/byg/recipes/wood/baobab/wood.json} | 7 +- .../recipes/wood/blue_enchanted/boat.json} | 6 +- .../wood/blue_enchanted/bookshelf.json} | 11 +-- .../recipes/wood/blue_enchanted/button.json} | 0 .../wood/blue_enchanted/crafting_table.json} | 7 +- .../recipes/wood/blue_enchanted/door.json} | 8 +- .../recipes/wood/blue_enchanted/fence.json} | 0 .../wood/blue_enchanted/fence_gate.json} | 0 .../recipes/wood/blue_enchanted/planks.json} | 4 +- .../wood/blue_enchanted/pressure_plate.json} | 4 +- .../recipes/wood/blue_enchanted/slab.json} | 4 +- .../recipes/wood/blue_enchanted/stairs.json} | 10 +-- .../wood/blue_enchanted/trapdoor.json} | 6 +- .../recipes/wood/blue_enchanted/wood.json} | 7 +- .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 10 --- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 21 +---- .../byg/common/block/BYGWoodTypes.java | 15 +++- .../byg/common/entity/boat/BYGBoatEntity.java | 4 +- .../byg/common/item/BYGItems.java | 23 +----- .../overworld/BYGOverworldTreeFeatures.java | 16 ++-- .../data/byg/tags/blocks/end_stone.json | 12 --- .../may_place_on/allium_flower_bush.json | 6 -- .../may_place_on/alpine_bellflower.json | 6 -- .../tags/blocks/may_place_on/amaranth.json | 6 -- .../tags/blocks/may_place_on/angelica.json | 6 -- .../may_place_on/araucaria_sapling.json | 6 -- .../blocks/may_place_on/aspen_sapling.json | 6 -- .../blocks/may_place_on/baobab_sapling.json | 6 -- .../tags/blocks/may_place_on/beach_grass.json | 6 -- .../byg/tags/blocks/may_place_on/begonia.json | 6 -- .../byg/tags/blocks/may_place_on/bistort.json | 6 -- .../tags/blocks/may_place_on/black_rose.json | 6 -- .../may_place_on/blue_enchanted_sapling.json | 6 -- .../tags/blocks/may_place_on/blue_sage.json | 6 -- .../may_place_on/blue_spruce_sapling.json | 6 -- .../may_place_on/brown_birch_sapling.json | 6 -- .../may_place_on/brown_oak_sapling.json | 6 -- .../may_place_on/brown_zelkova_sapling.json | 6 -- .../blocks/may_place_on/bulbis_oddity.json | 15 ---- .../blocks/may_place_on/california_poppy.json | 6 -- .../blocks/may_place_on/cika_sapling.json | 6 -- .../blocks/may_place_on/clover_patch.json | 6 -- .../byg/tags/blocks/may_place_on/crocus.json | 6 -- .../blocks/may_place_on/cyan_amaranth.json | 6 -- .../blocks/may_place_on/cypress_sapling.json | 6 -- .../tags/blocks/may_place_on/death_cap.json | 8 -- .../tags/blocks/may_place_on/delphinium.json | 6 -- .../blocks/may_place_on/ebony_sapling.json | 6 -- .../tags/blocks/may_place_on/embur_wart.json | 8 -- .../blocks/may_place_on/ether_sapling.json | 6 -- .../blocks/may_place_on/fairy_slipper.json | 7 -- .../tags/blocks/may_place_on/fir_sapling.json | 6 -- .../may_place_on/firecracker_flower_bush.json | 6 -- .../blocks/may_place_on/flower_patch.json | 6 -- .../flowering_indigo_jacaranda_bush.json | 6 -- .../flowering_jacaranda_bush.json | 6 -- .../tags/blocks/may_place_on/foxglove.json | 6 -- .../blocks/may_place_on/fungal_imparius.json | 15 ---- .../may_place_on/golden_spined_cactus.json | 6 -- .../may_place_on/green_enchanted_sapling.json | 6 -- .../blocks/may_place_on/green_mushroom.json | 8 -- .../tags/blocks/may_place_on/green_tulip.json | 6 -- .../tags/blocks/may_place_on/guzmania.json | 6 -- .../blocks/may_place_on/holly_sapling.json | 6 -- .../tags/blocks/may_place_on/horseweed.json | 6 -- .../blocks/may_place_on/hydrangea_bush.json | 6 -- .../may_place_on/imparius_mushroom.json | 15 ---- .../tags/blocks/may_place_on/incan_lily.json | 6 -- .../indigo_jacaranda_sapling.json | 6 -- .../byg/tags/blocks/may_place_on/iris.json | 6 -- .../may_place_on/jacaranda_sapling.json | 6 -- .../blocks/may_place_on/japanese_orchid.json | 6 -- .../blocks/may_place_on/joshua_sapling.json | 6 -- .../blocks/may_place_on/kovan_flower.json | 6 -- .../blocks/may_place_on/lament_sapling.json | 6 -- .../may_place_on/lazarus_bellflower.json | 6 -- .../blocks/may_place_on/lollipop_flower.json | 6 -- .../blocks/may_place_on/magenta_amaranth.json | 6 -- .../blocks/may_place_on/magenta_tulip.json | 6 -- .../blocks/may_place_on/mahogany_sapling.json | 6 -- .../blocks/may_place_on/mangrove_sapling.json | 6 -- .../blocks/may_place_on/mangrove_tree.json | 10 --- .../blocks/may_place_on/maple_sapling.json | 6 -- .../tags/blocks/may_place_on/mini_cactus.json | 6 -- .../may_place_on/nightshade_sapling.json | 6 -- .../blocks/may_place_on/orange_amaranth.json | 6 -- .../may_place_on/orange_birch_sapling.json | 6 -- .../blocks/may_place_on/orange_daisy.json | 6 -- .../may_place_on/orange_oak_sapling.json | 6 -- .../may_place_on/orange_spruce_sapling.json | 6 -- .../blocks/may_place_on/orchard_sapling.json | 6 -- .../tags/blocks/may_place_on/osiria_rose.json | 6 -- .../blocks/may_place_on/palm_sapling.json | 7 -- .../may_place_on/palo_verde_sapling.json | 6 -- .../may_place_on/peach_leather_flower.json | 6 -- .../blocks/may_place_on/pine_sapling.json | 6 -- .../tags/blocks/may_place_on/pink_allium.json | 6 -- .../blocks/may_place_on/pink_allium_bush.json | 6 -- .../blocks/may_place_on/pink_anemone.json | 6 -- .../may_place_on/pink_cherry_sapling.json | 6 -- .../blocks/may_place_on/pink_daffodil.json | 6 -- .../blocks/may_place_on/prairie_grass.json | 6 -- .../may_place_on/prickly_pear_cactus.json | 6 -- .../blocks/may_place_on/protea_flower.json | 6 -- .../blocks/may_place_on/purple_amaranth.json | 6 -- .../may_place_on/purple_bulbis_oddity.json | 15 ---- .../tags/blocks/may_place_on/purple_sage.json | 6 -- .../blocks/may_place_on/purple_tulip.json | 6 -- .../rainbow_eucalyptus_sapling.json | 6 -- .../may_place_on/red_birch_sapling.json | 6 -- .../may_place_on/red_maple_sapling.json | 6 -- .../blocks/may_place_on/red_oak_sapling.json | 6 -- .../may_place_on/red_spruce_sapling.json | 6 -- .../blocks/may_place_on/redwood_sapling.json | 6 -- .../byg/tags/blocks/may_place_on/richea.json | 6 -- .../byg/tags/blocks/may_place_on/rose.json | 6 -- .../blocks/may_place_on/shulkren_fungus.json | 15 ---- .../may_place_on/silver_maple_sapling.json | 6 -- .../may_place_on/silver_vase_flower.json | 6 -- .../blocks/may_place_on/skyris_sapling.json | 6 -- .../tags/blocks/may_place_on/soul_shroom.json | 8 -- .../blocks/may_place_on/sythian_fungus.json | 8 -- .../tags/blocks/may_place_on/tall_allium.json | 6 -- .../blocks/may_place_on/tall_beach_grass.json | 6 -- .../blocks/may_place_on/tall_pink_allium.json | 6 -- .../may_place_on/tall_prairie_grass.json | 6 -- .../blocks/may_place_on/torch_ginger.json | 6 -- .../may_place_on/violet_leather_flower.json | 6 -- .../blocks/may_place_on/weeping_milk_cap.json | 8 -- .../blocks/may_place_on/white_anemone.json | 6 -- .../may_place_on/white_cherry_sapling.json | 6 -- .../tags/blocks/may_place_on/white_sage.json | 6 -- .../blocks/may_place_on/willow_sapling.json | 6 -- .../blocks/may_place_on/winter_succulent.json | 6 -- .../may_place_on/witch_hazel_sapling.json | 6 -- .../may_place_on/withering_oak_sapling.json | 8 -- .../tags/blocks/may_place_on/wood_blewit.json | 8 -- .../may_place_on/yellow_birch_sapling.json | 6 -- .../blocks/may_place_on/yellow_daffodil.json | 6 -- .../may_place_on/yellow_spruce_sapling.json | 6 -- .../blocks/may_place_on/yellow_tulip.json | 6 -- .../blocks/may_place_on/zelkova_sapling.json | 6 -- .../datagen/providers/BYGRecipeProviders.java | 71 +++++++++++++++-- 201 files changed, 1226 insertions(+), 957 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json rename Common/src/{main/resources/data/byg/recipes/aspen_fence.json => generated/resources/data/byg/recipes/wood/aspen/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/aspen_fence_gate.json => generated/resources/data/byg/recipes/wood/aspen/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/aspen_planks.json => generated/resources/data/byg/recipes/wood/aspen/planks.json} (71%) rename Common/src/{main/resources/data/byg/recipes/aspen_pressure_plate.json => generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/aspen_slab.json => generated/resources/data/byg/recipes/wood/aspen/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/aspen_stairs.json => generated/resources/data/byg/recipes/wood/aspen/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/aspen_trapdoor.json => generated/resources/data/byg/recipes/wood/aspen/trapdoor.json} (86%) rename Common/src/{main/resources/data/byg/recipes/aspen_wood.json => generated/resources/data/byg/recipes/wood/aspen/wood.json} (78%) rename Common/src/{main/resources/data/byg/recipes/baobab_fence.json => generated/resources/data/byg/recipes/wood/baobab/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/baobab_fence_gate.json => generated/resources/data/byg/recipes/wood/baobab/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/baobab_planks.json => generated/resources/data/byg/recipes/wood/baobab/planks.json} (71%) rename Common/src/{main/resources/data/byg/recipes/baobab_pressure_plate.json => generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/baobab_slab.json => generated/resources/data/byg/recipes/wood/baobab/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/baobab_stairs.json => generated/resources/data/byg/recipes/wood/baobab/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/baobab_trapdoor.json => generated/resources/data/byg/recipes/wood/baobab/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/baobab_wood.json => generated/resources/data/byg/recipes/wood/baobab/wood.json} (78%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_boat.json => generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json} (86%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_bookshelf.json => generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json} (74%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_button.json => generated/resources/data/byg/recipes/wood/blue_enchanted/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_crafting_table.json => generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json} (76%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_door.json => generated/resources/data/byg/recipes/wood/blue_enchanted/door.json} (84%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_fence.json => generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_fence_gate.json => generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_planks.json => generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_pressure_plate.json => generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_slab.json => generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json} (91%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_stairs.json => generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json} (69%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_trapdoor.json => generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_wood.json => generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json} (79%) delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/end_stone.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/amaranth.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/angelica.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/beach_grass.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/begonia.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/bistort.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/black_rose.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_sage.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/california_poppy.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/clover_patch.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/crocus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/death_cap.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/delphinium.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/embur_wart.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/flower_patch.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/foxglove.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_tulip.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/guzmania.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/horseweed.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/incan_lily.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/iris.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/protea_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_sage.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/richea.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/rose.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_allium.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_anemone.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_sage.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 3413b12675..f1dba36110 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -3,21 +3,79 @@ d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json 1839dad0677af5c73450e0161ca3191bd546b488 data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json db985793fdd315c02ba0d3be4cb1764ac320e387 data/byg/advancements/recipes/byg.byg/wood/aspen/door.json +140ccce47b045be05a55dbeda4e526fc1d40bdab data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json +3dfc28bfe74af2d2aa2f87f61e088ea4543c8cca data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json +5aec7f4029228ff94d8a736aaee8bbd08e08e6f8 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json +0b8a550c52cb3c9e1aa883e77aa32b10f3f07770 data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json +5f42b62b9a96d8eb55d3bf645bafae9de79f6b13 data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json +fa6e7b7f077e8e0a3ffb64c8bb443132b0914c15 data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json +70fe220fa3368bd5be4b984c385e086531920331 data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json +4578f17118ea7f1321b347be2962ad9485e923fb data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json 5ad16716e1d1ef1a264f92a4520d0d4054a6eeff data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json 24fba2b2cbc207d1d51e10d59d7c23f12ad39e76 data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json e7dae4923c93313f898cf8769280740d3d73bb1c data/byg/advancements/recipes/byg.byg/wood/baobab/button.json 753f5b4d4e0fc6318a30581f6c6bf440dd109342 data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json 75f2d1cacb11e14a46fc3d5a84bce3240c72374b data/byg/advancements/recipes/byg.byg/wood/baobab/door.json -ba9970d23f3555577955246bca87be8f6071bdc2 data/byg/recipes/wood/aspen/boat.json -ac5c4dd5c571afcbb078a6f99da8dd878cc1427c data/byg/recipes/wood/aspen/bookshelf.json -e05679f10897a69f8bdbdf08f8369fd717630b00 data/byg/recipes/wood/aspen/button.json -675e989f1a7e69ab0c3c012122be559d8956f829 data/byg/recipes/wood/aspen/crafting_table.json -4e4cc07ab70fdff3c21de66af969c17e72d2a5c4 data/byg/recipes/wood/aspen/door.json -0359be132c17434db804ce87dc3235fc6316ccf4 data/byg/recipes/wood/baobab/boat.json -3e344d7915de08e29c5eb1a7f83d6ad82bfe8a11 data/byg/recipes/wood/baobab/bookshelf.json -e0cc0e3fdf31ac5fc31edb7d79ba8ed60eb71ad9 data/byg/recipes/wood/baobab/button.json -ca98a54f773ff6d262bf7d98b2b8851af4b0fb98 data/byg/recipes/wood/baobab/crafting_table.json -71649648fff33d70dd3130aaa699c11e154402fc data/byg/recipes/wood/baobab/door.json +604447503f3bcddb34d7bc75f728b36adeff3d34 data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json +f65bf801cc20711aae25ae606741fc1bf04fb445 data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json +3fb7ed6745b1f72995eaeb8d0b6b8d0a54029511 data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json +8684aace48a2f8c53dbecac0c70f37d66465e5f6 data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json +833619c47c131b4c72c1b6a56796c451f9c2bff0 data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json +19f58aad206582307b90f8db9784d80d40460e8d data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json +f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json +411e9c381fb8e2579819235c97e1fd3a1c5db11c data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json +167a2d9e7d9e7d03bbaf134d2232041fff87c5c1 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json +4cba0fd6e01f2950893d295aac62b622be78db50 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json +326b441cb19dae1bc6eb232360a665a527cec5e1 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json +0f43b9d796576822349412901689d96377d59bce data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json +6b51d098d8c6dab3f716dd8528e672f5f3a5c705 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json +733a5386f7b07d7834fb3d790fddf2f3758ca9ba data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json +23fe49cffbed25aa69be0ff760d983f067af2b65 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json +3b812b017c3126adfd258295ea7f46b3c2891b81 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json +6864e4a80e3e28f2edc0ed5e6f133110d4364113 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json +513a7028ba639f101216ceac8786ea58647b0ab5 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json +71ae592506dbd4598b54f717a182268035d3c0b2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json +59dd8ff337e24b31e917ab5405e8692c452b47b4 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json +227b8abe2f2bb7f03de82bdab4f84272a39f2fd2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json +a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json +e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json +a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json +b1ea352ac9d826d92c548d06df8cc71883325219 data/byg/recipes/wood/aspen/crafting_table.json +2e074f27da76623d60b4818fc91da6d6a25631f7 data/byg/recipes/wood/aspen/door.json +73c58c2e232229cdcd4a9660b569b4e514a6ba8a data/byg/recipes/wood/aspen/fence.json +073ac10577cb1c49ec9da3abfae7447afbd15fe8 data/byg/recipes/wood/aspen/fence_gate.json +a014243a472b2cc4ca484f5810ca7db7416f35ae data/byg/recipes/wood/aspen/planks.json +27ba6f01a336d971e5ec751bb64a2f635a434be5 data/byg/recipes/wood/aspen/pressure_plate.json +d7a1d70300005e933b50adb1acbec3a589a06297 data/byg/recipes/wood/aspen/slab.json +56f6741a5d527c2e790acfc0e0d2efa4420f9e3a data/byg/recipes/wood/aspen/stairs.json +015b0b00f19a550e60dadb8f9cda438a1ffaa221 data/byg/recipes/wood/aspen/trapdoor.json +d28c218f0f9f6c078619e2c26fe3e1835d980a9f data/byg/recipes/wood/aspen/wood.json +066abc9fd5ad44d4c5ec7d5fcb03f45953721e68 data/byg/recipes/wood/baobab/boat.json +3fe41d699430df2902edda4ce47e03d335be5524 data/byg/recipes/wood/baobab/bookshelf.json +7ad9aad06477fbad1d33dd07449f84cde3ef823d data/byg/recipes/wood/baobab/button.json +5dfab2c004a0a1797e83719081cd2b2c5580297a data/byg/recipes/wood/baobab/crafting_table.json +cc8efc86e9d25b5eb2c56073eca38423f7065d93 data/byg/recipes/wood/baobab/door.json +c26a6df862df265f1b5a76c1667373333febed1b data/byg/recipes/wood/baobab/fence.json +bc4ac59bbeb4d07f1340a59ea1f8f531bb1e8d9d data/byg/recipes/wood/baobab/fence_gate.json +b3af2ba0024d72f3fb5451eaf053917753b7d6fd data/byg/recipes/wood/baobab/planks.json +e9ea4c56af7c08592ab33701533d2fbb2f07e472 data/byg/recipes/wood/baobab/pressure_plate.json +0ca12512f00f62c144a4a1ea75110f1fa3a11ceb data/byg/recipes/wood/baobab/slab.json +634e1ee6eaaf1cd7a38f716e566ab3c763971f79 data/byg/recipes/wood/baobab/stairs.json +718313d55269a53b0a11200c07dcb028999d9731 data/byg/recipes/wood/baobab/trapdoor.json +ca005e9857765dac441a953c7d283888c48f342c data/byg/recipes/wood/baobab/wood.json +cdcea7dcf02fcac9f38cdebf4fbe3e1373674e0a data/byg/recipes/wood/blue_enchanted/boat.json +17affff67278f8b968f65cfc7e46d4fd870746a7 data/byg/recipes/wood/blue_enchanted/bookshelf.json +052228530563a6e5e40e4ca9c599e3c5b6b2e7f1 data/byg/recipes/wood/blue_enchanted/button.json +2dd0aff848fe2e5065fe8a8ef589269afb318064 data/byg/recipes/wood/blue_enchanted/crafting_table.json +3a591e628e2cc31995ec4fdb9fdb5088c1fc7e9b data/byg/recipes/wood/blue_enchanted/door.json +e7eeb1cc90892dcb31cf3b5c918ad5549acb3984 data/byg/recipes/wood/blue_enchanted/fence.json +d564fa63efed912a6941d291c5a499b39854307b data/byg/recipes/wood/blue_enchanted/fence_gate.json +f265b801f8ebdea3cd4fbf33891cac5f1ea2fc80 data/byg/recipes/wood/blue_enchanted/planks.json +787b857d14904563c701ac265b71f171f410845f data/byg/recipes/wood/blue_enchanted/pressure_plate.json +a31ee3423b1b94f5f0f725bbaa1bd475af2529a6 data/byg/recipes/wood/blue_enchanted/slab.json +642a4cdb86732d1bd0df8e77fbc158ea0b747a4c data/byg/recipes/wood/blue_enchanted/stairs.json +6288b691a45bfb216bb823d8e2f4ce9b71a01775 data/byg/recipes/wood/blue_enchanted/trapdoor.json +d936c12c34602c7d2a6305d50f8ff2dddb402a4d data/byg/recipes/wood/blue_enchanted/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json new file mode 100644 index 0000000000..8b0897dbc8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json new file mode 100644 index 0000000000..1f652c10ec --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json new file mode 100644 index 0000000000..7d1125b4eb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json new file mode 100644 index 0000000000..bf4ca11ccf --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json new file mode 100644 index 0000000000..cfad18d6ce --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json new file mode 100644 index 0000000000..8d695ccbb2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json new file mode 100644 index 0000000000..22f0a7a7b1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json new file mode 100644 index 0000000000..7cb7ea5bc1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json new file mode 100644 index 0000000000..84f3ddd3a2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json new file mode 100644 index 0000000000..adb364fefa --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json new file mode 100644 index 0000000000..498ca2ef4c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json new file mode 100644 index 0000000000..ddda347171 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json new file mode 100644 index 0000000000..168f0a3671 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json new file mode 100644 index 0000000000..bf06695012 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json new file mode 100644 index 0000000000..d35cb9092b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json new file mode 100644 index 0000000000..707b4fa7b6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json new file mode 100644 index 0000000000..d620cff016 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json new file mode 100644 index 0000000000..8f385f0b5f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json new file mode 100644 index 0000000000..3608f1bd26 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json new file mode 100644 index 0000000000..9a4198feae --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json new file mode 100644 index 0000000000..4e8ad9195b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json new file mode 100644 index 0000000000..12d803f8a5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json new file mode 100644 index 0000000000..2846fdeb25 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json new file mode 100644 index 0000000000..9b4566fd3c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json new file mode 100644 index 0000000000..957c08eabb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json new file mode 100644 index 0000000000..8717d319ab --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json new file mode 100644 index 0000000000..e6549a1233 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json new file mode 100644 index 0000000000..84d20bc753 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json new file mode 100644 index 0000000000..c892500c65 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json index 701961abb6..c8482a6dff 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "boat", "pattern": [ "P P", "PPP" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json index 5b75c48daa..4dd3aefa7c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ "PPP", "BBB", diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json index 265ed3fca2..000b885256 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "group": "wooden_button", "ingredients": [ { "item": "byg:aspen_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json index 4715f64d08..2a66e488a1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ "PP", "PP" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json index 7b625d859b..2ff545214b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "wooden_door", "pattern": [ "PP", "PP", diff --git a/Common/src/main/resources/data/byg/recipes/aspen_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/aspen_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/aspen_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/aspen_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/aspen_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json similarity index 71% rename from Common/src/main/resources/data/byg/recipes/aspen_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json index 8093a29a83..2990caacd9 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:aspen_logs" + "item": "byg:aspen_log" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/aspen_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/aspen_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json index 8d555a8905..0c0100ab68 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/aspen_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json index 67676d103d..3c962628bd 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/aspen_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json index 27642a1e66..abdc889abc 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, "result": { - "item": "byg:aspen_stairs", + "item": "byg:aspen_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/aspen_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/aspen_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json index 8c4498432b..b5755b1ca9 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/aspen_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/aspen_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json index 4f7eb93e5d..ff2cf613e6 100644 --- a/Common/src/main/resources/data/byg/recipes/aspen_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:aspen_log" } }, diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json index 01f57128bb..45a88ad27a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "boat", "pattern": [ "P P", "PPP" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json index 368ad4f7e5..a73c2b3886 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ "PPP", "BBB", diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json index ff854e3b18..b25b3dd1a4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/button.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "group": "wooden_button", "ingredients": [ { "item": "byg:baobab_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json index 915c02f209..7799bd1dfd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ "PP", "PP" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json index af0a73b820..f88d15219c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shaped", + "group": "wooden_door", "pattern": [ "PP", "PP", diff --git a/Common/src/main/resources/data/byg/recipes/baobab_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/baobab_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/baobab_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/baobab_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/baobab_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json similarity index 71% rename from Common/src/main/resources/data/byg/recipes/baobab_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json index 6202773797..44a13d677b 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:baobab_logs" + "item": "byg:baobab_log" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/baobab_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/baobab_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json index 4b09f092dc..81420d5bf7 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/baobab_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json index 4f480aa31d..0fbfe71e03 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/baobab_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json index 26a47156a2..f16d3756d9 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, "result": { - "item": "byg:baobab_stairs", + "item": "byg:baobab_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/baobab_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/baobab_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json index e89b78337d..3b1f452d8e 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/baobab_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/baobab_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json index 7a9ce42a06..642b1d66fc 100644 --- a/Common/src/main/resources/data/byg/recipes/baobab_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:baobab_log" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json index a0c2910568..6b32da2ff6 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json index f49cc69351..b8e82cef31 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_button.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/button.json diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json similarity index 76% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json index c1818a082a..6d1590d86e 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_door.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json index c005ed4450..829f4c0690 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json index c5c6dbc126..cd927d2fae 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:blue_enchanted_logs" + "item": "byg:blue_enchanted_log" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json index 2d2c26fd64..d05a035e71 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json index b32ce2401f..af456fe399 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json index 7ef9753196..982da5af42 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, "result": { - "item": "byg:blue_enchanted_stairs", + "item": "byg:blue_enchanted_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json index 6e942fb461..42076ffe8c 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json similarity index 79% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json index 080429c685..6f15833f95 100644 --- a/Common/src/main/resources/data/byg/recipes/blue_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:blue_enchanted_log" } }, diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index bd1ccb4424..ad77732762 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -137,7 +137,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.BLUE_ENCHANTED_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CHERRY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_DOOR.get(), RenderType.cutoutMipped()); @@ -166,7 +165,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.BLUE_ENCHANTED_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CHERRY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -206,7 +204,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Saplings - map.put(BYGBlocks.BLUE_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BLUE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_OAK_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 74f474086e..bbe76102d7 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -21,7 +21,6 @@ public static void compostablesBYG() { //Leaves compostibleBlocks(0.3f, BYGItems.BLOOMING_WITCH_HAZEL_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.BLUE_ENCHANTED_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_LEAVES.get()); @@ -69,7 +68,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.FIRECRACKER_LEAVES.get()); //Saplings - compostibleBlocks(0.3f, BYGItems.BLUE_ENCHANTED_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 47c25ea2ff..1c25a4c779 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -31,7 +31,6 @@ public static void flammablesBYG() { } //Logs - flammableBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_LOG.get(), 5, 5); @@ -52,7 +51,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_BLUE_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_LOG.get(), 5, 5); @@ -73,7 +71,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.BLUE_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_WOOD.get(), 5, 5); @@ -94,7 +91,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_BLUE_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_WOOD.get(), 5, 5); @@ -115,7 +111,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.BLUE_ENCHANTED_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_BOOKSHELF.get(), 5, 20); @@ -137,7 +132,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.BLUE_ENCHANTED_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_SLAB.get(), 5, 20); @@ -159,7 +153,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.BLUE_ENCHANTED_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_STAIRS.get(), 5, 20); @@ -181,7 +174,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.BLUE_ENCHANTED_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_PLANKS.get(), 5, 20); @@ -203,7 +195,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.BLUE_ENCHANTED_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CHERRY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_FENCE.get(), 5, 20); @@ -226,7 +217,6 @@ public static void flammablesBYG() { //Leaves flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_OAK_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 5d0c467eef..906d2135a2 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,7 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.BLUE_ENCHANTED_LOG.get(), BYGBlocks.STRIPPED_BLUE_ENCHANTED_LOG.get()); stripables.put(BYGBlocks.CHERRY_LOG.get(), BYGBlocks.STRIPPED_CHERRY_LOG.get()); stripables.put(BYGBlocks.CIKA_LOG.get(), BYGBlocks.STRIPPED_CIKA_LOG.get()); stripables.put(BYGBlocks.CYPRESS_LOG.get(), BYGBlocks.STRIPPED_CYPRESS_LOG.get()); @@ -52,7 +51,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.BLUE_ENCHANTED_WOOD.get(), BYGBlocks.STRIPPED_BLUE_ENCHANTED_WOOD.get()); stripables.put(BYGBlocks.CHERRY_WOOD.get(), BYGBlocks.STRIPPED_CHERRY_WOOD.get()); stripables.put(BYGBlocks.CIKA_WOOD.get(), BYGBlocks.STRIPPED_CIKA_WOOD.get()); stripables.put(BYGBlocks.CYPRESS_WOOD.get(), BYGBlocks.STRIPPED_CYPRESS_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 81b3d99b3d..ac5ce1997f 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject BLUE_ENCHANTED_PLANKS = createPlanks("blue_enchanted_planks"); public static final BlockRegistryObject CHERRY_PLANKS = createPlanks("cherry_planks"); public static final BlockRegistryObject CIKA_PLANKS = createPlanks("cika_planks"); public static final BlockRegistryObject CYPRESS_PLANKS = createPlanks("cypress_planks"); @@ -90,7 +89,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject BLUE_ENCHANTED_BOOKSHELF = createBookshelf("blue_enchanted_bookshelf"); public static final BlockRegistryObject CHERRY_BOOKSHELF = createBookshelf("cherry_bookshelf"); public static final BlockRegistryObject CIKA_BOOKSHELF = createBookshelf("cika_bookshelf"); public static final BlockRegistryObject CYPRESS_BOOKSHELF = createBookshelf("cypress_bookshelf"); @@ -118,7 +116,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject BLUE_ENCHANTED_DOOR = createDoor("blue_enchanted_door"); public static final BlockRegistryObject CHERRY_DOOR = createDoor("cherry_door"); public static final BlockRegistryObject CIKA_DOOR = createDoor("cika_door"); public static final BlockRegistryObject CYPRESS_DOOR = createDoor("cypress_door"); @@ -146,7 +143,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject BLUE_ENCHANTED_PRESSURE_PLATE = createWoodPressurePlate("blue_enchanted_pressure_plate"); public static final BlockRegistryObject CHERRY_PRESSURE_PLATE = createWoodPressurePlate("cherry_pressure_plate"); public static final BlockRegistryObject CIKA_PRESSURE_PLATE = createWoodPressurePlate("cika_pressure_plate"); public static final BlockRegistryObject CYPRESS_PRESSURE_PLATE = createWoodPressurePlate("cypress_pressure_plate"); @@ -174,7 +170,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject BLUE_ENCHANTED_BUTTON = createWoodButton("blue_enchanted_button"); public static final BlockRegistryObject CHERRY_BUTTON = createWoodButton("cherry_button"); public static final BlockRegistryObject CIKA_BUTTON = createWoodButton("cika_button"); public static final BlockRegistryObject CYPRESS_BUTTON = createWoodButton("cypress_button"); @@ -202,7 +197,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject BLUE_ENCHANTED_TRAPDOOR = createTrapDoor("blue_enchanted_trapdoor"); public static final BlockRegistryObject CHERRY_TRAPDOOR = createTrapDoor("cherry_trapdoor"); public static final BlockRegistryObject CIKA_TRAPDOOR = createTrapDoor("cika_trapdoor"); public static final BlockRegistryObject CYPRESS_TRAPDOOR = createTrapDoor("cypress_trapdoor"); @@ -230,7 +224,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject BLUE_ENCHANTED_CRAFTING_TABLE = createCraftingTable("blue_enchanted_crafting_table"); public static final BlockRegistryObject CHERRY_CRAFTING_TABLE = createCraftingTable("cherry_crafting_table"); public static final BlockRegistryObject CIKA_CRAFTING_TABLE = createCraftingTable("cika_crafting_table"); public static final BlockRegistryObject CYPRESS_CRAFTING_TABLE = createCraftingTable("cypress_crafting_table"); @@ -258,7 +251,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject BLUE_ENCHANTED_FENCE_GATE = createFenceGate("blue_enchanted_fence_gate"); public static final BlockRegistryObject CHERRY_FENCE_GATE = createFenceGate("cherry_fence_gate"); public static final BlockRegistryObject CIKA_FENCE_GATE = createFenceGate("cika_fence_gate"); public static final BlockRegistryObject CYPRESS_FENCE_GATE = createFenceGate("cypress_fence_gate"); @@ -286,7 +278,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject BLUE_ENCHANTED_SLAB = createWoodSlab("blue_enchanted_slab"); public static final BlockRegistryObject CHERRY_SLAB = createWoodSlab("cherry_slab"); public static final BlockRegistryObject CIKA_SLAB = createWoodSlab("cika_slab"); public static final BlockRegistryObject CYPRESS_SLAB = createWoodSlab("cypress_slab"); @@ -314,7 +305,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject BLUE_ENCHANTED_STAIRS = createWoodStairs("blue_enchanted_stairs"); public static final BlockRegistryObject CHERRY_STAIRS = createWoodStairs("cherry_stairs"); public static final BlockRegistryObject CIKA_STAIRS = createWoodStairs("cika_stairs"); public static final BlockRegistryObject CYPRESS_STAIRS = createWoodStairs("cypress_stairs"); @@ -342,7 +332,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject BLUE_ENCHANTED_FENCE = createFence("blue_enchanted_fence"); public static final BlockRegistryObject CHERRY_FENCE = createFence("cherry_fence"); public static final BlockRegistryObject CIKA_FENCE = createFence("cika_fence"); public static final BlockRegistryObject CYPRESS_FENCE = createFence("cypress_fence"); @@ -370,7 +359,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject BLUE_ENCHANTED_SIGN = createSign("blue_enchanted_sign", BYGWoodType.BLUE_ENCHANTED, BLUE_ENCHANTED_PLANKS); public static final BlockRegistryObject CHERRY_SIGN = createSign("cherry_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_SIGN = createSign("cika_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_SIGN = createSign("cypress_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); @@ -398,7 +386,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject BLUE_ENCHANTED_WALL_SIGN = createWallSign("blue_enchanted_wall_sign", BYGWoodType.BLUE_ENCHANTED, BLUE_ENCHANTED_PLANKS); public static final BlockRegistryObject CHERRY_WALL_SIGN = createWallSign("cherry_wall_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_WALL_SIGN = createWallSign("cika_wall_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_WALL_SIGN = createWallSign("cypress_wall_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); @@ -438,7 +425,6 @@ public class BYGBlocks { public static final BlockRegistryObject MUD_BRICKS = createDirt("mud_bricks"); public static final BlockRegistryObject ARAUCARIA_SAPLING = createSapling(BYGBlockTags.GROUND_ARAUCARIA_SAPLING, "araucaria_sapling"); - public static final BlockRegistryObject BLUE_ENCHANTED_SAPLING = createSapling(BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, "blue_enchanted_sapling"); public static final BlockRegistryObject BLUE_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_BLUE_SPRUCE_SAPLING, "blue_spruce_sapling"); public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); @@ -493,7 +479,6 @@ public class BYGBlocks { public static final BlockRegistryObject ARAUCARIA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "araucaria_leaves"); public static final BlockRegistryObject BLOOMING_WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "blooming_witch_hazel_leaves"); - public static final BlockRegistryObject BLUE_ENCHANTED_LEAVES = createGlowingLeaves(MaterialColor.COLOR_BLUE, 15, "blue_enchanted_leaves"); public static final BlockRegistryObject BLUE_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_BLUE, "blue_spruce_leaves"); public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); @@ -827,7 +812,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject BLUE_ENCHANTED_LOG = createLog("blue_enchanted_log"); public static final BlockRegistryObject CHERRY_LOG = createLog("cherry_log"); public static final BlockRegistryObject CIKA_LOG = createLog("cika_log"); public static final BlockRegistryObject CYPRESS_LOG = createLog("cypress_log"); @@ -860,7 +844,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject BLUE_ENCHANTED_WOOD = createWood("blue_enchanted_wood"); public static final BlockRegistryObject CHERRY_WOOD = createWood("cherry_wood"); public static final BlockRegistryObject CIKA_WOOD = createWood("cika_wood"); public static final BlockRegistryObject CYPRESS_WOOD = createWood("cypress_wood"); @@ -1018,7 +1001,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_BLUE_ENCHANTED_LOG = createStrippedLog("stripped_blue_enchanted_log"); public static final BlockRegistryObject STRIPPED_CHERRY_LOG = createStrippedLog("stripped_cherry_log"); public static final BlockRegistryObject STRIPPED_CIKA_LOG = createStrippedLog("stripped_cika_log"); public static final BlockRegistryObject STRIPPED_CYPRESS_LOG = createStrippedLog("stripped_cypress_log"); @@ -1046,7 +1028,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_BLUE_ENCHANTED_WOOD = createWood("stripped_blue_enchanted_wood"); public static final BlockRegistryObject STRIPPED_CHERRY_WOOD = createWood("stripped_cherry_wood"); public static final BlockRegistryObject STRIPPED_CIKA_WOOD = createWood("stripped_cika_wood"); public static final BlockRegistryObject STRIPPED_CYPRESS_WOOD = createWood("stripped_cypress_wood"); @@ -1740,7 +1721,7 @@ static BlockRegistryObject createLeaves(MaterialColor color, String id) { return createBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of(Material.LEAVES, color).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isViewBlocking((state, world, pos) -> false).isSuffocating((state, world, pos) -> false)), id); } - private static BlockRegistryObject createGlowingLeaves(MaterialColor color, int lightLevel, String id) { + static BlockRegistryObject createGlowingLeaves(MaterialColor color, int lightLevel, String id) { return createBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of(Material.LEAVES, color).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isViewBlocking((state, world, pos) -> false).isSuffocating((state, world, pos) -> false).lightLevel((state) -> lightLevel)), id); } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 83c5513f86..61e73812ce 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -18,16 +18,21 @@ import potionstudios.byg.reg.BlockRegistryObject; import potionstudios.byg.reg.RegistryObject; +import javax.annotation.Nullable; + @MethodsReturnNonnullByDefault public enum BYGWoodTypes { ASPEN("aspen", BYGBlockTags.GROUND_ASPEN_SAPLING, MaterialColor.TERRACOTTA_YELLOW, BYGBoatEntity.BYGType.ASPEN), - BAOBAB("baobab", BYGBlockTags.GROUND_BAOBAB_SAPLING, MaterialColor.TERRACOTTA_GREEN, BYGBoatEntity.BYGType.BAOBAB); + BAOBAB("baobab", BYGBlockTags.GROUND_BAOBAB_SAPLING, MaterialColor.TERRACOTTA_GREEN, BYGBoatEntity.BYGType.BAOBAB), + BLUE_ENCHANTED("blue_enchanted", BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, MaterialColor.COLOR_BLUE, BYGBoatEntity.BYGType.BLUE_ENCHANTED); private final String name; private final WoodType woodType; private final TagKey saplingGroundTag; private final MaterialColor materialColor; private final BYGBoatEntity.BYGType boatType; + @Nullable + private final Integer leavesLightLevel; private boolean initialized; private BlockRegistryObject sapling; @@ -60,11 +65,16 @@ public enum BYGWoodTypes { private RegistryObject boat; BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, BYGBoatEntity.BYGType boatType) { + this(name, saplingGroundTag, materialColor, boatType, null); + } + + BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, BYGBoatEntity.BYGType boatType, @Nullable Integer leavesLightLevel) { this.name = name; this.saplingGroundTag = saplingGroundTag; this.materialColor = materialColor; this.boatType = boatType; this.woodType = BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(name).toString().replace(":", "/"))) : null; + this.leavesLightLevel = leavesLightLevel; } public void init() { @@ -72,7 +82,7 @@ public void init() { return; this.sapling = BYGBlocks.createSapling(saplingGroundTag, name + "_sapling"); BYGItems.createSaplingItem(sapling); - this.leaves = BYGBlocks.createLeaves(materialColor, name + "leaves"); + this.leaves = leavesLightLevel == null ? BYGBlocks.createLeaves(materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(materialColor, leavesLightLevel, name + "_leaves"); BYGItems.createItem(leaves); this.log = BYGBlocks.createLog(name + "_log"); @@ -110,7 +120,6 @@ public void init() { this.button = BYGBlocks.createWoodButton(name + "_button"); BYGItems.createItem(button); - // TODO fix type this.sign = BYGBlocks.createSign(name + "_sign", woodType, planks); this.wallSign = BYGBlocks.createWallSign(name + "_wall_sign", woodType, planks); this.signItem = BYGItems.createSign(name + "_sign", sign, wallSign); diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index bf8abf6e7c..35e860646e 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -50,7 +50,7 @@ public Item getDropItem() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.boat().get(); case BAOBAB -> BYGWoodTypes.BAOBAB.boat().get(); - case BLUE_ENCHANTED -> BYGItems.BLUE_ENCHANTED_BOAT.get(); + case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.boat().get(); case CHERRY -> BYGItems.CHERRY_BOAT.get(); case CIKA -> BYGItems.CIKA_BOAT.get(); case CYPRESS -> BYGItems.CYPRESS_BOAT.get(); @@ -77,7 +77,7 @@ public Block getPlanks() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.planks().get(); case BAOBAB -> BYGWoodTypes.BAOBAB.planks().get(); - case BLUE_ENCHANTED -> BYGBlocks.BLUE_ENCHANTED_PLANKS.get(); + case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.planks().get(); case CHERRY -> BYGBlocks.CHERRY_PLANKS.get(); case CIKA -> BYGBlocks.CIKA_PLANKS.get(); case CYPRESS -> BYGBlocks.CYPRESS_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 811074fdbb..8529c4d9fc 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -250,28 +250,9 @@ public class BYGItems { BAOBAB_FRUIT = createItem(() -> new BaobabFruitItem(BYGBlocks.BAOBAB_FRUIT_BLOCK.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(3).saturationMod(0.5f).alwaysEat().build())), "baobab_fruit"); BYGWoodTypes.BAOBAB.init(); - } - //Blue Enchanted Woodtype - public static final RegistryObject BLUE_ENCHANTED_SAPLING = createSaplingItem(BYGBlocks.BLUE_ENCHANTED_SAPLING); - public static final RegistryObject BLUE_ENCHANTED_LEAVES = createItem(BYGBlocks.BLUE_ENCHANTED_LEAVES); - public static final RegistryObject BLUE_ENCHANTED_LOG = createItem(BYGBlocks.BLUE_ENCHANTED_LOG); - public static final RegistryObject BLUE_ENCHANTED_WOOD = createItem(BYGBlocks.BLUE_ENCHANTED_WOOD); - public static final RegistryObject STRIPPED_BLUE_ENCHANTED_LOG = createItem(BYGBlocks.STRIPPED_BLUE_ENCHANTED_LOG); - public static final RegistryObject STRIPPED_BLUE_ENCHANTED_WOOD = createItem(BYGBlocks.STRIPPED_BLUE_ENCHANTED_WOOD); - public static final RegistryObject BLUE_ENCHANTED_PLANKS = createItem(BYGBlocks.BLUE_ENCHANTED_PLANKS); - public static final RegistryObject BLUE_ENCHANTED_BOOKSHELF = createItem(BYGBlocks.BLUE_ENCHANTED_BOOKSHELF); - public static final RegistryObject BLUE_ENCHANTED_CRAFTING_TABLE = createItem(BYGBlocks.BLUE_ENCHANTED_CRAFTING_TABLE); - public static final RegistryObject BLUE_ENCHANTED_STAIRS = createItem(BYGBlocks.BLUE_ENCHANTED_STAIRS); - public static final RegistryObject BLUE_ENCHANTED_SLAB = createItem(BYGBlocks.BLUE_ENCHANTED_SLAB); - public static final RegistryObject BLUE_ENCHANTED_FENCE = createItem(BYGBlocks.BLUE_ENCHANTED_FENCE); - public static final RegistryObject BLUE_ENCHANTED_FENCE_GATE = createItem(BYGBlocks.BLUE_ENCHANTED_FENCE_GATE); - public static final RegistryObject BLUE_ENCHANTED_DOOR = createItem(BYGBlocks.BLUE_ENCHANTED_DOOR); - public static final RegistryObject BLUE_ENCHANTED_TRAPDOOR = createItem(BYGBlocks.BLUE_ENCHANTED_TRAPDOOR); - public static final RegistryObject BLUE_ENCHANTED_PRESSURE_PLATE = createItem(BYGBlocks.BLUE_ENCHANTED_PRESSURE_PLATE); - public static final RegistryObject BLUE_ENCHANTED_BUTTON = createItem(BYGBlocks.BLUE_ENCHANTED_BUTTON); - public static final RegistryObject BLUE_ENCHANTED_SIGN = createSign("blue_enchanted_sign", BYGBlocks.BLUE_ENCHANTED_SIGN, BYGBlocks.BLUE_ENCHANTED_WALL_SIGN); - public static final RegistryObject BLUE_ENCHANTED_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.BLUE_ENCHANTED, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "blue_enchanted_boat"); + BYGWoodTypes.BLUE_ENCHANTED.init(); + } //Bulbis Woodtype public static final RegistryObject PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 3daff75cef..35df76d78c 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -752,8 +752,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> ENCHANTED_BLUE_TREE1 = createConfiguredFeature("blue_enchanted_tree1", BYGFeatures.ENCHANTED_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get()) + .setTrunkBlock(BLUE_ENCHANTED.log().get()) + .setLeavesBlock(BLUE_ENCHANTED.leaves().get()) .setMaxHeight(18) .setMinHeight(13) .build() @@ -761,8 +761,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> ENCHANTED_BLUE_TREE2 = createConfiguredFeature("blue_enchanted_tree2", BYGFeatures.ENCHANTED_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get()) + .setTrunkBlock(BLUE_ENCHANTED.log().get()) + .setLeavesBlock(BLUE_ENCHANTED.leaves().get()) .setMaxHeight(26) .setMinHeight(19) .build() @@ -770,8 +770,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> ENCHANTED_BLUE_TREE3 = createConfiguredFeature("blue_enchanted_tree3", BYGFeatures.ENCHANTED_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get()) + .setTrunkBlock(BLUE_ENCHANTED.log().get()) + .setLeavesBlock(BLUE_ENCHANTED.leaves().get()) .setMaxHeight(15) .setMinHeight(9) .build() @@ -804,8 +804,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> ENCHANTED_BLUE_GROVE_TREE1 = createConfiguredFeature("blue_enchanted_grove_tree1", BYGFeatures.ENCHANTED_GROVE_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.BLUE_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.BLUE_ENCHANTED_LEAVES.get()) + .setTrunkBlock(BLUE_ENCHANTED.log().get()) + .setLeavesBlock(BLUE_ENCHANTED.leaves().get()) .setMaxHeight(15) .setMinHeight(9) .build() diff --git a/Common/src/main/resources/data/byg/tags/blocks/end_stone.json b/Common/src/main/resources/data/byg/tags/blocks/end_stone.json deleted file mode 100644 index 064f2d1eb2..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/end_stone.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:bulbis_phycelium", - "byg:ether_stone", - "byg:imparius_phylium", - "byg:ivis_phylium", - "byg:nightshade_phylium", - "byg:shulkren_phylium", - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/amaranth.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/amaranth.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/amaranth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/angelica.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/angelica.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/angelica.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/beach_grass.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/beach_grass.json deleted file mode 100644 index 3eb4811f63..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/beach_grass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/begonia.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/begonia.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/begonia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bistort.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bistort.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bistort.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/black_rose.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/black_rose.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/black_rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_sage.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_sage.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_sage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json deleted file mode 100644 index 761a921370..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:end_stone", - { - "id": "#c:end_stones", - "required": false - }, - { - "id": "#forge:end_stones", - "required": false - }, - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/california_poppy.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/california_poppy.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/california_poppy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/clover_patch.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/clover_patch.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/clover_patch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/crocus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/crocus.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/crocus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/death_cap.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/death_cap.json deleted file mode 100644 index 2dc3d3d493..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/death_cap.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:nylium", - "minecraft:mycelium", - "minecraft:soul_soil" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/delphinium.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/delphinium.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/delphinium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/embur_wart.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/embur_wart.json deleted file mode 100644 index 2dc3d3d493..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/embur_wart.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:nylium", - "minecraft:mycelium", - "minecraft:soul_soil" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json deleted file mode 100644 index 963c874b02..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt", - "#minecraft:logs" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flower_patch.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flower_patch.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flower_patch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/foxglove.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/foxglove.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/foxglove.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json deleted file mode 100644 index 761a921370..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:end_stone", - { - "id": "#c:end_stones", - "required": false - }, - { - "id": "#forge:end_stones", - "required": false - }, - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json deleted file mode 100644 index 3eb4811f63..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json deleted file mode 100644 index cf820055e9..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:base_stone_overworld", - "#minecraft:dirt", - "#minecraft:mushroom_grow_block" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_tulip.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_tulip.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/green_tulip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/guzmania.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/guzmania.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/guzmania.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/horseweed.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/horseweed.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/horseweed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json deleted file mode 100644 index 761a921370..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:end_stone", - { - "id": "#c:end_stones", - "required": false - }, - { - "id": "#forge:end_stones", - "required": false - }, - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/incan_lily.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/incan_lily.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/incan_lily.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/iris.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/iris.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/iris.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json deleted file mode 100644 index 8267be7dcd..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt", - "#minecraft:sand", - "#minecraft:sand", - "byg:mud_block", - "minecraft:clay" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json deleted file mode 100644 index 3eb4811f63..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json deleted file mode 100644 index b0380bf71b..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt", - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json deleted file mode 100644 index 3eb4811f63..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/protea_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/protea_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/protea_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json deleted file mode 100644 index 761a921370..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:end_stone", - { - "id": "#c:end_stones", - "required": false - }, - { - "id": "#forge:end_stones", - "required": false - }, - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_sage.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_sage.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_sage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/richea.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/richea.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/richea.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rose.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rose.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json deleted file mode 100644 index 761a921370..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:end_stone", - { - "id": "#c:end_stones", - "required": false - }, - { - "id": "#forge:end_stones", - "required": false - }, - "minecraft:end_stone" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json deleted file mode 100644 index 2dc3d3d493..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:nylium", - "minecraft:mycelium", - "minecraft:soul_soil" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json deleted file mode 100644 index 2dc3d3d493..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:nylium", - "minecraft:mycelium", - "minecraft:soul_soil" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_allium.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_allium.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_allium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json deleted file mode 100644 index 3eb4811f63..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json deleted file mode 100644 index cf820055e9..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:base_stone_overworld", - "#minecraft:dirt", - "#minecraft:mushroom_grow_block" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_anemone.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_anemone.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_anemone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_sage.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_sage.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/white_sage.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json deleted file mode 100644 index 2dc3d3d493..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:nylium", - "minecraft:mycelium", - "minecraft:soul_soil" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json deleted file mode 100644 index cf820055e9..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:base_stone_overworld", - "#minecraft:dirt", - "#minecraft:mushroom_grow_block" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json b/Common/src/main/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json deleted file mode 100644 index cb2c7cab6d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:dirt" - ] -} \ No newline at end of file diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 9db3547b08..3d6312ae06 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -20,6 +20,7 @@ public BYGRecipeProviders(DataGenerator pGenerator) { protected void buildCraftingRecipes(Consumer consumer) { for (BYGWoodTypes type : BYGWoodTypes.values()) { ShapedRecipeBuilder.shaped(type.door().get(), 3) + .group("wooden_door") .pattern("PP") .pattern("PP") .pattern("PP") @@ -27,12 +28,14 @@ protected void buildCraftingRecipes(Consumer consumer) { .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/door")); ShapedRecipeBuilder.shaped(type.boat().get()) + .group("boat") .pattern("P P") .pattern("PPP") .define('P', type.planks().get()) .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/boat")); ShapedRecipeBuilder.shaped(type.bookshelf().get()) + .group("bookshelf") .pattern("PPP") .pattern("BBB") .pattern("PPP") @@ -41,15 +44,73 @@ protected void buildCraftingRecipes(Consumer consumer) { .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/bookshelf")); ShapelessRecipeBuilder.shapeless(type.button().get()) + .group("wooden_button") .requires(type.planks().get()) .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/button")); ShapedRecipeBuilder.shaped(type.craftingTable()) - .pattern("PP") - .pattern("PP") - .define('P', type.planks().get()) - .unlockedBy("has_planks", has(type.planks())) - .save(consumer, BYG.createLocation("wood/" + type + "/crafting_table")); + .group("crafting_table") + .pattern("PP") + .pattern("PP") + .define('P', type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/crafting_table")); + ShapedRecipeBuilder.shaped(type.fence(), 3) + .group("wooden_fence") + .pattern("W#W") + .pattern("W#W") + .define('#', Items.STICK) // TODO this should be a tag + .define('W', type.planks()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/fence")); + ShapedRecipeBuilder.shaped(type.fenceGate()) + .group("wooden_fence_gate") + .pattern("#W#") + .pattern("#W#") + .unlockedBy("has_planks", has(type.planks())) + .define('#', Items.STICK) // TODO this should be a tag + .define('W', type.planks()) + .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); + ShapelessRecipeBuilder.shapeless(type.planks(), 4) + .group("wooden_planks") + .unlockedBy("has_logs", has(type.log())) + .requires(type.log()) // TODO tag + .save(consumer, BYG.createLocation("wood/" + type + "/planks")); + ShapedRecipeBuilder.shaped(type.pressurePlate()) + .group("wooden_pressure_plate") + .pattern("PP") + .define('P', type.planks()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/pressure_plate")); + ShapedRecipeBuilder.shaped(type.slab(), 6) + .group("wooden_slab") + .pattern("PPP") + .define('P', type.planks()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/slab")); + ShapedRecipeBuilder.shaped(type.slab(), 4) + .group("wooden_stairs") + .pattern("P ") + .pattern("PP ") + .pattern("PPP") + .define('P', type.planks()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/stairs")); + ShapedRecipeBuilder.shaped(type.trapdoor(), 2) + .group("wooden_trapdoor") + .pattern("PPP") + .pattern("PPP") + .define('P', type.planks()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/trapdoor")); + ShapedRecipeBuilder.shaped(type.wood(), 3) + .group("wood") + .pattern("LL") + .pattern("LL") + .define('L', type.log()) + .unlockedBy("has_log", has(type.log())) + .save(consumer, BYG.createLocation("wood/" + type + "/wood")); } } + } From d1404e40a61b431cee1c9c06ab411c9e8a8d89f3 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Mon, 23 May 2022 21:36:36 +0300 Subject: [PATCH 03/90] Move bulbis --- Common/src/generated/resources/.cache/cache | 24 +++++++ .../byg.byg/wood/bulbis/bookshelf.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/button.json | 34 ++++++++++ .../byg.byg/wood/bulbis/crafting_table.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/door.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/fence.json | 34 ++++++++++ .../byg.byg/wood/bulbis/fence_gate.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/planks.json | 34 ++++++++++ .../byg.byg/wood/bulbis/pressure_plate.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/slab.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/stairs.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/trapdoor.json | 34 ++++++++++ .../recipes/byg.byg/wood/bulbis/wood.json | 34 ++++++++++ .../byg/recipes/wood/bulbis/bookshelf.json} | 11 ++-- .../data/byg/recipes/wood/bulbis/button.json} | 0 .../recipes/wood/bulbis/crafting_table.json} | 7 ++- .../data/byg/recipes/wood/bulbis/door.json} | 8 +-- .../data/byg/recipes/wood/bulbis/fence.json} | 0 .../byg/recipes/wood/bulbis/fence_gate.json} | 0 .../data/byg/recipes/wood/bulbis/planks.json} | 4 +- .../recipes/wood/bulbis/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/bulbis/slab.json} | 4 +- .../data/byg/recipes/wood/bulbis/stairs.json} | 12 ++-- .../byg/recipes/wood/bulbis/trapdoor.json} | 6 +- .../data/byg/recipes/wood/bulbis/wood.json} | 7 ++- .../textures/renders/BYGRenderTypes.java | 13 ++-- .../byg/common/BYGCompostables.java | 4 +- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 20 +----- .../byg/common/block/BYGWoodTypes.java | 62 +++++++++++++------ .../byg/common/item/BYGItems.java | 33 +++------- .../feature/config/BYGMushroomConfig.java | 5 ++ .../end/BYGEndVegetationFeatures.java | 36 ++++++----- .../datagen/providers/BYGRecipeProviders.java | 16 ++--- 34 files changed, 559 insertions(+), 127 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json rename Common/src/{main/resources/data/byg/recipes/bulbis_bookshelf.json => generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/bulbis_button.json => generated/resources/data/byg/recipes/wood/bulbis/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/bulbis_crafting_table.json => generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/bulbis_door.json => generated/resources/data/byg/recipes/wood/bulbis/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/bulbis_fence.json => generated/resources/data/byg/recipes/wood/bulbis/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/bulbis_fence_gate.json => generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/bulbis_planks.json => generated/resources/data/byg/recipes/wood/bulbis/planks.json} (71%) rename Common/src/{main/resources/data/byg/recipes/bulbis_pressure_plate.json => generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/bulbis_slab.json => generated/resources/data/byg/recipes/wood/bulbis/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/bulbis_stairs.json => generated/resources/data/byg/recipes/wood/bulbis/stairs.json} (58%) rename Common/src/{main/resources/data/byg/recipes/bulbis_trapdoor.json => generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/bulbis_wood.json => generated/resources/data/byg/recipes/wood/bulbis/wood.json} (78%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index f1dba36110..23c2e668d4 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -37,6 +37,18 @@ f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/w 71ae592506dbd4598b54f717a182268035d3c0b2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json 59dd8ff337e24b31e917ab5405e8692c452b47b4 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json 227b8abe2f2bb7f03de82bdab4f84272a39f2fd2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json +6b82d269ef533babeb129ead109ac430f9bac423 data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json +59388d27e5237edba7ff239e0b3fb94d96ff9c42 data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json +400aa527a416e95c00d0f267720b2c55a8a656c1 data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json +e750119b99fb80d6a938f4753bc7490aee61300d data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json +6ff0c5bf4b3d452a38688a7db7b50e6d828ddec9 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json +c50eea308107c7fbb7c5254415df875448eff056 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json +0dbe53467e4737bbd5033143ca809789552436d1 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json +995bf4d4574badf99459ebc78dcb2707774190b3 data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json +ef0119d4da07d55c8a35779d0a1231acd24ad6fe data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json +14dcfdd0b3b214ce0b94bec84a8e834695bd93ee data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json +999a1a1a0be1d07927214494be8dc56ba59a5d6f data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json +e3d666835415e1a77b40e193ebbd1c6f61deaa60 data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -76,6 +88,18 @@ a31ee3423b1b94f5f0f725bbaa1bd475af2529a6 data/byg/recipes/wood/blue_enchanted/sl 642a4cdb86732d1bd0df8e77fbc158ea0b747a4c data/byg/recipes/wood/blue_enchanted/stairs.json 6288b691a45bfb216bb823d8e2f4ce9b71a01775 data/byg/recipes/wood/blue_enchanted/trapdoor.json d936c12c34602c7d2a6305d50f8ff2dddb402a4d data/byg/recipes/wood/blue_enchanted/wood.json +f376a529b65cb0bfd3e1138f087935cfe197c8c8 data/byg/recipes/wood/bulbis/bookshelf.json +3b63cc1e4ac322cf4c21ec0815e0e5adb1632938 data/byg/recipes/wood/bulbis/button.json +24b50ed86668b9c10dffe4ff3c3ff3628319990e data/byg/recipes/wood/bulbis/crafting_table.json +67800a40053b00689a31dfd0efcda4fc1d08f066 data/byg/recipes/wood/bulbis/door.json +0ffd6670039dbd035a7ed8aeff7c28d39b9ff8e3 data/byg/recipes/wood/bulbis/fence.json +c7d42d60e3ffc6f17028fe495f4d2fe20f47c424 data/byg/recipes/wood/bulbis/fence_gate.json +6b0bd5776bb6e538768155fde12e7a6c819b4b64 data/byg/recipes/wood/bulbis/planks.json +f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_plate.json +f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json +2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json +e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json +5caa3354b5580a44c9394df5f775439b2e186b14 data/byg/recipes/wood/bulbis/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json new file mode 100644 index 0000000000..5471664eb3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json new file mode 100644 index 0000000000..c8e47320a4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json new file mode 100644 index 0000000000..72ea2baacd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json new file mode 100644 index 0000000000..82d335ad59 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json new file mode 100644 index 0000000000..077b451964 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json new file mode 100644 index 0000000000..fafd63908d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json new file mode 100644 index 0000000000..7e1ad03294 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_stem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json new file mode 100644 index 0000000000..661523c912 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json new file mode 100644 index 0000000000..ee10fc6477 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json new file mode 100644 index 0000000000..4e00a6513f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json new file mode 100644 index 0000000000..6741159af6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json new file mode 100644 index 0000000000..259757152d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_stem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/bulbis_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json index 696ad21240..3544d419ad 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_button.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/bulbis_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/button.json diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/bulbis_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json index d24eb1b56b..24fe44ce0f 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_door.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/bulbis_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json index 55fc9e06f0..638b761db4 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/bulbis_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/bulbis_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json similarity index 71% rename from Common/src/main/resources/data/byg/recipes/bulbis_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json index 749775223d..3b4f46ee3e 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:bulbis_stems" + "item": "byg:bulbis_stem" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/bulbis_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json index b3968aa82c..d0280167d7 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/bulbis_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json index 973818e46f..fbeafefecd 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json similarity index 58% rename from Common/src/main/resources/data/byg/recipes/bulbis_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json index 212343b452..06a7a6f82c 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "group": "byg:bulbis_stairs", + "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, "result": { - "item": "byg:bulbis_stairs", + "item": "byg:bulbis_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/bulbis_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json index 68f7e45631..0fbb44b622 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/bulbis_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json index 1a172f14f6..bec7bf4c3f 100644 --- a/Common/src/main/resources/data/byg/recipes/bulbis_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:bulbis_stem" } }, diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index ad77732762..4faea9abac 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -16,9 +16,13 @@ public static void renderTypes(Consumer> mapConsumer) { Map map = new HashMap<>(); for (BYGWoodTypes type : BYGWoodTypes.values()) { - map.put(type.door().get(), RenderType.translucent()); - map.put(type.trapdoor().get(), RenderType.translucent()); - map.put(type.sapling().get(), RenderType.translucent()); + final var renderType = switch (type) { + case ASPEN -> RenderType.translucent(); + default -> RenderType.cutoutMipped(); + }; + map.put(type.door().get(), renderType); + map.put(type.trapdoor().get(), renderType); + map.put(type.growerItem().get(), renderType); } map.put(BYGBlocks.WITCH_HAZEL_BLOSSOM.get(), RenderType.cutoutMipped()); @@ -101,7 +105,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.NIGHTSHADE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_ODDITY.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_SHELL.get(), RenderType.translucent()); - map.put(BYGBlocks.BULBIS_ODDITY.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BULBIS_SHELL.get(), RenderType.translucent()); map.put(BYGBlocks.NIGHTSHADE_BERRY_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_ROOTS.get(), RenderType.cutoutMipped()); @@ -159,7 +162,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.SYTHIAN_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.BULBIS_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ETHER_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); @@ -187,7 +189,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.SYTHIAN_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.BULBIS_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ETHER_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_TRAPDOOR.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index bbe76102d7..ec027eff50 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -16,7 +16,7 @@ public static void compostablesBYG() { for (BYGWoodTypes type : BYGWoodTypes.values()) { compostibleBlocks(0.3f, type.leaves().get()); - compostibleBlocks(0.3f, type.sapling().get()); + compostibleBlocks(0.3f, type.growerItem().get()); } //Leaves @@ -214,7 +214,7 @@ public static void compostablesBYG() { compostibleBlocks(0.65f, BYGItems.DEATH_CAP.get()); compostibleBlocks(0.65f, BYGItems.SOUL_SHROOM.get()); compostibleBlocks(0.65f, BYGItems.BAOBAB_FRUIT.get()); - compostibleBlocks(0.65f, BYGItems.BULBIS_ODDITY.get()); + compostibleBlocks(0.65f, BYGWoodTypes.BULBIS.growerItem()); compostibleBlocks(0.65f, BYGItems.PURPLE_BULBIS_ODDITY.get()); //Plants diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 906d2135a2..7f8be7e144 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -47,7 +47,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.ETHER_LOG.get(), BYGBlocks.STRIPPED_ETHER_LOG.get()); stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); - stripables.put(BYGBlocks.BULBIS_STEM.get(), BYGBlocks.STRIPPED_BULBIS_LOG.get()); stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); @@ -76,7 +75,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.ETHER_WOOD.get(), BYGBlocks.STRIPPED_ETHER_WOOD.get()); stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); - stripables.put(BYGBlocks.BULBIS_WOOD.get(), BYGBlocks.STRIPPED_BULBIS_WOOD.get()); stripables.put(BYGBlocks.EMBUR_HYPHAE.get(), BYGBlocks.STRIPPED_EMBUR_HYPHAE.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGBlocks.IMPARIUS_HYPHAE.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index ac5ce1997f..6fc0c71c5e 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -84,7 +84,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_PLANKS = createPlanks("embur_planks"); public static final BlockRegistryObject PALM_PLANKS = createPlanks("palm_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); - public static final BlockRegistryObject BULBIS_PLANKS = createPlanks("bulbis_planks"); public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); @@ -111,7 +110,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_BOOKSHELF = createBookshelf("embur_bookshelf"); public static final BlockRegistryObject PALM_BOOKSHELF = createBookshelf("palm_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); - public static final BlockRegistryObject BULBIS_BOOKSHELF = createBookshelf("bulbis_bookshelf"); public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); @@ -138,7 +136,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_DOOR = createDoor("embur_door"); public static final BlockRegistryObject PALM_DOOR = createDoor("palm_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); - public static final BlockRegistryObject BULBIS_DOOR = createDoor("bulbis_door"); public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); @@ -165,7 +162,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_PRESSURE_PLATE = createWoodPressurePlate("embur_pressure_plate"); public static final BlockRegistryObject PALM_PRESSURE_PLATE = createWoodPressurePlate("palm_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); - public static final BlockRegistryObject BULBIS_PRESSURE_PLATE = createWoodPressurePlate("bulbis_pressure_plate"); public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); @@ -192,7 +188,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_BUTTON = createWoodButton("embur_button"); public static final BlockRegistryObject PALM_BUTTON = createWoodButton("palm_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); - public static final BlockRegistryObject BULBIS_BUTTON = createWoodButton("bulbis_button"); public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); @@ -219,7 +214,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_TRAPDOOR = createTrapDoor("embur_trapdoor"); public static final BlockRegistryObject PALM_TRAPDOOR = createTrapDoor("palm_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); - public static final BlockRegistryObject BULBIS_TRAPDOOR = createTrapDoor("bulbis_trapdoor"); public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); @@ -246,7 +240,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_CRAFTING_TABLE = createCraftingTable("embur_crafting_table"); public static final BlockRegistryObject PALM_CRAFTING_TABLE = createCraftingTable("palm_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); - public static final BlockRegistryObject BULBIS_CRAFTING_TABLE = createCraftingTable("bulbis_crafting_table"); public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); @@ -273,7 +266,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_FENCE_GATE = createFenceGate("embur_fence_gate"); public static final BlockRegistryObject PALM_FENCE_GATE = createFenceGate("palm_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); - public static final BlockRegistryObject BULBIS_FENCE_GATE = createFenceGate("bulbis_fence_gate"); public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); @@ -300,7 +292,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_SLAB = createWoodSlab("embur_slab"); public static final BlockRegistryObject PALM_SLAB = createWoodSlab("palm_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); - public static final BlockRegistryObject BULBIS_SLAB = createWoodSlab("bulbis_slab"); public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); @@ -327,7 +318,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_STAIRS = createWoodStairs("embur_stairs"); public static final BlockRegistryObject PALM_STAIRS = createWoodStairs("palm_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); - public static final BlockRegistryObject BULBIS_STAIRS = createWoodStairs("bulbis_stairs"); public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); @@ -354,7 +344,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_FENCE = createFence("embur_fence"); public static final BlockRegistryObject PALM_FENCE = createFence("palm_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); - public static final BlockRegistryObject BULBIS_FENCE = createFence("bulbis_fence"); public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); @@ -381,7 +370,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_SIGN = createSign("embur_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject PALM_SIGN = createSign("palm_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); - public static final BlockRegistryObject BULBIS_SIGN = createSign("bulbis_sign", BYGWoodType.BULBIS, BULBIS_PLANKS); public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); @@ -408,7 +396,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_WALL_SIGN = createWallSign("embur_wall_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject PALM_WALL_SIGN = createWallSign("palm_wall_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); - public static final BlockRegistryObject BULBIS_WALL_SIGN = createWallSign("bulbis_wall_sign", BYGWoodType.BULBIS, BULBIS_PLANKS); public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject ETHER_WALL_SIGN = createWallSign("ether_wall_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_WALL_SIGN = createWallSign("imparius_wall_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); @@ -836,7 +823,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_LOG = createLog("palm_log"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); - public static final BlockRegistryObject BULBIS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "bulbis_stem"); public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); public static final BlockRegistryObject ETHER_LOG = createLog("ether_log"); @@ -868,7 +854,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_WOOD = createWood("palm_wood"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); - public static final BlockRegistryObject BULBIS_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "bulbis_wood"); public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); public static final BlockRegistryObject ETHER_WOOD = createWood("ether_wood"); public static final BlockRegistryObject IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "imparius_hyphae"); @@ -883,7 +868,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOUL_SHROOM = createFungus(BYGBlockTags.GROUND_SOUL_SHROOM, "soul_shroom"); public static final BlockRegistryObject DEATH_CAP = createFungus(BYGBlockTags.GROUND_DEATH_CAP, "death_cap"); - public static final BlockRegistryObject BULBIS_ODDITY = createMushroom(BYGBlockTags.GROUND_BULBIS_ODDITY, "bulbis_oddity"); public static final BlockRegistryObject PURPLE_BULBIS_ODDITY = createMushroom(BYGBlockTags.GROUND_PURPLE_BULBIS_ODDITY, "purple_bulbis_oddity"); public static final BlockRegistryObject SHULKREN_FUNGUS = createMushroom(BYGBlockTags.GROUND_SHULKREN_FUNGUS, "shulkren_fungus"); public static final BlockRegistryObject IMPARIUS_MUSHROOM = createMushroom(BYGBlockTags.GROUND_IMPARIUS_MUSHROOM, "imparius_mushroom"); @@ -1024,7 +1008,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_embur_pedu"); public static final BlockRegistryObject STRIPPED_PALM_LOG = createStrippedLog("stripped_palm_log"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); - public static final BlockRegistryObject STRIPPED_BULBIS_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_bulbis_stem"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); @@ -1051,7 +1034,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_embur_hyphae"); public static final BlockRegistryObject STRIPPED_PALM_WOOD = createWood("stripped_palm_wood"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); - public static final BlockRegistryObject STRIPPED_BULBIS_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_bulbis_wood"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_WOOD = createWood("stripped_nightshade_wood"); public static final BlockRegistryObject STRIPPED_ETHER_WOOD = createWood("stripped_ether_wood"); @@ -1506,7 +1488,7 @@ private static BlockRegistryObject createWhitePuffBlock(SoundType sound, return createPottedBlock(() -> new WhitePuffballBlock(BlockBehaviour.Properties.of(Material.PLANT, color).sound(sound).noOcclusion().noCollission().strength(0.0f).randomTicks()), id); } - private static BlockRegistryObject createMushroom(TagKey blockTagKey, String id) { + static BlockRegistryObject createMushroom(TagKey blockTagKey, String id) { return createPottedBlock(() -> new BYGMushroomBlock(BlockBehaviour.Properties.copy(Blocks.RED_MUSHROOM), blockTagKey), id); } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 61e73812ce..a499f1114b 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -2,7 +2,6 @@ import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; -import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.SignItem; @@ -19,23 +18,27 @@ import potionstudios.byg.reg.RegistryObject; import javax.annotation.Nullable; +import java.util.Set; -@MethodsReturnNonnullByDefault public enum BYGWoodTypes { ASPEN("aspen", BYGBlockTags.GROUND_ASPEN_SAPLING, MaterialColor.TERRACOTTA_YELLOW, BYGBoatEntity.BYGType.ASPEN), BAOBAB("baobab", BYGBlockTags.GROUND_BAOBAB_SAPLING, MaterialColor.TERRACOTTA_GREEN, BYGBoatEntity.BYGType.BAOBAB), - BLUE_ENCHANTED("blue_enchanted", BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, MaterialColor.COLOR_BLUE, BYGBoatEntity.BYGType.BLUE_ENCHANTED); + BLUE_ENCHANTED("blue_enchanted", BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, MaterialColor.COLOR_BLUE, BYGBoatEntity.BYGType.BLUE_ENCHANTED), + BULBIS("bulbis", BYGBlockTags.GROUND_BULBIS_ODDITY, MaterialColor.COLOR_BLUE, null, null, GrowerItemType.ODDITY, true, Excludable.LEAVES); private final String name; private final WoodType woodType; private final TagKey saplingGroundTag; private final MaterialColor materialColor; private final BYGBoatEntity.BYGType boatType; + private final GrowerItemType growerItemType; + private final Set excludables; + private final boolean isStem; @Nullable private final Integer leavesLightLevel; private boolean initialized; - private BlockRegistryObject sapling; + private BlockRegistryObject growerItem; private BlockRegistryObject leaves; private BlockRegistryObject log; @@ -64,34 +67,43 @@ public enum BYGWoodTypes { private RegistryObject boat; - BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, BYGBoatEntity.BYGType boatType) { - this(name, saplingGroundTag, materialColor, boatType, null); + BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, @Nullable BYGBoatEntity.BYGType boatType, Excludable... excludables) { + this(name, saplingGroundTag, materialColor, boatType, null, GrowerItemType.SAPLING, false, excludables); } - BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, BYGBoatEntity.BYGType boatType, @Nullable Integer leavesLightLevel) { + BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, @Nullable BYGBoatEntity.BYGType boatType, @Nullable Integer leavesLightLevel, GrowerItemType growerItemType, boolean isStem, Excludable... excludables) { this.name = name; this.saplingGroundTag = saplingGroundTag; this.materialColor = materialColor; this.boatType = boatType; this.woodType = BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(name).toString().replace(":", "/"))) : null; + this.isStem = isStem; + this.growerItemType = growerItemType; this.leavesLightLevel = leavesLightLevel; + this.excludables = Set.of(excludables); } public void init() { if (initialized) return; - this.sapling = BYGBlocks.createSapling(saplingGroundTag, name + "_sapling"); - BYGItems.createSaplingItem(sapling); - this.leaves = leavesLightLevel == null ? BYGBlocks.createLeaves(materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(materialColor, leavesLightLevel, name + "_leaves"); - BYGItems.createItem(leaves); - - this.log = BYGBlocks.createLog(name + "_log"); + this.growerItem = switch (growerItemType) { + case SAPLING -> BYGBlocks.createSapling(saplingGroundTag, name + "_sapling"); + case ODDITY -> BYGBlocks.createMushroom(saplingGroundTag, name + "_oddity"); + case FUNGUS -> BYGBlocks.createMushroom(saplingGroundTag, name + "_fungus"); + }; + BYGItems.createGrowerItem(growerItem, growerItemType == GrowerItemType.SAPLING); + if (!excludables.contains(Excludable.LEAVES)) { + this.leaves = leavesLightLevel == null ? BYGBlocks.createLeaves(materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(materialColor, leavesLightLevel, name + "_leaves"); + BYGItems.createItem(leaves); + } + + this.log = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_stem") : BYGBlocks.createLog(name + "_log"); BYGItems.createItem(log); - this.wood = BYGBlocks.createWood(name + "_wood"); + this.wood = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_wood") : BYGBlocks.createWood(name + "_wood"); BYGItems.createItem(wood); - this.strippedLog = BYGBlocks.createStrippedLog("stripped_" + name + "_log"); + this.strippedLog = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_stem") : BYGBlocks.createStrippedLog("stripped_" + name + "_log"); BYGItems.createItem(strippedLog); - this.strippedWood = BYGBlocks.createWood("stripped_" + name + "_wood"); + this.strippedWood = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_wood") : BYGBlocks.createWood("stripped_" + name + "_wood"); BYGItems.createItem(strippedWood); this.planks = BYGBlocks.createPlanks(name + "_planks"); @@ -124,7 +136,9 @@ public void init() { this.wallSign = BYGBlocks.createWallSign(name + "_wall_sign", woodType, planks); this.signItem = BYGItems.createSign(name + "_sign", sign, wallSign); - this.boat = BYGItems.createItem(() -> new BYGBoatItem(boatType, new Item.Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), name + "_boat"); + if (boatType != null) { + this.boat = BYGItems.createItem(() -> new BYGBoatItem(boatType, new Item.Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), name + "_boat"); + } initialized = true; } @@ -136,8 +150,8 @@ public String toString() { public BlockRegistryObject planks() { return planks; } - public BlockRegistryObject sapling() { - return sapling; + public BlockRegistryObject growerItem() { + return growerItem; } public WoodType woodType() { return woodType; @@ -220,4 +234,14 @@ public RegistryObject boat() { } public static void loadClass() {} + + public enum GrowerItemType { + SAPLING, + ODDITY, + FUNGUS + } + + public enum Excludable { + LEAVES + } } diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 8529c4d9fc..d8533d3adc 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -245,6 +245,13 @@ public class BYGItems { //Baobab Woodtype public static final RegistryObject BAOBAB_FRUIT; + //Bulbis Woodtype + public static final RegistryObject PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); + public static final RegistryObject PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); + public static final RegistryObject PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); + public static final RegistryObject BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); + public static final RegistryObject BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); + static { BYGWoodTypes.ASPEN.init(); @@ -252,33 +259,9 @@ public class BYGItems { BYGWoodTypes.BAOBAB.init(); BYGWoodTypes.BLUE_ENCHANTED.init(); + BYGWoodTypes.BULBIS.init(); } - //Bulbis Woodtype - public static final RegistryObject PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); - public static final RegistryObject PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); - public static final RegistryObject PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); - public static final RegistryObject BULBIS_ODDITY = createGrowerItem(BYGBlocks.BULBIS_ODDITY); - public static final RegistryObject BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); - public static final RegistryObject BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); - public static final RegistryObject BULBIS_STEM = createItem(BYGBlocks.BULBIS_STEM); - public static final RegistryObject BULBIS_WOOD = createItem(BYGBlocks.BULBIS_WOOD); - public static final RegistryObject STRIPPED_BULBIS_LOG = createItem(BYGBlocks.STRIPPED_BULBIS_LOG); - public static final RegistryObject STRIPPED_BULBIS_WOOD = createItem(BYGBlocks.STRIPPED_BULBIS_WOOD); - public static final RegistryObject BULBIS_PLANKS = createItem(BYGBlocks.BULBIS_PLANKS); - public static final RegistryObject BULBIS_BOOKSHELF = createItem(BYGBlocks.BULBIS_BOOKSHELF); - public static final RegistryObject BULBIS_CRAFTING_TABLE = createItem(BYGBlocks.BULBIS_CRAFTING_TABLE); - public static final RegistryObject BULBIS_STAIRS = createItem(BYGBlocks.BULBIS_STAIRS); - public static final RegistryObject BULBIS_SLAB = createItem(BYGBlocks.BULBIS_SLAB); - public static final RegistryObject BULBIS_FENCE = createItem(BYGBlocks.BULBIS_FENCE); - public static final RegistryObject BULBIS_FENCE_GATE = createItem(BYGBlocks.BULBIS_FENCE_GATE); - public static final RegistryObject BULBIS_DOOR = createItem(BYGBlocks.BULBIS_DOOR); - public static final RegistryObject BULBIS_TRAPDOOR = createItem(BYGBlocks.BULBIS_TRAPDOOR); - public static final RegistryObject BULBIS_PRESSURE_PLATE = createItem(BYGBlocks.BULBIS_PRESSURE_PLATE); - public static final RegistryObject BULBIS_BUTTON = createItem(BYGBlocks.BULBIS_BUTTON); - public static final RegistryObject BULBIS_SIGN = createSign("bulbis_sign", BYGBlocks.BULBIS_SIGN, BYGBlocks.BULBIS_WALL_SIGN); - - //Cherry Woodtype public static final RegistryObject PINK_CHERRY_SAPLING = createSaplingItem(BYGBlocks.PINK_CHERRY_SAPLING); public static final RegistryObject PINK_CHERRY_FOLIAGE = createItem(BYGBlocks.PINK_CHERRY_FOLIAGE); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGMushroomConfig.java b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGMushroomConfig.java index 3bd39d28a8..64bd7523cc 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGMushroomConfig.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGMushroomConfig.java @@ -10,6 +10,7 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider; import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.reg.RegistryObject; public class BYGMushroomConfig implements FeatureConfiguration { @@ -107,6 +108,10 @@ public static class Builder { private int minHeight = 15; private int maxPossibleHeight = 1; + public Builder setStemBlock(RegistryObject block) { + return setStemBlock(block.get()); + } + public Builder setStemBlock(Block block) { if (block != null) stemProvider = SimpleStateProvider.simple(block.defaultBlockState()); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java index 7575fe902a..ee966a26c1 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java @@ -20,11 +20,13 @@ import net.minecraft.world.level.levelgen.placement.BlockPredicateFilter; import net.minecraft.world.level.material.Fluids; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.BYGMushroomConfig; import potionstudios.byg.common.world.feature.config.BYGTreeConfig; import potionstudios.byg.common.world.feature.config.HangingColumnWithBaseConfig; +import static potionstudios.byg.common.block.BYGWoodTypes.BULBIS; import static potionstudios.byg.common.world.feature.features.BYGFeaturesUtil.*; import static potionstudios.byg.common.world.feature.placement.BYGPlacedFeaturesUtil.createPlacedFeature; @@ -42,7 +44,7 @@ public class BYGEndVegetationFeatures { () -> Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(SimpleStateProvider.simple(BYGBlocks.CRYPTIC_BRAMBLE.get())) ); - public static final Holder> BULBIS_ODDITY = createPatchConfiguredFeature("bulbis_oddity", BYGBlocks.BULBIS_ODDITY.get(), 32); + public static final Holder> BULBIS_ODDITY = createPatchConfiguredFeature("bulbis_oddity", BULBIS.growerItem().get(), 32); public static final Holder> PURPLE_BULBIS_ODDITY = createPatchConfiguredFeature("purple_bulbis_oddity", BYGBlocks.PURPLE_BULBIS_ODDITY.get(), 32); @@ -422,7 +424,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_BUSH1 = createConfiguredFeature("bulbis_bush1", BYGFeatures.BULBIS_BUSH1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -432,7 +434,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE1 = createConfiguredFeature("bulbis_tree1", BYGFeatures.BULBIS_TREE1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -442,7 +444,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE2 = createConfiguredFeature("bulbis_tree2", BYGFeatures.BULBIS_TREE2, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -452,7 +454,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE3 = createConfiguredFeature("bulbis_tree3", BYGFeatures.BULBIS_TREE3, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -462,7 +464,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE4 = createConfiguredFeature("bulbis_tree4", BYGFeatures.BULBIS_TREE4, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -472,7 +474,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE5 = createConfiguredFeature("bulbis_tree5", BYGFeatures.BULBIS_TREE5, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -482,7 +484,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE6 = createConfiguredFeature("bulbis_tree6", BYGFeatures.BULBIS_TREE6, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -492,7 +494,7 @@ public class BYGEndVegetationFeatures { public static final Holder> BULBIS_TREE7 = createConfiguredFeature("bulbis_tree7", BYGFeatures.BULBIS_TREE7, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -502,7 +504,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_BUSH1 = createConfiguredFeature("purple_bulbis_bush1", BYGFeatures.BULBIS_BUSH1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -512,7 +514,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE1 = createConfiguredFeature("purple_bulbis_tree1", BYGFeatures.BULBIS_TREE1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -522,7 +524,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE2 = createConfiguredFeature("purple_bulbis_tree2", BYGFeatures.BULBIS_TREE2, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -532,7 +534,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE3 = createConfiguredFeature("purple_bulbis_tree3", BYGFeatures.BULBIS_TREE3, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -542,7 +544,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE4 = createConfiguredFeature("purple_bulbis_tree4", BYGFeatures.BULBIS_TREE4, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -552,7 +554,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE5 = createConfiguredFeature("purple_bulbis_tree5", BYGFeatures.BULBIS_TREE5, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -562,7 +564,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE6 = createConfiguredFeature("purple_bulbis_tree6", BYGFeatures.BULBIS_TREE6, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) @@ -572,7 +574,7 @@ public class BYGEndVegetationFeatures { public static final Holder> PURPLE_BULBIS_TREE7 = createConfiguredFeature("purple_bulbis_tree7", BYGFeatures.BULBIS_TREE7, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.BULBIS_WOOD.get()) + .setStemBlock(BULBIS.wood()) .setMushroomBlock(BYGBlocks.PURPLE_BULBIS_SHELL.get()) .setMinHeight(6) .setMaxHeight(12) diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 3d6312ae06..37835cd6d8 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -27,13 +27,15 @@ protected void buildCraftingRecipes(Consumer consumer) { .define('P', type.planks().get()) .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/door")); - ShapedRecipeBuilder.shaped(type.boat().get()) - .group("boat") - .pattern("P P") - .pattern("PPP") - .define('P', type.planks().get()) - .unlockedBy("has_planks", has(type.planks())) - .save(consumer, BYG.createLocation("wood/" + type + "/boat")); + if (type.boat() != null) { + ShapedRecipeBuilder.shaped(type.boat().get()) + .group("boat") + .pattern("P P") + .pattern("PPP") + .define('P', type.planks().get()) + .unlockedBy("has_planks", has(type.planks())) + .save(consumer, BYG.createLocation("wood/" + type + "/boat")); + } ShapedRecipeBuilder.shaped(type.bookshelf().get()) .group("bookshelf") .pattern("PPP") From 21aa48f6298abae77cfb3146a28f519ed2804551 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Mon, 23 May 2022 23:27:44 +0300 Subject: [PATCH 04/90] Move cherry --- Common/src/generated/resources/.cache/cache | 26 ++++ .../recipes/byg.byg/wood/cherry/boat.json | 34 +++++ .../byg.byg/wood/cherry/bookshelf.json | 34 +++++ .../recipes/byg.byg/wood/cherry/button.json | 34 +++++ .../byg.byg/wood/cherry/crafting_table.json | 34 +++++ .../recipes/byg.byg/wood/cherry/door.json | 34 +++++ .../recipes/byg.byg/wood/cherry/fence.json | 34 +++++ .../byg.byg/wood/cherry/fence_gate.json | 34 +++++ .../recipes/byg.byg/wood/cherry/planks.json | 34 +++++ .../byg.byg/wood/cherry/pressure_plate.json | 34 +++++ .../recipes/byg.byg/wood/cherry/slab.json | 34 +++++ .../recipes/byg.byg/wood/cherry/stairs.json | 34 +++++ .../recipes/byg.byg/wood/cherry/trapdoor.json | 34 +++++ .../recipes/byg.byg/wood/cherry/wood.json | 34 +++++ .../data/byg/recipes/wood/cherry/boat.json} | 6 +- .../byg/recipes/wood/cherry/bookshelf.json} | 11 +- .../data/byg/recipes/wood/cherry/button.json} | 0 .../recipes/wood/cherry/crafting_table.json} | 7 +- .../data/byg/recipes/wood/cherry/door.json} | 8 +- .../data/byg/recipes/wood/cherry/fence.json} | 0 .../byg/recipes/wood/cherry/fence_gate.json} | 0 .../data/byg/recipes/wood/cherry/planks.json} | 2 +- .../recipes/wood/cherry/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/cherry/slab.json} | 4 +- .../data/byg/recipes/wood/cherry/stairs.json} | 10 +- .../byg/recipes/wood/cherry/trapdoor.json} | 6 +- .../data/byg/recipes/wood/cherry/wood.json} | 7 +- .../textures/renders/BYGRenderTypes.java | 5 +- .../byg/common/BYGFlammables.java | 9 -- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 17 --- .../byg/common/block/BYGWoodType.java | 2 - .../byg/common/block/BYGWoodTypes.java | 116 +++++++++++------- .../byg/common/entity/boat/BYGBoatEntity.java | 4 +- .../byg/common/item/BYGItems.java | 57 ++++----- .../world/feature/config/BYGTreeConfig.java | 5 + .../overworld/BYGOverworldTreeFeatures.java | 8 +- .../datagen/providers/BYGRecipeProviders.java | 21 +++- 38 files changed, 628 insertions(+), 151 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json rename Common/src/{main/resources/data/byg/recipes/cherry_boat.json => generated/resources/data/byg/recipes/wood/cherry/boat.json} (85%) rename Common/src/{main/resources/data/byg/recipes/cherry_bookshelf.json => generated/resources/data/byg/recipes/wood/cherry/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/cherry_button.json => generated/resources/data/byg/recipes/wood/cherry/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cherry_crafting_table.json => generated/resources/data/byg/recipes/wood/cherry/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/cherry_door.json => generated/resources/data/byg/recipes/wood/cherry/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/cherry_fence.json => generated/resources/data/byg/recipes/wood/cherry/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cherry_fence_gate.json => generated/resources/data/byg/recipes/wood/cherry/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cherry_planks.json => generated/resources/data/byg/recipes/wood/cherry/planks.json} (86%) rename Common/src/{main/resources/data/byg/recipes/cherry_pressure_plate.json => generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/cherry_slab.json => generated/resources/data/byg/recipes/wood/cherry/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/cherry_stairs.json => generated/resources/data/byg/recipes/wood/cherry/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/cherry_trapdoor.json => generated/resources/data/byg/recipes/wood/cherry/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/cherry_wood.json => generated/resources/data/byg/recipes/wood/cherry/wood.json} (78%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 23c2e668d4..3ff463a77b 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -49,6 +49,19 @@ ef0119d4da07d55c8a35779d0a1231acd24ad6fe data/byg/advancements/recipes/byg.byg/w 14dcfdd0b3b214ce0b94bec84a8e834695bd93ee data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json 999a1a1a0be1d07927214494be8dc56ba59a5d6f data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json e3d666835415e1a77b40e193ebbd1c6f61deaa60 data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json +3c6a275c40d897a11193e76d014c15b3c24aa4b8 data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json +52f7e26086dd14af9180b69034abe66c355aef0b data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json +2534dfbe152c4c359fa8d9192401d616ccb70631 data/byg/advancements/recipes/byg.byg/wood/cherry/button.json +e1588dd3dc5c8002944d146df52e6271500963ab data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json +26febe445f845f73cef06afeb9bddf1c5038d1c9 data/byg/advancements/recipes/byg.byg/wood/cherry/door.json +69fcbbc9d24d42c1ee5affe4737369af97f483d8 data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json +097af9339c3f2d7bc75ed63c67242dbfbdb60308 data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json +c7c83bd3dbbdc82648bcf421c0f0b41e0079f1d9 data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json +efe4a39583a805af78c82bfe7f224e36844abe3f data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json +fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json +131415f581121f364e982090cd76e69de0d5c07c data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json +7c19345d226ea6e1a1adab274168dfe289200373 data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json +4277c921c71f28463f09b2ca099f99bef21ada03 data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -100,6 +113,19 @@ f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json 2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json 5caa3354b5580a44c9394df5f775439b2e186b14 data/byg/recipes/wood/bulbis/wood.json +fcc3ecbb4c7fd0ca85a097eb05af19fb9470f82b data/byg/recipes/wood/cherry/boat.json +f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf.json +69a6c51e9be471a4fdf07a0d253b4b3f76026818 data/byg/recipes/wood/cherry/button.json +032216390b5e594204b830a8338af8a4db15039f data/byg/recipes/wood/cherry/crafting_table.json +b4cd0c2f83180f071060cbb47c2bc18b485cd329 data/byg/recipes/wood/cherry/door.json +e70972b9e4b8503218933cf69caae4f28852558c data/byg/recipes/wood/cherry/fence.json +1b0d138a0e2653ae3daaf5e3af62893a45514ecb data/byg/recipes/wood/cherry/fence_gate.json +c2513e2dfb5d80b4e0aafcd98e4f683dc2c7da41 data/byg/recipes/wood/cherry/planks.json +7a9a8fd4e78eb7200da14f359424fa885400425e data/byg/recipes/wood/cherry/pressure_plate.json +34165d5515938d8f03bc640c5c4d6095310ff503 data/byg/recipes/wood/cherry/slab.json +e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json +f2e078bc274292f6555d1e28d485f9b7b6641de2 data/byg/recipes/wood/cherry/trapdoor.json +68789845ea93600e6fe7cb420a98157a5488ed65 data/byg/recipes/wood/cherry/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json new file mode 100644 index 0000000000..c2a8a84296 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json new file mode 100644 index 0000000000..1556004df0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json new file mode 100644 index 0000000000..6844dd980c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json new file mode 100644 index 0000000000..2d5c672f38 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json new file mode 100644 index 0000000000..bb41b38fd8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json new file mode 100644 index 0000000000..a94bff2507 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json new file mode 100644 index 0000000000..8355292a3f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json new file mode 100644 index 0000000000..f32084a190 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json new file mode 100644 index 0000000000..8debc46a91 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json new file mode 100644 index 0000000000..41d355e48c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json new file mode 100644 index 0000000000..ecdf230a15 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json new file mode 100644 index 0000000000..2a8471978e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json new file mode 100644 index 0000000000..cb3acf85ac --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cherry_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/cherry_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json index 44c222a77e..edc2861480 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/cherry_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json index 1e43e5bb97..fcdde704bb 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_button.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cherry_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/button.json diff --git a/Common/src/main/resources/data/byg/recipes/cherry_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/cherry_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json index 61e74c4f4d..aaefa5bbed 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_door.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/cherry_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json index ae0c53aa79..f5cf1d83b7 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cherry_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/cherry_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cherry_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/cherry_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/cherry_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json index 6032e345af..14653d934d 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { "tag": "byg:cherry_logs" diff --git a/Common/src/main/resources/data/byg/recipes/cherry_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/cherry_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json index 6fc5f239fb..d7bc76208a 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/cherry_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json index fe321fe865..afbcd876a3 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/cherry_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json index 66d9acac0d..879c201719 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, "result": { - "item": "byg:cherry_stairs", + "item": "byg:cherry_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cherry_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/cherry_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json index f6f17334b4..f1037f372c 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cherry_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/cherry_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json index 85b3ff7789..6d3e953819 100644 --- a/Common/src/main/resources/data/byg/recipes/cherry_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:cherry_log" } }, diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 4faea9abac..dbb8d28f4d 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -22,7 +22,8 @@ public static void renderTypes(Consumer> mapConsumer) { }; map.put(type.door().get(), renderType); map.put(type.trapdoor().get(), renderType); - map.put(type.growerItem().get(), renderType); + if (type.growerItem() != null) + map.put(type.growerItem().get(), renderType); } map.put(BYGBlocks.WITCH_HAZEL_BLOSSOM.get(), RenderType.cutoutMipped()); @@ -140,7 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.CHERRY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_DOOR.get(), RenderType.cutoutMipped()); @@ -167,7 +167,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.CHERRY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CIKA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_TRAPDOOR.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 1c25a4c779..b2dddc3769 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -31,7 +31,6 @@ public static void flammablesBYG() { } //Logs - flammableBlock(BYGBlocks.CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.FIR_LOG.get(), 5, 5); @@ -51,7 +50,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_CHERRY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_LOG.get(), 5, 5); @@ -71,7 +69,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.FIR_WOOD.get(), 5, 5); @@ -91,7 +88,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_CHERRY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_WOOD.get(), 5, 5); @@ -111,7 +107,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.CHERRY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_BOOKSHELF.get(), 5, 20); @@ -132,7 +127,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.CHERRY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_SLAB.get(), 5, 20); @@ -153,7 +147,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.CHERRY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_STAIRS.get(), 5, 20); @@ -174,7 +167,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.CHERRY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_PLANKS.get(), 5, 20); @@ -195,7 +187,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.CHERRY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CIKA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_FENCE.get(), 5, 20); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 7f8be7e144..2dbdd84a39 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,7 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.CHERRY_LOG.get(), BYGBlocks.STRIPPED_CHERRY_LOG.get()); stripables.put(BYGBlocks.CIKA_LOG.get(), BYGBlocks.STRIPPED_CIKA_LOG.get()); stripables.put(BYGBlocks.CYPRESS_LOG.get(), BYGBlocks.STRIPPED_CYPRESS_LOG.get()); stripables.put(BYGBlocks.EBONY_LOG.get(), BYGBlocks.STRIPPED_EBONY_LOG.get()); @@ -50,7 +49,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.CHERRY_WOOD.get(), BYGBlocks.STRIPPED_CHERRY_WOOD.get()); stripables.put(BYGBlocks.CIKA_WOOD.get(), BYGBlocks.STRIPPED_CIKA_WOOD.get()); stripables.put(BYGBlocks.CYPRESS_WOOD.get(), BYGBlocks.STRIPPED_CYPRESS_WOOD.get()); stripables.put(BYGBlocks.EBONY_WOOD.get(), BYGBlocks.STRIPPED_EBONY_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 6fc0c71c5e..215d2fe410 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject CHERRY_PLANKS = createPlanks("cherry_planks"); public static final BlockRegistryObject CIKA_PLANKS = createPlanks("cika_planks"); public static final BlockRegistryObject CYPRESS_PLANKS = createPlanks("cypress_planks"); public static final BlockRegistryObject EBONY_PLANKS = createPlanks("ebony_planks"); @@ -88,7 +87,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject CHERRY_BOOKSHELF = createBookshelf("cherry_bookshelf"); public static final BlockRegistryObject CIKA_BOOKSHELF = createBookshelf("cika_bookshelf"); public static final BlockRegistryObject CYPRESS_BOOKSHELF = createBookshelf("cypress_bookshelf"); public static final BlockRegistryObject EBONY_BOOKSHELF = createBookshelf("ebony_bookshelf"); @@ -114,7 +112,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject CHERRY_DOOR = createDoor("cherry_door"); public static final BlockRegistryObject CIKA_DOOR = createDoor("cika_door"); public static final BlockRegistryObject CYPRESS_DOOR = createDoor("cypress_door"); public static final BlockRegistryObject EBONY_DOOR = createDoor("ebony_door"); @@ -140,7 +137,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject CHERRY_PRESSURE_PLATE = createWoodPressurePlate("cherry_pressure_plate"); public static final BlockRegistryObject CIKA_PRESSURE_PLATE = createWoodPressurePlate("cika_pressure_plate"); public static final BlockRegistryObject CYPRESS_PRESSURE_PLATE = createWoodPressurePlate("cypress_pressure_plate"); public static final BlockRegistryObject EBONY_PRESSURE_PLATE = createWoodPressurePlate("ebony_pressure_plate"); @@ -166,7 +162,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject CHERRY_BUTTON = createWoodButton("cherry_button"); public static final BlockRegistryObject CIKA_BUTTON = createWoodButton("cika_button"); public static final BlockRegistryObject CYPRESS_BUTTON = createWoodButton("cypress_button"); public static final BlockRegistryObject EBONY_BUTTON = createWoodButton("ebony_button"); @@ -192,7 +187,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject CHERRY_TRAPDOOR = createTrapDoor("cherry_trapdoor"); public static final BlockRegistryObject CIKA_TRAPDOOR = createTrapDoor("cika_trapdoor"); public static final BlockRegistryObject CYPRESS_TRAPDOOR = createTrapDoor("cypress_trapdoor"); public static final BlockRegistryObject EBONY_TRAPDOOR = createTrapDoor("ebony_trapdoor"); @@ -218,7 +212,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject CHERRY_CRAFTING_TABLE = createCraftingTable("cherry_crafting_table"); public static final BlockRegistryObject CIKA_CRAFTING_TABLE = createCraftingTable("cika_crafting_table"); public static final BlockRegistryObject CYPRESS_CRAFTING_TABLE = createCraftingTable("cypress_crafting_table"); public static final BlockRegistryObject EBONY_CRAFTING_TABLE = createCraftingTable("ebony_crafting_table"); @@ -244,7 +237,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject CHERRY_FENCE_GATE = createFenceGate("cherry_fence_gate"); public static final BlockRegistryObject CIKA_FENCE_GATE = createFenceGate("cika_fence_gate"); public static final BlockRegistryObject CYPRESS_FENCE_GATE = createFenceGate("cypress_fence_gate"); public static final BlockRegistryObject EBONY_FENCE_GATE = createFenceGate("ebony_fence_gate"); @@ -270,7 +262,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject CHERRY_SLAB = createWoodSlab("cherry_slab"); public static final BlockRegistryObject CIKA_SLAB = createWoodSlab("cika_slab"); public static final BlockRegistryObject CYPRESS_SLAB = createWoodSlab("cypress_slab"); public static final BlockRegistryObject EBONY_SLAB = createWoodSlab("ebony_slab"); @@ -296,7 +287,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject CHERRY_STAIRS = createWoodStairs("cherry_stairs"); public static final BlockRegistryObject CIKA_STAIRS = createWoodStairs("cika_stairs"); public static final BlockRegistryObject CYPRESS_STAIRS = createWoodStairs("cypress_stairs"); public static final BlockRegistryObject EBONY_STAIRS = createWoodStairs("ebony_stairs"); @@ -322,7 +312,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject CHERRY_FENCE = createFence("cherry_fence"); public static final BlockRegistryObject CIKA_FENCE = createFence("cika_fence"); public static final BlockRegistryObject CYPRESS_FENCE = createFence("cypress_fence"); public static final BlockRegistryObject EBONY_FENCE = createFence("ebony_fence"); @@ -348,7 +337,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject CHERRY_SIGN = createSign("cherry_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_SIGN = createSign("cika_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_SIGN = createSign("cypress_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_SIGN = createSign("ebony_sign", BYGWoodType.EBONY, EBONY_PLANKS); @@ -374,7 +362,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject CHERRY_WALL_SIGN = createWallSign("cherry_wall_sign", BYGWoodType.CHERRY, CHERRY_PLANKS); public static final BlockRegistryObject CIKA_WALL_SIGN = createWallSign("cika_wall_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_WALL_SIGN = createWallSign("cypress_wall_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_WALL_SIGN = createWallSign("ebony_wall_sign", BYGWoodType.EBONY, EBONY_PLANKS); @@ -799,7 +786,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject CHERRY_LOG = createLog("cherry_log"); public static final BlockRegistryObject CIKA_LOG = createLog("cika_log"); public static final BlockRegistryObject CYPRESS_LOG = createLog("cypress_log"); public static final BlockRegistryObject EBONY_LOG = createLog("ebony_log"); @@ -830,7 +816,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject CHERRY_WOOD = createWood("cherry_wood"); public static final BlockRegistryObject CIKA_WOOD = createWood("cika_wood"); public static final BlockRegistryObject CYPRESS_WOOD = createWood("cypress_wood"); public static final BlockRegistryObject EBONY_WOOD = createWood("ebony_wood"); @@ -985,7 +970,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_CHERRY_LOG = createStrippedLog("stripped_cherry_log"); public static final BlockRegistryObject STRIPPED_CIKA_LOG = createStrippedLog("stripped_cika_log"); public static final BlockRegistryObject STRIPPED_CYPRESS_LOG = createStrippedLog("stripped_cypress_log"); public static final BlockRegistryObject STRIPPED_EBONY_LOG = createStrippedLog("stripped_ebony_log"); @@ -1011,7 +995,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_CHERRY_WOOD = createWood("stripped_cherry_wood"); public static final BlockRegistryObject STRIPPED_CIKA_WOOD = createWood("stripped_cika_wood"); public static final BlockRegistryObject STRIPPED_CYPRESS_WOOD = createWood("stripped_cypress_wood"); public static final BlockRegistryObject STRIPPED_EBONY_WOOD = createWood("stripped_ebony_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 853cb44d8d..139393fe7f 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,8 +10,6 @@ // TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType BLUE_ENCHANTED = register("blue_enchanted"); - public static final WoodType CHERRY = register("cherry"); public static final WoodType CIKA = register("cika"); public static final WoodType CYPRESS = register("cypress"); public static final WoodType EBONY = register("ebony"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index a499f1114b..5124eefe29 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -1,41 +1,33 @@ package potionstudios.byg.common.block; -import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; -import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.SignItem; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.material.MaterialColor; -import potionstudios.byg.BYG; -import potionstudios.byg.BYGConstants; import potionstudios.byg.common.entity.boat.BYGBoatEntity; import potionstudios.byg.common.item.BYGBoatItem; import potionstudios.byg.common.item.BYGCreativeTab; import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.mixin.access.WoodTypeAccess; import potionstudios.byg.reg.BlockRegistryObject; import potionstudios.byg.reg.RegistryObject; -import javax.annotation.Nullable; -import java.util.Set; +import java.util.EnumSet; +import java.util.List; public enum BYGWoodTypes { - ASPEN("aspen", BYGBlockTags.GROUND_ASPEN_SAPLING, MaterialColor.TERRACOTTA_YELLOW, BYGBoatEntity.BYGType.ASPEN), - BAOBAB("baobab", BYGBlockTags.GROUND_BAOBAB_SAPLING, MaterialColor.TERRACOTTA_GREEN, BYGBoatEntity.BYGType.BAOBAB), - BLUE_ENCHANTED("blue_enchanted", BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING, MaterialColor.COLOR_BLUE, BYGBoatEntity.BYGType.BLUE_ENCHANTED), - BULBIS("bulbis", BYGBlockTags.GROUND_BULBIS_ODDITY, MaterialColor.COLOR_BLUE, null, null, GrowerItemType.ODDITY, true, Excludable.LEAVES); + ASPEN("aspen", new Builder().boatType(BYGBoatEntity.BYGType.ASPEN).materialColor(MaterialColor.TERRACOTTA_YELLOW).growerItemGroundTag(BYGBlockTags.GROUND_ASPEN_SAPLING)), + BAOBAB("baobab", new Builder().boatType(BYGBoatEntity.BYGType.BAOBAB).growerItemGroundTag(BYGBlockTags.GROUND_BAOBAB_SAPLING).materialColor(MaterialColor.TERRACOTTA_GREEN)), + BLUE_ENCHANTED("blue_enchanted", new Builder().boatType(BYGBoatEntity.BYGType.BLUE_ENCHANTED).growerItemGroundTag(BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING).materialColor(MaterialColor.COLOR_BLUE).leavesLightLevel(15)), + BULBIS("bulbis", new Builder().materialColor(MaterialColor.COLOR_BLUE).growerItemGroundTag(BYGBlockTags.GROUND_BULBIS_ODDITY).growerItem(GrowerItemType.ODDITY).exclude(BlockType.LEAVES).stem()), + CHERRY("cherry", new Builder().exclude(BlockType.SAPLING).boatType(BYGBoatEntity.BYGType.CHERRY).exclude(BlockType.LEAVES)); private final String name; private final WoodType woodType; - private final TagKey saplingGroundTag; - private final MaterialColor materialColor; - private final BYGBoatEntity.BYGType boatType; - private final GrowerItemType growerItemType; - private final Set excludables; - private final boolean isStem; - @Nullable - private final Integer leavesLightLevel; + private final Builder builder; private boolean initialized; private BlockRegistryObject growerItem; @@ -67,43 +59,35 @@ public enum BYGWoodTypes { private RegistryObject boat; - BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, @Nullable BYGBoatEntity.BYGType boatType, Excludable... excludables) { - this(name, saplingGroundTag, materialColor, boatType, null, GrowerItemType.SAPLING, false, excludables); - } - - BYGWoodTypes(String name, TagKey saplingGroundTag, MaterialColor materialColor, @Nullable BYGBoatEntity.BYGType boatType, @Nullable Integer leavesLightLevel, GrowerItemType growerItemType, boolean isStem, Excludable... excludables) { + BYGWoodTypes(String name, Builder builder) { this.name = name; - this.saplingGroundTag = saplingGroundTag; - this.materialColor = materialColor; - this.boatType = boatType; - this.woodType = BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(name).toString().replace(":", "/"))) : null; - this.isStem = isStem; - this.growerItemType = growerItemType; - this.leavesLightLevel = leavesLightLevel; - this.excludables = Set.of(excludables); + this.builder = builder; + this.woodType = WoodTypeAccess.byg_create(name); } public void init() { if (initialized) return; - this.growerItem = switch (growerItemType) { - case SAPLING -> BYGBlocks.createSapling(saplingGroundTag, name + "_sapling"); - case ODDITY -> BYGBlocks.createMushroom(saplingGroundTag, name + "_oddity"); - case FUNGUS -> BYGBlocks.createMushroom(saplingGroundTag, name + "_fungus"); + this.growerItem = switch (builder.growerItemType) { + case SAPLING -> BYGBlocks.createSapling(builder.growerItemGroundTag, name + "_sapling"); + case ODDITY -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_oddity"); + case FUNGUS -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_fungus"); }; - BYGItems.createGrowerItem(growerItem, growerItemType == GrowerItemType.SAPLING); - if (!excludables.contains(Excludable.LEAVES)) { - this.leaves = leavesLightLevel == null ? BYGBlocks.createLeaves(materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(materialColor, leavesLightLevel, name + "_leaves"); + if (!builder.excludes.contains(BlockType.SAPLING)) { + BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); + } + if (!builder.excludes.contains(BlockType.LEAVES)) { + this.leaves = builder.leavesLightLevel == null ? BYGBlocks.createLeaves(builder.materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(builder.materialColor, builder.leavesLightLevel, name + "_leaves"); BYGItems.createItem(leaves); } - this.log = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_stem") : BYGBlocks.createLog(name + "_log"); + this.log = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_stem") : BYGBlocks.createLog(name + "_log"); BYGItems.createItem(log); - this.wood = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_wood") : BYGBlocks.createWood(name + "_wood"); + this.wood = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_wood") : BYGBlocks.createWood(name + "_wood"); BYGItems.createItem(wood); - this.strippedLog = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_stem") : BYGBlocks.createStrippedLog("stripped_" + name + "_log"); + this.strippedLog = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_stem") : BYGBlocks.createStrippedLog("stripped_" + name + "_log"); BYGItems.createItem(strippedLog); - this.strippedWood = isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_wood") : BYGBlocks.createWood("stripped_" + name + "_wood"); + this.strippedWood = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_wood") : BYGBlocks.createWood("stripped_" + name + "_wood"); BYGItems.createItem(strippedWood); this.planks = BYGBlocks.createPlanks(name + "_planks"); @@ -136,8 +120,8 @@ public void init() { this.wallSign = BYGBlocks.createWallSign(name + "_wall_sign", woodType, planks); this.signItem = BYGItems.createSign(name + "_sign", sign, wallSign); - if (boatType != null) { - this.boat = BYGItems.createItem(() -> new BYGBoatItem(boatType, new Item.Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), name + "_boat"); + if (builder.boatType != null) { + this.boat = BYGItems.createItem(() -> new BYGBoatItem(builder.boatType, new Item.Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), name + "_boat"); } initialized = true; } @@ -241,7 +225,47 @@ public enum GrowerItemType { FUNGUS } - public enum Excludable { - LEAVES + public enum BlockType { + LEAVES, + SAPLING + } + + public static final class Builder { + private GrowerItemType growerItemType = GrowerItemType.SAPLING; + private final EnumSet excludes = EnumSet.noneOf(BlockType.class); + private TagKey growerItemGroundTag = BlockTags.DIRT; + private BYGBoatEntity.BYGType boatType; + private MaterialColor materialColor; + private Integer leavesLightLevel; + private boolean isStem; + + public Builder growerItem(GrowerItemType type) { + this.growerItemType = type; + return this; + } + public Builder exclude(BlockType... types) { + excludes.addAll(List.of(types)); + return this; + } + public Builder growerItemGroundTag(TagKey tag) { + this.growerItemGroundTag = tag; + return this; + } + public Builder boatType(BYGBoatEntity.BYGType type) { + this.boatType = type; + return this; + } + public Builder materialColor(MaterialColor colour) { + this.materialColor = colour; + return this; + } + public Builder leavesLightLevel(Integer leavesLightLevel) { + this.leavesLightLevel = leavesLightLevel; + return this; + } + public Builder stem() { + this.isStem = true; + return this; + } } } diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 35e860646e..5d91844c39 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -51,7 +51,7 @@ public Item getDropItem() { default -> BYGWoodTypes.ASPEN.boat().get(); case BAOBAB -> BYGWoodTypes.BAOBAB.boat().get(); case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.boat().get(); - case CHERRY -> BYGItems.CHERRY_BOAT.get(); + case CHERRY -> BYGWoodTypes.CHERRY.boat().get(); case CIKA -> BYGItems.CIKA_BOAT.get(); case CYPRESS -> BYGItems.CYPRESS_BOAT.get(); case EBONY -> BYGItems.EBONY_BOAT.get(); @@ -78,7 +78,7 @@ public Block getPlanks() { default -> BYGWoodTypes.ASPEN.planks().get(); case BAOBAB -> BYGWoodTypes.BAOBAB.planks().get(); case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.planks().get(); - case CHERRY -> BYGBlocks.CHERRY_PLANKS.get(); + case CHERRY -> BYGWoodTypes.CHERRY.planks().get(); case CIKA -> BYGBlocks.CIKA_PLANKS.get(); case CYPRESS -> BYGBlocks.CYPRESS_PLANKS.get(); case EBONY -> BYGBlocks.EBONY_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index d8533d3adc..9c77a0403c 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -246,11 +246,19 @@ public class BYGItems { public static final RegistryObject BAOBAB_FRUIT; //Bulbis Woodtype - public static final RegistryObject PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); - public static final RegistryObject PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); - public static final RegistryObject PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); - public static final RegistryObject BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); - public static final RegistryObject BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); + public static final RegistryObject PURPLE_BULBIS_ODDITY; + public static final RegistryObject PURPLE_BULBIS_ANOMALY; + public static final RegistryObject PURPLE_BULBIS_SHELL; + public static final RegistryObject BULBIS_ANOMALY; + public static final RegistryObject BULBIS_SHELL; + + //Cherry Woodtype + public static final RegistryObject PINK_CHERRY_SAPLING; + public static final RegistryObject PINK_CHERRY_FOLIAGE; + public static final RegistryObject PINK_CHERRY_LEAVES; + public static final RegistryObject WHITE_CHERRY_SAPLING; + public static final RegistryObject WHITE_CHERRY_FOLIAGE; + public static final RegistryObject WHITE_CHERRY_LEAVES; static { BYGWoodTypes.ASPEN.init(); @@ -259,33 +267,22 @@ public class BYGItems { BYGWoodTypes.BAOBAB.init(); BYGWoodTypes.BLUE_ENCHANTED.init(); + + PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); + PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); + PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); + BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); + BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); BYGWoodTypes.BULBIS.init(); - } - //Cherry Woodtype - public static final RegistryObject PINK_CHERRY_SAPLING = createSaplingItem(BYGBlocks.PINK_CHERRY_SAPLING); - public static final RegistryObject PINK_CHERRY_FOLIAGE = createItem(BYGBlocks.PINK_CHERRY_FOLIAGE); - public static final RegistryObject PINK_CHERRY_LEAVES = createItem(BYGBlocks.PINK_CHERRY_LEAVES); - public static final RegistryObject WHITE_CHERRY_SAPLING = createSaplingItem(BYGBlocks.WHITE_CHERRY_SAPLING); - public static final RegistryObject WHITE_CHERRY_FOLIAGE = createItem(BYGBlocks.WHITE_CHERRY_FOLIAGE); - public static final RegistryObject WHITE_CHERRY_LEAVES = createItem(BYGBlocks.WHITE_CHERRY_LEAVES); - public static final RegistryObject CHERRY_LOG = createItem(BYGBlocks.CHERRY_LOG); - public static final RegistryObject CHERRY_WOOD = createItem(BYGBlocks.CHERRY_WOOD); - public static final RegistryObject STRIPPED_CHERRY_LOG = createItem(BYGBlocks.STRIPPED_CHERRY_LOG); - public static final RegistryObject STRIPPED_CHERRY_WOOD = createItem(BYGBlocks.STRIPPED_CHERRY_WOOD); - public static final RegistryObject CHERRY_PLANKS = createItem(BYGBlocks.CHERRY_PLANKS); - public static final RegistryObject CHERRY_BOOKSHELF = createItem(BYGBlocks.CHERRY_BOOKSHELF); - public static final RegistryObject CHERRY_CRAFTING_TABLE = createItem(BYGBlocks.CHERRY_CRAFTING_TABLE); - public static final RegistryObject CHERRY_STAIRS = createItem(BYGBlocks.CHERRY_STAIRS); - public static final RegistryObject CHERRY_SLAB = createItem(BYGBlocks.CHERRY_SLAB); - public static final RegistryObject CHERRY_FENCE = createItem(BYGBlocks.CHERRY_FENCE); - public static final RegistryObject CHERRY_FENCE_GATE = createItem(BYGBlocks.CHERRY_FENCE_GATE); - public static final RegistryObject CHERRY_DOOR = createItem(BYGBlocks.CHERRY_DOOR); - public static final RegistryObject CHERRY_TRAPDOOR = createItem(BYGBlocks.CHERRY_TRAPDOOR); - public static final RegistryObject CHERRY_PRESSURE_PLATE = createItem(BYGBlocks.CHERRY_PRESSURE_PLATE); - public static final RegistryObject CHERRY_BUTTON = createItem(BYGBlocks.CHERRY_BUTTON); - public static final RegistryObject CHERRY_SIGN = createSign("cherry_sign", BYGBlocks.CHERRY_SIGN, BYGBlocks.CHERRY_WALL_SIGN); - public static final RegistryObject CHERRY_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.CHERRY, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "cherry_boat"); + PINK_CHERRY_SAPLING = createSaplingItem(BYGBlocks.PINK_CHERRY_SAPLING); + PINK_CHERRY_FOLIAGE = createItem(BYGBlocks.PINK_CHERRY_FOLIAGE); + PINK_CHERRY_LEAVES = createItem(BYGBlocks.PINK_CHERRY_LEAVES); + WHITE_CHERRY_SAPLING = createSaplingItem(BYGBlocks.WHITE_CHERRY_SAPLING); + WHITE_CHERRY_FOLIAGE = createItem(BYGBlocks.WHITE_CHERRY_FOLIAGE); + WHITE_CHERRY_LEAVES = createItem(BYGBlocks.WHITE_CHERRY_LEAVES); + BYGWoodTypes.CHERRY.init(); + } //Cika Woodtype public static final RegistryObject CIKA_SAPLING = createSaplingItem(BYGBlocks.CIKA_SAPLING); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java index c3730da049..c95961b192 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java @@ -12,6 +12,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider; +import potionstudios.byg.reg.RegistryObject; import java.util.List; import java.util.Set; @@ -120,6 +121,10 @@ public static class Builder { private int maxPossibleHeight = 1; private int diskRadius = 0; + public Builder setTrunkBlock(RegistryObject block) { + return setTrunkBlock(block.get()); + } + public Builder setTrunkBlock(Block block) { if (block != null) trunkProvider = SimpleStateProvider.simple(block.defaultBlockState()); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 35df76d78c..eb70ba8ca7 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -357,7 +357,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CHERRY_PINK_TREE1 = createConfiguredFeature("pink_cherry_tree1", BYGFeatures.CHERRY_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CHERRY_LOG.get()) + .setTrunkBlock(CHERRY.log()) .setLeavesBlock(BYGBlocks.PINK_CHERRY_LEAVES.get()) .setMaxHeight(21) .setMinHeight(14) @@ -366,7 +366,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CHERRY_PINK_TREE2 = createConfiguredFeature("pink_cherry_tree2", BYGFeatures.CHERRY_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CHERRY_LOG.get()) + .setTrunkBlock(CHERRY.log()) .setLeavesBlock(BYGBlocks.PINK_CHERRY_LEAVES.get()) .setMaxHeight(13) .setMinHeight(8) @@ -375,7 +375,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CHERRY_WHITE_TREE1 = createConfiguredFeature("white_cherry_tree1", BYGFeatures.CHERRY_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CHERRY_LOG.get()) + .setTrunkBlock(CHERRY.log()) .setLeavesBlock(BYGBlocks.WHITE_CHERRY_LEAVES.get()) .setMaxHeight(21) .setMinHeight(14) @@ -384,7 +384,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CHERRY_WHITE_TREE2 = createConfiguredFeature("white_cherry_tree2", BYGFeatures.CHERRY_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CHERRY_LOG.get()) + .setTrunkBlock(CHERRY.log()) .setLeavesBlock(BYGBlocks.WHITE_CHERRY_LEAVES.get()) .setMaxHeight(13) .setMinHeight(8) diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 37835cd6d8..1d91cec484 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -5,8 +5,11 @@ import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.Items; import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGBlockTags; import potionstudios.byg.common.block.BYGWoodTypes; import java.util.function.Consumer; @@ -73,11 +76,19 @@ protected void buildCraftingRecipes(Consumer consumer) { .define('#', Items.STICK) // TODO this should be a tag .define('W', type.planks()) .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); - ShapelessRecipeBuilder.shapeless(type.planks(), 4) - .group("wooden_planks") - .unlockedBy("has_logs", has(type.log())) - .requires(type.log()) // TODO tag - .save(consumer, BYG.createLocation("wood/" + type + "/planks")); + if (type == BYGWoodTypes.CHERRY) { + ShapelessRecipeBuilder.shapeless(type.planks(), 4) + .group("wooden_planks") + .unlockedBy("has_logs", has(type.log())) + .requires(ItemTags.create(BYG.createLocation("cherry_logs"))) + .save(consumer, BYG.createLocation("wood/" + type + "/planks")); + } else { + ShapelessRecipeBuilder.shapeless(type.planks(), 4) + .group("wooden_planks") + .unlockedBy("has_logs", has(type.log())) + .requires(type.log()) // TODO tag + .save(consumer, BYG.createLocation("wood/" + type + "/planks")); + } ShapedRecipeBuilder.shaped(type.pressurePlate()) .group("wooden_pressure_plate") .pattern("PP") From 94075769332102e599c3276491270919ae8b55a1 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 14:31:18 +0300 Subject: [PATCH 05/90] More datagen --- Common/build.gradle | 1 + Common/src/generated/resources/.cache/cache | 4 +- .../data/byg/recipes/wood/cherry/planks.json | 2 +- .../tags/blocks/mineable/shovel.json | 61 ++++++++++--------- .../byg/common/block/BYGWoodTypes.java | 28 +++++++-- .../byg/mixin/dev/BlockBehaviorAccess.java | 14 +++++ Common/src/main/resources/byg.mixins.json | 1 + .../providers/BYGBlockTagsProvider.java | 28 +++++++++ .../datagen/providers/BYGRecipeProviders.java | 18 ++---- 9 files changed, 107 insertions(+), 50 deletions(-) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/mineable/shovel.json (83%) create mode 100644 Common/src/main/java/potionstudios/byg/mixin/dev/BlockBehaviorAccess.java diff --git a/Common/build.gradle b/Common/build.gradle index 825c0e9142..24cbbae21a 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -37,6 +37,7 @@ processResources { filesMatching(['pack.mcmeta']) { expand buildProps } + exclude '.cache/cache' } tasks.withType(Javadoc) { diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 3ff463a77b..e0b02db3c1 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -120,7 +120,7 @@ f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf. b4cd0c2f83180f071060cbb47c2bc18b485cd329 data/byg/recipes/wood/cherry/door.json e70972b9e4b8503218933cf69caae4f28852558c data/byg/recipes/wood/cherry/fence.json 1b0d138a0e2653ae3daaf5e3af62893a45514ecb data/byg/recipes/wood/cherry/fence_gate.json -c2513e2dfb5d80b4e0aafcd98e4f683dc2c7da41 data/byg/recipes/wood/cherry/planks.json +f9f098edb149f3aa05bc38f8ec9b9c5a621646c7 data/byg/recipes/wood/cherry/planks.json 7a9a8fd4e78eb7200da14f359424fa885400425e data/byg/recipes/wood/cherry/pressure_plate.json 34165d5515938d8f03bc640c5c4d6095310ff503 data/byg/recipes/wood/cherry/slab.json e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json @@ -250,3 +250,5 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json +650ffcc2123f4f0501ae5efebd77bad2f81135da data/minecraft/tags/blocks/mineable/axe.json +cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json index 14653d934d..aebb25ae8a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "tag": "byg:cherry_logs" + "item": "byg:cherry_log" } ], "result": { diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json similarity index 83% rename from Common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json index 766f641df0..ce1b6c5a0f 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -1,46 +1,47 @@ { "replace": false, "values": [ - "byg:peat", + "byg:black_sand", + "byg:blue_petal_block", + "byg:blue_sand", + "byg:cattail_thatch", + "byg:cattail_thatch_carpet", + "byg:cattail_thatch_slab", + "byg:cattail_thatch_stairs", + "byg:chiseled_fungal_imparius", + "byg:chiseled_fungal_imparius_slab", + "byg:chiseled_fungal_imparius_stairs", + "byg:chiseled_fungal_imparius_wall", + "byg:cracked_red_sand", + "byg:embur_gel_block", + "byg:end_sand", + "byg:ether_soil", + "byg:fungal_imparius_block", + "byg:fungal_imparius_filament", + "byg:fungal_imparius_filament_block", + "byg:imparius_mushroom_block", + "byg:light_blue_petal_block", "byg:lush_dirt", "byg:lush_farmland", - "byg:ether_soil", + "byg:lush_grass_block", + "byg:lush_grass_path", "byg:mud_block", "byg:mud_bricks", + "byg:peat", + "byg:pink_sand", + "byg:purple_petal_block", + "byg:purple_sand", + "byg:purple_shroomlight", "byg:quartzite_sand", + "byg:red_petal_block", + "byg:shulkren_wart_block", + "byg:sythian_wart_block", "byg:wailing_bell_blossom", "byg:warped_soul_sand", "byg:warped_soul_soil", - "byg:sythian_wart_block", - "byg:embur_gel_block", - "byg:end_sand", - "byg:therium_lamp", - "byg:imparius_mushroom_block", - "byg:fungal_imparius_block", - "byg:chiseled_fungal_imparius", - "byg:chiseled_fungal_imparius_slab", - "byg:chiseled_fungal_imparius_stairs", - "byg:chiseled_fungal_imparius_wall", - "byg:fungal_imparius_filament_block", - "byg:fungal_imparius_filament", - "byg:shulkren_wart_block", - "byg:purple_shroomlight", - "byg:glowstone_lamp", - "byg:subzero_ash", - "byg:subzero_ash_block", "byg:white_petal_block", - "byg:red_petal_block", - "byg:purple_petal_block", - "byg:blue_petal_block", - "byg:light_blue_petal_block", - "byg:yellow_petal_block", - "byg:black_sand", "byg:white_sand", - "byg:blue_sand", - "byg:purple_sand", - "byg:pink_sand", "byg:windswept_sand", - "byg:lush_grass_block", - "byg:lush_grass_path" + "byg:yellow_petal_block" ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 5124eefe29..71391aab8a 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -19,11 +19,29 @@ import java.util.List; public enum BYGWoodTypes { - ASPEN("aspen", new Builder().boatType(BYGBoatEntity.BYGType.ASPEN).materialColor(MaterialColor.TERRACOTTA_YELLOW).growerItemGroundTag(BYGBlockTags.GROUND_ASPEN_SAPLING)), - BAOBAB("baobab", new Builder().boatType(BYGBoatEntity.BYGType.BAOBAB).growerItemGroundTag(BYGBlockTags.GROUND_BAOBAB_SAPLING).materialColor(MaterialColor.TERRACOTTA_GREEN)), - BLUE_ENCHANTED("blue_enchanted", new Builder().boatType(BYGBoatEntity.BYGType.BLUE_ENCHANTED).growerItemGroundTag(BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING).materialColor(MaterialColor.COLOR_BLUE).leavesLightLevel(15)), - BULBIS("bulbis", new Builder().materialColor(MaterialColor.COLOR_BLUE).growerItemGroundTag(BYGBlockTags.GROUND_BULBIS_ODDITY).growerItem(GrowerItemType.ODDITY).exclude(BlockType.LEAVES).stem()), - CHERRY("cherry", new Builder().exclude(BlockType.SAPLING).boatType(BYGBoatEntity.BYGType.CHERRY).exclude(BlockType.LEAVES)); + ASPEN("aspen", new Builder() + .boatType(BYGBoatEntity.BYGType.ASPEN) + .materialColor(MaterialColor.TERRACOTTA_YELLOW) + .growerItemGroundTag(BYGBlockTags.GROUND_ASPEN_SAPLING)), + BAOBAB("baobab", new Builder() + .boatType(BYGBoatEntity.BYGType.BAOBAB) + .growerItemGroundTag(BYGBlockTags.GROUND_BAOBAB_SAPLING) + .materialColor(MaterialColor.TERRACOTTA_GREEN)), + BLUE_ENCHANTED("blue_enchanted", new Builder() + .boatType(BYGBoatEntity.BYGType.BLUE_ENCHANTED) + .growerItemGroundTag(BYGBlockTags.GROUND_BLUE_ENCHANTED_SAPLING) + .materialColor(MaterialColor.COLOR_BLUE) + .leavesLightLevel(15)), + BULBIS("bulbis", new Builder() + .materialColor(MaterialColor.COLOR_BLUE) + .growerItemGroundTag(BYGBlockTags.GROUND_BULBIS_ODDITY) + .growerItem(GrowerItemType.ODDITY) + .exclude(BlockType.LEAVES) + .stem()), + CHERRY("cherry", new Builder() + .exclude(BlockType.SAPLING) + .boatType(BYGBoatEntity.BYGType.CHERRY) + .exclude(BlockType.LEAVES)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/mixin/dev/BlockBehaviorAccess.java b/Common/src/main/java/potionstudios/byg/mixin/dev/BlockBehaviorAccess.java new file mode 100644 index 0000000000..5b5aa5b7c9 --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/mixin/dev/BlockBehaviorAccess.java @@ -0,0 +1,14 @@ +package potionstudios.byg.mixin.dev; + +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.Material; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(BlockBehaviour.class) +public interface BlockBehaviorAccess { + + @Accessor + Material getMaterial(); + +} diff --git a/Common/src/main/resources/byg.mixins.json b/Common/src/main/resources/byg.mixins.json index 17087087ed..89a6a0731b 100644 --- a/Common/src/main/resources/byg.mixins.json +++ b/Common/src/main/resources/byg.mixins.json @@ -95,6 +95,7 @@ "common.world.level.dimension.MixinDimensionType", "common.world.level.storage.loot.MixinLootTableManager", "common.world.surface.MixinSurfaceSystem", + "dev.BlockBehaviorAccess", "dev.MixinMinecraftServer", "server.MixinMinecraftServer" ], diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java index dc21c437e8..a186d99e75 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java @@ -10,11 +10,15 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.material.Material; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; +import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.TagBuilderAccess; +import potionstudios.byg.mixin.dev.BlockBehaviorAccess; import potionstudios.byg.reg.RegistryObject; import java.util.*; @@ -30,6 +34,7 @@ public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelp super(pGenerator, Registry.BLOCK, BYG.MOD_ID, existingFileHelper); } + // TODO document what gets generated @Override protected void addTags() { tag( @@ -69,6 +74,22 @@ protected void addTags() { } this.tag(BYGBlockTags.GROUND_PALM_SAPLING).addTag(BlockTags.SAND).addTag(BlockTags.DIRT); this.tag(BYGBlockTags.GROUND_FAIRY_SLIPPER).addTag(BlockTags.LOGS); + + final var shovelMaterials = List.of(Material.DIRT, Material.GRASS, Material.SAND, Material.CLAY); + final var shovelMinable = tag(BlockTags.MINEABLE_WITH_SHOVEL); + PROVIDER.getEntries() + .stream() + .map(RegistryObject::get) + .filter(bl -> shovelMaterials.contains(((BlockBehaviorAccess) bl).getMaterial())) + .forEach(shovelMinable::add); + +// For now, until we get all wood moved +// final var axeMineable = tag(BlockTags.MINEABLE_WITH_AXE); +// for (BYGWoodTypes type : BYGWoodTypes.values()) { +// add(axeMineable, type.bookshelf(), type.button(), type.craftingTable(), type.door(), type.trapdoor(), type.planks(), type.fence(), type.fenceGate(), type.log(), type.wood(), type.strippedLog(), type.strippedWood(), type.pressurePlate(), type.sign(), type.wallSign(), type +// .slab(), type.stairs()); +// } + sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); } @@ -89,6 +110,13 @@ private void tag(TagKey tag, Supplier... blocks) { this.tag(tag).add(Arrays.stream(blocks).map(Supplier::get).toArray(Block[]::new)); } + @SafeVarargs + private void add(TagAppender tag, Supplier... values) { + for (final var sup : values) + if (sup != null) + tag.add(sup.get()); + } + @Override public String getName() { return "BYG Blocks"; diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 1d91cec484..5ce1f73694 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -76,19 +76,11 @@ protected void buildCraftingRecipes(Consumer consumer) { .define('#', Items.STICK) // TODO this should be a tag .define('W', type.planks()) .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); - if (type == BYGWoodTypes.CHERRY) { - ShapelessRecipeBuilder.shapeless(type.planks(), 4) - .group("wooden_planks") - .unlockedBy("has_logs", has(type.log())) - .requires(ItemTags.create(BYG.createLocation("cherry_logs"))) - .save(consumer, BYG.createLocation("wood/" + type + "/planks")); - } else { - ShapelessRecipeBuilder.shapeless(type.planks(), 4) - .group("wooden_planks") - .unlockedBy("has_logs", has(type.log())) - .requires(type.log()) // TODO tag - .save(consumer, BYG.createLocation("wood/" + type + "/planks")); - } + ShapelessRecipeBuilder.shapeless(type.planks(), 4) + .group("wooden_planks") + .unlockedBy("has_logs", has(type.log())) + .requires(type.log()) // TODO tag + .save(consumer, BYG.createLocation("wood/" + type + "/planks")); ShapedRecipeBuilder.shaped(type.pressurePlate()) .group("wooden_pressure_plate") .pattern("PP") From 726c66c477f12ec4953592485bfdc9fbd1365782 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 15:53:53 +0300 Subject: [PATCH 06/90] Move cika --- Common/src/generated/resources/.cache/cache | 39 +++++++++- .../assets/byg/models/block/aspen_log.json | 7 ++ .../assets/byg/models/block/baobab_log.json | 7 ++ .../byg/models/block/blue_enchanted_log.json | 7 ++ .../assets/byg/models/block/bulbis_stem.json | 7 ++ .../assets/byg/models/block/cherry_log.json | 7 ++ .../assets/byg/models/block/cika_log.json | 7 ++ .../assets/byg/models/item/aspen_log.json | 39 ++++++++++ .../assets/byg/models/item/baobab_log.json | 39 ++++++++++ .../byg/models/item/blue_enchanted_log.json | 19 ++++- .../assets/byg/models/item/bulbis_stem.json | 39 ++++++++++ .../assets/byg/models/item/cherry_log.json | 39 ++++++++++ .../assets/byg/models/item/cika_log.json | 39 ++++++++++ .../recipes/byg.byg/wood/cika/boat.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/bookshelf.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/button.json | 34 +++++++++ .../byg.byg/wood/cika/crafting_table.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/door.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/fence.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/fence_gate.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/planks.json | 34 +++++++++ .../byg.byg/wood/cika/pressure_plate.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/slab.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/stairs.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/trapdoor.json | 34 +++++++++ .../recipes/byg.byg/wood/cika/wood.json | 34 +++++++++ .../data/byg/recipes/wood/cika/boat.json} | 6 +- .../byg/recipes/wood/cika/bookshelf.json} | 11 +-- .../data/byg/recipes/wood/cika/button.json} | 0 .../recipes/wood/cika/crafting_table.json} | 7 +- .../data/byg/recipes/wood/cika/door.json} | 8 +- .../data/byg/recipes/wood/cika/fence.json} | 0 .../byg/recipes/wood/cika/fence_gate.json} | 0 .../data/byg/recipes/wood/cika/planks.json} | 4 +- .../recipes/wood/cika/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/cika/slab.json} | 4 +- .../data/byg/recipes/wood/cika/stairs.json} | 10 +-- .../data/byg/recipes/wood/cika/trapdoor.json} | 6 +- .../data/byg/recipes/wood/cika/wood.json} | 7 +- .../gui/biomepedia1/ItemsViewScreen.java | 11 +-- .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGCompostables.java | 13 ++-- .../byg/common/BYGFlammables.java | 44 ++++++----- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 ----- .../byg/common/block/BYGWoodType.java | 2 - .../byg/common/block/BYGWoodTypes.java | 8 +- .../byg/common/entity/boat/BYGBoatEntity.java | 4 +- .../byg/common/item/BYGItems.java | 23 +----- .../overworld/BYGOverworldTreeFeatures.java | 12 +-- .../assets/byg/models/block/aspen_log.json | 7 -- .../assets/byg/models/block/baobab_log.json | 7 -- .../byg/models/block/blue_enchanted_log.json | 7 -- .../assets/byg/models/block/bulbis_stem.json | 7 -- .../assets/byg/models/block/cherry_log.json | 7 -- .../assets/byg/models/block/cika_log.json | 7 -- .../assets/byg/models/item/aspen_log.json | 22 ------ .../assets/byg/models/item/baobab_log.json | 22 ------ .../assets/byg/models/item/bulbis_stem.json | 3 - .../assets/byg/models/item/cherry_log.json | 22 ------ .../assets/byg/models/item/cika_log.json | 22 ------ .../block/{aspen_log.png => aspen/log.png} | Bin .../{aspen_log_top.png => aspen/log_top.png} | Bin .../block/{baobab_log.png => baobab/log.png} | Bin .../log_top.png} | Bin .../log.png} | Bin .../log.png.mcmeta} | 0 .../log_top.png} | Bin .../block/{bulbis_stem.png => bulbis/log.png} | Bin .../log_top.png} | Bin .../block/{cherry_log.png => cherry/log.png} | Bin .../log_top.png} | Bin .../block/{cika_log.png => cika/log.png} | Bin .../{cika_log_top.png => cika/log_top.png} | Bin .../potionstudios/byg/datagen/BYGDataGen.java | 11 ++- .../datagen/providers/BYGAssetsProvider.java | 69 ++++++++++++++++++ 76 files changed, 897 insertions(+), 261 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_log.json rename Common/src/{main => generated}/resources/assets/byg/models/item/blue_enchanted_log.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_log.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json rename Common/src/{main/resources/data/byg/recipes/cika_boat.json => generated/resources/data/byg/recipes/wood/cika/boat.json} (84%) rename Common/src/{main/resources/data/byg/recipes/cika_bookshelf.json => generated/resources/data/byg/recipes/wood/cika/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/cika_button.json => generated/resources/data/byg/recipes/wood/cika/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cika_crafting_table.json => generated/resources/data/byg/recipes/wood/cika/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/cika_door.json => generated/resources/data/byg/recipes/wood/cika/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/cika_fence.json => generated/resources/data/byg/recipes/wood/cika/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cika_fence_gate.json => generated/resources/data/byg/recipes/wood/cika/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cika_planks.json => generated/resources/data/byg/recipes/wood/cika/planks.json} (71%) rename Common/src/{main/resources/data/byg/recipes/cika_pressure_plate.json => generated/resources/data/byg/recipes/wood/cika/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/cika_slab.json => generated/resources/data/byg/recipes/wood/cika/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/cika_cherry.json => generated/resources/data/byg/recipes/wood/cika/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/cika_trapdoor.json => generated/resources/data/byg/recipes/wood/cika/trapdoor.json} (86%) rename Common/src/{main/resources/data/byg/recipes/cika_wood.json => generated/resources/data/byg/recipes/wood/cika/wood.json} (78%) delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_log.json rename Common/src/main/resources/assets/byg/textures/block/{aspen_log.png => aspen/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_log_top.png => aspen/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_log.png => baobab/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_log_top.png => baobab/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_log.png => blue_enchanted/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_log.png.mcmeta => blue_enchanted/log.png.mcmeta} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_log_top.png => blue_enchanted/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_stem.png => bulbis/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_stem_top.png => bulbis/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_log.png => cherry/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_log_top.png => cherry/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_log.png => cika/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_log_top.png => cika/log_top.png} (100%) create mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index e0b02db3c1..c43faf1b3d 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -1,3 +1,15 @@ +7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen_log.json +3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab_log.json +fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted_log.json +f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis_stem.json +093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry_log.json +96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika_log.json +38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json +e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json +57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json +f2056b8b51a75bcd460fc546467ad30e88af4cd6 assets/byg/models/item/bulbis_stem.json +3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json +75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -62,6 +74,19 @@ fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/w 131415f581121f364e982090cd76e69de0d5c07c data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json 7c19345d226ea6e1a1adab274168dfe289200373 data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json 4277c921c71f28463f09b2ca099f99bef21ada03 data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json +880e327783f05849d5b9f76db856276129229b05 data/byg/advancements/recipes/byg.byg/wood/cika/boat.json +6db36c0851ed3dba1011af2efd7bb34675f88620 data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json +06c046e7482dbeb32b720c27210fb8078d217626 data/byg/advancements/recipes/byg.byg/wood/cika/button.json +496353afae5dd68db59bd0e4ae42924cdaa82cf0 data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json +ddbd1ecd8afe20b7be22ddb9105886a3bbb52375 data/byg/advancements/recipes/byg.byg/wood/cika/door.json +1863f6ddef21684706dbeee59720bbf07b735b08 data/byg/advancements/recipes/byg.byg/wood/cika/fence.json +6551ec208aba255c717faad92d7646ff435e2dca data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json +ed3b3c4ebb8770fb3fa40cd7569972724c035f32 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json +d9615b7a10088c08da377d5037e9264235f0eced data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json +761cabe05bc9c0ea350782e2acbccabcec112bf7 data/byg/advancements/recipes/byg.byg/wood/cika/slab.json +280574a7a2a3df2ab428677d10f15cefe9af326e data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json +dcaafbd26e9fc567180c8dc46b465b515473a713 data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json +b8f23159b7ff36e757d4782411514205527913ba data/byg/advancements/recipes/byg.byg/wood/cika/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -126,6 +151,19 @@ f9f098edb149f3aa05bc38f8ec9b9c5a621646c7 data/byg/recipes/wood/cherry/planks.jso e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json f2e078bc274292f6555d1e28d485f9b7b6641de2 data/byg/recipes/wood/cherry/trapdoor.json 68789845ea93600e6fe7cb420a98157a5488ed65 data/byg/recipes/wood/cherry/wood.json +581f671e542900899612da305c2e47bab58ff1d3 data/byg/recipes/wood/cika/boat.json +c3931becfcf4f37f896ec97b536aad2a006a26aa data/byg/recipes/wood/cika/bookshelf.json +1225b84e5ab6917972f15229e2733c17c9265aba data/byg/recipes/wood/cika/button.json +ee25638100ad8238083995c754da3aecc36a46e6 data/byg/recipes/wood/cika/crafting_table.json +10202553084d0d7950261e8d350bb8d706adf428 data/byg/recipes/wood/cika/door.json +276810bd6a9c3514cb0f9eae361dee4232fcd222 data/byg/recipes/wood/cika/fence.json +7a20c825a465ed5cca2a2b5a21e5246e5eff5e90 data/byg/recipes/wood/cika/fence_gate.json +e4d53c24c89b80e81ca38dcec9729fd850cbcc52 data/byg/recipes/wood/cika/planks.json +94f6ec4de852211c4b2108527f215c7f9a31d39a data/byg/recipes/wood/cika/pressure_plate.json +da0c6a3d35ec44c43f0dd23a8f67c672476379bc data/byg/recipes/wood/cika/slab.json +deca528a6fd5b0a2445ee388685a857ba2ad3463 data/byg/recipes/wood/cika/stairs.json +3f0f2756422aa6c65d4c248ce38464df692a749a data/byg/recipes/wood/cika/trapdoor.json +8e45c9d7b92db703152be1c93bed84ec0cb786f1 data/byg/recipes/wood/cika/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -250,5 +288,4 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json -650ffcc2123f4f0501ae5efebd77bad2f81135da data/minecraft/tags/blocks/mineable/axe.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_log.json b/Common/src/generated/resources/assets/byg/models/block/aspen_log.json new file mode 100644 index 0000000000..06e8a45e49 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/aspen/log", + "end": "byg:block/aspen/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_log.json b/Common/src/generated/resources/assets/byg/models/block/baobab_log.json new file mode 100644 index 0000000000..4825408dce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/baobab/log", + "end": "byg:block/baobab/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json new file mode 100644 index 0000000000..4b36ebd4b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/blue_enchanted/log", + "end": "byg:block/blue_enchanted/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json new file mode 100644 index 0000000000..8085d5b223 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/bulbis/log", + "end": "byg:block/bulbis/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_log.json b/Common/src/generated/resources/assets/byg/models/block/cherry_log.json new file mode 100644 index 0000000000..c0935d77f4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cherry/log", + "end": "byg:block/cherry/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_log.json b/Common/src/generated/resources/assets/byg/models/block/cika_log.json new file mode 100644 index 0000000000..8e1572cf1b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cika/log", + "end": "byg:block/cika/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_log.json b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json new file mode 100644 index 0000000000..f0af62afb7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_log.json b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json new file mode 100644 index 0000000000..d95de2ab00 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json similarity index 50% rename from Common/src/main/resources/assets/byg/models/item/blue_enchanted_log.json rename to Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json index 2b81358c6a..0f6c77dd21 100644 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json @@ -1,7 +1,24 @@ { "parent": "byg:block/blue_enchanted_log", "display": { - "thirdperson": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { "rotation": [ 10, -45, diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json new file mode 100644 index 0000000000..e232b45eaf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_stem", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_log.json b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json new file mode 100644 index 0000000000..2800b33ac7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_log.json b/Common/src/generated/resources/assets/byg/models/item/cika_log.json new file mode 100644 index 0000000000..29d4bf16f0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json new file mode 100644 index 0000000000..c782defc02 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json new file mode 100644 index 0000000000..8d6ed76cd2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json new file mode 100644 index 0000000000..2ccc6faca0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json new file mode 100644 index 0000000000..4d89c927fb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json new file mode 100644 index 0000000000..87eab0642f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json new file mode 100644 index 0000000000..edd42628db --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json new file mode 100644 index 0000000000..911dc9c5b5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json new file mode 100644 index 0000000000..c678816fba --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json new file mode 100644 index 0000000000..f4fa085aeb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json new file mode 100644 index 0000000000..47c24f5aad --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json new file mode 100644 index 0000000000..8aed4e2c4e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json new file mode 100644 index 0000000000..253fcbdb78 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json new file mode 100644 index 0000000000..4ffe3ec7cc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cika_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/cika_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json index 8874008442..ff6f966f1c 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/cika_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json index f6b8255b33..9dc2531623 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_button.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cika_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/button.json diff --git a/Common/src/main/resources/data/byg/recipes/cika_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/cika_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json index bbcb68b76e..aa1b5a1802 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_door.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/cika_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/door.json index 30d432685d..17331a60a2 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cika_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/cika_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cika_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/cika_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json similarity index 71% rename from Common/src/main/resources/data/byg/recipes/cika_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json index 12198e0886..ae116edcfa 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:cika_logs" + "item": "byg:cika_log" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/cika_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/cika_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json index 31c15ad2b7..9c4ac16185 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/cika_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json index b4406a2e7e..1681894bb5 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_cherry.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/cika_cherry.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json index 7c1be10219..72bc735cac 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_cherry.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, "result": { - "item": "byg:cika_stairs", + "item": "byg:cika_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cika_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/cika_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json index 87193d499b..48133ca973 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cika_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cika_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/cika_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json index e3b61d8ac3..29918ceee4 100644 --- a/Common/src/main/resources/data/byg/recipes/cika_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:cika_log" } }, diff --git a/Common/src/main/java/potionstudios/byg/client/gui/biomepedia1/ItemsViewScreen.java b/Common/src/main/java/potionstudios/byg/client/gui/biomepedia1/ItemsViewScreen.java index 6af572c12c..f54e0ec844 100644 --- a/Common/src/main/java/potionstudios/byg/client/gui/biomepedia1/ItemsViewScreen.java +++ b/Common/src/main/java/potionstudios/byg/client/gui/biomepedia1/ItemsViewScreen.java @@ -13,10 +13,13 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import potionstudios.byg.BYG; +import potionstudios.byg.common.item.BYGItems; +import java.util.Collection; import java.util.List; import java.util.function.Consumer; import java.util.function.Predicate; +import java.util.function.Supplier; public class ItemsViewScreen extends Screen { @@ -67,12 +70,10 @@ protected void init() { } private void createMenu() { - createMenu(key -> Registry.ITEM.getKey(key).getNamespace().equals(BYG.MOD_ID), 7, 10); + createMenu(BYGItems.PROVIDER.getEntries().>toArray(Supplier[]::new), 7, 10); } - private void createMenu(Predicate filter, int rowLength, int columnLength) { - Item[] bygItems = Registry.ITEM.stream().filter(filter).toArray(Item[]::new); - + private void createMenu(Supplier[] bygItems, int rowLength, int columnLength) { this.maxPagePairCount = (bygItems.length / (rowLength * columnLength)) / 2 + 1; items = new ItemWidget[maxPagePairCount][2][columnLength][rowLength]; int registryIdx = 0; @@ -91,7 +92,7 @@ private void createMenu(Predicate filter, int rowLength, int columnLength) if (registryIdx > bygItems.length - 1) { break; } - ItemWidget itemWidget = new ItemWidget(new ItemStack(bygItems[registryIdx]), this.itemRenderer, xOffset + startX, yOffset, buttonSize, buttonSize, button -> { + ItemWidget itemWidget = new ItemWidget(bygItems[registryIdx].get().getDefaultInstance(), this.itemRenderer, xOffset + startX, yOffset, buttonSize, buttonSize, button -> { Item item = button.stack.getItem(); if (button.hasAdditonalInfo) { if (item instanceof BlockItem blockItem) { diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index dbb8d28f4d..fa7c51dbdf 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -141,7 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.CIKA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_DOOR.get(), RenderType.cutoutMipped()); @@ -167,7 +166,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.CIKA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -208,7 +206,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_OAK_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CYPRESS_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.CIKA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index ec027eff50..038e821d47 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -6,17 +6,20 @@ import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; +import javax.annotation.Nullable; + public class BYGCompostables { - public static void compostibleBlocks(float chance, ItemLike item) { - ComposterBlock.COMPOSTABLES.put(item.asItem(), chance); + public static void compostibleBlocks(float chance, @Nullable ItemLike item) { + if (item != null) + ComposterBlock.COMPOSTABLES.put(item.asItem(), chance); } public static void compostablesBYG() { BYG.LOGGER.debug("BYG: Adding Compostible Blocks..."); for (BYGWoodTypes type : BYGWoodTypes.values()) { - compostibleBlocks(0.3f, type.leaves().get()); - compostibleBlocks(0.3f, type.growerItem().get()); + compostibleBlocks(0.3f, type.leaves()); + compostibleBlocks(0.3f, type.growerItem()); } //Leaves @@ -24,7 +27,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.CIKA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.CYPRESS_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.EBONY_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FIR_LEAVES.get()); @@ -71,7 +73,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.CIKA_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.CYPRESS_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.EBONY_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.FIR_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index b2dddc3769..0f0eec9f04 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -7,31 +7,38 @@ import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.FireBlockAccess; +import potionstudios.byg.reg.RegistryObject; + +import javax.annotation.Nullable; public class BYGFlammables { - public static void flammableBlock(Block block, int flameOdds, int burnOdds) { - FireBlock fire = (FireBlock) Blocks.FIRE; - ((FireBlockAccess) fire).byg_setFlammable(block, flameOdds, burnOdds); + public static void flammableBlock(@Nullable Block block, int flameOdds, int burnOdds) { + if (block != null) { + FireBlock fire = (FireBlock) Blocks.FIRE; + ((FireBlockAccess) fire).byg_setFlammable(block, flameOdds, burnOdds); + } + } + public static void flammableBlock(@Nullable RegistryObject block, int flameOdds, int burnOdds) { + flammableBlock(block == null ? null : block.get(), flameOdds, burnOdds); } public static void flammablesBYG() { BYG.LOGGER.debug("BYG: Adding Flammables..."); for (BYGWoodTypes type : BYGWoodTypes.values()) { - flammableBlock(type.log().get(), 5, 5); - flammableBlock(type.strippedLog().get(), 5, 5); - flammableBlock(type.wood().get(), 5, 5); - flammableBlock(type.strippedWood().get(), 5, 5); - flammableBlock(type.bookshelf().get(), 5, 20); - flammableBlock(type.slab().get(), 5, 20); - flammableBlock(type.stairs().get(), 5, 20); - flammableBlock(type.planks().get(), 5, 20); - flammableBlock(type.fence().get(), 5, 20); - flammableBlock(type.leaves().get(), 30, 60); + flammableBlock(type.log(), 5, 5); + flammableBlock(type.strippedLog(), 5, 5); + flammableBlock(type.wood(), 5, 5); + flammableBlock(type.strippedWood(), 5, 5); + flammableBlock(type.bookshelf(), 5, 20); + flammableBlock(type.slab(), 5, 20); + flammableBlock(type.stairs(), 5, 20); + flammableBlock(type.planks(), 5, 20); + flammableBlock(type.fence(), 5, 20); + flammableBlock(type.leaves(), 30, 60); } //Logs - flammableBlock(BYGBlocks.CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.FIR_LOG.get(), 5, 5); flammableBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get(), 5, 5); @@ -50,7 +57,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_CIKA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_LOG.get(), 5, 5); @@ -69,7 +75,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.FIR_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), 5, 5); @@ -88,7 +93,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_CIKA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_CYPRESS_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_WOOD.get(), 5, 5); @@ -107,7 +111,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.CIKA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.FIR_BOOKSHELF.get(), 5, 20); @@ -127,7 +130,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.CIKA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.FIR_SLAB.get(), 5, 20); @@ -147,7 +149,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.CIKA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_STAIRS.get(), 5, 20); @@ -167,7 +168,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.CIKA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_PLANKS.get(), 5, 20); @@ -187,7 +187,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.CIKA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.CYPRESS_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.FIR_FENCE.get(), 5, 20); @@ -211,7 +210,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_OAK_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.CIKA_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.CYPRESS_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.EBONY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FIR_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 2dbdd84a39..5a77b5315a 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,7 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.CIKA_LOG.get(), BYGBlocks.STRIPPED_CIKA_LOG.get()); stripables.put(BYGBlocks.CYPRESS_LOG.get(), BYGBlocks.STRIPPED_CYPRESS_LOG.get()); stripables.put(BYGBlocks.EBONY_LOG.get(), BYGBlocks.STRIPPED_EBONY_LOG.get()); stripables.put(BYGBlocks.FIR_LOG.get(), BYGBlocks.STRIPPED_FIR_LOG.get()); @@ -49,7 +48,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.CIKA_WOOD.get(), BYGBlocks.STRIPPED_CIKA_WOOD.get()); stripables.put(BYGBlocks.CYPRESS_WOOD.get(), BYGBlocks.STRIPPED_CYPRESS_WOOD.get()); stripables.put(BYGBlocks.EBONY_WOOD.get(), BYGBlocks.STRIPPED_EBONY_WOOD.get()); stripables.put(BYGBlocks.FIR_WOOD.get(), BYGBlocks.STRIPPED_FIR_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 215d2fe410..bd029856d8 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject CIKA_PLANKS = createPlanks("cika_planks"); public static final BlockRegistryObject CYPRESS_PLANKS = createPlanks("cypress_planks"); public static final BlockRegistryObject EBONY_PLANKS = createPlanks("ebony_planks"); public static final BlockRegistryObject FIR_PLANKS = createPlanks("fir_planks"); @@ -87,7 +86,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject CIKA_BOOKSHELF = createBookshelf("cika_bookshelf"); public static final BlockRegistryObject CYPRESS_BOOKSHELF = createBookshelf("cypress_bookshelf"); public static final BlockRegistryObject EBONY_BOOKSHELF = createBookshelf("ebony_bookshelf"); public static final BlockRegistryObject FIR_BOOKSHELF = createBookshelf("fir_bookshelf"); @@ -112,7 +110,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject CIKA_DOOR = createDoor("cika_door"); public static final BlockRegistryObject CYPRESS_DOOR = createDoor("cypress_door"); public static final BlockRegistryObject EBONY_DOOR = createDoor("ebony_door"); public static final BlockRegistryObject FIR_DOOR = createDoor("fir_door"); @@ -137,7 +134,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject CIKA_PRESSURE_PLATE = createWoodPressurePlate("cika_pressure_plate"); public static final BlockRegistryObject CYPRESS_PRESSURE_PLATE = createWoodPressurePlate("cypress_pressure_plate"); public static final BlockRegistryObject EBONY_PRESSURE_PLATE = createWoodPressurePlate("ebony_pressure_plate"); public static final BlockRegistryObject FIR_PRESSURE_PLATE = createWoodPressurePlate("fir_pressure_plate"); @@ -162,7 +158,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject CIKA_BUTTON = createWoodButton("cika_button"); public static final BlockRegistryObject CYPRESS_BUTTON = createWoodButton("cypress_button"); public static final BlockRegistryObject EBONY_BUTTON = createWoodButton("ebony_button"); public static final BlockRegistryObject FIR_BUTTON = createWoodButton("fir_button"); @@ -187,7 +182,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject CIKA_TRAPDOOR = createTrapDoor("cika_trapdoor"); public static final BlockRegistryObject CYPRESS_TRAPDOOR = createTrapDoor("cypress_trapdoor"); public static final BlockRegistryObject EBONY_TRAPDOOR = createTrapDoor("ebony_trapdoor"); public static final BlockRegistryObject FIR_TRAPDOOR = createTrapDoor("fir_trapdoor"); @@ -212,7 +206,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject CIKA_CRAFTING_TABLE = createCraftingTable("cika_crafting_table"); public static final BlockRegistryObject CYPRESS_CRAFTING_TABLE = createCraftingTable("cypress_crafting_table"); public static final BlockRegistryObject EBONY_CRAFTING_TABLE = createCraftingTable("ebony_crafting_table"); public static final BlockRegistryObject FIR_CRAFTING_TABLE = createCraftingTable("fir_crafting_table"); @@ -237,7 +230,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject CIKA_FENCE_GATE = createFenceGate("cika_fence_gate"); public static final BlockRegistryObject CYPRESS_FENCE_GATE = createFenceGate("cypress_fence_gate"); public static final BlockRegistryObject EBONY_FENCE_GATE = createFenceGate("ebony_fence_gate"); public static final BlockRegistryObject FIR_FENCE_GATE = createFenceGate("fir_fence_gate"); @@ -262,7 +254,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject CIKA_SLAB = createWoodSlab("cika_slab"); public static final BlockRegistryObject CYPRESS_SLAB = createWoodSlab("cypress_slab"); public static final BlockRegistryObject EBONY_SLAB = createWoodSlab("ebony_slab"); public static final BlockRegistryObject FIR_SLAB = createWoodSlab("fir_slab"); @@ -287,7 +278,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject CIKA_STAIRS = createWoodStairs("cika_stairs"); public static final BlockRegistryObject CYPRESS_STAIRS = createWoodStairs("cypress_stairs"); public static final BlockRegistryObject EBONY_STAIRS = createWoodStairs("ebony_stairs"); public static final BlockRegistryObject FIR_STAIRS = createWoodStairs("fir_stairs"); @@ -312,7 +302,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject CIKA_FENCE = createFence("cika_fence"); public static final BlockRegistryObject CYPRESS_FENCE = createFence("cypress_fence"); public static final BlockRegistryObject EBONY_FENCE = createFence("ebony_fence"); public static final BlockRegistryObject FIR_FENCE = createFence("fir_fence"); @@ -337,7 +326,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject CIKA_SIGN = createSign("cika_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_SIGN = createSign("cypress_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_SIGN = createSign("ebony_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_SIGN = createSign("fir_sign", BYGWoodType.FIR, FIR_PLANKS); @@ -362,7 +350,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject CIKA_WALL_SIGN = createWallSign("cika_wall_sign", BYGWoodType.CIKA, CIKA_PLANKS); public static final BlockRegistryObject CYPRESS_WALL_SIGN = createWallSign("cypress_wall_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_WALL_SIGN = createWallSign("ebony_wall_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_WALL_SIGN = createWallSign("fir_wall_sign", BYGWoodType.FIR, FIR_PLANKS); @@ -403,7 +390,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); - public static final BlockRegistryObject CIKA_SAPLING = createSapling(BYGBlockTags.GROUND_CIKA_SAPLING, "cika_sapling"); public static final BlockRegistryObject CYPRESS_SAPLING = createSapling(BYGBlockTags.GROUND_CYPRESS_SAPLING, "cypress_sapling"); public static final BlockRegistryObject EBONY_SAPLING = createSapling(BYGBlockTags.GROUND_EBONY_SAPLING, "ebony_sapling"); public static final BlockRegistryObject FIR_SAPLING = createSapling(BYGBlockTags.GROUND_FIR_SAPLING, "fir_sapling"); @@ -457,7 +443,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); public static final BlockRegistryObject BROWN_ZELKOVA_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_zelkova_leaves"); - public static final BlockRegistryObject CIKA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_ORANGE, "cika_leaves"); public static final BlockRegistryObject CYPRESS_LEAVES = createLeaves(MaterialColor.TERRACOTTA_LIGHT_GREEN, "cypress_leaves"); public static final BlockRegistryObject EBONY_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ebony_leaves"); public static final BlockRegistryObject FIR_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "fir_leaves"); @@ -786,7 +771,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject CIKA_LOG = createLog("cika_log"); public static final BlockRegistryObject CYPRESS_LOG = createLog("cypress_log"); public static final BlockRegistryObject EBONY_LOG = createLog("ebony_log"); public static final BlockRegistryObject FIR_LOG = createLog("fir_log"); @@ -816,7 +800,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject CIKA_WOOD = createWood("cika_wood"); public static final BlockRegistryObject CYPRESS_WOOD = createWood("cypress_wood"); public static final BlockRegistryObject EBONY_WOOD = createWood("ebony_wood"); public static final BlockRegistryObject FIR_WOOD = createWood("fir_wood"); @@ -970,7 +953,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_CIKA_LOG = createStrippedLog("stripped_cika_log"); public static final BlockRegistryObject STRIPPED_CYPRESS_LOG = createStrippedLog("stripped_cypress_log"); public static final BlockRegistryObject STRIPPED_EBONY_LOG = createStrippedLog("stripped_ebony_log"); public static final BlockRegistryObject STRIPPED_FIR_LOG = createStrippedLog("stripped_fir_log"); @@ -995,7 +977,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_CIKA_WOOD = createWood("stripped_cika_wood"); public static final BlockRegistryObject STRIPPED_CYPRESS_WOOD = createWood("stripped_cypress_wood"); public static final BlockRegistryObject STRIPPED_EBONY_WOOD = createWood("stripped_ebony_wood"); public static final BlockRegistryObject STRIPPED_FIR_WOOD = createWood("stripped_fir_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 139393fe7f..4287b733c4 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,7 +10,6 @@ // TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType CIKA = register("cika"); public static final WoodType CYPRESS = register("cypress"); public static final WoodType EBONY = register("ebony"); public static final WoodType FIR = register("fir"); @@ -31,7 +30,6 @@ public class BYGWoodType { public static final WoodType EMBUR = register("embur"); public static final WoodType PALM = register("palm"); public static final WoodType LAMENT = register("lament"); - public static final WoodType BULBIS = register("bulbis"); public static final WoodType NIGHTSHADE = register("nightshade"); public static final WoodType ETHER = register("ether"); public static final WoodType IMPARIUS = register("imparius"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 71391aab8a..300f56e845 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -39,9 +39,11 @@ public enum BYGWoodTypes { .exclude(BlockType.LEAVES) .stem()), CHERRY("cherry", new Builder() - .exclude(BlockType.SAPLING) - .boatType(BYGBoatEntity.BYGType.CHERRY) - .exclude(BlockType.LEAVES)); + .exclude(BlockType.SAPLING, BlockType.LEAVES) + .boatType(BYGBoatEntity.BYGType.CHERRY)), + CIKA("cika", new Builder() + .boatType(BYGBoatEntity.BYGType.CIKA) + .materialColor(MaterialColor.TERRACOTTA_ORANGE)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 5d91844c39..420a9b8ef3 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -52,7 +52,7 @@ public Item getDropItem() { case BAOBAB -> BYGWoodTypes.BAOBAB.boat().get(); case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.boat().get(); case CHERRY -> BYGWoodTypes.CHERRY.boat().get(); - case CIKA -> BYGItems.CIKA_BOAT.get(); + case CIKA -> BYGWoodTypes.CIKA.boat().get(); case CYPRESS -> BYGItems.CYPRESS_BOAT.get(); case EBONY -> BYGItems.EBONY_BOAT.get(); case FIR -> BYGItems.FIR_BOAT.get(); @@ -79,7 +79,7 @@ public Block getPlanks() { case BAOBAB -> BYGWoodTypes.BAOBAB.planks().get(); case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.planks().get(); case CHERRY -> BYGWoodTypes.CHERRY.planks().get(); - case CIKA -> BYGBlocks.CIKA_PLANKS.get(); + case CIKA -> BYGWoodTypes.CIKA.planks().get(); case CYPRESS -> BYGBlocks.CYPRESS_PLANKS.get(); case EBONY -> BYGBlocks.EBONY_PLANKS.get(); case FIR -> BYGBlocks.FIR_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 9c77a0403c..59f76cf4a1 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -282,28 +282,9 @@ public class BYGItems { WHITE_CHERRY_FOLIAGE = createItem(BYGBlocks.WHITE_CHERRY_FOLIAGE); WHITE_CHERRY_LEAVES = createItem(BYGBlocks.WHITE_CHERRY_LEAVES); BYGWoodTypes.CHERRY.init(); - } - //Cika Woodtype - public static final RegistryObject CIKA_SAPLING = createSaplingItem(BYGBlocks.CIKA_SAPLING); - public static final RegistryObject CIKA_LEAVES = createItem(BYGBlocks.CIKA_LEAVES); - public static final RegistryObject CIKA_LOG = createItem(BYGBlocks.CIKA_LOG); - public static final RegistryObject CIKA_WOOD = createItem(BYGBlocks.CIKA_WOOD); - public static final RegistryObject STRIPPED_CIKA_LOG = createItem(BYGBlocks.STRIPPED_CIKA_LOG); - public static final RegistryObject STRIPPED_CIKA_WOOD = createItem(BYGBlocks.STRIPPED_CIKA_WOOD); - public static final RegistryObject CIKA_PLANKS = createItem(BYGBlocks.CIKA_PLANKS); - public static final RegistryObject CIKA_BOOKSHELF = createItem(BYGBlocks.CIKA_BOOKSHELF); - public static final RegistryObject CIKA_CRAFTING_TABLE = createItem(BYGBlocks.CIKA_CRAFTING_TABLE); - public static final RegistryObject CIKA_STAIRS = createItem(BYGBlocks.CIKA_STAIRS); - public static final RegistryObject CIKA_SLAB = createItem(BYGBlocks.CIKA_SLAB); - public static final RegistryObject CIKA_FENCE = createItem(BYGBlocks.CIKA_FENCE); - public static final RegistryObject CIKA_FENCE_GATE = createItem(BYGBlocks.CIKA_FENCE_GATE); - public static final RegistryObject CIKA_DOOR = createItem(BYGBlocks.CIKA_DOOR); - public static final RegistryObject CIKA_TRAPDOOR = createItem(BYGBlocks.CIKA_TRAPDOOR); - public static final RegistryObject CIKA_PRESSURE_PLATE = createItem(BYGBlocks.CIKA_PRESSURE_PLATE); - public static final RegistryObject CIKA_BUTTON = createItem(BYGBlocks.CIKA_BUTTON); - public static final RegistryObject CIKA_SIGN = createSign("cika_sign", BYGBlocks.CIKA_SIGN, BYGBlocks.CIKA_WALL_SIGN); - public static final RegistryObject CIKA_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.CIKA, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "cika_boat"); + BYGWoodTypes.CIKA.init(); + } //Cypress Woodtype public static final RegistryObject CYPRESS_SAPLING = createSaplingItem(BYGBlocks.CYPRESS_SAPLING); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index eb70ba8ca7..8639ba6621 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -393,8 +393,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> CIKA_TREE1 = createConfiguredFeature("cika_tree1", BYGFeatures.CIKA_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CIKA_LOG.get()) - .setLeavesBlock(BYGBlocks.CIKA_LEAVES.get()) + .setTrunkBlock(CIKA.log().get()) + .setLeavesBlock(CIKA.leaves().get()) .setMaxHeight(21) .setMinHeight(14) .build() @@ -402,8 +402,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> CIKA_TREE2 = createConfiguredFeature("cika_tree2", BYGFeatures.CIKA_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CIKA_LOG.get()) - .setLeavesBlock(BYGBlocks.CIKA_LEAVES.get()) + .setTrunkBlock(CIKA.log().get()) + .setLeavesBlock(CIKA.leaves().get()) .setMaxHeight(21) .setMinHeight(14) .build() @@ -411,8 +411,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> CIKA_TREE3 = createConfiguredFeature("cika_tree3", BYGFeatures.CIKA_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CIKA_LOG.get()) - .setLeavesBlock(BYGBlocks.CIKA_LEAVES.get()) + .setTrunkBlock(CIKA.log().get()) + .setLeavesBlock(CIKA.leaves().get()) .setMaxHeight(21) .setMinHeight(14) .build() diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_log.json b/Common/src/main/resources/assets/byg/models/block/aspen_log.json deleted file mode 100644 index 97645f758f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/aspen_log_top", - "side": "byg:block/aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_log.json b/Common/src/main/resources/assets/byg/models/block/baobab_log.json deleted file mode 100644 index 7b1d87c049..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/baobab_log_top", - "side": "byg:block/baobab_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_log.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_log.json deleted file mode 100644 index cbb618075e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/blue_enchanted_log_top", - "side": "byg:block/blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_stem.json b/Common/src/main/resources/assets/byg/models/block/bulbis_stem.json deleted file mode 100644 index 56dc27ea57..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/bulbis_stem_top", - "side": "byg:block/bulbis_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_log.json b/Common/src/main/resources/assets/byg/models/block/cherry_log.json deleted file mode 100644 index 4c820d752b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/cherry_log_top", - "side": "byg:block/cherry_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_log.json b/Common/src/main/resources/assets/byg/models/block/cika_log.json deleted file mode 100644 index 51e7558ec6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/cika_log_top", - "side": "byg:block/cika_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_log.json b/Common/src/main/resources/assets/byg/models/item/aspen_log.json deleted file mode 100644 index 252dd29a06..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_log.json b/Common/src/main/resources/assets/byg/models/item/baobab_log.json deleted file mode 100644 index e9590ea5d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_stem.json b/Common/src/main/resources/assets/byg/models/item/bulbis_stem.json deleted file mode 100644 index 32d7793705..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_stem" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_log.json b/Common/src/main/resources/assets/byg/models/item/cherry_log.json deleted file mode 100644 index 66c56a353a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_log.json b/Common/src/main/resources/assets/byg/models/item/cika_log.json deleted file mode 100644 index 05f0c413bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_log.png b/Common/src/main/resources/assets/byg/textures/block/aspen/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_log.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_log_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_log.png b/Common/src/main/resources/assets/byg/textures/block/baobab/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_log.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_log_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log.png.mcmeta b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log.png.mcmeta similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log.png.mcmeta rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log.png.mcmeta diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_stem.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_stem.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_stem_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_log.png b/Common/src/main/resources/assets/byg/textures/block/cherry/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_log.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cherry/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_log.png b/Common/src/main/resources/assets/byg/textures/block/cika/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_log.png rename to Common/src/main/resources/assets/byg/textures/block/cika/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cika/log_top.png diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java index 998329b362..124306a022 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java @@ -4,6 +4,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; +import potionstudios.byg.datagen.providers.BYGAssetsProvider; import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; import potionstudios.byg.datagen.providers.BYGRecipeProviders; @@ -14,8 +15,14 @@ public class BYGDataGen { static void onDatagen(final GatherDataEvent event) { final var gen = event.getGenerator(); final var existingFileHelper = event.getExistingFileHelper(); - gen.addProvider(new BYGBlockTagsProvider(gen, existingFileHelper)); - gen.addProvider(new BYGRecipeProviders(gen)); + + if (event.includeServer()) { + gen.addProvider(new BYGBlockTagsProvider(gen, existingFileHelper)); + gen.addProvider(new BYGRecipeProviders(gen)); + } + if (event.includeClient()) { + gen.addProvider(new BYGAssetsProvider(gen, existingFileHelper)); + } } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java new file mode 100644 index 0000000000..c8a41b35c3 --- /dev/null +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java @@ -0,0 +1,69 @@ +package potionstudios.byg.datagen.providers; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.HashCache; +import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelBuilder; +import net.minecraftforge.common.data.ExistingFileHelper; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGWoodTypes; + +import java.io.IOException; + +public class BYGAssetsProvider extends BlockModelProvider { + private final ItemProvider item; + public BYGAssetsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, BYG.MOD_ID, existingFileHelper); + this.item = new ItemProvider(generator, existingFileHelper); + } + + @Override + protected void registerModels() { + + for (final var type : BYGWoodTypes.values()) { + final var log = cubeColumn(type.log().getId().getPath(), BYG.createLocation("block/" + type + "/log"), BYG.createLocation("block/" + type + "/log_top")); + item.withExistingParent(type.log().getId().getPath(), log.getLocation()) + .transforms() + .transform(ModelBuilder.Perspective.THIRDPERSON_LEFT) + .rotation(10, -45, 170) + .translation(0, 1.5f, -2.75f) + .scale(0.375f, 0.375f, 0.375f) + .end() + .transform(ModelBuilder.Perspective.THIRDPERSON_RIGHT) + .rotation(10, -45, 170) + .translation(0, 1.5f, -2.75f) + .scale(0.375f, 0.375f, 0.375f) + .end() + .end(); + } + } + + public ItemModelBuilder item(String path) { + return item.getBuilder(path); + } + + @Override + public void run(HashCache cache) throws IOException { + super.run(cache); + item.generateAll(cache); + } + + private static final class ItemProvider extends ItemModelProvider { + + public ItemProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, BYG.MOD_ID, existingFileHelper); + } + + @Override + protected void registerModels() { + + } + + @Override + public void generateAll(HashCache cache) { + super.generateAll(cache); + } + } +} From e64bad86adf40470f51695cfc861b13b24538e83 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 16:21:37 +0300 Subject: [PATCH 07/90] Move cypress --- Common/src/generated/resources/.cache/cache | 28 +++++++++++++ .../assets/byg/models/block/cypress_log.json | 7 ++++ .../assets/byg/models/item/cypress_log.json | 39 ++++++++++++++++++ .../recipes/byg.byg/wood/cypress/boat.json | 34 +++++++++++++++ .../byg.byg/wood/cypress/bookshelf.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/button.json | 34 +++++++++++++++ .../byg.byg/wood/cypress/crafting_table.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/door.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/fence.json | 34 +++++++++++++++ .../byg.byg/wood/cypress/fence_gate.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/planks.json | 34 +++++++++++++++ .../byg.byg/wood/cypress/pressure_plate.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/slab.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/stairs.json | 34 +++++++++++++++ .../byg.byg/wood/cypress/trapdoor.json | 34 +++++++++++++++ .../recipes/byg.byg/wood/cypress/wood.json | 34 +++++++++++++++ .../data/byg/recipes/wood/cypress/boat.json} | 6 +-- .../byg/recipes/wood/cypress/bookshelf.json} | 11 ++--- .../byg/recipes/wood/cypress/button.json} | 0 .../recipes/wood/cypress/crafting_table.json} | 7 ++-- .../data/byg/recipes/wood/cypress/door.json} | 8 ++-- .../data/byg/recipes/wood/cypress/fence.json} | 0 .../byg/recipes/wood/cypress/fence_gate.json} | 0 .../byg/recipes/wood/cypress/planks.json} | 4 +- .../recipes/wood/cypress/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/cypress/slab.json} | 4 +- .../byg/recipes/wood/cypress/stairs.json} | 10 ++--- .../byg/recipes/wood/cypress/trapdoor.json} | 6 +-- .../data/byg/recipes/wood/cypress/wood.json} | 7 ++-- .../byg/client/textures/ColorManager.java | 5 ++- .../textures/renders/BYGRenderTypes.java | 3 -- .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 8 ---- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 --------- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 5 ++- .../byg/common/entity/boat/BYGBoatEntity.java | 4 +- .../byg/common/item/BYGItems.java | 22 +--------- .../world/feature/config/BYGTreeConfig.java | 8 ++++ .../overworld/BYGOverworldTreeFeatures.java | 10 ++--- .../{cypress_log.png => cypress/log.png} | Bin .../log_top.png} | Bin 43 files changed, 573 insertions(+), 99 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_log.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json rename Common/src/{main/resources/data/byg/recipes/cypress_boat.json => generated/resources/data/byg/recipes/wood/cypress/boat.json} (85%) rename Common/src/{main/resources/data/byg/recipes/cypress_bookshelf.json => generated/resources/data/byg/recipes/wood/cypress/bookshelf.json} (73%) rename Common/src/{main/resources/data/byg/recipes/cypress_button.json => generated/resources/data/byg/recipes/wood/cypress/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cypress_crafting_table.json => generated/resources/data/byg/recipes/wood/cypress/crafting_table.json} (75%) rename Common/src/{main/resources/data/byg/recipes/cypress_door.json => generated/resources/data/byg/recipes/wood/cypress/door.json} (84%) rename Common/src/{main/resources/data/byg/recipes/cypress_fence.json => generated/resources/data/byg/recipes/wood/cypress/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cypress_fence_gate.json => generated/resources/data/byg/recipes/wood/cypress/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cypress_planks.json => generated/resources/data/byg/recipes/wood/cypress/planks.json} (71%) rename Common/src/{main/resources/data/byg/recipes/cypress_pressure_plate.json => generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/cypress_slab.json => generated/resources/data/byg/recipes/wood/cypress/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/cypress_stairs.json => generated/resources/data/byg/recipes/wood/cypress/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/cypress_trapdoor.json => generated/resources/data/byg/recipes/wood/cypress/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/cypress_wood.json => generated/resources/data/byg/recipes/wood/cypress/wood.json} (78%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_log.png => cypress/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_log_top.png => cypress/log_top.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index c43faf1b3d..40ced4228a 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -4,12 +4,14 @@ fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted_ f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis_stem.json 093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry_log.json 96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika_log.json +dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress_log.json 38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json 57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json f2056b8b51a75bcd460fc546467ad30e88af4cd6 assets/byg/models/item/bulbis_stem.json 3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json 75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json +c3b7cdf031367e432cd957f075f634d8c7878e7c assets/byg/models/item/cypress_log.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -87,6 +89,19 @@ d9615b7a10088c08da377d5037e9264235f0eced data/byg/advancements/recipes/byg.byg/w 280574a7a2a3df2ab428677d10f15cefe9af326e data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json dcaafbd26e9fc567180c8dc46b465b515473a713 data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json b8f23159b7ff36e757d4782411514205527913ba data/byg/advancements/recipes/byg.byg/wood/cika/wood.json +bd475e53816f3adddde30dc00d917c7d23d0aee1 data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json +9303794cf89b78c7ee2a0a35e873df86102b0fa8 data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json +69d875c7e780112827a3ef4cecd2fed41dbb8db1 data/byg/advancements/recipes/byg.byg/wood/cypress/button.json +4a3b8d1dc283ead2610a2bb03383468d81720808 data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json +07033ec8a66fd2280963d2b23937f366bd6e53d7 data/byg/advancements/recipes/byg.byg/wood/cypress/door.json +8ec5cb0ee54caa360644208f1c48afacd3b22bf7 data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json +6ade55f8bfb3a222785938193bc19e98bbd647a1 data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json +53228ffa7ed8405ca434d994b2fd01f8ed3f9111 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json +04b81587e55ceaf3998232cf34b1805ad93fbadd data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json +0095d0adaaa11d85552ab54d5195b1aa557572b9 data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json +40e7f6394d71ccbd802b40b1fb9a81556d92e79a data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json +fcfe35857371e012b64fc77fea5524b63abe2be2 data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json +c7af942f104a1a9e2b3b533d49a4b0e75dacfca7 data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -164,6 +179,19 @@ da0c6a3d35ec44c43f0dd23a8f67c672476379bc data/byg/recipes/wood/cika/slab.json deca528a6fd5b0a2445ee388685a857ba2ad3463 data/byg/recipes/wood/cika/stairs.json 3f0f2756422aa6c65d4c248ce38464df692a749a data/byg/recipes/wood/cika/trapdoor.json 8e45c9d7b92db703152be1c93bed84ec0cb786f1 data/byg/recipes/wood/cika/wood.json +2ab25d932ec5bec50e458e1d74ab7cddd9089bd9 data/byg/recipes/wood/cypress/boat.json +bb34adc112d88028f6e18a12e11eaa0d47bd290e data/byg/recipes/wood/cypress/bookshelf.json +77c6b91acb8813e49be3238993c50e4aa2f03194 data/byg/recipes/wood/cypress/button.json +f49127239fb1ab9d6802b9e1fe66e1c572ec2118 data/byg/recipes/wood/cypress/crafting_table.json +5a7c0c05282005ed0d691a7bbb0f5ac0f957477e data/byg/recipes/wood/cypress/door.json +da84cfa442da22cd420c9beb3b83809048b24929 data/byg/recipes/wood/cypress/fence.json +ace13bffd8ab14666fb12d4947c3a4c881c02ee1 data/byg/recipes/wood/cypress/fence_gate.json +a9a6d9d502a887d889169c7b2be913c735cd1151 data/byg/recipes/wood/cypress/planks.json +210e0438be44d8e2cbc208ac03fdca0bee1cd476 data/byg/recipes/wood/cypress/pressure_plate.json +4858f390405103a5725338a816ac6d0d4d4bd732 data/byg/recipes/wood/cypress/slab.json +2bd5355bf93b6081d2fb6ed0905b317889bc8196 data/byg/recipes/wood/cypress/stairs.json +fc7e5419f84acc14b0aa73b4dc8d58d2f480a74b data/byg/recipes/wood/cypress/trapdoor.json +71959d4e94637409778e5b0aabe06e05b560cfb8 data/byg/recipes/wood/cypress/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_log.json b/Common/src/generated/resources/assets/byg/models/block/cypress_log.json new file mode 100644 index 0000000000..c9e8e32c57 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cypress/log", + "end": "byg:block/cypress/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_log.json b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json new file mode 100644 index 0000000000..3fa4bb85a7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json new file mode 100644 index 0000000000..79acf15709 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json new file mode 100644 index 0000000000..768854fb1b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json new file mode 100644 index 0000000000..f23b8795e2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json new file mode 100644 index 0000000000..7eab25c7c1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json new file mode 100644 index 0000000000..29492d3cea --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json new file mode 100644 index 0000000000..0061726a0a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json new file mode 100644 index 0000000000..79c9cba12c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json new file mode 100644 index 0000000000..4dc5e3cc49 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json new file mode 100644 index 0000000000..8b68f2c5d9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json new file mode 100644 index 0000000000..dd9770a99d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json new file mode 100644 index 0000000000..0396ea50c3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json new file mode 100644 index 0000000000..f8edc5c76c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json new file mode 100644 index 0000000000..2f9d3bddb6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cypress_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/cypress_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json index 060316e0e0..c4a11ff986 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json similarity index 73% rename from Common/src/main/resources/data/byg/recipes/cypress_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json index e85ab228cc..a3ea52446c 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_button.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cypress_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/button.json diff --git a/Common/src/main/resources/data/byg/recipes/cypress_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json similarity index 75% rename from Common/src/main/resources/data/byg/recipes/cypress_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json index 0c3257b08f..e60766814d 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_door.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/cypress_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json index dccded0dc4..ad2afbc8ae 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cypress_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/cypress_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cypress_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/cypress_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json similarity index 71% rename from Common/src/main/resources/data/byg/recipes/cypress_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json index 3878e0dffe..f7bd02a35f 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:cypress_logs" + "item": "byg:cypress_log" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/cypress_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/cypress_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json index 58236d7f47..ea3d35012e 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/cypress_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json index 3987ae777a..3f348ddeb4 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/cypress_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json index fee9d19395..405f47f11f 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, "result": { - "item": "byg:cypress_stairs", + "item": "byg:cypress_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/cypress_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/cypress_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json index f3aa56fb54..0cc2392f90 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/cypress_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/cypress_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json index 61a74dde67..61b784bbb6 100644 --- a/Common/src/main/resources/data/byg/recipes/cypress_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:cypress_log" } }, diff --git a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java index 8409e5fd74..40e3e27623 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java @@ -9,6 +9,7 @@ import net.minecraft.world.level.GrassColor; import net.minecraft.world.level.block.state.BlockState; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; public class ColorManager { @@ -16,7 +17,7 @@ public class ColorManager { public static synchronized void onBlockColorsInit(BlockColors blockColors) { //registers the colors for blocks that changes colors based on biome blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageGrassColor(lightReader, pos) : GrassColor.get(0.5D, 1.0D), BYGBlocks.LUSH_GRASS_BLOCK.get(), BYGBlocks.OVERGROWN_STONE.get(), BYGBlocks.OVERGROWN_NETHERRACK.get(), BYGBlocks.TINY_LILYPADS.get(), BYGBlocks.FLOWERING_TINY_LILY_PADS.get(), BYGBlocks.OVERGROWN_DACITE.get(), BYGBlocks.NETHER_BRISTLE.get()); - blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGBlocks.MAHOGANY_LEAVES.get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGBlocks.WILLOW_LEAVES.get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGBlocks.CYPRESS_LEAVES.get()); + blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGBlocks.MAHOGANY_LEAVES.get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGBlocks.WILLOW_LEAVES.get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageWaterColor(lightReader, pos) : -1, BYGBlocks.WATER_BARREL_CACTUS.get()); } @@ -34,7 +35,7 @@ public static synchronized void onItemColorsInit(BlockColors blockColors, ItemCo BYGItems.POISON_IVY.get(), BYGItems.OVERGROWN_STONE.get(), BYGItems.TINY_LILYPADS.get(), BYGItems.FLOWERING_TINY_LILY_PADS.get(), BYGItems.NETHER_BRISTLE.get(), BYGItems.OVERGROWN_DACITE.get(), BYGItems.LEAF_PILE.get(), BYGItems.ORCHARD_LEAVES.get(), BYGItems.FLOWERING_ORCHARD_LEAVES.get(), BYGItems.RIPE_ORCHARD_LEAVES.get(), - BYGItems.WILLOW_LEAVES.get(), BYGItems.CYPRESS_LEAVES.get(), + BYGItems.WILLOW_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get(), BYGItems.MAPLE_LEAVES.get(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); } } diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index fa7c51dbdf..e6cec16d10 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -141,7 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.CYPRESS_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_DOOR.get(), RenderType.cutoutMipped()); @@ -166,7 +165,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.CYPRESS_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -205,7 +203,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.BLUE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_OAK_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.CYPRESS_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EBONY_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 038e821d47..16fa756b18 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -27,7 +27,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.CYPRESS_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.EBONY_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FIR_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_ORCHARD_LEAVES.get()); @@ -73,7 +72,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.CYPRESS_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.EBONY_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.FIR_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.GREEN_ENCHANTED_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 0f0eec9f04..5e7cee06c6 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -57,7 +57,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_CYPRESS_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get(), 5, 5); @@ -93,7 +92,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_CYPRESS_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get(), 5, 5); @@ -111,7 +109,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.CYPRESS_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.FIR_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_BOOKSHELF.get(), 5, 20); @@ -130,7 +127,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.CYPRESS_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.FIR_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_SLAB.get(), 5, 20); @@ -149,7 +145,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.CYPRESS_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_STAIRS.get(), 5, 20); @@ -168,7 +163,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.CYPRESS_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_PLANKS.get(), 5, 20); @@ -187,7 +181,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.CYPRESS_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.EBONY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.FIR_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_FENCE.get(), 5, 20); @@ -210,7 +203,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_OAK_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.CYPRESS_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.EBONY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FIR_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 5a77b5315a..ff7c3882fc 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,7 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.CYPRESS_LOG.get(), BYGBlocks.STRIPPED_CYPRESS_LOG.get()); stripables.put(BYGBlocks.EBONY_LOG.get(), BYGBlocks.STRIPPED_EBONY_LOG.get()); stripables.put(BYGBlocks.FIR_LOG.get(), BYGBlocks.STRIPPED_FIR_LOG.get()); stripables.put(BYGBlocks.GREEN_ENCHANTED_LOG.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get()); @@ -48,7 +47,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.CYPRESS_WOOD.get(), BYGBlocks.STRIPPED_CYPRESS_WOOD.get()); stripables.put(BYGBlocks.EBONY_WOOD.get(), BYGBlocks.STRIPPED_EBONY_WOOD.get()); stripables.put(BYGBlocks.FIR_WOOD.get(), BYGBlocks.STRIPPED_FIR_WOOD.get()); stripables.put(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index bd029856d8..88a0e932ce 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject CYPRESS_PLANKS = createPlanks("cypress_planks"); public static final BlockRegistryObject EBONY_PLANKS = createPlanks("ebony_planks"); public static final BlockRegistryObject FIR_PLANKS = createPlanks("fir_planks"); public static final BlockRegistryObject GREEN_ENCHANTED_PLANKS = createPlanks("green_enchanted_planks"); @@ -86,7 +85,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject CYPRESS_BOOKSHELF = createBookshelf("cypress_bookshelf"); public static final BlockRegistryObject EBONY_BOOKSHELF = createBookshelf("ebony_bookshelf"); public static final BlockRegistryObject FIR_BOOKSHELF = createBookshelf("fir_bookshelf"); public static final BlockRegistryObject GREEN_ENCHANTED_BOOKSHELF = createBookshelf("green_enchanted_bookshelf"); @@ -110,7 +108,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject CYPRESS_DOOR = createDoor("cypress_door"); public static final BlockRegistryObject EBONY_DOOR = createDoor("ebony_door"); public static final BlockRegistryObject FIR_DOOR = createDoor("fir_door"); public static final BlockRegistryObject GREEN_ENCHANTED_DOOR = createDoor("green_enchanted_door"); @@ -134,7 +131,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject CYPRESS_PRESSURE_PLATE = createWoodPressurePlate("cypress_pressure_plate"); public static final BlockRegistryObject EBONY_PRESSURE_PLATE = createWoodPressurePlate("ebony_pressure_plate"); public static final BlockRegistryObject FIR_PRESSURE_PLATE = createWoodPressurePlate("fir_pressure_plate"); public static final BlockRegistryObject GREEN_ENCHANTED_PRESSURE_PLATE = createWoodPressurePlate("green_enchanted_pressure_plate"); @@ -158,7 +154,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject CYPRESS_BUTTON = createWoodButton("cypress_button"); public static final BlockRegistryObject EBONY_BUTTON = createWoodButton("ebony_button"); public static final BlockRegistryObject FIR_BUTTON = createWoodButton("fir_button"); public static final BlockRegistryObject GREEN_ENCHANTED_BUTTON = createWoodButton("green_enchanted_button"); @@ -182,7 +177,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject CYPRESS_TRAPDOOR = createTrapDoor("cypress_trapdoor"); public static final BlockRegistryObject EBONY_TRAPDOOR = createTrapDoor("ebony_trapdoor"); public static final BlockRegistryObject FIR_TRAPDOOR = createTrapDoor("fir_trapdoor"); public static final BlockRegistryObject GREEN_ENCHANTED_TRAPDOOR = createTrapDoor("green_enchanted_trapdoor"); @@ -206,7 +200,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject CYPRESS_CRAFTING_TABLE = createCraftingTable("cypress_crafting_table"); public static final BlockRegistryObject EBONY_CRAFTING_TABLE = createCraftingTable("ebony_crafting_table"); public static final BlockRegistryObject FIR_CRAFTING_TABLE = createCraftingTable("fir_crafting_table"); public static final BlockRegistryObject GREEN_ENCHANTED_CRAFTING_TABLE = createCraftingTable("green_enchanted_crafting_table"); @@ -230,7 +223,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject CYPRESS_FENCE_GATE = createFenceGate("cypress_fence_gate"); public static final BlockRegistryObject EBONY_FENCE_GATE = createFenceGate("ebony_fence_gate"); public static final BlockRegistryObject FIR_FENCE_GATE = createFenceGate("fir_fence_gate"); public static final BlockRegistryObject GREEN_ENCHANTED_FENCE_GATE = createFenceGate("green_enchanted_fence_gate"); @@ -254,7 +246,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject CYPRESS_SLAB = createWoodSlab("cypress_slab"); public static final BlockRegistryObject EBONY_SLAB = createWoodSlab("ebony_slab"); public static final BlockRegistryObject FIR_SLAB = createWoodSlab("fir_slab"); public static final BlockRegistryObject GREEN_ENCHANTED_SLAB = createWoodSlab("green_enchanted_slab"); @@ -278,7 +269,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject CYPRESS_STAIRS = createWoodStairs("cypress_stairs"); public static final BlockRegistryObject EBONY_STAIRS = createWoodStairs("ebony_stairs"); public static final BlockRegistryObject FIR_STAIRS = createWoodStairs("fir_stairs"); public static final BlockRegistryObject GREEN_ENCHANTED_STAIRS = createWoodStairs("green_enchanted_stairs"); @@ -302,7 +292,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject CYPRESS_FENCE = createFence("cypress_fence"); public static final BlockRegistryObject EBONY_FENCE = createFence("ebony_fence"); public static final BlockRegistryObject FIR_FENCE = createFence("fir_fence"); public static final BlockRegistryObject GREEN_ENCHANTED_FENCE = createFence("green_enchanted_fence"); @@ -326,7 +315,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject CYPRESS_SIGN = createSign("cypress_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_SIGN = createSign("ebony_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_SIGN = createSign("fir_sign", BYGWoodType.FIR, FIR_PLANKS); public static final BlockRegistryObject GREEN_ENCHANTED_SIGN = createSign("green_enchanted_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); @@ -350,7 +338,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject CYPRESS_WALL_SIGN = createWallSign("cypress_wall_sign", BYGWoodType.CYPRESS, CYPRESS_PLANKS); public static final BlockRegistryObject EBONY_WALL_SIGN = createWallSign("ebony_wall_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_WALL_SIGN = createWallSign("fir_wall_sign", BYGWoodType.FIR, FIR_PLANKS); public static final BlockRegistryObject GREEN_ENCHANTED_WALL_SIGN = createWallSign("green_enchanted_wall_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); @@ -390,7 +377,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); - public static final BlockRegistryObject CYPRESS_SAPLING = createSapling(BYGBlockTags.GROUND_CYPRESS_SAPLING, "cypress_sapling"); public static final BlockRegistryObject EBONY_SAPLING = createSapling(BYGBlockTags.GROUND_EBONY_SAPLING, "ebony_sapling"); public static final BlockRegistryObject FIR_SAPLING = createSapling(BYGBlockTags.GROUND_FIR_SAPLING, "fir_sapling"); public static final BlockRegistryObject GREEN_ENCHANTED_SAPLING = createSapling(BYGBlockTags.GROUND_GREEN_ENCHANTED_SAPLING, "green_enchanted_sapling"); @@ -443,7 +429,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); public static final BlockRegistryObject BROWN_ZELKOVA_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_zelkova_leaves"); - public static final BlockRegistryObject CYPRESS_LEAVES = createLeaves(MaterialColor.TERRACOTTA_LIGHT_GREEN, "cypress_leaves"); public static final BlockRegistryObject EBONY_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ebony_leaves"); public static final BlockRegistryObject FIR_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "fir_leaves"); public static final BlockRegistryObject FLOWERING_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "flowering_orchard_leaves"); @@ -771,7 +756,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject CYPRESS_LOG = createLog("cypress_log"); public static final BlockRegistryObject EBONY_LOG = createLog("ebony_log"); public static final BlockRegistryObject FIR_LOG = createLog("fir_log"); public static final BlockRegistryObject GREEN_ENCHANTED_LOG = createLog("green_enchanted_log"); @@ -800,7 +784,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject CYPRESS_WOOD = createWood("cypress_wood"); public static final BlockRegistryObject EBONY_WOOD = createWood("ebony_wood"); public static final BlockRegistryObject FIR_WOOD = createWood("fir_wood"); public static final BlockRegistryObject GREEN_ENCHANTED_WOOD = createWood("green_enchanted_wood"); @@ -953,7 +936,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_CYPRESS_LOG = createStrippedLog("stripped_cypress_log"); public static final BlockRegistryObject STRIPPED_EBONY_LOG = createStrippedLog("stripped_ebony_log"); public static final BlockRegistryObject STRIPPED_FIR_LOG = createStrippedLog("stripped_fir_log"); public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_LOG = createStrippedLog("stripped_green_enchanted_log"); @@ -977,7 +959,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_CYPRESS_WOOD = createWood("stripped_cypress_wood"); public static final BlockRegistryObject STRIPPED_EBONY_WOOD = createWood("stripped_ebony_wood"); public static final BlockRegistryObject STRIPPED_FIR_WOOD = createWood("stripped_fir_wood"); public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_WOOD = createWood("stripped_green_enchanted_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 4287b733c4..8f91f2f31b 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,7 +10,6 @@ // TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType CYPRESS = register("cypress"); public static final WoodType EBONY = register("ebony"); public static final WoodType FIR = register("fir"); public static final WoodType GREEN_ENCHANTED = register("green_enchanted"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 300f56e845..baf73190af 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -43,7 +43,10 @@ public enum BYGWoodTypes { .boatType(BYGBoatEntity.BYGType.CHERRY)), CIKA("cika", new Builder() .boatType(BYGBoatEntity.BYGType.CIKA) - .materialColor(MaterialColor.TERRACOTTA_ORANGE)); + .materialColor(MaterialColor.TERRACOTTA_ORANGE)), + CYPRESS("cypress", new Builder() + .boatType(BYGBoatEntity.BYGType.CYPRESS) + .materialColor(MaterialColor.TERRACOTTA_LIGHT_GREEN)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 420a9b8ef3..200e0f5c2e 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -53,7 +53,7 @@ public Item getDropItem() { case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.boat().get(); case CHERRY -> BYGWoodTypes.CHERRY.boat().get(); case CIKA -> BYGWoodTypes.CIKA.boat().get(); - case CYPRESS -> BYGItems.CYPRESS_BOAT.get(); + case CYPRESS -> BYGWoodTypes.CYPRESS.boat().get(); case EBONY -> BYGItems.EBONY_BOAT.get(); case FIR -> BYGItems.FIR_BOAT.get(); case GREEN_ENCHANTED -> BYGItems.GREEN_ENCHANTED_BOAT.get(); @@ -80,7 +80,7 @@ public Block getPlanks() { case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.planks().get(); case CHERRY -> BYGWoodTypes.CHERRY.planks().get(); case CIKA -> BYGWoodTypes.CIKA.planks().get(); - case CYPRESS -> BYGBlocks.CYPRESS_PLANKS.get(); + case CYPRESS -> BYGWoodTypes.CYPRESS.planks().get(); case EBONY -> BYGBlocks.EBONY_PLANKS.get(); case FIR -> BYGBlocks.FIR_PLANKS.get(); case GREEN_ENCHANTED -> BYGBlocks.GREEN_ENCHANTED_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 59f76cf4a1..abf292d50d 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -284,29 +284,9 @@ public class BYGItems { BYGWoodTypes.CHERRY.init(); BYGWoodTypes.CIKA.init(); + BYGWoodTypes.CYPRESS.init(); } - //Cypress Woodtype - public static final RegistryObject CYPRESS_SAPLING = createSaplingItem(BYGBlocks.CYPRESS_SAPLING); - public static final RegistryObject CYPRESS_LEAVES = createItem(BYGBlocks.CYPRESS_LEAVES); - public static final RegistryObject CYPRESS_LOG = createItem(BYGBlocks.CYPRESS_LOG); - public static final RegistryObject CYPRESS_WOOD = createItem(BYGBlocks.CYPRESS_WOOD); - public static final RegistryObject STRIPPED_CYPRESS_LOG = createItem(BYGBlocks.STRIPPED_CYPRESS_LOG); - public static final RegistryObject STRIPPED_CYPRESS_WOOD = createItem(BYGBlocks.STRIPPED_CYPRESS_WOOD); - public static final RegistryObject CYPRESS_PLANKS = createItem(BYGBlocks.CYPRESS_PLANKS); - public static final RegistryObject CYPRESS_BOOKSHELF = createItem(BYGBlocks.CYPRESS_BOOKSHELF); - public static final RegistryObject CYPRESS_CRAFTING_TABLE = createItem(BYGBlocks.CYPRESS_CRAFTING_TABLE); - public static final RegistryObject CYPRESS_STAIRS = createItem(BYGBlocks.CYPRESS_STAIRS); - public static final RegistryObject CYPRESS_SLAB = createItem(BYGBlocks.CYPRESS_SLAB); - public static final RegistryObject CYPRESS_FENCE = createItem(BYGBlocks.CYPRESS_FENCE); - public static final RegistryObject CYPRESS_FENCE_GATE = createItem(BYGBlocks.CYPRESS_FENCE_GATE); - public static final RegistryObject CYPRESS_DOOR = createItem(BYGBlocks.CYPRESS_DOOR); - public static final RegistryObject CYPRESS_TRAPDOOR = createItem(BYGBlocks.CYPRESS_TRAPDOOR); - public static final RegistryObject CYPRESS_PRESSURE_PLATE = createItem(BYGBlocks.CYPRESS_PRESSURE_PLATE); - public static final RegistryObject CYPRESS_BUTTON = createItem(BYGBlocks.CYPRESS_BUTTON); - public static final RegistryObject CYPRESS_SIGN = createSign("cypress_sign", BYGBlocks.CYPRESS_SIGN, BYGBlocks.CYPRESS_WALL_SIGN); - public static final RegistryObject CYPRESS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.CYPRESS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "cypress_boat"); - //Ebony Woodtype public static final RegistryObject EBONY_SAPLING = createSaplingItem(BYGBlocks.EBONY_SAPLING); public static final RegistryObject EBONY_LEAVES = createItem(BYGBlocks.EBONY_LEAVES); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java index c95961b192..74fd8ffa2b 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java @@ -12,6 +12,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider; +import potionstudios.byg.common.block.BYGWoodType; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.reg.RegistryObject; import java.util.List; @@ -121,6 +123,12 @@ public static class Builder { private int maxPossibleHeight = 1; private int diskRadius = 0; + public Builder fromWoodType(BYGWoodTypes type) { + this.setTrunkBlock(type.log()); + setLeavesBlock(type.leaves().get()); + return this; + } + public Builder setTrunkBlock(RegistryObject block) { return setTrunkBlock(block.get()); } diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 8639ba6621..520de9e52b 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -20,6 +20,7 @@ import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.BYGTreeConfig; import potionstudios.byg.common.world.feature.features.BYGFeaturesUtil; @@ -494,8 +495,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CYPRESS_TREE1 = createConfiguredFeature("cypress_tree1", BYGFeatures.CYPRESS_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CYPRESS_LOG.get()) - .setLeavesBlock(BYGBlocks.CYPRESS_LEAVES.get()) + .fromWoodType(BYGWoodTypes.CYPRESS) .setMaxHeight(30) .setMinHeight(20) .build() @@ -503,8 +503,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CYPRESS_TREE2 = createConfiguredFeature("cypress_tree2", BYGFeatures.CYPRESS_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CYPRESS_LOG.get()) - .setLeavesBlock(BYGBlocks.CYPRESS_LEAVES.get()) + .fromWoodType(BYGWoodTypes.CYPRESS) .setMaxHeight(30) .setMinHeight(20) .build() @@ -512,8 +511,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CYPRESS_TREE3 = createConfiguredFeature("cypress_tree3", BYGFeatures.CYPRESS_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.CYPRESS_LOG.get()) - .setLeavesBlock(BYGBlocks.CYPRESS_LEAVES.get()) + .fromWoodType(BYGWoodTypes.CYPRESS) .setMaxHeight(30) .setMinHeight(20) .build() diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_log.png b/Common/src/main/resources/assets/byg/textures/block/cypress/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_log.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/log_top.png From 05517ef5232d1598ad40c1ae3a0bbcf4ec86362a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 16:48:06 +0300 Subject: [PATCH 08/90] Move ebony --- Common/src/generated/resources/.cache/cache | 64 ++++++++++++++---- .../assets/byg/models/block/ebony_log.json | 7 ++ .../assets/byg/models/item/ebony_log.json | 39 +++++++++++ .../recipes/byg.byg/wood/aspen/planks.json | 4 +- .../recipes/byg.byg/wood/baobab/planks.json | 4 +- .../byg.byg/wood/blue_enchanted/planks.json | 4 +- .../recipes/byg.byg/wood/bulbis/planks.json | 4 +- .../recipes/byg.byg/wood/cherry/planks.json | 4 +- .../recipes/byg.byg/wood/cika/planks.json | 4 +- .../recipes/byg.byg/wood/cypress/planks.json | 4 +- .../recipes/byg.byg/wood/ebony/boat.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/bookshelf.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/button.json | 34 ++++++++++ .../byg.byg/wood/ebony/crafting_table.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/door.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/fence.json | 34 ++++++++++ .../byg.byg/wood/ebony/fence_gate.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/planks.json | 32 +++++++++ .../byg.byg/wood/ebony/pressure_plate.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/slab.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/stairs.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/trapdoor.json | 34 ++++++++++ .../recipes/byg.byg/wood/ebony/wood.json | 34 ++++++++++ .../data/byg/recipes/wood/aspen/planks.json | 2 +- .../data/byg/recipes/wood/baobab/planks.json | 2 +- .../recipes/wood/blue_enchanted/planks.json | 2 +- .../data/byg/recipes/wood/bulbis/planks.json | 2 +- .../data/byg/recipes/wood/cherry/planks.json | 2 +- .../data/byg/recipes/wood/cika/planks.json | 2 +- .../data/byg/recipes/wood/cypress/planks.json | 2 +- .../data/byg/recipes/wood/ebony/boat.json} | 6 +- .../byg/recipes/wood/ebony/bookshelf.json} | 11 +-- .../data/byg/recipes/wood/ebony/button.json} | 0 .../recipes/wood/ebony/crafting_table.json} | 7 +- .../data/byg/recipes/wood/ebony/door.json} | 8 +-- .../data/byg/recipes/wood/ebony/fence.json} | 0 .../byg/recipes/wood/ebony/fence_gate.json} | 0 .../data/byg/recipes/wood/ebony/planks.json} | 4 +- .../recipes/wood/ebony/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/ebony/slab.json} | 4 +- .../data/byg/recipes/wood/ebony/stairs.json} | 10 +-- .../byg/recipes/wood/ebony/trapdoor.json} | 6 +- .../data/byg/recipes/wood/ebony/wood.json} | 7 +- .../data/byg/tags/items/wood/aspen_logs.json | 7 ++ .../data/byg/tags/items/wood/baobab_logs.json | 7 ++ .../tags/items/wood/blue_enchanted_logs.json | 7 ++ .../data/byg/tags/items/wood/bulbis_logs.json | 7 ++ .../data/byg/tags/items/wood/cherry_logs.json | 7 ++ .../data/byg/tags/items/wood/cika_logs.json | 7 ++ .../byg/tags/items/wood/cypress_logs.json | 7 ++ .../data/byg/tags/items/wood/ebony_logs.json | 7 ++ .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 10 --- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 ------ .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 18 ++++- .../byg/common/entity/boat/BYGBoatEntity.java | 4 +- .../byg/common/item/BYGItems.java | 22 +----- .../overworld/BYGOverworldTreeFeatures.java | 12 ++-- .../assets/byg/models/block/cypress_log.json | 7 -- .../assets/byg/models/block/ebony_log.json | 7 -- .../assets/byg/models/item/cypress_log.json | 22 ------ .../assets/byg/models/item/ebony_log.json | 22 ------ .../block/{ebony_log.png => ebony/log.png} | Bin .../{ebony_log_top.png => ebony/log_top.png} | Bin .../potionstudios/byg/datagen/BYGDataGen.java | 5 +- .../providers/BYGBlockTagsProvider.java | 27 ++++++-- .../providers/BYGItemTagsProvider.java | 35 ++++++++++ .../datagen/providers/BYGRecipeProviders.java | 4 +- 71 files changed, 725 insertions(+), 212 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_log.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json rename Common/src/{main/resources/data/byg/recipes/ebony_boat.json => generated/resources/data/byg/recipes/wood/ebony/boat.json} (85%) rename Common/src/{main/resources/data/byg/recipes/ebony_bookshelf.json => generated/resources/data/byg/recipes/wood/ebony/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/ebony_button.json => generated/resources/data/byg/recipes/wood/ebony/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/ebony_crafting_table.json => generated/resources/data/byg/recipes/wood/ebony/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/ebony_door.json => generated/resources/data/byg/recipes/wood/ebony/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/ebony_fence.json => generated/resources/data/byg/recipes/wood/ebony/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/ebony_fence_gate.json => generated/resources/data/byg/recipes/wood/ebony/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/ebony_planks.json => generated/resources/data/byg/recipes/wood/ebony/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/ebony_pressure_plate.json => generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/ebony_slab.json => generated/resources/data/byg/recipes/wood/ebony/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/ebony_stairs.json => generated/resources/data/byg/recipes/wood/ebony/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/ebony_trapdoor.json => generated/resources/data/byg/recipes/wood/ebony/trapdoor.json} (86%) rename Common/src/{main/resources/data/byg/recipes/ebony_wood.json => generated/resources/data/byg/recipes/wood/ebony/wood.json} (78%) create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_log.json rename Common/src/main/resources/assets/byg/textures/block/{ebony_log.png => ebony/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_log_top.png => ebony/log_top.png} (100%) create mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 40ced4228a..d2d2f45c98 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -5,6 +5,7 @@ f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis_stem.jso 093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry_log.json 96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika_log.json dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress_log.json +9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony_log.json 38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json 57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json @@ -12,6 +13,7 @@ f2056b8b51a75bcd460fc546467ad30e88af4cd6 assets/byg/models/item/bulbis_stem.json 3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json 75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json c3b7cdf031367e432cd957f075f634d8c7878e7c assets/byg/models/item/cypress_log.json +ddacb253e1661eeb7eca1130ecb83b19223cd41e assets/byg/models/item/ebony_log.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -19,7 +21,7 @@ d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/w db985793fdd315c02ba0d3be4cb1764ac320e387 data/byg/advancements/recipes/byg.byg/wood/aspen/door.json 140ccce47b045be05a55dbeda4e526fc1d40bdab data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json 3dfc28bfe74af2d2aa2f87f61e088ea4543c8cca data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json -5aec7f4029228ff94d8a736aaee8bbd08e08e6f8 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json +db84ae5b52bba81b3e43f27613343f80abdfbd19 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json 0b8a550c52cb3c9e1aa883e77aa32b10f3f07770 data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json 5f42b62b9a96d8eb55d3bf645bafae9de79f6b13 data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json fa6e7b7f077e8e0a3ffb64c8bb443132b0914c15 data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json @@ -32,7 +34,7 @@ e7dae4923c93313f898cf8769280740d3d73bb1c data/byg/advancements/recipes/byg.byg/w 75f2d1cacb11e14a46fc3d5a84bce3240c72374b data/byg/advancements/recipes/byg.byg/wood/baobab/door.json 604447503f3bcddb34d7bc75f728b36adeff3d34 data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json f65bf801cc20711aae25ae606741fc1bf04fb445 data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json -3fb7ed6745b1f72995eaeb8d0b6b8d0a54029511 data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json +96b241c110d1505c97c6ef75487aed6c81fbf2b5 data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json 8684aace48a2f8c53dbecac0c70f37d66465e5f6 data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json 833619c47c131b4c72c1b6a56796c451f9c2bff0 data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json 19f58aad206582307b90f8db9784d80d40460e8d data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json @@ -45,7 +47,7 @@ f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/w 6b51d098d8c6dab3f716dd8528e672f5f3a5c705 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json 733a5386f7b07d7834fb3d790fddf2f3758ca9ba data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json 23fe49cffbed25aa69be0ff760d983f067af2b65 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json -3b812b017c3126adfd258295ea7f46b3c2891b81 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json +f41f2d2d3c0af5821bc96e82b7a0429b02e379a8 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json 6864e4a80e3e28f2edc0ed5e6f133110d4364113 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json 513a7028ba639f101216ceac8786ea58647b0ab5 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json 71ae592506dbd4598b54f717a182268035d3c0b2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json @@ -57,7 +59,7 @@ f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/w e750119b99fb80d6a938f4753bc7490aee61300d data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json 6ff0c5bf4b3d452a38688a7db7b50e6d828ddec9 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json c50eea308107c7fbb7c5254415df875448eff056 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json -0dbe53467e4737bbd5033143ca809789552436d1 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json +8342d661d5bb9157c11a082342ae5d4764706786 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json 995bf4d4574badf99459ebc78dcb2707774190b3 data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json ef0119d4da07d55c8a35779d0a1231acd24ad6fe data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json 14dcfdd0b3b214ce0b94bec84a8e834695bd93ee data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json @@ -70,7 +72,7 @@ e1588dd3dc5c8002944d146df52e6271500963ab data/byg/advancements/recipes/byg.byg/w 26febe445f845f73cef06afeb9bddf1c5038d1c9 data/byg/advancements/recipes/byg.byg/wood/cherry/door.json 69fcbbc9d24d42c1ee5affe4737369af97f483d8 data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json 097af9339c3f2d7bc75ed63c67242dbfbdb60308 data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json -c7c83bd3dbbdc82648bcf421c0f0b41e0079f1d9 data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json +c3daf89e6c51f92a94448687e88128853602ab94 data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json efe4a39583a805af78c82bfe7f224e36844abe3f data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json 131415f581121f364e982090cd76e69de0d5c07c data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json @@ -83,7 +85,7 @@ fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/w ddbd1ecd8afe20b7be22ddb9105886a3bbb52375 data/byg/advancements/recipes/byg.byg/wood/cika/door.json 1863f6ddef21684706dbeee59720bbf07b735b08 data/byg/advancements/recipes/byg.byg/wood/cika/fence.json 6551ec208aba255c717faad92d7646ff435e2dca data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json -ed3b3c4ebb8770fb3fa40cd7569972724c035f32 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json +7669036e415ce7f705c7103a4f9a47655f2b33b8 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json d9615b7a10088c08da377d5037e9264235f0eced data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json 761cabe05bc9c0ea350782e2acbccabcec112bf7 data/byg/advancements/recipes/byg.byg/wood/cika/slab.json 280574a7a2a3df2ab428677d10f15cefe9af326e data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json @@ -96,12 +98,25 @@ bd475e53816f3adddde30dc00d917c7d23d0aee1 data/byg/advancements/recipes/byg.byg/w 07033ec8a66fd2280963d2b23937f366bd6e53d7 data/byg/advancements/recipes/byg.byg/wood/cypress/door.json 8ec5cb0ee54caa360644208f1c48afacd3b22bf7 data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json 6ade55f8bfb3a222785938193bc19e98bbd647a1 data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json -53228ffa7ed8405ca434d994b2fd01f8ed3f9111 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json +88fad555f9efec69903219ab247e55b7db136f30 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json 04b81587e55ceaf3998232cf34b1805ad93fbadd data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json 0095d0adaaa11d85552ab54d5195b1aa557572b9 data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json 40e7f6394d71ccbd802b40b1fb9a81556d92e79a data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json fcfe35857371e012b64fc77fea5524b63abe2be2 data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json c7af942f104a1a9e2b3b533d49a4b0e75dacfca7 data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json +22bd4b976c9e0436cdf68280bc0193444479448c data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json +406638d185de81cfcd999c647aae649044a1bb51 data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json +0f18b748ea306f4ee39524fcf3a2b514222a9960 data/byg/advancements/recipes/byg.byg/wood/ebony/button.json +fa594aa7463ad026fb2fa455b4f9a7d47b5a2dce data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json +3e08116e2b9b55e617df914678bbc2a313813234 data/byg/advancements/recipes/byg.byg/wood/ebony/door.json +ec1ebec1e8fd863cb4adefc098ae89e70ca04c22 data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json +f1a0277ee9f6b8bda41805b9e07fe1b8277eae82 data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json +114915093f7c91ddf77e806f0714a293c3d58ff3 data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json +0c17e3d382a5afcb9be55ea38be12caac60a6e4e data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json +c11c95a814d930a9a9128fdbcc8138c651a1a0db data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json +c146cebcc5cda2004d61257e4c2deb4ff421e9de data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json +9dd64acb1012c36dbcf979f00f680b3f716465b4 data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json +bc237fdfe5a01a5caf21ae87675b4fe144caa9d6 data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -109,7 +124,7 @@ b1ea352ac9d826d92c548d06df8cc71883325219 data/byg/recipes/wood/aspen/crafting_ta 2e074f27da76623d60b4818fc91da6d6a25631f7 data/byg/recipes/wood/aspen/door.json 73c58c2e232229cdcd4a9660b569b4e514a6ba8a data/byg/recipes/wood/aspen/fence.json 073ac10577cb1c49ec9da3abfae7447afbd15fe8 data/byg/recipes/wood/aspen/fence_gate.json -a014243a472b2cc4ca484f5810ca7db7416f35ae data/byg/recipes/wood/aspen/planks.json +783c791292b8003c229ede378f587fd6c415cfe5 data/byg/recipes/wood/aspen/planks.json 27ba6f01a336d971e5ec751bb64a2f635a434be5 data/byg/recipes/wood/aspen/pressure_plate.json d7a1d70300005e933b50adb1acbec3a589a06297 data/byg/recipes/wood/aspen/slab.json 56f6741a5d527c2e790acfc0e0d2efa4420f9e3a data/byg/recipes/wood/aspen/stairs.json @@ -122,7 +137,7 @@ d28c218f0f9f6c078619e2c26fe3e1835d980a9f data/byg/recipes/wood/aspen/wood.json cc8efc86e9d25b5eb2c56073eca38423f7065d93 data/byg/recipes/wood/baobab/door.json c26a6df862df265f1b5a76c1667373333febed1b data/byg/recipes/wood/baobab/fence.json bc4ac59bbeb4d07f1340a59ea1f8f531bb1e8d9d data/byg/recipes/wood/baobab/fence_gate.json -b3af2ba0024d72f3fb5451eaf053917753b7d6fd data/byg/recipes/wood/baobab/planks.json +073f67bd061280348c117639af247a85acac4e18 data/byg/recipes/wood/baobab/planks.json e9ea4c56af7c08592ab33701533d2fbb2f07e472 data/byg/recipes/wood/baobab/pressure_plate.json 0ca12512f00f62c144a4a1ea75110f1fa3a11ceb data/byg/recipes/wood/baobab/slab.json 634e1ee6eaaf1cd7a38f716e566ab3c763971f79 data/byg/recipes/wood/baobab/stairs.json @@ -135,7 +150,7 @@ cdcea7dcf02fcac9f38cdebf4fbe3e1373674e0a data/byg/recipes/wood/blue_enchanted/bo 3a591e628e2cc31995ec4fdb9fdb5088c1fc7e9b data/byg/recipes/wood/blue_enchanted/door.json e7eeb1cc90892dcb31cf3b5c918ad5549acb3984 data/byg/recipes/wood/blue_enchanted/fence.json d564fa63efed912a6941d291c5a499b39854307b data/byg/recipes/wood/blue_enchanted/fence_gate.json -f265b801f8ebdea3cd4fbf33891cac5f1ea2fc80 data/byg/recipes/wood/blue_enchanted/planks.json +14cee8bfff1a506fd525aedc3c5244b7bf5a999d data/byg/recipes/wood/blue_enchanted/planks.json 787b857d14904563c701ac265b71f171f410845f data/byg/recipes/wood/blue_enchanted/pressure_plate.json a31ee3423b1b94f5f0f725bbaa1bd475af2529a6 data/byg/recipes/wood/blue_enchanted/slab.json 642a4cdb86732d1bd0df8e77fbc158ea0b747a4c data/byg/recipes/wood/blue_enchanted/stairs.json @@ -147,7 +162,7 @@ f376a529b65cb0bfd3e1138f087935cfe197c8c8 data/byg/recipes/wood/bulbis/bookshelf. 67800a40053b00689a31dfd0efcda4fc1d08f066 data/byg/recipes/wood/bulbis/door.json 0ffd6670039dbd035a7ed8aeff7c28d39b9ff8e3 data/byg/recipes/wood/bulbis/fence.json c7d42d60e3ffc6f17028fe495f4d2fe20f47c424 data/byg/recipes/wood/bulbis/fence_gate.json -6b0bd5776bb6e538768155fde12e7a6c819b4b64 data/byg/recipes/wood/bulbis/planks.json +338e3d049ad40ffedad289df4168a312c10f2b94 data/byg/recipes/wood/bulbis/planks.json f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_plate.json f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json 2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json @@ -160,7 +175,7 @@ f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf. b4cd0c2f83180f071060cbb47c2bc18b485cd329 data/byg/recipes/wood/cherry/door.json e70972b9e4b8503218933cf69caae4f28852558c data/byg/recipes/wood/cherry/fence.json 1b0d138a0e2653ae3daaf5e3af62893a45514ecb data/byg/recipes/wood/cherry/fence_gate.json -f9f098edb149f3aa05bc38f8ec9b9c5a621646c7 data/byg/recipes/wood/cherry/planks.json +28edc8349437a264eeb4ebddfc214deec3d1fb88 data/byg/recipes/wood/cherry/planks.json 7a9a8fd4e78eb7200da14f359424fa885400425e data/byg/recipes/wood/cherry/pressure_plate.json 34165d5515938d8f03bc640c5c4d6095310ff503 data/byg/recipes/wood/cherry/slab.json e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json @@ -173,7 +188,7 @@ ee25638100ad8238083995c754da3aecc36a46e6 data/byg/recipes/wood/cika/crafting_tab 10202553084d0d7950261e8d350bb8d706adf428 data/byg/recipes/wood/cika/door.json 276810bd6a9c3514cb0f9eae361dee4232fcd222 data/byg/recipes/wood/cika/fence.json 7a20c825a465ed5cca2a2b5a21e5246e5eff5e90 data/byg/recipes/wood/cika/fence_gate.json -e4d53c24c89b80e81ca38dcec9729fd850cbcc52 data/byg/recipes/wood/cika/planks.json +4144f24a51f076711b652d8dc263d847f4e0f9f1 data/byg/recipes/wood/cika/planks.json 94f6ec4de852211c4b2108527f215c7f9a31d39a data/byg/recipes/wood/cika/pressure_plate.json da0c6a3d35ec44c43f0dd23a8f67c672476379bc data/byg/recipes/wood/cika/slab.json deca528a6fd5b0a2445ee388685a857ba2ad3463 data/byg/recipes/wood/cika/stairs.json @@ -186,12 +201,25 @@ f49127239fb1ab9d6802b9e1fe66e1c572ec2118 data/byg/recipes/wood/cypress/crafting_ 5a7c0c05282005ed0d691a7bbb0f5ac0f957477e data/byg/recipes/wood/cypress/door.json da84cfa442da22cd420c9beb3b83809048b24929 data/byg/recipes/wood/cypress/fence.json ace13bffd8ab14666fb12d4947c3a4c881c02ee1 data/byg/recipes/wood/cypress/fence_gate.json -a9a6d9d502a887d889169c7b2be913c735cd1151 data/byg/recipes/wood/cypress/planks.json +1d7448e510d921e8f79e54d5f219c9ac2b7fede1 data/byg/recipes/wood/cypress/planks.json 210e0438be44d8e2cbc208ac03fdca0bee1cd476 data/byg/recipes/wood/cypress/pressure_plate.json 4858f390405103a5725338a816ac6d0d4d4bd732 data/byg/recipes/wood/cypress/slab.json 2bd5355bf93b6081d2fb6ed0905b317889bc8196 data/byg/recipes/wood/cypress/stairs.json fc7e5419f84acc14b0aa73b4dc8d58d2f480a74b data/byg/recipes/wood/cypress/trapdoor.json 71959d4e94637409778e5b0aabe06e05b560cfb8 data/byg/recipes/wood/cypress/wood.json +9d0151950c4527d7aee79319c3dd5197402fc0df data/byg/recipes/wood/ebony/boat.json +dcceaf00fa6006d3a5b1338df05350b1b7463ae6 data/byg/recipes/wood/ebony/bookshelf.json +632826dba9bce03f3ed485ed57dc46afebd8a538 data/byg/recipes/wood/ebony/button.json +1ecbc6da6ff49798e35a10b15887fbce992b9372 data/byg/recipes/wood/ebony/crafting_table.json +76a1adacb68adf209a91a7693b9d6df433111402 data/byg/recipes/wood/ebony/door.json +e7fe3c01f190a0b22e1e7a57257a018df7a43fe1 data/byg/recipes/wood/ebony/fence.json +81fb1ab680f4562be18be9243b3bff3c9d0ad8fd data/byg/recipes/wood/ebony/fence_gate.json +aca20354a788e1d97963eec8c4fed0a825d75df2 data/byg/recipes/wood/ebony/planks.json +083a97f1cc0659a9b168c24d28190daa7482be9c data/byg/recipes/wood/ebony/pressure_plate.json +ecd292502b1ba405da5b7cd6dc907e6741a7ab34 data/byg/recipes/wood/ebony/slab.json +b03173249150fb57da7ea0b5fc3272530c0333e1 data/byg/recipes/wood/ebony/stairs.json +cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.json +7ef6d2286f911144c5a1fd7bfb95974631517438 data/byg/recipes/wood/ebony/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -316,4 +344,12 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json +289c45b9d1d7c2454275c9e31d84687afce1dd37 data/byg/tags/items/wood/aspen_logs.json +bcdbea8a4817d523a8fa8975d98164bc12532cf3 data/byg/tags/items/wood/baobab_logs.json +6f65a3e60d322faffed59e9f47b03086d41c6358 data/byg/tags/items/wood/blue_enchanted_logs.json +350204f5af4ced581f20c13f034cf6cbb3e557d1 data/byg/tags/items/wood/bulbis_logs.json +3b88dfcc5a9af3f583f02b1eb25d2843cd0641d5 data/byg/tags/items/wood/cherry_logs.json +e629914e0c0a5c9aace6f7c8a410142ec1b2b539 data/byg/tags/items/wood/cika_logs.json +be12ec3d68eee6eb8bbf5dac855a337bc7d1b788 data/byg/tags/items/wood/cypress_logs.json +be75a061b10665d7e7aa7af3ca4f14d21a660c30 data/byg/tags/items/wood/ebony_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_log.json b/Common/src/generated/resources/assets/byg/models/block/ebony_log.json new file mode 100644 index 0000000000..b5b6042b18 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/ebony/log", + "end": "byg:block/ebony/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_log.json b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json new file mode 100644 index 0000000000..970d8717d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json index 7d1125b4eb..b94977cbe6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:aspen_log" - ] + "tag": "byg:wood/aspen_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json index 498ca2ef4c..eb4756314a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:baobab_log" - ] + "tag": "byg:wood/baobab_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json index 9b4566fd3c..659021cb0c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:blue_enchanted_log" - ] + "tag": "byg:wood/blue_enchanted_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json index 7e1ad03294..1b289efbd2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:bulbis_stem" - ] + "tag": "byg:wood/bulbis_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json index f32084a190..df7d25d957 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:cherry_log" - ] + "tag": "byg:wood/cherry_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json index c678816fba..ccd3a40c01 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:cika_log" - ] + "tag": "byg:wood/cika_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json index 4dc5e3cc49..a084a21af0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "byg:cypress_log" - ] + "tag": "byg:wood/cypress_logs" } ] } diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json new file mode 100644 index 0000000000..6fb6476450 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json new file mode 100644 index 0000000000..60cd34e48f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json new file mode 100644 index 0000000000..6a0eb07bc4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json new file mode 100644 index 0000000000..5a80ee6a63 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json new file mode 100644 index 0000000000..2f81b12e1f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json new file mode 100644 index 0000000000..893e57855c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json new file mode 100644 index 0000000000..3614945562 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json new file mode 100644 index 0000000000..18de81f9fe --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/ebony_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json new file mode 100644 index 0000000000..e975c5714f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json new file mode 100644 index 0000000000..616d80e1c9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json new file mode 100644 index 0000000000..a8fa9b892b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json new file mode 100644 index 0000000000..6f195d68fc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json new file mode 100644 index 0000000000..efec1785a8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json index 2990caacd9..1f10a00d40 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:aspen_log" + "tag": "byg:wood/aspen_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json index 44a13d677b..ed60434226 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:baobab_log" + "tag": "byg:wood/baobab_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json index cd927d2fae..a0169150b5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:blue_enchanted_log" + "tag": "byg:wood/blue_enchanted_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json index 3b4f46ee3e..60eaa7c302 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:bulbis_stem" + "tag": "byg:wood/bulbis_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json index aebb25ae8a..18a58c1bef 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:cherry_log" + "tag": "byg:wood/cherry_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json index ae116edcfa..10ecdc315a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:cika_log" + "tag": "byg:wood/cika_logs" } ], "result": { diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json index f7bd02a35f..1deea807ee 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json @@ -3,7 +3,7 @@ "group": "wooden_planks", "ingredients": [ { - "item": "byg:cypress_log" + "tag": "byg:wood/cypress_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/ebony_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/ebony_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json index eea9016165..2a9e5c26fc 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/ebony_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json index c63bafdd28..3e206eb488 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_button.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/ebony_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/button.json diff --git a/Common/src/main/resources/data/byg/recipes/ebony_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/ebony_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json index 62312e6ce8..229d202452 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_door.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/ebony_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json index 4c8540df60..d0fd483362 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/ebony_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/ebony_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/ebony_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/ebony_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/ebony_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json index c66e978e0d..75a9283ff6 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:ebony_logs" + "tag": "byg:wood/ebony_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/ebony_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/ebony_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json index 2fbdcbcbe9..101cbf889b 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/ebony_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json index 622e11ce98..8932f57ceb 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/ebony_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json index 8d1eb6148a..4804ab1ecc 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, "result": { - "item": "byg:ebony_stairs", + "item": "byg:ebony_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ebony_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/ebony_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json index faa41a9b28..2a884e31ef 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/ebony_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/ebony_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json index d6abc4c686..97570adf68 100644 --- a/Common/src/main/resources/data/byg/recipes/ebony_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:ebony_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json new file mode 100644 index 0000000000..da85664bbd --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:aspen_log", + "byg:stripped_aspen_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json new file mode 100644 index 0000000000..ed4b52f23f --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:baobab_log", + "byg:stripped_baobab_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json new file mode 100644 index 0000000000..925a04b42e --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:blue_enchanted_log", + "byg:stripped_blue_enchanted_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json new file mode 100644 index 0000000000..c47ece67d9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:bulbis_stem", + "byg:stripped_bulbis_stem" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json new file mode 100644 index 0000000000..1d12aee025 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:cherry_log", + "byg:stripped_cherry_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json new file mode 100644 index 0000000000..eed919967f --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:cika_log", + "byg:stripped_cika_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json new file mode 100644 index 0000000000..8eb9b47b40 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:cypress_log", + "byg:stripped_cypress_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json new file mode 100644 index 0000000000..5ca12cb47c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:ebony_log", + "byg:stripped_ebony_log" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index e6cec16d10..65427d0245 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -141,7 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.EBONY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.HOLLY_DOOR.get(), RenderType.cutoutMipped()); @@ -165,7 +164,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.EBONY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.HOLLY_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -203,7 +201,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.BLUE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_OAK_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.EBONY_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FIR_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.GREEN_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.HOLLY_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 16fa756b18..1978e7086b 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -27,7 +27,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.EBONY_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FIR_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_PALO_VERDE_LEAVES.get()); @@ -72,7 +71,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.EBONY_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.FIR_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.GREEN_ENCHANTED_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.HOLLY_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 5e7cee06c6..6a4fa03d3c 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -39,7 +39,6 @@ public static void flammablesBYG() { } //Logs - flammableBlock(BYGBlocks.EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.FIR_LOG.get(), 5, 5); flammableBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.HOLLY_LOG.get(), 5, 5); @@ -57,7 +56,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_EBONY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_HOLLY_LOG.get(), 5, 5); @@ -74,7 +72,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.FIR_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.HOLLY_WOOD.get(), 5, 5); @@ -92,7 +89,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_EBONY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_FIR_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_HOLLY_WOOD.get(), 5, 5); @@ -109,7 +105,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.EBONY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.FIR_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.HOLLY_BOOKSHELF.get(), 5, 20); @@ -127,7 +122,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.EBONY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.FIR_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.HOLLY_SLAB.get(), 5, 20); @@ -145,7 +139,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.EBONY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.HOLLY_STAIRS.get(), 5, 20); @@ -163,7 +156,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.EBONY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.FIR_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.HOLLY_PLANKS.get(), 5, 20); @@ -181,7 +173,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.EBONY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.FIR_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.GREEN_ENCHANTED_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.HOLLY_FENCE.get(), 5, 20); @@ -203,7 +194,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_OAK_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.EBONY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FIR_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index ff7c3882fc..d55d0037c8 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,7 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.EBONY_LOG.get(), BYGBlocks.STRIPPED_EBONY_LOG.get()); stripables.put(BYGBlocks.FIR_LOG.get(), BYGBlocks.STRIPPED_FIR_LOG.get()); stripables.put(BYGBlocks.GREEN_ENCHANTED_LOG.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get()); stripables.put(BYGBlocks.HOLLY_LOG.get(), BYGBlocks.STRIPPED_HOLLY_LOG.get()); @@ -47,7 +46,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.EBONY_WOOD.get(), BYGBlocks.STRIPPED_EBONY_WOOD.get()); stripables.put(BYGBlocks.FIR_WOOD.get(), BYGBlocks.STRIPPED_FIR_WOOD.get()); stripables.put(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get()); stripables.put(BYGBlocks.HOLLY_WOOD.get(), BYGBlocks.STRIPPED_HOLLY_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 88a0e932ce..1a43aed1b7 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject EBONY_PLANKS = createPlanks("ebony_planks"); public static final BlockRegistryObject FIR_PLANKS = createPlanks("fir_planks"); public static final BlockRegistryObject GREEN_ENCHANTED_PLANKS = createPlanks("green_enchanted_planks"); public static final BlockRegistryObject HOLLY_PLANKS = createPlanks("holly_planks"); @@ -85,7 +84,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject EBONY_BOOKSHELF = createBookshelf("ebony_bookshelf"); public static final BlockRegistryObject FIR_BOOKSHELF = createBookshelf("fir_bookshelf"); public static final BlockRegistryObject GREEN_ENCHANTED_BOOKSHELF = createBookshelf("green_enchanted_bookshelf"); public static final BlockRegistryObject HOLLY_BOOKSHELF = createBookshelf("holly_bookshelf"); @@ -108,7 +106,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject EBONY_DOOR = createDoor("ebony_door"); public static final BlockRegistryObject FIR_DOOR = createDoor("fir_door"); public static final BlockRegistryObject GREEN_ENCHANTED_DOOR = createDoor("green_enchanted_door"); public static final BlockRegistryObject HOLLY_DOOR = createDoor("holly_door"); @@ -131,7 +128,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject EBONY_PRESSURE_PLATE = createWoodPressurePlate("ebony_pressure_plate"); public static final BlockRegistryObject FIR_PRESSURE_PLATE = createWoodPressurePlate("fir_pressure_plate"); public static final BlockRegistryObject GREEN_ENCHANTED_PRESSURE_PLATE = createWoodPressurePlate("green_enchanted_pressure_plate"); public static final BlockRegistryObject HOLLY_PRESSURE_PLATE = createWoodPressurePlate("holly_pressure_plate"); @@ -154,7 +150,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject EBONY_BUTTON = createWoodButton("ebony_button"); public static final BlockRegistryObject FIR_BUTTON = createWoodButton("fir_button"); public static final BlockRegistryObject GREEN_ENCHANTED_BUTTON = createWoodButton("green_enchanted_button"); public static final BlockRegistryObject HOLLY_BUTTON = createWoodButton("holly_button"); @@ -177,7 +172,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject EBONY_TRAPDOOR = createTrapDoor("ebony_trapdoor"); public static final BlockRegistryObject FIR_TRAPDOOR = createTrapDoor("fir_trapdoor"); public static final BlockRegistryObject GREEN_ENCHANTED_TRAPDOOR = createTrapDoor("green_enchanted_trapdoor"); public static final BlockRegistryObject HOLLY_TRAPDOOR = createTrapDoor("holly_trapdoor"); @@ -200,7 +194,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject EBONY_CRAFTING_TABLE = createCraftingTable("ebony_crafting_table"); public static final BlockRegistryObject FIR_CRAFTING_TABLE = createCraftingTable("fir_crafting_table"); public static final BlockRegistryObject GREEN_ENCHANTED_CRAFTING_TABLE = createCraftingTable("green_enchanted_crafting_table"); public static final BlockRegistryObject HOLLY_CRAFTING_TABLE = createCraftingTable("holly_crafting_table"); @@ -223,7 +216,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject EBONY_FENCE_GATE = createFenceGate("ebony_fence_gate"); public static final BlockRegistryObject FIR_FENCE_GATE = createFenceGate("fir_fence_gate"); public static final BlockRegistryObject GREEN_ENCHANTED_FENCE_GATE = createFenceGate("green_enchanted_fence_gate"); public static final BlockRegistryObject HOLLY_FENCE_GATE = createFenceGate("holly_fence_gate"); @@ -246,7 +238,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject EBONY_SLAB = createWoodSlab("ebony_slab"); public static final BlockRegistryObject FIR_SLAB = createWoodSlab("fir_slab"); public static final BlockRegistryObject GREEN_ENCHANTED_SLAB = createWoodSlab("green_enchanted_slab"); public static final BlockRegistryObject HOLLY_SLAB = createWoodSlab("holly_slab"); @@ -269,7 +260,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject EBONY_STAIRS = createWoodStairs("ebony_stairs"); public static final BlockRegistryObject FIR_STAIRS = createWoodStairs("fir_stairs"); public static final BlockRegistryObject GREEN_ENCHANTED_STAIRS = createWoodStairs("green_enchanted_stairs"); public static final BlockRegistryObject HOLLY_STAIRS = createWoodStairs("holly_stairs"); @@ -292,7 +282,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject EBONY_FENCE = createFence("ebony_fence"); public static final BlockRegistryObject FIR_FENCE = createFence("fir_fence"); public static final BlockRegistryObject GREEN_ENCHANTED_FENCE = createFence("green_enchanted_fence"); public static final BlockRegistryObject HOLLY_FENCE = createFence("holly_fence"); @@ -315,7 +304,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject EBONY_SIGN = createSign("ebony_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_SIGN = createSign("fir_sign", BYGWoodType.FIR, FIR_PLANKS); public static final BlockRegistryObject GREEN_ENCHANTED_SIGN = createSign("green_enchanted_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); public static final BlockRegistryObject HOLLY_SIGN = createSign("holly_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); @@ -338,7 +326,6 @@ public class BYGBlocks { public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject EBONY_WALL_SIGN = createWallSign("ebony_wall_sign", BYGWoodType.EBONY, EBONY_PLANKS); public static final BlockRegistryObject FIR_WALL_SIGN = createWallSign("fir_wall_sign", BYGWoodType.FIR, FIR_PLANKS); public static final BlockRegistryObject GREEN_ENCHANTED_WALL_SIGN = createWallSign("green_enchanted_wall_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); public static final BlockRegistryObject HOLLY_WALL_SIGN = createWallSign("holly_wall_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); @@ -377,7 +364,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); - public static final BlockRegistryObject EBONY_SAPLING = createSapling(BYGBlockTags.GROUND_EBONY_SAPLING, "ebony_sapling"); public static final BlockRegistryObject FIR_SAPLING = createSapling(BYGBlockTags.GROUND_FIR_SAPLING, "fir_sapling"); public static final BlockRegistryObject GREEN_ENCHANTED_SAPLING = createSapling(BYGBlockTags.GROUND_GREEN_ENCHANTED_SAPLING, "green_enchanted_sapling"); public static final BlockRegistryObject HOLLY_SAPLING = createSapling(BYGBlockTags.GROUND_HOLLY_SAPLING, "holly_sapling"); @@ -429,7 +415,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); public static final BlockRegistryObject BROWN_ZELKOVA_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_zelkova_leaves"); - public static final BlockRegistryObject EBONY_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ebony_leaves"); public static final BlockRegistryObject FIR_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "fir_leaves"); public static final BlockRegistryObject FLOWERING_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "flowering_orchard_leaves"); public static final BlockRegistryObject FLOWERING_PALO_VERDE_LEAVES = createFloweringPaloVerdeLeaves(MaterialColor.COLOR_YELLOW, "flowering_palo_verde_leaves"); @@ -756,7 +741,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject EBONY_LOG = createLog("ebony_log"); public static final BlockRegistryObject FIR_LOG = createLog("fir_log"); public static final BlockRegistryObject GREEN_ENCHANTED_LOG = createLog("green_enchanted_log"); public static final BlockRegistryObject HOLLY_LOG = createLog("holly_log"); @@ -784,7 +768,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject EBONY_WOOD = createWood("ebony_wood"); public static final BlockRegistryObject FIR_WOOD = createWood("fir_wood"); public static final BlockRegistryObject GREEN_ENCHANTED_WOOD = createWood("green_enchanted_wood"); public static final BlockRegistryObject HOLLY_WOOD = createWood("holly_wood"); @@ -936,7 +919,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_EBONY_LOG = createStrippedLog("stripped_ebony_log"); public static final BlockRegistryObject STRIPPED_FIR_LOG = createStrippedLog("stripped_fir_log"); public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_LOG = createStrippedLog("stripped_green_enchanted_log"); public static final BlockRegistryObject STRIPPED_HOLLY_LOG = createStrippedLog("stripped_holly_log"); @@ -959,7 +941,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); - public static final BlockRegistryObject STRIPPED_EBONY_WOOD = createWood("stripped_ebony_wood"); public static final BlockRegistryObject STRIPPED_FIR_WOOD = createWood("stripped_fir_wood"); public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_WOOD = createWood("stripped_green_enchanted_wood"); public static final BlockRegistryObject STRIPPED_HOLLY_WOOD = createWood("stripped_holly_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 8f91f2f31b..5bbac7e5b6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,7 +10,6 @@ // TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType EBONY = register("ebony"); public static final WoodType FIR = register("fir"); public static final WoodType GREEN_ENCHANTED = register("green_enchanted"); public static final WoodType HOLLY = register("holly"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index baf73190af..bdde33cf0b 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -1,5 +1,6 @@ package potionstudios.byg.common.block; +import net.minecraft.core.Registry; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -7,6 +8,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.properties.WoodType; import net.minecraft.world.level.material.MaterialColor; +import potionstudios.byg.BYG; import potionstudios.byg.common.entity.boat.BYGBoatEntity; import potionstudios.byg.common.item.BYGBoatItem; import potionstudios.byg.common.item.BYGCreativeTab; @@ -42,17 +44,25 @@ public enum BYGWoodTypes { .exclude(BlockType.SAPLING, BlockType.LEAVES) .boatType(BYGBoatEntity.BYGType.CHERRY)), CIKA("cika", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_CIKA_SAPLING) .boatType(BYGBoatEntity.BYGType.CIKA) .materialColor(MaterialColor.TERRACOTTA_ORANGE)), CYPRESS("cypress", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_CYPRESS_SAPLING) .boatType(BYGBoatEntity.BYGType.CYPRESS) - .materialColor(MaterialColor.TERRACOTTA_LIGHT_GREEN)); + .materialColor(MaterialColor.TERRACOTTA_LIGHT_GREEN)), + EBONY("ebony", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_EBONY_SAPLING) + .boatType(BYGBoatEntity.BYGType.EBONY) + .materialColor(MaterialColor.COLOR_GREEN)); private final String name; private final WoodType woodType; private final Builder builder; private boolean initialized; + private final TagKey logTag; + private BlockRegistryObject growerItem; private BlockRegistryObject leaves; @@ -86,6 +96,8 @@ public enum BYGWoodTypes { this.name = name; this.builder = builder; this.woodType = WoodTypeAccess.byg_create(name); + + logTag = TagKey.create(Registry.ITEM_REGISTRY, BYG.createLocation("wood/" + name + "_logs")); } public void init() { @@ -240,7 +252,9 @@ public RegistryObject boat() { return boat; } - public static void loadClass() {} + public TagKey logTag() { + return logTag; + } public enum GrowerItemType { SAPLING, diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 200e0f5c2e..2550f51373 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -54,7 +54,7 @@ public Item getDropItem() { case CHERRY -> BYGWoodTypes.CHERRY.boat().get(); case CIKA -> BYGWoodTypes.CIKA.boat().get(); case CYPRESS -> BYGWoodTypes.CYPRESS.boat().get(); - case EBONY -> BYGItems.EBONY_BOAT.get(); + case EBONY -> BYGWoodTypes.EBONY.boat().get(); case FIR -> BYGItems.FIR_BOAT.get(); case GREEN_ENCHANTED -> BYGItems.GREEN_ENCHANTED_BOAT.get(); case HOLLY -> BYGItems.HOLLY_BOAT.get(); @@ -81,7 +81,7 @@ public Block getPlanks() { case CHERRY -> BYGWoodTypes.CHERRY.planks().get(); case CIKA -> BYGWoodTypes.CIKA.planks().get(); case CYPRESS -> BYGWoodTypes.CYPRESS.planks().get(); - case EBONY -> BYGBlocks.EBONY_PLANKS.get(); + case EBONY -> BYGWoodTypes.EBONY.planks().get(); case FIR -> BYGBlocks.FIR_PLANKS.get(); case GREEN_ENCHANTED -> BYGBlocks.GREEN_ENCHANTED_PLANKS.get(); case HOLLY -> BYGBlocks.HOLLY_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index abf292d50d..98b163d640 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -285,29 +285,9 @@ public class BYGItems { BYGWoodTypes.CIKA.init(); BYGWoodTypes.CYPRESS.init(); + BYGWoodTypes.EBONY.init(); } - //Ebony Woodtype - public static final RegistryObject EBONY_SAPLING = createSaplingItem(BYGBlocks.EBONY_SAPLING); - public static final RegistryObject EBONY_LEAVES = createItem(BYGBlocks.EBONY_LEAVES); - public static final RegistryObject EBONY_LOG = createItem(BYGBlocks.EBONY_LOG); - public static final RegistryObject EBONY_WOOD = createItem(BYGBlocks.EBONY_WOOD); - public static final RegistryObject STRIPPED_EBONY_LOG = createItem(BYGBlocks.STRIPPED_EBONY_LOG); - public static final RegistryObject STRIPPED_EBONY_WOOD = createItem(BYGBlocks.STRIPPED_EBONY_WOOD); - public static final RegistryObject EBONY_PLANKS = createItem(BYGBlocks.EBONY_PLANKS); - public static final RegistryObject EBONY_BOOKSHELF = createItem(BYGBlocks.EBONY_BOOKSHELF); - public static final RegistryObject EBONY_CRAFTING_TABLE = createItem(BYGBlocks.EBONY_CRAFTING_TABLE); - public static final RegistryObject EBONY_STAIRS = createItem(BYGBlocks.EBONY_STAIRS); - public static final RegistryObject EBONY_SLAB = createItem(BYGBlocks.EBONY_SLAB); - public static final RegistryObject EBONY_FENCE = createItem(BYGBlocks.EBONY_FENCE); - public static final RegistryObject EBONY_FENCE_GATE = createItem(BYGBlocks.EBONY_FENCE_GATE); - public static final RegistryObject EBONY_DOOR = createItem(BYGBlocks.EBONY_DOOR); - public static final RegistryObject EBONY_TRAPDOOR = createItem(BYGBlocks.EBONY_TRAPDOOR); - public static final RegistryObject EBONY_PRESSURE_PLATE = createItem(BYGBlocks.EBONY_PRESSURE_PLATE); - public static final RegistryObject EBONY_BUTTON = createItem(BYGBlocks.EBONY_BUTTON); - public static final RegistryObject EBONY_SIGN = createSign("ebony_sign", BYGBlocks.EBONY_SIGN, BYGBlocks.EBONY_WALL_SIGN); - public static final RegistryObject EBONY_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.EBONY, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "ebony_boat"); - //Ether Woodtype public static final RegistryObject ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 520de9e52b..1af29cf876 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -64,8 +64,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ANCIENT_TREE2 = createConfiguredFeature("ancient_tree2", BYGFeatures.ANCIENT_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.EBONY_LOG.get()). - setLeavesBlock(BYGBlocks.EBONY_LEAVES.get()) + .fromWoodType(EBONY) .setMaxHeight(25) .setMinHeight(15) .build() @@ -722,8 +721,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> EBONY_BUSH1 = createConfiguredFeature("ebony_bush1", BYGFeatures.EBONY_BUSH1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.EBONY_LOG.get()) - .setLeavesBlock(BYGBlocks.EBONY_LEAVES.get()) + .fromWoodType(BYGWoodTypes.EBONY) .setMaxHeight(28) .setMinHeight(23) .build() @@ -731,8 +729,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> EBONY_TREE1 = createConfiguredFeature("ebony_tree1", BYGFeatures.EBONY_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.EBONY_LOG.get()) - .setLeavesBlock(BYGBlocks.EBONY_LEAVES.get()) + .fromWoodType(BYGWoodTypes.EBONY) .setMaxHeight(13) .setMinHeight(6) .build() @@ -740,8 +737,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> EBONY_TREE2 = createConfiguredFeature("ebony_tree2", BYGFeatures.EBONY_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.EBONY_LOG.get()) - .setLeavesBlock(BYGBlocks.EBONY_LEAVES.get()) + .fromWoodType(BYGWoodTypes.EBONY) .setMaxHeight(17) .setMinHeight(11) .build() diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_log.json b/Common/src/main/resources/assets/byg/models/block/cypress_log.json deleted file mode 100644 index 22aa671601..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/cypress_log_top", - "side": "byg:block/cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_log.json b/Common/src/main/resources/assets/byg/models/block/ebony_log.json deleted file mode 100644 index bd9314defd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/ebony_log_top", - "side": "byg:block/ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_log.json b/Common/src/main/resources/assets/byg/models/item/cypress_log.json deleted file mode 100644 index 7d6c1c506c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_log.json b/Common/src/main/resources/assets/byg/models/item/ebony_log.json deleted file mode 100644 index 0ed9dfcc97..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_log.png b/Common/src/main/resources/assets/byg/textures/block/ebony/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_log.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/log_top.png diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java index 124306a022..b5f138608c 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java @@ -6,6 +6,7 @@ import potionstudios.byg.BYG; import potionstudios.byg.datagen.providers.BYGAssetsProvider; import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; +import potionstudios.byg.datagen.providers.BYGItemTagsProvider; import potionstudios.byg.datagen.providers.BYGRecipeProviders; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = BYG.MOD_ID) @@ -17,7 +18,9 @@ static void onDatagen(final GatherDataEvent event) { final var existingFileHelper = event.getExistingFileHelper(); if (event.includeServer()) { - gen.addProvider(new BYGBlockTagsProvider(gen, existingFileHelper)); + final var blockTags = new BYGBlockTagsProvider(gen, existingFileHelper); + gen.addProvider(blockTags); + gen.addProvider(new BYGItemTagsProvider(gen, blockTags, existingFileHelper)); gen.addProvider(new BYGRecipeProviders(gen)); } if (event.includeClient()) { diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java index a186d99e75..fb4b261d42 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java @@ -1,7 +1,19 @@ package potionstudios.byg.datagen.providers; +import static potionstudios.byg.common.block.BYGBlocks.BULBIS_PHYCELIUM; +import static potionstudios.byg.common.block.BYGBlocks.ETHER_STONE; +import static potionstudios.byg.common.block.BYGBlocks.IMPARIUS_PHYLIUM; +import static potionstudios.byg.common.block.BYGBlocks.IVIS_PHYLIUM; +import static potionstudios.byg.common.block.BYGBlocks.LUSH_FARMLAND; +import static potionstudios.byg.common.block.BYGBlocks.LUSH_GRASS_BLOCK; +import static potionstudios.byg.common.block.BYGBlocks.LUSH_GRASS_PATH; +import static potionstudios.byg.common.block.BYGBlocks.MUD_BLOCK; +import static potionstudios.byg.common.block.BYGBlocks.NIGHTSHADE_PHYLIUM; +import static potionstudios.byg.common.block.BYGBlocks.PROVIDER; +import static potionstudios.byg.common.block.BYGBlocks.SHULKREN_PHYLIUM; import net.minecraft.core.Registry; import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.tags.TagsProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; @@ -15,23 +27,24 @@ import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; -import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.TagBuilderAccess; import potionstudios.byg.mixin.dev.BlockBehaviorAccess; import potionstudios.byg.reg.RegistryObject; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.function.Supplier; -import static potionstudios.byg.common.block.BYGBlocks.*; - @SuppressWarnings("ALL") -public class BYGBlockTagsProvider extends TagsProvider { - +public class BYGBlockTagsProvider extends BlockTagsProvider { public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { - super(pGenerator, Registry.BLOCK, BYG.MOD_ID, existingFileHelper); + super(pGenerator, BYG.MOD_ID, existingFileHelper); } // TODO document what gets generated diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java new file mode 100644 index 0000000000..3bc50a9f92 --- /dev/null +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java @@ -0,0 +1,35 @@ +package potionstudios.byg.datagen.providers; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGWoodTypes; + +import java.util.Arrays; +import java.util.function.Supplier; + +public class BYGItemTagsProvider extends ItemTagsProvider { + public BYGItemTagsProvider(DataGenerator p_126530_, BlockTagsProvider p_126531_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_126530_, p_126531_, BYG.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + for (BYGWoodTypes type : BYGWoodTypes.values()) { + tag(type.logTag(), type.log(), type.strippedLog()); + } + } + + @SafeVarargs + @SuppressWarnings("ALL") + private void tag(TagKey tag, Supplier... items) { + this.tag(tag).add(Arrays.stream(items).map(Supplier::get).map(ItemLike::asItem).toArray(Item[]::new)); + } +} diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 5ce1f73694..2c8215d5df 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -78,8 +78,8 @@ protected void buildCraftingRecipes(Consumer consumer) { .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); ShapelessRecipeBuilder.shapeless(type.planks(), 4) .group("wooden_planks") - .unlockedBy("has_logs", has(type.log())) - .requires(type.log()) // TODO tag + .unlockedBy("has_logs", has(type.logTag())) + .requires(type.logTag()) .save(consumer, BYG.createLocation("wood/" + type + "/planks")); ShapedRecipeBuilder.shaped(type.pressurePlate()) .group("wooden_pressure_plate") From 8d2af3bf0b0121a764494bceab1e8961ad821440 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 17:58:14 +0300 Subject: [PATCH 09/90] Yes --- .../byg/models/block/aspen_bookshelf.json | 12 -- .../assets/byg/models/block/aspen_button.json | 6 - .../models/block/aspen_button_inventory.json | 6 - .../models/block/aspen_button_pressed.json | 6 - .../models/block/aspen_crafting_table.json | 12 -- .../byg/models/block/aspen_door_bottom.json | 7 - .../models/block/aspen_door_bottom_hinge.json | 7 - .../byg/models/block/aspen_door_top.json | 7 - .../models/block/aspen_door_top_hinge.json | 7 - .../assets/byg/models/block/aspen_fence.json | 7 - .../byg/models/block/aspen_fence_gate.json | 6 - .../models/block/aspen_fence_gate_open.json | 6 - .../models/block/aspen_fence_gate_wall.json | 6 - .../block/aspen_fence_gate_wall_open.json | 6 - .../models/block/aspen_fence_inventory.json | 7 - .../byg/models/block/aspen_fence_post.json | 7 - .../assets/byg/models/block/aspen_leaves.json | 12 -- .../byg/models/block/aspen_leaves_snowy.json | 12 -- .../assets/byg/models/block/aspen_planks.json | 12 -- .../models/block/aspen_pressure_plate.json | 6 - .../block/aspen_pressure_plate_down.json | 6 - .../byg/models/block/aspen_sapling.json | 7 - .../assets/byg/models/block/aspen_slab.json | 8 - .../byg/models/block/aspen_slab_top.json | 8 - .../assets/byg/models/block/aspen_stairs.json | 8 - .../byg/models/block/aspen_stairs_inner.json | 8 - .../byg/models/block/aspen_stairs_outer.json | 8 - .../models/block/aspen_trapdoor_bottom.json | 6 - .../byg/models/block/aspen_trapdoor_open.json | 6 - .../byg/models/block/aspen_trapdoor_top.json | 6 - .../assets/byg/models/block/aspen_wall.json | 7 - .../models/block/aspen_wall_inventory.json | 7 - .../byg/models/block/aspen_wall_post.json | 7 - .../assets/byg/models/block/aspen_wood.json | 7 - .../assets/byg/models/item/aspen_boat.json | 6 - .../byg/models/item/aspen_bookshelf.json | 22 --- .../assets/byg/models/item/aspen_button.json | 22 --- .../byg/models/item/aspen_crafting_table.json | 22 --- .../assets/byg/models/item/aspen_door.json | 6 - .../assets/byg/models/item/aspen_fence.json | 3 - .../byg/models/item/aspen_fence_gate.json | 22 --- .../assets/byg/models/item/aspen_leaves.json | 22 --- .../assets/byg/models/item/aspen_planks.json | 22 --- .../byg/models/item/aspen_pressure_plate.json | 22 --- .../assets/byg/models/item/aspen_sapling.json | 6 - .../assets/byg/models/item/aspen_slab.json | 22 --- .../assets/byg/models/item/aspen_stairs.json | 22 --- .../byg/models/item/aspen_trapdoor.json | 22 --- .../assets/byg/models/item/aspen_wall.json | 3 - .../assets/byg/models/item/aspen_wood.json | 22 --- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{aspen_leaves.png => aspen/leaves.png} | Bin .../{aspen_planks.png => aspen/planks.png} | Bin .../{aspen_sapling.png => aspen/sapling.png} | Bin .../trapdoor.png} | Bin .../item/{aspen_boat.png => aspen/boat.png} | Bin .../item/{aspen_door.png => aspen/door.png} | Bin .../datagen/providers/BYGAssetsProvider.java | 150 +++++++++++++++++- 63 files changed, 147 insertions(+), 525 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/aspen_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_wood.json rename Common/src/main/resources/assets/byg/textures/block/{aspen_bookshelf.png => aspen/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_crafting_table_front.png => aspen/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_crafting_table_side.png => aspen/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_crafting_table_top.png => aspen/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_door_bottom.png => aspen/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_door_top.png => aspen/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_leaves.png => aspen/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_planks.png => aspen/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_sapling.png => aspen/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{aspen_trapdoor.png => aspen/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{aspen_boat.png => aspen/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{aspen_door.png => aspen/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/aspen_bookshelf.json deleted file mode 100644 index cc1d0e18c0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/aspen_planks", - "up": "byg:block/aspen_planks", - "north": "byg:block/aspen_bookshelf", - "east": "byg:block/aspen_bookshelf", - "south": "byg:block/aspen_bookshelf", - "west": "byg:block/aspen_bookshelf", - "particle": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_button.json b/Common/src/main/resources/assets/byg/models/block/aspen_button.json deleted file mode 100644 index 20e8b93639..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/aspen_button_inventory.json deleted file mode 100644 index dbf0fb299d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/aspen_button_pressed.json deleted file mode 100644 index 00a1bfc4f1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/aspen_crafting_table.json deleted file mode 100644 index bcb8ef4b13..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/aspen_crafting_table_front", - "down": "byg:block/aspen_planks", - "up": "byg:block/aspen_crafting_table_top", - "north": "byg:block/aspen_crafting_table_front", - "east": "byg:block/aspen_crafting_table_side", - "south": "byg:block/aspen_crafting_table_side", - "west": "byg:block/aspen_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom.json deleted file mode 100644 index 34042ff076..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/aspen_door_bottom", - "top": "byg:block/aspen_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom_hinge.json deleted file mode 100644 index e2a96a3b98..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/aspen_door_bottom", - "top": "byg:block/aspen_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_door_top.json b/Common/src/main/resources/assets/byg/models/block/aspen_door_top.json deleted file mode 100644 index a488767416..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/aspen_door_bottom", - "top": "byg:block/aspen_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/aspen_door_top_hinge.json deleted file mode 100644 index cada7d0a36..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/aspen_door_bottom", - "top": "byg:block/aspen_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence.json deleted file mode 100644 index ede4555fb4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/aspen_planks", - "particle": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate.json deleted file mode 100644 index 6297bab094..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_open.json deleted file mode 100644 index dae0045597..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall.json deleted file mode 100644 index 3dd158c84d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json deleted file mode 100644 index 3ce95e6f76..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_inventory.json deleted file mode 100644 index 2815052dce..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/aspen_planks", - "particle": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_fence_post.json b/Common/src/main/resources/assets/byg/models/block/aspen_fence_post.json deleted file mode 100644 index f43ab134b9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/aspen_planks", - "particle": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_leaves.json b/Common/src/main/resources/assets/byg/models/block/aspen_leaves.json deleted file mode 100644 index faa25dfdf1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_leaves.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/aspen_leaves", - "up": "byg:block/aspen_leaves", - "north": "byg:block/aspen_leaves", - "east": "byg:block/aspen_leaves", - "south": "byg:block/aspen_leaves", - "west": "byg:block/aspen_leaves", - "particle": "byg:block/aspen_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/aspen_leaves_snowy.json deleted file mode 100644 index 974a77ad52..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/aspen_leaves_snowy", - "up": "byg:block/aspen_leaves_snowy", - "north": "byg:block/aspen_leaves_snowy_side", - "east": "byg:block/aspen_leaves_snowy_side", - "south": "byg:block/aspen_leaves_snowy_side", - "west": "byg:block/aspen_leaves_snowy_side", - "particle": "byg:block/aspen_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_planks.json b/Common/src/main/resources/assets/byg/models/block/aspen_planks.json deleted file mode 100644 index b26a77abef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/aspen_planks", - "up": "byg:block/aspen_planks", - "north": "byg:block/aspen_planks", - "east": "byg:block/aspen_planks", - "south": "byg:block/aspen_planks", - "west": "byg:block/aspen_planks", - "particle": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate.json deleted file mode 100644 index 1123fb77f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate_down.json deleted file mode 100644 index 222f3ecabc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_sapling.json b/Common/src/main/resources/assets/byg/models/block/aspen_sapling.json deleted file mode 100644 index ff1bf22282..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/aspen_sapling", - "particle": "byg:block/aspen_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_slab.json b/Common/src/main/resources/assets/byg/models/block/aspen_slab.json deleted file mode 100644 index 5d2082584c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/aspen_planks", - "top": "byg:block/aspen_planks", - "side": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_slab_top.json b/Common/src/main/resources/assets/byg/models/block/aspen_slab_top.json deleted file mode 100644 index 2349e677d0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/aspen_planks", - "top": "byg:block/aspen_planks", - "side": "byg:block/aspen_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_stairs.json b/Common/src/main/resources/assets/byg/models/block/aspen_stairs.json deleted file mode 100644 index e2acfa0d4f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/aspen_planks", - "top": "byg:block/aspen_planks", - "side": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/aspen_stairs_inner.json deleted file mode 100644 index 059facefe8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/aspen_planks", - "top": "byg:block/aspen_planks", - "side": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/aspen_stairs_outer.json deleted file mode 100644 index 4e1d48f0ee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/aspen_planks", - "top": "byg:block/aspen_planks", - "side": "byg:block/aspen_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_bottom.json deleted file mode 100644 index 635fe147b2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/aspen_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_open.json deleted file mode 100644 index 7d31eeca9a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/aspen_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_top.json deleted file mode 100644 index c763ee4400..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/aspen_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_wall.json b/Common/src/main/resources/assets/byg/models/block/aspen_wall.json deleted file mode 100644 index f5abdef9ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/aspen_log", - "particle": "byg:block/aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/aspen_wall_inventory.json deleted file mode 100644 index a414ced3f1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/aspen_log", - "particle": "byg:block/aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_wall_post.json b/Common/src/main/resources/assets/byg/models/block/aspen_wall_post.json deleted file mode 100644 index d872e85f8e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/aspen_log", - "particle": "byg:block/aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/aspen_wood.json b/Common/src/main/resources/assets/byg/models/block/aspen_wood.json deleted file mode 100644 index d3746d44e7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/aspen_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/aspen_log", - "particle": "byg:block/aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_boat.json b/Common/src/main/resources/assets/byg/models/item/aspen_boat.json deleted file mode 100644 index 9cefe35b55..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/aspen_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/aspen_bookshelf.json deleted file mode 100644 index 8c3f761ef1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_button.json b/Common/src/main/resources/assets/byg/models/item/aspen_button.json deleted file mode 100644 index eebc557c69..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/aspen_crafting_table.json deleted file mode 100644 index 8accc72995..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_door.json b/Common/src/main/resources/assets/byg/models/item/aspen_door.json deleted file mode 100644 index 7db9b5cca2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/aspen_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_fence.json b/Common/src/main/resources/assets/byg/models/item/aspen_fence.json deleted file mode 100644 index 455a848d92..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/aspen_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/aspen_fence_gate.json deleted file mode 100644 index 448b1f47c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_leaves.json b/Common/src/main/resources/assets/byg/models/item/aspen_leaves.json deleted file mode 100644 index d697a87ea4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_planks.json b/Common/src/main/resources/assets/byg/models/item/aspen_planks.json deleted file mode 100644 index f3d503f966..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/aspen_pressure_plate.json deleted file mode 100644 index 2b50cbc723..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_sapling.json b/Common/src/main/resources/assets/byg/models/item/aspen_sapling.json deleted file mode 100644 index a0fe857d85..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/aspen_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_slab.json b/Common/src/main/resources/assets/byg/models/item/aspen_slab.json deleted file mode 100644 index 1e570b66f6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_stairs.json b/Common/src/main/resources/assets/byg/models/item/aspen_stairs.json deleted file mode 100644 index 2186d8b7fa..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/aspen_trapdoor.json deleted file mode 100644 index d62e09b108..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_wall.json b/Common/src/main/resources/assets/byg/models/item/aspen_wall.json deleted file mode 100644 index 11c4c5dd4f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/aspen_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_wood.json b/Common/src/main/resources/assets/byg/models/item/aspen_wood.json deleted file mode 100644 index 9ea6c1b3dc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/aspen_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/aspen/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/aspen/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_door_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_leaves.png b/Common/src/main/resources/assets/byg/textures/block/aspen/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_planks.png b/Common/src/main/resources/assets/byg/textures/block/aspen/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_planks.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_sapling.png b/Common/src/main/resources/assets/byg/textures/block/aspen/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/aspen/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/aspen_boat.png b/Common/src/main/resources/assets/byg/textures/item/aspen/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/aspen_boat.png rename to Common/src/main/resources/assets/byg/textures/item/aspen/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/aspen_door.png b/Common/src/main/resources/assets/byg/textures/item/aspen/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/aspen_door.png rename to Common/src/main/resources/assets/byg/textures/item/aspen/door.png diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java index c8a41b35c3..329bafd2e3 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java @@ -2,6 +2,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.model.generators.BlockModelProvider; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; @@ -21,10 +22,154 @@ public BYGAssetsProvider(DataGenerator generator, ExistingFileHelper existingFil @Override protected void registerModels() { + final var generatedParent = mcLoc("item/generated"); for (final var type : BYGWoodTypes.values()) { - final var log = cubeColumn(type.log().getId().getPath(), BYG.createLocation("block/" + type + "/log"), BYG.createLocation("block/" + type + "/log_top")); - item.withExistingParent(type.log().getId().getPath(), log.getLocation()) + final var typeLoc = "block/" + type + "/"; + final var typeLocItem = "item/" + type + "/"; + final var log = cubeColumn(type.log().getId().getPath(), BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); + configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); + + if (type.boat() != null) + item.withExistingParent(type.boat().getId().getPath(), generatedParent) + .texture("layer0", rl(typeLocItem + "boat")); + + final var bookshelf = cube( + type.bookshelf().getId().getPath(), + rl(typeLoc + "planks"), + rl(typeLoc + "planks"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf") + ).texture("particle", typeLoc + "planks"); + configureTransform(item.withExistingParent(type.bookshelf().getId().getPath(), bookshelf.getLocation())); + + final var button = buttonInventory(type.button().getId().getPath() + "_inventory", rl(typeLoc + "planks")); + button(type.button().getId().getPath(), rl(typeLoc + "planks")); + buttonPressed(type.button().getId().getPath() + "_pressed", rl(typeLoc + "planks")); + configureTransform(item.withExistingParent(type.button().getId().getPath(), button.getLocation())); + + final var craftingTable = cube( + type.craftingTable().getId().getPath(), + rl(typeLoc + "planks"), + rl(typeLoc + "crafting_table_top"), + rl(typeLoc + "crafting_table_front"), + rl(typeLoc + "crafting_table_side"), + rl(typeLoc + "crafting_table_side"), + rl(typeLoc + "crafting_table_front") + ).texture("particle", typeLoc + "crafting_table_front"); + configureTransform(item.withExistingParent(type.craftingTable().getId().getPath(), craftingTable.getLocation())); + + doorBottomLeft( + type.door().getId().getPath() + "_bottom", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") + ); + doorBottomRight( + type.door().getId().getPath() + "_bottom_hinge", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") + ); + doorTopLeft( + type.door().getId().getPath() + "_top", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") + ); + doorTopRight( + type.door().getId().getPath() + "_top_hinge", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") + ); + item.withExistingParent(type.door().getId().getPath(), generatedParent) + .texture("layer0", rl(typeLocItem + "door")); + + fenceSide(type.fence().getId().getPath(), rl(typeLoc + "planks")) + .texture("particle", rl(typeLoc + "planks")); + final var fenceInv = fenceInventory(type.fence().getId().getPath(), rl(typeLoc + "planks")) + .texture("particle", rl(typeLoc + "planks")); + configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceInv.getLocation())); + + final var fenceGate = fenceGate(type.fenceGate().getId().getPath(), rl(typeLoc + "planks")); + fenceGateOpen(type.fenceGate().getId().getPath() + "_open", rl(typeLoc + "planks")); + fenceGateWall(type.fenceGate().getId().getPath() + "_wall", rl(typeLoc + "planks")); + fenceGateWallOpen(type.fenceGate().getId().getPath() + "_wall_open", rl(typeLoc + "planks")); + fencePost(type + "_fence_post", rl(typeLoc + "planks")) + .texture("particle", rl(typeLoc + "planks")); + configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceGate.getLocation())); + + if (type.leaves() != null) { + final var leavesLoc = rl(typeLoc + "leaves"); + final var leaves = cube( + type.leaves().getId().getPath(), + leavesLoc, leavesLoc, leavesLoc, + leavesLoc, leavesLoc, leavesLoc + ).texture("particle", leavesLoc); + configureTransform(item.withExistingParent(type.leaves().getId().getPath(), leaves.getLocation())); + cube( + type.leaves().getId().getPath() + "_snowy", + rl(typeLoc + "leaves_snowy"), + rl(typeLoc + "leaves_snowy"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side") + ).texture("particle", rl(typeLoc + "leaves_snowy_side")); + } + final var planksLoc = rl(typeLoc + "planks"); + final var planks = cube(type.planks().getId().getPath(), planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) + .texture("particle", planksLoc); + configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); + + final var wood = cubeAll(type.wood().getId().getPath(), rl(typeLoc + "log")) + .texture("particle", rl(typeLoc + "log")); + configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); + + if (type.growerItem() != null) { + final var textureLoc = rl(typeLoc + "grower_item"); + cross(type.growerItem().getId().getPath(), textureLoc); + item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) + .texture("layer0", rl(typeLocItem + "grower_item")); + } + final var pressurePlate = pressurePlate(type.pressurePlate().getId().getPath(), rl(typeLoc + "planks")); + pressurePlateDown(type.pressurePlate().getId().getPath() + "_down", rl(typeLoc + "planks")); + configureTransform(item.withExistingParent(type.pressurePlate().getId().getPath(), pressurePlate.getLocation())); + + final var slab = slab(type.slab().getId().getPath(), planksLoc, planksLoc, planksLoc); + slabTop(type.slab().getId().getPath() + "_top", planksLoc, planksLoc, planksLoc); + configureTransform(item.withExistingParent(type.slab().getId().getPath(), slab.getLocation())); + + final var stairs = stairs(type.stairs().getId().getPath(), planksLoc, planksLoc, planksLoc); + stairsInner(type.stairs().getId().getPath() + "_inner", planksLoc, planksLoc, planksLoc); + stairsOuter(type.stairs().getId().getPath() + "_outer", planksLoc, planksLoc, planksLoc); + configureTransform(item.withExistingParent(type.stairs().getId().getPath(), stairs.getLocation())); + + final var trapdoorName = type.trapdoor().getId().getPath(); + final var trapdoorLoc = rl(typeLoc + "trapdoor"); + final var trapdoor = trapdoorOrientableBottom(trapdoorName + "_bottom", trapdoorLoc); + trapdoorOrientableTop(trapdoorName + "_top", trapdoorLoc); + trapdoorOrientableOpen(trapdoorName + "_open", trapdoorLoc); + configureTransform(item.withExistingParent(trapdoorName, trapdoor.getLocation())); + + // TODO what are walls? + final var logLocation = rl(typeLoc + "log"); + final var wallInv = wallInventory(type + "_wall_inventory", logLocation) + .texture("particle", logLocation); + item.withExistingParent(type.wallSign().getId().getPath(), wallInv.getLocation()); + wallSide(type + "_wall", logLocation) + .texture("particle", logLocation); + wallPost(type + "_wall_post", logLocation) + .texture("particle", logLocation); + } + } + + private static ResourceLocation rl(String path) { + return BYG.createLocation(path); + } + + @SuppressWarnings("all") + private ItemModelBuilder configureTransform(ItemModelBuilder builder) { + return builder .transforms() .transform(ModelBuilder.Perspective.THIRDPERSON_LEFT) .rotation(10, -45, 170) @@ -37,7 +182,6 @@ protected void registerModels() { .scale(0.375f, 0.375f, 0.375f) .end() .end(); - } } public ItemModelBuilder item(String path) { From 7c702b97c8eb1de769de5921fd7ccd0abf5a73c3 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 17:59:06 +0300 Subject: [PATCH 10/90] Baobab del --- .../byg/models/block/baobab_bookshelf.json | 12 ---------- .../byg/models/block/baobab_button.json | 6 ----- .../models/block/baobab_button_inventory.json | 6 ----- .../models/block/baobab_button_pressed.json | 6 ----- .../models/block/baobab_crafting_table.json | 12 ---------- .../byg/models/block/baobab_door_bottom.json | 7 ------ .../block/baobab_door_bottom_hinge.json | 7 ------ .../byg/models/block/baobab_door_top.json | 7 ------ .../models/block/baobab_door_top_hinge.json | 7 ------ .../assets/byg/models/block/baobab_fence.json | 7 ------ .../byg/models/block/baobab_fence_gate.json | 6 ----- .../models/block/baobab_fence_gate_open.json | 6 ----- .../models/block/baobab_fence_gate_wall.json | 6 ----- .../block/baobab_fence_gate_wall_open.json | 6 ----- .../models/block/baobab_fence_inventory.json | 7 ------ .../byg/models/block/baobab_fence_post.json | 7 ------ .../byg/models/block/baobab_leaves.json | 12 ---------- .../byg/models/block/baobab_leaves_snowy.json | 12 ---------- .../byg/models/block/baobab_planks.json | 12 ---------- .../models/block/baobab_pressure_plate.json | 6 ----- .../byg/models/block/baobab_sapling.json | 7 ------ .../assets/byg/models/block/baobab_slab.json | 8 ------- .../byg/models/block/baobab_slab_top.json | 8 ------- .../byg/models/block/baobab_stairs.json | 8 ------- .../byg/models/block/baobab_stairs_inner.json | 8 ------- .../byg/models/block/baobab_stairs_outer.json | 8 ------- .../models/block/baobab_trapdoor_bottom.json | 6 ----- .../models/block/baobab_trapdoor_open.json | 6 ----- .../byg/models/block/baobab_trapdoor_top.json | 6 ----- .../assets/byg/models/block/baobab_wall.json | 7 ------ .../models/block/baobab_wall_inventory.json | 7 ------ .../byg/models/block/baobab_wall_post.json | 7 ------ .../assets/byg/models/block/baobab_wood.json | 7 ------ .../assets/byg/models/item/baobab_boat.json | 6 ----- .../byg/models/item/baobab_bookshelf.json | 22 ------------------ .../assets/byg/models/item/baobab_button.json | 22 ------------------ .../models/item/baobab_crafting_table.json | 22 ------------------ .../assets/byg/models/item/baobab_door.json | 6 ----- .../assets/byg/models/item/baobab_fence.json | 3 --- .../byg/models/item/baobab_fence_gate.json | 22 ------------------ .../assets/byg/models/item/baobab_leaves.json | 22 ------------------ .../assets/byg/models/item/baobab_planks.json | 22 ------------------ .../models/item/baobab_pressure_plate.json | 22 ------------------ .../byg/models/item/baobab_sapling.json | 6 ----- .../assets/byg/models/item/baobab_slab.json | 22 ------------------ .../assets/byg/models/item/baobab_stairs.json | 22 ------------------ .../byg/models/item/baobab_trapdoor.json | 22 ------------------ .../assets/byg/models/item/baobab_wall.json | 3 --- .../assets/byg/models/item/baobab_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../fruit_stage0.png} | Bin .../fruit_stage1.png} | Bin .../fruit_stage2.png} | Bin .../fruit_stage3.png} | Bin .../{baobab_leaves.png => baobab/leaves.png} | Bin .../{baobab_planks.png => baobab/planks.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../item/{baobab_boat.png => baobab/boat.png} | Bin .../item/{baobab_door.png => baobab/door.png} | Bin .../{baobab_fruit.png => baobab/fruit.png} | Bin 66 files changed, 516 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_wood.json rename Common/src/main/resources/assets/byg/textures/block/{baobab_bookshelf.png => baobab/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_crafting_table_front.png => baobab/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_crafting_table_side.png => baobab/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_crafting_table_top.png => baobab/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_door_bottom.png => baobab/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_door_top.png => baobab/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_fruit_stage0.png => baobab/fruit_stage0.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_fruit_stage1.png => baobab/fruit_stage1.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_fruit_stage2.png => baobab/fruit_stage2.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_fruit_stage3.png => baobab/fruit_stage3.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_leaves.png => baobab/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_planks.png => baobab/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_sapling.png => baobab/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{baobab_trapdoor.png => baobab/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{baobab_boat.png => baobab/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{baobab_door.png => baobab/door.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{baobab_fruit.png => baobab/fruit.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/baobab_bookshelf.json deleted file mode 100644 index ac345024f8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/baobab_planks", - "up": "byg:block/baobab_planks", - "north": "byg:block/baobab_bookshelf", - "east": "byg:block/baobab_bookshelf", - "south": "byg:block/baobab_bookshelf", - "west": "byg:block/baobab_bookshelf", - "particle": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_button.json b/Common/src/main/resources/assets/byg/models/block/baobab_button.json deleted file mode 100644 index 278c3d04d8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/baobab_button_inventory.json deleted file mode 100644 index f183e6c47f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/baobab_button_pressed.json deleted file mode 100644 index bc9905bbd9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/baobab_crafting_table.json deleted file mode 100644 index 3a1317f46b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/baobab_crafting_table_front", - "down": "byg:block/baobab_planks", - "up": "byg:block/baobab_crafting_table_top", - "north": "byg:block/baobab_crafting_table_front", - "east": "byg:block/baobab_crafting_table_side", - "south": "byg:block/baobab_crafting_table_side", - "west": "byg:block/baobab_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom.json deleted file mode 100644 index fb80c977ad..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/baobab_door_bottom", - "top": "byg:block/baobab_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom_hinge.json deleted file mode 100644 index 7b886d96fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/baobab_door_bottom", - "top": "byg:block/baobab_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_door_top.json b/Common/src/main/resources/assets/byg/models/block/baobab_door_top.json deleted file mode 100644 index c84242e94f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/baobab_door_bottom", - "top": "byg:block/baobab_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/baobab_door_top_hinge.json deleted file mode 100644 index ac6003ff88..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/baobab_door_bottom", - "top": "byg:block/baobab_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence.json deleted file mode 100644 index 0ee73a0d47..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/baobab_planks", - "particle": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate.json deleted file mode 100644 index 0f58f6d0f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_open.json deleted file mode 100644 index ed085115e8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall.json deleted file mode 100644 index 9405b4fb14..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json deleted file mode 100644 index f77a7f9254..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_inventory.json deleted file mode 100644 index 05bf67b1e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/baobab_planks", - "particle": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fence_post.json b/Common/src/main/resources/assets/byg/models/block/baobab_fence_post.json deleted file mode 100644 index ba910bfa63..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/baobab_planks", - "particle": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_leaves.json b/Common/src/main/resources/assets/byg/models/block/baobab_leaves.json deleted file mode 100644 index 0b8b1a4827..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_leaves.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/baobab_leaves", - "up": "byg:block/baobab_leaves", - "north": "byg:block/baobab_leaves", - "east": "byg:block/baobab_leaves", - "south": "byg:block/baobab_leaves", - "west": "byg:block/baobab_leaves", - "particle": "byg:block/baobab_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/baobab_leaves_snowy.json deleted file mode 100644 index 2e345f0d2f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/baobab_leaves_snowy", - "up": "byg:block/baobab_leaves_snowy", - "north": "byg:block/baobab_leaves_snowy_side", - "east": "byg:block/baobab_leaves_snowy_side", - "south": "byg:block/baobab_leaves_snowy_side", - "west": "byg:block/baobab_leaves_snowy_side", - "particle": "byg:block/baobab_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_planks.json b/Common/src/main/resources/assets/byg/models/block/baobab_planks.json deleted file mode 100644 index a2b69d230a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/baobab_planks", - "up": "byg:block/baobab_planks", - "north": "byg:block/baobab_planks", - "east": "byg:block/baobab_planks", - "south": "byg:block/baobab_planks", - "west": "byg:block/baobab_planks", - "particle": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate.json deleted file mode 100644 index 79cd8e5658..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_sapling.json b/Common/src/main/resources/assets/byg/models/block/baobab_sapling.json deleted file mode 100644 index 49c080eadc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/baobab_sapling", - "particle": "byg:block/baobab_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_slab.json b/Common/src/main/resources/assets/byg/models/block/baobab_slab.json deleted file mode 100644 index 63b820c89d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/baobab_planks", - "top": "byg:block/baobab_planks", - "side": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_slab_top.json b/Common/src/main/resources/assets/byg/models/block/baobab_slab_top.json deleted file mode 100644 index 180a125b8b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/baobab_planks", - "top": "byg:block/baobab_planks", - "side": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_stairs.json b/Common/src/main/resources/assets/byg/models/block/baobab_stairs.json deleted file mode 100644 index 0689bca90a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/baobab_planks", - "top": "byg:block/baobab_planks", - "side": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/baobab_stairs_inner.json deleted file mode 100644 index 2b4a189935..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/baobab_planks", - "top": "byg:block/baobab_planks", - "side": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/baobab_stairs_outer.json deleted file mode 100644 index 9165b0c6d8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/baobab_planks", - "top": "byg:block/baobab_planks", - "side": "byg:block/baobab_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_bottom.json deleted file mode 100644 index 419f54833d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/baobab_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_open.json deleted file mode 100644 index 634ee69cb5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/baobab_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_top.json deleted file mode 100644 index a593ec49a7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/baobab_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_wall.json b/Common/src/main/resources/assets/byg/models/block/baobab_wall.json deleted file mode 100644 index b02bc20112..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/baobab_log_side", - "particle": "byg:block/baobab_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/baobab_wall_inventory.json deleted file mode 100644 index 232e55ad2b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/baobab_log_side", - "particle": "byg:block/baobab_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_wall_post.json b/Common/src/main/resources/assets/byg/models/block/baobab_wall_post.json deleted file mode 100644 index 088391064f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/baobab_log_side", - "particle": "byg:block/baobab_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_wood.json b/Common/src/main/resources/assets/byg/models/block/baobab_wood.json deleted file mode 100644 index 6be6f89797..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/baobab_log", - "particle": "byg:block/baobab_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_boat.json b/Common/src/main/resources/assets/byg/models/item/baobab_boat.json deleted file mode 100644 index de377b3464..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/baobab_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/baobab_bookshelf.json deleted file mode 100644 index f71da174b8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_button.json b/Common/src/main/resources/assets/byg/models/item/baobab_button.json deleted file mode 100644 index 49e3bd8d6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/baobab_crafting_table.json deleted file mode 100644 index ab39a0a896..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_door.json b/Common/src/main/resources/assets/byg/models/item/baobab_door.json deleted file mode 100644 index 137ad2e848..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/baobab_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_fence.json b/Common/src/main/resources/assets/byg/models/item/baobab_fence.json deleted file mode 100644 index 2c2b3238d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/baobab_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/baobab_fence_gate.json deleted file mode 100644 index b694529b04..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_leaves.json b/Common/src/main/resources/assets/byg/models/item/baobab_leaves.json deleted file mode 100644 index 0878987913..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_planks.json b/Common/src/main/resources/assets/byg/models/item/baobab_planks.json deleted file mode 100644 index 3b110fc29e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/baobab_pressure_plate.json deleted file mode 100644 index 813f240e29..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_sapling.json b/Common/src/main/resources/assets/byg/models/item/baobab_sapling.json deleted file mode 100644 index c8959209db..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/baobab_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_slab.json b/Common/src/main/resources/assets/byg/models/item/baobab_slab.json deleted file mode 100644 index bb364d2dc5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_stairs.json b/Common/src/main/resources/assets/byg/models/item/baobab_stairs.json deleted file mode 100644 index 89e7474e39..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/baobab_trapdoor.json deleted file mode 100644 index ad8cdf1990..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_wall.json b/Common/src/main/resources/assets/byg/models/item/baobab_wall.json deleted file mode 100644 index 3f951faa77..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/baobab_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_wood.json b/Common/src/main/resources/assets/byg/models/item/baobab_wood.json deleted file mode 100644 index 5f7f2146e1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/baobab_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/baobab/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/baobab/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_door_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage0.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage0.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage0.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage0.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage1.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage1.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage1.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage1.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage2.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage2.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage2.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage2.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage3.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage3.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_fruit_stage3.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage3.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_leaves.png b/Common/src/main/resources/assets/byg/textures/block/baobab/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_planks.png b/Common/src/main/resources/assets/byg/textures/block/baobab/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_planks.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_sapling.png b/Common/src/main/resources/assets/byg/textures/block/baobab/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/baobab/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/baobab_boat.png b/Common/src/main/resources/assets/byg/textures/item/baobab/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/baobab_boat.png rename to Common/src/main/resources/assets/byg/textures/item/baobab/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/baobab_door.png b/Common/src/main/resources/assets/byg/textures/item/baobab/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/baobab_door.png rename to Common/src/main/resources/assets/byg/textures/item/baobab/door.png diff --git a/Common/src/main/resources/assets/byg/textures/item/baobab_fruit.png b/Common/src/main/resources/assets/byg/textures/item/baobab/fruit.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/baobab_fruit.png rename to Common/src/main/resources/assets/byg/textures/item/baobab/fruit.png From 8f87ffe144d55a82f3fd80c5566c7619864f8626 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 17:59:30 +0300 Subject: [PATCH 11/90] BlueEnchanted del --- .../block/blue_enchanted_bookshelf.json | 12 ---------- .../models/block/blue_enchanted_button.json | 6 ----- .../blue_enchanted_button_inventory.json | 6 ----- .../block/blue_enchanted_button_pressed.json | 6 ----- .../block/blue_enchanted_crafting_table.json | 12 ---------- .../block/blue_enchanted_door_bottom.json | 7 ------ .../blue_enchanted_door_bottom_hinge.json | 7 ------ .../models/block/blue_enchanted_door_top.json | 7 ------ .../block/blue_enchanted_door_top_hinge.json | 7 ------ .../models/block/blue_enchanted_fence.json | 7 ------ .../block/blue_enchanted_fence_gate.json | 6 ----- .../block/blue_enchanted_fence_gate_open.json | 6 ----- .../block/blue_enchanted_fence_gate_wall.json | 6 ----- .../blue_enchanted_fence_gate_wall_open.json | 6 ----- .../block/blue_enchanted_fence_inventory.json | 7 ------ .../block/blue_enchanted_fence_post.json | 7 ------ .../models/block/blue_enchanted_leaves.json | 12 ---------- .../block/blue_enchanted_leaves_snowy.json | 12 ---------- .../models/block/blue_enchanted_planks.json | 12 ---------- .../block/blue_enchanted_pressure_plate.json | 6 ----- .../models/block/blue_enchanted_sapling.json | 7 ------ .../byg/models/block/blue_enchanted_slab.json | 8 ------- .../models/block/blue_enchanted_slab_top.json | 8 ------- .../models/block/blue_enchanted_stairs.json | 8 ------- .../block/blue_enchanted_stairs_inner.json | 8 ------- .../block/blue_enchanted_stairs_outer.json | 8 ------- .../block/blue_enchanted_trapdoor_bottom.json | 6 ----- .../block/blue_enchanted_trapdoor_open.json | 6 ----- .../block/blue_enchanted_trapdoor_top.json | 6 ----- .../byg/models/block/blue_enchanted_wall.json | 7 ------ .../block/blue_enchanted_wall_inventory.json | 7 ------ .../block/blue_enchanted_wall_post.json | 7 ------ .../byg/models/block/blue_enchanted_wood.json | 7 ------ .../byg/models/item/blue_enchanted_boat.json | 6 ----- .../models/item/blue_enchanted_bookshelf.json | 22 ------------------ .../models/item/blue_enchanted_button.json | 22 ------------------ .../item/blue_enchanted_crafting_table.json | 22 ------------------ .../byg/models/item/blue_enchanted_door.json | 6 ----- .../byg/models/item/blue_enchanted_fence.json | 3 --- .../item/blue_enchanted_fence_gate.json | 22 ------------------ .../models/item/blue_enchanted_leaves.json | 22 ------------------ .../models/item/blue_enchanted_planks.json | 22 ------------------ .../item/blue_enchanted_pressure_plate.json | 22 ------------------ .../models/item/blue_enchanted_sapling.json | 6 ----- .../byg/models/item/blue_enchanted_slab.json | 22 ------------------ .../models/item/blue_enchanted_stairs.json | 22 ------------------ .../models/item/blue_enchanted_trapdoor.json | 22 ------------------ .../byg/models/item/blue_enchanted_wall.json | 3 --- .../byg/models/item/blue_enchanted_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../leaves.png} | Bin .../planks.png} | Bin .../planks_top.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../boat.png} | Bin .../door.png} | Bin 62 files changed, 516 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_wood.json rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_bookshelf.png => blue_enchanted/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_crafting_table_front.png => blue_enchanted/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_crafting_table_side.png => blue_enchanted/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_crafting_table_top.png => blue_enchanted/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_door_bottom.png => blue_enchanted/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_door_top.png => blue_enchanted/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_leaves.png => blue_enchanted/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_planks.png => blue_enchanted/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_planks_top.png => blue_enchanted/planks_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_sapling.png => blue_enchanted/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{blue_enchanted_trapdoor.png => blue_enchanted/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{blue_enchanted_boat.png => blue_enchanted/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{blue_enchanted_door.png => blue_enchanted/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_bookshelf.json deleted file mode 100644 index a97887e818..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/blue_enchanted_planks", - "up": "byg:block/blue_enchanted_planks", - "north": "byg:block/blue_enchanted_bookshelf", - "east": "byg:block/blue_enchanted_bookshelf", - "south": "byg:block/blue_enchanted_bookshelf", - "west": "byg:block/blue_enchanted_bookshelf", - "particle": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button.json deleted file mode 100644 index 087ce3588b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_inventory.json deleted file mode 100644 index 12db6037d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_pressed.json deleted file mode 100644 index 4aadce2f09..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_crafting_table.json deleted file mode 100644 index d5f12462af..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/blue_enchanted_crafting_table_front", - "down": "byg:block/blue_enchanted_planks", - "up": "byg:block/blue_enchanted_crafting_table_top", - "north": "byg:block/blue_enchanted_crafting_table_front", - "east": "byg:block/blue_enchanted_crafting_table_side", - "south": "byg:block/blue_enchanted_crafting_table_side", - "west": "byg:block/blue_enchanted_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom.json deleted file mode 100644 index 786fd00162..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/blue_enchanted_door_bottom", - "top": "byg:block/blue_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json deleted file mode 100644 index f3de83a7b2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/blue_enchanted_door_bottom", - "top": "byg:block/blue_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top.json deleted file mode 100644 index f287c17676..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/blue_enchanted_door_bottom", - "top": "byg:block/blue_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json deleted file mode 100644 index 0e020e9a9d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/blue_enchanted_door_bottom", - "top": "byg:block/blue_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence.json deleted file mode 100644 index 43b36c17ce..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/blue_enchanted_planks", - "particle": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate.json deleted file mode 100644 index 60c90ea20c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json deleted file mode 100644 index f3ddfeca2b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json deleted file mode 100644 index 13d23bdb4f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json deleted file mode 100644 index 15b1518aea..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_inventory.json deleted file mode 100644 index 7ad6d60db8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/blue_enchanted_planks", - "particle": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_post.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_post.json deleted file mode 100644 index c4929dce57..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/blue_enchanted_planks", - "particle": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves.json deleted file mode 100644 index 3baea67594..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/blue_enchanted_leaves", - "up": "byg:block/blue_enchanted_leaves", - "north": "byg:block/blue_enchanted_leaves", - "east": "byg:block/blue_enchanted_leaves", - "south": "byg:block/blue_enchanted_leaves", - "west": "byg:block/blue_enchanted_leaves", - "particle": "byg:block/blue_enchanted_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json deleted file mode 100644 index ed040df7fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/blue_enchanted_leaves_snowy", - "up": "byg:block/blue_enchanted_leaves_snowy", - "north": "byg:block/blue_enchanted_leaves_snowy_side", - "east": "byg:block/blue_enchanted_leaves_snowy_side", - "south": "byg:block/blue_enchanted_leaves_snowy_side", - "west": "byg:block/blue_enchanted_leaves_snowy_side", - "particle": "byg:block/blue_enchanted_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_planks.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_planks.json deleted file mode 100644 index 7100cf99d7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/blue_enchanted_planks_top", - "up": "byg:block/blue_enchanted_planks_top", - "north": "byg:block/blue_enchanted_planks", - "east": "byg:block/blue_enchanted_planks", - "south": "byg:block/blue_enchanted_planks", - "west": "byg:block/blue_enchanted_planks", - "particle": "byg:block/blue_enchanted_planks_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json deleted file mode 100644 index 2e88567a59..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_sapling.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_sapling.json deleted file mode 100644 index 7bc02df86d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/blue_enchanted_sapling", - "particle": "byg:block/blue_enchanted_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab.json deleted file mode 100644 index c43df22190..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/blue_enchanted_planks", - "top": "byg:block/blue_enchanted_planks_top", - "side": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab_top.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab_top.json deleted file mode 100644 index 53bede9477..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/blue_enchanted_planks", - "top": "byg:block/blue_enchanted_planks_top", - "side": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs.json deleted file mode 100644 index c073159410..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/blue_enchanted_planks", - "top": "byg:block/blue_enchanted_planks", - "side": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json deleted file mode 100644 index 083995e952..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/blue_enchanted_planks", - "top": "byg:block/blue_enchanted_planks", - "side": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json deleted file mode 100644 index 4b1656fc58..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/blue_enchanted_planks", - "top": "byg:block/blue_enchanted_planks", - "side": "byg:block/blue_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json deleted file mode 100644 index 9de8db2f6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/blue_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json deleted file mode 100644 index fdf530da45..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/blue_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json deleted file mode 100644 index 929e7087e9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/blue_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall.json deleted file mode 100644 index ef8c7687ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/blue_enchanted_log", - "particle": "byg:block/blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_inventory.json deleted file mode 100644 index 61b52a0a8c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/blue_enchanted_log", - "particle": "byg:block/blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_post.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_post.json deleted file mode 100644 index 15118362df..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/blue_enchanted_log", - "particle": "byg:block/blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wood.json deleted file mode 100644 index 8b5f9ea242..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/blue_enchanted_log", - "particle": "byg:block/blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_boat.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_boat.json deleted file mode 100644 index 3cc608d2dd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/blue_enchanted_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_bookshelf.json deleted file mode 100644 index c945ac0978..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_button.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_button.json deleted file mode 100644 index ab1427fba4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_crafting_table.json deleted file mode 100644 index ad31d97b28..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_door.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_door.json deleted file mode 100644 index 17de9838be..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/blue_enchanted_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence.json deleted file mode 100644 index e9f48da94b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence_gate.json deleted file mode 100644 index 50a3ffe39d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_leaves.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_leaves.json deleted file mode 100644 index 70e1859be4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_planks.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_planks.json deleted file mode 100644 index a6e63e7e8e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json deleted file mode 100644 index ae929a2948..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sapling.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sapling.json deleted file mode 100644 index c275489d01..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/blue_enchanted_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_slab.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_slab.json deleted file mode 100644 index e0ad9445da..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_stairs.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_stairs.json deleted file mode 100644 index 5cd0cad38d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_trapdoor.json deleted file mode 100644 index 93353fb1e7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wall.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wall.json deleted file mode 100644 index fa8b29b663..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wood.json deleted file mode 100644 index d5aa0d99b6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/blue_enchanted_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_door_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_leaves.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_planks.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_planks.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_planks_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/planks_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_planks_top.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/planks_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_sapling.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/blue_enchanted_boat.png b/Common/src/main/resources/assets/byg/textures/item/blue_enchanted/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/blue_enchanted_boat.png rename to Common/src/main/resources/assets/byg/textures/item/blue_enchanted/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/blue_enchanted_door.png b/Common/src/main/resources/assets/byg/textures/item/blue_enchanted/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/blue_enchanted_door.png rename to Common/src/main/resources/assets/byg/textures/item/blue_enchanted/door.png From 152ffb33b068221e6256eb34fa99301523d6b63e Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 17:59:47 +0300 Subject: [PATCH 12/90] Bulbis del --- .../assets/byg/models/block/bulbis_bookshelf.json | 12 ------------ .../assets/byg/models/block/bulbis_button.json | 6 ------ .../byg/models/block/bulbis_button_inventory.json | 6 ------ .../byg/models/block/bulbis_button_pressed.json | 6 ------ .../byg/models/block/bulbis_crafting_table.json | 12 ------------ .../assets/byg/models/block/bulbis_door_bottom.json | 7 ------- .../byg/models/block/bulbis_door_bottom_hinge.json | 7 ------- .../assets/byg/models/block/bulbis_door_top.json | 7 ------- .../byg/models/block/bulbis_door_top_hinge.json | 7 ------- .../assets/byg/models/block/bulbis_fence_gate.json | 6 ------ .../byg/models/block/bulbis_fence_gate_open.json | 6 ------ .../byg/models/block/bulbis_fence_gate_wall.json | 6 ------ .../models/block/bulbis_fence_gate_wall_open.json | 6 ------ .../byg/models/block/bulbis_fence_inventory.json | 6 ------ .../assets/byg/models/block/bulbis_fence_post.json | 6 ------ .../assets/byg/models/block/bulbis_leaves.json | 6 ------ .../assets/byg/models/block/bulbis_oddity.json | 7 ------- .../assets/byg/models/block/bulbis_planks.json | 6 ------ .../byg/models/block/bulbis_pressure_plate.json | 6 ------ .../assets/byg/models/block/bulbis_slab.json | 8 -------- .../assets/byg/models/block/bulbis_slab_top.json | 8 -------- .../assets/byg/models/block/bulbis_stairs.json | 8 -------- .../byg/models/block/bulbis_stairs_inner.json | 8 -------- .../byg/models/block/bulbis_stairs_outer.json | 8 -------- .../byg/models/block/bulbis_trapdoor_bottom.json | 6 ------ .../byg/models/block/bulbis_trapdoor_open.json | 6 ------ .../byg/models/block/bulbis_trapdoor_top.json | 6 ------ .../assets/byg/models/block/bulbis_wood.json | 7 ------- .../assets/byg/models/item/bulbis_bookshelf.json | 3 --- .../assets/byg/models/item/bulbis_button.json | 3 --- .../byg/models/item/bulbis_crafting_table.json | 3 --- .../assets/byg/models/item/bulbis_door.json | 6 ------ .../assets/byg/models/item/bulbis_fence.json | 3 --- .../assets/byg/models/item/bulbis_fence_gate.json | 3 --- .../assets/byg/models/item/bulbis_leaves.json | 3 --- .../assets/byg/models/item/bulbis_oddity.json | 6 ------ .../assets/byg/models/item/bulbis_planks.json | 3 --- .../byg/models/item/bulbis_pressure_plate.json | 3 --- .../assets/byg/models/item/bulbis_slab.json | 3 --- .../assets/byg/models/item/bulbis_stairs.json | 3 --- .../assets/byg/models/item/bulbis_trapdoor.json | 3 --- .../assets/byg/models/item/bulbis_wood.json | 3 --- .../anomaly_bottom.png} | Bin .../anomaly_bottom.png.mcmeta} | 0 .../anomaly_top.png} | Bin .../anomaly_top.png.mcmeta} | 0 .../{bulbis_bookshelf.png => bulbis/bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top .png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../{bulbis_door_top.png => bulbis/door_top.png} | Bin .../block/{bulbis_oddity.png => bulbis/oddity.png} | Bin .../{bulbis_phycelium.png => bulbis/phycelium.png} | Bin .../phycelium_top.png} | Bin .../block/{bulbis_planks.png => bulbis/planks.png} | Bin .../block/{bulbis_shell.png => bulbis/shell.png} | Bin .../{bulbis_sprouts.png => bulbis/sprouts.png} | Bin .../{bulbis_trapdoor.png => bulbis/trapdoor.png} | Bin .../item/{bulbis_anomaly.png => bulbis/anomaly.png} | Bin .../item/{bulbis_door.png => bulbis/door.png} | Bin 62 files changed, 244 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_oddity.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_oddity.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_wood.json rename Common/src/main/resources/assets/byg/textures/block/{bulbis_anomaly_bottom.png => bulbis/anomaly_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_anomaly_bottom.png.mcmeta => bulbis/anomaly_bottom.png.mcmeta} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_anomaly_top.png => bulbis/anomaly_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_anomaly_top.png.mcmeta => bulbis/anomaly_top.png.mcmeta} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_bookshelf.png => bulbis/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_crafting_table_front.png => bulbis/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_crafting_table_side.png => bulbis/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_crafting_table_top .png => bulbis/crafting_table_top .png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_crafting_table_top.png => bulbis/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_door_bottom.png => bulbis/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_door_top.png => bulbis/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_oddity.png => bulbis/oddity.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_phycelium.png => bulbis/phycelium.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_phycelium_top.png => bulbis/phycelium_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_planks.png => bulbis/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_shell.png => bulbis/shell.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_sprouts.png => bulbis/sprouts.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis_trapdoor.png => bulbis/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{bulbis_anomaly.png => bulbis/anomaly.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{bulbis_door.png => bulbis/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/bulbis_bookshelf.json deleted file mode 100644 index a53d74a6e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/bulbis_planks", - "up": "byg:block/bulbis_planks", - "north": "byg:block/bulbis_bookshelf", - "east": "byg:block/bulbis_bookshelf", - "south": "byg:block/bulbis_bookshelf", - "west": "byg:block/bulbis_bookshelf", - "particle": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_button.json b/Common/src/main/resources/assets/byg/models/block/bulbis_button.json deleted file mode 100644 index 0aa217f5c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/bulbis_button_inventory.json deleted file mode 100644 index cadcc2db03..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/bulbis_button_pressed.json deleted file mode 100644 index 3bdde5c0b1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/bulbis_crafting_table.json deleted file mode 100644 index 2ed7e02748..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/bulbis_crafting_table_front", - "down": "byg:block/bulbis_planks", - "up": "byg:block/bulbis_crafting_table_top", - "north": "byg:block/bulbis_crafting_table_front", - "east": "byg:block/bulbis_crafting_table_side", - "south": "byg:block/bulbis_crafting_table_side", - "west": "byg:block/bulbis_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom.json deleted file mode 100644 index 83cf7f61ab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/bulbis_door_bottom", - "top": "byg:block/bulbis_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json deleted file mode 100644 index dd8e3c455e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/bulbis_door_bottom", - "top": "byg:block/bulbis_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_door_top.json b/Common/src/main/resources/assets/byg/models/block/bulbis_door_top.json deleted file mode 100644 index c7dfa0cfa2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/bulbis_door_bottom", - "top": "byg:block/bulbis_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/bulbis_door_top_hinge.json deleted file mode 100644 index 744dc1faf8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/bulbis_door_bottom", - "top": "byg:block/bulbis_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate.json deleted file mode 100644 index 4741f202ac..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_open.json deleted file mode 100644 index 51f056d313..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall.json deleted file mode 100644 index 4a479244f6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json deleted file mode 100644 index b74386181c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_inventory.json deleted file mode 100644 index 1db49af7c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_post.json b/Common/src/main/resources/assets/byg/models/block/bulbis_fence_post.json deleted file mode 100644 index b4d72ac752..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_leaves.json b/Common/src/main/resources/assets/byg/models/block/bulbis_leaves.json deleted file mode 100644 index dd2174963c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/bulbis" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_oddity.json b/Common/src/main/resources/assets/byg/models/block/bulbis_oddity.json deleted file mode 100644 index 49539a4e0a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_oddity.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/bulbis_oddity", - "particle": "byg:block/bulbis_oddity" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_planks.json b/Common/src/main/resources/assets/byg/models/block/bulbis_planks.json deleted file mode 100644 index 00957c2f07..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate.json deleted file mode 100644 index a04d780711..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_slab.json b/Common/src/main/resources/assets/byg/models/block/bulbis_slab.json deleted file mode 100644 index 51456b42f7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/bulbis_planks", - "top": "byg:block/bulbis_planks", - "side": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_slab_top.json b/Common/src/main/resources/assets/byg/models/block/bulbis_slab_top.json deleted file mode 100644 index 3000c5e75c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/bulbis_planks", - "top": "byg:block/bulbis_planks", - "side": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs.json b/Common/src/main/resources/assets/byg/models/block/bulbis_stairs.json deleted file mode 100644 index 6c3cf45c46..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/bulbis_planks", - "top": "byg:block/bulbis_planks", - "side": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_inner.json deleted file mode 100644 index 1efe0f5cd6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/bulbis_planks", - "top": "byg:block/bulbis_planks", - "side": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_outer.json deleted file mode 100644 index c11c6149b6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/bulbis_planks", - "top": "byg:block/bulbis_planks", - "side": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json deleted file mode 100644 index b648a55c78..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/bulbis_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_open.json deleted file mode 100644 index eb6d34baac..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/bulbis_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_top.json deleted file mode 100644 index 85f3b05fff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/bulbis_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_wood.json b/Common/src/main/resources/assets/byg/models/block/bulbis_wood.json deleted file mode 100644 index 7f32300548..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/bulbis_stem", - "side": "byg:block/bulbis_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/bulbis_bookshelf.json deleted file mode 100644 index cb4c5acb80..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_bookshelf.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_bookshelf" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_button.json b/Common/src/main/resources/assets/byg/models/item/bulbis_button.json deleted file mode 100644 index 5ff960fc2c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/bulbis_crafting_table.json deleted file mode 100644 index 6aa81f883a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_crafting_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_crafting_table" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_door.json b/Common/src/main/resources/assets/byg/models/item/bulbis_door.json deleted file mode 100644 index bf9b9b96a7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/bulbis_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_fence.json b/Common/src/main/resources/assets/byg/models/item/bulbis_fence.json deleted file mode 100644 index 91d962df2b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/bulbis_fence_gate.json deleted file mode 100644 index 5c42e40a0d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_leaves.json b/Common/src/main/resources/assets/byg/models/item/bulbis_leaves.json deleted file mode 100644 index cf9b267796..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_leaves" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_oddity.json b/Common/src/main/resources/assets/byg/models/item/bulbis_oddity.json deleted file mode 100644 index 48ed0d7afb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_oddity.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/bulbis_oddity" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_planks.json b/Common/src/main/resources/assets/byg/models/item/bulbis_planks.json deleted file mode 100644 index 790c9c80a5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/bulbis_pressure_plate.json deleted file mode 100644 index 586575ece7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_slab.json b/Common/src/main/resources/assets/byg/models/item/bulbis_slab.json deleted file mode 100644 index f6cef826e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_stairs.json b/Common/src/main/resources/assets/byg/models/item/bulbis_stairs.json deleted file mode 100644 index 41a6b44a62..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/bulbis_trapdoor.json deleted file mode 100644 index 883d59846c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_wood.json b/Common/src/main/resources/assets/byg/models/item/bulbis_wood.json deleted file mode 100644 index 40d24ef0f6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/bulbis_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_bottom.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_bottom.png.mcmeta b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png.mcmeta similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_bottom.png.mcmeta rename to Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png.mcmeta diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_top.png.mcmeta b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png.mcmeta similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_anomaly_top.png.mcmeta rename to Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png.mcmeta diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_top .png b/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_top .png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_top .png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_top .png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_door_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_oddity.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/oddity.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_oddity.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/oddity.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_planks.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_planks.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_shell.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/shell.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_shell.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/shell.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_sprouts.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/sprouts.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_sprouts.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/sprouts.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/bulbis_anomaly.png b/Common/src/main/resources/assets/byg/textures/item/bulbis/anomaly.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/bulbis_anomaly.png rename to Common/src/main/resources/assets/byg/textures/item/bulbis/anomaly.png diff --git a/Common/src/main/resources/assets/byg/textures/item/bulbis_door.png b/Common/src/main/resources/assets/byg/textures/item/bulbis/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/bulbis_door.png rename to Common/src/main/resources/assets/byg/textures/item/bulbis/door.png From f344a996690613a8eea90dac145074d54eeae188 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 18:00:06 +0300 Subject: [PATCH 13/90] Cherry del --- .../byg/models/block/cherry_bookshelf.json | 12 ---------- .../byg/models/block/cherry_button.json | 6 ----- .../models/block/cherry_button_inventory.json | 6 ----- .../models/block/cherry_button_pressed.json | 6 ----- .../models/block/cherry_crafting_table.json | 12 ---------- .../byg/models/block/cherry_door_bottom.json | 7 ------ .../block/cherry_door_bottom_hinge.json | 7 ------ .../byg/models/block/cherry_door_top.json | 7 ------ .../models/block/cherry_door_top_hinge.json | 7 ------ .../assets/byg/models/block/cherry_fence.json | 7 ------ .../byg/models/block/cherry_fence_gate.json | 6 ----- .../models/block/cherry_fence_gate_open.json | 6 ----- .../models/block/cherry_fence_gate_wall.json | 6 ----- .../block/cherry_fence_gate_wall_open.json | 6 ----- .../models/block/cherry_fence_inventory.json | 7 ------ .../byg/models/block/cherry_fence_post.json | 7 ------ .../byg/models/block/cherry_planks.json | 7 ------ .../models/block/cherry_pressure_plate.json | 6 ----- .../assets/byg/models/block/cherry_slab.json | 8 ------- .../byg/models/block/cherry_slab_top.json | 8 ------- .../byg/models/block/cherry_stairs.json | 8 ------- .../byg/models/block/cherry_stairs_inner.json | 8 ------- .../byg/models/block/cherry_stairs_outer.json | 8 ------- .../models/block/cherry_trapdoor_bottom.json | 6 ----- .../models/block/cherry_trapdoor_open.json | 6 ----- .../byg/models/block/cherry_trapdoor_top.json | 6 ----- .../assets/byg/models/block/cherry_wall.json | 7 ------ .../models/block/cherry_wall_inventory.json | 7 ------ .../byg/models/block/cherry_wall_post.json | 7 ------ .../assets/byg/models/block/cherry_wood.json | 7 ------ .../assets/byg/models/item/cherry_boat.json | 6 ----- .../byg/models/item/cherry_bookshelf.json | 22 ------------------ .../assets/byg/models/item/cherry_button.json | 22 ------------------ .../models/item/cherry_crafting_table.json | 22 ------------------ .../assets/byg/models/item/cherry_door.json | 6 ----- .../assets/byg/models/item/cherry_fence.json | 3 --- .../byg/models/item/cherry_fence_gate.json | 22 ------------------ .../assets/byg/models/item/cherry_planks.json | 22 ------------------ .../models/item/cherry_pressure_plate.json | 22 ------------------ .../assets/byg/models/item/cherry_slab.json | 22 ------------------ .../assets/byg/models/item/cherry_stairs.json | 22 ------------------ .../byg/models/item/cherry_trapdoor.json | 22 ------------------ .../assets/byg/models/item/cherry_wall.json | 3 --- .../assets/byg/models/item/cherry_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_side.png} | Bin .../crafting_table.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{cherry_planks.png => cherry/planks.png} | Bin .../trapdoor.png} | Bin .../item/{cherry_boat.png => cherry/boat.png} | Bin .../item/{cherry_door.png => cherry/door.png} | Bin 56 files changed, 452 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_wood.json rename Common/src/main/resources/assets/byg/textures/block/{cherry_bookshelf.png => cherry/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_crafting_side.png => cherry/crafting_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_crafting_table.png => cherry/crafting_table.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_crafting_table_front.png => cherry/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_crafting_table_side.png => cherry/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_crafting_table_top.png => cherry/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_door_bottom.png => cherry/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_door_top.png => cherry/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_planks.png => cherry/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cherry_trapdoor.png => cherry/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cherry_boat.png => cherry/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cherry_door.png => cherry/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/cherry_bookshelf.json deleted file mode 100644 index d7d89faea4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/cherry_planks", - "up": "byg:block/cherry_planks", - "north": "byg:block/cherry_bookshelf", - "east": "byg:block/cherry_bookshelf", - "south": "byg:block/cherry_bookshelf", - "west": "byg:block/cherry_bookshelf", - "particle": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_button.json b/Common/src/main/resources/assets/byg/models/block/cherry_button.json deleted file mode 100644 index 3078f9c126..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/cherry_button_inventory.json deleted file mode 100644 index b1cf07af98..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/cherry_button_pressed.json deleted file mode 100644 index 6ae8e509c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/cherry_crafting_table.json deleted file mode 100644 index 320b2fc760..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/cherry_crafting_table_front", - "down": "byg:block/cherry_planks", - "up": "byg:block/cherry_crafting_table_top", - "north": "byg:block/cherry_crafting_table_front", - "east": "byg:block/cherry_crafting_table_side", - "south": "byg:block/cherry_crafting_table_side", - "west": "byg:block/cherry_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom.json deleted file mode 100644 index 49dbba54df..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/cherry_door_bottom", - "top": "byg:block/cherry_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom_hinge.json deleted file mode 100644 index a3a7225ce7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/cherry_door_bottom", - "top": "byg:block/cherry_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_door_top.json b/Common/src/main/resources/assets/byg/models/block/cherry_door_top.json deleted file mode 100644 index 7da6abbb7b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/cherry_door_bottom", - "top": "byg:block/cherry_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/cherry_door_top_hinge.json deleted file mode 100644 index acf4a4b59b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/cherry_door_bottom", - "top": "byg:block/cherry_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence.json deleted file mode 100644 index df14aa54ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/cherry_planks", - "particle": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate.json deleted file mode 100644 index 0340054409..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_open.json deleted file mode 100644 index cf5dad0e75..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall.json deleted file mode 100644 index 6f95fabaef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json deleted file mode 100644 index 9e9d1338e9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_inventory.json deleted file mode 100644 index d40b2604cc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/cherry_planks", - "particle": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_fence_post.json b/Common/src/main/resources/assets/byg/models/block/cherry_fence_post.json deleted file mode 100644 index a4a08a2053..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/cherry_planks", - "particle": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_planks.json b/Common/src/main/resources/assets/byg/models/block/cherry_planks.json deleted file mode 100644 index 40df383179..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cherry_planks", - "particle": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate.json deleted file mode 100644 index dd6f2d8b1d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_slab.json b/Common/src/main/resources/assets/byg/models/block/cherry_slab.json deleted file mode 100644 index c9941639c6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/cherry_planks", - "top": "byg:block/cherry_planks", - "side": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_slab_top.json b/Common/src/main/resources/assets/byg/models/block/cherry_slab_top.json deleted file mode 100644 index dc088fa052..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/cherry_planks", - "top": "byg:block/cherry_planks", - "side": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_stairs.json b/Common/src/main/resources/assets/byg/models/block/cherry_stairs.json deleted file mode 100644 index a42961b7ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/cherry_planks", - "top": "byg:block/cherry_planks", - "side": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/cherry_stairs_inner.json deleted file mode 100644 index b2dfd2b8f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/cherry_planks", - "top": "byg:block/cherry_planks", - "side": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/cherry_stairs_outer.json deleted file mode 100644 index 60f17121b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/cherry_planks", - "top": "byg:block/cherry_planks", - "side": "byg:block/cherry_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_bottom.json deleted file mode 100644 index 5a27be4fe0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/cherry_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_open.json deleted file mode 100644 index 30530b13d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/cherry_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_top.json deleted file mode 100644 index 254742ffb7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/cherry_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_wall.json b/Common/src/main/resources/assets/byg/models/block/cherry_wall.json deleted file mode 100644 index 3b78b9e4df..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/cherry_log_side", - "particle": "byg:block/cherry_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/cherry_wall_inventory.json deleted file mode 100644 index 2ad8d4142a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/cherry_log_side", - "particle": "byg:block/cherry_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_wall_post.json b/Common/src/main/resources/assets/byg/models/block/cherry_wall_post.json deleted file mode 100644 index 2ba082ad9d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/cherry_log_side", - "particle": "byg:block/cherry_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_wood.json b/Common/src/main/resources/assets/byg/models/block/cherry_wood.json deleted file mode 100644 index f004c71158..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cherry_log", - "particle": "byg:block/cherry_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_boat.json b/Common/src/main/resources/assets/byg/models/item/cherry_boat.json deleted file mode 100644 index 23a0eac703..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cherry_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/cherry_bookshelf.json deleted file mode 100644 index 512e9b4d41..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_button.json b/Common/src/main/resources/assets/byg/models/item/cherry_button.json deleted file mode 100644 index 3dc234c849..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/cherry_crafting_table.json deleted file mode 100644 index aba0e92a0e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_door.json b/Common/src/main/resources/assets/byg/models/item/cherry_door.json deleted file mode 100644 index 1b95ef44f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cherry_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_fence.json b/Common/src/main/resources/assets/byg/models/item/cherry_fence.json deleted file mode 100644 index c3c5f48683..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cherry_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/cherry_fence_gate.json deleted file mode 100644 index 45f4f365ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_planks.json b/Common/src/main/resources/assets/byg/models/item/cherry_planks.json deleted file mode 100644 index 70242d7718..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/cherry_pressure_plate.json deleted file mode 100644 index 75457bbf2d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_slab.json b/Common/src/main/resources/assets/byg/models/item/cherry_slab.json deleted file mode 100644 index 269d48d8d7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_stairs.json b/Common/src/main/resources/assets/byg/models/item/cherry_stairs.json deleted file mode 100644 index 5fb36fc1e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/cherry_trapdoor.json deleted file mode 100644 index e4a5521a92..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_wall.json b/Common/src/main/resources/assets/byg/models/item/cherry_wall.json deleted file mode 100644 index a0352fb61a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cherry_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_wood.json b/Common/src/main/resources/assets/byg/models/item/cherry_wood.json deleted file mode 100644 index b444d9029e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cherry_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/cherry/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_crafting_side.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_crafting_side.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/crafting_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/cherry/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_door_top.png b/Common/src/main/resources/assets/byg/textures/block/cherry/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_planks.png b/Common/src/main/resources/assets/byg/textures/block/cherry/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_planks.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/cherry/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cherry_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cherry_boat.png b/Common/src/main/resources/assets/byg/textures/item/cherry/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cherry_boat.png rename to Common/src/main/resources/assets/byg/textures/item/cherry/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cherry_door.png b/Common/src/main/resources/assets/byg/textures/item/cherry/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cherry_door.png rename to Common/src/main/resources/assets/byg/textures/item/cherry/door.png From 371b36c8a80d2ae6c8ff48a177289d26732940fb Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 18:00:17 +0300 Subject: [PATCH 14/90] Cika del --- .../byg/models/block/cika_bookshelf.json | 12 ---------- .../assets/byg/models/block/cika_button.json | 6 ----- .../models/block/cika_button_inventory.json | 6 ----- .../byg/models/block/cika_button_pressed.json | 6 ----- .../byg/models/block/cika_crafting_table.json | 12 ---------- .../byg/models/block/cika_door_bottom.json | 7 ------ .../models/block/cika_door_bottom_hinge.json | 7 ------ .../byg/models/block/cika_door_top.json | 7 ------ .../byg/models/block/cika_door_top_hinge.json | 7 ------ .../assets/byg/models/block/cika_fence.json | 7 ------ .../byg/models/block/cika_fence_gate.json | 6 ----- .../models/block/cika_fence_gate_open.json | 6 ----- .../models/block/cika_fence_gate_wall.json | 6 ----- .../block/cika_fence_gate_wall_open.json | 6 ----- .../models/block/cika_fence_inventory.json | 7 ------ .../byg/models/block/cika_fence_post.json | 7 ------ .../assets/byg/models/block/cika_leaves.json | 7 ------ .../byg/models/block/cika_leaves_snowy.json | 12 ---------- .../assets/byg/models/block/cika_planks.json | 7 ------ .../byg/models/block/cika_pressure_plate.json | 6 ----- .../assets/byg/models/block/cika_sapling.json | 7 ------ .../assets/byg/models/block/cika_slab.json | 8 ------- .../byg/models/block/cika_slab_top.json | 8 ------- .../assets/byg/models/block/cika_stairs.json | 8 ------- .../byg/models/block/cika_stairs_inner.json | 8 ------- .../byg/models/block/cika_stairs_outer.json | 8 ------- .../models/block/cika_trapdoor_bottom.json | 6 ----- .../byg/models/block/cika_trapdoor_open.json | 6 ----- .../byg/models/block/cika_trapdoor_top.json | 6 ----- .../assets/byg/models/block/cika_wall.json | 7 ------ .../byg/models/block/cika_wall_inventory.json | 7 ------ .../byg/models/block/cika_wall_post.json | 7 ------ .../assets/byg/models/block/cika_wood.json | 7 ------ .../assets/byg/models/item/cika_boat.json | 6 ----- .../byg/models/item/cika_bookshelf.json | 22 ------------------ .../assets/byg/models/item/cika_button.json | 22 ------------------ .../byg/models/item/cika_crafting_table.json | 22 ------------------ .../assets/byg/models/item/cika_door.json | 6 ----- .../assets/byg/models/item/cika_fence.json | 3 --- .../byg/models/item/cika_fence_gate.json | 22 ------------------ .../assets/byg/models/item/cika_leaves.json | 22 ------------------ .../assets/byg/models/item/cika_planks.json | 22 ------------------ .../byg/models/item/cika_pressure_plate.json | 22 ------------------ .../assets/byg/models/item/cika_sapling.json | 6 ----- .../assets/byg/models/item/cika_slab.json | 22 ------------------ .../assets/byg/models/item/cika_stairs.json | 22 ------------------ .../assets/byg/models/item/cika_trapdoor.json | 22 ------------------ .../assets/byg/models/item/cika_wall.json | 3 --- .../assets/byg/models/item/cika_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../{cika_door_top.png => cika/door_top.png} | Bin .../{cika_leaves.png => cika/leaves.png} | Bin .../{cika_planks.png => cika/planks.png} | Bin .../{cika_sapling.png => cika/sapling.png} | Bin .../{cika_trapdoor.png => cika/trapdoor.png} | Bin .../item/{cika_boat.png => cika/boat.png} | Bin .../item/{cika_door.png => cika/door.png} | Bin 61 files changed, 506 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_wood.json rename Common/src/main/resources/assets/byg/textures/block/{cika_bookshelf.png => cika/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_crafting_table_front.png => cika/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_crafting_table_side.png => cika/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_crafting_table_top.png => cika/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_door_bottom.png => cika/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_door_top.png => cika/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_leaves.png => cika/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_planks.png => cika/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_sapling.png => cika/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cika_trapdoor.png => cika/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cika_boat.png => cika/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cika_door.png => cika/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/cika_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/cika_bookshelf.json deleted file mode 100644 index f29512f706..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/cika_planks", - "up": "byg:block/cika_planks", - "north": "byg:block/cika_bookshelf", - "east": "byg:block/cika_bookshelf", - "south": "byg:block/cika_bookshelf", - "west": "byg:block/cika_bookshelf", - "particle": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_button.json b/Common/src/main/resources/assets/byg/models/block/cika_button.json deleted file mode 100644 index 0c819a235e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/cika_button_inventory.json deleted file mode 100644 index 3ae7469365..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/cika_button_pressed.json deleted file mode 100644 index 9f28d2b622..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/cika_crafting_table.json deleted file mode 100644 index 92bfa9f211..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/cika_crafting_table_front", - "down": "byg:block/cika_planks", - "up": "byg:block/cika_crafting_table_top", - "north": "byg:block/cika_crafting_table_front", - "east": "byg:block/cika_crafting_table_side", - "south": "byg:block/cika_crafting_table_side", - "west": "byg:block/cika_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/cika_door_bottom.json deleted file mode 100644 index a7d5df4dd3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/cika_door_bottom", - "top": "byg:block/cika_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/cika_door_bottom_hinge.json deleted file mode 100644 index 5b1a5a43e6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/cika_door_bottom", - "top": "byg:block/cika_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_door_top.json b/Common/src/main/resources/assets/byg/models/block/cika_door_top.json deleted file mode 100644 index ba65aa4876..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/cika_door_bottom", - "top": "byg:block/cika_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/cika_door_top_hinge.json deleted file mode 100644 index 1d3f631c1d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/cika_door_bottom", - "top": "byg:block/cika_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence.json b/Common/src/main/resources/assets/byg/models/block/cika_fence.json deleted file mode 100644 index 265522b74a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/cika_planks", - "particle": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_gate.json deleted file mode 100644 index 456bf73a2c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_open.json deleted file mode 100644 index 0d62f216c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall.json deleted file mode 100644 index ab2e511cee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall_open.json deleted file mode 100644 index 2fff2a19fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_inventory.json deleted file mode 100644 index 3ec9603a9e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/cika_planks", - "particle": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_fence_post.json b/Common/src/main/resources/assets/byg/models/block/cika_fence_post.json deleted file mode 100644 index 7d1f06f0eb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/cika_planks", - "particle": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_leaves.json b/Common/src/main/resources/assets/byg/models/block/cika_leaves.json deleted file mode 100644 index 7387d26e1e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cika_leaves", - "particle": "byg:block/cika_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/cika_leaves_snowy.json deleted file mode 100644 index a1f6706456..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/cika_leaves_snowy", - "up": "byg:block/cika_leaves_snowy", - "north": "byg:block/cika_leaves_snowy_side", - "east": "byg:block/cika_leaves_snowy_side", - "south": "byg:block/cika_leaves_snowy_side", - "west": "byg:block/cika_leaves_snowy_side", - "particle": "byg:block/cika_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_planks.json b/Common/src/main/resources/assets/byg/models/block/cika_planks.json deleted file mode 100644 index 96d565c0b2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cika_planks", - "particle": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate.json deleted file mode 100644 index 28e962652d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_sapling.json b/Common/src/main/resources/assets/byg/models/block/cika_sapling.json deleted file mode 100644 index 5160925740..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/cika_sapling", - "particle": "byg:block/cika_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_slab.json b/Common/src/main/resources/assets/byg/models/block/cika_slab.json deleted file mode 100644 index 22defa5a29..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/cika_planks", - "top": "byg:block/cika_planks", - "side": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_slab_top.json b/Common/src/main/resources/assets/byg/models/block/cika_slab_top.json deleted file mode 100644 index bb368bd190..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/cika_planks", - "top": "byg:block/cika_planks", - "side": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_stairs.json b/Common/src/main/resources/assets/byg/models/block/cika_stairs.json deleted file mode 100644 index 02a2236b2d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/cika_planks", - "top": "byg:block/cika_planks", - "side": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/cika_stairs_inner.json deleted file mode 100644 index 23ad09f148..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/cika_planks", - "top": "byg:block/cika_planks", - "side": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/cika_stairs_outer.json deleted file mode 100644 index 6d19ce35da..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/cika_planks", - "top": "byg:block/cika_planks", - "side": "byg:block/cika_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_bottom.json deleted file mode 100644 index ade39cbd15..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/cika_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_open.json deleted file mode 100644 index b0294bbd3f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/cika_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_top.json deleted file mode 100644 index cad294f404..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/cika_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_wall.json b/Common/src/main/resources/assets/byg/models/block/cika_wall.json deleted file mode 100644 index 58363173cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/cika_log_side", - "particle": "byg:block/cika_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/cika_wall_inventory.json deleted file mode 100644 index 14055b0bf5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/cika_log_side", - "particle": "byg:block/cika_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_wall_post.json b/Common/src/main/resources/assets/byg/models/block/cika_wall_post.json deleted file mode 100644 index e09609ad64..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/cika_log_side", - "particle": "byg:block/cika_log_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cika_wood.json b/Common/src/main/resources/assets/byg/models/block/cika_wood.json deleted file mode 100644 index 422b8babee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cika_log", - "particle": "byg:block/cika_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_boat.json b/Common/src/main/resources/assets/byg/models/item/cika_boat.json deleted file mode 100644 index 015717779b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cika_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/cika_bookshelf.json deleted file mode 100644 index f571dd9214..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_button.json b/Common/src/main/resources/assets/byg/models/item/cika_button.json deleted file mode 100644 index 3892ba7b6a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/cika_crafting_table.json deleted file mode 100644 index 867f69bc80..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_door.json b/Common/src/main/resources/assets/byg/models/item/cika_door.json deleted file mode 100644 index 38e36d3fd7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cika_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_fence.json b/Common/src/main/resources/assets/byg/models/item/cika_fence.json deleted file mode 100644 index 110fb2842a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cika_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/cika_fence_gate.json deleted file mode 100644 index a4f25dbb47..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_leaves.json b/Common/src/main/resources/assets/byg/models/item/cika_leaves.json deleted file mode 100644 index fce0794422..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_planks.json b/Common/src/main/resources/assets/byg/models/item/cika_planks.json deleted file mode 100644 index c0f8a5cb59..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/cika_pressure_plate.json deleted file mode 100644 index 39ff6bed6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_sapling.json b/Common/src/main/resources/assets/byg/models/item/cika_sapling.json deleted file mode 100644 index b3a0ec2e13..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/cika_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_slab.json b/Common/src/main/resources/assets/byg/models/item/cika_slab.json deleted file mode 100644 index 9dacacc9ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_stairs.json b/Common/src/main/resources/assets/byg/models/item/cika_stairs.json deleted file mode 100644 index 1097f9d02d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/cika_trapdoor.json deleted file mode 100644 index 0b20b815d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_wall.json b/Common/src/main/resources/assets/byg/models/item/cika_wall.json deleted file mode 100644 index d2e2a5705b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cika_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_wood.json b/Common/src/main/resources/assets/byg/models/item/cika_wood.json deleted file mode 100644 index f7fb49474f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cika_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/cika/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/cika/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/cika/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/cika/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_door_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/cika/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_leaves.png b/Common/src/main/resources/assets/byg/textures/block/cika/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/cika/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_planks.png b/Common/src/main/resources/assets/byg/textures/block/cika/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_planks.png rename to Common/src/main/resources/assets/byg/textures/block/cika/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_sapling.png b/Common/src/main/resources/assets/byg/textures/block/cika/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/cika/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/cika/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/cika/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cika_boat.png b/Common/src/main/resources/assets/byg/textures/item/cika/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cika_boat.png rename to Common/src/main/resources/assets/byg/textures/item/cika/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cika_door.png b/Common/src/main/resources/assets/byg/textures/item/cika/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cika_door.png rename to Common/src/main/resources/assets/byg/textures/item/cika/door.png From af1341663e49ef8db3a13afdd9db77a3c7ec4e9d Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 18:00:34 +0300 Subject: [PATCH 15/90] Cypress del --- .../byg/models/block/cypress_bookshelf.json | 12 ---------- .../byg/models/block/cypress_button.json | 6 ----- .../block/cypress_button_inventory.json | 6 ----- .../models/block/cypress_button_pressed.json | 6 ----- .../models/block/cypress_crafting_table.json | 12 ---------- .../byg/models/block/cypress_door_bottom.json | 7 ------ .../block/cypress_door_bottom_hinge.json | 7 ------ .../byg/models/block/cypress_door_top.json | 7 ------ .../models/block/cypress_door_top_hinge.json | 7 ------ .../byg/models/block/cypress_fence.json | 7 ------ .../byg/models/block/cypress_fence_gate.json | 6 ----- .../models/block/cypress_fence_gate_open.json | 6 ----- .../models/block/cypress_fence_gate_wall.json | 6 ----- .../block/cypress_fence_gate_wall_open.json | 6 ----- .../models/block/cypress_fence_inventory.json | 7 ------ .../byg/models/block/cypress_fence_post.json | 7 ------ .../byg/models/block/cypress_leaves.json | 7 ------ .../models/block/cypress_leaves_snowy.json | 12 ---------- .../byg/models/block/cypress_planks.json | 7 ------ .../models/block/cypress_pressure_plate.json | 6 ----- .../byg/models/block/cypress_sapling.json | 7 ------ .../assets/byg/models/block/cypress_slab.json | 8 ------- .../byg/models/block/cypress_slab_top.json | 8 ------- .../byg/models/block/cypress_stairs.json | 8 ------- .../models/block/cypress_stairs_inner.json | 8 ------- .../models/block/cypress_stairs_outer.json | 8 ------- .../models/block/cypress_trapdoor_bottom.json | 6 ----- .../models/block/cypress_trapdoor_open.json | 6 ----- .../models/block/cypress_trapdoor_top.json | 6 ----- .../assets/byg/models/block/cypress_wall.json | 7 ------ .../models/block/cypress_wall_inventory.json | 7 ------ .../byg/models/block/cypress_wall_post.json | 7 ------ .../assets/byg/models/block/cypress_wood.json | 7 ------ .../assets/byg/models/item/cypress_boat.json | 6 ----- .../byg/models/item/cypress_bookshelf.json | 22 ------------------ .../byg/models/item/cypress_button.json | 22 ------------------ .../models/item/cypress_crafting_table.json | 22 ------------------ .../assets/byg/models/item/cypress_door.json | 6 ----- .../assets/byg/models/item/cypress_fence.json | 3 --- .../byg/models/item/cypress_fence_gate.json | 22 ------------------ .../byg/models/item/cypress_leaves.json | 22 ------------------ .../byg/models/item/cypress_planks.json | 22 ------------------ .../models/item/cypress_pressure_plate.json | 22 ------------------ .../byg/models/item/cypress_sapling.json | 6 ----- .../assets/byg/models/item/cypress_slab.json | 22 ------------------ .../byg/models/item/cypress_stairs.json | 22 ------------------ .../byg/models/item/cypress_trapdoor.json | 22 ------------------ .../assets/byg/models/item/cypress_wall.json | 3 --- .../assets/byg/models/item/cypress_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../leaves.png} | Bin .../planks.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../{cypress_boat.png => cypress/boat.png} | Bin .../{cypress_door.png => cypress/door.png} | Bin 61 files changed, 506 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_wood.json rename Common/src/main/resources/assets/byg/textures/block/{cypress_bookshelf.png => cypress/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_crafting_table_front.png => cypress/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_crafting_table_side.png => cypress/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_crafting_table_top.png => cypress/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_door_bottom.png => cypress/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_door_top.png => cypress/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_leaves.png => cypress/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_planks.png => cypress/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_sapling.png => cypress/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{cypress_trapdoor.png => cypress/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cypress_boat.png => cypress/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cypress_door.png => cypress/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/cypress_bookshelf.json deleted file mode 100644 index 0e6ffc1071..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/cypress_planks", - "up": "byg:block/cypress_planks", - "north": "byg:block/cypress_bookshelf", - "east": "byg:block/cypress_bookshelf", - "south": "byg:block/cypress_bookshelf", - "west": "byg:block/cypress_bookshelf", - "particle": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_button.json b/Common/src/main/resources/assets/byg/models/block/cypress_button.json deleted file mode 100644 index 84cc547b4c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/cypress_button_inventory.json deleted file mode 100644 index 98e0bda6f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/cypress_button_pressed.json deleted file mode 100644 index afaaad35ee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/cypress_crafting_table.json deleted file mode 100644 index e72b233429..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/cypress_crafting_table_front", - "down": "byg:block/cypress_planks", - "up": "byg:block/cypress_crafting_table_top", - "north": "byg:block/cypress_crafting_table_front", - "east": "byg:block/cypress_crafting_table_side", - "south": "byg:block/cypress_crafting_table_side", - "west": "byg:block/cypress_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom.json deleted file mode 100644 index 772f8b1394..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/cypress_door_bottom", - "top": "byg:block/cypress_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom_hinge.json deleted file mode 100644 index e6064ad56f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/cypress_door_bottom", - "top": "byg:block/cypress_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_door_top.json b/Common/src/main/resources/assets/byg/models/block/cypress_door_top.json deleted file mode 100644 index 6bb42b4c79..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/cypress_door_bottom", - "top": "byg:block/cypress_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/cypress_door_top_hinge.json deleted file mode 100644 index 62293c543f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/cypress_door_bottom", - "top": "byg:block/cypress_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence.json deleted file mode 100644 index ca8bb72f70..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/cypress_planks", - "particle": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate.json deleted file mode 100644 index a1d0cc13c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_open.json deleted file mode 100644 index 8474a60caf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall.json deleted file mode 100644 index 8aeafdd11b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json deleted file mode 100644 index 43746cfeec..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_inventory.json deleted file mode 100644 index 7f76627221..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/cypress_planks", - "particle": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_fence_post.json b/Common/src/main/resources/assets/byg/models/block/cypress_fence_post.json deleted file mode 100644 index 2822742535..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/cypress_planks", - "particle": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_leaves.json b/Common/src/main/resources/assets/byg/models/block/cypress_leaves.json deleted file mode 100644 index b1ee337cf6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/cypress_leaves", - "particle": "byg:block/cypress_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/cypress_leaves_snowy.json deleted file mode 100644 index 5617c66c39..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/cypress_leaves_snowy", - "up": "byg:block/cypress_leaves_snowy", - "north": "byg:block/cypress_leaves_snowy_side", - "east": "byg:block/cypress_leaves_snowy_side", - "south": "byg:block/cypress_leaves_snowy_side", - "west": "byg:block/cypress_leaves_snowy_side", - "particle": "byg:block/cypress_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_planks.json b/Common/src/main/resources/assets/byg/models/block/cypress_planks.json deleted file mode 100644 index bbf5b8de38..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cypress_planks", - "particle": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate.json deleted file mode 100644 index a2be1e89d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_sapling.json b/Common/src/main/resources/assets/byg/models/block/cypress_sapling.json deleted file mode 100644 index 4ca2255b0e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/cypress_sapling", - "particle": "byg:block/cypress_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_slab.json b/Common/src/main/resources/assets/byg/models/block/cypress_slab.json deleted file mode 100644 index c10d9b14f0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/cypress_planks", - "top": "byg:block/cypress_planks", - "side": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_slab_top.json b/Common/src/main/resources/assets/byg/models/block/cypress_slab_top.json deleted file mode 100644 index 8527bccb1b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/cypress_planks", - "top": "byg:block/cypress_planks", - "side": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_stairs.json b/Common/src/main/resources/assets/byg/models/block/cypress_stairs.json deleted file mode 100644 index 79be57846c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/cypress_planks", - "top": "byg:block/cypress_planks", - "side": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/cypress_stairs_inner.json deleted file mode 100644 index 0b3f48c661..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/cypress_planks", - "top": "byg:block/cypress_planks", - "side": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/cypress_stairs_outer.json deleted file mode 100644 index f09eff84fd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/cypress_planks", - "top": "byg:block/cypress_planks", - "side": "byg:block/cypress_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_bottom.json deleted file mode 100644 index aeb19d1aa7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/cypress_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_open.json deleted file mode 100644 index 1e5cbf28a4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/cypress_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_top.json deleted file mode 100644 index 5656d2e440..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/cypress_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_wall.json b/Common/src/main/resources/assets/byg/models/block/cypress_wall.json deleted file mode 100644 index e6c97369e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/cypress_log", - "particle": "byg:block/cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/cypress_wall_inventory.json deleted file mode 100644 index b691755a06..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/cypress_log", - "particle": "byg:block/cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_wall_post.json b/Common/src/main/resources/assets/byg/models/block/cypress_wall_post.json deleted file mode 100644 index dd2b9677fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/cypress_log", - "particle": "byg:block/cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_wood.json b/Common/src/main/resources/assets/byg/models/block/cypress_wood.json deleted file mode 100644 index e3591cf0db..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/cypress_log", - "particle": "byg:block/cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_boat.json b/Common/src/main/resources/assets/byg/models/item/cypress_boat.json deleted file mode 100644 index 3e63503aee..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cypress_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/cypress_bookshelf.json deleted file mode 100644 index 79636db06a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_button.json b/Common/src/main/resources/assets/byg/models/item/cypress_button.json deleted file mode 100644 index 313be8446d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/cypress_crafting_table.json deleted file mode 100644 index 5c046d432a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_door.json b/Common/src/main/resources/assets/byg/models/item/cypress_door.json deleted file mode 100644 index 2488535050..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/cypress_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_fence.json b/Common/src/main/resources/assets/byg/models/item/cypress_fence.json deleted file mode 100644 index f3a975e800..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cypress_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/cypress_fence_gate.json deleted file mode 100644 index 6aadebdb8b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_leaves.json b/Common/src/main/resources/assets/byg/models/item/cypress_leaves.json deleted file mode 100644 index 7923b0dfd7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_planks.json b/Common/src/main/resources/assets/byg/models/item/cypress_planks.json deleted file mode 100644 index 0603f75ff7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/cypress_pressure_plate.json deleted file mode 100644 index eb37bb90e2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_sapling.json b/Common/src/main/resources/assets/byg/models/item/cypress_sapling.json deleted file mode 100644 index 2c3a697bf1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/cypress_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_slab.json b/Common/src/main/resources/assets/byg/models/item/cypress_slab.json deleted file mode 100644 index 1ebc83cc2c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_stairs.json b/Common/src/main/resources/assets/byg/models/item/cypress_stairs.json deleted file mode 100644 index 4cc22a7b4a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/cypress_trapdoor.json deleted file mode 100644 index 8cf6fa6afb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_wall.json b/Common/src/main/resources/assets/byg/models/item/cypress_wall.json deleted file mode 100644 index 87f0056ff7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/cypress_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_wood.json b/Common/src/main/resources/assets/byg/models/item/cypress_wood.json deleted file mode 100644 index ec910ae93b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/cypress_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/cypress/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/cypress/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_door_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_leaves.png b/Common/src/main/resources/assets/byg/textures/block/cypress/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_planks.png b/Common/src/main/resources/assets/byg/textures/block/cypress/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_planks.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_sapling.png b/Common/src/main/resources/assets/byg/textures/block/cypress/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/cypress/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cypress_boat.png b/Common/src/main/resources/assets/byg/textures/item/cypress/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cypress_boat.png rename to Common/src/main/resources/assets/byg/textures/item/cypress/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cypress_door.png b/Common/src/main/resources/assets/byg/textures/item/cypress/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cypress_door.png rename to Common/src/main/resources/assets/byg/textures/item/cypress/door.png From fdacd1e71666d9c10a5a58d8204df925490ed131 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 18:00:47 +0300 Subject: [PATCH 16/90] Ebony del --- .../byg/models/block/ebony_bookshelf.json | 12 ---------- .../assets/byg/models/block/ebony_button.json | 6 ----- .../models/block/ebony_button_inventory.json | 6 ----- .../models/block/ebony_button_pressed.json | 6 ----- .../models/block/ebony_crafting_table.json | 12 ---------- .../byg/models/block/ebony_door_bottom.json | 7 ------ .../models/block/ebony_door_bottom_hinge.json | 7 ------ .../byg/models/block/ebony_door_top.json | 7 ------ .../models/block/ebony_door_top_hinge.json | 7 ------ .../assets/byg/models/block/ebony_fence.json | 7 ------ .../byg/models/block/ebony_fence_gate.json | 6 ----- .../models/block/ebony_fence_gate_open.json | 6 ----- .../models/block/ebony_fence_gate_wall.json | 6 ----- .../block/ebony_fence_gate_wall_open.json | 6 ----- .../models/block/ebony_fence_inventory.json | 7 ------ .../byg/models/block/ebony_fence_post.json | 7 ------ .../assets/byg/models/block/ebony_leaves.json | 7 ------ .../byg/models/block/ebony_leaves_snowy.json | 12 ---------- .../assets/byg/models/block/ebony_planks.json | 7 ------ .../models/block/ebony_pressure_plate.json | 6 ----- .../byg/models/block/ebony_sapling.json | 7 ------ .../assets/byg/models/block/ebony_slab.json | 8 ------- .../byg/models/block/ebony_slab_top.json | 8 ------- .../assets/byg/models/block/ebony_stairs.json | 8 ------- .../byg/models/block/ebony_stairs_inner.json | 8 ------- .../byg/models/block/ebony_stairs_outer.json | 8 ------- .../models/block/ebony_trapdoor_bottom.json | 6 ----- .../byg/models/block/ebony_trapdoor_open.json | 6 ----- .../byg/models/block/ebony_trapdoor_top.json | 6 ----- .../assets/byg/models/block/ebony_wall.json | 7 ------ .../models/block/ebony_wall_inventory.json | 7 ------ .../byg/models/block/ebony_wall_post.json | 7 ------ .../assets/byg/models/block/ebony_wood.json | 7 ------ .../assets/byg/models/item/ebony_boat.json | 6 ----- .../byg/models/item/ebony_bookshelf.json | 22 ------------------ .../assets/byg/models/item/ebony_button.json | 22 ------------------ .../byg/models/item/ebony_crafting_table.json | 22 ------------------ .../assets/byg/models/item/ebony_door.json | 6 ----- .../assets/byg/models/item/ebony_fence.json | 3 --- .../byg/models/item/ebony_fence_gate.json | 22 ------------------ .../assets/byg/models/item/ebony_leaves.json | 22 ------------------ .../assets/byg/models/item/ebony_planks.json | 22 ------------------ .../byg/models/item/ebony_pressure_plate.json | 22 ------------------ .../assets/byg/models/item/ebony_sapling.json | 6 ----- .../assets/byg/models/item/ebony_slab.json | 22 ------------------ .../assets/byg/models/item/ebony_stairs.json | 22 ------------------ .../byg/models/item/ebony_trapdoor.json | 22 ------------------ .../assets/byg/models/item/ebony_wall.json | 3 --- .../assets/byg/models/item/ebony_wood.json | 22 ------------------ .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{ebony_leaves.png => ebony/leaves.png} | Bin .../{ebony_planks.png => ebony/planks.png} | Bin .../{ebony_sapling.png => ebony/sapling.png} | Bin .../trapdoor.png} | Bin .../item/{ebony_boat.png => ebony/boat.png} | Bin .../item/{ebony_door.png => ebony/door.png} | Bin 61 files changed, 506 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_wood.json rename Common/src/main/resources/assets/byg/textures/block/{ebony_bookshelf.png => ebony/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_crafting_table_front.png => ebony/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_crafting_table_side.png => ebony/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_crafting_table_top.png => ebony/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_door_bottom.png => ebony/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_door_top.png => ebony/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_leaves.png => ebony/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_planks.png => ebony/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_sapling.png => ebony/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ebony_trapdoor.png => ebony/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ebony_boat.png => ebony/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ebony_door.png => ebony/door.png} (100%) diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/ebony_bookshelf.json deleted file mode 100644 index a2ebbf51f9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/ebony_planks", - "up": "byg:block/ebony_planks", - "north": "byg:block/ebony_bookshelf", - "east": "byg:block/ebony_bookshelf", - "south": "byg:block/ebony_bookshelf", - "west": "byg:block/ebony_bookshelf", - "particle": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_button.json b/Common/src/main/resources/assets/byg/models/block/ebony_button.json deleted file mode 100644 index d1dd31dd2f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/ebony_button_inventory.json deleted file mode 100644 index 841e970fcc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/ebony_button_pressed.json deleted file mode 100644 index 17f8363116..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/ebony_crafting_table.json deleted file mode 100644 index 7c9f538f1d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/ebony_crafting_table_front", - "down": "byg:block/ebony_planks", - "up": "byg:block/ebony_crafting_table_top", - "north": "byg:block/ebony_crafting_table_front", - "east": "byg:block/ebony_crafting_table_side", - "south": "byg:block/ebony_crafting_table_side", - "west": "byg:block/ebony_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom.json deleted file mode 100644 index a5903f3cbd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/ebony_door_bottom", - "top": "byg:block/ebony_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom_hinge.json deleted file mode 100644 index 95e236103e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/ebony_door_bottom", - "top": "byg:block/ebony_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_door_top.json b/Common/src/main/resources/assets/byg/models/block/ebony_door_top.json deleted file mode 100644 index 32d1f2e53d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/ebony_door_bottom", - "top": "byg:block/ebony_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/ebony_door_top_hinge.json deleted file mode 100644 index 51eb920263..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/ebony_door_bottom", - "top": "byg:block/ebony_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence.json deleted file mode 100644 index 903376c981..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/ebony_planks", - "particle": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate.json deleted file mode 100644 index 18f7ce9a6d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_open.json deleted file mode 100644 index 2df2e174b1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall.json deleted file mode 100644 index 349fd37f62..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json deleted file mode 100644 index 1afd8b43d2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_inventory.json deleted file mode 100644 index b709dc00cb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/ebony_planks", - "particle": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_fence_post.json b/Common/src/main/resources/assets/byg/models/block/ebony_fence_post.json deleted file mode 100644 index 9807d0aff2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/ebony_planks", - "particle": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_leaves.json b/Common/src/main/resources/assets/byg/models/block/ebony_leaves.json deleted file mode 100644 index 7a7d2effa7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/ebony_leaves", - "particle": "byg:block/ebony_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/ebony_leaves_snowy.json deleted file mode 100644 index 953c22ba0c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/ebony_leaves_snowy", - "up": "byg:block/ebony_leaves_snowy", - "north": "byg:block/ebony_leaves_snowy_side", - "east": "byg:block/ebony_leaves_snowy_side", - "south": "byg:block/ebony_leaves_snowy_side", - "west": "byg:block/ebony_leaves_snowy_side", - "particle": "byg:block/ebony_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_planks.json b/Common/src/main/resources/assets/byg/models/block/ebony_planks.json deleted file mode 100644 index 92e99ceafa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/ebony_planks", - "particle": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate.json deleted file mode 100644 index f331c29f67..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_sapling.json b/Common/src/main/resources/assets/byg/models/block/ebony_sapling.json deleted file mode 100644 index fa69226f66..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/ebony_sapling", - "particle": "byg:block/ebony_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_slab.json b/Common/src/main/resources/assets/byg/models/block/ebony_slab.json deleted file mode 100644 index 112eb92bca..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/ebony_planks", - "top": "byg:block/ebony_planks", - "side": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_slab_top.json b/Common/src/main/resources/assets/byg/models/block/ebony_slab_top.json deleted file mode 100644 index 1018f12970..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/ebony_planks", - "top": "byg:block/ebony_planks", - "side": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_stairs.json b/Common/src/main/resources/assets/byg/models/block/ebony_stairs.json deleted file mode 100644 index db3a2da825..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/ebony_planks", - "top": "byg:block/ebony_planks", - "side": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/ebony_stairs_inner.json deleted file mode 100644 index a00a11b7d6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/ebony_planks", - "top": "byg:block/ebony_planks", - "side": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/ebony_stairs_outer.json deleted file mode 100644 index 3fbaf123bf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/ebony_planks", - "top": "byg:block/ebony_planks", - "side": "byg:block/ebony_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_bottom.json deleted file mode 100644 index 9b85a85ad0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/ebony_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_open.json deleted file mode 100644 index 79a9d37821..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/ebony_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_top.json deleted file mode 100644 index 221f31b11c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/ebony_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_wall.json b/Common/src/main/resources/assets/byg/models/block/ebony_wall.json deleted file mode 100644 index c98414f77d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/ebony_log", - "particle": "byg:block/ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/ebony_wall_inventory.json deleted file mode 100644 index 41e3021931..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/ebony_log", - "particle": "byg:block/ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_wall_post.json b/Common/src/main/resources/assets/byg/models/block/ebony_wall_post.json deleted file mode 100644 index 5b68eabba6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/ebony_log", - "particle": "byg:block/ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_wood.json b/Common/src/main/resources/assets/byg/models/block/ebony_wood.json deleted file mode 100644 index 4ea9c359f8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/ebony_log", - "particle": "byg:block/ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_boat.json b/Common/src/main/resources/assets/byg/models/item/ebony_boat.json deleted file mode 100644 index c8a0873f01..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/ebony_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/ebony_bookshelf.json deleted file mode 100644 index 44916792d7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_button.json b/Common/src/main/resources/assets/byg/models/item/ebony_button.json deleted file mode 100644 index 61d6285e3a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/ebony_crafting_table.json deleted file mode 100644 index 606f124a8c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_door.json b/Common/src/main/resources/assets/byg/models/item/ebony_door.json deleted file mode 100644 index a21fc4ddbe..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/ebony_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_fence.json b/Common/src/main/resources/assets/byg/models/item/ebony_fence.json deleted file mode 100644 index f470996ba8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ebony_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/ebony_fence_gate.json deleted file mode 100644 index ac554342ec..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_leaves.json b/Common/src/main/resources/assets/byg/models/item/ebony_leaves.json deleted file mode 100644 index 2890065fdc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_planks.json b/Common/src/main/resources/assets/byg/models/item/ebony_planks.json deleted file mode 100644 index d7d8404abc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/ebony_pressure_plate.json deleted file mode 100644 index 1ad4e5beff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_sapling.json b/Common/src/main/resources/assets/byg/models/item/ebony_sapling.json deleted file mode 100644 index bf41e12828..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/ebony_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_slab.json b/Common/src/main/resources/assets/byg/models/item/ebony_slab.json deleted file mode 100644 index 3091082ed2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_stairs.json b/Common/src/main/resources/assets/byg/models/item/ebony_stairs.json deleted file mode 100644 index 8ade9d63cd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/ebony_trapdoor.json deleted file mode 100644 index 8e9aaa1824..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_wall.json b/Common/src/main/resources/assets/byg/models/item/ebony_wall.json deleted file mode 100644 index f73a16eb8e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ebony_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_wood.json b/Common/src/main/resources/assets/byg/models/item/ebony_wood.json deleted file mode 100644 index f683e6834f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/ebony_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/ebony/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/ebony/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_door_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_leaves.png b/Common/src/main/resources/assets/byg/textures/block/ebony/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_planks.png b/Common/src/main/resources/assets/byg/textures/block/ebony/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_planks.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_sapling.png b/Common/src/main/resources/assets/byg/textures/block/ebony/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/ebony/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ebony_boat.png b/Common/src/main/resources/assets/byg/textures/item/ebony/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ebony_boat.png rename to Common/src/main/resources/assets/byg/textures/item/ebony/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ebony_door.png b/Common/src/main/resources/assets/byg/textures/item/ebony/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ebony_door.png rename to Common/src/main/resources/assets/byg/textures/item/ebony/door.png From ddf074580aed589a470c19ab10b8faa68ffe0801 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 18:27:52 +0300 Subject: [PATCH 17/90] Hmm --- Common/src/generated/resources/.cache/cache | 345 ++++++++++++++++++ .../byg/models/block/aspen_bookshelf.json | 12 + .../assets/byg/models/block/aspen_button.json | 6 + .../models/block/aspen_button_inventory.json | 6 + .../models/block/aspen_button_pressed.json | 6 + .../models/block/aspen_crafting_table.json | 12 + .../byg/models/block/aspen_door_bottom.json | 7 + .../models/block/aspen_door_bottom_hinge.json | 7 + .../byg/models/block/aspen_door_top.json | 7 + .../models/block/aspen_door_top_hinge.json | 7 + .../assets/byg/models/block/aspen_fence.json | 7 + .../byg/models/block/aspen_fence_gate.json | 6 + .../models/block/aspen_fence_gate_open.json | 6 + .../models/block/aspen_fence_gate_wall.json | 6 + .../block/aspen_fence_gate_wall_open.json | 6 + .../byg/models/block/aspen_fence_post.json | 7 + .../assets/byg/models/block/aspen_leaves.json | 12 + .../byg/models/block/aspen_leaves_snowy.json | 12 + .../assets/byg/models/block/aspen_planks.json | 12 + .../models/block/aspen_pressure_plate.json | 6 + .../block/aspen_pressure_plate_down.json | 6 + .../byg/models/block/aspen_sapling.json | 6 + .../assets/byg/models/block/aspen_slab.json | 8 + .../byg/models/block/aspen_slab_top.json | 8 + .../assets/byg/models/block/aspen_stairs.json | 8 + .../byg/models/block/aspen_stairs_inner.json | 8 + .../byg/models/block/aspen_stairs_outer.json | 8 + .../models/block/aspen_trapdoor_bottom.json | 6 + .../byg/models/block/aspen_trapdoor_open.json | 6 + .../byg/models/block/aspen_trapdoor_top.json | 6 + .../assets/byg/models/block/aspen_wood.json | 7 + .../byg/models/block/baobab_bookshelf.json | 12 + .../byg/models/block/baobab_button.json | 6 + .../models/block/baobab_button_inventory.json | 6 + .../models/block/baobab_button_pressed.json | 6 + .../models/block/baobab_crafting_table.json | 12 + .../byg/models/block/baobab_door_bottom.json | 7 + .../block/baobab_door_bottom_hinge.json | 7 + .../byg/models/block/baobab_door_top.json | 7 + .../models/block/baobab_door_top_hinge.json | 7 + .../assets/byg/models/block/baobab_fence.json | 7 + .../byg/models/block/baobab_fence_gate.json | 6 + .../models/block/baobab_fence_gate_open.json | 6 + .../models/block/baobab_fence_gate_wall.json | 6 + .../block/baobab_fence_gate_wall_open.json | 6 + .../byg/models/block/baobab_fence_post.json | 7 + .../byg/models/block/baobab_leaves.json | 12 + .../byg/models/block/baobab_leaves_snowy.json | 12 + .../byg/models/block/baobab_planks.json | 12 + .../models/block/baobab_pressure_plate.json | 6 + .../block/baobab_pressure_plate_down.json | 6 + .../byg/models/block/baobab_sapling.json | 6 + .../assets/byg/models/block/baobab_slab.json | 8 + .../byg/models/block/baobab_slab_top.json | 8 + .../byg/models/block/baobab_stairs.json | 8 + .../byg/models/block/baobab_stairs_inner.json | 8 + .../byg/models/block/baobab_stairs_outer.json | 8 + .../models/block/baobab_trapdoor_bottom.json | 6 + .../models/block/baobab_trapdoor_open.json | 6 + .../byg/models/block/baobab_trapdoor_top.json | 6 + .../assets/byg/models/block/baobab_wood.json | 7 + .../block/blue_enchanted_bookshelf.json | 12 + .../models/block/blue_enchanted_button.json | 6 + .../blue_enchanted_button_inventory.json | 6 + .../block/blue_enchanted_button_pressed.json | 6 + .../block/blue_enchanted_crafting_table.json | 12 + .../block/blue_enchanted_door_bottom.json | 7 + .../blue_enchanted_door_bottom_hinge.json | 7 + .../models/block/blue_enchanted_door_top.json | 7 + .../block/blue_enchanted_door_top_hinge.json | 7 + .../models/block/blue_enchanted_fence.json | 7 + .../block/blue_enchanted_fence_gate.json | 6 + .../block/blue_enchanted_fence_gate_open.json | 6 + .../block/blue_enchanted_fence_gate_wall.json | 6 + .../blue_enchanted_fence_gate_wall_open.json | 6 + .../block/blue_enchanted_fence_post.json | 7 + .../models/block/blue_enchanted_leaves.json | 12 + .../block/blue_enchanted_leaves_snowy.json | 12 + .../models/block/blue_enchanted_planks.json | 12 + .../block/blue_enchanted_pressure_plate.json | 6 + .../blue_enchanted_pressure_plate_down.json | 6 + .../models/block/blue_enchanted_sapling.json | 6 + .../byg/models/block/blue_enchanted_slab.json | 8 + .../models/block/blue_enchanted_slab_top.json | 8 + .../models/block/blue_enchanted_stairs.json | 8 + .../block/blue_enchanted_stairs_inner.json | 8 + .../block/blue_enchanted_stairs_outer.json | 8 + .../block/blue_enchanted_trapdoor_bottom.json | 6 + .../block/blue_enchanted_trapdoor_open.json | 6 + .../block/blue_enchanted_trapdoor_top.json | 6 + .../byg/models/block/blue_enchanted_wood.json | 7 + .../byg/models/block/bulbis_bookshelf.json | 12 + .../byg/models/block/bulbis_button.json | 6 + .../models/block/bulbis_button_inventory.json | 6 + .../models/block/bulbis_button_pressed.json | 6 + .../models/block/bulbis_crafting_table.json | 12 + .../byg/models/block/bulbis_door_bottom.json | 7 + .../block/bulbis_door_bottom_hinge.json | 7 + .../byg/models/block/bulbis_door_top.json | 7 + .../models/block/bulbis_door_top_hinge.json | 7 + .../assets/byg/models/block/bulbis_fence.json | 7 + .../byg/models/block/bulbis_fence_gate.json | 6 + .../models/block/bulbis_fence_gate_open.json | 6 + .../models/block/bulbis_fence_gate_wall.json | 6 + .../block/bulbis_fence_gate_wall_open.json | 6 + .../byg/models/block/bulbis_fence_post.json | 7 + .../byg/models/block/bulbis_oddity.json | 6 + .../byg/models/block/bulbis_planks.json | 12 + .../models/block/bulbis_pressure_plate.json | 6 + .../block/bulbis_pressure_plate_down.json | 6 + .../assets/byg/models/block/bulbis_slab.json | 8 + .../byg/models/block/bulbis_slab_top.json | 8 + .../byg/models/block/bulbis_stairs.json | 8 + .../byg/models/block/bulbis_stairs_inner.json | 8 + .../byg/models/block/bulbis_stairs_outer.json | 8 + .../models/block/bulbis_trapdoor_bottom.json | 6 + .../models/block/bulbis_trapdoor_open.json | 6 + .../byg/models/block/bulbis_trapdoor_top.json | 6 + .../assets/byg/models/block/bulbis_wood.json | 7 + .../byg/models/block/cherry_bookshelf.json | 12 + .../byg/models/block/cherry_button.json | 6 + .../models/block/cherry_button_inventory.json | 6 + .../models/block/cherry_button_pressed.json | 6 + .../models/block/cherry_crafting_table.json | 12 + .../byg/models/block/cherry_door_bottom.json | 7 + .../block/cherry_door_bottom_hinge.json | 7 + .../byg/models/block/cherry_door_top.json | 7 + .../models/block/cherry_door_top_hinge.json | 7 + .../assets/byg/models/block/cherry_fence.json | 7 + .../byg/models/block/cherry_fence_gate.json | 6 + .../models/block/cherry_fence_gate_open.json | 6 + .../models/block/cherry_fence_gate_wall.json | 6 + .../block/cherry_fence_gate_wall_open.json | 6 + .../byg/models/block/cherry_fence_post.json | 7 + .../byg/models/block/cherry_planks.json | 12 + .../models/block/cherry_pressure_plate.json | 6 + .../block/cherry_pressure_plate_down.json | 6 + .../byg/models/block/cherry_sapling.json | 6 + .../assets/byg/models/block/cherry_slab.json | 8 + .../byg/models/block/cherry_slab_top.json | 8 + .../byg/models/block/cherry_stairs.json | 8 + .../byg/models/block/cherry_stairs_inner.json | 8 + .../byg/models/block/cherry_stairs_outer.json | 8 + .../models/block/cherry_trapdoor_bottom.json | 6 + .../models/block/cherry_trapdoor_open.json | 6 + .../byg/models/block/cherry_trapdoor_top.json | 6 + .../assets/byg/models/block/cherry_wood.json | 7 + .../byg/models/block/cika_bookshelf.json | 12 + .../assets/byg/models/block/cika_button.json | 6 + .../models/block/cika_button_inventory.json | 6 + .../byg/models/block/cika_button_pressed.json | 6 + .../byg/models/block/cika_crafting_table.json | 12 + .../byg/models/block/cika_door_bottom.json | 7 + .../models/block/cika_door_bottom_hinge.json | 7 + .../byg/models/block/cika_door_top.json | 7 + .../byg/models/block/cika_door_top_hinge.json | 7 + .../assets/byg/models/block/cika_fence.json | 7 + .../byg/models/block/cika_fence_gate.json | 6 + .../models/block/cika_fence_gate_open.json | 6 + .../models/block/cika_fence_gate_wall.json | 6 + .../block/cika_fence_gate_wall_open.json | 6 + .../byg/models/block/cika_fence_post.json | 7 + .../assets/byg/models/block/cika_leaves.json | 12 + .../byg/models/block/cika_leaves_snowy.json | 12 + .../assets/byg/models/block/cika_planks.json | 12 + .../byg/models/block/cika_pressure_plate.json | 6 + .../block/cika_pressure_plate_down.json | 6 + .../assets/byg/models/block/cika_sapling.json | 6 + .../assets/byg/models/block/cika_slab.json | 8 + .../byg/models/block/cika_slab_top.json | 8 + .../assets/byg/models/block/cika_stairs.json | 8 + .../byg/models/block/cika_stairs_inner.json | 8 + .../byg/models/block/cika_stairs_outer.json | 8 + .../models/block/cika_trapdoor_bottom.json | 6 + .../byg/models/block/cika_trapdoor_open.json | 6 + .../byg/models/block/cika_trapdoor_top.json | 6 + .../assets/byg/models/block/cika_wood.json | 7 + .../byg/models/block/cypress_bookshelf.json | 12 + .../byg/models/block/cypress_button.json | 6 + .../block/cypress_button_inventory.json | 6 + .../models/block/cypress_button_pressed.json | 6 + .../models/block/cypress_crafting_table.json | 12 + .../byg/models/block/cypress_door_bottom.json | 7 + .../block/cypress_door_bottom_hinge.json | 7 + .../byg/models/block/cypress_door_top.json | 7 + .../models/block/cypress_door_top_hinge.json | 7 + .../byg/models/block/cypress_fence.json | 7 + .../byg/models/block/cypress_fence_gate.json | 6 + .../models/block/cypress_fence_gate_open.json | 6 + .../models/block/cypress_fence_gate_wall.json | 6 + .../block/cypress_fence_gate_wall_open.json | 6 + .../byg/models/block/cypress_fence_post.json | 7 + .../byg/models/block/cypress_leaves.json | 12 + .../models/block/cypress_leaves_snowy.json | 12 + .../byg/models/block/cypress_planks.json | 12 + .../models/block/cypress_pressure_plate.json | 6 + .../block/cypress_pressure_plate_down.json | 6 + .../byg/models/block/cypress_sapling.json | 6 + .../assets/byg/models/block/cypress_slab.json | 8 + .../byg/models/block/cypress_slab_top.json | 8 + .../byg/models/block/cypress_stairs.json | 8 + .../models/block/cypress_stairs_inner.json | 8 + .../models/block/cypress_stairs_outer.json | 8 + .../models/block/cypress_trapdoor_bottom.json | 6 + .../models/block/cypress_trapdoor_open.json | 6 + .../models/block/cypress_trapdoor_top.json | 6 + .../assets/byg/models/block/cypress_wood.json | 7 + .../byg/models/block/ebony_bookshelf.json | 12 + .../assets/byg/models/block/ebony_button.json | 6 + .../models/block/ebony_button_inventory.json | 6 + .../models/block/ebony_button_pressed.json | 6 + .../models/block/ebony_crafting_table.json | 12 + .../byg/models/block/ebony_door_bottom.json | 7 + .../models/block/ebony_door_bottom_hinge.json | 7 + .../byg/models/block/ebony_door_top.json | 7 + .../models/block/ebony_door_top_hinge.json | 7 + .../assets/byg/models/block/ebony_fence.json | 7 + .../byg/models/block/ebony_fence_gate.json | 6 + .../models/block/ebony_fence_gate_open.json | 6 + .../models/block/ebony_fence_gate_wall.json | 6 + .../block/ebony_fence_gate_wall_open.json | 6 + .../byg/models/block/ebony_fence_post.json | 7 + .../assets/byg/models/block/ebony_leaves.json | 12 + .../byg/models/block/ebony_leaves_snowy.json | 12 + .../assets/byg/models/block/ebony_planks.json | 12 + .../models/block/ebony_pressure_plate.json | 6 + .../block/ebony_pressure_plate_down.json | 6 + .../byg/models/block/ebony_sapling.json | 6 + .../assets/byg/models/block/ebony_slab.json | 8 + .../byg/models/block/ebony_slab_top.json | 8 + .../assets/byg/models/block/ebony_stairs.json | 8 + .../byg/models/block/ebony_stairs_inner.json | 8 + .../byg/models/block/ebony_stairs_outer.json | 8 + .../models/block/ebony_trapdoor_bottom.json | 6 + .../byg/models/block/ebony_trapdoor_open.json | 6 + .../byg/models/block/ebony_trapdoor_top.json | 6 + .../assets/byg/models/block/ebony_wood.json | 7 + .../assets/byg/models/item/aspen_boat.json | 6 + .../byg/models/item/aspen_bookshelf.json | 39 ++ .../assets/byg/models/item/aspen_button.json | 39 ++ .../byg/models/item/aspen_crafting_table.json | 39 ++ .../assets/byg/models/item/aspen_door.json | 6 + .../assets/byg/models/item/aspen_fence.json | 39 ++ .../assets/byg/models/item/aspen_leaves.json | 39 ++ .../assets/byg/models/item/aspen_planks.json | 39 ++ .../byg/models/item/aspen_pressure_plate.json | 39 ++ .../assets/byg/models/item/aspen_sapling.json | 6 + .../assets/byg/models/item/aspen_slab.json | 39 ++ .../assets/byg/models/item/aspen_stairs.json | 39 ++ .../byg/models/item/aspen_trapdoor.json | 39 ++ .../assets/byg/models/item/aspen_wood.json | 39 ++ .../assets/byg/models/item/baobab_boat.json | 6 + .../byg/models/item/baobab_bookshelf.json | 39 ++ .../assets/byg/models/item/baobab_button.json | 39 ++ .../models/item/baobab_crafting_table.json | 39 ++ .../assets/byg/models/item/baobab_door.json | 6 + .../assets/byg/models/item/baobab_fence.json | 39 ++ .../assets/byg/models/item/baobab_leaves.json | 39 ++ .../assets/byg/models/item/baobab_planks.json | 39 ++ .../models/item/baobab_pressure_plate.json | 39 ++ .../byg/models/item/baobab_sapling.json | 6 + .../assets/byg/models/item/baobab_slab.json | 39 ++ .../assets/byg/models/item/baobab_stairs.json | 39 ++ .../byg/models/item/baobab_trapdoor.json | 39 ++ .../assets/byg/models/item/baobab_wood.json | 39 ++ .../byg/models/item/blue_enchanted_boat.json | 6 + .../models/item/blue_enchanted_bookshelf.json | 39 ++ .../models/item/blue_enchanted_button.json | 39 ++ .../item/blue_enchanted_crafting_table.json | 39 ++ .../byg/models/item/blue_enchanted_door.json | 6 + .../byg/models/item/blue_enchanted_fence.json | 39 ++ .../models/item/blue_enchanted_leaves.json | 39 ++ .../models/item/blue_enchanted_planks.json | 39 ++ .../item/blue_enchanted_pressure_plate.json | 39 ++ .../models/item/blue_enchanted_sapling.json | 6 + .../byg/models/item/blue_enchanted_slab.json | 39 ++ .../models/item/blue_enchanted_stairs.json | 39 ++ .../models/item/blue_enchanted_trapdoor.json | 39 ++ .../byg/models/item/blue_enchanted_wood.json | 39 ++ .../byg/models/item/bulbis_bookshelf.json | 39 ++ .../assets/byg/models/item/bulbis_button.json | 39 ++ .../models/item/bulbis_crafting_table.json | 39 ++ .../assets/byg/models/item/bulbis_door.json | 6 + .../assets/byg/models/item/bulbis_fence.json | 39 ++ .../assets/byg/models/item/bulbis_oddity.json | 6 + .../assets/byg/models/item/bulbis_planks.json | 39 ++ .../models/item/bulbis_pressure_plate.json | 39 ++ .../assets/byg/models/item/bulbis_slab.json | 39 ++ .../assets/byg/models/item/bulbis_stairs.json | 39 ++ .../byg/models/item/bulbis_trapdoor.json | 39 ++ .../assets/byg/models/item/bulbis_wood.json | 39 ++ .../assets/byg/models/item/cherry_boat.json | 6 + .../byg/models/item/cherry_bookshelf.json | 39 ++ .../assets/byg/models/item/cherry_button.json | 39 ++ .../models/item/cherry_crafting_table.json | 39 ++ .../assets/byg/models/item/cherry_door.json | 6 + .../assets/byg/models/item/cherry_fence.json | 39 ++ .../assets/byg/models/item/cherry_planks.json | 39 ++ .../models/item/cherry_pressure_plate.json | 39 ++ .../byg/models/item/cherry_sapling.json | 6 + .../assets/byg/models/item/cherry_slab.json | 39 ++ .../assets/byg/models/item/cherry_stairs.json | 39 ++ .../byg/models/item/cherry_trapdoor.json | 39 ++ .../assets/byg/models/item/cherry_wood.json | 39 ++ .../assets/byg/models/item/cika_boat.json | 6 + .../byg/models/item/cika_bookshelf.json | 39 ++ .../assets/byg/models/item/cika_button.json | 39 ++ .../byg/models/item/cika_crafting_table.json | 39 ++ .../assets/byg/models/item/cika_door.json | 6 + .../assets/byg/models/item/cika_fence.json | 39 ++ .../assets/byg/models/item/cika_leaves.json | 39 ++ .../assets/byg/models/item/cika_planks.json | 39 ++ .../byg/models/item/cika_pressure_plate.json | 39 ++ .../assets/byg/models/item/cika_sapling.json | 6 + .../assets/byg/models/item/cika_slab.json | 39 ++ .../assets/byg/models/item/cika_stairs.json | 39 ++ .../assets/byg/models/item/cika_trapdoor.json | 39 ++ .../assets/byg/models/item/cika_wood.json | 39 ++ .../assets/byg/models/item/cypress_boat.json | 6 + .../byg/models/item/cypress_bookshelf.json | 39 ++ .../byg/models/item/cypress_button.json | 39 ++ .../models/item/cypress_crafting_table.json | 39 ++ .../assets/byg/models/item/cypress_door.json | 6 + .../assets/byg/models/item/cypress_fence.json | 39 ++ .../byg/models/item/cypress_leaves.json | 39 ++ .../byg/models/item/cypress_planks.json | 39 ++ .../models/item/cypress_pressure_plate.json | 39 ++ .../byg/models/item/cypress_sapling.json | 6 + .../assets/byg/models/item/cypress_slab.json | 39 ++ .../byg/models/item/cypress_stairs.json | 39 ++ .../byg/models/item/cypress_trapdoor.json | 39 ++ .../assets/byg/models/item/cypress_wood.json | 39 ++ .../assets/byg/models/item/ebony_boat.json | 6 + .../byg/models/item/ebony_bookshelf.json | 39 ++ .../assets/byg/models/item/ebony_button.json | 39 ++ .../byg/models/item/ebony_crafting_table.json | 39 ++ .../assets/byg/models/item/ebony_door.json | 6 + .../assets/byg/models/item/ebony_fence.json | 39 ++ .../assets/byg/models/item/ebony_leaves.json | 39 ++ .../assets/byg/models/item/ebony_planks.json | 39 ++ .../byg/models/item/ebony_pressure_plate.json | 39 ++ .../assets/byg/models/item/ebony_sapling.json | 6 + .../assets/byg/models/item/ebony_slab.json | 39 ++ .../assets/byg/models/item/ebony_stairs.json | 39 ++ .../byg/models/item/ebony_trapdoor.json | 39 ++ .../assets/byg/models/item/ebony_wood.json | 39 ++ .../block/apen_crafting_tables_side.png | Bin 683 -> 0 bytes .../datagen/providers/BYGAssetsProvider.java | 19 +- .../byg/mixin/dev/ModelBuilderMixin.java | 28 ++ .../byg/mixin/dev/ModelProviderAccess.java | 14 + .../src/main/resources/byg_forge.mixins.json | 3 + 351 files changed, 5660 insertions(+), 9 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_wood.json delete mode 100644 Common/src/main/resources/assets/byg/textures/block/apen_crafting_tables_side.png create mode 100644 Forge/src/main/java/potionstudios/byg/mixin/dev/ModelBuilderMixin.java create mode 100644 Forge/src/main/java/potionstudios/byg/mixin/dev/ModelProviderAccess.java diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index d2d2f45c98..c588502cf3 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -1,19 +1,364 @@ +cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen_bookshelf.json +473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen_button.json +ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen_button_inventory.json +2bf3e6875f2c2751989618864aab8594dca74324 assets/byg/models/block/aspen_button_pressed.json +2a4946082bf8a99219734a5a1b0037719801ec10 assets/byg/models/block/aspen_crafting_table.json +b400d8113db2ef9fe9b7c918b964da9607fbffd5 assets/byg/models/block/aspen_door_bottom.json +0c3b6bb17c05ebb10ed2efc27598ee0c9f008d84 assets/byg/models/block/aspen_door_bottom_hinge.json +21335a02142a92dcc64ce7015f15f255cb2fe4b3 assets/byg/models/block/aspen_door_top.json +145d21652351e1c9de9d92c5118e76d97aad6f28 assets/byg/models/block/aspen_door_top_hinge.json +daf50a260453b66485cc77994c2bb6812d7e1e0f assets/byg/models/block/aspen_fence.json +180b19690fbadacdfa8ed5291f8011900e36263f assets/byg/models/block/aspen_fence_gate.json +3894c7ee2aaf9fe44ece506c223269c1a1e49ef5 assets/byg/models/block/aspen_fence_gate_open.json +0290d9f0631c5c089d0f53ae9c3af53f69dd34ee assets/byg/models/block/aspen_fence_gate_wall.json +836a5eff00071c22e737f2e2aaf189d93aacd32b assets/byg/models/block/aspen_fence_gate_wall_open.json +69dc1fbecb1981deb8e3780ddf4f7f802176340d assets/byg/models/block/aspen_fence_post.json +ee08f30cf4c4531f14782e40f3923425e6ca7933 assets/byg/models/block/aspen_leaves.json +a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen_leaves_snowy.json 7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen_log.json +09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen_planks.json +5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen_pressure_plate.json +1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen_pressure_plate_down.json +6bcb97531d915bed45b5232f401ef2d106b05c57 assets/byg/models/block/aspen_sapling.json +c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen_slab.json +8b9b48288da793a220e7cf839a7e0af136c92b16 assets/byg/models/block/aspen_slab_top.json +ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen_stairs.json +be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen_stairs_inner.json +4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen_stairs_outer.json +76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen_trapdoor_bottom.json +d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen_trapdoor_open.json +f0307f9818774087d2220c7bf39678414ee734ef assets/byg/models/block/aspen_trapdoor_top.json +95a22561722879a34775e020a8505278b435c747 assets/byg/models/block/aspen_wood.json +24f0c0973b6317415088e96958133b02b8c8701e assets/byg/models/block/baobab_bookshelf.json +07843ab609e2ed5d8c2bec533b20151e574ac689 assets/byg/models/block/baobab_button.json +73668cdfb040d89a3d9e02f465b7972f5ad5ec44 assets/byg/models/block/baobab_button_inventory.json +b6b4024eb2fa6d04d310d59afec6be0cb3669215 assets/byg/models/block/baobab_button_pressed.json +9dda473d195d670fdc118783ed914ee2eb9f9cae assets/byg/models/block/baobab_crafting_table.json +929262f73d154eea8176b5751cd39eb4db85e46f assets/byg/models/block/baobab_door_bottom.json +548fb33d0edaed51f9ec57b2bb8af8a84dfca3aa assets/byg/models/block/baobab_door_bottom_hinge.json +016c61a08b4c977dfca8c0b66f43dca2848cdcc6 assets/byg/models/block/baobab_door_top.json +9bdd88660bda76acef39ee3fb40b89da903969f2 assets/byg/models/block/baobab_door_top_hinge.json +34529c51b201e26a237210ee7dfe86902b7c3b60 assets/byg/models/block/baobab_fence.json +7f9a54e0f109af35ef589d840771b29b2fb03c4c assets/byg/models/block/baobab_fence_gate.json +db06b19f47aa1a3d943a69404d325d720bcc50bf assets/byg/models/block/baobab_fence_gate_open.json +83eb28eb0430ecfb7e99d4306635d3c962fce1c2 assets/byg/models/block/baobab_fence_gate_wall.json +f29f2504f0dd6d6cdcf0c4a660ea2943cba748b3 assets/byg/models/block/baobab_fence_gate_wall_open.json +df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab_fence_post.json +4c154d63eb511ab0da68ce19bbc88bc0a82808f8 assets/byg/models/block/baobab_leaves.json +224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab_leaves_snowy.json 3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab_log.json +1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab_planks.json +548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab_pressure_plate.json +f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab_pressure_plate_down.json +09c4fb1513ee3f51064da761c3706a1bc7f54c65 assets/byg/models/block/baobab_sapling.json +84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab_slab.json +095d0b898c8418b3fd79da96cd9a60aef7b72234 assets/byg/models/block/baobab_slab_top.json +17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab_stairs.json +76cd7c13e8a472c170bee401f53816a7146883d3 assets/byg/models/block/baobab_stairs_inner.json +36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab_stairs_outer.json +71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab_trapdoor_bottom.json +67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab_trapdoor_open.json +6d9421e7af02d85635301868cf30b019383f40d4 assets/byg/models/block/baobab_trapdoor_top.json +2a1b0e89f7858eae90274e135d83506016780a95 assets/byg/models/block/baobab_wood.json +342ea09ac25e8ff00beb042c6f15c5f87a3fff9b assets/byg/models/block/blue_enchanted_bookshelf.json +903b94423177dc6cbca0365f40b125357c38939e assets/byg/models/block/blue_enchanted_button.json +84acdb5c60d5523d8495329660cb63f2ee6b28c2 assets/byg/models/block/blue_enchanted_button_inventory.json +3d1b62263487869a2ba6b589357bc8e9aea5422b assets/byg/models/block/blue_enchanted_button_pressed.json +b5ccb0c95ea37c1f21ec6ecd56f42af33c6d5a84 assets/byg/models/block/blue_enchanted_crafting_table.json +d425e1b470fa2311bf39ca9023a20593929c761d assets/byg/models/block/blue_enchanted_door_bottom.json +b587f8eb21d159390db55ab8e3901090c0d73eee assets/byg/models/block/blue_enchanted_door_bottom_hinge.json +be454095ca2d89d5760f75b886635bc50e4fae41 assets/byg/models/block/blue_enchanted_door_top.json +748faf2eb6c9dc10dc3bdda258aeb50c79fa3d45 assets/byg/models/block/blue_enchanted_door_top_hinge.json +de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted_fence.json +258440a4812ac1074a0b55fcca031d1c741376e8 assets/byg/models/block/blue_enchanted_fence_gate.json +ac35dd46cb7bfcbfb120542d1999ce5db459249a assets/byg/models/block/blue_enchanted_fence_gate_open.json +737a7fad5fc148a658a9f70faaebcc00988d8488 assets/byg/models/block/blue_enchanted_fence_gate_wall.json +add286acac4cd6e672144ca2bc0053b65226e980 assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json +77b409997fe27d49c4942575e6a751dd1b15c17f assets/byg/models/block/blue_enchanted_fence_post.json +6f20986996d0fd8e995a1895e0d95303f967c29f assets/byg/models/block/blue_enchanted_leaves.json +30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted_leaves_snowy.json fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted_log.json +e2fd0bbb982161d06a3c5359113df56fb96df5ab assets/byg/models/block/blue_enchanted_planks.json +f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted_pressure_plate.json +ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted_pressure_plate_down.json +6690be3be333d7427f15a4124d2a9020118ab5d7 assets/byg/models/block/blue_enchanted_sapling.json +ddfaf3a3114a8727610eeb2a27663ad09f3bd187 assets/byg/models/block/blue_enchanted_slab.json +a6f663a7b9b3dde3ae9a7c7987073a8a19ade11b assets/byg/models/block/blue_enchanted_slab_top.json +eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted_stairs.json +5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted_stairs_inner.json +615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted_stairs_outer.json +dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted_trapdoor_bottom.json +470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted_trapdoor_open.json +fd2b82aae72fea322eb7cdc2e60f4ad1d064e9f1 assets/byg/models/block/blue_enchanted_trapdoor_top.json +a63365bae6d564b24bdb318370143249497bbdad assets/byg/models/block/blue_enchanted_wood.json +9f3ef59e8c04f55c28783a40933f433b7b1387ff assets/byg/models/block/bulbis_bookshelf.json +3b2faa52752790a21cf55466d1b33ccfec4e0085 assets/byg/models/block/bulbis_button.json +7177ac629742d77d2bd4b21443e06ba86afd7fa3 assets/byg/models/block/bulbis_button_inventory.json +c4c6062f9fb44f2016e7a314af6df8eec67e9279 assets/byg/models/block/bulbis_button_pressed.json +fcd7c1a6d62498cc2d16eba55ae1ccb14dba5e7c assets/byg/models/block/bulbis_crafting_table.json +a642b309fe508adcbf2a2b49470e7b1854dba57b assets/byg/models/block/bulbis_door_bottom.json +96b605f552035bb647603df97556bf2be301878b assets/byg/models/block/bulbis_door_bottom_hinge.json +fdf7fa5f81165b8c00825d07385ee17675cb1b95 assets/byg/models/block/bulbis_door_top.json +dc36d5affb1a63ab9bf1257f0fa91ff6d4d5d92a assets/byg/models/block/bulbis_door_top_hinge.json +8cbcfd0f20c708f6620a70b3e5f1c76a04771606 assets/byg/models/block/bulbis_fence.json +5e7637d0afb0425001fa45251d09f1ffbf6020d7 assets/byg/models/block/bulbis_fence_gate.json +7d27266056ef31574bfc19f5fd1b33638dbe66ad assets/byg/models/block/bulbis_fence_gate_open.json +fc210cd930ed68bdec95a982b1366f4a02ec4860 assets/byg/models/block/bulbis_fence_gate_wall.json +97fe5fe95b7751bc98cdf7d427ff852f084039c4 assets/byg/models/block/bulbis_fence_gate_wall_open.json +4dacfe5197a8d22fe04c6260d47378a44efdf429 assets/byg/models/block/bulbis_fence_post.json +c611670729691d4e63ba20dc76dd4831e76dae28 assets/byg/models/block/bulbis_oddity.json +d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis_planks.json +25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis_pressure_plate.json +eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis_pressure_plate_down.json +6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis_slab.json +3c49ab33b91ebcfaa455a5e479c1e79c3cdea16e assets/byg/models/block/bulbis_slab_top.json +fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis_stairs.json +35c77b8c5bef56b75ec9bd9f77bda8c07eb3e038 assets/byg/models/block/bulbis_stairs_inner.json +f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis_stairs_outer.json f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis_stem.json +56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis_trapdoor_bottom.json +c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis_trapdoor_open.json +00e5df9209acfce5ae98613398d022e942a26895 assets/byg/models/block/bulbis_trapdoor_top.json +a5f7f77a368e842399c01fedf858b142186091bf assets/byg/models/block/bulbis_wood.json +55419b8445de262fc9c14a2d1afc29ee3cc2d6d9 assets/byg/models/block/cherry_bookshelf.json +b61b724bd5d1b23f60a694ade93df7f9c0c5439d assets/byg/models/block/cherry_button.json +1b676842159db22e820b6b2e2b972691c2a66636 assets/byg/models/block/cherry_button_inventory.json +106c0ae5bd00115b3e73999bd274abd4eff83533 assets/byg/models/block/cherry_button_pressed.json +ef09392bff11a9cb0d8cf7b69d01964dd95a1e18 assets/byg/models/block/cherry_crafting_table.json +42cf930389a7420578a4294e014b47ca56e1237b assets/byg/models/block/cherry_door_bottom.json +c83212fc7c9175c1e8c820e96501dfbdb873a84e assets/byg/models/block/cherry_door_bottom_hinge.json +a677d914969547e2293587e2489b02fa89dfa1b9 assets/byg/models/block/cherry_door_top.json +33ab247625af5e119c513be35d596af9bb71681f assets/byg/models/block/cherry_door_top_hinge.json +ea0814753d2b3957c50080ff987d3a9fe66e4a99 assets/byg/models/block/cherry_fence.json +7a8e50369a71e11f2864b0bb75dba0461031efe3 assets/byg/models/block/cherry_fence_gate.json +5b49884019ee143a8e963e97abca5f8c5e43a1c4 assets/byg/models/block/cherry_fence_gate_open.json +949313b622a8222938acb430f6a89611845549cb assets/byg/models/block/cherry_fence_gate_wall.json +29078a270340acc30c6d60750051ed70597de05e assets/byg/models/block/cherry_fence_gate_wall_open.json +d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry_fence_post.json 093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry_log.json +bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry_planks.json +c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry_pressure_plate.json +f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry_pressure_plate_down.json +4e6b412c1c60feb4512be023424863cd5cde9b59 assets/byg/models/block/cherry_sapling.json +e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry_slab.json +1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry_slab_top.json +fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry_stairs.json +26b9d1ca396822f5f1a09b1ce06b38653fa4ef83 assets/byg/models/block/cherry_stairs_inner.json +1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry_stairs_outer.json +91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry_trapdoor_bottom.json +36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry_trapdoor_open.json +fb80e8dd89c2212bc3f597edaf0dee479c54b85c assets/byg/models/block/cherry_trapdoor_top.json +bbd3d4453849adc0f9c3e7e28e70a8451ec4a782 assets/byg/models/block/cherry_wood.json +8e70925b7477898d4bd0df33ff28ee7249d375d3 assets/byg/models/block/cika_bookshelf.json +cc495384bec10638db5ddb6cc9faf711ff1c5232 assets/byg/models/block/cika_button.json +ca5f79439846633630eea472e5cad307e30bd453 assets/byg/models/block/cika_button_inventory.json +8fe475630a162cff09e718dea1a53e745d48bd4d assets/byg/models/block/cika_button_pressed.json +ec7f5ef0c1ce4a2adf6ebd242c95d8411412cb3e assets/byg/models/block/cika_crafting_table.json +9fad1795f6acf907f7755f58d27bc722c5488118 assets/byg/models/block/cika_door_bottom.json +1fd5bb03ddff045d543bbda9e8762ef3fbef74a6 assets/byg/models/block/cika_door_bottom_hinge.json +eb16090931562f07122cddd222e4e9418b9746fa assets/byg/models/block/cika_door_top.json +2a7f1ea09bdf76c91add47cdf5c3c6fc3b4be54c assets/byg/models/block/cika_door_top_hinge.json +86560ee5e158e108cd114e82aa3073740cf248e0 assets/byg/models/block/cika_fence.json +8feb73315cf47b0f75413c5599823c71bdf0d2f5 assets/byg/models/block/cika_fence_gate.json +b6db2e0e1e73401133becbab9a099746eb06a770 assets/byg/models/block/cika_fence_gate_open.json +42d2165b07de96fa37fa1778e4935d6ab5272b73 assets/byg/models/block/cika_fence_gate_wall.json +4fecb9752f8cb6be9892ed65611d5fdf1f09dc6c assets/byg/models/block/cika_fence_gate_wall_open.json +5c50c602c71dd100a41b371b4a0190e3ad6bed88 assets/byg/models/block/cika_fence_post.json +8273bf0ac526eaeb06f93fa20811b5b0f9b8d40c assets/byg/models/block/cika_leaves.json +7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika_leaves_snowy.json 96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika_log.json +c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika_planks.json +f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika_pressure_plate.json +2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika_pressure_plate_down.json +d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika_sapling.json +ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika_slab.json +667387df6f1056509f112ba271b9d014d10c29b4 assets/byg/models/block/cika_slab_top.json +869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika_stairs.json +37d8526d628e939746fa4329b3237ca573f22907 assets/byg/models/block/cika_stairs_inner.json +d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika_stairs_outer.json +c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika_trapdoor_bottom.json +c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika_trapdoor_open.json +0f30e72e84531b3d6d613373ab71dd3a879cebaf assets/byg/models/block/cika_trapdoor_top.json +ea609e86e0e63aed18f9e92b034fc11af52ef2f9 assets/byg/models/block/cika_wood.json +bdf49e36532585b5b5b2db8ed61b17d5a1c2e3e9 assets/byg/models/block/cypress_bookshelf.json +3d65c0eb8f729fc119a1f3e4b01db0fc8503b358 assets/byg/models/block/cypress_button.json +daaa1ff636b6076a787e07439b1c460766dc20d1 assets/byg/models/block/cypress_button_inventory.json +3fcd6ca99f4aa6157ed76c842796c312c540fca7 assets/byg/models/block/cypress_button_pressed.json +48735a4456a1503e6945285e207490674162fdca assets/byg/models/block/cypress_crafting_table.json +3cc3da8203d317e0ce58e8c5eb2721b45ae390f1 assets/byg/models/block/cypress_door_bottom.json +5a8c42fa4bf3318f04da0925edfe1f09a6011951 assets/byg/models/block/cypress_door_bottom_hinge.json +065f336487f18e17361888ddaaa9bcdb4b1648c3 assets/byg/models/block/cypress_door_top.json +aacc54da619b8fd02a9abbf6b2dd471e5f231e13 assets/byg/models/block/cypress_door_top_hinge.json +8faa1548a6315cf7c78f80e4e741dfa12c3969fd assets/byg/models/block/cypress_fence.json +0de581245240221df11568d426898e83ef74b3e6 assets/byg/models/block/cypress_fence_gate.json +e6d14fb5066fed64c9541963dd7b70f66d784a59 assets/byg/models/block/cypress_fence_gate_open.json +15cb8b853d109f7922c6c557f8aed40a930dca13 assets/byg/models/block/cypress_fence_gate_wall.json +2a819545d5416489110f2c5dd8c4904a652fea95 assets/byg/models/block/cypress_fence_gate_wall_open.json +75e33321d34e2e787c45200c9bd38feaefe66618 assets/byg/models/block/cypress_fence_post.json +90deed53c54c2be689e626becf9e83283acc806f assets/byg/models/block/cypress_leaves.json +8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress_leaves_snowy.json dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress_log.json +c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress_planks.json +c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress_pressure_plate.json +9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress_pressure_plate_down.json +a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress_sapling.json +0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress_slab.json +55a7d16cc6ce2440632aba1f5c6d49c35e9a4da5 assets/byg/models/block/cypress_slab_top.json +b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress_stairs.json +c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress_stairs_inner.json +c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress_stairs_outer.json +e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress_trapdoor_bottom.json +bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress_trapdoor_open.json +4be848d813d65b3d7c66300f924dba25f677dba6 assets/byg/models/block/cypress_trapdoor_top.json +8e10baca50495ea8c4f12fa54722e824ae262b38 assets/byg/models/block/cypress_wood.json +b93df8197bda1b32ddf52e34fd1ad6c27b771615 assets/byg/models/block/ebony_bookshelf.json +76cd46330236e92926b217c076af66da805c23f0 assets/byg/models/block/ebony_button.json +c830cefb803bdbb8b0e876b9e90f3bde62a082e6 assets/byg/models/block/ebony_button_inventory.json +e3462900ba6d457c2aa2c96d24a2155c05592314 assets/byg/models/block/ebony_button_pressed.json +d3b2e6ae17c21ffaf3bead7a79cb3f03724ad529 assets/byg/models/block/ebony_crafting_table.json +cacae4a007bd19eed1ec4a3611cc143028ad14ad assets/byg/models/block/ebony_door_bottom.json +7ad4ae8c86b7683682a3c32888e9af799b467236 assets/byg/models/block/ebony_door_bottom_hinge.json +ebb92b99029121c1a7b6228088d7aec2c0e9ab5b assets/byg/models/block/ebony_door_top.json +27f89fa53bb5e1978532bedf299c3eeacbf513fb assets/byg/models/block/ebony_door_top_hinge.json +2aa0fd88c46608d1892fd02d8cc2a15eafb0a54c assets/byg/models/block/ebony_fence.json +7853de16757a84e50014845c56485675285ccc4a assets/byg/models/block/ebony_fence_gate.json +623aabce821beab1ddc3384c64ccb0af843af02f assets/byg/models/block/ebony_fence_gate_open.json +75ed72e58a4714deef390e7a7c0b68d9c46bc1cc assets/byg/models/block/ebony_fence_gate_wall.json +98555849999e40d33542de797cf1b39f1d8f8e21 assets/byg/models/block/ebony_fence_gate_wall_open.json +b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony_fence_post.json +2bc5e8035e080a279e7169b2d7f293f61c727841 assets/byg/models/block/ebony_leaves.json +5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony_leaves_snowy.json 9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony_log.json +2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony_planks.json +0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony_pressure_plate.json +a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony_pressure_plate_down.json +60ec91c07896435780b7cd33fd6da69670198f8d assets/byg/models/block/ebony_sapling.json +607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony_slab.json +871149a9d367aa279b5bc4f44fe9dccb20d51c06 assets/byg/models/block/ebony_slab_top.json +9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony_stairs.json +41d73969017926ed2daee4ff4034e6d5622e9da4 assets/byg/models/block/ebony_stairs_inner.json +913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony_stairs_outer.json +f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony_trapdoor_bottom.json +631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony_trapdoor_open.json +5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony_trapdoor_top.json +d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony_wood.json +331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json +2a41ddc8b5d75708c62d5a1b53ae0fc953feb3a4 assets/byg/models/item/aspen_bookshelf.json +f435515510c23e5ea4d3245bba670b6a50020e3a assets/byg/models/item/aspen_button.json +c673592916b855e4c9138b7ae3422aa447996010 assets/byg/models/item/aspen_crafting_table.json +6058b86174918e7a984dce6bae27c57f67849c56 assets/byg/models/item/aspen_door.json +a67931ed3d4f51e3ebbd0113e8ab11fb558bc0d6 assets/byg/models/item/aspen_fence.json +8bf5a3b56b1057859c019509f050019c4c0cd2a3 assets/byg/models/item/aspen_leaves.json 38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json +003c7d02949ca1e996078ba778608ac111dd24a3 assets/byg/models/item/aspen_planks.json +a4a903cde601f67eb459cdc5adb5d601c0a5b7c1 assets/byg/models/item/aspen_pressure_plate.json +3f00e9072f5289e65b6d39326c2e425ed4dc5567 assets/byg/models/item/aspen_sapling.json +b44f9ce5f7763b6e4943b553de26557ad277a095 assets/byg/models/item/aspen_slab.json +70e9a656e937b82858cdf57ef6add2081916b748 assets/byg/models/item/aspen_stairs.json +bb89fe9a00e3db29b3100a96affdde9ed207392c assets/byg/models/item/aspen_trapdoor.json +f387d9254642404576e9e3e29be6a8c96c79888f assets/byg/models/item/aspen_wood.json +faa6be8a2020e22b2de29ec835066d1acb0b57b8 assets/byg/models/item/baobab_boat.json +2736dfa3db6556f5f19714c8d498f8a7d75aaece assets/byg/models/item/baobab_bookshelf.json +ef7cb412cc785f0c8d395007d1a46b774b784a73 assets/byg/models/item/baobab_button.json +53d8f10a777d00e18648cd0f39fcdaa71e5ab0d2 assets/byg/models/item/baobab_crafting_table.json +77e287a34be20212e1e8aa1c68551a0435abac2f assets/byg/models/item/baobab_door.json +24bcf89982bed893e004eee5f145ec47c71beeff assets/byg/models/item/baobab_fence.json +cae214bd8eb999707ec8299ac478e5a98cc8b9af assets/byg/models/item/baobab_leaves.json e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json +811bc3c29eedb0f316f0270f2df050892bf1b9a8 assets/byg/models/item/baobab_planks.json +18cefa8faa0bde471bc033e0c77e33dc3eb55b69 assets/byg/models/item/baobab_pressure_plate.json +563eb366526a14858c38aed02361f5f0ca769e30 assets/byg/models/item/baobab_sapling.json +bc20310e527da1548678c0a59b51fd6d0f1afadc assets/byg/models/item/baobab_slab.json +03b7abe171962daaf260fc7f680fbf82e821c7af assets/byg/models/item/baobab_stairs.json +1c07c8fd0364342f923360fac1ca207ac8a28b3d assets/byg/models/item/baobab_trapdoor.json +d80889f8626eef81e43fb7f0c1e61bb6a943706a assets/byg/models/item/baobab_wood.json +364ec05acaa6d67f772f0dd7c7d3c6c43981148f assets/byg/models/item/blue_enchanted_boat.json +7d3644f31c133e896cdb59c4d8b237373f2d9262 assets/byg/models/item/blue_enchanted_bookshelf.json +5f732627fc4c0ee15eec778dfb6a271f4065603e assets/byg/models/item/blue_enchanted_button.json +9db3f629b539e2e633a8cdbde0331627788218ef assets/byg/models/item/blue_enchanted_crafting_table.json +429b921a774a05b4ef0334e7869b685f468ef6e4 assets/byg/models/item/blue_enchanted_door.json +6fb9c43873685ba7bd64fa383dd360ff03caaec2 assets/byg/models/item/blue_enchanted_fence.json +380c82778540cd6f022c488e9cdfbb6e99bbccee assets/byg/models/item/blue_enchanted_leaves.json 57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json +a265155fa64db093249c67b8fda1ac6532879c85 assets/byg/models/item/blue_enchanted_planks.json +11dd424bcd0170e575c71a550f4490cff08669a7 assets/byg/models/item/blue_enchanted_pressure_plate.json +14aab78089dccd4548dabc79ca9e6d6be27c5b7b assets/byg/models/item/blue_enchanted_sapling.json +6c6b7d4aaaaf41ae5544189b4d6f2f17ea503041 assets/byg/models/item/blue_enchanted_slab.json +6d133dc48556d0112a21ccd0a1cf0f91512f5ba9 assets/byg/models/item/blue_enchanted_stairs.json +507919363761d0c195b6f24703dcb31ada9ac4e8 assets/byg/models/item/blue_enchanted_trapdoor.json +ac614eceb30e702ce249b3435d116266aceb378e assets/byg/models/item/blue_enchanted_wood.json +7302f15f7a738cf856d0eb3d7e411394755e607c assets/byg/models/item/bulbis_bookshelf.json +11bf1c9f68c37f557306cac66aeae608b3b2a697 assets/byg/models/item/bulbis_button.json +5821586e299beeb47c3c76c60f5076de955e7a0e assets/byg/models/item/bulbis_crafting_table.json +1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json +568697f5c9accc89a632cbae00af83d6fe45dcbd assets/byg/models/item/bulbis_fence.json +3dc9cdb385d74665f9afd7e3e2e0cd2c9d70401d assets/byg/models/item/bulbis_oddity.json +6232ec108f910e2497aa4b78fa9d61c6d5bcc67a assets/byg/models/item/bulbis_planks.json +e4e1bbe9650f4073ce5b24c67d05c822c376b987 assets/byg/models/item/bulbis_pressure_plate.json +e85566c0cce6c3accfe4d705236b48580cfc4c05 assets/byg/models/item/bulbis_slab.json +7c973aedc12697df0306690a73a30c001544c374 assets/byg/models/item/bulbis_stairs.json f2056b8b51a75bcd460fc546467ad30e88af4cd6 assets/byg/models/item/bulbis_stem.json +cea43440cb2c4d446121146aeeb3f581e2c91575 assets/byg/models/item/bulbis_trapdoor.json +179fedb24a0d281cf55948f851c22938de4dab22 assets/byg/models/item/bulbis_wood.json +d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json +d31d28976d49400bd7e9a8e9056d9864376336b5 assets/byg/models/item/cherry_bookshelf.json +ed5732472b48092d0667c6cdfe012fe8d054d615 assets/byg/models/item/cherry_button.json +8a39ef10b32eeaac6d28815b3684a9bd6c4949b9 assets/byg/models/item/cherry_crafting_table.json +6701e69fee961fa3cafe3637ab9252d1d691c5fb assets/byg/models/item/cherry_door.json +7421ff38d22944fc6d87369676250c7834e54282 assets/byg/models/item/cherry_fence.json 3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json +4afd993824a2270fc517773eead3639dff772b7f assets/byg/models/item/cherry_planks.json +09ef608b2d7680f4d6c1547a2d5a7003444324e3 assets/byg/models/item/cherry_pressure_plate.json +de96b84775ce0ff158d7cfb6b7798ac16198ca6c assets/byg/models/item/cherry_sapling.json +671865c0d273b1784012ee1c3ccf6289106733e8 assets/byg/models/item/cherry_slab.json +347b47476667ec9ed1230b0e951c785d3d97af59 assets/byg/models/item/cherry_stairs.json +b98caf270c4062571b7ad23d5e276e2852377a2e assets/byg/models/item/cherry_trapdoor.json +a6de76a976c89462eadaafcbd6a883d91a6c5729 assets/byg/models/item/cherry_wood.json +50009b1b8338fa245894386cd307a1483260902c assets/byg/models/item/cika_boat.json +e8aa5b4ce19c262fbce40cbc0dc3e57e4366a00b assets/byg/models/item/cika_bookshelf.json +cbf0fcd278b651ff7468c45ef57a9de7c8358dcb assets/byg/models/item/cika_button.json +44b2ef89056645a68f755f62b491f225f66d4f41 assets/byg/models/item/cika_crafting_table.json +5ab0f9e30bea28148174a3bbb3c193711dfd1fa9 assets/byg/models/item/cika_door.json +981943d63794d720070dd44bcd77b936828792b0 assets/byg/models/item/cika_fence.json +3829225fda8f1bdf1cb93b4bae9ed23273a20eb0 assets/byg/models/item/cika_leaves.json 75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json +4d58890cd17246419cfeccad9dd883e8583d0c5a assets/byg/models/item/cika_planks.json +a526914b982685199270b7bce46b0a91a07be34d assets/byg/models/item/cika_pressure_plate.json +c4d2311e57813d3612dc5032f9e8517161d1e1a6 assets/byg/models/item/cika_sapling.json +eab4ab2b214b7c786d1684e021d4530907c2eaf4 assets/byg/models/item/cika_slab.json +f45b7d3c6be311dddcc801dc95843cfec9d700aa assets/byg/models/item/cika_stairs.json +b57967dd5c58dd29d9d7a86b8bab1543fcdb8953 assets/byg/models/item/cika_trapdoor.json +1f544581dc2e271cd36b37644d4e3ed7c41f59d2 assets/byg/models/item/cika_wood.json +1115843477e3e39471f26b22717d36f32817cbf4 assets/byg/models/item/cypress_boat.json +2384a3fe2fa89bf0ae4a0f331b85411a77f2bca2 assets/byg/models/item/cypress_bookshelf.json +b8107ed4fd70adf461147bb54efaab50eb206a59 assets/byg/models/item/cypress_button.json +1f189bb300f4d3960941075d107f7230e1dcb2fb assets/byg/models/item/cypress_crafting_table.json +47de2d9214f236ac039c4a62783da8493fb36bb3 assets/byg/models/item/cypress_door.json +1c4bc38f4c51c6c011eb4df3b7a5e67572339db3 assets/byg/models/item/cypress_fence.json +a87bbfd107f869ea32d2faa73acb148981051696 assets/byg/models/item/cypress_leaves.json c3b7cdf031367e432cd957f075f634d8c7878e7c assets/byg/models/item/cypress_log.json +ba0d97b9bc5fb7c4ad8dc2b5fc9faeefe1b343c7 assets/byg/models/item/cypress_planks.json +3fb6fbbe4c400f7721d15544866e584265c874e0 assets/byg/models/item/cypress_pressure_plate.json +0cd68739a2232eed84704875967dfdb72b2cbe61 assets/byg/models/item/cypress_sapling.json +a9cd53d5bd6f3549dc341e6f01f28c98af0922a3 assets/byg/models/item/cypress_slab.json +ddd4da9af60b209d807793d662bad1f784c9ab41 assets/byg/models/item/cypress_stairs.json +7489fc14b7693662b85372ccf82e40d4a2ad4534 assets/byg/models/item/cypress_trapdoor.json +25741e244adfab7e8e69525c0f8aab8f3547e20c assets/byg/models/item/cypress_wood.json +45839da35dac45b1fa019ca536de6cbd2afbce8c assets/byg/models/item/ebony_boat.json +882060aa29cb44a2a7d31c8c68a6f120fb1ecfbd assets/byg/models/item/ebony_bookshelf.json +2097a924294277837bd73aefed1ccba2085f0941 assets/byg/models/item/ebony_button.json +9ce2127e1fd89db74526e22be78ff30a37e00bdb assets/byg/models/item/ebony_crafting_table.json +c3fdda9816205904c9e67c08632bbf936878d5cf assets/byg/models/item/ebony_door.json +c2973d3a2ffb73a1e490d4fd337bf07aa4effade assets/byg/models/item/ebony_fence.json +28c947a9ffb6b64215afb7864ed48f932e945b35 assets/byg/models/item/ebony_leaves.json ddacb253e1661eeb7eca1130ecb83b19223cd41e assets/byg/models/item/ebony_log.json +835129b5147191b14343dd09839ab17616f507a8 assets/byg/models/item/ebony_planks.json +e104745079cff1d9ee2b3d86e7087e38011876cb assets/byg/models/item/ebony_pressure_plate.json +685fb18ac8ff696b3e9a29222fc59ef24d9f563d assets/byg/models/item/ebony_sapling.json +b00a7837960eb11b0a5b3c9dde743d3ba3a4cd34 assets/byg/models/item/ebony_slab.json +bdf7e636f64a72718f82816ef74c75ad2afe77e3 assets/byg/models/item/ebony_stairs.json +be5c1e32405cb4a4b96d365ea0636838862959f5 assets/byg/models/item/ebony_trapdoor.json +16407cb9711e490eba772f4e0fa8280ed003b15b assets/byg/models/item/ebony_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json new file mode 100644 index 0000000000..55184f1e54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/aspen/planks", + "up": "byg:block/aspen/planks", + "north": "byg:block/aspen/bookshelf", + "south": "byg:block/aspen/bookshelf", + "east": "byg:block/aspen/bookshelf", + "west": "byg:block/aspen/bookshelf", + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button.json b/Common/src/generated/resources/assets/byg/models/block/aspen_button.json new file mode 100644 index 0000000000..656d64f3f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json new file mode 100644 index 0000000000..adaec654d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json new file mode 100644 index 0000000000..615c76618e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json new file mode 100644 index 0000000000..391021fe02 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/aspen/planks", + "up": "byg:block/aspen/crafting_table_top", + "north": "byg:block/aspen/crafting_table_front", + "south": "byg:block/aspen/crafting_table_side", + "east": "byg:block/aspen/crafting_table_side", + "west": "byg:block/aspen/crafting_table_front", + "particle": "byg:block/aspen/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json new file mode 100644 index 0000000000..88d63b2d22 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json new file mode 100644 index 0000000000..4f9b847150 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json new file mode 100644 index 0000000000..792ff365c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json new file mode 100644 index 0000000000..25ff281723 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence.json new file mode 100644 index 0000000000..8660cfacce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/aspen/planks", + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json new file mode 100644 index 0000000000..0c13a20bb4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json new file mode 100644 index 0000000000..b64dc9dedd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json new file mode 100644 index 0000000000..45dba1f770 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json new file mode 100644 index 0000000000..07847f6080 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json new file mode 100644 index 0000000000..bd513b53fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/aspen/planks", + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json b/Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json new file mode 100644 index 0000000000..359f2fe217 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/aspen/leaves", + "up": "byg:block/aspen/leaves", + "north": "byg:block/aspen/leaves", + "south": "byg:block/aspen/leaves", + "east": "byg:block/aspen/leaves", + "west": "byg:block/aspen/leaves", + "particle": "byg:block/aspen/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json new file mode 100644 index 0000000000..966497991f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/aspen/leaves_snowy", + "up": "byg:block/aspen/leaves_snowy", + "north": "byg:block/aspen/leaves_snowy_side", + "south": "byg:block/aspen/leaves_snowy_side", + "east": "byg:block/aspen/leaves_snowy_side", + "west": "byg:block/aspen/leaves_snowy_side", + "particle": "byg:block/aspen/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_planks.json b/Common/src/generated/resources/assets/byg/models/block/aspen_planks.json new file mode 100644 index 0000000000..9adc7f228c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/aspen/planks", + "up": "byg:block/aspen/planks", + "north": "byg:block/aspen/planks", + "south": "byg:block/aspen/planks", + "east": "byg:block/aspen/planks", + "west": "byg:block/aspen/planks", + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json new file mode 100644 index 0000000000..d645a04d7d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json new file mode 100644 index 0000000000..181d920f64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json b/Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json new file mode 100644 index 0000000000..b43fd38cec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/aspen/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_slab.json b/Common/src/generated/resources/assets/byg/models/block/aspen_slab.json new file mode 100644 index 0000000000..9c9519e145 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/aspen/planks", + "bottom": "byg:block/aspen/planks", + "top": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json new file mode 100644 index 0000000000..17d80994e5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/aspen/planks", + "bottom": "byg:block/aspen/planks", + "top": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json new file mode 100644 index 0000000000..aff2e0987f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/aspen/planks", + "bottom": "byg:block/aspen/planks", + "top": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json new file mode 100644 index 0000000000..5ff07c1549 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/aspen/planks", + "bottom": "byg:block/aspen/planks", + "top": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json new file mode 100644 index 0000000000..a89afd5515 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/aspen/planks", + "bottom": "byg:block/aspen/planks", + "top": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json new file mode 100644 index 0000000000..2de207e241 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/aspen/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json new file mode 100644 index 0000000000..5b029720c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/aspen/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json new file mode 100644 index 0000000000..85a842a138 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/aspen/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_wood.json b/Common/src/generated/resources/assets/byg/models/block/aspen_wood.json new file mode 100644 index 0000000000..6a3f022b06 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/aspen/log", + "particle": "byg:block/aspen/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json new file mode 100644 index 0000000000..64e6ccc7b4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/baobab/planks", + "up": "byg:block/baobab/planks", + "north": "byg:block/baobab/bookshelf", + "south": "byg:block/baobab/bookshelf", + "east": "byg:block/baobab/bookshelf", + "west": "byg:block/baobab/bookshelf", + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button.json b/Common/src/generated/resources/assets/byg/models/block/baobab_button.json new file mode 100644 index 0000000000..3502ec485b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json new file mode 100644 index 0000000000..47408f037e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json new file mode 100644 index 0000000000..86d4ae9d7b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json new file mode 100644 index 0000000000..599b9ae710 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/baobab/planks", + "up": "byg:block/baobab/crafting_table_top", + "north": "byg:block/baobab/crafting_table_front", + "south": "byg:block/baobab/crafting_table_side", + "east": "byg:block/baobab/crafting_table_side", + "west": "byg:block/baobab/crafting_table_front", + "particle": "byg:block/baobab/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json new file mode 100644 index 0000000000..4bd1c45a98 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json new file mode 100644 index 0000000000..0593a7bfb4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json new file mode 100644 index 0000000000..d0db8aa023 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json new file mode 100644 index 0000000000..793c1e0573 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence.json new file mode 100644 index 0000000000..5f86bc04ce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/baobab/planks", + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json new file mode 100644 index 0000000000..54ac54f927 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json new file mode 100644 index 0000000000..7347b4cdd6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json new file mode 100644 index 0000000000..c49466f0a3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json new file mode 100644 index 0000000000..e9d6ad772d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json new file mode 100644 index 0000000000..884c79351f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/baobab/planks", + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json b/Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json new file mode 100644 index 0000000000..f9954ff0a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/baobab/leaves", + "up": "byg:block/baobab/leaves", + "north": "byg:block/baobab/leaves", + "south": "byg:block/baobab/leaves", + "east": "byg:block/baobab/leaves", + "west": "byg:block/baobab/leaves", + "particle": "byg:block/baobab/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json new file mode 100644 index 0000000000..65fb38df23 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/baobab/leaves_snowy", + "up": "byg:block/baobab/leaves_snowy", + "north": "byg:block/baobab/leaves_snowy_side", + "south": "byg:block/baobab/leaves_snowy_side", + "east": "byg:block/baobab/leaves_snowy_side", + "west": "byg:block/baobab/leaves_snowy_side", + "particle": "byg:block/baobab/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_planks.json b/Common/src/generated/resources/assets/byg/models/block/baobab_planks.json new file mode 100644 index 0000000000..d95a5ecdd2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/baobab/planks", + "up": "byg:block/baobab/planks", + "north": "byg:block/baobab/planks", + "south": "byg:block/baobab/planks", + "east": "byg:block/baobab/planks", + "west": "byg:block/baobab/planks", + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json new file mode 100644 index 0000000000..42aacaacd4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json new file mode 100644 index 0000000000..7ebcfbcbe5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json b/Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json new file mode 100644 index 0000000000..bd5197a0d6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/baobab/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_slab.json b/Common/src/generated/resources/assets/byg/models/block/baobab_slab.json new file mode 100644 index 0000000000..e27ad85619 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/baobab/planks", + "bottom": "byg:block/baobab/planks", + "top": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json new file mode 100644 index 0000000000..01aa894a19 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/baobab/planks", + "bottom": "byg:block/baobab/planks", + "top": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json new file mode 100644 index 0000000000..5bac8422f4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/baobab/planks", + "bottom": "byg:block/baobab/planks", + "top": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json new file mode 100644 index 0000000000..0b2da064e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/baobab/planks", + "bottom": "byg:block/baobab/planks", + "top": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json new file mode 100644 index 0000000000..a69a49ec02 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/baobab/planks", + "bottom": "byg:block/baobab/planks", + "top": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json new file mode 100644 index 0000000000..f2a4d297be --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/baobab/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json new file mode 100644 index 0000000000..e22b2bd604 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/baobab/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json new file mode 100644 index 0000000000..8b4aec3d0c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/baobab/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_wood.json b/Common/src/generated/resources/assets/byg/models/block/baobab_wood.json new file mode 100644 index 0000000000..936f5bd0d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/baobab/log", + "particle": "byg:block/baobab/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json new file mode 100644 index 0000000000..ec690fa161 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/blue_enchanted/planks", + "up": "byg:block/blue_enchanted/planks", + "north": "byg:block/blue_enchanted/bookshelf", + "south": "byg:block/blue_enchanted/bookshelf", + "east": "byg:block/blue_enchanted/bookshelf", + "west": "byg:block/blue_enchanted/bookshelf", + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json new file mode 100644 index 0000000000..2e60b4b1c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json new file mode 100644 index 0000000000..2fb34c70fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json new file mode 100644 index 0000000000..276768c51a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json new file mode 100644 index 0000000000..d9e8e88910 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/blue_enchanted/planks", + "up": "byg:block/blue_enchanted/crafting_table_top", + "north": "byg:block/blue_enchanted/crafting_table_front", + "south": "byg:block/blue_enchanted/crafting_table_side", + "east": "byg:block/blue_enchanted/crafting_table_side", + "west": "byg:block/blue_enchanted/crafting_table_front", + "particle": "byg:block/blue_enchanted/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json new file mode 100644 index 0000000000..ecb938dc83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json new file mode 100644 index 0000000000..dd1ec89ff6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json new file mode 100644 index 0000000000..f45d54f684 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json new file mode 100644 index 0000000000..10adb9fa1a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json new file mode 100644 index 0000000000..d16e734a77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/blue_enchanted/planks", + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json new file mode 100644 index 0000000000..9c7cd6ceb0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json new file mode 100644 index 0000000000..fb263afe54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json new file mode 100644 index 0000000000..2d37900c2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json new file mode 100644 index 0000000000..551eb3d5a8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json new file mode 100644 index 0000000000..7751f09cdc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/blue_enchanted/planks", + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json new file mode 100644 index 0000000000..00f99babb8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/blue_enchanted/leaves", + "up": "byg:block/blue_enchanted/leaves", + "north": "byg:block/blue_enchanted/leaves", + "south": "byg:block/blue_enchanted/leaves", + "east": "byg:block/blue_enchanted/leaves", + "west": "byg:block/blue_enchanted/leaves", + "particle": "byg:block/blue_enchanted/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json new file mode 100644 index 0000000000..14b314102c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/blue_enchanted/leaves_snowy", + "up": "byg:block/blue_enchanted/leaves_snowy", + "north": "byg:block/blue_enchanted/leaves_snowy_side", + "south": "byg:block/blue_enchanted/leaves_snowy_side", + "east": "byg:block/blue_enchanted/leaves_snowy_side", + "west": "byg:block/blue_enchanted/leaves_snowy_side", + "particle": "byg:block/blue_enchanted/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json new file mode 100644 index 0000000000..4ae0446074 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/blue_enchanted/planks", + "up": "byg:block/blue_enchanted/planks", + "north": "byg:block/blue_enchanted/planks", + "south": "byg:block/blue_enchanted/planks", + "east": "byg:block/blue_enchanted/planks", + "west": "byg:block/blue_enchanted/planks", + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json new file mode 100644 index 0000000000..98e0bb68bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json new file mode 100644 index 0000000000..a26461e61e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json new file mode 100644 index 0000000000..f0dbe156c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/blue_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json new file mode 100644 index 0000000000..6138def462 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/blue_enchanted/planks", + "bottom": "byg:block/blue_enchanted/planks", + "top": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json new file mode 100644 index 0000000000..24f7777cc8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/blue_enchanted/planks", + "bottom": "byg:block/blue_enchanted/planks", + "top": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json new file mode 100644 index 0000000000..3af9113453 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/blue_enchanted/planks", + "bottom": "byg:block/blue_enchanted/planks", + "top": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json new file mode 100644 index 0000000000..0fb03ae64a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/blue_enchanted/planks", + "bottom": "byg:block/blue_enchanted/planks", + "top": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json new file mode 100644 index 0000000000..5a410b8c2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/blue_enchanted/planks", + "bottom": "byg:block/blue_enchanted/planks", + "top": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json new file mode 100644 index 0000000000..21635282f5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/blue_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json new file mode 100644 index 0000000000..e853514431 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/blue_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json new file mode 100644 index 0000000000..5c7bf31c05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/blue_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json new file mode 100644 index 0000000000..4d87c3ede0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/blue_enchanted/log", + "particle": "byg:block/blue_enchanted/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json new file mode 100644 index 0000000000..2ec9420e41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/bulbis/planks", + "up": "byg:block/bulbis/planks", + "north": "byg:block/bulbis/bookshelf", + "south": "byg:block/bulbis/bookshelf", + "east": "byg:block/bulbis/bookshelf", + "west": "byg:block/bulbis/bookshelf", + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_button.json new file mode 100644 index 0000000000..c311dd1d8a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json new file mode 100644 index 0000000000..8e4e82b5c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json new file mode 100644 index 0000000000..38e5a7200e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json new file mode 100644 index 0000000000..4ecb980620 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/bulbis/planks", + "up": "byg:block/bulbis/crafting_table_top", + "north": "byg:block/bulbis/crafting_table_front", + "south": "byg:block/bulbis/crafting_table_side", + "east": "byg:block/bulbis/crafting_table_side", + "west": "byg:block/bulbis/crafting_table_front", + "particle": "byg:block/bulbis/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json new file mode 100644 index 0000000000..cbfd4f388b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json new file mode 100644 index 0000000000..84b96018a4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json new file mode 100644 index 0000000000..14c5c1da47 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json new file mode 100644 index 0000000000..e11e905d01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json new file mode 100644 index 0000000000..ec6b830c0b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/bulbis/planks", + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json new file mode 100644 index 0000000000..50a76ff98e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json new file mode 100644 index 0000000000..807a6b0039 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json new file mode 100644 index 0000000000..38b7f3b392 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json new file mode 100644 index 0000000000..056630bdc0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json new file mode 100644 index 0000000000..15ea730057 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/bulbis/planks", + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json new file mode 100644 index 0000000000..29e46d3663 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/bulbis/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json new file mode 100644 index 0000000000..9a588815b8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/bulbis/planks", + "up": "byg:block/bulbis/planks", + "north": "byg:block/bulbis/planks", + "south": "byg:block/bulbis/planks", + "east": "byg:block/bulbis/planks", + "west": "byg:block/bulbis/planks", + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json new file mode 100644 index 0000000000..9e5cb90df4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json new file mode 100644 index 0000000000..322ee1fbc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json new file mode 100644 index 0000000000..5e2e6f78fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/bulbis/planks", + "bottom": "byg:block/bulbis/planks", + "top": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json new file mode 100644 index 0000000000..8947c4b6dd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/bulbis/planks", + "bottom": "byg:block/bulbis/planks", + "top": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json new file mode 100644 index 0000000000..f79febfdfb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/bulbis/planks", + "bottom": "byg:block/bulbis/planks", + "top": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json new file mode 100644 index 0000000000..3ee36d1109 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/bulbis/planks", + "bottom": "byg:block/bulbis/planks", + "top": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json new file mode 100644 index 0000000000..f001963e62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/bulbis/planks", + "bottom": "byg:block/bulbis/planks", + "top": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json new file mode 100644 index 0000000000..5166cf0de9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/bulbis/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json new file mode 100644 index 0000000000..24800acd34 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/bulbis/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json new file mode 100644 index 0000000000..1bc2d67e85 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/bulbis/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json new file mode 100644 index 0000000000..88723c960b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/bulbis/log", + "particle": "byg:block/bulbis/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json new file mode 100644 index 0000000000..7bcf3eac95 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cherry/planks", + "up": "byg:block/cherry/planks", + "north": "byg:block/cherry/bookshelf", + "south": "byg:block/cherry/bookshelf", + "east": "byg:block/cherry/bookshelf", + "west": "byg:block/cherry/bookshelf", + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button.json b/Common/src/generated/resources/assets/byg/models/block/cherry_button.json new file mode 100644 index 0000000000..6cee7da2e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json new file mode 100644 index 0000000000..d5c6e9f57e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json new file mode 100644 index 0000000000..200d9a1afe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json new file mode 100644 index 0000000000..60d9304857 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cherry/planks", + "up": "byg:block/cherry/crafting_table_top", + "north": "byg:block/cherry/crafting_table_front", + "south": "byg:block/cherry/crafting_table_side", + "east": "byg:block/cherry/crafting_table_side", + "west": "byg:block/cherry/crafting_table_front", + "particle": "byg:block/cherry/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json new file mode 100644 index 0000000000..8539fa9c44 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json new file mode 100644 index 0000000000..cb177a4848 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json new file mode 100644 index 0000000000..cb0be9ef28 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json new file mode 100644 index 0000000000..e7b9fb6af2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence.json new file mode 100644 index 0000000000..4d1b744c13 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/cherry/planks", + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json new file mode 100644 index 0000000000..f2df96ef4b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json new file mode 100644 index 0000000000..9e68d4b99a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json new file mode 100644 index 0000000000..39e7804e86 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json new file mode 100644 index 0000000000..0277d9d309 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json new file mode 100644 index 0000000000..07cf83ae29 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/cherry/planks", + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_planks.json b/Common/src/generated/resources/assets/byg/models/block/cherry_planks.json new file mode 100644 index 0000000000..8db5d3b7c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cherry/planks", + "up": "byg:block/cherry/planks", + "north": "byg:block/cherry/planks", + "south": "byg:block/cherry/planks", + "east": "byg:block/cherry/planks", + "west": "byg:block/cherry/planks", + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json new file mode 100644 index 0000000000..609741694e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json new file mode 100644 index 0000000000..b9472c06ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json new file mode 100644 index 0000000000..2b5dc9fce5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/cherry/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_slab.json b/Common/src/generated/resources/assets/byg/models/block/cherry_slab.json new file mode 100644 index 0000000000..5c11f82751 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/cherry/planks", + "bottom": "byg:block/cherry/planks", + "top": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json new file mode 100644 index 0000000000..4ecd1c826a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/cherry/planks", + "bottom": "byg:block/cherry/planks", + "top": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json new file mode 100644 index 0000000000..42950e7803 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/cherry/planks", + "bottom": "byg:block/cherry/planks", + "top": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json new file mode 100644 index 0000000000..4e45b39693 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/cherry/planks", + "bottom": "byg:block/cherry/planks", + "top": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json new file mode 100644 index 0000000000..b3ab4a9594 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/cherry/planks", + "bottom": "byg:block/cherry/planks", + "top": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json new file mode 100644 index 0000000000..bd1fc52190 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/cherry/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json new file mode 100644 index 0000000000..713fd68f95 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/cherry/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json new file mode 100644 index 0000000000..66c6e94d58 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/cherry/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_wood.json b/Common/src/generated/resources/assets/byg/models/block/cherry_wood.json new file mode 100644 index 0000000000..4d6062f8e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cherry/log", + "particle": "byg:block/cherry/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json new file mode 100644 index 0000000000..772480d3c1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cika/planks", + "up": "byg:block/cika/planks", + "north": "byg:block/cika/bookshelf", + "south": "byg:block/cika/bookshelf", + "east": "byg:block/cika/bookshelf", + "west": "byg:block/cika/bookshelf", + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button.json b/Common/src/generated/resources/assets/byg/models/block/cika_button.json new file mode 100644 index 0000000000..2a8dcc61e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json new file mode 100644 index 0000000000..2afe6ce445 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json new file mode 100644 index 0000000000..342c20110c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json new file mode 100644 index 0000000000..36892ccc54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cika/planks", + "up": "byg:block/cika/crafting_table_top", + "north": "byg:block/cika/crafting_table_front", + "south": "byg:block/cika/crafting_table_side", + "east": "byg:block/cika/crafting_table_side", + "west": "byg:block/cika/crafting_table_front", + "particle": "byg:block/cika/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json new file mode 100644 index 0000000000..06c8c33e36 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json new file mode 100644 index 0000000000..e09d476fb8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cika_door_top.json new file mode 100644 index 0000000000..d6d57766f0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json new file mode 100644 index 0000000000..c248ed0ba2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence.json new file mode 100644 index 0000000000..8c33fb6414 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/cika/planks", + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json new file mode 100644 index 0000000000..bf64c593a2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json new file mode 100644 index 0000000000..6d03fa020b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json new file mode 100644 index 0000000000..c6bd7e47ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json new file mode 100644 index 0000000000..9f67578933 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json new file mode 100644 index 0000000000..e6d723fc7c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/cika/planks", + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_leaves.json b/Common/src/generated/resources/assets/byg/models/block/cika_leaves.json new file mode 100644 index 0000000000..65729da08e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cika/leaves", + "up": "byg:block/cika/leaves", + "north": "byg:block/cika/leaves", + "south": "byg:block/cika/leaves", + "east": "byg:block/cika/leaves", + "west": "byg:block/cika/leaves", + "particle": "byg:block/cika/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json new file mode 100644 index 0000000000..624e2acccc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cika/leaves_snowy", + "up": "byg:block/cika/leaves_snowy", + "north": "byg:block/cika/leaves_snowy_side", + "south": "byg:block/cika/leaves_snowy_side", + "east": "byg:block/cika/leaves_snowy_side", + "west": "byg:block/cika/leaves_snowy_side", + "particle": "byg:block/cika/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_planks.json b/Common/src/generated/resources/assets/byg/models/block/cika_planks.json new file mode 100644 index 0000000000..406711316e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cika/planks", + "up": "byg:block/cika/planks", + "north": "byg:block/cika/planks", + "south": "byg:block/cika/planks", + "east": "byg:block/cika/planks", + "west": "byg:block/cika/planks", + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json new file mode 100644 index 0000000000..3c8be32b5c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json new file mode 100644 index 0000000000..9bde84b5e4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cika_sapling.json new file mode 100644 index 0000000000..c797b1d56f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/cika/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_slab.json b/Common/src/generated/resources/assets/byg/models/block/cika_slab.json new file mode 100644 index 0000000000..12a6746e30 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/cika/planks", + "bottom": "byg:block/cika/planks", + "top": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json new file mode 100644 index 0000000000..e3e73a280b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/cika/planks", + "bottom": "byg:block/cika/planks", + "top": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cika_stairs.json new file mode 100644 index 0000000000..a0d6abae24 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/cika/planks", + "bottom": "byg:block/cika/planks", + "top": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json new file mode 100644 index 0000000000..a7518eeb93 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/cika/planks", + "bottom": "byg:block/cika/planks", + "top": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json new file mode 100644 index 0000000000..d6204195a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/cika/planks", + "bottom": "byg:block/cika/planks", + "top": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json new file mode 100644 index 0000000000..f9f6d867d4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/cika/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json new file mode 100644 index 0000000000..c7131e0261 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/cika/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json new file mode 100644 index 0000000000..e87531b1b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/cika/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_wood.json b/Common/src/generated/resources/assets/byg/models/block/cika_wood.json new file mode 100644 index 0000000000..295f1e8822 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cika/log", + "particle": "byg:block/cika/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json new file mode 100644 index 0000000000..b54df58f41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cypress/planks", + "up": "byg:block/cypress/planks", + "north": "byg:block/cypress/bookshelf", + "south": "byg:block/cypress/bookshelf", + "east": "byg:block/cypress/bookshelf", + "west": "byg:block/cypress/bookshelf", + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button.json b/Common/src/generated/resources/assets/byg/models/block/cypress_button.json new file mode 100644 index 0000000000..b491cfb064 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json new file mode 100644 index 0000000000..af7ea41c32 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json new file mode 100644 index 0000000000..506b510e32 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json new file mode 100644 index 0000000000..d503c6afa9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cypress/planks", + "up": "byg:block/cypress/crafting_table_top", + "north": "byg:block/cypress/crafting_table_front", + "south": "byg:block/cypress/crafting_table_side", + "east": "byg:block/cypress/crafting_table_side", + "west": "byg:block/cypress/crafting_table_front", + "particle": "byg:block/cypress/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json new file mode 100644 index 0000000000..bc49aacbe9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json new file mode 100644 index 0000000000..79408955e7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json new file mode 100644 index 0000000000..69eee36e68 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json new file mode 100644 index 0000000000..d2b3040599 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence.json new file mode 100644 index 0000000000..1be16b0811 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/cypress/planks", + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json new file mode 100644 index 0000000000..a383810f30 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json new file mode 100644 index 0000000000..adcc0dcafd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json new file mode 100644 index 0000000000..45cebece2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json new file mode 100644 index 0000000000..f03a58f711 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json new file mode 100644 index 0000000000..3001b43cea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/cypress/planks", + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json b/Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json new file mode 100644 index 0000000000..a382446e41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cypress/leaves", + "up": "byg:block/cypress/leaves", + "north": "byg:block/cypress/leaves", + "south": "byg:block/cypress/leaves", + "east": "byg:block/cypress/leaves", + "west": "byg:block/cypress/leaves", + "particle": "byg:block/cypress/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json new file mode 100644 index 0000000000..790fe62427 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cypress/leaves_snowy", + "up": "byg:block/cypress/leaves_snowy", + "north": "byg:block/cypress/leaves_snowy_side", + "south": "byg:block/cypress/leaves_snowy_side", + "east": "byg:block/cypress/leaves_snowy_side", + "west": "byg:block/cypress/leaves_snowy_side", + "particle": "byg:block/cypress/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_planks.json b/Common/src/generated/resources/assets/byg/models/block/cypress_planks.json new file mode 100644 index 0000000000..d7b365e7b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/cypress/planks", + "up": "byg:block/cypress/planks", + "north": "byg:block/cypress/planks", + "south": "byg:block/cypress/planks", + "east": "byg:block/cypress/planks", + "west": "byg:block/cypress/planks", + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json new file mode 100644 index 0000000000..aa0212540d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json new file mode 100644 index 0000000000..4512189d37 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json new file mode 100644 index 0000000000..f72742c7c9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/cypress/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_slab.json b/Common/src/generated/resources/assets/byg/models/block/cypress_slab.json new file mode 100644 index 0000000000..e53421d247 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/cypress/planks", + "bottom": "byg:block/cypress/planks", + "top": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json new file mode 100644 index 0000000000..ccfb1bca70 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/cypress/planks", + "bottom": "byg:block/cypress/planks", + "top": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json new file mode 100644 index 0000000000..5b3d4ad8a6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/cypress/planks", + "bottom": "byg:block/cypress/planks", + "top": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json new file mode 100644 index 0000000000..5a18e7716b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/cypress/planks", + "bottom": "byg:block/cypress/planks", + "top": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json new file mode 100644 index 0000000000..efbb9eef66 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/cypress/planks", + "bottom": "byg:block/cypress/planks", + "top": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json new file mode 100644 index 0000000000..99ad742b3a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/cypress/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json new file mode 100644 index 0000000000..b4d6e6d122 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/cypress/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json new file mode 100644 index 0000000000..fc2ef1300c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/cypress/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_wood.json b/Common/src/generated/resources/assets/byg/models/block/cypress_wood.json new file mode 100644 index 0000000000..c1605aeb62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cypress/log", + "particle": "byg:block/cypress/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json new file mode 100644 index 0000000000..d10b207eaa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ebony/planks", + "up": "byg:block/ebony/planks", + "north": "byg:block/ebony/bookshelf", + "south": "byg:block/ebony/bookshelf", + "east": "byg:block/ebony/bookshelf", + "west": "byg:block/ebony/bookshelf", + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button.json b/Common/src/generated/resources/assets/byg/models/block/ebony_button.json new file mode 100644 index 0000000000..a0a7f3fe2a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json new file mode 100644 index 0000000000..71499cc5a7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json new file mode 100644 index 0000000000..2b672e38eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json new file mode 100644 index 0000000000..88f174d423 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ebony/planks", + "up": "byg:block/ebony/crafting_table_top", + "north": "byg:block/ebony/crafting_table_front", + "south": "byg:block/ebony/crafting_table_side", + "east": "byg:block/ebony/crafting_table_side", + "west": "byg:block/ebony/crafting_table_front", + "particle": "byg:block/ebony/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json new file mode 100644 index 0000000000..a7e3cd6e1f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json new file mode 100644 index 0000000000..8ff6c136ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json new file mode 100644 index 0000000000..e1601f0a20 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json new file mode 100644 index 0000000000..d27e1063c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence.json new file mode 100644 index 0000000000..0824af0a5d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/ebony/planks", + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json new file mode 100644 index 0000000000..5ee8e06977 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json new file mode 100644 index 0000000000..f87579476f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json new file mode 100644 index 0000000000..246f9e12bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json new file mode 100644 index 0000000000..2a2870d681 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json new file mode 100644 index 0000000000..e2a3c694b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/ebony/planks", + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json b/Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json new file mode 100644 index 0000000000..eddfe28d59 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ebony/leaves", + "up": "byg:block/ebony/leaves", + "north": "byg:block/ebony/leaves", + "south": "byg:block/ebony/leaves", + "east": "byg:block/ebony/leaves", + "west": "byg:block/ebony/leaves", + "particle": "byg:block/ebony/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json new file mode 100644 index 0000000000..49d9603b86 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ebony/leaves_snowy", + "up": "byg:block/ebony/leaves_snowy", + "north": "byg:block/ebony/leaves_snowy_side", + "south": "byg:block/ebony/leaves_snowy_side", + "east": "byg:block/ebony/leaves_snowy_side", + "west": "byg:block/ebony/leaves_snowy_side", + "particle": "byg:block/ebony/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_planks.json b/Common/src/generated/resources/assets/byg/models/block/ebony_planks.json new file mode 100644 index 0000000000..6d5fd1bc6e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ebony/planks", + "up": "byg:block/ebony/planks", + "north": "byg:block/ebony/planks", + "south": "byg:block/ebony/planks", + "east": "byg:block/ebony/planks", + "west": "byg:block/ebony/planks", + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json new file mode 100644 index 0000000000..a71b5f9dd8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json new file mode 100644 index 0000000000..3a1affbfb3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json b/Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json new file mode 100644 index 0000000000..298c72abaa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/ebony/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_slab.json b/Common/src/generated/resources/assets/byg/models/block/ebony_slab.json new file mode 100644 index 0000000000..4bb75aa974 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/ebony/planks", + "bottom": "byg:block/ebony/planks", + "top": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json new file mode 100644 index 0000000000..b222515c56 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/ebony/planks", + "bottom": "byg:block/ebony/planks", + "top": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json new file mode 100644 index 0000000000..ecd78f6421 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/ebony/planks", + "bottom": "byg:block/ebony/planks", + "top": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json new file mode 100644 index 0000000000..27c771fd7c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/ebony/planks", + "bottom": "byg:block/ebony/planks", + "top": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json new file mode 100644 index 0000000000..0c91049299 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/ebony/planks", + "bottom": "byg:block/ebony/planks", + "top": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json new file mode 100644 index 0000000000..cdfb1ab771 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/ebony/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json new file mode 100644 index 0000000000..a67a91ff17 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/ebony/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json new file mode 100644 index 0000000000..9c214bdb96 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/ebony/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_wood.json b/Common/src/generated/resources/assets/byg/models/block/ebony_wood.json new file mode 100644 index 0000000000..1fb07b252d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/ebony/log", + "particle": "byg:block/ebony/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_boat.json b/Common/src/generated/resources/assets/byg/models/item/aspen_boat.json new file mode 100644 index 0000000000..baeadfd721 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/aspen/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json new file mode 100644 index 0000000000..a44037b70f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_button.json b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json new file mode 100644 index 0000000000..47afd17739 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json new file mode 100644 index 0000000000..06bd88df64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_door.json b/Common/src/generated/resources/assets/byg/models/item/aspen_door.json new file mode 100644 index 0000000000..dca426cffe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/aspen/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json new file mode 100644 index 0000000000..b0cb669387 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json new file mode 100644 index 0000000000..c86344de9c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json new file mode 100644 index 0000000000..0bb97ce95a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json new file mode 100644 index 0000000000..aa89f31f8d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json b/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json new file mode 100644 index 0000000000..02f92a5456 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/aspen/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json new file mode 100644 index 0000000000..8b7182bfa0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json new file mode 100644 index 0000000000..3340137aac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json new file mode 100644 index 0000000000..093957b38d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json new file mode 100644 index 0000000000..49c30feaf3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_boat.json b/Common/src/generated/resources/assets/byg/models/item/baobab_boat.json new file mode 100644 index 0000000000..94c44ed73f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/baobab/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json new file mode 100644 index 0000000000..e5dc797793 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_button.json b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json new file mode 100644 index 0000000000..e6600bed75 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json new file mode 100644 index 0000000000..b0e1e75ab5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_door.json b/Common/src/generated/resources/assets/byg/models/item/baobab_door.json new file mode 100644 index 0000000000..b5bed11dac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/baobab/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json new file mode 100644 index 0000000000..81cbf0ae5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json new file mode 100644 index 0000000000..53a85c0e4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json new file mode 100644 index 0000000000..b9f4929698 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json new file mode 100644 index 0000000000..1074450766 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json b/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json new file mode 100644 index 0000000000..b53537a4ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/baobab/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json new file mode 100644 index 0000000000..a6c90b282a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json new file mode 100644 index 0000000000..3668d10f6e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json new file mode 100644 index 0000000000..1dd28bacf5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json new file mode 100644 index 0000000000..71871215d4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_boat.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_boat.json new file mode 100644 index 0000000000..bfeead4c79 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/blue_enchanted/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json new file mode 100644 index 0000000000..1c34108283 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json new file mode 100644 index 0000000000..78fa1b466e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json new file mode 100644 index 0000000000..70993fcc61 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_door.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_door.json new file mode 100644 index 0000000000..753857f6c5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/blue_enchanted/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json new file mode 100644 index 0000000000..741eddf4e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json new file mode 100644 index 0000000000..53ca92f2b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json new file mode 100644 index 0000000000..e6a00cd53d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json new file mode 100644 index 0000000000..ef496dc434 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json new file mode 100644 index 0000000000..10cf000a38 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/blue_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json new file mode 100644 index 0000000000..777fb31095 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json new file mode 100644 index 0000000000..d3eeea0e8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json new file mode 100644 index 0000000000..4ad91e2f41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json new file mode 100644 index 0000000000..835b9253a9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json new file mode 100644 index 0000000000..6ca4b3dbb0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json new file mode 100644 index 0000000000..9bd7507e2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json new file mode 100644 index 0000000000..5668f6273f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_door.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_door.json new file mode 100644 index 0000000000..aaab389c79 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/bulbis/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json new file mode 100644 index 0000000000..d917cb1e4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json new file mode 100644 index 0000000000..899357c847 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/bulbis/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json new file mode 100644 index 0000000000..6923f9a4c5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json new file mode 100644 index 0000000000..5847ceab2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json new file mode 100644 index 0000000000..e7a6078ea8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json new file mode 100644 index 0000000000..02a197036e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json new file mode 100644 index 0000000000..0d66f9999d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json new file mode 100644 index 0000000000..cd6f7f3de6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_boat.json b/Common/src/generated/resources/assets/byg/models/item/cherry_boat.json new file mode 100644 index 0000000000..39f7415e7e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cherry/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json new file mode 100644 index 0000000000..148ee63907 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_button.json b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json new file mode 100644 index 0000000000..0f57d126a8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json new file mode 100644 index 0000000000..15e2399b0a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_door.json b/Common/src/generated/resources/assets/byg/models/item/cherry_door.json new file mode 100644 index 0000000000..bf81cf2844 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cherry/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json new file mode 100644 index 0000000000..5999d229d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json new file mode 100644 index 0000000000..ef3cddb26d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json new file mode 100644 index 0000000000..65714fd84b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json new file mode 100644 index 0000000000..d8223a4443 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cherry/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json new file mode 100644 index 0000000000..01892637f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json new file mode 100644 index 0000000000..fedb245d55 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json new file mode 100644 index 0000000000..d4440c4f26 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json new file mode 100644 index 0000000000..468e4c7818 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_boat.json b/Common/src/generated/resources/assets/byg/models/item/cika_boat.json new file mode 100644 index 0000000000..4420e32d8f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cika/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json new file mode 100644 index 0000000000..a8294d736c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_button.json b/Common/src/generated/resources/assets/byg/models/item/cika_button.json new file mode 100644 index 0000000000..c0dd2e6490 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json new file mode 100644 index 0000000000..5b257cc8e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_door.json b/Common/src/generated/resources/assets/byg/models/item/cika_door.json new file mode 100644 index 0000000000..836a90c8d0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cika/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json new file mode 100644 index 0000000000..7c42c0220f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json new file mode 100644 index 0000000000..8400734999 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_planks.json b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json new file mode 100644 index 0000000000..31625158af --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json new file mode 100644 index 0000000000..98dca2fa61 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json new file mode 100644 index 0000000000..14e750f65e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cika/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_slab.json b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json new file mode 100644 index 0000000000..b01acfad04 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json new file mode 100644 index 0000000000..b2bd0efa93 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json new file mode 100644 index 0000000000..91a4a4dd31 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_wood.json b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json new file mode 100644 index 0000000000..79a917c124 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_boat.json b/Common/src/generated/resources/assets/byg/models/item/cypress_boat.json new file mode 100644 index 0000000000..27b215112c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cypress/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json new file mode 100644 index 0000000000..e2b9f6de31 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_button.json b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json new file mode 100644 index 0000000000..0842eb36d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json new file mode 100644 index 0000000000..1767bdbc15 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_door.json b/Common/src/generated/resources/assets/byg/models/item/cypress_door.json new file mode 100644 index 0000000000..42aca07260 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cypress/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json new file mode 100644 index 0000000000..b8e366df9c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json new file mode 100644 index 0000000000..189826efd7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json new file mode 100644 index 0000000000..d616e7aaf9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json new file mode 100644 index 0000000000..273a0d6c32 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json new file mode 100644 index 0000000000..45f5f74565 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cypress/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json new file mode 100644 index 0000000000..8a8ce21936 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json new file mode 100644 index 0000000000..376cbd366d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json new file mode 100644 index 0000000000..156e555114 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json new file mode 100644 index 0000000000..9f2f001848 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_boat.json b/Common/src/generated/resources/assets/byg/models/item/ebony_boat.json new file mode 100644 index 0000000000..7c1a126764 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ebony/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json new file mode 100644 index 0000000000..32f9ad5140 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_button.json b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json new file mode 100644 index 0000000000..2bc22156db --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json new file mode 100644 index 0000000000..960c2e2187 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_door.json b/Common/src/generated/resources/assets/byg/models/item/ebony_door.json new file mode 100644 index 0000000000..519357b6b9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ebony/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json new file mode 100644 index 0000000000..dcfe17cabd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json new file mode 100644 index 0000000000..506c26a03f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json new file mode 100644 index 0000000000..95878c0a81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json new file mode 100644 index 0000000000..bccdeb7e60 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json b/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json new file mode 100644 index 0000000000..f5334386d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ebony/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json new file mode 100644 index 0000000000..fb51e32c20 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json new file mode 100644 index 0000000000..cbcd35c94b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json new file mode 100644 index 0000000000..08a25c0329 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json new file mode 100644 index 0000000000..8d3ad1fa0f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/apen_crafting_tables_side.png b/Common/src/main/resources/assets/byg/textures/block/apen_crafting_tables_side.png deleted file mode 100644 index dd6f35e4701a939f084fdf74e6b6cfefb4c87ff0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 683 zcmV;c0#yBpP)Px%Wl2OqR5*=olTk=hQ5eU6cP!?WwkF;#b)golfzm@GDltJYOo$Tk!6brw$Oqr8 z>`AB>5gPaw_*4%)lwbu#5K1vM5HrqeMN!37{o3TiP& zA(dcmZkdU}c9!yGr+Fz~W@@C5LMnlv=?I!mCK&^;05(LH6waSHMj#YsYNU^3X@_KK zhl#;<%xx6_wU`4S5DEj}2AEy2XkO6+fDuu@qsS3%6|bU zq!IvZR(Fvl#iC0JFmC}e$rxgj%w~1>z*_GQK;+qLc7j1RpYKn@4e({Xf;X=+e6<^Y z-zdXzm5<-DWJ@LhFFq~f6+N^LTn6CRZx4o9*$3Rcbq#>(xf^KjBHVm5$&nu)91n(i z+Nk+`RD(ePy1UyDG@Z!%Jqd+W0$EZ>r_;1b3h{KB=2XJ*z?Qhx&_Xa6WMd_IP=Xz# z=Hgp2+bWI87-rox>isypch_sQW^3s)%nCoZbO09PDqhip5uYXwj(!I))ML%x{tJR; zT|AtFLMp-Wvn>dkPR;LQdVbLYsKp$zq#Ve&*d#k1*g#oQK+~-_??u`TR;n`FDq@pN zAQVO|=A5M2^}jO!x6384mbW&>dKNq9UeQCwDC2So%r3+*%!=hhoqm@~;2(vk6u Date: Tue, 24 May 2022 18:44:54 +0300 Subject: [PATCH 18/90] Hmm, datagen all models --- Common/src/generated/resources/.cache/cache | 16 +++++++--------- .../assets/byg/models/block/cherry_sapling.json | 6 ------ .../assets/byg/models/item/aspen_sapling.json | 2 +- .../assets/byg/models/item/baobab_sapling.json | 2 +- .../byg/models/item/blue_enchanted_sapling.json | 2 +- .../assets/byg/models/item/bulbis_oddity.json | 2 +- .../assets/byg/models/item/cherry_sapling.json | 6 ------ .../assets/byg/models/item/cika_sapling.json | 2 +- .../assets/byg/models/item/cypress_sapling.json | 2 +- .../assets/byg/models/item/ebony_sapling.json | 2 +- .../byg/common/block/BYGWoodTypes.java | 4 ++-- .../block/baobab_pressure_plate_down.json | 6 ------ .../blue_enchanted_pressure_plate_down.json | 6 ------ .../block/bulbis_pressure_plate_down.json | 6 ------ .../block/cherry_pressure_plate_down.json | 6 ------ .../models/block/cika_pressure_plate_down.json | 6 ------ .../block/cypress_pressure_plate_down.json | 6 ------ .../models/block/ebony_pressure_plate_down.json | 6 ------ .../aspen/{sapling.png => grower_item.png} | Bin .../baobab/{sapling.png => grower_item.png} | Bin .../{sapling.png => grower_item.png} | Bin .../bulbis/{oddity.png => grower_item.png} | Bin .../block/cika/{sapling.png => grower_item.png} | Bin .../cypress/{sapling.png => grower_item.png} | Bin .../ebony/{sapling.png => grower_item.png} | Bin .../datagen/providers/BYGAssetsProvider.java | 2 +- .../byg/mixin/dev/ModelBuilderMixin.java | 11 +++++++++-- 27 files changed, 26 insertions(+), 75 deletions(-) delete mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json delete mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cika_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate_down.json rename Common/src/main/resources/assets/byg/textures/block/aspen/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/baobab/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/blue_enchanted/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/bulbis/{oddity.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/cika/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/cypress/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/ebony/{sapling.png => grower_item.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index c588502cf3..2644840938 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -139,7 +139,6 @@ d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry_fence_po bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry_planks.json c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry_pressure_plate.json f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry_pressure_plate_down.json -4e6b412c1c60feb4512be023424863cd5cde9b59 assets/byg/models/block/cherry_sapling.json e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry_slab.json 1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry_slab_top.json fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry_stairs.json @@ -252,7 +251,7 @@ a67931ed3d4f51e3ebbd0113e8ab11fb558bc0d6 assets/byg/models/item/aspen_fence.json 38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json 003c7d02949ca1e996078ba778608ac111dd24a3 assets/byg/models/item/aspen_planks.json a4a903cde601f67eb459cdc5adb5d601c0a5b7c1 assets/byg/models/item/aspen_pressure_plate.json -3f00e9072f5289e65b6d39326c2e425ed4dc5567 assets/byg/models/item/aspen_sapling.json +0b5ed255f00030cb3ff1df30d8c51d7b6ea9afb6 assets/byg/models/item/aspen_sapling.json b44f9ce5f7763b6e4943b553de26557ad277a095 assets/byg/models/item/aspen_slab.json 70e9a656e937b82858cdf57ef6add2081916b748 assets/byg/models/item/aspen_stairs.json bb89fe9a00e3db29b3100a96affdde9ed207392c assets/byg/models/item/aspen_trapdoor.json @@ -267,7 +266,7 @@ cae214bd8eb999707ec8299ac478e5a98cc8b9af assets/byg/models/item/baobab_leaves.js e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json 811bc3c29eedb0f316f0270f2df050892bf1b9a8 assets/byg/models/item/baobab_planks.json 18cefa8faa0bde471bc033e0c77e33dc3eb55b69 assets/byg/models/item/baobab_pressure_plate.json -563eb366526a14858c38aed02361f5f0ca769e30 assets/byg/models/item/baobab_sapling.json +50ba87085b69541ad42bb85171ae33cce565c83c assets/byg/models/item/baobab_sapling.json bc20310e527da1548678c0a59b51fd6d0f1afadc assets/byg/models/item/baobab_slab.json 03b7abe171962daaf260fc7f680fbf82e821c7af assets/byg/models/item/baobab_stairs.json 1c07c8fd0364342f923360fac1ca207ac8a28b3d assets/byg/models/item/baobab_trapdoor.json @@ -282,7 +281,7 @@ d80889f8626eef81e43fb7f0c1e61bb6a943706a assets/byg/models/item/baobab_wood.json 57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json a265155fa64db093249c67b8fda1ac6532879c85 assets/byg/models/item/blue_enchanted_planks.json 11dd424bcd0170e575c71a550f4490cff08669a7 assets/byg/models/item/blue_enchanted_pressure_plate.json -14aab78089dccd4548dabc79ca9e6d6be27c5b7b assets/byg/models/item/blue_enchanted_sapling.json +df6e5276a0b04b4146d38546530cba58bce7fa75 assets/byg/models/item/blue_enchanted_sapling.json 6c6b7d4aaaaf41ae5544189b4d6f2f17ea503041 assets/byg/models/item/blue_enchanted_slab.json 6d133dc48556d0112a21ccd0a1cf0f91512f5ba9 assets/byg/models/item/blue_enchanted_stairs.json 507919363761d0c195b6f24703dcb31ada9ac4e8 assets/byg/models/item/blue_enchanted_trapdoor.json @@ -292,7 +291,7 @@ ac614eceb30e702ce249b3435d116266aceb378e assets/byg/models/item/blue_enchanted_w 5821586e299beeb47c3c76c60f5076de955e7a0e assets/byg/models/item/bulbis_crafting_table.json 1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json 568697f5c9accc89a632cbae00af83d6fe45dcbd assets/byg/models/item/bulbis_fence.json -3dc9cdb385d74665f9afd7e3e2e0cd2c9d70401d assets/byg/models/item/bulbis_oddity.json +661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json 6232ec108f910e2497aa4b78fa9d61c6d5bcc67a assets/byg/models/item/bulbis_planks.json e4e1bbe9650f4073ce5b24c67d05c822c376b987 assets/byg/models/item/bulbis_pressure_plate.json e85566c0cce6c3accfe4d705236b48580cfc4c05 assets/byg/models/item/bulbis_slab.json @@ -309,7 +308,6 @@ ed5732472b48092d0667c6cdfe012fe8d054d615 assets/byg/models/item/cherry_button.js 3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json 4afd993824a2270fc517773eead3639dff772b7f assets/byg/models/item/cherry_planks.json 09ef608b2d7680f4d6c1547a2d5a7003444324e3 assets/byg/models/item/cherry_pressure_plate.json -de96b84775ce0ff158d7cfb6b7798ac16198ca6c assets/byg/models/item/cherry_sapling.json 671865c0d273b1784012ee1c3ccf6289106733e8 assets/byg/models/item/cherry_slab.json 347b47476667ec9ed1230b0e951c785d3d97af59 assets/byg/models/item/cherry_stairs.json b98caf270c4062571b7ad23d5e276e2852377a2e assets/byg/models/item/cherry_trapdoor.json @@ -324,7 +322,7 @@ cbf0fcd278b651ff7468c45ef57a9de7c8358dcb assets/byg/models/item/cika_button.json 75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json 4d58890cd17246419cfeccad9dd883e8583d0c5a assets/byg/models/item/cika_planks.json a526914b982685199270b7bce46b0a91a07be34d assets/byg/models/item/cika_pressure_plate.json -c4d2311e57813d3612dc5032f9e8517161d1e1a6 assets/byg/models/item/cika_sapling.json +b1fbf364db542513285aa4a7cd55c1f4eafd96d1 assets/byg/models/item/cika_sapling.json eab4ab2b214b7c786d1684e021d4530907c2eaf4 assets/byg/models/item/cika_slab.json f45b7d3c6be311dddcc801dc95843cfec9d700aa assets/byg/models/item/cika_stairs.json b57967dd5c58dd29d9d7a86b8bab1543fcdb8953 assets/byg/models/item/cika_trapdoor.json @@ -339,7 +337,7 @@ a87bbfd107f869ea32d2faa73acb148981051696 assets/byg/models/item/cypress_leaves.j c3b7cdf031367e432cd957f075f634d8c7878e7c assets/byg/models/item/cypress_log.json ba0d97b9bc5fb7c4ad8dc2b5fc9faeefe1b343c7 assets/byg/models/item/cypress_planks.json 3fb6fbbe4c400f7721d15544866e584265c874e0 assets/byg/models/item/cypress_pressure_plate.json -0cd68739a2232eed84704875967dfdb72b2cbe61 assets/byg/models/item/cypress_sapling.json +5b9cec5debe640c2da5fd07465f5b4744a7a0695 assets/byg/models/item/cypress_sapling.json a9cd53d5bd6f3549dc341e6f01f28c98af0922a3 assets/byg/models/item/cypress_slab.json ddd4da9af60b209d807793d662bad1f784c9ab41 assets/byg/models/item/cypress_stairs.json 7489fc14b7693662b85372ccf82e40d4a2ad4534 assets/byg/models/item/cypress_trapdoor.json @@ -354,7 +352,7 @@ c2973d3a2ffb73a1e490d4fd337bf07aa4effade assets/byg/models/item/ebony_fence.json ddacb253e1661eeb7eca1130ecb83b19223cd41e assets/byg/models/item/ebony_log.json 835129b5147191b14343dd09839ab17616f507a8 assets/byg/models/item/ebony_planks.json e104745079cff1d9ee2b3d86e7087e38011876cb assets/byg/models/item/ebony_pressure_plate.json -685fb18ac8ff696b3e9a29222fc59ef24d9f563d assets/byg/models/item/ebony_sapling.json +077f9c32aabcf49216b03cb5ea184b0535b856f4 assets/byg/models/item/ebony_sapling.json b00a7837960eb11b0a5b3c9dde743d3ba3a4cd34 assets/byg/models/item/ebony_slab.json bdf7e636f64a72718f82816ef74c75ad2afe77e3 assets/byg/models/item/ebony_stairs.json be5c1e32405cb4a4b96d365ea0636838862959f5 assets/byg/models/item/ebony_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json deleted file mode 100644 index 2b5dc9fce5..0000000000 --- a/Common/src/generated/resources/assets/byg/models/block/cherry_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "byg:block/cherry/grower_item" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json b/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json index 02f92a5456..5ab07df47b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/aspen/grower_item" + "layer0": "byg:block/aspen/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json b/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json index b53537a4ab..138710c0d7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/baobab/grower_item" + "layer0": "byg:block/baobab/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json index 10cf000a38..68f2882e4e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/blue_enchanted/grower_item" + "layer0": "byg:block/blue_enchanted/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json index 899357c847..70b9914947 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_oddity.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/bulbis/grower_item" + "layer0": "byg:block/bulbis/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json deleted file mode 100644 index d8223a4443..0000000000 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/cherry/grower_item" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json index 14e750f65e..7197b86644 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/cika/grower_item" + "layer0": "byg:block/cika/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json b/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json index 45f5f74565..a7adcf1409 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/cypress/grower_item" + "layer0": "byg:block/cypress/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json b/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json index f5334386d2..1758935168 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/ebony/grower_item" + "layer0": "byg:block/ebony/grower_item" } } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index bdde33cf0b..bf819772c5 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -103,13 +103,13 @@ public enum BYGWoodTypes { public void init() { if (initialized) return; + if (!builder.excludes.contains(BlockType.SAPLING)) { this.growerItem = switch (builder.growerItemType) { case SAPLING -> BYGBlocks.createSapling(builder.growerItemGroundTag, name + "_sapling"); case ODDITY -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_oddity"); case FUNGUS -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_fungus"); }; - if (!builder.excludes.contains(BlockType.SAPLING)) { - BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); + BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); } if (!builder.excludes.contains(BlockType.LEAVES)) { this.leaves = builder.leavesLightLevel == null ? BYGBlocks.createLeaves(builder.materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(builder.materialColor, builder.leavesLightLevel, name + "_leaves"); diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate_down.json deleted file mode 100644 index e237e18602..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/baobab_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/baobab_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json deleted file mode 100644 index 5744d43655..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/blue_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate_down.json deleted file mode 100644 index 1ef0172c5d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "byg:block/bulbis_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate_down.json deleted file mode 100644 index c19e3271fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cherry_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/cherry_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate_down.json deleted file mode 100644 index 805e01a7c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cika_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/cika_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate_down.json deleted file mode 100644 index cc39a9d50c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/cypress_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/cypress_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate_down.json deleted file mode 100644 index 94444280a8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ebony_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/ebony_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/sapling.png b/Common/src/main/resources/assets/byg/textures/block/aspen/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/aspen/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/sapling.png b/Common/src/main/resources/assets/byg/textures/block/baobab/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/baobab/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/sapling.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/blue_enchanted/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/oddity.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis/oddity.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cika/sapling.png b/Common/src/main/resources/assets/byg/textures/block/cika/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cika/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/cika/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/sapling.png b/Common/src/main/resources/assets/byg/textures/block/cypress/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/cypress/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/sapling.png b/Common/src/main/resources/assets/byg/textures/block/ebony/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ebony/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/grower_item.png diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java index b485063bb4..da1bd52c74 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java @@ -129,7 +129,7 @@ protected void registerModels() { final var textureLoc = rl(typeLoc + "grower_item"); cross(type.growerItem().getId().getPath(), textureLoc); item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) - .texture("layer0", rl(typeLocItem + "grower_item")); + .texture("layer0", textureLoc); } final var pressurePlate = pressurePlate(type.pressurePlate().getId().getPath(), rl(typeLoc + "planks")); pressurePlateDown(type.pressurePlate().getId().getPath() + "_down", rl(typeLoc + "planks")); diff --git a/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelBuilderMixin.java b/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelBuilderMixin.java index 65da36dea2..86978d6576 100644 --- a/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelBuilderMixin.java +++ b/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelBuilderMixin.java @@ -14,13 +14,20 @@ @Mixin(ModelBuilder.class) public class ModelBuilderMixin { - @Shadow @Final protected ExistingFileHelper existingFileHelper; private static final Logger LOG = LogUtils.getLogger(); + private static boolean byg$foundSnowyLeaves; + @Redirect(method = "texture(Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraftforge/client/model/generators/ModelBuilder;", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/common/data/ExistingFileHelper;exists(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraftforge/common/data/ExistingFileHelper$IResourceType;)Z"), remap = false) private boolean shushTextureNotFound(ExistingFileHelper instance, ResourceLocation loc, ExistingFileHelper.IResourceType type) { + if (loc.getPath().contains("leaves_snowy")) { + if (!byg$foundSnowyLeaves) + LOG.warn("Snowy Leaves textures still seem to be missing..."); + byg$foundSnowyLeaves = true; + return true; + } if (!instance.exists(loc, ModelProviderAccess.getTexture())) { - LOG.info("Texture {} does not exist in any known resource pack", loc); + LOG.warn("Texture {} does not exist in any known resource pack", loc); } return true; } From c2c9599a1f4b1d0464eae41ef02420417d34099a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:21:05 +0300 Subject: [PATCH 19/90] Allow blockstate gen --- .../byg/blockstates/aspen_bookshelf.json | 7 - .../assets/byg/blockstates/aspen_button.json | 118 ---------- .../byg/blockstates/aspen_crafting_table.json | 7 - .../assets/byg/blockstates/aspen_door.json | 124 ----------- .../assets/byg/blockstates/aspen_fence.json | 48 ---- .../byg/blockstates/aspen_fence_gate.json | 80 ------- .../assets/byg/blockstates/aspen_leaves.json | 7 - .../assets/byg/blockstates/aspen_log.json | 16 -- .../assets/byg/blockstates/aspen_planks.json | 7 - .../byg/blockstates/aspen_pressure_plate.json | 10 - .../assets/byg/blockstates/aspen_sapling.json | 7 - .../assets/byg/blockstates/aspen_slab.json | 13 -- .../assets/byg/blockstates/aspen_stairs.json | 209 ------------------ .../byg/blockstates/aspen_trapdoor.json | 69 ------ .../assets/byg/blockstates/aspen_wood.json | 16 -- .../potionstudios/byg/datagen/BYGDataGen.java | 6 +- ...ovider.java => BYGWoodAssetsProvider.java} | 138 +++++++----- 17 files changed, 85 insertions(+), 797 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_wood.json rename Forge/src/main/java/potionstudios/byg/datagen/providers/{BYGAssetsProvider.java => BYGWoodAssetsProvider.java} (51%) diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/aspen_bookshelf.json deleted file mode 100644 index 1996fca1b6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_button.json b/Common/src/main/resources/assets/byg/blockstates/aspen_button.json deleted file mode 100644 index 5d2bc277f9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/aspen_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/aspen_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/aspen_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/aspen_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/aspen_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/aspen_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/aspen_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/aspen_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/aspen_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/aspen_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/aspen_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/aspen_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/aspen_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/aspen_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/aspen_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/aspen_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/aspen_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/aspen_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/aspen_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/aspen_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/aspen_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/aspen_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/aspen_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/aspen_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/aspen_crafting_table.json deleted file mode 100644 index e5946e0690..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_door.json b/Common/src/main/resources/assets/byg/blockstates/aspen_door.json deleted file mode 100644 index 31dd6dd680..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_fence.json b/Common/src/main/resources/assets/byg/blockstates/aspen_fence.json deleted file mode 100644 index 5ef25f2476..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/aspen_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/aspen_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/aspen_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/aspen_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/aspen_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/aspen_fence_gate.json deleted file mode 100644 index 40c26c96ad..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/aspen_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/aspen_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/aspen_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/aspen_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/aspen_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/aspen_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/aspen_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/aspen_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/aspen_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/aspen_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/aspen_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/aspen_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/aspen_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/aspen_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/aspen_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/aspen_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_leaves.json b/Common/src/main/resources/assets/byg/blockstates/aspen_leaves.json deleted file mode 100644 index d15e954682..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_log.json b/Common/src/main/resources/assets/byg/blockstates/aspen_log.json deleted file mode 100644 index 31ddaaeadf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/aspen_log" - }, - "axis=z": { - "model": "byg:block/aspen_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/aspen_log", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_planks.json b/Common/src/main/resources/assets/byg/blockstates/aspen_planks.json deleted file mode 100644 index f4ec187a2c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/aspen_pressure_plate.json deleted file mode 100644 index de8dd71456..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/aspen_pressure_plate" - }, - "powered=true": { - "model": "byg:block/aspen_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_sapling.json b/Common/src/main/resources/assets/byg/blockstates/aspen_sapling.json deleted file mode 100644 index 300588a2ff..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_slab.json b/Common/src/main/resources/assets/byg/blockstates/aspen_slab.json deleted file mode 100644 index 26d45c64c2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/aspen_slab" - }, - "type=top": { - "model": "byg:block/aspen_slab_top" - }, - "type=double": { - "model": "byg:block/aspen_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_stairs.json b/Common/src/main/resources/assets/byg/blockstates/aspen_stairs.json deleted file mode 100644 index 1478056693..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/aspen_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/aspen_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/aspen_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/aspen_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/aspen_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/aspen_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/aspen_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/aspen_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/aspen_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/aspen_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/aspen_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/aspen_trapdoor.json deleted file mode 100644 index ea806ee25c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/aspen_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/aspen_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/aspen_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/aspen_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/aspen_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/aspen_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/aspen_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/aspen_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/aspen_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/aspen_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_wood.json b/Common/src/main/resources/assets/byg/blockstates/aspen_wood.json deleted file mode 100644 index c997b37cc6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/aspen_wood" - }, - "axis=z": { - "model": "byg:block/aspen_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/aspen_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java index b5f138608c..6bc6b90759 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java @@ -4,7 +4,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; -import potionstudios.byg.datagen.providers.BYGAssetsProvider; +import potionstudios.byg.datagen.providers.BYGWoodAssetsProvider; +import potionstudios.byg.datagen.providers.BYGBlockStateProvider; import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; import potionstudios.byg.datagen.providers.BYGItemTagsProvider; import potionstudios.byg.datagen.providers.BYGRecipeProviders; @@ -24,7 +25,8 @@ static void onDatagen(final GatherDataEvent event) { gen.addProvider(new BYGRecipeProviders(gen)); } if (event.includeClient()) { - gen.addProvider(new BYGAssetsProvider(gen, existingFileHelper)); + gen.addProvider(new BYGWoodAssetsProvider(gen, existingFileHelper)); + gen.addProvider(new BYGBlockStateProvider(gen, existingFileHelper)); } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java similarity index 51% rename from Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java rename to Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index da1bd52c74..dd87940f0c 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -3,7 +3,16 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraft.world.level.block.ButtonBlock; +import net.minecraft.world.level.block.CrossCollisionBlock; +import net.minecraft.world.level.block.DoorBlock; +import net.minecraft.world.level.block.FenceGateBlock; +import net.minecraft.world.level.block.PressurePlateBlock; +import net.minecraft.world.level.block.RotatedPillarBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.TrapDoorBlock; +import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ModelBuilder; @@ -13,29 +22,30 @@ import java.io.IOException; -public class BYGAssetsProvider extends BlockModelProvider { +public class BYGWoodAssetsProvider extends BlockStateProvider { private final ItemProvider item; - public BYGAssetsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + public BYGWoodAssetsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { super(generator, BYG.MOD_ID, existingFileHelper); this.item = new ItemProvider(generator, existingFileHelper); } @Override - protected void registerModels() { + protected void registerStatesAndModels() { final var generatedParent = mcLoc("item/generated"); for (final var type : BYGWoodTypes.values()) { final var typeLoc = "block/" + type + "/"; final var typeLocItem = "item/" + type + "/"; - final var log = cubeColumn(type.log().getId().getPath(), BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); + final var log = models().cubeColumn(type + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); + axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); if (type.boat() != null) item.withExistingParent(type.boat().getId().getPath(), generatedParent) .texture("layer0", rl(typeLocItem + "boat")); - final var bookshelf = cube( - type.bookshelf().getId().getPath(), + final var bookshelf = models().cube( + type + "/bookshelf", rl(typeLoc + "planks"), rl(typeLoc + "planks"), rl(typeLoc + "bookshelf"), @@ -44,14 +54,16 @@ protected void registerModels() { rl(typeLoc + "bookshelf") ).texture("particle", typeLoc + "planks"); configureTransform(item.withExistingParent(type.bookshelf().getId().getPath(), bookshelf.getLocation())); + simpleBlock(type.bookshelf().get(), bookshelf); - final var button = buttonInventory(type.button().getId().getPath() + "_inventory", rl(typeLoc + "planks")); - button(type.button().getId().getPath(), rl(typeLoc + "planks")); - buttonPressed(type.button().getId().getPath() + "_pressed", rl(typeLoc + "planks")); + final var button = models().buttonInventory(type + "/button_inventory", rl(typeLoc + "planks")); + models().button(type + "/button", rl(typeLoc + "planks")); + final var buttonPressed = models().buttonPressed(type + "/button_pressed", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.button().getId().getPath(), button.getLocation())); + buttonBlock((ButtonBlock) type.button().get(), button, buttonPressed); - final var craftingTable = cube( - type.craftingTable().getId().getPath(), + final var craftingTable = models().cube( + type + "/crafting_table", rl(typeLoc + "planks"), rl(typeLoc + "crafting_table_top"), rl(typeLoc + "crafting_table_front"), @@ -60,54 +72,58 @@ protected void registerModels() { rl(typeLoc + "crafting_table_front") ).texture("particle", typeLoc + "crafting_table_front"); configureTransform(item.withExistingParent(type.craftingTable().getId().getPath(), craftingTable.getLocation())); + simpleBlock(type.craftingTable().get(), craftingTable); - doorBottomLeft( - type.door().getId().getPath() + "_bottom", + final var doorBottomLeft = models().doorBottomLeft( + type + "/door_bottom", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); - doorBottomRight( - type.door().getId().getPath() + "_bottom_hinge", + final var doorBottomRight = models().doorBottomRight( + type + "/door_bottom_hinge", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); - doorTopLeft( - type.door().getId().getPath() + "_top", + final var doorTopLeft = models().doorTopLeft( + type + "/door_top", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); - doorTopRight( - type.door().getId().getPath() + "_top_hinge", + final var doorTopRight = models().doorTopRight( + type + "/door_top_hinge", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); + doorBlock((DoorBlock) type.door().get(), doorBottomLeft, doorBottomRight, doorTopLeft, doorBottomRight); item.withExistingParent(type.door().getId().getPath(), generatedParent) .texture("layer0", rl(typeLocItem + "door")); - fenceSide(type.fence().getId().getPath(), rl(typeLoc + "planks")) + final var fencePost = models().fencePost(type + "/fence_post", rl(typeLoc + "planks")) + .texture("particle", rl(typeLoc + "planks")); + final var fenceSide = models().fenceSide(type + "/fence", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); - final var fenceInv = fenceInventory(type.fence().getId().getPath(), rl(typeLoc + "planks")) + final var fenceInv = models().fenceInventory(type + "/fence_inv", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceInv.getLocation())); + fourWayBlock((CrossCollisionBlock) type.fence().get(), fencePost, fenceSide); - final var fenceGate = fenceGate(type.fenceGate().getId().getPath(), rl(typeLoc + "planks")); - fenceGateOpen(type.fenceGate().getId().getPath() + "_open", rl(typeLoc + "planks")); - fenceGateWall(type.fenceGate().getId().getPath() + "_wall", rl(typeLoc + "planks")); - fenceGateWallOpen(type.fenceGate().getId().getPath() + "_wall_open", rl(typeLoc + "planks")); - fencePost(type + "_fence_post", rl(typeLoc + "planks")) - .texture("particle", rl(typeLoc + "planks")); + final var fenceGate = models().fenceGate(type + "/fence_gate", rl(typeLoc + "planks")); + final var fenceGateOpen = models().fenceGateOpen(type + "/fence_gate_open", rl(typeLoc + "planks")); + final var fenceGateWall = models().fenceGateWall(type + "/fence_gate_wall", rl(typeLoc + "planks")); + final var fenceGateWallOpen = models().fenceGateWallOpen(type + "/fence_gate_wall_open", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceGate.getLocation())); + fenceGateBlock((FenceGateBlock) type.fenceGate().get(), fenceGate, fenceGateOpen, fenceGateWall, fenceGateWallOpen); if (type.leaves() != null) { final var leavesLoc = rl(typeLoc + "leaves"); - final var leaves = cube( - type.leaves().getId().getPath(), + final var leaves = models().cube( + type + "/leaves", leavesLoc, leavesLoc, leavesLoc, leavesLoc, leavesLoc, leavesLoc ).texture("particle", leavesLoc); configureTransform(item.withExistingParent(type.leaves().getId().getPath(), leaves.getLocation())); - cube( - type.leaves().getId().getPath() + "_snowy", + models().cube( + type + "/leaves_snowy", rl(typeLoc + "leaves_snowy"), rl(typeLoc + "leaves_snowy"), rl(typeLoc + "leaves_snowy_side"), @@ -115,52 +131,60 @@ protected void registerModels() { rl(typeLoc + "leaves_snowy_side"), rl(typeLoc + "leaves_snowy_side") ).texture("particle", rl(typeLoc + "leaves_snowy_side")); + simpleBlock(type.leaves().get(), leaves); // TODO leaves should be snowy as well } final var planksLoc = rl(typeLoc + "planks"); - final var planks = cube(type.planks().getId().getPath(), planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) + final var planks = models().cube(type + "/planks", planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) .texture("particle", planksLoc); configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); + simpleBlock(type.planks().get(), planks); - final var wood = cubeAll(type.wood().getId().getPath(), rl(typeLoc + "log")) + final var wood = models().cubeAll(typeLoc + "/wood", rl(typeLoc + "log")) .texture("particle", rl(typeLoc + "log")); configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); + axisBlock((RotatedPillarBlock) type.wood().get(), wood, wood); if (type.growerItem() != null) { final var textureLoc = rl(typeLoc + "grower_item"); - cross(type.growerItem().getId().getPath(), textureLoc); + final var growerItem = models().cross(type + "/grower_item", textureLoc); item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) .texture("layer0", textureLoc); + simpleBlock(type.growerItem().get(), growerItem); } - final var pressurePlate = pressurePlate(type.pressurePlate().getId().getPath(), rl(typeLoc + "planks")); - pressurePlateDown(type.pressurePlate().getId().getPath() + "_down", rl(typeLoc + "planks")); + final var pressurePlate = models().pressurePlate(type + "/pressure_plate", rl(typeLoc + "planks")); + final var pressurePlateDown = models().pressurePlateDown(type + "/pressure_plate_down", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.pressurePlate().getId().getPath(), pressurePlate.getLocation())); + pressurePlateBlock((PressurePlateBlock) type.pressurePlate().get(), pressurePlate, pressurePlateDown); - final var slab = slab(type.slab().getId().getPath(), planksLoc, planksLoc, planksLoc); - slabTop(type.slab().getId().getPath() + "_top", planksLoc, planksLoc, planksLoc); + final var slab = models().slab(type + "/slab", planksLoc, planksLoc, planksLoc); + final var slabTop = models().slabTop(type + "/slab_top", planksLoc, planksLoc, planksLoc); configureTransform(item.withExistingParent(type.slab().getId().getPath(), slab.getLocation())); + slabBlock((SlabBlock) type.slab().get(), slab, slabTop, planks); - final var stairs = stairs(type.stairs().getId().getPath(), planksLoc, planksLoc, planksLoc); - stairsInner(type.stairs().getId().getPath() + "_inner", planksLoc, planksLoc, planksLoc); - stairsOuter(type.stairs().getId().getPath() + "_outer", planksLoc, planksLoc, planksLoc); + final var stairs = models().stairs(type + "/stairs", planksLoc, planksLoc, planksLoc); + final var stairsInner = models().stairsInner(type + "/stairs_inner", planksLoc, planksLoc, planksLoc); + final var stairsOuter = models().stairsOuter(type + "/stairs_outer", planksLoc, planksLoc, planksLoc); configureTransform(item.withExistingParent(type.stairs().getId().getPath(), stairs.getLocation())); + stairsBlock((StairBlock) type.stairs().get(), stairs, stairsInner, stairsOuter); - final var trapdoorName = type.trapdoor().getId().getPath(); + final var trapdoorName = type + "/trapdoor"; final var trapdoorLoc = rl(typeLoc + "trapdoor"); - final var trapdoor = trapdoorOrientableBottom(trapdoorName + "_bottom", trapdoorLoc); - trapdoorOrientableTop(trapdoorName + "_top", trapdoorLoc); - trapdoorOrientableOpen(trapdoorName + "_open", trapdoorLoc); + final var trapdoor = models().trapdoorOrientableBottom(trapdoorName + "_bottom", trapdoorLoc); + final var trapdoorTop = models().trapdoorOrientableTop(trapdoorName + "_top", trapdoorLoc); + final var trapdoorOpen = models().trapdoorOrientableOpen(trapdoorName + "_open", trapdoorLoc); configureTransform(item.withExistingParent(trapdoorName, trapdoor.getLocation())); - - if (type.sign() != null) { - final var logLocation = rl(typeLoc + "log"); - final var wallInv = wallInventory(type + "_wall_inventory", logLocation) - .texture("particle", logLocation); - item.withExistingParent(type.wallSign().getId().getPath(), wallInv.getLocation()); - wallSide(type + "_wall", logLocation) - .texture("particle", logLocation); - wallPost(type + "_wall_post", logLocation) - .texture("particle", logLocation); - } + trapdoorBlock((TrapDoorBlock) type.trapdoor().get(), trapdoor, trapdoorTop, trapdoorOpen, true); + +// No wood walls for now +// final var logLocation = rl(typeLoc + "log"); +// final var wallInv = models().wallInventory(type + "/wall_inventory", logLocation) +// .texture("particle", logLocation); +// item.withExistingParent(type.wall().getId().getPath(), wallInv.getLocation()); +// final var wall = models().wallSide(type + "/wall", logLocation) +// .texture("particle", logLocation); +// final var wallPost = models().wallPost(type + "/wall_post", logLocation) +// .texture("particle", logLocation); +// wallBlock(type.wall().get(), wallPost, wall, wall); } } From fcc36d28901cc29b54b4120d72022728c5c93e89 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:24:59 +0300 Subject: [PATCH 20/90] Remove generatable block states --- .../assets/byg/blockstates/aspen_wall.json | 51 ----- .../byg/blockstates/baobab_bookshelf.json | 7 - .../assets/byg/blockstates/baobab_button.json | 118 ---------- .../blockstates/baobab_crafting_table.json | 7 - .../assets/byg/blockstates/baobab_door.json | 124 ----------- .../assets/byg/blockstates/baobab_fence.json | 48 ---- .../byg/blockstates/baobab_fence_gate.json | 80 ------- .../assets/byg/blockstates/baobab_leaves.json | 7 - .../assets/byg/blockstates/baobab_log.json | 16 -- .../assets/byg/blockstates/baobab_planks.json | 7 - .../blockstates/baobab_pressure_plate.json | 10 - .../byg/blockstates/baobab_sapling.json | 7 - .../assets/byg/blockstates/baobab_slab.json | 13 -- .../assets/byg/blockstates/baobab_stairs.json | 209 ------------------ .../byg/blockstates/baobab_trapdoor.json | 69 ------ .../assets/byg/blockstates/baobab_wall.json | 51 ----- .../assets/byg/blockstates/baobab_wood.json | 16 -- .../blockstates/blue_enchanted_bookshelf.json | 7 - .../blockstates/blue_enchanted_button.json | 118 ---------- .../blue_enchanted_crafting_table.json | 7 - .../byg/blockstates/blue_enchanted_door.json | 124 ----------- .../byg/blockstates/blue_enchanted_fence.json | 48 ---- .../blue_enchanted_fence_gate.json | 80 ------- .../blockstates/blue_enchanted_leaves.json | 8 - .../byg/blockstates/blue_enchanted_log.json | 17 -- .../blockstates/blue_enchanted_planks.json | 7 - .../blue_enchanted_pressure_plate.json | 10 - .../blockstates/blue_enchanted_sapling.json | 7 - .../byg/blockstates/blue_enchanted_slab.json | 13 -- .../blockstates/blue_enchanted_stairs.json | 209 ------------------ .../blockstates/blue_enchanted_trapdoor.json | 69 ------ .../byg/blockstates/blue_enchanted_wall.json | 51 ----- .../byg/blockstates/blue_enchanted_wood.json | 16 -- .../byg/blockstates/bulbis_bookshelf.json | 7 - .../assets/byg/blockstates/bulbis_button.json | 118 ---------- .../blockstates/bulbis_crafting_table.json | 7 - .../assets/byg/blockstates/bulbis_door.json | 124 ----------- .../assets/byg/blockstates/bulbis_fence.json | 48 ---- .../byg/blockstates/bulbis_fence_gate.json | 80 ------- .../assets/byg/blockstates/bulbis_oddity.json | 7 - .../assets/byg/blockstates/bulbis_planks.json | 7 - .../blockstates/bulbis_pressure_plate.json | 10 - .../assets/byg/blockstates/bulbis_slab.json | 13 -- .../assets/byg/blockstates/bulbis_stairs.json | 209 ------------------ .../byg/blockstates/bulbis_trapdoor.json | 68 ------ .../assets/byg/blockstates/bulbis_wood.json | 16 -- .../byg/blockstates/cherry_bookshelf.json | 7 - .../assets/byg/blockstates/cherry_button.json | 118 ---------- .../blockstates/cherry_crafting_table.json | 7 - .../assets/byg/blockstates/cherry_door.json | 124 ----------- .../assets/byg/blockstates/cherry_fence.json | 48 ---- .../byg/blockstates/cherry_fence_gate.json | 80 ------- .../assets/byg/blockstates/cherry_log.json | 17 -- .../assets/byg/blockstates/cherry_planks.json | 7 - .../blockstates/cherry_pressure_plate.json | 10 - .../assets/byg/blockstates/cherry_slab.json | 13 -- .../assets/byg/blockstates/cherry_stairs.json | 209 ------------------ .../byg/blockstates/cherry_trapdoor.json | 69 ------ .../assets/byg/blockstates/cherry_wall.json | 51 ----- .../assets/byg/blockstates/cherry_wood.json | 16 -- .../byg/blockstates/cika_bookshelf.json | 7 - .../assets/byg/blockstates/cika_button.json | 118 ---------- .../byg/blockstates/cika_crafting_table.json | 7 - .../assets/byg/blockstates/cika_door.json | 124 ----------- .../assets/byg/blockstates/cika_fence.json | 48 ---- .../byg/blockstates/cika_fence_gate.json | 80 ------- .../assets/byg/blockstates/cika_leaves.json | 7 - .../assets/byg/blockstates/cika_log.json | 17 -- .../assets/byg/blockstates/cika_planks.json | 7 - .../byg/blockstates/cika_pressure_plate.json | 10 - .../assets/byg/blockstates/cika_sapling.json | 7 - .../assets/byg/blockstates/cika_slab.json | 13 -- .../assets/byg/blockstates/cika_stairs.json | 209 ------------------ .../assets/byg/blockstates/cika_trapdoor.json | 69 ------ .../assets/byg/blockstates/cika_wall.json | 51 ----- .../assets/byg/blockstates/cika_wood.json | 16 -- .../byg/blockstates/cypress_bookshelf.json | 7 - .../byg/blockstates/cypress_button.json | 118 ---------- .../blockstates/cypress_crafting_table.json | 7 - .../assets/byg/blockstates/cypress_door.json | 124 ----------- .../assets/byg/blockstates/cypress_fence.json | 48 ---- .../byg/blockstates/cypress_fence_gate.json | 80 ------- .../byg/blockstates/cypress_leaves.json | 7 - .../assets/byg/blockstates/cypress_log.json | 17 -- .../byg/blockstates/cypress_planks.json | 7 - .../blockstates/cypress_pressure_plate.json | 10 - .../byg/blockstates/cypress_sapling.json | 7 - .../assets/byg/blockstates/cypress_slab.json | 13 -- .../byg/blockstates/cypress_stairs.json | 209 ------------------ .../byg/blockstates/cypress_trapdoor.json | 69 ------ .../assets/byg/blockstates/cypress_wall.json | 51 ----- .../assets/byg/blockstates/cypress_wood.json | 16 -- .../byg/blockstates/ebony_bookshelf.json | 7 - .../assets/byg/blockstates/ebony_button.json | 118 ---------- .../byg/blockstates/ebony_crafting_table.json | 7 - .../assets/byg/blockstates/ebony_door.json | 124 ----------- .../assets/byg/blockstates/ebony_fence.json | 48 ---- .../byg/blockstates/ebony_fence_gate.json | 80 ------- .../assets/byg/blockstates/ebony_leaves.json | 7 - .../assets/byg/blockstates/ebony_log.json | 17 -- .../assets/byg/blockstates/ebony_planks.json | 7 - .../byg/blockstates/ebony_pressure_plate.json | 10 - .../assets/byg/blockstates/ebony_sapling.json | 7 - .../assets/byg/blockstates/ebony_slab.json | 13 -- .../assets/byg/blockstates/ebony_stairs.json | 209 ------------------ .../byg/blockstates/ebony_trapdoor.json | 69 ------ .../assets/byg/blockstates/ebony_wall.json | 51 ----- .../assets/byg/blockstates/ebony_wood.json | 16 -- 108 files changed, 5491 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_oddity.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_wood.json diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_wall.json b/Common/src/main/resources/assets/byg/blockstates/aspen_wall.json deleted file mode 100644 index 18ec3f4ad6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/aspen_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/aspen_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/aspen_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/aspen_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/aspen_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/baobab_bookshelf.json deleted file mode 100644 index b0e3cf1c36..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_button.json b/Common/src/main/resources/assets/byg/blockstates/baobab_button.json deleted file mode 100644 index 45e75c8cd4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/baobab_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/baobab_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/baobab_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/baobab_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/baobab_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/baobab_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/baobab_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/baobab_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/baobab_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/baobab_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/baobab_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/baobab_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/baobab_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/baobab_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/baobab_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/baobab_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/baobab_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/baobab_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/baobab_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/baobab_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/baobab_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/baobab_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/baobab_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/baobab_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/baobab_crafting_table.json deleted file mode 100644 index ac51afc045..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_door.json b/Common/src/main/resources/assets/byg/blockstates/baobab_door.json deleted file mode 100644 index ab8e40dac1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_fence.json b/Common/src/main/resources/assets/byg/blockstates/baobab_fence.json deleted file mode 100644 index 44729aa6f0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/baobab_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/baobab_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/baobab_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/baobab_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/baobab_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/baobab_fence_gate.json deleted file mode 100644 index e407f0d5a6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/baobab_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/baobab_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/baobab_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/baobab_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/baobab_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/baobab_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/baobab_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/baobab_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/baobab_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/baobab_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/baobab_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/baobab_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/baobab_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/baobab_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/baobab_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/baobab_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_leaves.json b/Common/src/main/resources/assets/byg/blockstates/baobab_leaves.json deleted file mode 100644 index e2ed15ccb7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_log.json b/Common/src/main/resources/assets/byg/blockstates/baobab_log.json deleted file mode 100644 index 61ba3dfc6b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/baobab_log" - }, - "axis=z": { - "model": "byg:block/baobab_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/baobab_log", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_planks.json b/Common/src/main/resources/assets/byg/blockstates/baobab_planks.json deleted file mode 100644 index 897732d16f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/baobab_pressure_plate.json deleted file mode 100644 index fde2d4860e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/baobab_pressure_plate" - }, - "powered=true": { - "model": "byg:block/baobab_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_sapling.json b/Common/src/main/resources/assets/byg/blockstates/baobab_sapling.json deleted file mode 100644 index 82c974fadb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_slab.json b/Common/src/main/resources/assets/byg/blockstates/baobab_slab.json deleted file mode 100644 index 45b3037fda..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/baobab_slab" - }, - "type=top": { - "model": "byg:block/baobab_slab_top" - }, - "type=double": { - "model": "byg:block/baobab_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_stairs.json b/Common/src/main/resources/assets/byg/blockstates/baobab_stairs.json deleted file mode 100644 index 2c5eb527bf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/baobab_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/baobab_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/baobab_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/baobab_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/baobab_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/baobab_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/baobab_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/baobab_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/baobab_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/baobab_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/baobab_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/baobab_trapdoor.json deleted file mode 100644 index cdc9e48371..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/baobab_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/baobab_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/baobab_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/baobab_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/baobab_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/baobab_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/baobab_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/baobab_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/baobab_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/baobab_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_wall.json b/Common/src/main/resources/assets/byg/blockstates/baobab_wall.json deleted file mode 100644 index fe63c29441..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/baobab_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/baobab_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/baobab_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/baobab_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/baobab_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_wood.json b/Common/src/main/resources/assets/byg/blockstates/baobab_wood.json deleted file mode 100644 index 964713adcf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/baobab_wood" - }, - "axis=z": { - "model": "byg:block/baobab_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/baobab_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json deleted file mode 100644 index 2b202ae3ac..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_button.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_button.json deleted file mode 100644 index 8b18236823..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/blue_enchanted_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/blue_enchanted_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/blue_enchanted_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/blue_enchanted_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/blue_enchanted_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/blue_enchanted_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/blue_enchanted_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/blue_enchanted_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/blue_enchanted_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/blue_enchanted_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/blue_enchanted_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/blue_enchanted_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/blue_enchanted_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json deleted file mode 100644 index 20101e73b7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_door.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_door.json deleted file mode 100644 index 5cd18e1307..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence.json deleted file mode 100644 index 231342723c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/blue_enchanted_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json deleted file mode 100644 index 24b64238b2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_leaves.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_leaves.json deleted file mode 100644 index e1c86af95f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_leaves" - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_log.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_log.json deleted file mode 100644 index fc7a49a364..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/blue_enchanted_log" - }, - "axis=z": { - "model": "byg:block/blue_enchanted_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/blue_enchanted_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_planks.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_planks.json deleted file mode 100644 index c37dc393c9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json deleted file mode 100644 index 5e32c6d9bb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/blue_enchanted_pressure_plate" - }, - "powered=true": { - "model": "byg:block/blue_enchanted_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sapling.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sapling.json deleted file mode 100644 index 55c65d694d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_slab.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_slab.json deleted file mode 100644 index e8537117f8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/blue_enchanted_slab" - }, - "type=top": { - "model": "byg:block/blue_enchanted_slab_top" - }, - "type=double": { - "model": "byg:block/blue_enchanted_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_stairs.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_stairs.json deleted file mode 100644 index 669c3fbc5c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/blue_enchanted_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json deleted file mode 100644 index 0be3044739..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/blue_enchanted_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/blue_enchanted_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall.json deleted file mode 100644 index 1ef5274b1f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/blue_enchanted_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wood.json deleted file mode 100644 index f4fe810ac3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/blue_enchanted_wood" - }, - "axis=z": { - "model": "byg:block/blue_enchanted_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/blue_enchanted_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_bookshelf.json deleted file mode 100644 index 0da78ece87..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_button.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_button.json deleted file mode 100644 index 35fe9d0cf9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/bulbis_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/bulbis_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/bulbis_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/bulbis_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/bulbis_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/bulbis_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/bulbis_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/bulbis_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/bulbis_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/bulbis_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/bulbis_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/bulbis_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/bulbis_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/bulbis_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/bulbis_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/bulbis_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/bulbis_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/bulbis_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/bulbis_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/bulbis_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/bulbis_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/bulbis_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/bulbis_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/bulbis_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_crafting_table.json deleted file mode 100644 index 1127bfdb14..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_door.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_door.json deleted file mode 100644 index c71b2f33af..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/bulbis_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/bulbis_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/bulbis_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/bulbis_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/bulbis_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/bulbis_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/bulbis_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/bulbis_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/bulbis_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/bulbis_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/bulbis_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/bulbis_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/bulbis_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/bulbis_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/bulbis_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/bulbis_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/bulbis_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/bulbis_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/bulbis_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/bulbis_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/bulbis_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/bulbis_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_fence.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_fence.json deleted file mode 100644 index 8f9b1e645e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/bulbis_fence_post" - } - }, - { - "apply": { - "model": "byg:block/bulbis_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "byg:block/bulbis_fence_side", - "y": 90, - "uvlock": true - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "byg:block/bulbis_fence_side", - "y": 180, - "uvlock": true - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "byg:block/bulbis_fence_side", - "y": 270, - "uvlock": true - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_fence_gate.json deleted file mode 100644 index 6c0d267f61..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/bulbis_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/bulbis_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/bulbis_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/bulbis_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/bulbis_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/bulbis_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/bulbis_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/bulbis_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/bulbis_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/bulbis_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/bulbis_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/bulbis_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/bulbis_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/bulbis_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/bulbis_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/bulbis_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_oddity.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_oddity.json deleted file mode 100644 index 411731ff33..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_oddity.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_oddity" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_planks.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_planks.json deleted file mode 100644 index 3bd0671b42..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_pressure_plate.json deleted file mode 100644 index 3115d20ba2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/bulbis_pressure_plate" - }, - "powered=true": { - "model": "byg:block/bulbis_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_slab.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_slab.json deleted file mode 100644 index 69ec42cd25..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/bulbis_slab" - }, - "type=double": { - "model": "byg:block/bulbis_planks" - }, - "type=top": { - "model": "byg:block/bulbis_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_stairs.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_stairs.json deleted file mode 100644 index 97af0fceb5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/bulbis_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/bulbis_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/bulbis_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/bulbis_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/bulbis_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/bulbis_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/bulbis_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/bulbis_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/bulbis_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/bulbis_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/bulbis_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/bulbis_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/bulbis_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/bulbis_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/bulbis_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/bulbis_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/bulbis_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/bulbis_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/bulbis_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/bulbis_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/bulbis_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/bulbis_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/bulbis_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/bulbis_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/bulbis_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/bulbis_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_trapdoor.json deleted file mode 100644 index e48a705047..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/bulbis_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/bulbis_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/bulbis_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/bulbis_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/bulbis_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/bulbis_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/bulbis_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/bulbis_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/bulbis_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/bulbis_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/bulbis_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/bulbis_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/bulbis_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/bulbis_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/bulbis_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/bulbis_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_wood.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_wood.json deleted file mode 100644 index fd45ba0cda..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/bulbis_wood" - }, - "axis=z": { - "model": "byg:block/bulbis_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/bulbis_wood", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/cherry_bookshelf.json deleted file mode 100644 index 13837fecfb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cherry_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_button.json b/Common/src/main/resources/assets/byg/blockstates/cherry_button.json deleted file mode 100644 index 8e6bc87e9d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/cherry_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cherry_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cherry_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/cherry_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cherry_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cherry_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cherry_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/cherry_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cherry_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/cherry_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/cherry_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/cherry_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/cherry_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/cherry_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/cherry_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/cherry_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/cherry_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cherry_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cherry_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cherry_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/cherry_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/cherry_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cherry_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cherry_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/cherry_crafting_table.json deleted file mode 100644 index 5d7d0bb454..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cherry_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_door.json b/Common/src/main/resources/assets/byg/blockstates/cherry_door.json deleted file mode 100644 index d5165d9968..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_fence.json b/Common/src/main/resources/assets/byg/blockstates/cherry_fence.json deleted file mode 100644 index d3105f5941..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/cherry_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cherry_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cherry_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cherry_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cherry_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/cherry_fence_gate.json deleted file mode 100644 index 7e9fbe1601..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cherry_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cherry_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cherry_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/cherry_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cherry_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cherry_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/cherry_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/cherry_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/cherry_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cherry_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cherry_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cherry_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/cherry_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cherry_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cherry_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/cherry_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_log.json b/Common/src/main/resources/assets/byg/blockstates/cherry_log.json deleted file mode 100644 index 1ba16fa403..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cherry_log" - }, - "axis=z": { - "model": "byg:block/cherry_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cherry_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_planks.json b/Common/src/main/resources/assets/byg/blockstates/cherry_planks.json deleted file mode 100644 index f073d8c112..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cherry_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/cherry_pressure_plate.json deleted file mode 100644 index 29fcfa6f04..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/cherry_pressure_plate" - }, - "powered=true": { - "model": "byg:block/cherry_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_slab.json b/Common/src/main/resources/assets/byg/blockstates/cherry_slab.json deleted file mode 100644 index cb0fd69b45..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/cherry_slab" - }, - "type=top": { - "model": "byg:block/cherry_slab_top" - }, - "type=double": { - "model": "byg:block/cherry_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_stairs.json b/Common/src/main/resources/assets/byg/blockstates/cherry_stairs.json deleted file mode 100644 index 965d6a8d93..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/cherry_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cherry_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cherry_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cherry_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cherry_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cherry_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cherry_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/cherry_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/cherry_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cherry_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cherry_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/cherry_trapdoor.json deleted file mode 100644 index 89135d468f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/cherry_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cherry_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cherry_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cherry_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/cherry_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cherry_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/cherry_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/cherry_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cherry_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cherry_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_wall.json b/Common/src/main/resources/assets/byg/blockstates/cherry_wall.json deleted file mode 100644 index 2e4e78c0ae..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/cherry_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cherry_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cherry_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cherry_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cherry_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_wood.json b/Common/src/main/resources/assets/byg/blockstates/cherry_wood.json deleted file mode 100644 index 0e70b71bdb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cherry_wood" - }, - "axis=z": { - "model": "byg:block/cherry_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cherry_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/cika_bookshelf.json deleted file mode 100644 index 4dbed4d40e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_button.json b/Common/src/main/resources/assets/byg/blockstates/cika_button.json deleted file mode 100644 index 8c2d163fe8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/cika_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cika_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cika_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/cika_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cika_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cika_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cika_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/cika_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cika_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/cika_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/cika_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/cika_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/cika_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/cika_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/cika_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/cika_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/cika_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cika_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cika_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cika_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/cika_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/cika_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cika_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cika_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/cika_crafting_table.json deleted file mode 100644 index 202352b72c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_door.json b/Common/src/main/resources/assets/byg/blockstates/cika_door.json deleted file mode 100644 index 95c2ed84d5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cika_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cika_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cika_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cika_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cika_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cika_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cika_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cika_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cika_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cika_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cika_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cika_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cika_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cika_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cika_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cika_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cika_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cika_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cika_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cika_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cika_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cika_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cika_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cika_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cika_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cika_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cika_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_fence.json b/Common/src/main/resources/assets/byg/blockstates/cika_fence.json deleted file mode 100644 index 7c00a30168..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/cika_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cika_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cika_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cika_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cika_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/cika_fence_gate.json deleted file mode 100644 index fa3f804f81..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cika_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cika_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cika_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/cika_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cika_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cika_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/cika_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/cika_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/cika_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cika_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cika_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cika_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/cika_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cika_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cika_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/cika_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_leaves.json b/Common/src/main/resources/assets/byg/blockstates/cika_leaves.json deleted file mode 100644 index 0ef6096c04..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_log.json b/Common/src/main/resources/assets/byg/blockstates/cika_log.json deleted file mode 100644 index 76402b3c62..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cika_log" - }, - "axis=z": { - "model": "byg:block/cika_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cika_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_planks.json b/Common/src/main/resources/assets/byg/blockstates/cika_planks.json deleted file mode 100644 index a5ff5e7def..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/cika_pressure_plate.json deleted file mode 100644 index 78fa541c05..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/cika_pressure_plate" - }, - "powered=true": { - "model": "byg:block/cika_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_sapling.json b/Common/src/main/resources/assets/byg/blockstates/cika_sapling.json deleted file mode 100644 index 1b93e96fda..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_slab.json b/Common/src/main/resources/assets/byg/blockstates/cika_slab.json deleted file mode 100644 index 63985a4161..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/cika_slab" - }, - "type=top": { - "model": "byg:block/cika_slab_top" - }, - "type=double": { - "model": "byg:block/cika_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_stairs.json b/Common/src/main/resources/assets/byg/blockstates/cika_stairs.json deleted file mode 100644 index 7d6a7a274e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/cika_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cika_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cika_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cika_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cika_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cika_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cika_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cika_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cika_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/cika_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/cika_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cika_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cika_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cika_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cika_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/cika_trapdoor.json deleted file mode 100644 index f61f5b2d87..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/cika_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cika_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cika_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cika_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/cika_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cika_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/cika_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/cika_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cika_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/cika_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/cika_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/cika_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/cika_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/cika_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/cika_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cika_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_wall.json b/Common/src/main/resources/assets/byg/blockstates/cika_wall.json deleted file mode 100644 index aeafb7a528..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/cika_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cika_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cika_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cika_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cika_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_wood.json b/Common/src/main/resources/assets/byg/blockstates/cika_wood.json deleted file mode 100644 index 0fa9599f66..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cika_wood" - }, - "axis=z": { - "model": "byg:block/cika_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cika_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/cypress_bookshelf.json deleted file mode 100644 index 41806c2e06..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_button.json b/Common/src/main/resources/assets/byg/blockstates/cypress_button.json deleted file mode 100644 index 647d0ac98a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/cypress_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cypress_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cypress_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/cypress_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cypress_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cypress_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cypress_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/cypress_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cypress_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/cypress_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/cypress_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/cypress_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/cypress_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/cypress_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/cypress_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/cypress_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/cypress_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cypress_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cypress_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cypress_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/cypress_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/cypress_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cypress_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cypress_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/cypress_crafting_table.json deleted file mode 100644 index c42058e809..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_door.json b/Common/src/main/resources/assets/byg/blockstates/cypress_door.json deleted file mode 100644 index dfb4796a9f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_fence.json b/Common/src/main/resources/assets/byg/blockstates/cypress_fence.json deleted file mode 100644 index 92ae9c4071..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/cypress_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cypress_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cypress_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cypress_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cypress_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/cypress_fence_gate.json deleted file mode 100644 index c7031fb938..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cypress_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cypress_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cypress_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/cypress_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cypress_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cypress_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/cypress_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/cypress_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/cypress_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cypress_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cypress_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cypress_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/cypress_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cypress_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cypress_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/cypress_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_leaves.json b/Common/src/main/resources/assets/byg/blockstates/cypress_leaves.json deleted file mode 100644 index 273acc4210..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_log.json b/Common/src/main/resources/assets/byg/blockstates/cypress_log.json deleted file mode 100644 index dd34956893..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cypress_log" - }, - "axis=z": { - "model": "byg:block/cypress_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cypress_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_planks.json b/Common/src/main/resources/assets/byg/blockstates/cypress_planks.json deleted file mode 100644 index 8a16ade034..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/cypress_pressure_plate.json deleted file mode 100644 index 8f74052ed7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/cypress_pressure_plate" - }, - "powered=true": { - "model": "byg:block/cypress_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_sapling.json b/Common/src/main/resources/assets/byg/blockstates/cypress_sapling.json deleted file mode 100644 index 5db2659287..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_slab.json b/Common/src/main/resources/assets/byg/blockstates/cypress_slab.json deleted file mode 100644 index 2bba85656e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/cypress_slab" - }, - "type=top": { - "model": "byg:block/cypress_slab_top" - }, - "type=double": { - "model": "byg:block/cypress_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_stairs.json b/Common/src/main/resources/assets/byg/blockstates/cypress_stairs.json deleted file mode 100644 index ffb016c873..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/cypress_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cypress_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cypress_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cypress_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cypress_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cypress_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cypress_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/cypress_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/cypress_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cypress_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cypress_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/cypress_trapdoor.json deleted file mode 100644 index 223fbd23b8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/cypress_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cypress_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cypress_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cypress_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/cypress_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cypress_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/cypress_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/cypress_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cypress_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cypress_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_wall.json b/Common/src/main/resources/assets/byg/blockstates/cypress_wall.json deleted file mode 100644 index 59c4de6a9d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/cypress_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/cypress_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/cypress_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/cypress_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/cypress_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_wood.json b/Common/src/main/resources/assets/byg/blockstates/cypress_wood.json deleted file mode 100644 index b15cfdd818..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/cypress_wood" - }, - "axis=z": { - "model": "byg:block/cypress_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/cypress_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/ebony_bookshelf.json deleted file mode 100644 index 312bc586e5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_button.json b/Common/src/main/resources/assets/byg/blockstates/ebony_button.json deleted file mode 100644 index 272d573f7f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/ebony_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/ebony_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/ebony_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/ebony_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/ebony_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/ebony_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/ebony_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/ebony_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/ebony_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/ebony_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/ebony_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/ebony_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/ebony_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/ebony_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/ebony_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/ebony_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/ebony_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/ebony_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/ebony_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/ebony_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/ebony_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/ebony_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/ebony_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/ebony_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/ebony_crafting_table.json deleted file mode 100644 index cf8136cd6f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_door.json b/Common/src/main/resources/assets/byg/blockstates/ebony_door.json deleted file mode 100644 index 2edb21b360..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_fence.json b/Common/src/main/resources/assets/byg/blockstates/ebony_fence.json deleted file mode 100644 index 955a77864c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/ebony_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/ebony_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/ebony_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/ebony_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/ebony_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/ebony_fence_gate.json deleted file mode 100644 index 0f43cd70c8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/ebony_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/ebony_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/ebony_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/ebony_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/ebony_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/ebony_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/ebony_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/ebony_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/ebony_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/ebony_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/ebony_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/ebony_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/ebony_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/ebony_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/ebony_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/ebony_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_leaves.json b/Common/src/main/resources/assets/byg/blockstates/ebony_leaves.json deleted file mode 100644 index ccf0ce5903..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_log.json b/Common/src/main/resources/assets/byg/blockstates/ebony_log.json deleted file mode 100644 index 9246a51b32..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/ebony_log" - }, - "axis=z": { - "model": "byg:block/ebony_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/ebony_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_planks.json b/Common/src/main/resources/assets/byg/blockstates/ebony_planks.json deleted file mode 100644 index 6ae39b56ae..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/ebony_pressure_plate.json deleted file mode 100644 index 5e3d18c9e1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/ebony_pressure_plate" - }, - "powered=true": { - "model": "byg:block/ebony_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_sapling.json b/Common/src/main/resources/assets/byg/blockstates/ebony_sapling.json deleted file mode 100644 index d813d6c07b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_slab.json b/Common/src/main/resources/assets/byg/blockstates/ebony_slab.json deleted file mode 100644 index 114b78dc6e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/ebony_slab" - }, - "type=top": { - "model": "byg:block/ebony_slab_top" - }, - "type=double": { - "model": "byg:block/ebony_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_stairs.json b/Common/src/main/resources/assets/byg/blockstates/ebony_stairs.json deleted file mode 100644 index ba2421054e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/ebony_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/ebony_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/ebony_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/ebony_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/ebony_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/ebony_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/ebony_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/ebony_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/ebony_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/ebony_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/ebony_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/ebony_trapdoor.json deleted file mode 100644 index bbd73ef19b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/ebony_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/ebony_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/ebony_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/ebony_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/ebony_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/ebony_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/ebony_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/ebony_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/ebony_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/ebony_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_wall.json b/Common/src/main/resources/assets/byg/blockstates/ebony_wall.json deleted file mode 100644 index d56cafa18d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/ebony_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/ebony_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/ebony_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/ebony_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/ebony_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_wood.json b/Common/src/main/resources/assets/byg/blockstates/ebony_wood.json deleted file mode 100644 index edb60e2c72..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/ebony_wood" - }, - "axis=z": { - "model": "byg:block/ebony_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/ebony_wood", - "x": 90, - "y": 90 - } - } -} From 36cf488a1c29ab766dfb9b88bc3f2e7b8e693019 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:37:11 +0300 Subject: [PATCH 21/90] Blockstates! --- Common/src/generated/resources/.cache/cache | 799 ++++++++++-------- .../byg/blockstates/aspen_bookshelf.json | 7 + .../assets/byg/blockstates/aspen_button.json | 118 +++ .../byg/blockstates/aspen_crafting_table.json | 7 + .../assets/byg/blockstates/aspen_door.json | 124 +++ .../assets/byg/blockstates/aspen_fence.json | 48 ++ .../byg/blockstates/aspen_fence_gate.json | 80 ++ .../assets/byg/blockstates/aspen_leaves.json | 7 + .../assets/byg/blockstates/aspen_log.json | 16 + .../assets/byg/blockstates/aspen_planks.json | 7 + .../byg/blockstates/aspen_pressure_plate.json | 10 + .../assets/byg/blockstates/aspen_sapling.json | 7 + .../assets/byg/blockstates/aspen_slab.json | 13 + .../assets/byg/blockstates/aspen_stairs.json | 209 +++++ .../byg/blockstates/aspen_trapdoor.json | 68 ++ .../assets/byg/blockstates/aspen_wood.json | 16 + .../byg/blockstates/baobab_bookshelf.json | 7 + .../assets/byg/blockstates/baobab_button.json | 118 +++ .../blockstates/baobab_crafting_table.json | 7 + .../assets/byg/blockstates/baobab_door.json | 124 +++ .../assets/byg/blockstates/baobab_fence.json | 48 ++ .../byg/blockstates/baobab_fence_gate.json | 80 ++ .../assets/byg/blockstates/baobab_leaves.json | 7 + .../assets/byg/blockstates/baobab_log.json | 16 + .../assets/byg/blockstates/baobab_planks.json | 7 + .../blockstates/baobab_pressure_plate.json | 10 + .../byg/blockstates/baobab_sapling.json | 7 + .../assets/byg/blockstates/baobab_slab.json | 13 + .../assets/byg/blockstates/baobab_stairs.json | 209 +++++ .../byg/blockstates/baobab_trapdoor.json | 68 ++ .../assets/byg/blockstates/baobab_wood.json | 16 + .../blockstates/blue_enchanted_bookshelf.json | 7 + .../blockstates/blue_enchanted_button.json | 118 +++ .../blue_enchanted_crafting_table.json | 7 + .../byg/blockstates/blue_enchanted_door.json | 124 +++ .../byg/blockstates/blue_enchanted_fence.json | 48 ++ .../blue_enchanted_fence_gate.json | 80 ++ .../blockstates/blue_enchanted_leaves.json | 7 + .../byg/blockstates/blue_enchanted_log.json | 16 + .../blockstates/blue_enchanted_planks.json | 7 + .../blue_enchanted_pressure_plate.json | 10 + .../blockstates/blue_enchanted_sapling.json | 7 + .../byg/blockstates/blue_enchanted_slab.json | 13 + .../blockstates/blue_enchanted_stairs.json | 209 +++++ .../blockstates/blue_enchanted_trapdoor.json | 68 ++ .../byg/blockstates/blue_enchanted_wood.json | 16 + .../byg/blockstates/bulbis_bookshelf.json | 7 + .../assets/byg/blockstates/bulbis_button.json | 118 +++ .../blockstates/bulbis_crafting_table.json | 7 + .../assets/byg/blockstates/bulbis_door.json | 124 +++ .../assets/byg/blockstates/bulbis_fence.json | 48 ++ .../byg/blockstates/bulbis_fence_gate.json | 80 ++ .../assets/byg/blockstates/bulbis_oddity.json | 7 + .../assets/byg/blockstates/bulbis_planks.json | 7 + .../blockstates/bulbis_pressure_plate.json | 10 + .../assets/byg/blockstates/bulbis_slab.json | 13 + .../assets/byg/blockstates/bulbis_stairs.json | 209 +++++ .../assets/byg/blockstates/bulbis_stem.json | 16 + .../byg/blockstates/bulbis_trapdoor.json | 68 ++ .../assets/byg/blockstates/bulbis_wood.json | 16 + .../byg/blockstates/cherry_bookshelf.json | 7 + .../assets/byg/blockstates/cherry_button.json | 118 +++ .../blockstates/cherry_crafting_table.json | 7 + .../assets/byg/blockstates/cherry_door.json | 124 +++ .../assets/byg/blockstates/cherry_fence.json | 48 ++ .../byg/blockstates/cherry_fence_gate.json | 80 ++ .../assets/byg/blockstates/cherry_log.json | 16 + .../assets/byg/blockstates/cherry_planks.json | 7 + .../blockstates/cherry_pressure_plate.json | 10 + .../assets/byg/blockstates/cherry_slab.json | 13 + .../assets/byg/blockstates/cherry_stairs.json | 209 +++++ .../byg/blockstates/cherry_trapdoor.json | 68 ++ .../assets/byg/blockstates/cherry_wood.json | 16 + .../byg/blockstates/cika_bookshelf.json | 7 + .../assets/byg/blockstates/cika_button.json | 118 +++ .../byg/blockstates/cika_crafting_table.json | 7 + .../assets/byg/blockstates/cika_door.json | 124 +++ .../assets/byg/blockstates/cika_fence.json | 48 ++ .../byg/blockstates/cika_fence_gate.json | 80 ++ .../assets/byg/blockstates/cika_leaves.json | 7 + .../assets/byg/blockstates/cika_log.json | 16 + .../assets/byg/blockstates/cika_planks.json | 7 + .../byg/blockstates/cika_pressure_plate.json | 10 + .../assets/byg/blockstates/cika_sapling.json | 7 + .../assets/byg/blockstates/cika_slab.json | 13 + .../assets/byg/blockstates/cika_stairs.json | 209 +++++ .../assets/byg/blockstates/cika_trapdoor.json | 68 ++ .../assets/byg/blockstates/cika_wood.json | 16 + .../byg/blockstates/cypress_bookshelf.json | 7 + .../byg/blockstates/cypress_button.json | 118 +++ .../blockstates/cypress_crafting_table.json | 7 + .../assets/byg/blockstates/cypress_door.json | 124 +++ .../assets/byg/blockstates/cypress_fence.json | 48 ++ .../byg/blockstates/cypress_fence_gate.json | 80 ++ .../byg/blockstates/cypress_leaves.json | 7 + .../assets/byg/blockstates/cypress_log.json | 16 + .../byg/blockstates/cypress_planks.json | 7 + .../blockstates/cypress_pressure_plate.json | 10 + .../byg/blockstates/cypress_sapling.json | 7 + .../assets/byg/blockstates/cypress_slab.json | 13 + .../byg/blockstates/cypress_stairs.json | 209 +++++ .../byg/blockstates/cypress_trapdoor.json | 68 ++ .../assets/byg/blockstates/cypress_wood.json | 16 + .../byg/blockstates/ebony_bookshelf.json | 7 + .../assets/byg/blockstates/ebony_button.json | 118 +++ .../byg/blockstates/ebony_crafting_table.json | 7 + .../assets/byg/blockstates/ebony_door.json | 124 +++ .../assets/byg/blockstates/ebony_fence.json | 48 ++ .../byg/blockstates/ebony_fence_gate.json | 80 ++ .../assets/byg/blockstates/ebony_leaves.json | 7 + .../assets/byg/blockstates/ebony_log.json | 16 + .../assets/byg/blockstates/ebony_planks.json | 7 + .../byg/blockstates/ebony_pressure_plate.json | 10 + .../assets/byg/blockstates/ebony_sapling.json | 7 + .../assets/byg/blockstates/ebony_slab.json | 13 + .../assets/byg/blockstates/ebony_stairs.json | 209 +++++ .../byg/blockstates/ebony_trapdoor.json | 68 ++ .../assets/byg/blockstates/ebony_wood.json | 16 + .../bookshelf.json} | 0 .../{aspen_button.json => aspen/button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/aspen/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../{aspen_leaves.json => aspen/leaves.json} | 0 .../leaves_snowy.json} | 0 .../block/{aspen_log.json => aspen/log.json} | 0 .../{aspen_planks.json => aspen/planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{aspen_slab.json => aspen/slab.json} | 0 .../slab_top.json} | 0 .../{aspen_stairs.json => aspen/stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../aspen/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{aspen_wood.json => aspen/wood.json} | 0 .../bookshelf.json} | 0 .../button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/baobab/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../leaves.json} | 0 .../leaves_snowy.json} | 0 .../{baobab_log.json => baobab/log.json} | 0 .../planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{baobab_slab.json => baobab/slab.json} | 0 .../slab_top.json} | 0 .../stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../baobab/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{baobab_wood.json => baobab/wood.json} | 0 .../bookshelf.json} | 0 .../button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../models/block/blue_enchanted/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../leaves.json} | 0 .../leaves_snowy.json} | 0 .../log.json} | 0 .../planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../slab.json} | 0 .../slab_top.json} | 0 .../stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../blue_enchanted/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../wood.json} | 0 .../bookshelf.json} | 0 .../button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/bulbis/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../{bulbis_stem.json => bulbis/log.json} | 0 .../planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{bulbis_slab.json => bulbis/slab.json} | 0 .../slab_top.json} | 0 .../stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../bulbis/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{bulbis_wood.json => bulbis/wood.json} | 0 .../bookshelf.json} | 0 .../button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/cherry/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../{cherry_log.json => cherry/log.json} | 0 .../planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{cherry_slab.json => cherry/slab.json} | 0 .../slab_top.json} | 0 .../stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../cherry/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{cherry_wood.json => cherry/wood.json} | 0 .../bookshelf.json} | 0 .../{cika_button.json => cika/button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/cika/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../{cika_fence.json => cika/fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../{cika_leaves.json => cika/leaves.json} | 0 .../leaves_snowy.json} | 0 .../block/{cika_log.json => cika/log.json} | 0 .../{cika_planks.json => cika/planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../block/{cika_slab.json => cika/slab.json} | 0 .../slab_top.json} | 0 .../{cika_stairs.json => cika/stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../cika/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../block/{cika_wood.json => cika/wood.json} | 0 .../bookshelf.json} | 0 .../button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../byg/models/block/cypress/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../leaves.json} | 0 .../leaves_snowy.json} | 0 .../{cypress_log.json => cypress/log.json} | 0 .../planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{cypress_slab.json => cypress/slab.json} | 0 .../slab_top.json} | 0 .../stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../byg/models/block/cypress/trapdoor.json | 39 + .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{cypress_wood.json => cypress/wood.json} | 0 .../bookshelf.json} | 0 .../{ebony_button.json => ebony/button.json} | 0 .../button_inventory.json} | 0 .../button_pressed.json} | 0 .../crafting_table.json} | 0 .../door_bottom.json} | 0 .../door_bottom_hinge.json} | 0 .../door_top.json} | 0 .../door_top_hinge.json} | 0 .../assets/byg/models/block/ebony/fence.json | 7 + .../fence_gate.json} | 0 .../fence_gate_open.json} | 0 .../fence_gate_wall.json} | 0 .../fence_gate_wall_open.json} | 0 .../fence_inv.json} | 0 .../fence_post.json} | 0 .../grower_item.json} | 0 .../{ebony_leaves.json => ebony/leaves.json} | 0 .../leaves_snowy.json} | 0 .../block/{ebony_log.json => ebony/log.json} | 0 .../{ebony_planks.json => ebony/planks.json} | 0 .../pressure_plate.json} | 0 .../pressure_plate_down.json} | 0 .../{ebony_slab.json => ebony/slab.json} | 0 .../slab_top.json} | 0 .../{ebony_stairs.json => ebony/stairs.json} | 0 .../stairs_inner.json} | 0 .../stairs_outer.json} | 0 .../ebony/trapdoor.json} | 2 +- .../trapdoor_bottom.json} | 0 .../trapdoor_open.json} | 0 .../trapdoor_top.json} | 0 .../{ebony_wood.json => ebony/wood.json} | 0 .../byg/models/item/aspen_bookshelf.json | 2 +- .../assets/byg/models/item/aspen_button.json | 2 +- .../byg/models/item/aspen_crafting_table.json | 2 +- .../assets/byg/models/item/aspen_fence.json | 2 +- .../assets/byg/models/item/aspen_leaves.json | 2 +- .../assets/byg/models/item/aspen_log.json | 2 +- .../assets/byg/models/item/aspen_planks.json | 2 +- .../byg/models/item/aspen_pressure_plate.json | 2 +- .../assets/byg/models/item/aspen_slab.json | 2 +- .../assets/byg/models/item/aspen_stairs.json | 2 +- .../assets/byg/models/item/aspen_wood.json | 2 +- .../byg/models/item/baobab_bookshelf.json | 2 +- .../assets/byg/models/item/baobab_button.json | 2 +- .../models/item/baobab_crafting_table.json | 2 +- .../assets/byg/models/item/baobab_fence.json | 2 +- .../assets/byg/models/item/baobab_leaves.json | 2 +- .../assets/byg/models/item/baobab_log.json | 2 +- .../assets/byg/models/item/baobab_planks.json | 2 +- .../models/item/baobab_pressure_plate.json | 2 +- .../assets/byg/models/item/baobab_slab.json | 2 +- .../assets/byg/models/item/baobab_stairs.json | 2 +- .../assets/byg/models/item/baobab_wood.json | 2 +- .../models/item/blue_enchanted_bookshelf.json | 2 +- .../models/item/blue_enchanted_button.json | 2 +- .../item/blue_enchanted_crafting_table.json | 2 +- .../byg/models/item/blue_enchanted_fence.json | 2 +- .../models/item/blue_enchanted_leaves.json | 2 +- .../byg/models/item/blue_enchanted_log.json | 2 +- .../models/item/blue_enchanted_planks.json | 2 +- .../item/blue_enchanted_pressure_plate.json | 2 +- .../byg/models/item/blue_enchanted_slab.json | 2 +- .../models/item/blue_enchanted_stairs.json | 2 +- .../byg/models/item/blue_enchanted_wood.json | 2 +- .../byg/models/item/bulbis_bookshelf.json | 2 +- .../assets/byg/models/item/bulbis_button.json | 2 +- .../models/item/bulbis_crafting_table.json | 2 +- .../assets/byg/models/item/bulbis_fence.json | 2 +- .../assets/byg/models/item/bulbis_planks.json | 2 +- .../models/item/bulbis_pressure_plate.json | 2 +- .../assets/byg/models/item/bulbis_slab.json | 2 +- .../assets/byg/models/item/bulbis_stairs.json | 2 +- .../assets/byg/models/item/bulbis_stem.json | 2 +- .../assets/byg/models/item/bulbis_wood.json | 2 +- .../byg/models/item/cherry_bookshelf.json | 2 +- .../assets/byg/models/item/cherry_button.json | 2 +- .../models/item/cherry_crafting_table.json | 2 +- .../assets/byg/models/item/cherry_fence.json | 2 +- .../assets/byg/models/item/cherry_log.json | 2 +- .../assets/byg/models/item/cherry_planks.json | 2 +- .../models/item/cherry_pressure_plate.json | 2 +- .../assets/byg/models/item/cherry_slab.json | 2 +- .../assets/byg/models/item/cherry_stairs.json | 2 +- .../assets/byg/models/item/cherry_wood.json | 2 +- .../byg/models/item/cika_bookshelf.json | 2 +- .../assets/byg/models/item/cika_button.json | 2 +- .../byg/models/item/cika_crafting_table.json | 2 +- .../assets/byg/models/item/cika_fence.json | 2 +- .../assets/byg/models/item/cika_leaves.json | 2 +- .../assets/byg/models/item/cika_log.json | 2 +- .../assets/byg/models/item/cika_planks.json | 2 +- .../byg/models/item/cika_pressure_plate.json | 2 +- .../assets/byg/models/item/cika_slab.json | 2 +- .../assets/byg/models/item/cika_stairs.json | 2 +- .../assets/byg/models/item/cika_wood.json | 2 +- .../byg/models/item/cypress_bookshelf.json | 2 +- .../byg/models/item/cypress_button.json | 2 +- .../models/item/cypress_crafting_table.json | 2 +- .../assets/byg/models/item/cypress_fence.json | 2 +- .../byg/models/item/cypress_leaves.json | 2 +- .../assets/byg/models/item/cypress_log.json | 2 +- .../byg/models/item/cypress_planks.json | 2 +- .../models/item/cypress_pressure_plate.json | 2 +- .../assets/byg/models/item/cypress_slab.json | 2 +- .../byg/models/item/cypress_stairs.json | 2 +- .../byg/models/item/cypress_trapdoor.json | 39 - .../assets/byg/models/item/cypress_wood.json | 2 +- .../byg/models/item/ebony_bookshelf.json | 2 +- .../assets/byg/models/item/ebony_button.json | 2 +- .../byg/models/item/ebony_crafting_table.json | 2 +- .../assets/byg/models/item/ebony_fence.json | 2 +- .../assets/byg/models/item/ebony_leaves.json | 2 +- .../assets/byg/models/item/ebony_log.json | 2 +- .../assets/byg/models/item/ebony_planks.json | 2 +- .../byg/models/item/ebony_pressure_plate.json | 2 +- .../assets/byg/models/item/ebony_slab.json | 2 +- .../assets/byg/models/item/ebony_stairs.json | 2 +- .../assets/byg/models/item/ebony_wood.json | 2 +- .../potionstudios/byg/datagen/BYGDataGen.java | 2 - .../providers/BYGWoodAssetsProvider.java | 67 +- 466 files changed, 6559 insertions(+), 504 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_oddity.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_stem.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_wood.json rename Common/src/generated/resources/assets/byg/models/block/{aspen_bookshelf.json => aspen/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_button.json => aspen/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_button_inventory.json => aspen/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_button_pressed.json => aspen/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_crafting_table.json => aspen/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_door_bottom.json => aspen/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_door_bottom_hinge.json => aspen/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_door_top.json => aspen/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_door_top_hinge.json => aspen/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/fence.json rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence_gate.json => aspen/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence_gate_open.json => aspen/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence_gate_wall.json => aspen/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence_gate_wall_open.json => aspen/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence.json => aspen/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_fence_post.json => aspen/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_sapling.json => aspen/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_leaves.json => aspen/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_leaves_snowy.json => aspen/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_log.json => aspen/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_planks.json => aspen/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_pressure_plate.json => aspen/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_pressure_plate_down.json => aspen/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_slab.json => aspen/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_slab_top.json => aspen/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_stairs.json => aspen/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_stairs_inner.json => aspen/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_stairs_outer.json => aspen/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/aspen_trapdoor.json => block/aspen/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_trapdoor_bottom.json => aspen/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_trapdoor_open.json => aspen/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_trapdoor_top.json => aspen/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{aspen_wood.json => aspen/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_bookshelf.json => baobab/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_button.json => baobab/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_button_inventory.json => baobab/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_button_pressed.json => baobab/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_crafting_table.json => baobab/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_door_bottom.json => baobab/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_door_bottom_hinge.json => baobab/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_door_top.json => baobab/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_door_top_hinge.json => baobab/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/fence.json rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence_gate.json => baobab/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence_gate_open.json => baobab/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence_gate_wall.json => baobab/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence_gate_wall_open.json => baobab/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence.json => baobab/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_fence_post.json => baobab/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_sapling.json => baobab/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_leaves.json => baobab/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_leaves_snowy.json => baobab/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_log.json => baobab/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_planks.json => baobab/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_pressure_plate.json => baobab/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_pressure_plate_down.json => baobab/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_slab.json => baobab/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_slab_top.json => baobab/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_stairs.json => baobab/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_stairs_inner.json => baobab/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_stairs_outer.json => baobab/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/baobab_trapdoor.json => block/baobab/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_trapdoor_bottom.json => baobab/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_trapdoor_open.json => baobab/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_trapdoor_top.json => baobab/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{baobab_wood.json => baobab/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_bookshelf.json => blue_enchanted/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_button.json => blue_enchanted/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_button_inventory.json => blue_enchanted/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_button_pressed.json => blue_enchanted/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_crafting_table.json => blue_enchanted/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_door_bottom.json => blue_enchanted/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_door_bottom_hinge.json => blue_enchanted/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_door_top.json => blue_enchanted/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_door_top_hinge.json => blue_enchanted/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence_gate.json => blue_enchanted/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence_gate_open.json => blue_enchanted/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence_gate_wall.json => blue_enchanted/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence_gate_wall_open.json => blue_enchanted/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence.json => blue_enchanted/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_fence_post.json => blue_enchanted/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_sapling.json => blue_enchanted/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_leaves.json => blue_enchanted/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_leaves_snowy.json => blue_enchanted/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_log.json => blue_enchanted/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_planks.json => blue_enchanted/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_pressure_plate.json => blue_enchanted/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_pressure_plate_down.json => blue_enchanted/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_slab.json => blue_enchanted/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_slab_top.json => blue_enchanted/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_stairs.json => blue_enchanted/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_stairs_inner.json => blue_enchanted/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_stairs_outer.json => blue_enchanted/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/blue_enchanted_trapdoor.json => block/blue_enchanted/trapdoor.json} (90%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_trapdoor_bottom.json => blue_enchanted/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_trapdoor_open.json => blue_enchanted/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_trapdoor_top.json => blue_enchanted/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{blue_enchanted_wood.json => blue_enchanted/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_bookshelf.json => bulbis/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_button.json => bulbis/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_button_inventory.json => bulbis/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_button_pressed.json => bulbis/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_crafting_table.json => bulbis/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_door_bottom.json => bulbis/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_door_bottom_hinge.json => bulbis/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_door_top.json => bulbis/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_door_top_hinge.json => bulbis/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence_gate.json => bulbis/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence_gate_open.json => bulbis/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence_gate_wall.json => bulbis/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence_gate_wall_open.json => bulbis/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence.json => bulbis/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_fence_post.json => bulbis/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_oddity.json => bulbis/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_stem.json => bulbis/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_planks.json => bulbis/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_pressure_plate.json => bulbis/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_pressure_plate_down.json => bulbis/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_slab.json => bulbis/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_slab_top.json => bulbis/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_stairs.json => bulbis/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_stairs_inner.json => bulbis/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_stairs_outer.json => bulbis/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/cherry_trapdoor.json => block/bulbis/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_trapdoor_bottom.json => bulbis/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_trapdoor_open.json => bulbis/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_trapdoor_top.json => bulbis/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{bulbis_wood.json => bulbis/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_bookshelf.json => cherry/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_button.json => cherry/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_button_inventory.json => cherry/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_button_pressed.json => cherry/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_crafting_table.json => cherry/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_door_bottom.json => cherry/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_door_bottom_hinge.json => cherry/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_door_top.json => cherry/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_door_top_hinge.json => cherry/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/fence.json rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence_gate.json => cherry/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence_gate_open.json => cherry/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence_gate_wall.json => cherry/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence_gate_wall_open.json => cherry/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence.json => cherry/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_fence_post.json => cherry/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_log.json => cherry/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_planks.json => cherry/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_pressure_plate.json => cherry/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_pressure_plate_down.json => cherry/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_slab.json => cherry/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_slab_top.json => cherry/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_stairs.json => cherry/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_stairs_inner.json => cherry/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_stairs_outer.json => cherry/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/bulbis_trapdoor.json => block/cherry/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_trapdoor_bottom.json => cherry/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_trapdoor_open.json => cherry/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_trapdoor_top.json => cherry/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cherry_wood.json => cherry/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_bookshelf.json => cika/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_button.json => cika/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_button_inventory.json => cika/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_button_pressed.json => cika/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_crafting_table.json => cika/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_door_bottom.json => cika/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_door_bottom_hinge.json => cika/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_door_top.json => cika/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_door_top_hinge.json => cika/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/fence.json rename Common/src/generated/resources/assets/byg/models/block/{cika_fence_gate.json => cika/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_fence_gate_open.json => cika/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_fence_gate_wall.json => cika/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_fence_gate_wall_open.json => cika/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_fence.json => cika/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_fence_post.json => cika/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_sapling.json => cika/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_leaves.json => cika/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_leaves_snowy.json => cika/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_log.json => cika/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_planks.json => cika/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_pressure_plate.json => cika/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_pressure_plate_down.json => cika/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_slab.json => cika/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_slab_top.json => cika/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_stairs.json => cika/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_stairs_inner.json => cika/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_stairs_outer.json => cika/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/cika_trapdoor.json => block/cika/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{cika_trapdoor_bottom.json => cika/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_trapdoor_open.json => cika/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_trapdoor_top.json => cika/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cika_wood.json => cika/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_bookshelf.json => cypress/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_button.json => cypress/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_button_inventory.json => cypress/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_button_pressed.json => cypress/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_crafting_table.json => cypress/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_door_bottom.json => cypress/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_door_bottom_hinge.json => cypress/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_door_top.json => cypress/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_door_top_hinge.json => cypress/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/fence.json rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence_gate.json => cypress/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence_gate_open.json => cypress/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence_gate_wall.json => cypress/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence_gate_wall_open.json => cypress/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence.json => cypress/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_fence_post.json => cypress/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_sapling.json => cypress/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_leaves.json => cypress/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_leaves_snowy.json => cypress/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_log.json => cypress/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_planks.json => cypress/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_pressure_plate.json => cypress/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_pressure_plate_down.json => cypress/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_slab.json => cypress/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_slab_top.json => cypress/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_stairs.json => cypress/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_stairs_inner.json => cypress/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_stairs_outer.json => cypress/stairs_outer.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json rename Common/src/generated/resources/assets/byg/models/block/{cypress_trapdoor_bottom.json => cypress/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_trapdoor_open.json => cypress/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_trapdoor_top.json => cypress/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{cypress_wood.json => cypress/wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_bookshelf.json => ebony/bookshelf.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_button.json => ebony/button.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_button_inventory.json => ebony/button_inventory.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_button_pressed.json => ebony/button_pressed.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_crafting_table.json => ebony/crafting_table.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_door_bottom.json => ebony/door_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_door_bottom_hinge.json => ebony/door_bottom_hinge.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_door_top.json => ebony/door_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_door_top_hinge.json => ebony/door_top_hinge.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/fence.json rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence_gate.json => ebony/fence_gate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence_gate_open.json => ebony/fence_gate_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence_gate_wall.json => ebony/fence_gate_wall.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence_gate_wall_open.json => ebony/fence_gate_wall_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence.json => ebony/fence_inv.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_fence_post.json => ebony/fence_post.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_sapling.json => ebony/grower_item.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_leaves.json => ebony/leaves.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_leaves_snowy.json => ebony/leaves_snowy.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_log.json => ebony/log.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_planks.json => ebony/planks.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_pressure_plate.json => ebony/pressure_plate.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_pressure_plate_down.json => ebony/pressure_plate_down.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_slab.json => ebony/slab.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_slab_top.json => ebony/slab_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_stairs.json => ebony/stairs.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_stairs_inner.json => ebony/stairs_inner.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_stairs_outer.json => ebony/stairs_outer.json} (100%) rename Common/src/generated/resources/assets/byg/models/{item/ebony_trapdoor.json => block/ebony/trapdoor.json} (91%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_trapdoor_bottom.json => ebony/trapdoor_bottom.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_trapdoor_open.json => ebony/trapdoor_open.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_trapdoor_top.json => ebony/trapdoor_top.json} (100%) rename Common/src/generated/resources/assets/byg/models/block/{ebony_wood.json => ebony/wood.json} (100%) delete mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 2644840938..a73ede6440 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -1,362 +1,487 @@ -cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen_bookshelf.json -473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen_button.json -ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen_button_inventory.json -2bf3e6875f2c2751989618864aab8594dca74324 assets/byg/models/block/aspen_button_pressed.json -2a4946082bf8a99219734a5a1b0037719801ec10 assets/byg/models/block/aspen_crafting_table.json -b400d8113db2ef9fe9b7c918b964da9607fbffd5 assets/byg/models/block/aspen_door_bottom.json -0c3b6bb17c05ebb10ed2efc27598ee0c9f008d84 assets/byg/models/block/aspen_door_bottom_hinge.json -21335a02142a92dcc64ce7015f15f255cb2fe4b3 assets/byg/models/block/aspen_door_top.json -145d21652351e1c9de9d92c5118e76d97aad6f28 assets/byg/models/block/aspen_door_top_hinge.json -daf50a260453b66485cc77994c2bb6812d7e1e0f assets/byg/models/block/aspen_fence.json -180b19690fbadacdfa8ed5291f8011900e36263f assets/byg/models/block/aspen_fence_gate.json -3894c7ee2aaf9fe44ece506c223269c1a1e49ef5 assets/byg/models/block/aspen_fence_gate_open.json -0290d9f0631c5c089d0f53ae9c3af53f69dd34ee assets/byg/models/block/aspen_fence_gate_wall.json -836a5eff00071c22e737f2e2aaf189d93aacd32b assets/byg/models/block/aspen_fence_gate_wall_open.json -69dc1fbecb1981deb8e3780ddf4f7f802176340d assets/byg/models/block/aspen_fence_post.json -ee08f30cf4c4531f14782e40f3923425e6ca7933 assets/byg/models/block/aspen_leaves.json -a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen_leaves_snowy.json -7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen_log.json -09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen_planks.json -5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen_pressure_plate.json -1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen_pressure_plate_down.json -6bcb97531d915bed45b5232f401ef2d106b05c57 assets/byg/models/block/aspen_sapling.json -c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen_slab.json -8b9b48288da793a220e7cf839a7e0af136c92b16 assets/byg/models/block/aspen_slab_top.json -ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen_stairs.json -be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen_stairs_inner.json -4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen_stairs_outer.json -76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen_trapdoor_bottom.json -d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen_trapdoor_open.json -f0307f9818774087d2220c7bf39678414ee734ef assets/byg/models/block/aspen_trapdoor_top.json -95a22561722879a34775e020a8505278b435c747 assets/byg/models/block/aspen_wood.json -24f0c0973b6317415088e96958133b02b8c8701e assets/byg/models/block/baobab_bookshelf.json -07843ab609e2ed5d8c2bec533b20151e574ac689 assets/byg/models/block/baobab_button.json -73668cdfb040d89a3d9e02f465b7972f5ad5ec44 assets/byg/models/block/baobab_button_inventory.json -b6b4024eb2fa6d04d310d59afec6be0cb3669215 assets/byg/models/block/baobab_button_pressed.json -9dda473d195d670fdc118783ed914ee2eb9f9cae assets/byg/models/block/baobab_crafting_table.json -929262f73d154eea8176b5751cd39eb4db85e46f assets/byg/models/block/baobab_door_bottom.json -548fb33d0edaed51f9ec57b2bb8af8a84dfca3aa assets/byg/models/block/baobab_door_bottom_hinge.json -016c61a08b4c977dfca8c0b66f43dca2848cdcc6 assets/byg/models/block/baobab_door_top.json -9bdd88660bda76acef39ee3fb40b89da903969f2 assets/byg/models/block/baobab_door_top_hinge.json -34529c51b201e26a237210ee7dfe86902b7c3b60 assets/byg/models/block/baobab_fence.json -7f9a54e0f109af35ef589d840771b29b2fb03c4c assets/byg/models/block/baobab_fence_gate.json -db06b19f47aa1a3d943a69404d325d720bcc50bf assets/byg/models/block/baobab_fence_gate_open.json -83eb28eb0430ecfb7e99d4306635d3c962fce1c2 assets/byg/models/block/baobab_fence_gate_wall.json -f29f2504f0dd6d6cdcf0c4a660ea2943cba748b3 assets/byg/models/block/baobab_fence_gate_wall_open.json -df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab_fence_post.json -4c154d63eb511ab0da68ce19bbc88bc0a82808f8 assets/byg/models/block/baobab_leaves.json -224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab_leaves_snowy.json -3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab_log.json -1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab_planks.json -548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab_pressure_plate.json -f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab_pressure_plate_down.json -09c4fb1513ee3f51064da761c3706a1bc7f54c65 assets/byg/models/block/baobab_sapling.json -84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab_slab.json -095d0b898c8418b3fd79da96cd9a60aef7b72234 assets/byg/models/block/baobab_slab_top.json -17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab_stairs.json -76cd7c13e8a472c170bee401f53816a7146883d3 assets/byg/models/block/baobab_stairs_inner.json -36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab_stairs_outer.json -71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab_trapdoor_bottom.json -67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab_trapdoor_open.json -6d9421e7af02d85635301868cf30b019383f40d4 assets/byg/models/block/baobab_trapdoor_top.json -2a1b0e89f7858eae90274e135d83506016780a95 assets/byg/models/block/baobab_wood.json -342ea09ac25e8ff00beb042c6f15c5f87a3fff9b assets/byg/models/block/blue_enchanted_bookshelf.json -903b94423177dc6cbca0365f40b125357c38939e assets/byg/models/block/blue_enchanted_button.json -84acdb5c60d5523d8495329660cb63f2ee6b28c2 assets/byg/models/block/blue_enchanted_button_inventory.json -3d1b62263487869a2ba6b589357bc8e9aea5422b assets/byg/models/block/blue_enchanted_button_pressed.json -b5ccb0c95ea37c1f21ec6ecd56f42af33c6d5a84 assets/byg/models/block/blue_enchanted_crafting_table.json -d425e1b470fa2311bf39ca9023a20593929c761d assets/byg/models/block/blue_enchanted_door_bottom.json -b587f8eb21d159390db55ab8e3901090c0d73eee assets/byg/models/block/blue_enchanted_door_bottom_hinge.json -be454095ca2d89d5760f75b886635bc50e4fae41 assets/byg/models/block/blue_enchanted_door_top.json -748faf2eb6c9dc10dc3bdda258aeb50c79fa3d45 assets/byg/models/block/blue_enchanted_door_top_hinge.json -de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted_fence.json -258440a4812ac1074a0b55fcca031d1c741376e8 assets/byg/models/block/blue_enchanted_fence_gate.json -ac35dd46cb7bfcbfb120542d1999ce5db459249a assets/byg/models/block/blue_enchanted_fence_gate_open.json -737a7fad5fc148a658a9f70faaebcc00988d8488 assets/byg/models/block/blue_enchanted_fence_gate_wall.json -add286acac4cd6e672144ca2bc0053b65226e980 assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json -77b409997fe27d49c4942575e6a751dd1b15c17f assets/byg/models/block/blue_enchanted_fence_post.json -6f20986996d0fd8e995a1895e0d95303f967c29f assets/byg/models/block/blue_enchanted_leaves.json -30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted_leaves_snowy.json -fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted_log.json -e2fd0bbb982161d06a3c5359113df56fb96df5ab assets/byg/models/block/blue_enchanted_planks.json -f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted_pressure_plate.json -ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted_pressure_plate_down.json -6690be3be333d7427f15a4124d2a9020118ab5d7 assets/byg/models/block/blue_enchanted_sapling.json -ddfaf3a3114a8727610eeb2a27663ad09f3bd187 assets/byg/models/block/blue_enchanted_slab.json -a6f663a7b9b3dde3ae9a7c7987073a8a19ade11b assets/byg/models/block/blue_enchanted_slab_top.json -eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted_stairs.json -5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted_stairs_inner.json -615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted_stairs_outer.json -dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted_trapdoor_bottom.json -470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted_trapdoor_open.json -fd2b82aae72fea322eb7cdc2e60f4ad1d064e9f1 assets/byg/models/block/blue_enchanted_trapdoor_top.json -a63365bae6d564b24bdb318370143249497bbdad assets/byg/models/block/blue_enchanted_wood.json -9f3ef59e8c04f55c28783a40933f433b7b1387ff assets/byg/models/block/bulbis_bookshelf.json -3b2faa52752790a21cf55466d1b33ccfec4e0085 assets/byg/models/block/bulbis_button.json -7177ac629742d77d2bd4b21443e06ba86afd7fa3 assets/byg/models/block/bulbis_button_inventory.json -c4c6062f9fb44f2016e7a314af6df8eec67e9279 assets/byg/models/block/bulbis_button_pressed.json -fcd7c1a6d62498cc2d16eba55ae1ccb14dba5e7c assets/byg/models/block/bulbis_crafting_table.json -a642b309fe508adcbf2a2b49470e7b1854dba57b assets/byg/models/block/bulbis_door_bottom.json -96b605f552035bb647603df97556bf2be301878b assets/byg/models/block/bulbis_door_bottom_hinge.json -fdf7fa5f81165b8c00825d07385ee17675cb1b95 assets/byg/models/block/bulbis_door_top.json -dc36d5affb1a63ab9bf1257f0fa91ff6d4d5d92a assets/byg/models/block/bulbis_door_top_hinge.json -8cbcfd0f20c708f6620a70b3e5f1c76a04771606 assets/byg/models/block/bulbis_fence.json -5e7637d0afb0425001fa45251d09f1ffbf6020d7 assets/byg/models/block/bulbis_fence_gate.json -7d27266056ef31574bfc19f5fd1b33638dbe66ad assets/byg/models/block/bulbis_fence_gate_open.json -fc210cd930ed68bdec95a982b1366f4a02ec4860 assets/byg/models/block/bulbis_fence_gate_wall.json -97fe5fe95b7751bc98cdf7d427ff852f084039c4 assets/byg/models/block/bulbis_fence_gate_wall_open.json -4dacfe5197a8d22fe04c6260d47378a44efdf429 assets/byg/models/block/bulbis_fence_post.json -c611670729691d4e63ba20dc76dd4831e76dae28 assets/byg/models/block/bulbis_oddity.json -d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis_planks.json -25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis_pressure_plate.json -eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis_pressure_plate_down.json -6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis_slab.json -3c49ab33b91ebcfaa455a5e479c1e79c3cdea16e assets/byg/models/block/bulbis_slab_top.json -fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis_stairs.json -35c77b8c5bef56b75ec9bd9f77bda8c07eb3e038 assets/byg/models/block/bulbis_stairs_inner.json -f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis_stairs_outer.json -f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis_stem.json -56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis_trapdoor_bottom.json -c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis_trapdoor_open.json -00e5df9209acfce5ae98613398d022e942a26895 assets/byg/models/block/bulbis_trapdoor_top.json -a5f7f77a368e842399c01fedf858b142186091bf assets/byg/models/block/bulbis_wood.json -55419b8445de262fc9c14a2d1afc29ee3cc2d6d9 assets/byg/models/block/cherry_bookshelf.json -b61b724bd5d1b23f60a694ade93df7f9c0c5439d assets/byg/models/block/cherry_button.json -1b676842159db22e820b6b2e2b972691c2a66636 assets/byg/models/block/cherry_button_inventory.json -106c0ae5bd00115b3e73999bd274abd4eff83533 assets/byg/models/block/cherry_button_pressed.json -ef09392bff11a9cb0d8cf7b69d01964dd95a1e18 assets/byg/models/block/cherry_crafting_table.json -42cf930389a7420578a4294e014b47ca56e1237b assets/byg/models/block/cherry_door_bottom.json -c83212fc7c9175c1e8c820e96501dfbdb873a84e assets/byg/models/block/cherry_door_bottom_hinge.json -a677d914969547e2293587e2489b02fa89dfa1b9 assets/byg/models/block/cherry_door_top.json -33ab247625af5e119c513be35d596af9bb71681f assets/byg/models/block/cherry_door_top_hinge.json -ea0814753d2b3957c50080ff987d3a9fe66e4a99 assets/byg/models/block/cherry_fence.json -7a8e50369a71e11f2864b0bb75dba0461031efe3 assets/byg/models/block/cherry_fence_gate.json -5b49884019ee143a8e963e97abca5f8c5e43a1c4 assets/byg/models/block/cherry_fence_gate_open.json -949313b622a8222938acb430f6a89611845549cb assets/byg/models/block/cherry_fence_gate_wall.json -29078a270340acc30c6d60750051ed70597de05e assets/byg/models/block/cherry_fence_gate_wall_open.json -d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry_fence_post.json -093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry_log.json -bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry_planks.json -c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry_pressure_plate.json -f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry_pressure_plate_down.json -e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry_slab.json -1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry_slab_top.json -fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry_stairs.json -26b9d1ca396822f5f1a09b1ce06b38653fa4ef83 assets/byg/models/block/cherry_stairs_inner.json -1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry_stairs_outer.json -91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry_trapdoor_bottom.json -36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry_trapdoor_open.json -fb80e8dd89c2212bc3f597edaf0dee479c54b85c assets/byg/models/block/cherry_trapdoor_top.json -bbd3d4453849adc0f9c3e7e28e70a8451ec4a782 assets/byg/models/block/cherry_wood.json -8e70925b7477898d4bd0df33ff28ee7249d375d3 assets/byg/models/block/cika_bookshelf.json -cc495384bec10638db5ddb6cc9faf711ff1c5232 assets/byg/models/block/cika_button.json -ca5f79439846633630eea472e5cad307e30bd453 assets/byg/models/block/cika_button_inventory.json -8fe475630a162cff09e718dea1a53e745d48bd4d assets/byg/models/block/cika_button_pressed.json -ec7f5ef0c1ce4a2adf6ebd242c95d8411412cb3e assets/byg/models/block/cika_crafting_table.json -9fad1795f6acf907f7755f58d27bc722c5488118 assets/byg/models/block/cika_door_bottom.json -1fd5bb03ddff045d543bbda9e8762ef3fbef74a6 assets/byg/models/block/cika_door_bottom_hinge.json -eb16090931562f07122cddd222e4e9418b9746fa assets/byg/models/block/cika_door_top.json -2a7f1ea09bdf76c91add47cdf5c3c6fc3b4be54c assets/byg/models/block/cika_door_top_hinge.json -86560ee5e158e108cd114e82aa3073740cf248e0 assets/byg/models/block/cika_fence.json -8feb73315cf47b0f75413c5599823c71bdf0d2f5 assets/byg/models/block/cika_fence_gate.json -b6db2e0e1e73401133becbab9a099746eb06a770 assets/byg/models/block/cika_fence_gate_open.json -42d2165b07de96fa37fa1778e4935d6ab5272b73 assets/byg/models/block/cika_fence_gate_wall.json -4fecb9752f8cb6be9892ed65611d5fdf1f09dc6c assets/byg/models/block/cika_fence_gate_wall_open.json -5c50c602c71dd100a41b371b4a0190e3ad6bed88 assets/byg/models/block/cika_fence_post.json -8273bf0ac526eaeb06f93fa20811b5b0f9b8d40c assets/byg/models/block/cika_leaves.json -7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika_leaves_snowy.json -96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika_log.json -c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika_planks.json -f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika_pressure_plate.json -2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika_pressure_plate_down.json -d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika_sapling.json -ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika_slab.json -667387df6f1056509f112ba271b9d014d10c29b4 assets/byg/models/block/cika_slab_top.json -869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika_stairs.json -37d8526d628e939746fa4329b3237ca573f22907 assets/byg/models/block/cika_stairs_inner.json -d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika_stairs_outer.json -c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika_trapdoor_bottom.json -c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika_trapdoor_open.json -0f30e72e84531b3d6d613373ab71dd3a879cebaf assets/byg/models/block/cika_trapdoor_top.json -ea609e86e0e63aed18f9e92b034fc11af52ef2f9 assets/byg/models/block/cika_wood.json -bdf49e36532585b5b5b2db8ed61b17d5a1c2e3e9 assets/byg/models/block/cypress_bookshelf.json -3d65c0eb8f729fc119a1f3e4b01db0fc8503b358 assets/byg/models/block/cypress_button.json -daaa1ff636b6076a787e07439b1c460766dc20d1 assets/byg/models/block/cypress_button_inventory.json -3fcd6ca99f4aa6157ed76c842796c312c540fca7 assets/byg/models/block/cypress_button_pressed.json -48735a4456a1503e6945285e207490674162fdca assets/byg/models/block/cypress_crafting_table.json -3cc3da8203d317e0ce58e8c5eb2721b45ae390f1 assets/byg/models/block/cypress_door_bottom.json -5a8c42fa4bf3318f04da0925edfe1f09a6011951 assets/byg/models/block/cypress_door_bottom_hinge.json -065f336487f18e17361888ddaaa9bcdb4b1648c3 assets/byg/models/block/cypress_door_top.json -aacc54da619b8fd02a9abbf6b2dd471e5f231e13 assets/byg/models/block/cypress_door_top_hinge.json -8faa1548a6315cf7c78f80e4e741dfa12c3969fd assets/byg/models/block/cypress_fence.json -0de581245240221df11568d426898e83ef74b3e6 assets/byg/models/block/cypress_fence_gate.json -e6d14fb5066fed64c9541963dd7b70f66d784a59 assets/byg/models/block/cypress_fence_gate_open.json -15cb8b853d109f7922c6c557f8aed40a930dca13 assets/byg/models/block/cypress_fence_gate_wall.json -2a819545d5416489110f2c5dd8c4904a652fea95 assets/byg/models/block/cypress_fence_gate_wall_open.json -75e33321d34e2e787c45200c9bd38feaefe66618 assets/byg/models/block/cypress_fence_post.json -90deed53c54c2be689e626becf9e83283acc806f assets/byg/models/block/cypress_leaves.json -8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress_leaves_snowy.json -dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress_log.json -c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress_planks.json -c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress_pressure_plate.json -9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress_pressure_plate_down.json -a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress_sapling.json -0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress_slab.json -55a7d16cc6ce2440632aba1f5c6d49c35e9a4da5 assets/byg/models/block/cypress_slab_top.json -b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress_stairs.json -c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress_stairs_inner.json -c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress_stairs_outer.json -e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress_trapdoor_bottom.json -bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress_trapdoor_open.json -4be848d813d65b3d7c66300f924dba25f677dba6 assets/byg/models/block/cypress_trapdoor_top.json -8e10baca50495ea8c4f12fa54722e824ae262b38 assets/byg/models/block/cypress_wood.json -b93df8197bda1b32ddf52e34fd1ad6c27b771615 assets/byg/models/block/ebony_bookshelf.json -76cd46330236e92926b217c076af66da805c23f0 assets/byg/models/block/ebony_button.json -c830cefb803bdbb8b0e876b9e90f3bde62a082e6 assets/byg/models/block/ebony_button_inventory.json -e3462900ba6d457c2aa2c96d24a2155c05592314 assets/byg/models/block/ebony_button_pressed.json -d3b2e6ae17c21ffaf3bead7a79cb3f03724ad529 assets/byg/models/block/ebony_crafting_table.json -cacae4a007bd19eed1ec4a3611cc143028ad14ad assets/byg/models/block/ebony_door_bottom.json -7ad4ae8c86b7683682a3c32888e9af799b467236 assets/byg/models/block/ebony_door_bottom_hinge.json -ebb92b99029121c1a7b6228088d7aec2c0e9ab5b assets/byg/models/block/ebony_door_top.json -27f89fa53bb5e1978532bedf299c3eeacbf513fb assets/byg/models/block/ebony_door_top_hinge.json -2aa0fd88c46608d1892fd02d8cc2a15eafb0a54c assets/byg/models/block/ebony_fence.json -7853de16757a84e50014845c56485675285ccc4a assets/byg/models/block/ebony_fence_gate.json -623aabce821beab1ddc3384c64ccb0af843af02f assets/byg/models/block/ebony_fence_gate_open.json -75ed72e58a4714deef390e7a7c0b68d9c46bc1cc assets/byg/models/block/ebony_fence_gate_wall.json -98555849999e40d33542de797cf1b39f1d8f8e21 assets/byg/models/block/ebony_fence_gate_wall_open.json -b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony_fence_post.json -2bc5e8035e080a279e7169b2d7f293f61c727841 assets/byg/models/block/ebony_leaves.json -5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony_leaves_snowy.json -9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony_log.json -2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony_planks.json -0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony_pressure_plate.json -a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony_pressure_plate_down.json -60ec91c07896435780b7cd33fd6da69670198f8d assets/byg/models/block/ebony_sapling.json -607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony_slab.json -871149a9d367aa279b5bc4f44fe9dccb20d51c06 assets/byg/models/block/ebony_slab_top.json -9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony_stairs.json -41d73969017926ed2daee4ff4034e6d5622e9da4 assets/byg/models/block/ebony_stairs_inner.json -913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony_stairs_outer.json -f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony_trapdoor_bottom.json -631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony_trapdoor_open.json -5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony_trapdoor_top.json -d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony_wood.json +b30f441c3c157109846ed8b851ae3fd1a8c7436a assets/byg/blockstates/aspen_bookshelf.json +b5c900c1aac808526360ed0175a497b1a382b433 assets/byg/blockstates/aspen_button.json +fd3329c171e82f85a18f706ba33da293d70445c8 assets/byg/blockstates/aspen_crafting_table.json +ec33f2ed070a0abe26a29210410740cb34ecf9bb assets/byg/blockstates/aspen_door.json +1062037f8303186ebdee325277f3536a5c1598f8 assets/byg/blockstates/aspen_fence.json +9102ffbed0ac6db820bc9669b9a93da58866cff7 assets/byg/blockstates/aspen_fence_gate.json +29d25252851409b25de70e0ba0211509fefcdc9f assets/byg/blockstates/aspen_leaves.json +5f5ca758a60e2c53d600c1cffd7962c03ca4b840 assets/byg/blockstates/aspen_log.json +48cdfbae2ce7ca6707f724911272fe81f9d8ddf1 assets/byg/blockstates/aspen_planks.json +cdc7e6b1223736a93f84dceb1576768bb9e48230 assets/byg/blockstates/aspen_pressure_plate.json +ad4ce10bc6c38899edd4bfec7d1a51b40e564f16 assets/byg/blockstates/aspen_sapling.json +5df218daa64d454008ee4627af709c02f76e1fc5 assets/byg/blockstates/aspen_slab.json +ebc382c911294f10130ea6accdd3bbe6d04fa01e assets/byg/blockstates/aspen_stairs.json +a1cf8cc2fd4e08745aaedb95ca8d8aa565c532b9 assets/byg/blockstates/aspen_trapdoor.json +9ed8e80457466b15e98e82b2d6c9811ac8cdc009 assets/byg/blockstates/aspen_wood.json +9b530553a60965f2c1d6df95e793ca5d5df668e7 assets/byg/blockstates/baobab_bookshelf.json +9494e776824d175009ab0c64293294a955c2b1d6 assets/byg/blockstates/baobab_button.json +a29d366559c6ddc55a2edbb7c31ffa202a6a967d assets/byg/blockstates/baobab_crafting_table.json +6e770f770815f5eefff82fb64659193468c11f3a assets/byg/blockstates/baobab_door.json +3e6fce83ee8e0c3f83ef1a4764cfba79439723de assets/byg/blockstates/baobab_fence.json +11d39189a8f092501cbf9c41d92ec8f99747c96f assets/byg/blockstates/baobab_fence_gate.json +cb8e0c689ba19dc671b9fbb7810e2f1bc3c2ece4 assets/byg/blockstates/baobab_leaves.json +75f715480b91e2e6daec947096217326ba39ea3d assets/byg/blockstates/baobab_log.json +71b82ac2d1698b5da5848e78d364b140f6ae696f assets/byg/blockstates/baobab_planks.json +8b556ed43bcfaddb28ddb4dad0724c2489c9e1e4 assets/byg/blockstates/baobab_pressure_plate.json +9a7979c28f981ba020325dafa75220ebc62a016d assets/byg/blockstates/baobab_sapling.json +5a90e48e6353dd15f5a1c9f676049550965a1599 assets/byg/blockstates/baobab_slab.json +46bc1593dab72984f0f50b93879ff5e72529b25a assets/byg/blockstates/baobab_stairs.json +9d16692195b2262dc3f385ff20dc0441d69498ae assets/byg/blockstates/baobab_trapdoor.json +a407a88762140e840178fe0cc1a9f2fa6fdd7782 assets/byg/blockstates/baobab_wood.json +456c6bb8f7cced890ba8c4bc49319b70d2e9fb97 assets/byg/blockstates/blue_enchanted_bookshelf.json +22ab3ec5237ade7b7763133ce7c0ed28bb28576a assets/byg/blockstates/blue_enchanted_button.json +aea28f311eec3ba4950d8fef2ef809de55b5ebe0 assets/byg/blockstates/blue_enchanted_crafting_table.json +2285fbe7ad192e19b9d52f3f09c6b20972c7fb05 assets/byg/blockstates/blue_enchanted_door.json +a8c0e87fb742bb27bd421145b35983ee3ed5b28e assets/byg/blockstates/blue_enchanted_fence.json +1fdcdad4d62f7529880aef2e8469753b241e61a2 assets/byg/blockstates/blue_enchanted_fence_gate.json +5abfba409f2ab105c80413dc1d386dcf2582a41d assets/byg/blockstates/blue_enchanted_leaves.json +beda7164cea919a803a0860ca97834050fda4120 assets/byg/blockstates/blue_enchanted_log.json +b1446b58b1422b8fa6fe2c743db666a5f3912d73 assets/byg/blockstates/blue_enchanted_planks.json +77e5d35fe49fc200e0c5ae18acb24645fcef1610 assets/byg/blockstates/blue_enchanted_pressure_plate.json +64e13153b23b1bd0b36e3921911497736cc30fe1 assets/byg/blockstates/blue_enchanted_sapling.json +845c52c88cea1f36eec88599489d6bd6da3d3dc0 assets/byg/blockstates/blue_enchanted_slab.json +b663397ca131c3809a264273db49bb3cbaa804f6 assets/byg/blockstates/blue_enchanted_stairs.json +ca04d4d0c482f697ac997c18cd672872d6d5574b assets/byg/blockstates/blue_enchanted_trapdoor.json +84b6d65765fdd81c70b72b26aaacf8356b43de40 assets/byg/blockstates/blue_enchanted_wood.json +11d9fdb3f3fb28605dc1813efddbc0769c7376e7 assets/byg/blockstates/bulbis_bookshelf.json +cdc4bb75ce5f65a4105e76f022b24c022329daaa assets/byg/blockstates/bulbis_button.json +d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_table.json +e76b9975b21af881fb254fb3b95a03656e34a48c assets/byg/blockstates/bulbis_door.json +05ea3dbc2d1cf74164eccace12632d07284bebfd assets/byg/blockstates/bulbis_fence.json +52f49d50d9a2b1ff65a4ef5579ae87edfe01fa68 assets/byg/blockstates/bulbis_fence_gate.json +aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json +650dfec098bab994309a39150c03ba8bb96103cf assets/byg/blockstates/bulbis_planks.json +93cd0d54e1ed8a0ed2fb7846904e437aa050cf7b assets/byg/blockstates/bulbis_pressure_plate.json +5421ac9b41c223ebab50565824a59307cc9d2662 assets/byg/blockstates/bulbis_slab.json +cd66b534707514f920646728e836d22ba63aba3e assets/byg/blockstates/bulbis_stairs.json +f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json +403946f133711ef34624713f7cb037cc9d4bd29a assets/byg/blockstates/bulbis_trapdoor.json +34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_wood.json +2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json +9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json +c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_table.json +810228e6611128342093cc7b1170ea67d2de7c6b assets/byg/blockstates/cherry_door.json +7837301596305f89a623a2e8f00ae80d4b69c68d assets/byg/blockstates/cherry_fence.json +5f4004b4ebee91256b09d5170dc6000b6482f836 assets/byg/blockstates/cherry_fence_gate.json +cac2a6bdf27098f538aad8afa1ef7a4e197d36e6 assets/byg/blockstates/cherry_log.json +b358d54ecbc20cd095b8a3190ecd0b6e5e92d8a1 assets/byg/blockstates/cherry_planks.json +18a4e50ded54706438caa3fdbab555de8b887375 assets/byg/blockstates/cherry_pressure_plate.json +13b503f19ea9f6b51671fbd47d4222676aab3a9d assets/byg/blockstates/cherry_slab.json +030349e42e73bbffc5fbdc60e2fb86c923a78355 assets/byg/blockstates/cherry_stairs.json +751ced15dcb317710bc594b5345beeef56e1615b assets/byg/blockstates/cherry_trapdoor.json +8093ed1c2a68e88868b09c31773f388295496eff assets/byg/blockstates/cherry_wood.json +4a3ba90f77e5b20c00636a9fddbdcdaa95556993 assets/byg/blockstates/cika_bookshelf.json +51eb709f9dd4702a5060327b3508fff7aeffd7ed assets/byg/blockstates/cika_button.json +30516f8e13ffb9c627bc8d5183b1b5fd00b18174 assets/byg/blockstates/cika_crafting_table.json +3b05bb426e59fb1ab0b3c7e66652da876cb831f9 assets/byg/blockstates/cika_door.json +cf27985827685ce0c53261402375bd0d7aa1ad38 assets/byg/blockstates/cika_fence.json +d46011fcb0eb1a993ba87cf2b70058331e5ba961 assets/byg/blockstates/cika_fence_gate.json +2437bbe06265b1d51a2bbedc21303b8a882a39ad assets/byg/blockstates/cika_leaves.json +2f4988eae476c2e0f08cb478c437ef572e360dcb assets/byg/blockstates/cika_log.json +233e151eb926da2ca9c1bf144ee815fc55c043ed assets/byg/blockstates/cika_planks.json +bc03f8c8b0e1bf4d2b3887e06ba7d7cb0701454b assets/byg/blockstates/cika_pressure_plate.json +1faa7bd9a8275098243926345e4b17a5d6041a45 assets/byg/blockstates/cika_sapling.json +34f068c89083814a3829f44ef7721bce9776971b assets/byg/blockstates/cika_slab.json +2c4e481c519b39c19fef8943c401c33447bba0fc assets/byg/blockstates/cika_stairs.json +51180b1bd9b44f829879c95433794894f904ea66 assets/byg/blockstates/cika_trapdoor.json +e44b08dca8032672db8b041d632dbcd3be644817 assets/byg/blockstates/cika_wood.json +2f90dccadf676a68cc434d058f16c1745f436fc2 assets/byg/blockstates/cypress_bookshelf.json +7f11b23b79d4ad7decd6a688a1de3b9cc6dfdf40 assets/byg/blockstates/cypress_button.json +9ae2c63c958ade5f3c3c8fb085dc799b6d3e3700 assets/byg/blockstates/cypress_crafting_table.json +0eceb43bf89018ba2116fb858cc0f0fa3eb450d4 assets/byg/blockstates/cypress_door.json +b2fd9cbc00821348f1c6a01570a99c6068f8cd31 assets/byg/blockstates/cypress_fence.json +050aae7a7841ea65d45c2e3d3cbf119ba89afabb assets/byg/blockstates/cypress_fence_gate.json +b68b8479abbd2fcb55d41803b00a7c86dc98107f assets/byg/blockstates/cypress_leaves.json +64ea91cd921cae787bcc4b1e9ae565729d3cf836 assets/byg/blockstates/cypress_log.json +05846aded161d6f08b10912c0d5bec70ba657cfb assets/byg/blockstates/cypress_planks.json +0434a174a2be6e8bc6aa359c67a1fc07979c50f8 assets/byg/blockstates/cypress_pressure_plate.json +030b18e58869eb145cca6b43d0a269fcd1c0f459 assets/byg/blockstates/cypress_sapling.json +18cbd38b265803125299f381d554825cf576e8e9 assets/byg/blockstates/cypress_slab.json +9cc116b20eb50e84ac9b35ba9261fa40d90c990a assets/byg/blockstates/cypress_stairs.json +fe5812f696dfecd2386017c2e904d584d651918b assets/byg/blockstates/cypress_trapdoor.json +5be9d15a21ae48ba0049c936da8eeddb83209941 assets/byg/blockstates/cypress_wood.json +0b58b77abeede946897bbe25202bee8368c9d22f assets/byg/blockstates/ebony_bookshelf.json +114efca25fa48660b167082279d1e00a1acd4860 assets/byg/blockstates/ebony_button.json +14075432b69c040e98b3a7e334647f0ad3da71ec assets/byg/blockstates/ebony_crafting_table.json +cda73dd2076e6c513799543a131625409fa156a9 assets/byg/blockstates/ebony_door.json +6c61f8ffa9fde9c16aa710bef6bb1e5ae739aa49 assets/byg/blockstates/ebony_fence.json +7f5a17bb8734ffa2664ecfe792d8936417286f17 assets/byg/blockstates/ebony_fence_gate.json +d74089c995e6affbc74a457cff279aaa1ac02a46 assets/byg/blockstates/ebony_leaves.json +68e5d032896e80ea64fd5ba48c6a8b0e9e009c7f assets/byg/blockstates/ebony_log.json +8b3aaf18e34e22e4f13e124a3b28aed80666de91 assets/byg/blockstates/ebony_planks.json +34f5626530e0f3a2a677cef41c1735d250e643ee assets/byg/blockstates/ebony_pressure_plate.json +1d6db1f12bffcadbba4b578c13e1aed3210760a7 assets/byg/blockstates/ebony_sapling.json +d698358e14d5b800a34701c887b3c102420d37db assets/byg/blockstates/ebony_slab.json +159597001403dce617cec0b09015229f82a692fa assets/byg/blockstates/ebony_stairs.json +7093b45027148af44c5a09e2dd072b01d4cc0dd0 assets/byg/blockstates/ebony_trapdoor.json +e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json +cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json +473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json +ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json +2bf3e6875f2c2751989618864aab8594dca74324 assets/byg/models/block/aspen/button_pressed.json +2a4946082bf8a99219734a5a1b0037719801ec10 assets/byg/models/block/aspen/crafting_table.json +b400d8113db2ef9fe9b7c918b964da9607fbffd5 assets/byg/models/block/aspen/door_bottom.json +0c3b6bb17c05ebb10ed2efc27598ee0c9f008d84 assets/byg/models/block/aspen/door_bottom_hinge.json +21335a02142a92dcc64ce7015f15f255cb2fe4b3 assets/byg/models/block/aspen/door_top.json +145d21652351e1c9de9d92c5118e76d97aad6f28 assets/byg/models/block/aspen/door_top_hinge.json +7d38e52981d404291a62a89148371edb08c4521b assets/byg/models/block/aspen/fence.json +180b19690fbadacdfa8ed5291f8011900e36263f assets/byg/models/block/aspen/fence_gate.json +3894c7ee2aaf9fe44ece506c223269c1a1e49ef5 assets/byg/models/block/aspen/fence_gate_open.json +0290d9f0631c5c089d0f53ae9c3af53f69dd34ee assets/byg/models/block/aspen/fence_gate_wall.json +836a5eff00071c22e737f2e2aaf189d93aacd32b assets/byg/models/block/aspen/fence_gate_wall_open.json +daf50a260453b66485cc77994c2bb6812d7e1e0f assets/byg/models/block/aspen/fence_inv.json +69dc1fbecb1981deb8e3780ddf4f7f802176340d assets/byg/models/block/aspen/fence_post.json +6bcb97531d915bed45b5232f401ef2d106b05c57 assets/byg/models/block/aspen/grower_item.json +ee08f30cf4c4531f14782e40f3923425e6ca7933 assets/byg/models/block/aspen/leaves.json +a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen/leaves_snowy.json +7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen/log.json +09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen/planks.json +5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen/pressure_plate.json +1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen/pressure_plate_down.json +c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen/slab.json +8b9b48288da793a220e7cf839a7e0af136c92b16 assets/byg/models/block/aspen/slab_top.json +ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen/stairs.json +be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen/stairs_inner.json +4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen/stairs_outer.json +0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/block/aspen/trapdoor.json +76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen/trapdoor_bottom.json +d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen/trapdoor_open.json +f0307f9818774087d2220c7bf39678414ee734ef assets/byg/models/block/aspen/trapdoor_top.json +95a22561722879a34775e020a8505278b435c747 assets/byg/models/block/aspen/wood.json +24f0c0973b6317415088e96958133b02b8c8701e assets/byg/models/block/baobab/bookshelf.json +07843ab609e2ed5d8c2bec533b20151e574ac689 assets/byg/models/block/baobab/button.json +73668cdfb040d89a3d9e02f465b7972f5ad5ec44 assets/byg/models/block/baobab/button_inventory.json +b6b4024eb2fa6d04d310d59afec6be0cb3669215 assets/byg/models/block/baobab/button_pressed.json +9dda473d195d670fdc118783ed914ee2eb9f9cae assets/byg/models/block/baobab/crafting_table.json +929262f73d154eea8176b5751cd39eb4db85e46f assets/byg/models/block/baobab/door_bottom.json +548fb33d0edaed51f9ec57b2bb8af8a84dfca3aa assets/byg/models/block/baobab/door_bottom_hinge.json +016c61a08b4c977dfca8c0b66f43dca2848cdcc6 assets/byg/models/block/baobab/door_top.json +9bdd88660bda76acef39ee3fb40b89da903969f2 assets/byg/models/block/baobab/door_top_hinge.json +cd99ed36ea1a0465079ed695201636aa827428e3 assets/byg/models/block/baobab/fence.json +7f9a54e0f109af35ef589d840771b29b2fb03c4c assets/byg/models/block/baobab/fence_gate.json +db06b19f47aa1a3d943a69404d325d720bcc50bf assets/byg/models/block/baobab/fence_gate_open.json +83eb28eb0430ecfb7e99d4306635d3c962fce1c2 assets/byg/models/block/baobab/fence_gate_wall.json +f29f2504f0dd6d6cdcf0c4a660ea2943cba748b3 assets/byg/models/block/baobab/fence_gate_wall_open.json +34529c51b201e26a237210ee7dfe86902b7c3b60 assets/byg/models/block/baobab/fence_inv.json +df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab/fence_post.json +09c4fb1513ee3f51064da761c3706a1bc7f54c65 assets/byg/models/block/baobab/grower_item.json +4c154d63eb511ab0da68ce19bbc88bc0a82808f8 assets/byg/models/block/baobab/leaves.json +224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab/leaves_snowy.json +3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab/log.json +1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab/planks.json +548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab/pressure_plate.json +f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure_plate_down.json +84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab/slab.json +095d0b898c8418b3fd79da96cd9a60aef7b72234 assets/byg/models/block/baobab/slab_top.json +17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab/stairs.json +76cd7c13e8a472c170bee401f53816a7146883d3 assets/byg/models/block/baobab/stairs_inner.json +36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab/stairs_outer.json +1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/block/baobab/trapdoor.json +71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab/trapdoor_bottom.json +67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab/trapdoor_open.json +6d9421e7af02d85635301868cf30b019383f40d4 assets/byg/models/block/baobab/trapdoor_top.json +2a1b0e89f7858eae90274e135d83506016780a95 assets/byg/models/block/baobab/wood.json +342ea09ac25e8ff00beb042c6f15c5f87a3fff9b assets/byg/models/block/blue_enchanted/bookshelf.json +903b94423177dc6cbca0365f40b125357c38939e assets/byg/models/block/blue_enchanted/button.json +84acdb5c60d5523d8495329660cb63f2ee6b28c2 assets/byg/models/block/blue_enchanted/button_inventory.json +3d1b62263487869a2ba6b589357bc8e9aea5422b assets/byg/models/block/blue_enchanted/button_pressed.json +b5ccb0c95ea37c1f21ec6ecd56f42af33c6d5a84 assets/byg/models/block/blue_enchanted/crafting_table.json +d425e1b470fa2311bf39ca9023a20593929c761d assets/byg/models/block/blue_enchanted/door_bottom.json +b587f8eb21d159390db55ab8e3901090c0d73eee assets/byg/models/block/blue_enchanted/door_bottom_hinge.json +be454095ca2d89d5760f75b886635bc50e4fae41 assets/byg/models/block/blue_enchanted/door_top.json +748faf2eb6c9dc10dc3bdda258aeb50c79fa3d45 assets/byg/models/block/blue_enchanted/door_top_hinge.json +93f9e0b6d0f86a45603e1946f33657a73072a2e4 assets/byg/models/block/blue_enchanted/fence.json +258440a4812ac1074a0b55fcca031d1c741376e8 assets/byg/models/block/blue_enchanted/fence_gate.json +ac35dd46cb7bfcbfb120542d1999ce5db459249a assets/byg/models/block/blue_enchanted/fence_gate_open.json +737a7fad5fc148a658a9f70faaebcc00988d8488 assets/byg/models/block/blue_enchanted/fence_gate_wall.json +add286acac4cd6e672144ca2bc0053b65226e980 assets/byg/models/block/blue_enchanted/fence_gate_wall_open.json +de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted/fence_inv.json +77b409997fe27d49c4942575e6a751dd1b15c17f assets/byg/models/block/blue_enchanted/fence_post.json +6690be3be333d7427f15a4124d2a9020118ab5d7 assets/byg/models/block/blue_enchanted/grower_item.json +6f20986996d0fd8e995a1895e0d95303f967c29f assets/byg/models/block/blue_enchanted/leaves.json +30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted/leaves_snowy.json +fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted/log.json +e2fd0bbb982161d06a3c5359113df56fb96df5ab assets/byg/models/block/blue_enchanted/planks.json +f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted/pressure_plate.json +ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted/pressure_plate_down.json +ddfaf3a3114a8727610eeb2a27663ad09f3bd187 assets/byg/models/block/blue_enchanted/slab.json +a6f663a7b9b3dde3ae9a7c7987073a8a19ade11b assets/byg/models/block/blue_enchanted/slab_top.json +eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/stairs.json +5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted/stairs_inner.json +615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted/stairs_outer.json +39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/block/blue_enchanted/trapdoor.json +dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted/trapdoor_bottom.json +470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted/trapdoor_open.json +fd2b82aae72fea322eb7cdc2e60f4ad1d064e9f1 assets/byg/models/block/blue_enchanted/trapdoor_top.json +a63365bae6d564b24bdb318370143249497bbdad assets/byg/models/block/blue_enchanted/wood.json +9f3ef59e8c04f55c28783a40933f433b7b1387ff assets/byg/models/block/bulbis/bookshelf.json +3b2faa52752790a21cf55466d1b33ccfec4e0085 assets/byg/models/block/bulbis/button.json +7177ac629742d77d2bd4b21443e06ba86afd7fa3 assets/byg/models/block/bulbis/button_inventory.json +c4c6062f9fb44f2016e7a314af6df8eec67e9279 assets/byg/models/block/bulbis/button_pressed.json +fcd7c1a6d62498cc2d16eba55ae1ccb14dba5e7c assets/byg/models/block/bulbis/crafting_table.json +a642b309fe508adcbf2a2b49470e7b1854dba57b assets/byg/models/block/bulbis/door_bottom.json +96b605f552035bb647603df97556bf2be301878b assets/byg/models/block/bulbis/door_bottom_hinge.json +fdf7fa5f81165b8c00825d07385ee17675cb1b95 assets/byg/models/block/bulbis/door_top.json +dc36d5affb1a63ab9bf1257f0fa91ff6d4d5d92a assets/byg/models/block/bulbis/door_top_hinge.json +302e666e93c7c4c2c87c95a7aea50ddc27c60208 assets/byg/models/block/bulbis/fence.json +5e7637d0afb0425001fa45251d09f1ffbf6020d7 assets/byg/models/block/bulbis/fence_gate.json +7d27266056ef31574bfc19f5fd1b33638dbe66ad assets/byg/models/block/bulbis/fence_gate_open.json +fc210cd930ed68bdec95a982b1366f4a02ec4860 assets/byg/models/block/bulbis/fence_gate_wall.json +97fe5fe95b7751bc98cdf7d427ff852f084039c4 assets/byg/models/block/bulbis/fence_gate_wall_open.json +8cbcfd0f20c708f6620a70b3e5f1c76a04771606 assets/byg/models/block/bulbis/fence_inv.json +4dacfe5197a8d22fe04c6260d47378a44efdf429 assets/byg/models/block/bulbis/fence_post.json +c611670729691d4e63ba20dc76dd4831e76dae28 assets/byg/models/block/bulbis/grower_item.json +f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis/log.json +d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis/planks.json +25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis/pressure_plate.json +eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis/pressure_plate_down.json +6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis/slab.json +3c49ab33b91ebcfaa455a5e479c1e79c3cdea16e assets/byg/models/block/bulbis/slab_top.json +fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis/stairs.json +35c77b8c5bef56b75ec9bd9f77bda8c07eb3e038 assets/byg/models/block/bulbis/stairs_inner.json +f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis/stairs_outer.json +38bee46bfbb50d6a6a7d336c53ae2e4a6f5f6621 assets/byg/models/block/bulbis/trapdoor.json +56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis/trapdoor_bottom.json +c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis/trapdoor_open.json +00e5df9209acfce5ae98613398d022e942a26895 assets/byg/models/block/bulbis/trapdoor_top.json +a5f7f77a368e842399c01fedf858b142186091bf assets/byg/models/block/bulbis/wood.json +55419b8445de262fc9c14a2d1afc29ee3cc2d6d9 assets/byg/models/block/cherry/bookshelf.json +b61b724bd5d1b23f60a694ade93df7f9c0c5439d assets/byg/models/block/cherry/button.json +1b676842159db22e820b6b2e2b972691c2a66636 assets/byg/models/block/cherry/button_inventory.json +106c0ae5bd00115b3e73999bd274abd4eff83533 assets/byg/models/block/cherry/button_pressed.json +ef09392bff11a9cb0d8cf7b69d01964dd95a1e18 assets/byg/models/block/cherry/crafting_table.json +42cf930389a7420578a4294e014b47ca56e1237b assets/byg/models/block/cherry/door_bottom.json +c83212fc7c9175c1e8c820e96501dfbdb873a84e assets/byg/models/block/cherry/door_bottom_hinge.json +a677d914969547e2293587e2489b02fa89dfa1b9 assets/byg/models/block/cherry/door_top.json +33ab247625af5e119c513be35d596af9bb71681f assets/byg/models/block/cherry/door_top_hinge.json +7ef922a47c2d8ae80b808efa7a9a2cdb188aee97 assets/byg/models/block/cherry/fence.json +7a8e50369a71e11f2864b0bb75dba0461031efe3 assets/byg/models/block/cherry/fence_gate.json +5b49884019ee143a8e963e97abca5f8c5e43a1c4 assets/byg/models/block/cherry/fence_gate_open.json +949313b622a8222938acb430f6a89611845549cb assets/byg/models/block/cherry/fence_gate_wall.json +29078a270340acc30c6d60750051ed70597de05e assets/byg/models/block/cherry/fence_gate_wall_open.json +ea0814753d2b3957c50080ff987d3a9fe66e4a99 assets/byg/models/block/cherry/fence_inv.json +d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry/fence_post.json +093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry/log.json +bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry/planks.json +c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry/pressure_plate.json +f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry/pressure_plate_down.json +e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry/slab.json +1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry/slab_top.json +fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry/stairs.json +26b9d1ca396822f5f1a09b1ce06b38653fa4ef83 assets/byg/models/block/cherry/stairs_inner.json +1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry/stairs_outer.json +c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/block/cherry/trapdoor.json +91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry/trapdoor_bottom.json +36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry/trapdoor_open.json +fb80e8dd89c2212bc3f597edaf0dee479c54b85c assets/byg/models/block/cherry/trapdoor_top.json +bbd3d4453849adc0f9c3e7e28e70a8451ec4a782 assets/byg/models/block/cherry/wood.json +8e70925b7477898d4bd0df33ff28ee7249d375d3 assets/byg/models/block/cika/bookshelf.json +cc495384bec10638db5ddb6cc9faf711ff1c5232 assets/byg/models/block/cika/button.json +ca5f79439846633630eea472e5cad307e30bd453 assets/byg/models/block/cika/button_inventory.json +8fe475630a162cff09e718dea1a53e745d48bd4d assets/byg/models/block/cika/button_pressed.json +ec7f5ef0c1ce4a2adf6ebd242c95d8411412cb3e assets/byg/models/block/cika/crafting_table.json +9fad1795f6acf907f7755f58d27bc722c5488118 assets/byg/models/block/cika/door_bottom.json +1fd5bb03ddff045d543bbda9e8762ef3fbef74a6 assets/byg/models/block/cika/door_bottom_hinge.json +eb16090931562f07122cddd222e4e9418b9746fa assets/byg/models/block/cika/door_top.json +2a7f1ea09bdf76c91add47cdf5c3c6fc3b4be54c assets/byg/models/block/cika/door_top_hinge.json +595542833ae7a0607cad0d33a76d06e09db6c949 assets/byg/models/block/cika/fence.json +8feb73315cf47b0f75413c5599823c71bdf0d2f5 assets/byg/models/block/cika/fence_gate.json +b6db2e0e1e73401133becbab9a099746eb06a770 assets/byg/models/block/cika/fence_gate_open.json +42d2165b07de96fa37fa1778e4935d6ab5272b73 assets/byg/models/block/cika/fence_gate_wall.json +4fecb9752f8cb6be9892ed65611d5fdf1f09dc6c assets/byg/models/block/cika/fence_gate_wall_open.json +86560ee5e158e108cd114e82aa3073740cf248e0 assets/byg/models/block/cika/fence_inv.json +5c50c602c71dd100a41b371b4a0190e3ad6bed88 assets/byg/models/block/cika/fence_post.json +d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika/grower_item.json +8273bf0ac526eaeb06f93fa20811b5b0f9b8d40c assets/byg/models/block/cika/leaves.json +7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika/leaves_snowy.json +96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika/log.json +c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika/planks.json +f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika/pressure_plate.json +2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika/pressure_plate_down.json +ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json +667387df6f1056509f112ba271b9d014d10c29b4 assets/byg/models/block/cika/slab_top.json +869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika/stairs.json +37d8526d628e939746fa4329b3237ca573f22907 assets/byg/models/block/cika/stairs_inner.json +d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika/stairs_outer.json +93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/block/cika/trapdoor.json +c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika/trapdoor_bottom.json +c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika/trapdoor_open.json +0f30e72e84531b3d6d613373ab71dd3a879cebaf assets/byg/models/block/cika/trapdoor_top.json +ea609e86e0e63aed18f9e92b034fc11af52ef2f9 assets/byg/models/block/cika/wood.json +bdf49e36532585b5b5b2db8ed61b17d5a1c2e3e9 assets/byg/models/block/cypress/bookshelf.json +3d65c0eb8f729fc119a1f3e4b01db0fc8503b358 assets/byg/models/block/cypress/button.json +daaa1ff636b6076a787e07439b1c460766dc20d1 assets/byg/models/block/cypress/button_inventory.json +3fcd6ca99f4aa6157ed76c842796c312c540fca7 assets/byg/models/block/cypress/button_pressed.json +48735a4456a1503e6945285e207490674162fdca assets/byg/models/block/cypress/crafting_table.json +3cc3da8203d317e0ce58e8c5eb2721b45ae390f1 assets/byg/models/block/cypress/door_bottom.json +5a8c42fa4bf3318f04da0925edfe1f09a6011951 assets/byg/models/block/cypress/door_bottom_hinge.json +065f336487f18e17361888ddaaa9bcdb4b1648c3 assets/byg/models/block/cypress/door_top.json +aacc54da619b8fd02a9abbf6b2dd471e5f231e13 assets/byg/models/block/cypress/door_top_hinge.json +298524c19f94a429ebddda33eb6f15114631873c assets/byg/models/block/cypress/fence.json +0de581245240221df11568d426898e83ef74b3e6 assets/byg/models/block/cypress/fence_gate.json +e6d14fb5066fed64c9541963dd7b70f66d784a59 assets/byg/models/block/cypress/fence_gate_open.json +15cb8b853d109f7922c6c557f8aed40a930dca13 assets/byg/models/block/cypress/fence_gate_wall.json +2a819545d5416489110f2c5dd8c4904a652fea95 assets/byg/models/block/cypress/fence_gate_wall_open.json +8faa1548a6315cf7c78f80e4e741dfa12c3969fd assets/byg/models/block/cypress/fence_inv.json +75e33321d34e2e787c45200c9bd38feaefe66618 assets/byg/models/block/cypress/fence_post.json +a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress/grower_item.json +90deed53c54c2be689e626becf9e83283acc806f assets/byg/models/block/cypress/leaves.json +8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress/leaves_snowy.json +dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress/log.json +c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress/planks.json +c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress/pressure_plate.json +9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress/pressure_plate_down.json +0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress/slab.json +55a7d16cc6ce2440632aba1f5c6d49c35e9a4da5 assets/byg/models/block/cypress/slab_top.json +b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress/stairs.json +c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress/stairs_inner.json +c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress/stairs_outer.json +beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/block/cypress/trapdoor.json +e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress/trapdoor_bottom.json +bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress/trapdoor_open.json +4be848d813d65b3d7c66300f924dba25f677dba6 assets/byg/models/block/cypress/trapdoor_top.json +8e10baca50495ea8c4f12fa54722e824ae262b38 assets/byg/models/block/cypress/wood.json +b93df8197bda1b32ddf52e34fd1ad6c27b771615 assets/byg/models/block/ebony/bookshelf.json +76cd46330236e92926b217c076af66da805c23f0 assets/byg/models/block/ebony/button.json +c830cefb803bdbb8b0e876b9e90f3bde62a082e6 assets/byg/models/block/ebony/button_inventory.json +e3462900ba6d457c2aa2c96d24a2155c05592314 assets/byg/models/block/ebony/button_pressed.json +d3b2e6ae17c21ffaf3bead7a79cb3f03724ad529 assets/byg/models/block/ebony/crafting_table.json +cacae4a007bd19eed1ec4a3611cc143028ad14ad assets/byg/models/block/ebony/door_bottom.json +7ad4ae8c86b7683682a3c32888e9af799b467236 assets/byg/models/block/ebony/door_bottom_hinge.json +ebb92b99029121c1a7b6228088d7aec2c0e9ab5b assets/byg/models/block/ebony/door_top.json +27f89fa53bb5e1978532bedf299c3eeacbf513fb assets/byg/models/block/ebony/door_top_hinge.json +5d25e4ba013a002a63afdc0653321094ac7b1e09 assets/byg/models/block/ebony/fence.json +7853de16757a84e50014845c56485675285ccc4a assets/byg/models/block/ebony/fence_gate.json +623aabce821beab1ddc3384c64ccb0af843af02f assets/byg/models/block/ebony/fence_gate_open.json +75ed72e58a4714deef390e7a7c0b68d9c46bc1cc assets/byg/models/block/ebony/fence_gate_wall.json +98555849999e40d33542de797cf1b39f1d8f8e21 assets/byg/models/block/ebony/fence_gate_wall_open.json +2aa0fd88c46608d1892fd02d8cc2a15eafb0a54c assets/byg/models/block/ebony/fence_inv.json +b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony/fence_post.json +60ec91c07896435780b7cd33fd6da69670198f8d assets/byg/models/block/ebony/grower_item.json +2bc5e8035e080a279e7169b2d7f293f61c727841 assets/byg/models/block/ebony/leaves.json +5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony/leaves_snowy.json +9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony/log.json +2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony/planks.json +0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony/pressure_plate.json +a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_plate_down.json +607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony/slab.json +871149a9d367aa279b5bc4f44fe9dccb20d51c06 assets/byg/models/block/ebony/slab_top.json +9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony/stairs.json +41d73969017926ed2daee4ff4034e6d5622e9da4 assets/byg/models/block/ebony/stairs_inner.json +913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony/stairs_outer.json +fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/block/ebony/trapdoor.json +f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_bottom.json +631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json +5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony/trapdoor_top.json +d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json -2a41ddc8b5d75708c62d5a1b53ae0fc953feb3a4 assets/byg/models/item/aspen_bookshelf.json -f435515510c23e5ea4d3245bba670b6a50020e3a assets/byg/models/item/aspen_button.json -c673592916b855e4c9138b7ae3422aa447996010 assets/byg/models/item/aspen_crafting_table.json +78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json +65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json +a2848cd275262a16626a23992a1a526914d5c364 assets/byg/models/item/aspen_crafting_table.json 6058b86174918e7a984dce6bae27c57f67849c56 assets/byg/models/item/aspen_door.json -a67931ed3d4f51e3ebbd0113e8ab11fb558bc0d6 assets/byg/models/item/aspen_fence.json -8bf5a3b56b1057859c019509f050019c4c0cd2a3 assets/byg/models/item/aspen_leaves.json -38d6a194a5f73913a97eca781f77bfb6b4206a74 assets/byg/models/item/aspen_log.json -003c7d02949ca1e996078ba778608ac111dd24a3 assets/byg/models/item/aspen_planks.json -a4a903cde601f67eb459cdc5adb5d601c0a5b7c1 assets/byg/models/item/aspen_pressure_plate.json +2f14a53284b4dc5f45b3f39f983a8ce521278395 assets/byg/models/item/aspen_fence.json +3ce228e1a16f8cc4b786be2e91f3b1f76d84dc3a assets/byg/models/item/aspen_leaves.json +7a39c1080f30287cf92be5da8bd8fa33081aaa70 assets/byg/models/item/aspen_log.json +8ccbe3930f4887d6a6f89135d2ea345fefd94ac8 assets/byg/models/item/aspen_planks.json +a9afd845f4e771fb6809dc439def5ee35663016e assets/byg/models/item/aspen_pressure_plate.json 0b5ed255f00030cb3ff1df30d8c51d7b6ea9afb6 assets/byg/models/item/aspen_sapling.json -b44f9ce5f7763b6e4943b553de26557ad277a095 assets/byg/models/item/aspen_slab.json -70e9a656e937b82858cdf57ef6add2081916b748 assets/byg/models/item/aspen_stairs.json -bb89fe9a00e3db29b3100a96affdde9ed207392c assets/byg/models/item/aspen_trapdoor.json -f387d9254642404576e9e3e29be6a8c96c79888f assets/byg/models/item/aspen_wood.json +9ce82435d1aa01ba081186b5f538a4872174885a assets/byg/models/item/aspen_slab.json +95e8459211f1b407f8d766e50791cdb84d2d3263 assets/byg/models/item/aspen_stairs.json +dda37f5ea836cf6231cf342862e02d4c4a8d8e8c assets/byg/models/item/aspen_wood.json faa6be8a2020e22b2de29ec835066d1acb0b57b8 assets/byg/models/item/baobab_boat.json -2736dfa3db6556f5f19714c8d498f8a7d75aaece assets/byg/models/item/baobab_bookshelf.json -ef7cb412cc785f0c8d395007d1a46b774b784a73 assets/byg/models/item/baobab_button.json -53d8f10a777d00e18648cd0f39fcdaa71e5ab0d2 assets/byg/models/item/baobab_crafting_table.json +bb4f3db5a9e8a066e7aa1a568491a3cfb28c2fd3 assets/byg/models/item/baobab_bookshelf.json +1cd0819f3663876c3742743756bb6647d1ca0b5d assets/byg/models/item/baobab_button.json +e07883a7884f530c5951b56b5799b34e4372e6fb assets/byg/models/item/baobab_crafting_table.json 77e287a34be20212e1e8aa1c68551a0435abac2f assets/byg/models/item/baobab_door.json -24bcf89982bed893e004eee5f145ec47c71beeff assets/byg/models/item/baobab_fence.json -cae214bd8eb999707ec8299ac478e5a98cc8b9af assets/byg/models/item/baobab_leaves.json -e62b65c47bfbd1f54c5a3abda2d26b26d8e2c4f3 assets/byg/models/item/baobab_log.json -811bc3c29eedb0f316f0270f2df050892bf1b9a8 assets/byg/models/item/baobab_planks.json -18cefa8faa0bde471bc033e0c77e33dc3eb55b69 assets/byg/models/item/baobab_pressure_plate.json +597fa9d8ef960b994f8a7301f46cd5aa8963c6ab assets/byg/models/item/baobab_fence.json +ca67915d4fd002dc7f62d0f988d8d40e77b579fc assets/byg/models/item/baobab_leaves.json +144b98c07b2e021a36fe7d25d686306373fa4722 assets/byg/models/item/baobab_log.json +8e820316436b1e08bf280070058a83f0c9935542 assets/byg/models/item/baobab_planks.json +b4d3db7e509a15c89df124667a7d6c3e5188bdf6 assets/byg/models/item/baobab_pressure_plate.json 50ba87085b69541ad42bb85171ae33cce565c83c assets/byg/models/item/baobab_sapling.json -bc20310e527da1548678c0a59b51fd6d0f1afadc assets/byg/models/item/baobab_slab.json -03b7abe171962daaf260fc7f680fbf82e821c7af assets/byg/models/item/baobab_stairs.json -1c07c8fd0364342f923360fac1ca207ac8a28b3d assets/byg/models/item/baobab_trapdoor.json -d80889f8626eef81e43fb7f0c1e61bb6a943706a assets/byg/models/item/baobab_wood.json +4e836fbab8a65cf4d797008c44509f3a19d11c05 assets/byg/models/item/baobab_slab.json +86a5a2e864b31515ecca3a0ae6cc91cf21654fca assets/byg/models/item/baobab_stairs.json +fa0f9ab545363bf6c66eb3431ca6672d4730271a assets/byg/models/item/baobab_wood.json 364ec05acaa6d67f772f0dd7c7d3c6c43981148f assets/byg/models/item/blue_enchanted_boat.json -7d3644f31c133e896cdb59c4d8b237373f2d9262 assets/byg/models/item/blue_enchanted_bookshelf.json -5f732627fc4c0ee15eec778dfb6a271f4065603e assets/byg/models/item/blue_enchanted_button.json -9db3f629b539e2e633a8cdbde0331627788218ef assets/byg/models/item/blue_enchanted_crafting_table.json +abc61690d812e1274877796418d2a2de0b596a49 assets/byg/models/item/blue_enchanted_bookshelf.json +9cdf652172d4e90aa597d893adbde9f787a79a98 assets/byg/models/item/blue_enchanted_button.json +587c2b678d69480cbb4f8858d635dcb7db49d2ba assets/byg/models/item/blue_enchanted_crafting_table.json 429b921a774a05b4ef0334e7869b685f468ef6e4 assets/byg/models/item/blue_enchanted_door.json -6fb9c43873685ba7bd64fa383dd360ff03caaec2 assets/byg/models/item/blue_enchanted_fence.json -380c82778540cd6f022c488e9cdfbb6e99bbccee assets/byg/models/item/blue_enchanted_leaves.json -57b24ffc8534b3809f0918c81e07ace48b7bfa14 assets/byg/models/item/blue_enchanted_log.json -a265155fa64db093249c67b8fda1ac6532879c85 assets/byg/models/item/blue_enchanted_planks.json -11dd424bcd0170e575c71a550f4490cff08669a7 assets/byg/models/item/blue_enchanted_pressure_plate.json +2c769b4c33caf2b05b6e487b47ff5234725aa244 assets/byg/models/item/blue_enchanted_fence.json +1da7b06ab294aed045338db636164d57c6536a74 assets/byg/models/item/blue_enchanted_leaves.json +faa99f2398307b4a01735cd99d327748658a41a4 assets/byg/models/item/blue_enchanted_log.json +43a9b7d1d66e10bec791a24437adb0ac3d5af35a assets/byg/models/item/blue_enchanted_planks.json +f61a7bf218e65808e180608e03e5d58a2dd97954 assets/byg/models/item/blue_enchanted_pressure_plate.json df6e5276a0b04b4146d38546530cba58bce7fa75 assets/byg/models/item/blue_enchanted_sapling.json -6c6b7d4aaaaf41ae5544189b4d6f2f17ea503041 assets/byg/models/item/blue_enchanted_slab.json -6d133dc48556d0112a21ccd0a1cf0f91512f5ba9 assets/byg/models/item/blue_enchanted_stairs.json -507919363761d0c195b6f24703dcb31ada9ac4e8 assets/byg/models/item/blue_enchanted_trapdoor.json -ac614eceb30e702ce249b3435d116266aceb378e assets/byg/models/item/blue_enchanted_wood.json -7302f15f7a738cf856d0eb3d7e411394755e607c assets/byg/models/item/bulbis_bookshelf.json -11bf1c9f68c37f557306cac66aeae608b3b2a697 assets/byg/models/item/bulbis_button.json -5821586e299beeb47c3c76c60f5076de955e7a0e assets/byg/models/item/bulbis_crafting_table.json +994145c6950682114ec3ef589b7be385b4be8869 assets/byg/models/item/blue_enchanted_slab.json +2feab092f5685c98b591642a82c08b0337b9138a assets/byg/models/item/blue_enchanted_stairs.json +a4cb1f144302e32010a17f914cb275eb062ef5bb assets/byg/models/item/blue_enchanted_wood.json +a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf.json +6426315883ed77300cec1569a91ed6306d3905e9 assets/byg/models/item/bulbis_button.json +490c0fcfd64530bdd65f2a85319c5c6d756e5f6d assets/byg/models/item/bulbis_crafting_table.json 1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json -568697f5c9accc89a632cbae00af83d6fe45dcbd assets/byg/models/item/bulbis_fence.json +8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence.json 661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json -6232ec108f910e2497aa4b78fa9d61c6d5bcc67a assets/byg/models/item/bulbis_planks.json -e4e1bbe9650f4073ce5b24c67d05c822c376b987 assets/byg/models/item/bulbis_pressure_plate.json -e85566c0cce6c3accfe4d705236b48580cfc4c05 assets/byg/models/item/bulbis_slab.json -7c973aedc12697df0306690a73a30c001544c374 assets/byg/models/item/bulbis_stairs.json -f2056b8b51a75bcd460fc546467ad30e88af4cd6 assets/byg/models/item/bulbis_stem.json -cea43440cb2c4d446121146aeeb3f581e2c91575 assets/byg/models/item/bulbis_trapdoor.json -179fedb24a0d281cf55948f851c22938de4dab22 assets/byg/models/item/bulbis_wood.json +e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json +4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json +9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json +55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json +52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json +1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_wood.json d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json -d31d28976d49400bd7e9a8e9056d9864376336b5 assets/byg/models/item/cherry_bookshelf.json -ed5732472b48092d0667c6cdfe012fe8d054d615 assets/byg/models/item/cherry_button.json -8a39ef10b32eeaac6d28815b3684a9bd6c4949b9 assets/byg/models/item/cherry_crafting_table.json +aa216009bf5130342dc1c1043b4c6305d8993657 assets/byg/models/item/cherry_bookshelf.json +d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.json +24d37586ac1ef398b0ab6687512ea2c74e9c177a assets/byg/models/item/cherry_crafting_table.json 6701e69fee961fa3cafe3637ab9252d1d691c5fb assets/byg/models/item/cherry_door.json -7421ff38d22944fc6d87369676250c7834e54282 assets/byg/models/item/cherry_fence.json -3c96dae67cf6caa215c5afc73fcbdf2212adf0dc assets/byg/models/item/cherry_log.json -4afd993824a2270fc517773eead3639dff772b7f assets/byg/models/item/cherry_planks.json -09ef608b2d7680f4d6c1547a2d5a7003444324e3 assets/byg/models/item/cherry_pressure_plate.json -671865c0d273b1784012ee1c3ccf6289106733e8 assets/byg/models/item/cherry_slab.json -347b47476667ec9ed1230b0e951c785d3d97af59 assets/byg/models/item/cherry_stairs.json -b98caf270c4062571b7ad23d5e276e2852377a2e assets/byg/models/item/cherry_trapdoor.json -a6de76a976c89462eadaafcbd6a883d91a6c5729 assets/byg/models/item/cherry_wood.json +2ca0508ae3f011ab0875c258d9dd0a004b64cd8b assets/byg/models/item/cherry_fence.json +5ca5c2026070205afd31d849c4882b94bb44d141 assets/byg/models/item/cherry_log.json +ed80d846b315f4eb21aa2a4fc3a5b584ffa4107d assets/byg/models/item/cherry_planks.json +2cae4e8da59f8d5cb192c6c772200b5b61b946ec assets/byg/models/item/cherry_pressure_plate.json +767d86f6a59dd9fc0c6af5a89bda1c752343858b assets/byg/models/item/cherry_slab.json +5c51b95d93aae080bb940eb3ae98743bc259bf75 assets/byg/models/item/cherry_stairs.json +c8811da3eda623268e3729042d2ef660fca8118d assets/byg/models/item/cherry_wood.json 50009b1b8338fa245894386cd307a1483260902c assets/byg/models/item/cika_boat.json -e8aa5b4ce19c262fbce40cbc0dc3e57e4366a00b assets/byg/models/item/cika_bookshelf.json -cbf0fcd278b651ff7468c45ef57a9de7c8358dcb assets/byg/models/item/cika_button.json -44b2ef89056645a68f755f62b491f225f66d4f41 assets/byg/models/item/cika_crafting_table.json +2f7c754b022ebf678f21c93d676476a75e27c7dc assets/byg/models/item/cika_bookshelf.json +99756216992f19a473bbb8cb29a5a91f63b075b1 assets/byg/models/item/cika_button.json +660fb89002d646500260d1200f121988d4b3d4f8 assets/byg/models/item/cika_crafting_table.json 5ab0f9e30bea28148174a3bbb3c193711dfd1fa9 assets/byg/models/item/cika_door.json -981943d63794d720070dd44bcd77b936828792b0 assets/byg/models/item/cika_fence.json -3829225fda8f1bdf1cb93b4bae9ed23273a20eb0 assets/byg/models/item/cika_leaves.json -75661b4634aa295b6965b2a78673e13a0f734f47 assets/byg/models/item/cika_log.json -4d58890cd17246419cfeccad9dd883e8583d0c5a assets/byg/models/item/cika_planks.json -a526914b982685199270b7bce46b0a91a07be34d assets/byg/models/item/cika_pressure_plate.json +562ce18f1061a4c17db837b81425a2eec253c2c7 assets/byg/models/item/cika_fence.json +b9f6e475b63f3a86395d511576c0c8262c41fe10 assets/byg/models/item/cika_leaves.json +491c04a3ab103dadfe75225b655cbd36d7940dfa assets/byg/models/item/cika_log.json +f4a01a1c2d74b1d2780e80597f51b506693a7632 assets/byg/models/item/cika_planks.json +af6cb0377220ef4d0b316926cd49c90cdf14b4fe assets/byg/models/item/cika_pressure_plate.json b1fbf364db542513285aa4a7cd55c1f4eafd96d1 assets/byg/models/item/cika_sapling.json -eab4ab2b214b7c786d1684e021d4530907c2eaf4 assets/byg/models/item/cika_slab.json -f45b7d3c6be311dddcc801dc95843cfec9d700aa assets/byg/models/item/cika_stairs.json -b57967dd5c58dd29d9d7a86b8bab1543fcdb8953 assets/byg/models/item/cika_trapdoor.json -1f544581dc2e271cd36b37644d4e3ed7c41f59d2 assets/byg/models/item/cika_wood.json +a6b01df5440d0b9cf7eca070fc1cb1ba1ed2883c assets/byg/models/item/cika_slab.json +f2c767f3f01c2fb97a87f737df7a766d41bf3706 assets/byg/models/item/cika_stairs.json +0495a6e67a0fc165da574f5535a437fc456ebbbe assets/byg/models/item/cika_wood.json 1115843477e3e39471f26b22717d36f32817cbf4 assets/byg/models/item/cypress_boat.json -2384a3fe2fa89bf0ae4a0f331b85411a77f2bca2 assets/byg/models/item/cypress_bookshelf.json -b8107ed4fd70adf461147bb54efaab50eb206a59 assets/byg/models/item/cypress_button.json -1f189bb300f4d3960941075d107f7230e1dcb2fb assets/byg/models/item/cypress_crafting_table.json +c64d221e2469fcc040ca492b5b9e6a37395900a5 assets/byg/models/item/cypress_bookshelf.json +3f78ccf79293769312aac83ae3f2fcb3f6afe976 assets/byg/models/item/cypress_button.json +1a31486948002ca09e6b0ed5b92118e7a109206d assets/byg/models/item/cypress_crafting_table.json 47de2d9214f236ac039c4a62783da8493fb36bb3 assets/byg/models/item/cypress_door.json -1c4bc38f4c51c6c011eb4df3b7a5e67572339db3 assets/byg/models/item/cypress_fence.json -a87bbfd107f869ea32d2faa73acb148981051696 assets/byg/models/item/cypress_leaves.json -c3b7cdf031367e432cd957f075f634d8c7878e7c assets/byg/models/item/cypress_log.json -ba0d97b9bc5fb7c4ad8dc2b5fc9faeefe1b343c7 assets/byg/models/item/cypress_planks.json -3fb6fbbe4c400f7721d15544866e584265c874e0 assets/byg/models/item/cypress_pressure_plate.json +973cdb059784a2eb34f77dea001b9d2b7f8e7ea9 assets/byg/models/item/cypress_fence.json +9cbe70113de8200f2deebbfc5d458be818a4410e assets/byg/models/item/cypress_leaves.json +7a569355989601998d8ad85c4784bfb2d2d71fa3 assets/byg/models/item/cypress_log.json +38acbdb182d2cac8f5a799ea9e1709814b0ffaab assets/byg/models/item/cypress_planks.json +461c62bae2a20c4617eb6c5a8ba4dc6d9f0f98ec assets/byg/models/item/cypress_pressure_plate.json 5b9cec5debe640c2da5fd07465f5b4744a7a0695 assets/byg/models/item/cypress_sapling.json -a9cd53d5bd6f3549dc341e6f01f28c98af0922a3 assets/byg/models/item/cypress_slab.json -ddd4da9af60b209d807793d662bad1f784c9ab41 assets/byg/models/item/cypress_stairs.json -7489fc14b7693662b85372ccf82e40d4a2ad4534 assets/byg/models/item/cypress_trapdoor.json -25741e244adfab7e8e69525c0f8aab8f3547e20c assets/byg/models/item/cypress_wood.json +fd97e91d95ffde72791e2854c2ed8d57fc1a2a05 assets/byg/models/item/cypress_slab.json +29a69284ab32d4f7358302067d7767c4599ed305 assets/byg/models/item/cypress_stairs.json +d66247dd97fcae964984c2ab71708db563f3b4f4 assets/byg/models/item/cypress_wood.json 45839da35dac45b1fa019ca536de6cbd2afbce8c assets/byg/models/item/ebony_boat.json -882060aa29cb44a2a7d31c8c68a6f120fb1ecfbd assets/byg/models/item/ebony_bookshelf.json -2097a924294277837bd73aefed1ccba2085f0941 assets/byg/models/item/ebony_button.json -9ce2127e1fd89db74526e22be78ff30a37e00bdb assets/byg/models/item/ebony_crafting_table.json +295ee2f6286c2368e71d6690681a82d420559d18 assets/byg/models/item/ebony_bookshelf.json +1e6f24bbdf74b5172d3d25d5f1400ef32a579ea4 assets/byg/models/item/ebony_button.json +3dcf588a9659c90e0839461538c7d5342e28821f assets/byg/models/item/ebony_crafting_table.json c3fdda9816205904c9e67c08632bbf936878d5cf assets/byg/models/item/ebony_door.json -c2973d3a2ffb73a1e490d4fd337bf07aa4effade assets/byg/models/item/ebony_fence.json -28c947a9ffb6b64215afb7864ed48f932e945b35 assets/byg/models/item/ebony_leaves.json -ddacb253e1661eeb7eca1130ecb83b19223cd41e assets/byg/models/item/ebony_log.json -835129b5147191b14343dd09839ab17616f507a8 assets/byg/models/item/ebony_planks.json -e104745079cff1d9ee2b3d86e7087e38011876cb assets/byg/models/item/ebony_pressure_plate.json +704318f13d3a73e326587bbf8956e9abc23fe87e assets/byg/models/item/ebony_fence.json +a7552666a20326e57e7e0913ae6dd6659f88a77a assets/byg/models/item/ebony_leaves.json +bede82f15ab2d814bfca0c4062a7eb69790d993d assets/byg/models/item/ebony_log.json +e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.json +3d72c90b1547a7dad403430ad53efb00d855174e assets/byg/models/item/ebony_pressure_plate.json 077f9c32aabcf49216b03cb5ea184b0535b856f4 assets/byg/models/item/ebony_sapling.json -b00a7837960eb11b0a5b3c9dde743d3ba3a4cd34 assets/byg/models/item/ebony_slab.json -bdf7e636f64a72718f82816ef74c75ad2afe77e3 assets/byg/models/item/ebony_stairs.json -be5c1e32405cb4a4b96d365ea0636838862959f5 assets/byg/models/item/ebony_trapdoor.json -16407cb9711e490eba772f4e0fa8280ed003b15b assets/byg/models/item/ebony_wood.json +a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json +98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json +ee030f03a491ef8d7d845da92ffd106d935d4b6c assets/byg/models/item/ebony_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_bookshelf.json new file mode 100644 index 0000000000..dcc1f9385f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json new file mode 100644 index 0000000000..5c912d3bae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/aspen/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/aspen/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/aspen/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/aspen/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/aspen/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/aspen/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/aspen/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/aspen/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/aspen/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_crafting_table.json new file mode 100644 index 0000000000..a33bbd580a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json new file mode 100644 index 0000000000..48205e0e52 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json new file mode 100644 index 0000000000..f3521dbbbe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/aspen/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/aspen/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/aspen/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/aspen/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/aspen/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json new file mode 100644 index 0000000000..e7d74e950c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_leaves.json new file mode 100644 index 0000000000..5c79cb0b80 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_log.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_log.json new file mode 100644 index 0000000000..2fc8d5643e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/aspen/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/aspen/log" + }, + "axis=z": { + "model": "byg:block/aspen/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_planks.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_planks.json new file mode 100644 index 0000000000..d03e55e583 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_pressure_plate.json new file mode 100644 index 0000000000..7dad9b8fb1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/aspen/pressure_plate" + }, + "powered=true": { + "model": "byg:block/aspen/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_sapling.json new file mode 100644 index 0000000000..1ccf0d4b64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json new file mode 100644 index 0000000000..a15044a8f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/aspen/slab_top" + }, + "type=bottom": { + "model": "byg:block/aspen/slab" + }, + "type=double": { + "model": "byg:block/aspen/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json new file mode 100644 index 0000000000..ba8b608a67 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json new file mode 100644 index 0000000000..1c837dd18a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_wood.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_wood.json new file mode 100644 index 0000000000..790a84fd62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/aspen/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/aspen/wood" + }, + "axis=z": { + "model": "byg:block/aspen/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_bookshelf.json new file mode 100644 index 0000000000..80cf0640e6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json new file mode 100644 index 0000000000..bb3f6541f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/baobab/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/baobab/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/baobab/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/baobab/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/baobab/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/baobab/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/baobab/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/baobab/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/baobab/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_crafting_table.json new file mode 100644 index 0000000000..f883f5858b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json new file mode 100644 index 0000000000..3540e8764c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json new file mode 100644 index 0000000000..e731a38a7b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/baobab/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/baobab/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/baobab/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/baobab/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/baobab/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json new file mode 100644 index 0000000000..e1ba415907 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_leaves.json new file mode 100644 index 0000000000..26032fc834 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_log.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_log.json new file mode 100644 index 0000000000..bffcbc03e3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/baobab/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/baobab/log" + }, + "axis=z": { + "model": "byg:block/baobab/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_planks.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_planks.json new file mode 100644 index 0000000000..500fe22598 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_pressure_plate.json new file mode 100644 index 0000000000..05c33bdf12 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/baobab/pressure_plate" + }, + "powered=true": { + "model": "byg:block/baobab/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_sapling.json new file mode 100644 index 0000000000..fc9260d1fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json new file mode 100644 index 0000000000..ae2d4a9e6a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/baobab/slab_top" + }, + "type=bottom": { + "model": "byg:block/baobab/slab" + }, + "type=double": { + "model": "byg:block/baobab/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json new file mode 100644 index 0000000000..3e599e99f5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json new file mode 100644 index 0000000000..35f6c567dc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_wood.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_wood.json new file mode 100644 index 0000000000..4ea16c1447 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/baobab/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/baobab/wood" + }, + "axis=z": { + "model": "byg:block/baobab/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json new file mode 100644 index 0000000000..e6f913985e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json new file mode 100644 index 0000000000..39f748e81d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json new file mode 100644 index 0000000000..506cd1320f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json new file mode 100644 index 0000000000..b2308f23ad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json new file mode 100644 index 0000000000..19577b1aff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/blue_enchanted/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/blue_enchanted/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/blue_enchanted/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/blue_enchanted/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/blue_enchanted/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json new file mode 100644 index 0000000000..3d011a49bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_leaves.json new file mode 100644 index 0000000000..9befb51360 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_log.json new file mode 100644 index 0000000000..a72aafb29d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/blue_enchanted/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/blue_enchanted/log" + }, + "axis=z": { + "model": "byg:block/blue_enchanted/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_planks.json new file mode 100644 index 0000000000..b24fcf9327 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json new file mode 100644 index 0000000000..a8ff62a310 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/blue_enchanted/pressure_plate" + }, + "powered=true": { + "model": "byg:block/blue_enchanted/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sapling.json new file mode 100644 index 0000000000..952aff2e7b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json new file mode 100644 index 0000000000..7fe159a6ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/blue_enchanted/slab_top" + }, + "type=bottom": { + "model": "byg:block/blue_enchanted/slab" + }, + "type=double": { + "model": "byg:block/blue_enchanted/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json new file mode 100644 index 0000000000..b5da9773c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json new file mode 100644 index 0000000000..20474850b4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wood.json new file mode 100644 index 0000000000..981a3baf7f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/blue_enchanted/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/blue_enchanted/wood" + }, + "axis=z": { + "model": "byg:block/blue_enchanted/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_bookshelf.json new file mode 100644 index 0000000000..4b57d92cae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json new file mode 100644 index 0000000000..b96ef63f47 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/bulbis/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/bulbis/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_crafting_table.json new file mode 100644 index 0000000000..20dd882c6b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json new file mode 100644 index 0000000000..8468e0ea26 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json new file mode 100644 index 0000000000..9cd972b333 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/bulbis/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/bulbis/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/bulbis/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/bulbis/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/bulbis/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json new file mode 100644 index 0000000000..f7f5ac800f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_oddity.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_oddity.json new file mode 100644 index 0000000000..4480e9adce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_oddity.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_planks.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_planks.json new file mode 100644 index 0000000000..d317966fb0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_pressure_plate.json new file mode 100644 index 0000000000..6852256dd2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/bulbis/pressure_plate" + }, + "powered=true": { + "model": "byg:block/bulbis/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json new file mode 100644 index 0000000000..b8219db3fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/bulbis/slab_top" + }, + "type=bottom": { + "model": "byg:block/bulbis/slab" + }, + "type=double": { + "model": "byg:block/bulbis/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json new file mode 100644 index 0000000000..884edb8ba8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_stem.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stem.json new file mode 100644 index 0000000000..804dbdeca4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stem.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/bulbis/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/bulbis/log" + }, + "axis=z": { + "model": "byg:block/bulbis/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json new file mode 100644 index 0000000000..a783d4e662 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json new file mode 100644 index 0000000000..d571465f47 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/bulbis/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/bulbis/wood" + }, + "axis=z": { + "model": "byg:block/bulbis/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_bookshelf.json new file mode 100644 index 0000000000..4d739f887e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cherry/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json new file mode 100644 index 0000000000..1890720e0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/cherry/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cherry/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/cherry/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/cherry/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/cherry/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/cherry/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/cherry/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/cherry/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/cherry/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_crafting_table.json new file mode 100644 index 0000000000..c8ff78ff31 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cherry/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json new file mode 100644 index 0000000000..e0f271e0b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json new file mode 100644 index 0000000000..8b4a233179 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/cherry/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/cherry/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/cherry/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/cherry/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/cherry/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json new file mode 100644 index 0000000000..628410825a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_log.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_log.json new file mode 100644 index 0000000000..9b27023d43 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cherry/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cherry/log" + }, + "axis=z": { + "model": "byg:block/cherry/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_planks.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_planks.json new file mode 100644 index 0000000000..e7dfe977df --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cherry/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_pressure_plate.json new file mode 100644 index 0000000000..83f557edb2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/cherry/pressure_plate" + }, + "powered=true": { + "model": "byg:block/cherry/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json new file mode 100644 index 0000000000..b72e64202a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/cherry/slab_top" + }, + "type=bottom": { + "model": "byg:block/cherry/slab" + }, + "type=double": { + "model": "byg:block/cherry/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json new file mode 100644 index 0000000000..e2aa6c9c9d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json new file mode 100644 index 0000000000..02d53d3a27 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_wood.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_wood.json new file mode 100644 index 0000000000..79f03096ae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cherry/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cherry/wood" + }, + "axis=z": { + "model": "byg:block/cherry/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/cika_bookshelf.json new file mode 100644 index 0000000000..262409a4e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_button.json b/Common/src/generated/resources/assets/byg/blockstates/cika_button.json new file mode 100644 index 0000000000..2b3a97b125 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/cika/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cika/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/cika/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/cika/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/cika/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/cika/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/cika/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/cika/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/cika/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/cika_crafting_table.json new file mode 100644 index 0000000000..f413a012b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_door.json b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json new file mode 100644 index 0000000000..c5e842821d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json new file mode 100644 index 0000000000..936e6680d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/cika/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/cika/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/cika/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/cika/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/cika/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json new file mode 100644 index 0000000000..b80595a2fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/cika_leaves.json new file mode 100644 index 0000000000..c0ad8f17ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_log.json b/Common/src/generated/resources/assets/byg/blockstates/cika_log.json new file mode 100644 index 0000000000..8c3f6fd916 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cika/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cika/log" + }, + "axis=z": { + "model": "byg:block/cika/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_planks.json b/Common/src/generated/resources/assets/byg/blockstates/cika_planks.json new file mode 100644 index 0000000000..d8cd1ebd4d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/cika_pressure_plate.json new file mode 100644 index 0000000000..02de892ec0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/cika/pressure_plate" + }, + "powered=true": { + "model": "byg:block/cika/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/cika_sapling.json new file mode 100644 index 0000000000..779a05c921 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json new file mode 100644 index 0000000000..c6577765d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/cika/slab_top" + }, + "type=bottom": { + "model": "byg:block/cika/slab" + }, + "type=double": { + "model": "byg:block/cika/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json new file mode 100644 index 0000000000..51ae3136a4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json new file mode 100644 index 0000000000..232e325954 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/cika/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/cika/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/cika/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/cika/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_wood.json b/Common/src/generated/resources/assets/byg/blockstates/cika_wood.json new file mode 100644 index 0000000000..15b2f8214f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cika/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cika/wood" + }, + "axis=z": { + "model": "byg:block/cika/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_bookshelf.json new file mode 100644 index 0000000000..39f5d2a75f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json new file mode 100644 index 0000000000..c20b3d37d4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/cypress/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cypress/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/cypress/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/cypress/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/cypress/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/cypress/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/cypress/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/cypress/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/cypress/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_crafting_table.json new file mode 100644 index 0000000000..f3f940c1eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json new file mode 100644 index 0000000000..bbce546b96 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json new file mode 100644 index 0000000000..651f0e5f6d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/cypress/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/cypress/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/cypress/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/cypress/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/cypress/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json new file mode 100644 index 0000000000..a56e9a1820 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_leaves.json new file mode 100644 index 0000000000..a825aab005 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_log.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_log.json new file mode 100644 index 0000000000..0e60f4e956 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cypress/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cypress/log" + }, + "axis=z": { + "model": "byg:block/cypress/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_planks.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_planks.json new file mode 100644 index 0000000000..be92b4c961 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_pressure_plate.json new file mode 100644 index 0000000000..3d31be6f80 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/cypress/pressure_plate" + }, + "powered=true": { + "model": "byg:block/cypress/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_sapling.json new file mode 100644 index 0000000000..c3c5fb44cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json new file mode 100644 index 0000000000..ddc23990fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/cypress/slab_top" + }, + "type=bottom": { + "model": "byg:block/cypress/slab" + }, + "type=double": { + "model": "byg:block/cypress/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json new file mode 100644 index 0000000000..b361ab6177 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json new file mode 100644 index 0000000000..526c61d211 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_wood.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_wood.json new file mode 100644 index 0000000000..d0333d716f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cypress/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cypress/wood" + }, + "axis=z": { + "model": "byg:block/cypress/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_bookshelf.json new file mode 100644 index 0000000000..ddb28283de --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json new file mode 100644 index 0000000000..9f2b7063b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/ebony/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/ebony/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/ebony/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/ebony/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/ebony/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/ebony/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/ebony/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/ebony/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/ebony/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_crafting_table.json new file mode 100644 index 0000000000..f295778a9a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json new file mode 100644 index 0000000000..f10e0c6036 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json new file mode 100644 index 0000000000..7cd07ed1fb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/ebony/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/ebony/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/ebony/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/ebony/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/ebony/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json new file mode 100644 index 0000000000..a4e30bceaa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_leaves.json new file mode 100644 index 0000000000..67cc4c4e9d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_log.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_log.json new file mode 100644 index 0000000000..c8be410a1c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ebony/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ebony/log" + }, + "axis=z": { + "model": "byg:block/ebony/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_planks.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_planks.json new file mode 100644 index 0000000000..8cef662a47 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_pressure_plate.json new file mode 100644 index 0000000000..6f026e3410 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/ebony/pressure_plate" + }, + "powered=true": { + "model": "byg:block/ebony/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_sapling.json new file mode 100644 index 0000000000..2dcc644833 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json new file mode 100644 index 0000000000..8ff11b333a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/ebony/slab_top" + }, + "type=bottom": { + "model": "byg:block/ebony/slab" + }, + "type=double": { + "model": "byg:block/ebony/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json new file mode 100644 index 0000000000..0c3e12e1b8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json new file mode 100644 index 0000000000..0738c0ae45 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_wood.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_wood.json new file mode 100644 index 0000000000..dc8926793f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ebony/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ebony/wood" + }, + "axis=z": { + "model": "byg:block/ebony/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button.json b/Common/src/generated/resources/assets/byg/models/block/aspen/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_button.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/aspen/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/aspen/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json new file mode 100644 index 0000000000..f982b9100e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/aspen/planks", + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json b/Common/src/generated/resources/assets/byg/models/block/aspen/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_log.json b/Common/src/generated/resources/assets/byg/models/block/aspen/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_log.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_planks.json b/Common/src/generated/resources/assets/byg/models/block/aspen/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_planks.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/aspen/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/aspen/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_slab.json b/Common/src/generated/resources/assets/byg/models/block/aspen/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_slab.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor.json index 093957b38d..0599364beb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_trapdoor_bottom", + "parent": "byg:block/aspen/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen_wood.json b/Common/src/generated/resources/assets/byg/models/block/aspen/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen_wood.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button.json b/Common/src/generated/resources/assets/byg/models/block/baobab/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_button.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/baobab/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/baobab/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json new file mode 100644 index 0000000000..abe7d50db9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/baobab/planks", + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json b/Common/src/generated/resources/assets/byg/models/block/baobab/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_log.json b/Common/src/generated/resources/assets/byg/models/block/baobab/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_log.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_planks.json b/Common/src/generated/resources/assets/byg/models/block/baobab/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_planks.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/baobab/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/baobab/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_slab.json b/Common/src/generated/resources/assets/byg/models/block/baobab/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_slab.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor.json index 1dd28bacf5..71b3bdc8d0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_trapdoor_bottom", + "parent": "byg:block/baobab/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab_wood.json b/Common/src/generated/resources/assets/byg/models/block/baobab/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab_wood.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json new file mode 100644 index 0000000000..13abdae318 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/blue_enchanted/planks", + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_log.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_planks.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor.json similarity index 90% rename from Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor.json index 4ad91e2f41..8c9774be15 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_trapdoor_bottom", + "parent": "byg:block/blue_enchanted/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted_wood.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_button.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json new file mode 100644 index 0000000000..1899ed5423 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/bulbis/planks", + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_oddity.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_stem.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_planks.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_slab.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor.json index d4440c4f26..7e6dfdcfc3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_trapdoor_bottom", + "parent": "byg:block/bulbis/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis_wood.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button.json b/Common/src/generated/resources/assets/byg/models/block/cherry/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_button.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cherry/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cherry/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json new file mode 100644 index 0000000000..5049d595e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/cherry/planks", + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_log.json b/Common/src/generated/resources/assets/byg/models/block/cherry/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_log.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_planks.json b/Common/src/generated/resources/assets/byg/models/block/cherry/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_planks.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cherry/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cherry/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_slab.json b/Common/src/generated/resources/assets/byg/models/block/cherry/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_slab.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor.json index 0d66f9999d..1626303edb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_trapdoor_bottom", + "parent": "byg:block/cherry/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry_wood.json b/Common/src/generated/resources/assets/byg/models/block/cherry/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry_wood.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button.json b/Common/src/generated/resources/assets/byg/models/block/cika/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_button.json rename to Common/src/generated/resources/assets/byg/models/block/cika/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cika/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/cika/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cika/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/cika/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cika/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/fence.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence.json new file mode 100644 index 0000000000..6e5013dffe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/cika/planks", + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cika/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/cika/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_leaves.json b/Common/src/generated/resources/assets/byg/models/block/cika/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/cika/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_log.json b/Common/src/generated/resources/assets/byg/models/block/cika/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_log.json rename to Common/src/generated/resources/assets/byg/models/block/cika/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_planks.json b/Common/src/generated/resources/assets/byg/models/block/cika/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_planks.json rename to Common/src/generated/resources/assets/byg/models/block/cika/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cika/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/cika/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cika/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/cika/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_slab.json b/Common/src/generated/resources/assets/byg/models/block/cika/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_slab.json rename to Common/src/generated/resources/assets/byg/models/block/cika/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/cika/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/cika/trapdoor.json index 91a4a4dd31..e74ce48185 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_trapdoor_bottom", + "parent": "byg:block/cika/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/cika/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cika_wood.json b/Common/src/generated/resources/assets/byg/models/block/cika/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika_wood.json rename to Common/src/generated/resources/assets/byg/models/block/cika/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button.json b/Common/src/generated/resources/assets/byg/models/block/cypress/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_button.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/cypress/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/cypress/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json new file mode 100644 index 0000000000..192e6205aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/cypress/planks", + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json b/Common/src/generated/resources/assets/byg/models/block/cypress/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_log.json b/Common/src/generated/resources/assets/byg/models/block/cypress/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_log.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_planks.json b/Common/src/generated/resources/assets/byg/models/block/cypress/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_planks.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/cypress/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/cypress/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_slab.json b/Common/src/generated/resources/assets/byg/models/block/cypress/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_slab.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json new file mode 100644 index 0000000000..5e7cdcfeab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress_wood.json b/Common/src/generated/resources/assets/byg/models/block/cypress/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress_wood.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_bookshelf.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button.json b/Common/src/generated/resources/assets/byg/models/block/ebony/button.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_button.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/button.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/ebony/button_inventory.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/button_inventory.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/ebony/button_pressed.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/button_pressed.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_crafting_table.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_door_top.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door_top_hinge.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door_top_hinge.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json new file mode 100644 index 0000000000..cb4b390a4f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/ebony/planks", + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_wall.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_wall.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_wall_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_gate_wall_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_fence_post.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json b/Common/src/generated/resources/assets/byg/models/block/ebony/grower_item.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/grower_item.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_leaves.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_leaves_snowy.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_log.json b/Common/src/generated/resources/assets/byg/models/block/ebony/log.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_log.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/log.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_planks.json b/Common/src/generated/resources/assets/byg/models/block/ebony/planks.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_planks.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/planks.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/ebony/pressure_plate.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/pressure_plate.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/ebony/pressure_plate_down.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/pressure_plate_down.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_slab.json b/Common/src/generated/resources/assets/byg/models/block/ebony/slab.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_slab.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/slab.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_slab_top.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_stairs.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_stairs_inner.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_stairs_outer.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor.json similarity index 91% rename from Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor.json index 08a25c0329..6917712738 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_trapdoor_bottom", + "parent": "byg:block/ebony/trapdoor_bottom", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_bottom.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_bottom.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_open.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_open.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_top.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor_top.json diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony_wood.json b/Common/src/generated/resources/assets/byg/models/block/ebony/wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony_wood.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/wood.json diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json index a44037b70f..f77288c4f7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_bookshelf", + "parent": "byg:block/aspen/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_button.json b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json index 47afd17739..40a12adbe4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_button_inventory", + "parent": "byg:block/aspen/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json index 06bd88df64..cccbf87fb1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_crafting_table", + "parent": "byg:block/aspen/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json index b0cb669387..6278f0810e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_fence_gate", + "parent": "byg:block/aspen/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json index c86344de9c..1ad0000bcd 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_leaves", + "parent": "byg:block/aspen/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_log.json b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json index f0af62afb7..03ad517786 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_log", + "parent": "byg:block/aspen/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json index 0bb97ce95a..6f777ec49f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_planks", + "parent": "byg:block/aspen/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json index aa89f31f8d..f862a93efb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_pressure_plate", + "parent": "byg:block/aspen/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json index 8b7182bfa0..664597a4a2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_slab", + "parent": "byg:block/aspen/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json index 3340137aac..cd9a808481 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_stairs", + "parent": "byg:block/aspen/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json index 49c30feaf3..cb2fa3a269 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen_wood", + "parent": "byg:block/aspen/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json index e5dc797793..a33bea422a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_bookshelf", + "parent": "byg:block/baobab/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_button.json b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json index e6600bed75..51aafe18f0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_button_inventory", + "parent": "byg:block/baobab/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json index b0e1e75ab5..2acc7acad3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_crafting_table", + "parent": "byg:block/baobab/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json index 81cbf0ae5b..6877a23b6a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_fence_gate", + "parent": "byg:block/baobab/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json index 53a85c0e4a..09a7a1b9ed 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_leaves", + "parent": "byg:block/baobab/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_log.json b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json index d95de2ab00..7082c4a8ec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_log", + "parent": "byg:block/baobab/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json index b9f4929698..9c2aab304f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_planks", + "parent": "byg:block/baobab/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json index 1074450766..1185dd6b8c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_pressure_plate", + "parent": "byg:block/baobab/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json index a6c90b282a..3f1966c6ac 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_slab", + "parent": "byg:block/baobab/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json index 3668d10f6e..9c74fcb74d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_stairs", + "parent": "byg:block/baobab/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json index 71871215d4..2c7c379f94 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab_wood", + "parent": "byg:block/baobab/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json index 1c34108283..3e8869c9d3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_bookshelf", + "parent": "byg:block/blue_enchanted/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json index 78fa1b466e..f29951e9ef 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_button_inventory", + "parent": "byg:block/blue_enchanted/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json index 70993fcc61..af2bdfa13e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_crafting_table", + "parent": "byg:block/blue_enchanted/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json index 741eddf4e0..2e6060bb8c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_fence_gate", + "parent": "byg:block/blue_enchanted/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json index 53ca92f2b5..dc31265e60 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_leaves", + "parent": "byg:block/blue_enchanted/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json index 0f6c77dd21..012f89edc4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_log", + "parent": "byg:block/blue_enchanted/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json index e6a00cd53d..fda674d8b7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_planks", + "parent": "byg:block/blue_enchanted/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json index ef496dc434..3d3cf79784 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_pressure_plate", + "parent": "byg:block/blue_enchanted/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json index 777fb31095..72e4212339 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_slab", + "parent": "byg:block/blue_enchanted/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json index d3eeea0e8b..2ef79b8da4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_stairs", + "parent": "byg:block/blue_enchanted/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json index 835b9253a9..530dbfe527 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted_wood", + "parent": "byg:block/blue_enchanted/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json index 6ca4b3dbb0..d412ffbc33 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_bookshelf", + "parent": "byg:block/bulbis/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json index 9bd7507e2c..6e79945947 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_button_inventory", + "parent": "byg:block/bulbis/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json index 5668f6273f..3042c119b1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_crafting_table", + "parent": "byg:block/bulbis/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json index d917cb1e4a..a8da00cc0d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_fence_gate", + "parent": "byg:block/bulbis/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json index 6923f9a4c5..d4ae1e44aa 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_planks", + "parent": "byg:block/bulbis/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json index 5847ceab2b..30aa0bffd8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_pressure_plate", + "parent": "byg:block/bulbis/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json index e7a6078ea8..e7faffb488 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_slab", + "parent": "byg:block/bulbis/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json index 02a197036e..41244b078a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_stairs", + "parent": "byg:block/bulbis/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json index e232b45eaf..9331c166a5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_stem", + "parent": "byg:block/bulbis/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json index cd6f7f3de6..be5e6d57bb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis_wood", + "parent": "byg:block/bulbis/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json index 148ee63907..dc2b414e60 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_bookshelf", + "parent": "byg:block/cherry/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_button.json b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json index 0f57d126a8..e4d565e663 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_button_inventory", + "parent": "byg:block/cherry/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json index 15e2399b0a..671a9a477b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_crafting_table", + "parent": "byg:block/cherry/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json index 5999d229d3..3701a2cd9b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_fence_gate", + "parent": "byg:block/cherry/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_log.json b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json index 2800b33ac7..dc403972aa 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_log", + "parent": "byg:block/cherry/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json index ef3cddb26d..4e008178ed 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_planks", + "parent": "byg:block/cherry/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json index 65714fd84b..3f07527352 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_pressure_plate", + "parent": "byg:block/cherry/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json index 01892637f8..b4ad840f3f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_slab", + "parent": "byg:block/cherry/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json index fedb245d55..ebfd7168a2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_stairs", + "parent": "byg:block/cherry/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json index 468e4c7818..0664fc3912 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry_wood", + "parent": "byg:block/cherry/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json index a8294d736c..dab69ea050 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_bookshelf", + "parent": "byg:block/cika/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_button.json b/Common/src/generated/resources/assets/byg/models/item/cika_button.json index c0dd2e6490..0888fed5d6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_button_inventory", + "parent": "byg:block/cika/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json index 5b257cc8e8..f0de9eeb03 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_crafting_table", + "parent": "byg:block/cika/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json index 7c42c0220f..f71dcb81ab 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_fence_gate", + "parent": "byg:block/cika/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json index 8400734999..09eebf3b78 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_leaves", + "parent": "byg:block/cika/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_log.json b/Common/src/generated/resources/assets/byg/models/item/cika_log.json index 29d4bf16f0..0a68df2ea1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_log", + "parent": "byg:block/cika/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_planks.json b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json index 31625158af..c444b27318 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_planks", + "parent": "byg:block/cika/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json index 98dca2fa61..9b6908433c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_pressure_plate", + "parent": "byg:block/cika/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_slab.json b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json index b01acfad04..f2d27b929e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_slab", + "parent": "byg:block/cika/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json index b2bd0efa93..24b60dce9d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_stairs", + "parent": "byg:block/cika/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_wood.json b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json index 79a917c124..1d0c9346c5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika_wood", + "parent": "byg:block/cika/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json index e2b9f6de31..14bb16319d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_bookshelf", + "parent": "byg:block/cypress/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_button.json b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json index 0842eb36d3..38cdd81a4d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_button_inventory", + "parent": "byg:block/cypress/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json index 1767bdbc15..15f6825a79 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_crafting_table", + "parent": "byg:block/cypress/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json index b8e366df9c..065043ed5f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_fence_gate", + "parent": "byg:block/cypress/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json index 189826efd7..653eee5dd3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_leaves", + "parent": "byg:block/cypress/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_log.json b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json index 3fa4bb85a7..14bcfe0e20 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_log", + "parent": "byg:block/cypress/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json index d616e7aaf9..bd9d6c288d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_planks", + "parent": "byg:block/cypress/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json index 273a0d6c32..1b1e02d483 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_pressure_plate", + "parent": "byg:block/cypress/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json index 8a8ce21936..7087e21d5f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_slab", + "parent": "byg:block/cypress/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json index 376cbd366d..fb826a89cf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_stairs", + "parent": "byg:block/cypress/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json deleted file mode 100644 index 156e555114..0000000000 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "parent": "byg:block/cypress_trapdoor_bottom", - "display": { - "thirdperson_lefthand": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json index 9f2f001848..721460df40 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress_wood", + "parent": "byg:block/cypress/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json index 32f9ad5140..eba82f91df 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_bookshelf", + "parent": "byg:block/ebony/bookshelf", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_button.json b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json index 2bc22156db..bb48fa6744 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_button_inventory", + "parent": "byg:block/ebony/button_inventory", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json index 960c2e2187..aa6679ec06 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_crafting_table", + "parent": "byg:block/ebony/crafting_table", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json index dcfe17cabd..16978f5baa 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_fence_gate", + "parent": "byg:block/ebony/fence_gate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json index 506c26a03f..355dc31eaa 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_leaves", + "parent": "byg:block/ebony/leaves", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_log.json b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json index 970d8717d2..baf9a230a4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_log", + "parent": "byg:block/ebony/log", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json index 95878c0a81..f4b08d29fe 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_planks", + "parent": "byg:block/ebony/planks", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json index bccdeb7e60..eb5dd202e6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_pressure_plate", + "parent": "byg:block/ebony/pressure_plate", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json index fb51e32c20..20fc1e36af 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_slab", + "parent": "byg:block/ebony/slab", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json index cbcd35c94b..0993c21a4e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_stairs", + "parent": "byg:block/ebony/stairs", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json index 8d3ad1fa0f..0baefc56ea 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony_wood", + "parent": "byg:block/ebony/wood", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java index 6bc6b90759..8c49af25d7 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java @@ -5,7 +5,6 @@ import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; import potionstudios.byg.datagen.providers.BYGWoodAssetsProvider; -import potionstudios.byg.datagen.providers.BYGBlockStateProvider; import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; import potionstudios.byg.datagen.providers.BYGItemTagsProvider; import potionstudios.byg.datagen.providers.BYGRecipeProviders; @@ -26,7 +25,6 @@ static void onDatagen(final GatherDataEvent event) { } if (event.includeClient()) { gen.addProvider(new BYGWoodAssetsProvider(gen, existingFileHelper)); - gen.addProvider(new BYGBlockStateProvider(gen, existingFileHelper)); } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index dd87940f0c..ddf174e1f0 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -34,9 +34,10 @@ protected void registerStatesAndModels() { final var generatedParent = mcLoc("item/generated"); for (final var type : BYGWoodTypes.values()) { + final var typeName = "block/" + type; final var typeLoc = "block/" + type + "/"; final var typeLocItem = "item/" + type + "/"; - final var log = models().cubeColumn(type + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); + final var log = models().cubeColumn(typeName + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); @@ -45,7 +46,7 @@ protected void registerStatesAndModels() { .texture("layer0", rl(typeLocItem + "boat")); final var bookshelf = models().cube( - type + "/bookshelf", + typeName + "/bookshelf", rl(typeLoc + "planks"), rl(typeLoc + "planks"), rl(typeLoc + "bookshelf"), @@ -56,14 +57,14 @@ protected void registerStatesAndModels() { configureTransform(item.withExistingParent(type.bookshelf().getId().getPath(), bookshelf.getLocation())); simpleBlock(type.bookshelf().get(), bookshelf); - final var button = models().buttonInventory(type + "/button_inventory", rl(typeLoc + "planks")); - models().button(type + "/button", rl(typeLoc + "planks")); - final var buttonPressed = models().buttonPressed(type + "/button_pressed", rl(typeLoc + "planks")); + final var button = models().buttonInventory(typeName + "/button_inventory", rl(typeLoc + "planks")); + models().button(typeName + "/button", rl(typeLoc + "planks")); + final var buttonPressed = models().buttonPressed(typeName + "/button_pressed", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.button().getId().getPath(), button.getLocation())); buttonBlock((ButtonBlock) type.button().get(), button, buttonPressed); final var craftingTable = models().cube( - type + "/crafting_table", + typeName + "/crafting_table", rl(typeLoc + "planks"), rl(typeLoc + "crafting_table_top"), rl(typeLoc + "crafting_table_front"), @@ -75,22 +76,22 @@ protected void registerStatesAndModels() { simpleBlock(type.craftingTable().get(), craftingTable); final var doorBottomLeft = models().doorBottomLeft( - type + "/door_bottom", + typeName + "/door_bottom", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); final var doorBottomRight = models().doorBottomRight( - type + "/door_bottom_hinge", + typeName + "/door_bottom_hinge", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); final var doorTopLeft = models().doorTopLeft( - type + "/door_top", + typeName + "/door_top", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); final var doorTopRight = models().doorTopRight( - type + "/door_top_hinge", + typeName + "/door_top_hinge", rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); @@ -98,32 +99,32 @@ protected void registerStatesAndModels() { item.withExistingParent(type.door().getId().getPath(), generatedParent) .texture("layer0", rl(typeLocItem + "door")); - final var fencePost = models().fencePost(type + "/fence_post", rl(typeLoc + "planks")) + final var fencePost = models().fencePost(typeName + "/fence_post", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); - final var fenceSide = models().fenceSide(type + "/fence", rl(typeLoc + "planks")) + final var fenceSide = models().fenceSide(typeName + "/fence", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); - final var fenceInv = models().fenceInventory(type + "/fence_inv", rl(typeLoc + "planks")) + final var fenceInv = models().fenceInventory(typeName + "/fence_inv", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceInv.getLocation())); fourWayBlock((CrossCollisionBlock) type.fence().get(), fencePost, fenceSide); - final var fenceGate = models().fenceGate(type + "/fence_gate", rl(typeLoc + "planks")); - final var fenceGateOpen = models().fenceGateOpen(type + "/fence_gate_open", rl(typeLoc + "planks")); - final var fenceGateWall = models().fenceGateWall(type + "/fence_gate_wall", rl(typeLoc + "planks")); - final var fenceGateWallOpen = models().fenceGateWallOpen(type + "/fence_gate_wall_open", rl(typeLoc + "planks")); + final var fenceGate = models().fenceGate(typeName + "/fence_gate", rl(typeLoc + "planks")); + final var fenceGateOpen = models().fenceGateOpen(typeName + "/fence_gate_open", rl(typeLoc + "planks")); + final var fenceGateWall = models().fenceGateWall(typeName + "/fence_gate_wall", rl(typeLoc + "planks")); + final var fenceGateWallOpen = models().fenceGateWallOpen(typeName + "/fence_gate_wall_open", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceGate.getLocation())); fenceGateBlock((FenceGateBlock) type.fenceGate().get(), fenceGate, fenceGateOpen, fenceGateWall, fenceGateWallOpen); if (type.leaves() != null) { final var leavesLoc = rl(typeLoc + "leaves"); final var leaves = models().cube( - type + "/leaves", + typeName + "/leaves", leavesLoc, leavesLoc, leavesLoc, leavesLoc, leavesLoc, leavesLoc ).texture("particle", leavesLoc); configureTransform(item.withExistingParent(type.leaves().getId().getPath(), leaves.getLocation())); models().cube( - type + "/leaves_snowy", + typeName + "/leaves_snowy", rl(typeLoc + "leaves_snowy"), rl(typeLoc + "leaves_snowy"), rl(typeLoc + "leaves_snowy_side"), @@ -134,40 +135,40 @@ protected void registerStatesAndModels() { simpleBlock(type.leaves().get(), leaves); // TODO leaves should be snowy as well } final var planksLoc = rl(typeLoc + "planks"); - final var planks = models().cube(type + "/planks", planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) + final var planks = models().cube(typeName + "/planks", planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) .texture("particle", planksLoc); configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); simpleBlock(type.planks().get(), planks); - final var wood = models().cubeAll(typeLoc + "/wood", rl(typeLoc + "log")) + final var wood = models().cubeAll(typeName + "/wood", rl(typeLoc + "log")) .texture("particle", rl(typeLoc + "log")); configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); axisBlock((RotatedPillarBlock) type.wood().get(), wood, wood); if (type.growerItem() != null) { final var textureLoc = rl(typeLoc + "grower_item"); - final var growerItem = models().cross(type + "/grower_item", textureLoc); + final var growerItem = models().cross(typeName + "/grower_item", textureLoc); item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) .texture("layer0", textureLoc); simpleBlock(type.growerItem().get(), growerItem); } - final var pressurePlate = models().pressurePlate(type + "/pressure_plate", rl(typeLoc + "planks")); - final var pressurePlateDown = models().pressurePlateDown(type + "/pressure_plate_down", rl(typeLoc + "planks")); + final var pressurePlate = models().pressurePlate(typeName + "/pressure_plate", rl(typeLoc + "planks")); + final var pressurePlateDown = models().pressurePlateDown(typeName + "/pressure_plate_down", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.pressurePlate().getId().getPath(), pressurePlate.getLocation())); pressurePlateBlock((PressurePlateBlock) type.pressurePlate().get(), pressurePlate, pressurePlateDown); - final var slab = models().slab(type + "/slab", planksLoc, planksLoc, planksLoc); - final var slabTop = models().slabTop(type + "/slab_top", planksLoc, planksLoc, planksLoc); + final var slab = models().slab(typeName + "/slab", planksLoc, planksLoc, planksLoc); + final var slabTop = models().slabTop(typeName + "/slab_top", planksLoc, planksLoc, planksLoc); configureTransform(item.withExistingParent(type.slab().getId().getPath(), slab.getLocation())); slabBlock((SlabBlock) type.slab().get(), slab, slabTop, planks); - final var stairs = models().stairs(type + "/stairs", planksLoc, planksLoc, planksLoc); - final var stairsInner = models().stairsInner(type + "/stairs_inner", planksLoc, planksLoc, planksLoc); - final var stairsOuter = models().stairsOuter(type + "/stairs_outer", planksLoc, planksLoc, planksLoc); + final var stairs = models().stairs(typeName + "/stairs", planksLoc, planksLoc, planksLoc); + final var stairsInner = models().stairsInner(typeName + "/stairs_inner", planksLoc, planksLoc, planksLoc); + final var stairsOuter = models().stairsOuter(typeName + "/stairs_outer", planksLoc, planksLoc, planksLoc); configureTransform(item.withExistingParent(type.stairs().getId().getPath(), stairs.getLocation())); stairsBlock((StairBlock) type.stairs().get(), stairs, stairsInner, stairsOuter); - final var trapdoorName = type + "/trapdoor"; + final var trapdoorName = typeName + "/trapdoor"; final var trapdoorLoc = rl(typeLoc + "trapdoor"); final var trapdoor = models().trapdoorOrientableBottom(trapdoorName + "_bottom", trapdoorLoc); final var trapdoorTop = models().trapdoorOrientableTop(trapdoorName + "_top", trapdoorLoc); @@ -177,12 +178,12 @@ protected void registerStatesAndModels() { // No wood walls for now // final var logLocation = rl(typeLoc + "log"); -// final var wallInv = models().wallInventory(type + "/wall_inventory", logLocation) +// final var wallInv = models().wallInventory(typeName + "/wall_inventory", logLocation) // .texture("particle", logLocation); // item.withExistingParent(type.wall().getId().getPath(), wallInv.getLocation()); -// final var wall = models().wallSide(type + "/wall", logLocation) +// final var wall = models().wallSide(typeName + "/wall", logLocation) // .texture("particle", logLocation); -// final var wallPost = models().wallPost(type + "/wall_post", logLocation) +// final var wallPost = models().wallPost(typeName + "/wall_post", logLocation) // .texture("particle", logLocation); // wallBlock(type.wall().get(), wallPost, wall, wall); } From 570420fa578255233a9e6ff6021cab86c05d64f0 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:39:13 +0300 Subject: [PATCH 22/90] Delete bulbis_stem.json --- .../assets/byg/blockstates/bulbis_stem.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_stem.json diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_stem.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_stem.json deleted file mode 100644 index deadba4070..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/bulbis_stem" - }, - "axis=z": { - "model": "byg:block/bulbis_stem", - "x": 90 - }, - "axis=x": { - "model": "byg:block/bulbis_stem", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file From 6b1f791862370639dd0c502f231448c98a391ac1 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:53:21 +0300 Subject: [PATCH 23/90] Move ether --- .../byg/common/block/BYGBlocks.java | 20 -- .../byg/common/block/BYGWoodTypes.java | 5 +- .../byg/common/item/BYGItems.java | 28 +-- .../byg/blockstates/ether_bookshelf.json | 7 - .../assets/byg/blockstates/ether_button.json | 118 ---------- .../byg/blockstates/ether_crafting_table.json | 7 - .../assets/byg/blockstates/ether_door.json | 124 ----------- .../assets/byg/blockstates/ether_fence.json | 48 ---- .../byg/blockstates/ether_fence_gate.json | 80 ------- .../assets/byg/blockstates/ether_leaves.json | 7 - .../assets/byg/blockstates/ether_log.json | 16 -- .../assets/byg/blockstates/ether_planks.json | 7 - .../byg/blockstates/ether_pressure_plate.json | 10 - .../assets/byg/blockstates/ether_sapling.json | 7 - .../assets/byg/blockstates/ether_slab.json | 13 -- .../assets/byg/blockstates/ether_stairs.json | 209 ------------------ .../byg/blockstates/ether_trapdoor.json | 68 ------ .../assets/byg/blockstates/ether_wood.json | 16 -- .../byg/models/block/ether_bookshelf.json | 12 - .../assets/byg/models/block/ether_button.json | 6 - .../models/block/ether_button_inventory.json | 6 - .../models/block/ether_button_pressed.json | 6 - .../models/block/ether_crafting_table.json | 12 - .../byg/models/block/ether_door_bottom.json | 7 - .../models/block/ether_door_bottom_hinge.json | 7 - .../byg/models/block/ether_door_top.json | 7 - .../models/block/ether_door_top_hinge.json | 7 - .../byg/models/block/ether_fence_gate.json | 6 - .../models/block/ether_fence_gate_open.json | 6 - .../models/block/ether_fence_gate_wall.json | 6 - .../block/ether_fence_gate_wall_open.json | 6 - .../models/block/ether_fence_inventory.json | 6 - .../byg/models/block/ether_fence_post.json | 6 - .../assets/byg/models/block/ether_leaves.json | 6 - .../assets/byg/models/block/ether_log.json | 7 - .../assets/byg/models/block/ether_planks.json | 6 - .../models/block/ether_pressure_plate.json | 6 - .../block/ether_pressure_plate_down.json | 6 - .../byg/models/block/ether_sapling.json | 7 - .../assets/byg/models/block/ether_slab.json | 8 - .../byg/models/block/ether_slab_top.json | 8 - .../assets/byg/models/block/ether_stairs.json | 8 - .../byg/models/block/ether_stairs_inner.json | 8 - .../byg/models/block/ether_stairs_outer.json | 8 - .../models/block/ether_trapdoor_bottom.json | 6 - .../byg/models/block/ether_trapdoor_open.json | 6 - .../byg/models/block/ether_trapdoor_top.json | 6 - .../assets/byg/models/block/ether_wood.json | 7 - .../byg/models/item/ether_bookshelf.json | 3 - .../assets/byg/models/item/ether_button.json | 3 - .../byg/models/item/ether_crafting_table.json | 3 - .../assets/byg/models/item/ether_door.json | 6 - .../assets/byg/models/item/ether_fence.json | 3 - .../byg/models/item/ether_fence_gate.json | 3 - .../assets/byg/models/item/ether_leaves.json | 3 - .../assets/byg/models/item/ether_log.json | 3 - .../assets/byg/models/item/ether_planks.json | 3 - .../byg/models/item/ether_pressure_plate.json | 3 - .../assets/byg/models/item/ether_sapling.json | 6 - .../assets/byg/models/item/ether_slab.json | 3 - .../assets/byg/models/item/ether_stairs.json | 3 - .../byg/models/item/ether_trapdoor.json | 3 - .../assets/byg/models/item/ether_wood.json | 3 - .../bookshelf.png} | Bin .../bulbs_stage0.png} | Bin .../bulbs_stage1.png} | Bin .../bulbs_stage2.png} | Bin .../bulbs_stage3.png} | Bin .../block/{ether_bush.png => ether/bush.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{ether_grass.png => ether/grass.png} | Bin .../{ether_leaves.png => ether/leaves.png} | Bin .../block/{ether_log.png => ether/log.png} | Bin .../{ether_log_top.png => ether/log_top.png} | Bin .../{ether_phylium.png => ether/phylium.png} | Bin .../phylium_top.png} | Bin .../{ether_planks.png => ether/planks.png} | Bin .../{ether_sapling.png => ether/sapling.png} | Bin .../block/{ether_soil.png => ether/soil.png} | Bin .../{ether_stone.png => ether/stone.png} | Bin .../stone_top.png} | Bin .../trapdoor.png} | Bin .../item/{ether_bulbs.png => ether/bulbs.png} | Bin .../item/{ether_door.png => ether/door.png} | Bin 88 files changed, 10 insertions(+), 1040 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/ether_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_wood.json rename Common/src/main/resources/assets/byg/textures/block/{ether_bookshelf.png => ether/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_bulbs_stage0.png => ether/bulbs_stage0.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_bulbs_stage1.png => ether/bulbs_stage1.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_bulbs_stage2.png => ether/bulbs_stage2.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_bulbs_stage3.png => ether/bulbs_stage3.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_bush.png => ether/bush.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_crafting_table_front.png => ether/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_crafting_table_side.png => ether/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_crafting_table_top.png => ether/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_door_bottom.png => ether/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_door_top.png => ether/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_grass.png => ether/grass.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_leaves.png => ether/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_log.png => ether/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_log_top.png => ether/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_phylium.png => ether/phylium.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_phylium_top.png => ether/phylium_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_planks.png => ether/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_sapling.png => ether/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_soil.png => ether/soil.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_stone.png => ether/stone.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_stone_top.png => ether/stone_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether_trapdoor.png => ether/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ether_bulbs.png => ether/bulbs.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ether_door.png => ether/door.png} (100%) diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 1a43aed1b7..7007162215 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -81,7 +81,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_PLANKS = createPlanks("palm_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); - public static final BlockRegistryObject ETHER_PLANKS = createPlanks("ether_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); public static final BlockRegistryObject FIR_BOOKSHELF = createBookshelf("fir_bookshelf"); @@ -103,7 +102,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_BOOKSHELF = createBookshelf("palm_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); - public static final BlockRegistryObject ETHER_BOOKSHELF = createBookshelf("ether_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); public static final BlockRegistryObject FIR_DOOR = createDoor("fir_door"); @@ -125,7 +123,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_DOOR = createDoor("palm_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); - public static final BlockRegistryObject ETHER_DOOR = createDoor("ether_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); public static final BlockRegistryObject FIR_PRESSURE_PLATE = createWoodPressurePlate("fir_pressure_plate"); @@ -147,7 +144,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_PRESSURE_PLATE = createWoodPressurePlate("palm_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); - public static final BlockRegistryObject ETHER_PRESSURE_PLATE = createWoodPressurePlate("ether_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); public static final BlockRegistryObject FIR_BUTTON = createWoodButton("fir_button"); @@ -169,7 +165,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_BUTTON = createWoodButton("palm_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); - public static final BlockRegistryObject ETHER_BUTTON = createWoodButton("ether_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); public static final BlockRegistryObject FIR_TRAPDOOR = createTrapDoor("fir_trapdoor"); @@ -191,7 +186,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_TRAPDOOR = createTrapDoor("palm_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); - public static final BlockRegistryObject ETHER_TRAPDOOR = createTrapDoor("ether_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); public static final BlockRegistryObject FIR_CRAFTING_TABLE = createCraftingTable("fir_crafting_table"); @@ -213,7 +207,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_CRAFTING_TABLE = createCraftingTable("palm_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); - public static final BlockRegistryObject ETHER_CRAFTING_TABLE = createCraftingTable("ether_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); public static final BlockRegistryObject FIR_FENCE_GATE = createFenceGate("fir_fence_gate"); @@ -235,7 +228,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_FENCE_GATE = createFenceGate("palm_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); - public static final BlockRegistryObject ETHER_FENCE_GATE = createFenceGate("ether_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); public static final BlockRegistryObject FIR_SLAB = createWoodSlab("fir_slab"); @@ -257,7 +249,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_SLAB = createWoodSlab("palm_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); - public static final BlockRegistryObject ETHER_SLAB = createWoodSlab("ether_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); public static final BlockRegistryObject FIR_STAIRS = createWoodStairs("fir_stairs"); @@ -279,7 +270,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_STAIRS = createWoodStairs("palm_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); - public static final BlockRegistryObject ETHER_STAIRS = createWoodStairs("ether_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); public static final BlockRegistryObject FIR_FENCE = createFence("fir_fence"); @@ -301,7 +291,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_FENCE = createFence("palm_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); - public static final BlockRegistryObject ETHER_FENCE = createFence("ether_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); public static final BlockRegistryObject FIR_SIGN = createSign("fir_sign", BYGWoodType.FIR, FIR_PLANKS); @@ -323,7 +312,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_SIGN = createSign("palm_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); - public static final BlockRegistryObject ETHER_SIGN = createSign("ether_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); public static final BlockRegistryObject FIR_WALL_SIGN = createWallSign("fir_wall_sign", BYGWoodType.FIR, FIR_PLANKS); @@ -345,7 +333,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_WALL_SIGN = createWallSign("palm_wall_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); - public static final BlockRegistryObject ETHER_WALL_SIGN = createWallSign("ether_wall_sign", BYGWoodType.ETHER, ETHER_PLANKS); public static final BlockRegistryObject IMPARIUS_WALL_SIGN = createWallSign("imparius_wall_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -399,7 +386,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_SAPLING = createSapling(BYGBlockTags.GROUND_PALM_SAPLING, "palm_sapling"); public static final BlockRegistryObject LAMENT_SAPLING = createSapling(BYGBlockTags.GROUND_LAMENT_SAPLING, "lament_sapling"); public static final BlockRegistryObject WITHERING_OAK_SAPLING = createFungus(BYGBlockTags.GROUND_WITHERING_OAK_SAPLING, "withering_oak_sapling"); - public static final BlockRegistryObject ETHER_SAPLING = createSapling(BYGBlockTags.GROUND_ETHER_SAPLING, "ether_sapling"); public static final BlockRegistryObject NIGHTSHADE_SAPLING = createSapling(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING, "nightshade_sapling"); public static final BlockRegistryObject JACARANDA_BUSH = createJacarandaBush("jacaranda_bush"); @@ -458,7 +444,6 @@ public class BYGBlocks { public static final BlockRegistryObject WITHERING_OAK_LEAVES = createLeaves(MaterialColor.COLOR_GRAY, "withering_oak_leaves"); public static final BlockRegistryObject FLOWERING_NIGHTSHADE_LEAVES = createGlowingLeaves(MaterialColor.COLOR_ORANGE, 15, "flowering_nightshade_leaves"); public static final BlockRegistryObject NIGHTSHADE_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "nightshade_leaves"); - public static final BlockRegistryObject ETHER_LEAVES = createLeaves(MaterialColor.COLOR_CYAN, "ether_leaves"); public static final BlockRegistryObject FIRECRACKER_LEAVES = createFirecrackerLeavesBlock(MaterialColor.COLOR_GREEN, "firecracker_leaves"); public static final BlockRegistryObject GREEN_MUSHROOM_BLOCK = createBlock(BYGBlockProperties.BlockHugeMushroom::new, "green_mushroom_block"); @@ -499,7 +484,6 @@ public class BYGBlocks { public static final BlockRegistryObject CLOVER_PATCH = createBlock(() -> new FlatVegetationBlock(BlockBehaviour.Properties.copy(Blocks.GRASS), BYGBlockTags.GROUND_CLOVER_PATCH), "clover_patch"); public static final BlockRegistryObject FLOWER_PATCH = createBlock(() -> new FlatVegetationBlock(BlockBehaviour.Properties.copy(Blocks.GRASS), BYGBlockTags.GROUND_FLOWER_PATCH), "flower_patch"); public static final BlockRegistryObject BAOBAB_FRUIT_BLOCK = createBaobabFruitBlock("baobab_fruit_block"); - public static final BlockRegistryObject ETHER_BULB = createEtherBulbBlock("ether_bulbs_block"); public static final BlockRegistryObject ANTHRACITE_BLOCK = createBlock(BYGBlockProperties.AnthraciteOre::new, "anthracite_block"); public static final BlockRegistryObject ANTHRACITE_ORE = createBlock(BYGBlockProperties.AnthraciteOre::new, "anthracite_ore"); @@ -763,7 +747,6 @@ public class BYGBlocks { public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); - public static final BlockRegistryObject ETHER_LOG = createLog("ether_log"); public static final BlockRegistryObject IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "imparius_stem"); public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); @@ -789,7 +772,6 @@ public class BYGBlocks { public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); - public static final BlockRegistryObject ETHER_WOOD = createWood("ether_wood"); public static final BlockRegistryObject IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "imparius_hyphae"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); @@ -939,7 +921,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_PALM_LOG = createStrippedLog("stripped_palm_log"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); - public static final BlockRegistryObject STRIPPED_ETHER_LOG = createStrippedLog("stripped_ether_log"); public static final BlockRegistryObject STRIPPED_FIR_WOOD = createWood("stripped_fir_wood"); public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_WOOD = createWood("stripped_green_enchanted_wood"); @@ -961,7 +942,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_PALM_WOOD = createWood("stripped_palm_wood"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_WOOD = createWood("stripped_nightshade_wood"); - public static final BlockRegistryObject STRIPPED_ETHER_WOOD = createWood("stripped_ether_wood"); public static final BlockRegistryObject TALL_ALLIUM = createTallFlower("tall_allium", BYGBlockTags.GROUND_TALL_ALLIUM); public static final BlockRegistryObject TALL_PINK_ALLIUM = createTallFlower("tall_pink_allium", BYGBlockTags.GROUND_TALL_PINK_ALLIUM); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index bf819772c5..0650a9ad16 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -54,7 +54,10 @@ public enum BYGWoodTypes { EBONY("ebony", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_EBONY_SAPLING) .boatType(BYGBoatEntity.BYGType.EBONY) - .materialColor(MaterialColor.COLOR_GREEN)); + .materialColor(MaterialColor.COLOR_GREEN)), + ETHER("ether", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_ETHER_SAPLING) + .materialColor(MaterialColor.COLOR_CYAN)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 98b163d640..5a11f590e6 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -260,6 +260,9 @@ public class BYGItems { public static final RegistryObject WHITE_CHERRY_FOLIAGE; public static final RegistryObject WHITE_CHERRY_LEAVES; + //Ether Woodtype + public static final RegistryObject ETHER_BULBS; + static { BYGWoodTypes.ASPEN.init(); @@ -286,29 +289,10 @@ public class BYGItems { BYGWoodTypes.CIKA.init(); BYGWoodTypes.CYPRESS.init(); BYGWoodTypes.EBONY.init(); - } - //Ether Woodtype - public static final RegistryObject ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); - - public static final RegistryObject ETHER_SAPLING = createSaplingItem(BYGBlocks.ETHER_SAPLING); - public static final RegistryObject ETHER_LEAVES = createItem(BYGBlocks.ETHER_LEAVES); - public static final RegistryObject ETHER_LOG = createItem(BYGBlocks.ETHER_LOG); - public static final RegistryObject ETHER_WOOD = createItem(BYGBlocks.ETHER_WOOD); - public static final RegistryObject STRIPPED_ETHER_LOG = createItem(BYGBlocks.STRIPPED_ETHER_LOG); - public static final RegistryObject STRIPPED_ETHER_WOOD = createItem(BYGBlocks.STRIPPED_ETHER_WOOD); - public static final RegistryObject ETHER_PLANKS = createItem(BYGBlocks.ETHER_PLANKS); - public static final RegistryObject ETHER_BOOKSHELF = createItem(BYGBlocks.ETHER_BOOKSHELF); - public static final RegistryObject ETHER_CRAFTING_TABLE = createItem(BYGBlocks.ETHER_CRAFTING_TABLE); - public static final RegistryObject ETHER_STAIRS = createItem(BYGBlocks.ETHER_STAIRS); - public static final RegistryObject ETHER_SLAB = createItem(BYGBlocks.ETHER_SLAB); - public static final RegistryObject ETHER_FENCE = createItem(BYGBlocks.ETHER_FENCE); - public static final RegistryObject ETHER_FENCE_GATE = createItem(BYGBlocks.ETHER_FENCE_GATE); - public static final RegistryObject ETHER_DOOR = createItem(BYGBlocks.ETHER_DOOR); - public static final RegistryObject ETHER_TRAPDOOR = createItem(BYGBlocks.ETHER_TRAPDOOR); - public static final RegistryObject ETHER_PRESSURE_PLATE = createItem(BYGBlocks.ETHER_PRESSURE_PLATE); - public static final RegistryObject ETHER_BUTTON = createItem(BYGBlocks.ETHER_BUTTON); - public static final RegistryObject ETHER_SIGN = createSign("ether_sign", BYGBlocks.ETHER_SIGN, BYGBlocks.ETHER_WALL_SIGN); + ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); + BYGWoodTypes.ETHER.init(); + } //Fir Woodtype public static final RegistryObject FIR_SAPLING = createSaplingItem(BYGBlocks.FIR_SAPLING); diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/ether_bookshelf.json deleted file mode 100644 index 760c1c46fb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_button.json b/Common/src/main/resources/assets/byg/blockstates/ether_button.json deleted file mode 100644 index 30ef4e56a3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/ether_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/ether_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/ether_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/ether_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/ether_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/ether_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/ether_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/ether_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/ether_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/ether_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/ether_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/ether_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/ether_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/ether_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/ether_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/ether_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/ether_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/ether_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/ether_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/ether_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/ether_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/ether_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/ether_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/ether_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/ether_crafting_table.json deleted file mode 100644 index 816190cf1d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_door.json b/Common/src/main/resources/assets/byg/blockstates/ether_door.json deleted file mode 100644 index 7ea9eb396b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/ether_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/ether_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/ether_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/ether_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/ether_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/ether_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/ether_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/ether_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/ether_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/ether_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/ether_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/ether_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/ether_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/ether_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/ether_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/ether_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/ether_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/ether_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/ether_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/ether_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/ether_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/ether_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/ether_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/ether_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/ether_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/ether_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/ether_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_fence.json b/Common/src/main/resources/assets/byg/blockstates/ether_fence.json deleted file mode 100644 index a1efa18478..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/ether_fence_post" - } - }, - { - "apply": { - "model": "byg:block/ether_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "byg:block/ether_fence_side", - "y": 90, - "uvlock": true - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "byg:block/ether_fence_side", - "y": 180, - "uvlock": true - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "byg:block/ether_fence_side", - "y": 270, - "uvlock": true - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/ether_fence_gate.json deleted file mode 100644 index 463022ca93..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/ether_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/ether_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/ether_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/ether_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/ether_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/ether_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/ether_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/ether_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/ether_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/ether_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/ether_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/ether_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/ether_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/ether_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/ether_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/ether_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_leaves.json b/Common/src/main/resources/assets/byg/blockstates/ether_leaves.json deleted file mode 100644 index 74c933649b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_leaves" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_log.json b/Common/src/main/resources/assets/byg/blockstates/ether_log.json deleted file mode 100644 index b1e895ffd4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/ether_log" - }, - "axis=z": { - "model": "byg:block/ether_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/ether_log", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_planks.json b/Common/src/main/resources/assets/byg/blockstates/ether_planks.json deleted file mode 100644 index cdf6468d18..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/ether_pressure_plate.json deleted file mode 100644 index 6f251e7442..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/ether_pressure_plate" - }, - "powered=true": { - "model": "byg:block/ether_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_sapling.json b/Common/src/main/resources/assets/byg/blockstates/ether_sapling.json deleted file mode 100644 index a42ceb2dd0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_slab.json b/Common/src/main/resources/assets/byg/blockstates/ether_slab.json deleted file mode 100644 index 740e474f22..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/ether_slab" - }, - "type=double": { - "model": "byg:block/ether_planks" - }, - "type=top": { - "model": "byg:block/ether_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_stairs.json b/Common/src/main/resources/assets/byg/blockstates/ether_stairs.json deleted file mode 100644 index a09e428ac1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/ether_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/ether_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/ether_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/ether_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/ether_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/ether_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/ether_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/ether_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/ether_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/ether_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/ether_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/ether_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/ether_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/ether_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/ether_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/ether_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/ether_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/ether_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/ether_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/ether_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/ether_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/ether_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/ether_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/ether_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/ether_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/ether_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/ether_trapdoor.json deleted file mode 100644 index ac8b23709f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/ether_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/ether_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/ether_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/ether_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/ether_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/ether_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/ether_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/ether_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/ether_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/ether_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/ether_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/ether_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/ether_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/ether_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/ether_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/ether_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_wood.json b/Common/src/main/resources/assets/byg/blockstates/ether_wood.json deleted file mode 100644 index cd06f4d381..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/ether_wood" - }, - "axis=z": { - "model": "byg:block/ether_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/ether_wood", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/ether_bookshelf.json deleted file mode 100644 index 273366e467..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/ether_planks", - "up": "byg:block/ether_planks", - "north": "byg:block/ether_bookshelf", - "east": "byg:block/ether_bookshelf", - "south": "byg:block/ether_bookshelf", - "west": "byg:block/ether_bookshelf", - "particle": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_button.json b/Common/src/main/resources/assets/byg/models/block/ether_button.json deleted file mode 100644 index 8670afddd5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/ether_button_inventory.json deleted file mode 100644 index 6601fa708f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/ether_button_pressed.json deleted file mode 100644 index 61a14b6f25..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/ether_crafting_table.json deleted file mode 100644 index aa15bad8c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/ether_crafting_table_front", - "down": "byg:block/ether_planks", - "up": "byg:block/ether_crafting_table_top", - "north": "byg:block/ether_crafting_table_front", - "east": "byg:block/ether_crafting_table_side", - "south": "byg:block/ether_crafting_table_side", - "west": "byg:block/ether_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/ether_door_bottom.json deleted file mode 100644 index d5de28381b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/ether_door_bottom", - "top": "byg:block/ether_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/ether_door_bottom_hinge.json deleted file mode 100644 index 95dfc8e9da..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/ether_door_bottom", - "top": "byg:block/ether_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_door_top.json b/Common/src/main/resources/assets/byg/models/block/ether_door_top.json deleted file mode 100644 index fa78e3e7ab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/ether_door_bottom", - "top": "byg:block/ether_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/ether_door_top_hinge.json deleted file mode 100644 index eec9f99d8d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/ether_door_bottom", - "top": "byg:block/ether_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_gate.json deleted file mode 100644 index efd2875fe3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_open.json deleted file mode 100644 index 46c243682f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall.json deleted file mode 100644 index 901b7c19e1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall_open.json deleted file mode 100644 index 0271edbde3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_inventory.json deleted file mode 100644 index 4020b4b9ab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_fence_post.json b/Common/src/main/resources/assets/byg/models/block/ether_fence_post.json deleted file mode 100644 index 7897b3b05f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_leaves.json b/Common/src/main/resources/assets/byg/models/block/ether_leaves.json deleted file mode 100644 index b7339bc7d7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/ether_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_log.json b/Common/src/main/resources/assets/byg/models/block/ether_log.json deleted file mode 100644 index 511bb5c0c5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/ether_log_top", - "side": "byg:block/ether_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_planks.json b/Common/src/main/resources/assets/byg/models/block/ether_planks.json deleted file mode 100644 index 98d54d0806..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate.json deleted file mode 100644 index b02d10114d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate_down.json deleted file mode 100644 index 8474db8154..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_sapling.json b/Common/src/main/resources/assets/byg/models/block/ether_sapling.json deleted file mode 100644 index a5e098fc54..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/ether_sapling", - "particle": "byg:block/ether_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_slab.json b/Common/src/main/resources/assets/byg/models/block/ether_slab.json deleted file mode 100644 index 346c09afbe..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/ether_planks", - "top": "byg:block/ether_planks", - "side": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_slab_top.json b/Common/src/main/resources/assets/byg/models/block/ether_slab_top.json deleted file mode 100644 index 4256f877fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/ether_planks", - "top": "byg:block/ether_planks", - "side": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_stairs.json b/Common/src/main/resources/assets/byg/models/block/ether_stairs.json deleted file mode 100644 index 94110d859c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/ether_planks", - "top": "byg:block/ether_planks", - "side": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/ether_stairs_inner.json deleted file mode 100644 index 0f18df87db..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/ether_planks", - "top": "byg:block/ether_planks", - "side": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/ether_stairs_outer.json deleted file mode 100644 index 872d85ae6f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/ether_planks", - "top": "byg:block/ether_planks", - "side": "byg:block/ether_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_bottom.json deleted file mode 100644 index 733996bd35..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/ether_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_open.json deleted file mode 100644 index a56dd62a34..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/ether_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_top.json deleted file mode 100644 index 166a565c00..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/ether_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_wood.json b/Common/src/main/resources/assets/byg/models/block/ether_wood.json deleted file mode 100644 index 62d8721b6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/ether_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/ether_log", - "side": "byg:block/ether_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/ether_bookshelf.json deleted file mode 100644 index 094d8fadc6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_bookshelf.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_bookshelf" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_button.json b/Common/src/main/resources/assets/byg/models/item/ether_button.json deleted file mode 100644 index eae82d4210..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/ether_crafting_table.json deleted file mode 100644 index 104d3d0830..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_crafting_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_crafting_table" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_door.json b/Common/src/main/resources/assets/byg/models/item/ether_door.json deleted file mode 100644 index 171a5451de..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/ether_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_fence.json b/Common/src/main/resources/assets/byg/models/item/ether_fence.json deleted file mode 100644 index 017a559e62..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/ether_fence_gate.json deleted file mode 100644 index 6117d17524..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_leaves.json b/Common/src/main/resources/assets/byg/models/item/ether_leaves.json deleted file mode 100644 index 1066953d96..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_leaves" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_log.json b/Common/src/main/resources/assets/byg/models/item/ether_log.json deleted file mode 100644 index 9354345d0d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_planks.json b/Common/src/main/resources/assets/byg/models/item/ether_planks.json deleted file mode 100644 index 6291b4635a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/ether_pressure_plate.json deleted file mode 100644 index 166039e36f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_sapling.json b/Common/src/main/resources/assets/byg/models/item/ether_sapling.json deleted file mode 100644 index 1c4cc811d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/ether_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_slab.json b/Common/src/main/resources/assets/byg/models/item/ether_slab.json deleted file mode 100644 index b220d310b5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_stairs.json b/Common/src/main/resources/assets/byg/models/item/ether_stairs.json deleted file mode 100644 index 8445a89e63..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/ether_trapdoor.json deleted file mode 100644 index ed226f1cb8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_wood.json b/Common/src/main/resources/assets/byg/models/item/ether_wood.json deleted file mode 100644 index 0110f089ae..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/ether_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/ether/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage0.png b/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage0.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage0.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage0.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png b/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage1.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage1.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png b/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage2.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage2.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png b/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage3.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage3.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bush.png b/Common/src/main/resources/assets/byg/textures/block/ether/bush.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_bush.png rename to Common/src/main/resources/assets/byg/textures/block/ether/bush.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/ether/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/ether/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_door_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_grass.png b/Common/src/main/resources/assets/byg/textures/block/ether/grass.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_grass.png rename to Common/src/main/resources/assets/byg/textures/block/ether/grass.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_leaves.png b/Common/src/main/resources/assets/byg/textures/block/ether/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/ether/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_log.png b/Common/src/main/resources/assets/byg/textures/block/ether/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_log.png rename to Common/src/main/resources/assets/byg/textures/block/ether/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_phylium.png b/Common/src/main/resources/assets/byg/textures/block/ether/phylium.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_phylium.png rename to Common/src/main/resources/assets/byg/textures/block/ether/phylium.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_phylium_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/phylium_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_phylium_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/phylium_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_planks.png b/Common/src/main/resources/assets/byg/textures/block/ether/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_planks.png rename to Common/src/main/resources/assets/byg/textures/block/ether/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_sapling.png b/Common/src/main/resources/assets/byg/textures/block/ether/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/ether/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_soil.png b/Common/src/main/resources/assets/byg/textures/block/ether/soil.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_soil.png rename to Common/src/main/resources/assets/byg/textures/block/ether/soil.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_stone.png b/Common/src/main/resources/assets/byg/textures/block/ether/stone.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_stone.png rename to Common/src/main/resources/assets/byg/textures/block/ether/stone.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/stone_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/stone_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/ether/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/ether/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ether_bulbs.png b/Common/src/main/resources/assets/byg/textures/item/ether/bulbs.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ether_bulbs.png rename to Common/src/main/resources/assets/byg/textures/item/ether/bulbs.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ether_door.png b/Common/src/main/resources/assets/byg/textures/item/ether/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ether_door.png rename to Common/src/main/resources/assets/byg/textures/item/ether/door.png From b8d25a74743e7dbd375b724d7a0dccf83c83b72e Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 19:58:32 +0300 Subject: [PATCH 24/90] Move green enchanted --- .../byg/common/block/BYGBlocks.java | 39 +--- .../byg/common/block/BYGWoodType.java | 3 - .../byg/common/block/BYGWoodTypes.java | 11 +- .../byg/common/item/BYGItems.java | 54 +---- .../green_enchanted_bookshelf.json | 7 - .../blockstates/green_enchanted_button.json | 118 ---------- .../green_enchanted_crafting_table.json | 7 - .../byg/blockstates/green_enchanted_door.json | 124 ----------- .../blockstates/green_enchanted_fence.json | 48 ---- .../green_enchanted_fence_gate.json | 80 ------- .../blockstates/green_enchanted_leaves.json | 7 - .../byg/blockstates/green_enchanted_log.json | 17 -- .../blockstates/green_enchanted_planks.json | 7 - .../green_enchanted_pressure_plate.json | 10 - .../blockstates/green_enchanted_sapling.json | 7 - .../byg/blockstates/green_enchanted_slab.json | 13 -- .../blockstates/green_enchanted_stairs.json | 209 ------------------ .../blockstates/green_enchanted_trapdoor.json | 69 ------ .../byg/blockstates/green_enchanted_wall.json | 51 ----- .../byg/blockstates/green_enchanted_wood.json | 16 -- .../block/green_enchanted_bookshelf.json | 12 - .../models/block/green_enchanted_button.json | 6 - .../green_enchanted_button_inventory.json | 6 - .../block/green_enchanted_button_pressed.json | 6 - .../block/green_enchanted_crafting_table.json | 12 - .../block/green_enchanted_door_bottom.json | 7 - .../green_enchanted_door_bottom_hinge.json | 7 - .../block/green_enchanted_door_top.json | 7 - .../block/green_enchanted_door_top_hinge.json | 7 - .../models/block/green_enchanted_fence.json | 7 - .../block/green_enchanted_fence_gate.json | 6 - .../green_enchanted_fence_gate_open.json | 6 - .../green_enchanted_fence_gate_wall.json | 6 - .../green_enchanted_fence_gate_wall_open.json | 6 - .../green_enchanted_fence_inventory.json | 7 - .../block/green_enchanted_fence_post.json | 7 - .../models/block/green_enchanted_leaves.json | 7 - .../block/green_enchanted_leaves_snowy.json | 12 - .../byg/models/block/green_enchanted_log.json | 7 - .../models/block/green_enchanted_planks.json | 12 - .../block/green_enchanted_pressure_plate.json | 6 - .../green_enchanted_pressure_plate_down.json | 6 - .../models/block/green_enchanted_sapling.json | 7 - .../models/block/green_enchanted_slab.json | 8 - .../block/green_enchanted_slab_top.json | 8 - .../models/block/green_enchanted_stairs.json | 8 - .../block/green_enchanted_stairs_inner.json | 8 - .../block/green_enchanted_stairs_outer.json | 8 - .../green_enchanted_trapdoor_bottom.json | 6 - .../block/green_enchanted_trapdoor_open.json | 6 - .../block/green_enchanted_trapdoor_top.json | 6 - .../models/block/green_enchanted_wall.json | 7 - .../block/green_enchanted_wall_inventory.json | 7 - .../block/green_enchanted_wall_post.json | 7 - .../models/block/green_enchanted_wood.json | 7 - .../byg/models/item/green_enchanted_boat.json | 6 - .../item/green_enchanted_bookshelf.json | 22 -- .../models/item/green_enchanted_button.json | 22 -- .../item/green_enchanted_crafting_table.json | 22 -- .../byg/models/item/green_enchanted_door.json | 6 - .../models/item/green_enchanted_fence.json | 3 - .../item/green_enchanted_fence_gate.json | 22 -- .../models/item/green_enchanted_leaves.json | 22 -- .../byg/models/item/green_enchanted_log.json | 22 -- .../models/item/green_enchanted_planks.json | 22 -- .../item/green_enchanted_pressure_plate.json | 22 -- .../models/item/green_enchanted_sapling.json | 6 - .../byg/models/item/green_enchanted_slab.json | 22 -- .../models/item/green_enchanted_stairs.json | 22 -- .../models/item/green_enchanted_trapdoor.json | 22 -- .../byg/models/item/green_enchanted_wall.json | 3 - .../byg/models/item/green_enchanted_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../leaves.png} | Bin .../log.png} | Bin .../log.png.mcmeta} | 0 .../log_top.png} | Bin .../planks.png} | Bin .../planks_top.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../boat.png} | Bin .../door.png} | Bin 88 files changed, 22 insertions(+), 1421 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/green_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_wood.json rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_bookshelf.png => green_enchanted/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_crafting_table_front.png => green_enchanted/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_crafting_table_side.png => green_enchanted/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_crafting_table_top.png => green_enchanted/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_door_bottom.png => green_enchanted/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_door_top.png => green_enchanted/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_leaves.png => green_enchanted/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_log.png => green_enchanted/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_log.png.mcmeta => green_enchanted/log.png.mcmeta} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_log_top.png => green_enchanted/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_planks.png => green_enchanted/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_planks_top.png => green_enchanted/planks_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_sapling.png => green_enchanted/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{green_enchanted_trapdoor.png => green_enchanted/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{green_enchanted_boat.png => green_enchanted/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{green_enchanted_door.png => green_enchanted/door.png} (100%) diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 7007162215..d7497bdebd 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,8 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject FIR_PLANKS = createPlanks("fir_planks"); - public static final BlockRegistryObject GREEN_ENCHANTED_PLANKS = createPlanks("green_enchanted_planks"); public static final BlockRegistryObject HOLLY_PLANKS = createPlanks("holly_planks"); public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAHOGANY_PLANKS = createPlanks("mahogany_planks"); @@ -83,8 +81,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject FIR_BOOKSHELF = createBookshelf("fir_bookshelf"); - public static final BlockRegistryObject GREEN_ENCHANTED_BOOKSHELF = createBookshelf("green_enchanted_bookshelf"); public static final BlockRegistryObject HOLLY_BOOKSHELF = createBookshelf("holly_bookshelf"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAHOGANY_BOOKSHELF = createBookshelf("mahogany_bookshelf"); @@ -104,8 +100,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject FIR_DOOR = createDoor("fir_door"); - public static final BlockRegistryObject GREEN_ENCHANTED_DOOR = createDoor("green_enchanted_door"); public static final BlockRegistryObject HOLLY_DOOR = createDoor("holly_door"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAHOGANY_DOOR = createDoor("mahogany_door"); @@ -125,8 +119,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject FIR_PRESSURE_PLATE = createWoodPressurePlate("fir_pressure_plate"); - public static final BlockRegistryObject GREEN_ENCHANTED_PRESSURE_PLATE = createWoodPressurePlate("green_enchanted_pressure_plate"); public static final BlockRegistryObject HOLLY_PRESSURE_PLATE = createWoodPressurePlate("holly_pressure_plate"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAHOGANY_PRESSURE_PLATE = createWoodPressurePlate("mahogany_pressure_plate"); @@ -146,8 +138,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject FIR_BUTTON = createWoodButton("fir_button"); - public static final BlockRegistryObject GREEN_ENCHANTED_BUTTON = createWoodButton("green_enchanted_button"); public static final BlockRegistryObject HOLLY_BUTTON = createWoodButton("holly_button"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAHOGANY_BUTTON = createWoodButton("mahogany_button"); @@ -167,8 +157,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject FIR_TRAPDOOR = createTrapDoor("fir_trapdoor"); - public static final BlockRegistryObject GREEN_ENCHANTED_TRAPDOOR = createTrapDoor("green_enchanted_trapdoor"); public static final BlockRegistryObject HOLLY_TRAPDOOR = createTrapDoor("holly_trapdoor"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAHOGANY_TRAPDOOR = createTrapDoor("mahogany_trapdoor"); @@ -188,8 +176,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject FIR_CRAFTING_TABLE = createCraftingTable("fir_crafting_table"); - public static final BlockRegistryObject GREEN_ENCHANTED_CRAFTING_TABLE = createCraftingTable("green_enchanted_crafting_table"); public static final BlockRegistryObject HOLLY_CRAFTING_TABLE = createCraftingTable("holly_crafting_table"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAHOGANY_CRAFTING_TABLE = createCraftingTable("mahogany_crafting_table"); @@ -209,8 +195,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject FIR_FENCE_GATE = createFenceGate("fir_fence_gate"); - public static final BlockRegistryObject GREEN_ENCHANTED_FENCE_GATE = createFenceGate("green_enchanted_fence_gate"); public static final BlockRegistryObject HOLLY_FENCE_GATE = createFenceGate("holly_fence_gate"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAHOGANY_FENCE_GATE = createFenceGate("mahogany_fence_gate"); @@ -230,8 +214,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject FIR_SLAB = createWoodSlab("fir_slab"); - public static final BlockRegistryObject GREEN_ENCHANTED_SLAB = createWoodSlab("green_enchanted_slab"); public static final BlockRegistryObject HOLLY_SLAB = createWoodSlab("holly_slab"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAHOGANY_SLAB = createWoodSlab("mahogany_slab"); @@ -251,8 +233,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject FIR_STAIRS = createWoodStairs("fir_stairs"); - public static final BlockRegistryObject GREEN_ENCHANTED_STAIRS = createWoodStairs("green_enchanted_stairs"); public static final BlockRegistryObject HOLLY_STAIRS = createWoodStairs("holly_stairs"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAHOGANY_STAIRS = createWoodStairs("mahogany_stairs"); @@ -272,8 +252,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject FIR_FENCE = createFence("fir_fence"); - public static final BlockRegistryObject GREEN_ENCHANTED_FENCE = createFence("green_enchanted_fence"); public static final BlockRegistryObject HOLLY_FENCE = createFence("holly_fence"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAHOGANY_FENCE = createFence("mahogany_fence"); @@ -293,8 +271,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject FIR_SIGN = createSign("fir_sign", BYGWoodType.FIR, FIR_PLANKS); - public static final BlockRegistryObject GREEN_ENCHANTED_SIGN = createSign("green_enchanted_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); public static final BlockRegistryObject HOLLY_SIGN = createSign("holly_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_SIGN = createSign("mahogany_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); @@ -314,8 +290,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject FIR_WALL_SIGN = createWallSign("fir_wall_sign", BYGWoodType.FIR, FIR_PLANKS); - public static final BlockRegistryObject GREEN_ENCHANTED_WALL_SIGN = createWallSign("green_enchanted_wall_sign", BYGWoodType.GREEN_ENCHANTED, GREEN_ENCHANTED_PLANKS); public static final BlockRegistryObject HOLLY_WALL_SIGN = createWallSign("holly_wall_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_WALL_SIGN = createWallSign("mahogany_wall_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); @@ -351,8 +325,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); - public static final BlockRegistryObject FIR_SAPLING = createSapling(BYGBlockTags.GROUND_FIR_SAPLING, "fir_sapling"); - public static final BlockRegistryObject GREEN_ENCHANTED_SAPLING = createSapling(BYGBlockTags.GROUND_GREEN_ENCHANTED_SAPLING, "green_enchanted_sapling"); public static final BlockRegistryObject HOLLY_SAPLING = createSapling(BYGBlockTags.GROUND_HOLLY_SAPLING, "holly_sapling"); public static final BlockRegistryObject FLOWERING_JACARANDA_BUSH = createFloweringJacarandaBush(1, TreeSpawners.JACARANDA, "flowering_jacaranda_bush"); public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_BUSH = createFloweringIndigoJacarandaBush(1, TreeSpawners.INDIGO_JACARANDA, "flowering_indigo_jacaranda_bush"); @@ -401,10 +373,8 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); public static final BlockRegistryObject BROWN_ZELKOVA_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_zelkova_leaves"); - public static final BlockRegistryObject FIR_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "fir_leaves"); public static final BlockRegistryObject FLOWERING_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "flowering_orchard_leaves"); public static final BlockRegistryObject FLOWERING_PALO_VERDE_LEAVES = createFloweringPaloVerdeLeaves(MaterialColor.COLOR_YELLOW, "flowering_palo_verde_leaves"); - public static final BlockRegistryObject GREEN_ENCHANTED_LEAVES = createGlowingLeaves(MaterialColor.COLOR_GREEN, 15, "green_enchanted_leaves"); public static final BlockRegistryObject HOLLY_BERRY_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "holly_berry_leaves"); public static final BlockRegistryObject HOLLY_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "holly_leaves"); public static final BlockRegistryObject JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_PURPLE, "jacaranda_leaves"); @@ -484,6 +454,7 @@ public class BYGBlocks { public static final BlockRegistryObject CLOVER_PATCH = createBlock(() -> new FlatVegetationBlock(BlockBehaviour.Properties.copy(Blocks.GRASS), BYGBlockTags.GROUND_CLOVER_PATCH), "clover_patch"); public static final BlockRegistryObject FLOWER_PATCH = createBlock(() -> new FlatVegetationBlock(BlockBehaviour.Properties.copy(Blocks.GRASS), BYGBlockTags.GROUND_FLOWER_PATCH), "flower_patch"); public static final BlockRegistryObject BAOBAB_FRUIT_BLOCK = createBaobabFruitBlock("baobab_fruit_block"); + public static final BlockRegistryObject ETHER_BULB = createEtherBulbBlock("ether_bulbs_block"); public static final BlockRegistryObject ANTHRACITE_BLOCK = createBlock(BYGBlockProperties.AnthraciteOre::new, "anthracite_block"); public static final BlockRegistryObject ANTHRACITE_ORE = createBlock(BYGBlockProperties.AnthraciteOre::new, "anthracite_ore"); @@ -725,8 +696,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject FIR_LOG = createLog("fir_log"); - public static final BlockRegistryObject GREEN_ENCHANTED_LOG = createLog("green_enchanted_log"); public static final BlockRegistryObject HOLLY_LOG = createLog("holly_log"); public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAHOGANY_LOG = createLog("mahogany_log"); @@ -751,8 +720,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject FIR_WOOD = createWood("fir_wood"); - public static final BlockRegistryObject GREEN_ENCHANTED_WOOD = createWood("green_enchanted_wood"); public static final BlockRegistryObject HOLLY_WOOD = createWood("holly_wood"); public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAHOGANY_WOOD = createWood("mahogany_wood"); @@ -901,8 +868,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_FIR_LOG = createStrippedLog("stripped_fir_log"); - public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_LOG = createStrippedLog("stripped_green_enchanted_log"); public static final BlockRegistryObject STRIPPED_HOLLY_LOG = createStrippedLog("stripped_holly_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_MAHOGANY_LOG = createStrippedLog("stripped_mahogany_log"); @@ -922,8 +887,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); - public static final BlockRegistryObject STRIPPED_FIR_WOOD = createWood("stripped_fir_wood"); - public static final BlockRegistryObject STRIPPED_GREEN_ENCHANTED_WOOD = createWood("stripped_green_enchanted_wood"); public static final BlockRegistryObject STRIPPED_HOLLY_WOOD = createWood("stripped_holly_wood"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAHOGANY_WOOD = createWood("stripped_mahogany_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 5bbac7e5b6..a81da83ad0 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -7,11 +7,8 @@ import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; -// TODO this needs to be merged with BYGWoodTypes public class BYGWoodType { - public static final WoodType FIR = register("fir"); - public static final WoodType GREEN_ENCHANTED = register("green_enchanted"); public static final WoodType HOLLY = register("holly"); public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAHOGANY = register("mahogany"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 0650a9ad16..8cc3f6fc8b 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -57,7 +57,16 @@ public enum BYGWoodTypes { .materialColor(MaterialColor.COLOR_GREEN)), ETHER("ether", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_ETHER_SAPLING) - .materialColor(MaterialColor.COLOR_CYAN)); + .materialColor(MaterialColor.COLOR_CYAN)), + FIR("fir", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_FIR_SAPLING) + .materialColor(MaterialColor.COLOR_GREEN) + .boatType(BYGBoatEntity.BYGType.FIR)), + GREEN_ENCHANTED("green_enchanted", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_GREEN_ENCHANTED_SAPLING) + .boatType(BYGBoatEntity.BYGType.GREEN_ENCHANTED) + .materialColor(MaterialColor.COLOR_GREEN) + .leavesLightLevel(15)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 5a11f590e6..3679d00bf8 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -5,8 +5,16 @@ import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.*; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.BowlFoodItem; +import net.minecraft.world.item.HoneyBottleItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.Item.Properties; +import net.minecraft.world.item.ItemNameBlockItem; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SignItem; +import net.minecraft.world.item.SwordItem; import net.minecraft.world.level.block.Block; import potionstudios.byg.BYG; import potionstudios.byg.BYGConstants; @@ -292,50 +300,10 @@ public class BYGItems { ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); BYGWoodTypes.ETHER.init(); + BYGWoodTypes.FIR.init(); + BYGWoodTypes.GREEN_ENCHANTED.init(); } - //Fir Woodtype - public static final RegistryObject FIR_SAPLING = createSaplingItem(BYGBlocks.FIR_SAPLING); - public static final RegistryObject FIR_LEAVES = createItem(BYGBlocks.FIR_LEAVES); - public static final RegistryObject FIR_LOG = createItem(BYGBlocks.FIR_LOG); - public static final RegistryObject FIR_WOOD = createItem(BYGBlocks.FIR_WOOD); - public static final RegistryObject STRIPPED_FIR_LOG = createItem(BYGBlocks.STRIPPED_FIR_LOG); - public static final RegistryObject STRIPPED_FIR_WOOD = createItem(BYGBlocks.STRIPPED_FIR_WOOD); - public static final RegistryObject FIR_PLANKS = createItem(BYGBlocks.FIR_PLANKS); - public static final RegistryObject FIR_BOOKSHELF = createItem(BYGBlocks.FIR_BOOKSHELF); - public static final RegistryObject FIR_CRAFTING_TABLE = createItem(BYGBlocks.FIR_CRAFTING_TABLE); - public static final RegistryObject FIR_STAIRS = createItem(BYGBlocks.FIR_STAIRS); - public static final RegistryObject FIR_SLAB = createItem(BYGBlocks.FIR_SLAB); - public static final RegistryObject FIR_FENCE = createItem(BYGBlocks.FIR_FENCE); - public static final RegistryObject FIR_FENCE_GATE = createItem(BYGBlocks.FIR_FENCE_GATE); - public static final RegistryObject FIR_DOOR = createItem(BYGBlocks.FIR_DOOR); - public static final RegistryObject FIR_TRAPDOOR = createItem(BYGBlocks.FIR_TRAPDOOR); - public static final RegistryObject FIR_PRESSURE_PLATE = createItem(BYGBlocks.FIR_PRESSURE_PLATE); - public static final RegistryObject FIR_BUTTON = createItem(BYGBlocks.FIR_BUTTON); - public static final RegistryObject FIR_SIGN = createSign("fir_sign", BYGBlocks.FIR_SIGN, BYGBlocks.FIR_WALL_SIGN); - public static final RegistryObject FIR_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.FIR, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "fir_boat"); - - //Green Enchanted Woodtype - public static final RegistryObject GREEN_ENCHANTED_SAPLING = createSaplingItem(BYGBlocks.GREEN_ENCHANTED_SAPLING); - public static final RegistryObject GREEN_ENCHANTED_LEAVES = createItem(BYGBlocks.GREEN_ENCHANTED_LEAVES); - public static final RegistryObject GREEN_ENCHANTED_LOG = createItem(BYGBlocks.GREEN_ENCHANTED_LOG); - public static final RegistryObject GREEN_ENCHANTED_WOOD = createItem(BYGBlocks.GREEN_ENCHANTED_WOOD); - public static final RegistryObject STRIPPED_GREEN_ENCHANTED_LOG = createItem(BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG); - public static final RegistryObject STRIPPED_GREEN_ENCHANTED_WOOD = createItem(BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD); - public static final RegistryObject GREEN_ENCHANTED_PLANKS = createItem(BYGBlocks.GREEN_ENCHANTED_PLANKS); - public static final RegistryObject GREEN_ENCHANTED_BOOKSHELF = createItem(BYGBlocks.GREEN_ENCHANTED_BOOKSHELF); - public static final RegistryObject GREEN_ENCHANTED_CRAFTING_TABLE = createItem(BYGBlocks.GREEN_ENCHANTED_CRAFTING_TABLE); - public static final RegistryObject GREEN_ENCHANTED_STAIRS = createItem(BYGBlocks.GREEN_ENCHANTED_STAIRS); - public static final RegistryObject GREEN_ENCHANTED_SLAB = createItem(BYGBlocks.GREEN_ENCHANTED_SLAB); - public static final RegistryObject GREEN_ENCHANTED_FENCE = createItem(BYGBlocks.GREEN_ENCHANTED_FENCE); - public static final RegistryObject GREEN_ENCHANTED_FENCE_GATE = createItem(BYGBlocks.GREEN_ENCHANTED_FENCE_GATE); - public static final RegistryObject GREEN_ENCHANTED_DOOR = createItem(BYGBlocks.GREEN_ENCHANTED_DOOR); - public static final RegistryObject GREEN_ENCHANTED_TRAPDOOR = createItem(BYGBlocks.GREEN_ENCHANTED_TRAPDOOR); - public static final RegistryObject GREEN_ENCHANTED_PRESSURE_PLATE = createItem(BYGBlocks.GREEN_ENCHANTED_PRESSURE_PLATE); - public static final RegistryObject GREEN_ENCHANTED_BUTTON = createItem(BYGBlocks.GREEN_ENCHANTED_BUTTON); - public static final RegistryObject GREEN_ENCHANTED_SIGN = createSign("green_enchanted_sign", BYGBlocks.GREEN_ENCHANTED_SIGN, BYGBlocks.GREEN_ENCHANTED_WALL_SIGN); - public static final RegistryObject GREEN_ENCHANTED_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.GREEN_ENCHANTED, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "green_enchanted_boat"); - //Holly Woodtype public static final RegistryObject HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); public static final RegistryObject HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_bookshelf.json deleted file mode 100644 index d97bb61cb7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_button.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_button.json deleted file mode 100644 index 5db4015652..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/green_enchanted_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/green_enchanted_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/green_enchanted_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/green_enchanted_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/green_enchanted_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/green_enchanted_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/green_enchanted_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/green_enchanted_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/green_enchanted_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/green_enchanted_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/green_enchanted_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/green_enchanted_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/green_enchanted_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/green_enchanted_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_crafting_table.json deleted file mode 100644 index f7d0cd67af..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_door.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_door.json deleted file mode 100644 index 5a6083f837..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence.json deleted file mode 100644 index 20c3e47172..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/green_enchanted_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence_gate.json deleted file mode 100644 index 50fbf830ad..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/green_enchanted_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/green_enchanted_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/green_enchanted_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/green_enchanted_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/green_enchanted_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/green_enchanted_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/green_enchanted_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/green_enchanted_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/green_enchanted_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/green_enchanted_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/green_enchanted_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/green_enchanted_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/green_enchanted_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/green_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/green_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/green_enchanted_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_leaves.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_leaves.json deleted file mode 100644 index 359f763b1a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_log.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_log.json deleted file mode 100644 index 83d106d9a9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/green_enchanted_log" - }, - "axis=z": { - "model": "byg:block/green_enchanted_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/green_enchanted_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_planks.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_planks.json deleted file mode 100644 index e9ab5722fa..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json deleted file mode 100644 index 190022c87d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/green_enchanted_pressure_plate" - }, - "powered=true": { - "model": "byg:block/green_enchanted_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sapling.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sapling.json deleted file mode 100644 index 9df7093b5c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_slab.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_slab.json deleted file mode 100644 index 0d152e4871..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/green_enchanted_slab" - }, - "type=top": { - "model": "byg:block/green_enchanted_slab_top" - }, - "type=double": { - "model": "byg:block/green_enchanted_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_stairs.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_stairs.json deleted file mode 100644 index 8bdf56fa4a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/green_enchanted_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_trapdoor.json deleted file mode 100644 index c5c6e08830..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/green_enchanted_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/green_enchanted_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/green_enchanted_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/green_enchanted_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/green_enchanted_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/green_enchanted_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/green_enchanted_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/green_enchanted_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/green_enchanted_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall.json deleted file mode 100644 index 4cabf52bbb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_wall_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_wall", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_wall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_wall", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/green_enchanted_wall", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wood.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wood.json deleted file mode 100644 index 07675094a9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/green_enchanted_wood" - }, - "axis=z": { - "model": "byg:block/green_enchanted_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/green_enchanted_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_bookshelf.json deleted file mode 100644 index fdcde6a3fe..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/green_enchanted_planks", - "up": "byg:block/green_enchanted_planks", - "north": "byg:block/green_enchanted_bookshelf", - "east": "byg:block/green_enchanted_bookshelf", - "south": "byg:block/green_enchanted_bookshelf", - "west": "byg:block/green_enchanted_bookshelf", - "particle": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_button.json deleted file mode 100644 index db39e3e217..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_inventory.json deleted file mode 100644 index b335735b66..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_pressed.json deleted file mode 100644 index 4022fb2276..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_crafting_table.json deleted file mode 100644 index f9cfab8dfb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/green_enchanted_crafting_table_front", - "down": "byg:block/green_enchanted_planks", - "up": "byg:block/green_enchanted_crafting_table_top", - "north": "byg:block/green_enchanted_crafting_table_front", - "east": "byg:block/green_enchanted_crafting_table_side", - "south": "byg:block/green_enchanted_crafting_table_side", - "west": "byg:block/green_enchanted_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom.json deleted file mode 100644 index be77423f24..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/green_enchanted_door_bottom", - "top": "byg:block/green_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom_hinge.json deleted file mode 100644 index 80af598911..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/green_enchanted_door_bottom", - "top": "byg:block/green_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top.json deleted file mode 100644 index d5bd5c52e8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/green_enchanted_door_bottom", - "top": "byg:block/green_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top_hinge.json deleted file mode 100644 index 406d768c28..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/green_enchanted_door_bottom", - "top": "byg:block/green_enchanted_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence.json deleted file mode 100644 index 43ec319a14..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/green_enchanted_planks", - "particle": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate.json deleted file mode 100644 index 4268303440..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_open.json deleted file mode 100644 index c045f069fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall.json deleted file mode 100644 index 862dd47b08..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall_open.json deleted file mode 100644 index 8fa262f324..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_inventory.json deleted file mode 100644 index a6101cd167..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/green_enchanted_planks", - "particle": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_post.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_post.json deleted file mode 100644 index 25155b5ff6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/green_enchanted_planks", - "particle": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves.json deleted file mode 100644 index f5772ca242..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/green_enchanted_leaves", - "particle": "byg:block/green_enchanted_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves_snowy.json deleted file mode 100644 index f311638062..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/green_enchanted_leaves_snowy", - "up": "byg:block/green_enchanted_leaves_snowy", - "north": "byg:block/green_enchanted_leaves_snowy_side", - "east": "byg:block/green_enchanted_leaves_snowy_side", - "south": "byg:block/green_enchanted_leaves_snowy_side", - "west": "byg:block/green_enchanted_leaves_snowy_side", - "particle": "byg:block/green_enchanted_leaves_snowy_side" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_log.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_log.json deleted file mode 100644 index 749d248ae4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/green_enchanted_log_top", - "side": "byg:block/green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_planks.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_planks.json deleted file mode 100644 index 219ca2abb1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/green_enchanted_planks_top", - "up": "byg:block/green_enchanted_planks_top", - "north": "byg:block/green_enchanted_planks", - "east": "byg:block/green_enchanted_planks", - "south": "byg:block/green_enchanted_planks", - "west": "byg:block/green_enchanted_planks", - "particle": "byg:block/green_enchanted_planks_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate.json deleted file mode 100644 index c5489fd13d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate_down.json deleted file mode 100644 index 1e43973047..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_sapling.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_sapling.json deleted file mode 100644 index e7de64237f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/green_enchanted_sapling", - "particle": "byg:block/green_enchanted_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab.json deleted file mode 100644 index 1bdcebd57c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/green_enchanted_planks", - "top": "byg:block/green_enchanted_planks_top", - "side": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab_top.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab_top.json deleted file mode 100644 index c30623c8b7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/green_enchanted_planks", - "top": "byg:block/green_enchanted_planks_top", - "side": "byg:block/green_enchanted_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs.json deleted file mode 100644 index 1f0018a431..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/green_enchanted_planks", - "top": "byg:block/green_enchanted_planks", - "side": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_inner.json deleted file mode 100644 index d5c3453601..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/green_enchanted_planks", - "top": "byg:block/green_enchanted_planks", - "side": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_outer.json deleted file mode 100644 index fa52985961..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/green_enchanted_planks", - "top": "byg:block/green_enchanted_planks", - "side": "byg:block/green_enchanted_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_bottom.json deleted file mode 100644 index 0ed96f8f19..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/green_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_open.json deleted file mode 100644 index 496e2f0b11..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/green_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_top.json deleted file mode 100644 index c79a52f5b9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/green_enchanted_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall.json deleted file mode 100644 index 00631071ae..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/green_enchanted_log", - "particle": "byg:block/green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_inventory.json deleted file mode 100644 index 062d564657..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/green_enchanted_log", - "particle": "byg:block/green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_post.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_post.json deleted file mode 100644 index 9e262ba583..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/green_enchanted_log", - "particle": "byg:block/green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/block/green_enchanted_wood.json deleted file mode 100644 index ba710de295..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/green_enchanted_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/green_enchanted_log", - "particle": "byg:block/green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_boat.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_boat.json deleted file mode 100644 index 7ba3855188..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/green_enchanted_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_bookshelf.json deleted file mode 100644 index 65a8562bf4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_button.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_button.json deleted file mode 100644 index ad60b24cd8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_crafting_table.json deleted file mode 100644 index a1c82ef805..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_door.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_door.json deleted file mode 100644 index 8925daff01..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/green_enchanted_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence.json deleted file mode 100644 index 72cdddd93f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence_gate.json deleted file mode 100644 index 38f1888cf9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_leaves.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_leaves.json deleted file mode 100644 index 9ee659974a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_log.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_log.json deleted file mode 100644 index dab36cdb5d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_planks.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_planks.json deleted file mode 100644 index e81e4b9c74..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_pressure_plate.json deleted file mode 100644 index c9a22e991e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_sapling.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_sapling.json deleted file mode 100644 index ec495daf6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/green_enchanted_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_slab.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_slab.json deleted file mode 100644 index d2f6e4a519..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_stairs.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_stairs.json deleted file mode 100644 index 6d8207e1eb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_trapdoor.json deleted file mode 100644 index cc577aa014..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_wall.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_wall.json deleted file mode 100644 index c2be1b9983..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_wood.json deleted file mode 100644 index 91b5c73dbf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/green_enchanted_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_door_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_leaves.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_log.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_log.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_log.png.mcmeta b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/log.png.mcmeta similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_log.png.mcmeta rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/log.png.mcmeta diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_log_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_planks.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_planks.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_planks_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_planks_top.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_sapling.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/green_enchanted_boat.png b/Common/src/main/resources/assets/byg/textures/item/green_enchanted/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/green_enchanted_boat.png rename to Common/src/main/resources/assets/byg/textures/item/green_enchanted/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/green_enchanted_door.png b/Common/src/main/resources/assets/byg/textures/item/green_enchanted/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/green_enchanted_door.png rename to Common/src/main/resources/assets/byg/textures/item/green_enchanted/door.png From d0c6b78e2fc397ba188a965fe97d1ee62c4424b0 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 20:02:00 +0300 Subject: [PATCH 25/90] Move holly --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 31 +-- .../byg/blockstates/holly_bookshelf.json | 7 - .../assets/byg/blockstates/holly_button.json | 118 ---------- .../byg/blockstates/holly_crafting_table.json | 7 - .../assets/byg/blockstates/holly_door.json | 124 ----------- .../assets/byg/blockstates/holly_fence.json | 48 ---- .../byg/blockstates/holly_fence_gate.json | 80 ------- .../assets/byg/blockstates/holly_leaves.json | 7 - .../assets/byg/blockstates/holly_log.json | 17 -- .../assets/byg/blockstates/holly_planks.json | 7 - .../byg/blockstates/holly_pressure_plate.json | 10 - .../assets/byg/blockstates/holly_sapling.json | 7 - .../assets/byg/blockstates/holly_slab.json | 13 -- .../assets/byg/blockstates/holly_stairs.json | 209 ------------------ .../byg/blockstates/holly_trapdoor.json | 69 ------ .../assets/byg/blockstates/holly_wood.json | 16 -- .../byg/models/block/holly_bookshelf.json | 12 - .../assets/byg/models/block/holly_button.json | 6 - .../models/block/holly_button_inventory.json | 6 - .../models/block/holly_button_pressed.json | 6 - .../models/block/holly_crafting_table.json | 12 - .../byg/models/block/holly_door_bottom.json | 7 - .../models/block/holly_door_bottom_hinge.json | 7 - .../byg/models/block/holly_door_top.json | 7 - .../models/block/holly_door_top_hinge.json | 7 - .../assets/byg/models/block/holly_fence.json | 7 - .../byg/models/block/holly_fence_gate.json | 6 - .../models/block/holly_fence_gate_open.json | 6 - .../models/block/holly_fence_gate_wall.json | 6 - .../block/holly_fence_gate_wall_open.json | 6 - .../models/block/holly_fence_inventory.json | 7 - .../byg/models/block/holly_fence_post.json | 7 - .../assets/byg/models/block/holly_leaves.json | 7 - .../byg/models/block/holly_leaves_snowy.json | 12 - .../assets/byg/models/block/holly_log.json | 7 - .../assets/byg/models/block/holly_planks.json | 7 - .../models/block/holly_pressure_plate.json | 6 - .../block/holly_pressure_plate_down.json | 6 - .../byg/models/block/holly_sapling.json | 7 - .../assets/byg/models/block/holly_slab.json | 8 - .../byg/models/block/holly_slab_top.json | 8 - .../assets/byg/models/block/holly_stairs.json | 8 - .../byg/models/block/holly_stairs_inner.json | 8 - .../byg/models/block/holly_stairs_outer.json | 8 - .../models/block/holly_trapdoor_bottom.json | 6 - .../byg/models/block/holly_trapdoor_open.json | 6 - .../byg/models/block/holly_trapdoor_top.json | 6 - .../assets/byg/models/block/holly_wood.json | 7 - .../assets/byg/models/item/holly_boat.json | 6 - .../byg/models/item/holly_bookshelf.json | 22 -- .../assets/byg/models/item/holly_button.json | 22 -- .../byg/models/item/holly_crafting_table.json | 22 -- .../assets/byg/models/item/holly_door.json | 6 - .../assets/byg/models/item/holly_fence.json | 3 - .../byg/models/item/holly_fence_gate.json | 22 -- .../assets/byg/models/item/holly_leaves.json | 22 -- .../assets/byg/models/item/holly_log.json | 22 -- .../assets/byg/models/item/holly_planks.json | 22 -- .../byg/models/item/holly_pressure_plate.json | 22 -- .../assets/byg/models/item/holly_sapling.json | 6 - .../assets/byg/models/item/holly_slab.json | 22 -- .../assets/byg/models/item/holly_stairs.json | 22 -- .../byg/models/item/holly_trapdoor.json | 22 -- .../assets/byg/models/item/holly_wood.json | 22 -- .../berry_leaves.png} | Bin .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{holly_leaves.png => holly/leaves.png} | Bin .../block/{holly_log.png => holly/log.png} | Bin .../{holly_log_top.png => holly/log_top.png} | Bin .../{holly_planks.png => holly/planks.png} | Bin .../{holly_sapling.png => holly/sapling.png} | Bin .../trapdoor.png} | Bin .../{holly_berries.png => holly/berries.png} | Bin .../item/{holly_boat.png => holly/boat.png} | Bin .../item/{holly_door.png => holly/door.png} | Bin 83 files changed, 13 insertions(+), 1300 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/holly_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_wood.json rename Common/src/main/resources/assets/byg/textures/block/{holly_berry_leaves.png => holly/berry_leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_bookshelf.png => holly/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_crafting_table_front.png => holly/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_crafting_table_side.png => holly/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_crafting_table_top.png => holly/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_door_bottom.png => holly/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_door_top.png => holly/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_leaves.png => holly/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_log.png => holly/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_log_top.png => holly/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_planks.png => holly/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_sapling.png => holly/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{holly_trapdoor.png => holly/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{holly_berries.png => holly/berries.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{holly_boat.png => holly/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{holly_door.png => holly/door.png} (100%) diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index d7497bdebd..397543881b 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,7 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject HOLLY_PLANKS = createPlanks("holly_planks"); public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAHOGANY_PLANKS = createPlanks("mahogany_planks"); public static final BlockRegistryObject MANGROVE_PLANKS = createPlanks("mangrove_planks"); @@ -81,7 +80,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); - public static final BlockRegistryObject HOLLY_BOOKSHELF = createBookshelf("holly_bookshelf"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAHOGANY_BOOKSHELF = createBookshelf("mahogany_bookshelf"); public static final BlockRegistryObject MANGROVE_BOOKSHELF = createBookshelf("mangrove_bookshelf"); @@ -100,7 +98,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); - public static final BlockRegistryObject HOLLY_DOOR = createDoor("holly_door"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAHOGANY_DOOR = createDoor("mahogany_door"); public static final BlockRegistryObject MANGROVE_DOOR = createDoor("mangrove_door"); @@ -119,7 +116,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); - public static final BlockRegistryObject HOLLY_PRESSURE_PLATE = createWoodPressurePlate("holly_pressure_plate"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAHOGANY_PRESSURE_PLATE = createWoodPressurePlate("mahogany_pressure_plate"); public static final BlockRegistryObject MANGROVE_PRESSURE_PLATE = createWoodPressurePlate("mangrove_pressure_plate"); @@ -138,7 +134,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); - public static final BlockRegistryObject HOLLY_BUTTON = createWoodButton("holly_button"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAHOGANY_BUTTON = createWoodButton("mahogany_button"); public static final BlockRegistryObject MANGROVE_BUTTON = createWoodButton("mangrove_button"); @@ -157,7 +152,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); - public static final BlockRegistryObject HOLLY_TRAPDOOR = createTrapDoor("holly_trapdoor"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAHOGANY_TRAPDOOR = createTrapDoor("mahogany_trapdoor"); public static final BlockRegistryObject MANGROVE_TRAPDOOR = createTrapDoor("mangrove_trapdoor"); @@ -176,7 +170,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); - public static final BlockRegistryObject HOLLY_CRAFTING_TABLE = createCraftingTable("holly_crafting_table"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAHOGANY_CRAFTING_TABLE = createCraftingTable("mahogany_crafting_table"); public static final BlockRegistryObject MANGROVE_CRAFTING_TABLE = createCraftingTable("mangrove_crafting_table"); @@ -195,7 +188,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); - public static final BlockRegistryObject HOLLY_FENCE_GATE = createFenceGate("holly_fence_gate"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAHOGANY_FENCE_GATE = createFenceGate("mahogany_fence_gate"); public static final BlockRegistryObject MANGROVE_FENCE_GATE = createFenceGate("mangrove_fence_gate"); @@ -214,7 +206,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); - public static final BlockRegistryObject HOLLY_SLAB = createWoodSlab("holly_slab"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAHOGANY_SLAB = createWoodSlab("mahogany_slab"); public static final BlockRegistryObject MANGROVE_SLAB = createWoodSlab("mangrove_slab"); @@ -233,7 +224,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); - public static final BlockRegistryObject HOLLY_STAIRS = createWoodStairs("holly_stairs"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAHOGANY_STAIRS = createWoodStairs("mahogany_stairs"); public static final BlockRegistryObject MANGROVE_STAIRS = createWoodStairs("mangrove_stairs"); @@ -252,7 +242,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); - public static final BlockRegistryObject HOLLY_FENCE = createFence("holly_fence"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAHOGANY_FENCE = createFence("mahogany_fence"); public static final BlockRegistryObject MANGROVE_FENCE = createFence("mangrove_fence"); @@ -271,7 +260,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); - public static final BlockRegistryObject HOLLY_SIGN = createSign("holly_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_SIGN = createSign("mahogany_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); public static final BlockRegistryObject MANGROVE_SIGN = createSign("mangrove_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); @@ -290,7 +278,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); - public static final BlockRegistryObject HOLLY_WALL_SIGN = createWallSign("holly_wall_sign", BYGWoodType.HOLLY, HOLLY_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_WALL_SIGN = createWallSign("mahogany_wall_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); public static final BlockRegistryObject MANGROVE_WALL_SIGN = createWallSign("mangrove_wall_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); @@ -325,7 +312,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_BIRCH_SAPLING, "brown_birch_sapling"); public static final BlockRegistryObject BROWN_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_OAK_SAPLING, "brown_oak_sapling"); public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); - public static final BlockRegistryObject HOLLY_SAPLING = createSapling(BYGBlockTags.GROUND_HOLLY_SAPLING, "holly_sapling"); public static final BlockRegistryObject FLOWERING_JACARANDA_BUSH = createFloweringJacarandaBush(1, TreeSpawners.JACARANDA, "flowering_jacaranda_bush"); public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_BUSH = createFloweringIndigoJacarandaBush(1, TreeSpawners.INDIGO_JACARANDA, "flowering_indigo_jacaranda_bush"); public static final BlockRegistryObject JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_JACARANDA_SAPLING, "jacaranda_sapling"); @@ -376,7 +362,6 @@ public class BYGBlocks { public static final BlockRegistryObject FLOWERING_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "flowering_orchard_leaves"); public static final BlockRegistryObject FLOWERING_PALO_VERDE_LEAVES = createFloweringPaloVerdeLeaves(MaterialColor.COLOR_YELLOW, "flowering_palo_verde_leaves"); public static final BlockRegistryObject HOLLY_BERRY_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "holly_berry_leaves"); - public static final BlockRegistryObject HOLLY_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "holly_leaves"); public static final BlockRegistryObject JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_PURPLE, "jacaranda_leaves"); public static final BlockRegistryObject INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "indigo_jacaranda_leaves"); public static final BlockRegistryObject FLOWERING_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_PURPLE, "flowering_jacaranda_leaves"); @@ -696,7 +681,6 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject HOLLY_LOG = createLog("holly_log"); public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAHOGANY_LOG = createLog("mahogany_log"); public static final BlockRegistryObject MANGROVE_LOG = createLog("mangrove_log"); @@ -720,7 +704,6 @@ public class BYGBlocks { public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject HOLLY_WOOD = createWood("holly_wood"); public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAHOGANY_WOOD = createWood("mahogany_wood"); public static final BlockRegistryObject MANGROVE_WOOD = createWood("mangrove_wood"); @@ -868,7 +851,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_HOLLY_LOG = createStrippedLog("stripped_holly_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_MAHOGANY_LOG = createStrippedLog("stripped_mahogany_log"); public static final BlockRegistryObject STRIPPED_MANGROVE_LOG = createStrippedLog("stripped_mangrove_log"); @@ -887,7 +869,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); - public static final BlockRegistryObject STRIPPED_HOLLY_WOOD = createWood("stripped_holly_wood"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAHOGANY_WOOD = createWood("stripped_mahogany_wood"); public static final BlockRegistryObject STRIPPED_MANGROVE_WOOD = createWood("stripped_mangrove_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index a81da83ad0..685c303658 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -9,7 +9,6 @@ public class BYGWoodType { - public static final WoodType HOLLY = register("holly"); public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAHOGANY = register("mahogany"); public static final WoodType MANGROVE = register("mangrove"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 8cc3f6fc8b..21b96a7907 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -66,7 +66,11 @@ public enum BYGWoodTypes { .growerItemGroundTag(BYGBlockTags.GROUND_GREEN_ENCHANTED_SAPLING) .boatType(BYGBoatEntity.BYGType.GREEN_ENCHANTED) .materialColor(MaterialColor.COLOR_GREEN) - .leavesLightLevel(15)); + .leavesLightLevel(15)), + HOLLY("holly", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_HOLLY_SAPLING) + .materialColor(MaterialColor.TERRACOTTA_GREEN) + .boatType(BYGBoatEntity.BYGType.HOLLY)); private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 3679d00bf8..d990d83a57 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -271,6 +271,10 @@ public class BYGItems { //Ether Woodtype public static final RegistryObject ETHER_BULBS; + // Holly Woodtype + public static final RegistryObject HOLLY_BERRY_LEAVES; + public static final RegistryObject HOLLY_BERRY; + static { BYGWoodTypes.ASPEN.init(); @@ -302,30 +306,11 @@ public class BYGItems { BYGWoodTypes.ETHER.init(); BYGWoodTypes.FIR.init(); BYGWoodTypes.GREEN_ENCHANTED.init(); - } - //Holly Woodtype - public static final RegistryObject HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); - public static final RegistryObject HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); - public static final RegistryObject HOLLY_SAPLING = createSaplingItem(BYGBlocks.HOLLY_SAPLING); - public static final RegistryObject HOLLY_LEAVES = createItem(BYGBlocks.HOLLY_LEAVES); - public static final RegistryObject HOLLY_LOG = createItem(BYGBlocks.HOLLY_LOG); - public static final RegistryObject HOLLY_WOOD = createItem(BYGBlocks.HOLLY_WOOD); - public static final RegistryObject STRIPPED_HOLLY_LOG = createItem(BYGBlocks.STRIPPED_HOLLY_LOG); - public static final RegistryObject STRIPPED_HOLLY_WOOD = createItem(BYGBlocks.STRIPPED_HOLLY_WOOD); - public static final RegistryObject HOLLY_PLANKS = createItem(BYGBlocks.HOLLY_PLANKS); - public static final RegistryObject HOLLY_BOOKSHELF = createItem(BYGBlocks.HOLLY_BOOKSHELF); - public static final RegistryObject HOLLY_CRAFTING_TABLE = createItem(BYGBlocks.HOLLY_CRAFTING_TABLE); - public static final RegistryObject HOLLY_STAIRS = createItem(BYGBlocks.HOLLY_STAIRS); - public static final RegistryObject HOLLY_SLAB = createItem(BYGBlocks.HOLLY_SLAB); - public static final RegistryObject HOLLY_FENCE = createItem(BYGBlocks.HOLLY_FENCE); - public static final RegistryObject HOLLY_FENCE_GATE = createItem(BYGBlocks.HOLLY_FENCE_GATE); - public static final RegistryObject HOLLY_DOOR = createItem(BYGBlocks.HOLLY_DOOR); - public static final RegistryObject HOLLY_TRAPDOOR = createItem(BYGBlocks.HOLLY_TRAPDOOR); - public static final RegistryObject HOLLY_PRESSURE_PLATE = createItem(BYGBlocks.HOLLY_PRESSURE_PLATE); - public static final RegistryObject HOLLY_BUTTON = createItem(BYGBlocks.HOLLY_BUTTON); - public static final RegistryObject HOLLY_SIGN = createSign("holly_sign", BYGBlocks.HOLLY_SIGN, BYGBlocks.HOLLY_WALL_SIGN); - public static final RegistryObject HOLLY_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.HOLLY, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "holly_boat"); + HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); + HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); + BYGWoodTypes.HOLLY.init(); + } //Imparius Woodtype public static final RegistryObject IMPARIUS_VINE = createItem(BYGBlocks.IMPARIUS_VINE); diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/holly_bookshelf.json deleted file mode 100644 index f03144145f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_button.json b/Common/src/main/resources/assets/byg/blockstates/holly_button.json deleted file mode 100644 index 36010e5051..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/holly_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/holly_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/holly_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/holly_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/holly_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/holly_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/holly_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/holly_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/holly_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/holly_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/holly_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/holly_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/holly_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/holly_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/holly_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/holly_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/holly_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/holly_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/holly_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/holly_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/holly_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/holly_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/holly_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/holly_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/holly_crafting_table.json deleted file mode 100644 index 1d1b2fccbd..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_door.json b/Common/src/main/resources/assets/byg/blockstates/holly_door.json deleted file mode 100644 index 9e7f3ba800..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/holly_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/holly_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/holly_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/holly_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/holly_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/holly_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/holly_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/holly_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/holly_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/holly_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/holly_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/holly_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/holly_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/holly_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/holly_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/holly_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/holly_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/holly_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/holly_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/holly_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/holly_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/holly_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/holly_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/holly_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/holly_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/holly_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/holly_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_fence.json b/Common/src/main/resources/assets/byg/blockstates/holly_fence.json deleted file mode 100644 index 19f6a86b31..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/holly_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/holly_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/holly_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/holly_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/holly_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/holly_fence_gate.json deleted file mode 100644 index ab847d402d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/holly_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/holly_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/holly_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/holly_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/holly_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/holly_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/holly_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/holly_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/holly_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/holly_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/holly_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/holly_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/holly_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/holly_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/holly_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/holly_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_leaves.json b/Common/src/main/resources/assets/byg/blockstates/holly_leaves.json deleted file mode 100644 index 4d84ec6d64..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_log.json b/Common/src/main/resources/assets/byg/blockstates/holly_log.json deleted file mode 100644 index 2b67c54edb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/holly_log" - }, - "axis=z": { - "model": "byg:block/holly_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/holly_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_planks.json b/Common/src/main/resources/assets/byg/blockstates/holly_planks.json deleted file mode 100644 index 79af144e81..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/holly_pressure_plate.json deleted file mode 100644 index 77d61fc48b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/holly_pressure_plate" - }, - "powered=true": { - "model": "byg:block/holly_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_sapling.json b/Common/src/main/resources/assets/byg/blockstates/holly_sapling.json deleted file mode 100644 index 2fceb46b92..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_slab.json b/Common/src/main/resources/assets/byg/blockstates/holly_slab.json deleted file mode 100644 index cb1105dc97..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/holly_slab" - }, - "type=top": { - "model": "byg:block/holly_slab_top" - }, - "type=double": { - "model": "byg:block/holly_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_stairs.json b/Common/src/main/resources/assets/byg/blockstates/holly_stairs.json deleted file mode 100644 index d20d32e74d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/holly_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/holly_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/holly_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/holly_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/holly_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/holly_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/holly_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/holly_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/holly_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/holly_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/holly_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/holly_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/holly_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/holly_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/holly_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/holly_trapdoor.json deleted file mode 100644 index f5810c0b70..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/holly_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/holly_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/holly_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/holly_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/holly_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/holly_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/holly_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/holly_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/holly_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/holly_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/holly_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/holly_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/holly_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/holly_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/holly_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/holly_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_wood.json b/Common/src/main/resources/assets/byg/blockstates/holly_wood.json deleted file mode 100644 index 22ca14270f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/holly_wood" - }, - "axis=z": { - "model": "byg:block/holly_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/holly_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/holly_bookshelf.json deleted file mode 100644 index 45782da6de..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/holly_planks", - "up": "byg:block/holly_planks", - "north": "byg:block/holly_bookshelf", - "east": "byg:block/holly_bookshelf", - "south": "byg:block/holly_bookshelf", - "west": "byg:block/holly_bookshelf", - "particle": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_button.json b/Common/src/main/resources/assets/byg/models/block/holly_button.json deleted file mode 100644 index d5073232cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/holly_button_inventory.json deleted file mode 100644 index 8713e71e5b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/holly_button_pressed.json deleted file mode 100644 index f4641e3007..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/holly_crafting_table.json deleted file mode 100644 index c673a7ff1a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/holly_crafting_table_front", - "down": "byg:block/holly_planks", - "up": "byg:block/holly_crafting_table_top", - "north": "byg:block/holly_crafting_table_front", - "east": "byg:block/holly_crafting_table_side", - "south": "byg:block/holly_crafting_table_side", - "west": "byg:block/holly_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/holly_door_bottom.json deleted file mode 100644 index 41899245a0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/holly_door_bottom", - "top": "byg:block/holly_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/holly_door_bottom_hinge.json deleted file mode 100644 index 4f5265e65c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/holly_door_bottom", - "top": "byg:block/holly_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_door_top.json b/Common/src/main/resources/assets/byg/models/block/holly_door_top.json deleted file mode 100644 index 9a71c202e1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/holly_door_bottom", - "top": "byg:block/holly_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/holly_door_top_hinge.json deleted file mode 100644 index 80b127c635..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/holly_door_bottom", - "top": "byg:block/holly_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence.json b/Common/src/main/resources/assets/byg/models/block/holly_fence.json deleted file mode 100644 index 3e7c426be5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/holly_planks", - "particle": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_gate.json deleted file mode 100644 index 084b2e5343..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_open.json deleted file mode 100644 index 6c7ca7ffb4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall.json deleted file mode 100644 index c4a52fb852..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall_open.json deleted file mode 100644 index 633dd763ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_inventory.json deleted file mode 100644 index b958446ce2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/holly_planks", - "particle": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_fence_post.json b/Common/src/main/resources/assets/byg/models/block/holly_fence_post.json deleted file mode 100644 index e187d6f099..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/holly_planks", - "particle": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_leaves.json b/Common/src/main/resources/assets/byg/models/block/holly_leaves.json deleted file mode 100644 index cf7f8b8540..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/holly_leaves", - "particle": "byg:block/holly_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/holly_leaves_snowy.json deleted file mode 100644 index 53ad04cc6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/holly_leaves_snowy", - "up": "byg:block/holly_leaves_snowy", - "north": "byg:block/holly_leaves_snowy_side", - "east": "byg:block/holly_leaves_snowy_side", - "south": "byg:block/holly_leaves_snowy_side", - "west": "byg:block/holly_leaves_snowy_side", - "particle": "byg:block/holly_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_log.json b/Common/src/main/resources/assets/byg/models/block/holly_log.json deleted file mode 100644 index cfe8fd96ea..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/holly_log_top", - "side": "byg:block/holly_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_planks.json b/Common/src/main/resources/assets/byg/models/block/holly_planks.json deleted file mode 100644 index a8d9348b55..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/holly_planks", - "particle": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate.json deleted file mode 100644 index 6cc1370a40..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate_down.json deleted file mode 100644 index f8b748a081..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_sapling.json b/Common/src/main/resources/assets/byg/models/block/holly_sapling.json deleted file mode 100644 index 4ff1ea16da..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/holly_sapling", - "particle": "byg:block/holly_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_slab.json b/Common/src/main/resources/assets/byg/models/block/holly_slab.json deleted file mode 100644 index b4c0261183..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/holly_planks", - "top": "byg:block/holly_planks", - "side": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_slab_top.json b/Common/src/main/resources/assets/byg/models/block/holly_slab_top.json deleted file mode 100644 index c996ee8752..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/holly_planks", - "top": "byg:block/holly_planks", - "side": "byg:block/holly_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_stairs.json b/Common/src/main/resources/assets/byg/models/block/holly_stairs.json deleted file mode 100644 index 69aebac7de..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/holly_planks", - "top": "byg:block/holly_planks", - "side": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/holly_stairs_inner.json deleted file mode 100644 index 8219cd222d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/holly_planks", - "top": "byg:block/holly_planks", - "side": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/holly_stairs_outer.json deleted file mode 100644 index 38cd12e649..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/holly_planks", - "top": "byg:block/holly_planks", - "side": "byg:block/holly_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_bottom.json deleted file mode 100644 index 0f98a54fd4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/holly_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_open.json deleted file mode 100644 index 27b52d6400..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/holly_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_top.json deleted file mode 100644 index f346764fab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/holly_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/holly_wood.json b/Common/src/main/resources/assets/byg/models/block/holly_wood.json deleted file mode 100644 index e5a9290118..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/holly_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/holly_log", - "particle": "byg:block/holly_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_boat.json b/Common/src/main/resources/assets/byg/models/item/holly_boat.json deleted file mode 100644 index c906d3c9c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/holly_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/holly_bookshelf.json deleted file mode 100644 index 9dc831f1a0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_button.json b/Common/src/main/resources/assets/byg/models/item/holly_button.json deleted file mode 100644 index 1c5305bad5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/holly_crafting_table.json deleted file mode 100644 index 9503c4630c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_door.json b/Common/src/main/resources/assets/byg/models/item/holly_door.json deleted file mode 100644 index f9e96355bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/holly_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_fence.json b/Common/src/main/resources/assets/byg/models/item/holly_fence.json deleted file mode 100644 index 5338e9da9e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/holly_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/holly_fence_gate.json deleted file mode 100644 index 68254a9b32..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_leaves.json b/Common/src/main/resources/assets/byg/models/item/holly_leaves.json deleted file mode 100644 index 621888a8ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_log.json b/Common/src/main/resources/assets/byg/models/item/holly_log.json deleted file mode 100644 index c8aaad9b88..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_planks.json b/Common/src/main/resources/assets/byg/models/item/holly_planks.json deleted file mode 100644 index f6446f12d8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/holly_pressure_plate.json deleted file mode 100644 index 9190299527..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_sapling.json b/Common/src/main/resources/assets/byg/models/item/holly_sapling.json deleted file mode 100644 index 40ecf73633..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/holly_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_slab.json b/Common/src/main/resources/assets/byg/models/item/holly_slab.json deleted file mode 100644 index 50c025aa5f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_stairs.json b/Common/src/main/resources/assets/byg/models/item/holly_stairs.json deleted file mode 100644 index 40ee5aaa48..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/holly_trapdoor.json deleted file mode 100644 index ba5a59ca07..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_wood.json b/Common/src/main/resources/assets/byg/models/item/holly_wood.json deleted file mode 100644 index a07e01c725..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/holly_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_berry_leaves.png b/Common/src/main/resources/assets/byg/textures/block/holly/berry_leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_berry_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/holly/berry_leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/holly/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/holly/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/holly/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/holly/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_door_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/holly/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_leaves.png b/Common/src/main/resources/assets/byg/textures/block/holly/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/holly/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_log.png b/Common/src/main/resources/assets/byg/textures/block/holly/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_log.png rename to Common/src/main/resources/assets/byg/textures/block/holly/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_log_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/holly/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_planks.png b/Common/src/main/resources/assets/byg/textures/block/holly/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_planks.png rename to Common/src/main/resources/assets/byg/textures/block/holly/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_sapling.png b/Common/src/main/resources/assets/byg/textures/block/holly/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/holly/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/holly/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/holly/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/holly_berries.png b/Common/src/main/resources/assets/byg/textures/item/holly/berries.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/holly_berries.png rename to Common/src/main/resources/assets/byg/textures/item/holly/berries.png diff --git a/Common/src/main/resources/assets/byg/textures/item/holly_boat.png b/Common/src/main/resources/assets/byg/textures/item/holly/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/holly_boat.png rename to Common/src/main/resources/assets/byg/textures/item/holly/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/holly_door.png b/Common/src/main/resources/assets/byg/textures/item/holly/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/holly_door.png rename to Common/src/main/resources/assets/byg/textures/item/holly/door.png From f6494b2896a0bb9f110cb45cd2de4b823a24b952 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 20:17:30 +0300 Subject: [PATCH 26/90] Generate models --- Common/src/generated/resources/.cache/cache | 353 ++++++++++++++++++ .../byg/blockstates/ether_bookshelf.json | 7 + .../assets/byg/blockstates/ether_button.json | 118 ++++++ .../byg/blockstates/ether_crafting_table.json | 7 + .../assets/byg/blockstates/ether_door.json | 124 ++++++ .../assets/byg/blockstates/ether_fence.json} | 13 +- .../byg/blockstates/ether_fence_gate.json | 80 ++++ .../assets/byg/blockstates/ether_leaves.json | 7 + .../assets/byg/blockstates/ether_log.json | 16 + .../assets/byg/blockstates/ether_planks.json | 7 + .../byg/blockstates/ether_pressure_plate.json | 10 + .../assets/byg/blockstates/ether_sapling.json | 7 + .../assets/byg/blockstates/ether_slab.json | 13 + .../assets/byg/blockstates/ether_stairs.json | 209 +++++++++++ .../byg/blockstates/ether_trapdoor.json | 68 ++++ .../assets/byg/blockstates/ether_wood.json | 16 + .../assets/byg/blockstates/fir_bookshelf.json | 7 + .../assets/byg/blockstates/fir_button.json | 156 ++++---- .../byg/blockstates/fir_crafting_table.json | 7 + .../assets/byg/blockstates/fir_door.json | 142 +++---- .../assets/byg/blockstates/fir_fence.json | 10 +- .../byg/blockstates/fir_fence_gate.json | 80 ++++ .../assets/byg/blockstates/fir_leaves.json} | 2 +- .../assets/byg/blockstates/fir_log.json | 17 +- .../assets/byg/blockstates/fir_planks.json | 2 +- .../byg/blockstates/fir_pressure_plate.json | 10 + .../assets/byg/blockstates/fir_sapling.json | 7 + .../assets/byg/blockstates/fir_slab.json | 13 + .../assets/byg/blockstates/fir_stairs.json | 216 +++++------ .../assets/byg/blockstates/fir_trapdoor.json | 79 ++-- .../assets/byg/blockstates/fir_wood.json | 16 +- .../green_enchanted_bookshelf.json | 7 + .../blockstates/green_enchanted_button.json | 118 ++++++ .../green_enchanted_crafting_table.json | 7 + .../byg/blockstates/green_enchanted_door.json | 124 ++++++ .../blockstates/green_enchanted_fence.json | 48 +++ .../green_enchanted_fence_gate.json | 80 ++++ .../blockstates/green_enchanted_leaves.json | 7 + .../byg/blockstates/green_enchanted_log.json | 16 + .../blockstates/green_enchanted_planks.json | 7 + .../green_enchanted_pressure_plate.json | 10 + .../blockstates/green_enchanted_sapling.json | 7 + .../byg/blockstates/green_enchanted_slab.json | 13 + .../blockstates/green_enchanted_stairs.json | 209 +++++++++++ .../blockstates/green_enchanted_trapdoor.json | 68 ++++ .../byg/blockstates/green_enchanted_wood.json | 16 + .../byg/blockstates/holly_bookshelf.json | 7 + .../assets/byg/blockstates/holly_button.json | 118 ++++++ .../byg/blockstates/holly_crafting_table.json | 7 + .../assets/byg/blockstates/holly_door.json | 124 ++++++ .../assets/byg/blockstates/holly_fence.json | 48 +++ .../byg/blockstates/holly_fence_gate.json | 80 ++++ .../assets/byg/blockstates/holly_leaves.json | 7 + .../assets/byg/blockstates/holly_log.json | 16 + .../assets/byg/blockstates/holly_planks.json | 7 + .../byg/blockstates/holly_pressure_plate.json | 10 + .../assets/byg/blockstates/holly_sapling.json | 7 + .../assets/byg/blockstates/holly_slab.json | 13 + .../assets/byg/blockstates/holly_stairs.json | 209 +++++++++++ .../byg/blockstates/holly_trapdoor.json | 68 ++++ .../assets/byg/blockstates/holly_wood.json | 16 + .../byg/models/block/ether/bookshelf.json | 12 + .../assets/byg/models/block/ether/button.json | 6 + .../models/block/ether/button_inventory.json | 6 + .../models/block/ether/button_pressed.json | 6 + .../models/block/ether/crafting_table.json | 12 + .../byg/models/block/ether/door_bottom.json | 7 + .../models/block/ether/door_bottom_hinge.json | 7 + .../byg/models/block/ether/door_top.json | 7 + .../models/block/ether/door_top_hinge.json | 7 + .../assets/byg/models/block/ether/fence.json | 7 + .../byg/models/block/ether/fence_gate.json | 6 + .../models/block/ether/fence_gate_open.json | 6 + .../models/block/ether/fence_gate_wall.json | 6 + .../block/ether/fence_gate_wall_open.json | 6 + .../byg/models/block/ether/fence_inv.json | 7 + .../byg/models/block/ether/fence_post.json | 7 + .../byg/models/block/ether/grower_item.json | 6 + .../assets/byg/models/block/ether/leaves.json | 12 + .../byg/models/block/ether/leaves_snowy.json | 12 + .../assets/byg/models/block/ether/log.json | 7 + .../assets/byg/models/block/ether/planks.json | 12 + .../models/block/ether/pressure_plate.json | 6 + .../block/ether/pressure_plate_down.json | 6 + .../assets/byg/models/block/ether/slab.json | 8 + .../byg/models/block/ether/slab_top.json | 8 + .../assets/byg/models/block/ether/stairs.json | 8 + .../byg/models/block/ether/stairs_inner.json | 8 + .../byg/models/block/ether/stairs_outer.json | 8 + .../byg/models/block/ether/trapdoor.json | 39 ++ .../models/block/ether/trapdoor_bottom.json | 6 + .../byg/models/block/ether/trapdoor_open.json | 6 + .../byg/models/block/ether/trapdoor_top.json | 6 + .../assets/byg/models/block/ether/wood.json | 7 + .../byg/models/block/fir/bookshelf.json | 12 + .../assets/byg/models/block/fir/button.json | 6 + .../models/block/fir/button_inventory.json | 6 + .../byg/models/block/fir/button_pressed.json | 6 + .../byg/models/block/fir/crafting_table.json | 12 + .../byg/models/block/fir/door_bottom.json | 7 + .../models/block/fir/door_bottom_hinge.json | 7 + .../assets/byg/models/block/fir/door_top.json | 7 + .../byg/models/block/fir/door_top_hinge.json | 7 + .../assets/byg/models/block/fir/fence.json | 7 + .../byg/models/block/fir/fence_gate.json | 6 + .../byg/models/block/fir/fence_gate_open.json | 6 + .../byg/models/block/fir/fence_gate_wall.json | 6 + .../block/fir/fence_gate_wall_open.json | 6 + .../byg/models/block/fir/fence_inv.json | 7 + .../byg/models/block/fir/fence_post.json | 7 + .../byg/models/block/fir/grower_item.json | 6 + .../assets/byg/models/block/fir/leaves.json | 12 + .../byg/models/block/fir/leaves_snowy.json | 12 + .../assets/byg/models/block/fir/log.json | 7 + .../assets/byg/models/block/fir/planks.json | 12 + .../byg/models/block/fir/pressure_plate.json | 6 + .../models/block/fir/pressure_plate_down.json | 6 + .../assets/byg/models/block/fir/slab.json | 8 + .../assets/byg/models/block/fir/slab_top.json | 8 + .../assets/byg/models/block/fir/stairs.json | 8 + .../byg/models/block/fir/stairs_inner.json | 8 + .../byg/models/block/fir/stairs_outer.json | 8 + .../assets/byg/models/block/fir/trapdoor.json | 39 ++ .../byg/models/block/fir/trapdoor_bottom.json | 6 + .../byg/models/block/fir/trapdoor_open.json | 6 + .../byg/models/block/fir/trapdoor_top.json | 6 + .../assets/byg/models/block/fir/wood.json | 7 + .../block/green_enchanted/bookshelf.json | 12 + .../models/block/green_enchanted/button.json | 6 + .../green_enchanted/button_inventory.json | 6 + .../block/green_enchanted/button_pressed.json | 6 + .../block/green_enchanted/crafting_table.json | 12 + .../block/green_enchanted/door_bottom.json | 7 + .../green_enchanted/door_bottom_hinge.json | 7 + .../block/green_enchanted/door_top.json | 7 + .../block/green_enchanted/door_top_hinge.json | 7 + .../models/block/green_enchanted/fence.json | 7 + .../block/green_enchanted/fence_gate.json | 6 + .../green_enchanted/fence_gate_open.json | 6 + .../green_enchanted/fence_gate_wall.json | 6 + .../green_enchanted/fence_gate_wall_open.json | 6 + .../block/green_enchanted/fence_inv.json | 7 + .../block/green_enchanted/fence_post.json | 7 + .../block/green_enchanted/grower_item.json | 6 + .../models/block/green_enchanted/leaves.json | 12 + .../block/green_enchanted/leaves_snowy.json | 12 + .../byg/models/block/green_enchanted/log.json | 7 + .../models/block/green_enchanted/planks.json | 12 + .../block/green_enchanted/pressure_plate.json | 6 + .../green_enchanted/pressure_plate_down.json | 6 + .../models/block/green_enchanted/slab.json | 8 + .../block/green_enchanted/slab_top.json | 8 + .../models/block/green_enchanted/stairs.json | 8 + .../block/green_enchanted/stairs_inner.json | 8 + .../block/green_enchanted/stairs_outer.json | 8 + .../block/green_enchanted/trapdoor.json | 39 ++ .../green_enchanted/trapdoor_bottom.json | 6 + .../block/green_enchanted/trapdoor_open.json | 6 + .../block/green_enchanted/trapdoor_top.json | 6 + .../models/block/green_enchanted/wood.json | 7 + .../byg/models/block/holly/bookshelf.json | 12 + .../assets/byg/models/block/holly/button.json | 6 + .../models/block/holly/button_inventory.json | 6 + .../models/block/holly/button_pressed.json | 6 + .../models/block/holly/crafting_table.json | 12 + .../byg/models/block/holly/door_bottom.json | 7 + .../models/block/holly/door_bottom_hinge.json | 7 + .../byg/models/block/holly/door_top.json | 7 + .../models/block/holly/door_top_hinge.json | 7 + .../assets/byg/models/block/holly/fence.json | 7 + .../byg/models/block/holly/fence_gate.json | 6 + .../models/block/holly/fence_gate_open.json | 6 + .../models/block/holly/fence_gate_wall.json | 6 + .../block/holly/fence_gate_wall_open.json | 6 + .../byg/models/block/holly/fence_inv.json | 7 + .../byg/models/block/holly/fence_post.json | 7 + .../byg/models/block/holly/grower_item.json | 6 + .../assets/byg/models/block/holly/leaves.json | 12 + .../byg/models/block/holly/leaves_snowy.json | 12 + .../assets/byg/models/block/holly/log.json | 7 + .../assets/byg/models/block/holly/planks.json | 12 + .../models/block/holly/pressure_plate.json | 6 + .../block/holly/pressure_plate_down.json | 6 + .../assets/byg/models/block/holly/slab.json | 8 + .../byg/models/block/holly/slab_top.json | 8 + .../assets/byg/models/block/holly/stairs.json | 8 + .../byg/models/block/holly/stairs_inner.json | 8 + .../byg/models/block/holly/stairs_outer.json | 8 + .../byg/models/block/holly/trapdoor.json | 39 ++ .../models/block/holly/trapdoor_bottom.json | 6 + .../byg/models/block/holly/trapdoor_open.json | 6 + .../byg/models/block/holly/trapdoor_top.json | 6 + .../assets/byg/models/block/holly/wood.json | 7 + .../byg/models/item/ether_bookshelf.json | 39 ++ .../assets/byg/models/item/ether_button.json | 39 ++ .../byg/models/item/ether_crafting_table.json | 39 ++ .../assets/byg/models/item/ether_door.json | 6 + .../assets/byg/models/item/ether_fence.json | 39 ++ .../assets/byg/models/item/ether_leaves.json | 39 ++ .../assets/byg/models/item/ether_log.json | 39 ++ .../assets/byg/models/item/ether_planks.json | 39 ++ .../byg/models/item/ether_pressure_plate.json | 39 ++ .../assets/byg/models/item/ether_sapling.json | 6 + .../assets/byg/models/item/ether_slab.json | 39 ++ .../assets/byg/models/item/ether_stairs.json | 39 ++ .../assets/byg/models/item/ether_wood.json | 39 ++ .../assets/byg/models/item/fir_boat.json | 6 + .../assets/byg/models/item/fir_bookshelf.json | 39 ++ .../assets/byg/models/item/fir_button.json | 39 ++ .../byg/models/item/fir_crafting_table.json | 39 ++ .../assets/byg/models/item/fir_door.json | 6 + .../assets/byg/models/item/fir_fence.json | 39 ++ .../assets/byg/models/item/fir_leaves.json | 39 ++ .../assets/byg/models/item/fir_log.json | 39 ++ .../assets/byg/models/item/fir_planks.json | 39 ++ .../byg/models/item/fir_pressure_plate.json | 39 ++ .../assets/byg/models/item/fir_sapling.json | 6 + .../assets/byg/models/item/fir_slab.json | 39 ++ .../assets/byg/models/item/fir_stairs.json | 39 ++ .../assets/byg/models/item/fir_wood.json | 39 ++ .../byg/models/item/green_enchanted_boat.json | 6 + .../item/green_enchanted_bookshelf.json | 39 ++ .../models/item/green_enchanted_button.json | 39 ++ .../item/green_enchanted_crafting_table.json | 39 ++ .../byg/models/item/green_enchanted_door.json | 6 + .../models/item/green_enchanted_fence.json | 39 ++ .../models/item/green_enchanted_leaves.json | 39 ++ .../byg/models/item/green_enchanted_log.json | 39 ++ .../models/item/green_enchanted_planks.json | 39 ++ .../item/green_enchanted_pressure_plate.json | 39 ++ .../models/item/green_enchanted_sapling.json | 6 + .../byg/models/item/green_enchanted_slab.json | 39 ++ .../models/item/green_enchanted_stairs.json | 39 ++ .../byg/models/item/green_enchanted_wood.json | 39 ++ .../assets/byg/models/item/holly_boat.json | 6 + .../byg/models/item/holly_bookshelf.json | 39 ++ .../assets/byg/models/item/holly_button.json | 39 ++ .../byg/models/item/holly_crafting_table.json | 39 ++ .../assets/byg/models/item/holly_door.json | 6 + .../assets/byg/models/item/holly_fence.json | 39 ++ .../assets/byg/models/item/holly_leaves.json | 39 ++ .../assets/byg/models/item/holly_log.json | 39 ++ .../assets/byg/models/item/holly_planks.json | 39 ++ .../byg/models/item/holly_pressure_plate.json | 39 ++ .../assets/byg/models/item/holly_sapling.json | 6 + .../assets/byg/models/item/holly_slab.json | 39 ++ .../assets/byg/models/item/holly_stairs.json | 39 ++ .../assets/byg/models/item/holly_wood.json | 39 ++ .../recipes/byg.byg/wood/ether/bookshelf.json | 34 ++ .../recipes/byg.byg/wood/ether/button.json | 34 ++ .../byg.byg/wood/ether/crafting_table.json | 34 ++ .../recipes/byg.byg/wood/ether/door.json | 34 ++ .../recipes/byg.byg/wood/ether/fence.json | 34 ++ .../byg.byg/wood/ether/fence_gate.json | 34 ++ .../recipes/byg.byg/wood/ether/planks.json | 32 ++ .../byg.byg/wood/ether/pressure_plate.json | 34 ++ .../recipes/byg.byg/wood/ether/slab.json | 34 ++ .../recipes/byg.byg/wood/ether/stairs.json | 34 ++ .../recipes/byg.byg/wood/ether/trapdoor.json | 34 ++ .../recipes/byg.byg/wood/ether/wood.json | 34 ++ .../recipes/byg.byg/wood/fir/boat.json | 34 ++ .../recipes/byg.byg/wood/fir/bookshelf.json | 34 ++ .../recipes/byg.byg/wood/fir/button.json | 34 ++ .../byg.byg/wood/fir/crafting_table.json | 34 ++ .../recipes/byg.byg/wood/fir/door.json | 34 ++ .../recipes/byg.byg/wood/fir/fence.json | 34 ++ .../recipes/byg.byg/wood/fir/fence_gate.json | 34 ++ .../recipes/byg.byg/wood/fir/planks.json | 32 ++ .../byg.byg/wood/fir/pressure_plate.json | 34 ++ .../recipes/byg.byg/wood/fir/slab.json | 34 ++ .../recipes/byg.byg/wood/fir/stairs.json | 34 ++ .../recipes/byg.byg/wood/fir/trapdoor.json | 34 ++ .../recipes/byg.byg/wood/fir/wood.json | 34 ++ .../byg.byg/wood/green_enchanted/boat.json | 34 ++ .../wood/green_enchanted/bookshelf.json | 34 ++ .../byg.byg/wood/green_enchanted/button.json | 34 ++ .../wood/green_enchanted/crafting_table.json | 34 ++ .../byg.byg/wood/green_enchanted/door.json | 34 ++ .../byg.byg/wood/green_enchanted/fence.json | 34 ++ .../wood/green_enchanted/fence_gate.json | 34 ++ .../byg.byg/wood/green_enchanted/planks.json | 32 ++ .../wood/green_enchanted/pressure_plate.json | 34 ++ .../byg.byg/wood/green_enchanted/slab.json | 34 ++ .../byg.byg/wood/green_enchanted/stairs.json | 34 ++ .../wood/green_enchanted/trapdoor.json | 34 ++ .../byg.byg/wood/green_enchanted/wood.json | 34 ++ .../recipes/byg.byg/wood/holly/boat.json | 34 ++ .../recipes/byg.byg/wood/holly/bookshelf.json | 34 ++ .../recipes/byg.byg/wood/holly/button.json | 34 ++ .../byg.byg/wood/holly/crafting_table.json | 34 ++ .../recipes/byg.byg/wood/holly/door.json | 34 ++ .../recipes/byg.byg/wood/holly/fence.json | 34 ++ .../byg.byg/wood/holly/fence_gate.json | 34 ++ .../recipes/byg.byg/wood/holly/planks.json | 32 ++ .../byg.byg/wood/holly/pressure_plate.json | 34 ++ .../recipes/byg.byg/wood/holly/slab.json | 34 ++ .../recipes/byg.byg/wood/holly/stairs.json | 34 ++ .../recipes/byg.byg/wood/holly/trapdoor.json | 34 ++ .../recipes/byg.byg/wood/holly/wood.json | 34 ++ .../byg/recipes/wood/ether/bookshelf.json | 20 + .../data/byg/recipes/wood/ether/button.json | 12 + .../recipes/wood/ether/crafting_table.json | 16 + .../data/byg/recipes/wood/ether/door.json | 18 + .../data/byg/recipes/wood/ether/fence.json | 20 + .../byg/recipes/wood/ether/fence_gate.json | 19 + .../data/byg/recipes/wood/ether/planks.json | 13 + .../recipes/wood/ether/pressure_plate.json | 15 + .../data/byg/recipes/wood/ether/slab.json | 16 + .../data/byg/recipes/wood/ether/stairs.json | 18 + .../data/byg/recipes/wood/ether/trapdoor.json | 17 + .../data/byg/recipes/wood/ether/wood.json | 17 + .../data/byg/recipes/wood/fir/boat.json | 16 + .../data/byg/recipes/wood/fir/bookshelf.json | 20 + .../data/byg/recipes/wood/fir/button.json | 12 + .../byg/recipes/wood/fir/crafting_table.json | 16 + .../data/byg/recipes/wood/fir/door.json | 18 + .../data/byg/recipes/wood/fir/fence.json | 20 + .../data/byg/recipes/wood/fir/fence_gate.json | 19 + .../data/byg/recipes/wood/fir/planks.json | 13 + .../byg/recipes/wood/fir/pressure_plate.json | 15 + .../data/byg/recipes/wood/fir/slab.json | 16 + .../data/byg/recipes/wood/fir/stairs.json | 18 + .../data/byg/recipes/wood/fir/trapdoor.json | 17 + .../data/byg/recipes/wood/fir/wood.json | 17 + .../recipes/wood/green_enchanted/boat.json | 16 + .../wood/green_enchanted/bookshelf.json | 20 + .../recipes/wood/green_enchanted/button.json | 12 + .../wood/green_enchanted/crafting_table.json | 16 + .../recipes/wood/green_enchanted/door.json | 18 + .../recipes/wood/green_enchanted/fence.json | 20 + .../wood/green_enchanted/fence_gate.json | 19 + .../recipes/wood/green_enchanted/planks.json | 13 + .../wood/green_enchanted/pressure_plate.json | 15 + .../recipes/wood/green_enchanted/slab.json | 16 + .../recipes/wood/green_enchanted/stairs.json | 18 + .../wood/green_enchanted/trapdoor.json | 17 + .../recipes/wood/green_enchanted/wood.json | 17 + .../data/byg/recipes/wood/holly/boat.json | 16 + .../byg/recipes/wood/holly/bookshelf.json | 20 + .../data/byg/recipes/wood/holly/button.json | 12 + .../recipes/wood/holly/crafting_table.json | 16 + .../data/byg/recipes/wood/holly/door.json | 18 + .../data/byg/recipes/wood/holly/fence.json | 20 + .../byg/recipes/wood/holly/fence_gate.json | 19 + .../data/byg/recipes/wood/holly/planks.json | 13 + .../recipes/wood/holly/pressure_plate.json | 15 + .../data/byg/recipes/wood/holly/slab.json | 16 + .../data/byg/recipes/wood/holly/stairs.json | 18 + .../data/byg/recipes/wood/holly/trapdoor.json | 17 + .../data/byg/recipes/wood/holly/wood.json | 17 + .../data/byg/tags/items/wood/ether_logs.json | 7 + .../data/byg/tags/items/wood/fir_logs.json | 7 + .../tags/items/wood/green_enchanted_logs.json | 7 + .../data/byg/tags/items/wood/holly_logs.json | 7 + .../textures/renders/BYGRenderTypes.java | 12 - .../byg/common/BYGCompostables.java | 8 - .../byg/common/BYGFlammables.java | 30 -- .../byg/common/BYGStrippables.java | 8 - .../byg/common/block/BYGWoodTypes.java | 10 + .../byg/common/block/EtherBulbsBlock.java | 2 +- .../byg/common/entity/boat/BYGBoatEntity.java | 24 +- .../end/BYGEndVegetationFeatures.java | 27 +- .../overworld/BYGOverworldTreeFeatures.java | 40 +- .../assets/byg/blockstates/fir_bookshelf.json | 7 - .../byg/blockstates/fir_crafting_table.json | 7 - .../byg/blockstates/fir_fence_gate.json | 80 ---- .../assets/byg/blockstates/fir_leaves.json | 7 - .../byg/blockstates/fir_pressure_plate.json | 10 - .../assets/byg/blockstates/fir_slab.json | 13 - .../byg/models/block/fir_bookshelf.json | 12 - .../assets/byg/models/block/fir_button.json | 6 - .../models/block/fir_button_inventory.json | 6 - .../byg/models/block/fir_button_pressed.json | 6 - .../byg/models/block/fir_crafting_table.json | 12 - .../byg/models/block/fir_door_bottom.json | 7 - .../models/block/fir_door_bottom_hinge.json | 7 - .../assets/byg/models/block/fir_door_top.json | 7 - .../byg/models/block/fir_door_top_hinge.json | 7 - .../assets/byg/models/block/fir_fence.json | 7 - .../byg/models/block/fir_fence_gate.json | 6 - .../byg/models/block/fir_fence_gate_open.json | 6 - .../byg/models/block/fir_fence_gate_wall.json | 6 - .../block/fir_fence_gate_wall_open.json | 6 - .../byg/models/block/fir_fence_inventory.json | 7 - .../byg/models/block/fir_fence_post.json | 7 - .../assets/byg/models/block/fir_leaves.json | 7 - .../byg/models/block/fir_leaves_snowy.json | 12 - .../assets/byg/models/block/fir_log.json | 7 - .../assets/byg/models/block/fir_planks.json | 7 - .../byg/models/block/fir_pressure_plate.json | 6 - .../models/block/fir_pressure_plate_down.json | 6 - .../assets/byg/models/block/fir_sapling.json | 7 - .../assets/byg/models/block/fir_slab.json | 8 - .../assets/byg/models/block/fir_slab_top.json | 8 - .../assets/byg/models/block/fir_stairs.json | 8 - .../byg/models/block/fir_stairs_inner.json | 8 - .../byg/models/block/fir_stairs_outer.json | 8 - .../byg/models/block/fir_trapdoor_bottom.json | 6 - .../byg/models/block/fir_trapdoor_open.json | 6 - .../byg/models/block/fir_trapdoor_top.json | 6 - .../assets/byg/models/block/fir_wall.json | 7 - .../byg/models/block/fir_wall_inventory.json | 7 - .../byg/models/block/fir_wall_post.json | 7 - .../assets/byg/models/block/fir_wood.json | 7 - .../assets/byg/models/item/fir_boat.json | 6 - .../assets/byg/models/item/fir_bookshelf.json | 22 -- .../assets/byg/models/item/fir_button.json | 22 -- .../byg/models/item/fir_crafting_table.json | 22 -- .../assets/byg/models/item/fir_door.json | 6 - .../assets/byg/models/item/fir_fence.json | 3 - .../byg/models/item/fir_fence_gate.json | 22 -- .../assets/byg/models/item/fir_leaves.json | 22 -- .../assets/byg/models/item/fir_log.json | 22 -- .../assets/byg/models/item/fir_planks.json | 22 -- .../byg/models/item/fir_pressure_plate.json | 22 -- .../assets/byg/models/item/fir_sapling.json | 6 - .../assets/byg/models/item/fir_slab.json | 22 -- .../assets/byg/models/item/fir_stairs.json | 22 -- .../assets/byg/models/item/fir_trapdoor.json | 22 -- .../assets/byg/models/item/fir_wall.json | 3 - .../assets/byg/models/item/fir_wood.json | 22 -- .../ether/{sapling.png => grower_item.png} | Bin .../{fir_bookshelf.png => fir/bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../{fir_door_top.png => fir/door_top.png} | Bin .../{fir_sapling.png => fir/grower_item.png} | Bin .../block/{fir_leaves.png => fir/leaves.png} | Bin .../block/{fir_log.png => fir/log.png} | Bin .../{fir_log_top.png => fir/log_top.png} | Bin .../block/{fir_planks.png => fir/planks.png} | Bin .../{fir_trapdoor.png => fir/trapdoor.png} | Bin .../{sapling.png => grower_item.png} | Bin .../holly/{sapling.png => grower_item.png} | Bin .../item/{fir_boat.png => fir/boat.png} | Bin .../item/{fir_door.png => fir/door.png} | Bin 438 files changed, 8513 insertions(+), 1114 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_door.json rename Common/src/{main/resources/assets/byg/blockstates/fir_wall.json => generated/resources/assets/byg/blockstates/ether_fence.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_bookshelf.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_button.json (53%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_door.json (61%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_fence.json (73%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json rename Common/src/{main/resources/assets/byg/blockstates/fir_sapling.json => generated/resources/assets/byg/blockstates/fir_leaves.json} (50%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_log.json (54%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_planks.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_slab.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_stairs.json (68%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_trapdoor.json (57%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/fir_wood.json (54%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_wall_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_wall_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/fir_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_wood.json rename Common/src/main/resources/assets/byg/textures/block/ether/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_bookshelf.png => fir/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_crafting_table_front.png => fir/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_crafting_table_side.png => fir/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_crafting_table_top.png => fir/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_door_bottom.png => fir/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_door_top.png => fir/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_sapling.png => fir/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_leaves.png => fir/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_log.png => fir/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_log_top.png => fir/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_planks.png => fir/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{fir_trapdoor.png => fir/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/green_enchanted/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/holly/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{fir_boat.png => fir/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{fir_door.png => fir/door.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index a73ede6440..d3937f2c75 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -115,6 +115,66 @@ d698358e14d5b800a34701c887b3c102420d37db assets/byg/blockstates/ebony_slab.json 159597001403dce617cec0b09015229f82a692fa assets/byg/blockstates/ebony_stairs.json 7093b45027148af44c5a09e2dd072b01d4cc0dd0 assets/byg/blockstates/ebony_trapdoor.json e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json +75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json +9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json +02861206e3db5520606113efda73aaee0a2d9252 assets/byg/blockstates/ether_crafting_table.json +b8d5330c7b946cc68eab17aebaa53b5fa1a69eb1 assets/byg/blockstates/ether_door.json +83814c68b112d7c4971b1ab274187057f9a10c6f assets/byg/blockstates/ether_fence.json +f9700f487572abb2236c67b992bbbbbf4ad26f0e assets/byg/blockstates/ether_fence_gate.json +38fd59128606055cd47f9d0f5e7dd9a838abad97 assets/byg/blockstates/ether_leaves.json +309ff34d42e5b2d1e09d8c828ed5518797e31cfd assets/byg/blockstates/ether_log.json +b5a493a4bd9575237f481905be4881c84339bf48 assets/byg/blockstates/ether_planks.json +37133b061949020bea2906138e83bb1df54e1031 assets/byg/blockstates/ether_pressure_plate.json +3e292be23042770314b45bfb2bffecf994ff4fed assets/byg/blockstates/ether_sapling.json +3079fa76d05999a8c0c0e531f6de4a84d12e8824 assets/byg/blockstates/ether_slab.json +3747906a8ae92fb238b2519cfa6fc46a8c55de04 assets/byg/blockstates/ether_stairs.json +80082439073ab19d72bb92807b6cef3bf7f2882a assets/byg/blockstates/ether_trapdoor.json +e3e77c7b000f51269b5f67ecddc512ec96ea05ae assets/byg/blockstates/ether_wood.json +f664d6bc826b44c0d13d33f27f57a59e7560edf0 assets/byg/blockstates/fir_bookshelf.json +156771fc3a906babe8931d717fb39aceef675330 assets/byg/blockstates/fir_button.json +33b5cf1acf9ae829ba7cb65eb1b234315d7d85af assets/byg/blockstates/fir_crafting_table.json +66ae513ef2b9c2f5a0988fc4942cd2eed0f13ccd assets/byg/blockstates/fir_door.json +082b1775bdb12abcaadf082548ce31498f8f1c68 assets/byg/blockstates/fir_fence.json +97884fc7522e744734612008fba109a49a1332a3 assets/byg/blockstates/fir_fence_gate.json +306bbaf05ba93fa40abdf5778a659bdbebd98518 assets/byg/blockstates/fir_leaves.json +5dbaafdcf890391e0104adb2be671bd42e4afcc7 assets/byg/blockstates/fir_log.json +26a3185d0554c29d7513d597f0484b1ec4c4dabe assets/byg/blockstates/fir_planks.json +a542a26d6211372337d75f448ffcb1064df92d3a assets/byg/blockstates/fir_pressure_plate.json +d3f83cdcf37f10a09f81aaa8f906aeeb56aedfbf assets/byg/blockstates/fir_sapling.json +aeca1210198d02e88eaa523732a4b57cd048a947 assets/byg/blockstates/fir_slab.json +ec0a00c28a345cd8e7651bf0d04ccdf9eed4a44a assets/byg/blockstates/fir_stairs.json +483d7c57d329f15846ba349f1e230bce57682388 assets/byg/blockstates/fir_trapdoor.json +491c543c8068f56f78c7a819a2037d1d7e07eed2 assets/byg/blockstates/fir_wood.json +9943f7e2bc7314068fe2d79f4c84b924cb7a0c59 assets/byg/blockstates/green_enchanted_bookshelf.json +04b2a6e84f0c0a930d5d119e5a23f44821f3544d assets/byg/blockstates/green_enchanted_button.json +67c51071904ce0110550b5107e8887987043220c assets/byg/blockstates/green_enchanted_crafting_table.json +05bed9ae2c7571cdf89c889c6f29714fc149a4e1 assets/byg/blockstates/green_enchanted_door.json +24c2fc4ab9a92ee26f5f9b9b3e4ba632ae1fca31 assets/byg/blockstates/green_enchanted_fence.json +5cd8bc0e467abb59e3e2489f306426e5d73453ac assets/byg/blockstates/green_enchanted_fence_gate.json +2ae3136bc890f8c9e8fbbfc3593c101393f9713b assets/byg/blockstates/green_enchanted_leaves.json +be960e54effc1b98eade1fb85034e63178f87090 assets/byg/blockstates/green_enchanted_log.json +db16b4281215de072da9fcdfa8a2e2d4f1c59e26 assets/byg/blockstates/green_enchanted_planks.json +29a1710526195079af4cdb764472b3467878855d assets/byg/blockstates/green_enchanted_pressure_plate.json +b8897b9101242e862efad4ff38bba82e3cf41f9d assets/byg/blockstates/green_enchanted_sapling.json +f7bb14615da3a0ea429d490f10cae1afb5845ab4 assets/byg/blockstates/green_enchanted_slab.json +e5e737a8dd8245a48d5a7ee0e959371e97c74ab1 assets/byg/blockstates/green_enchanted_stairs.json +4c28fe14767bd0b394d50f8cfc4324b2af6e895a assets/byg/blockstates/green_enchanted_trapdoor.json +f983f31f409c8107060d6869689d426cef3aacc1 assets/byg/blockstates/green_enchanted_wood.json +b32d0d43ebd88a4bfe468169f24c16d42579f0d7 assets/byg/blockstates/holly_bookshelf.json +198f588b7cb0580ad5ffa48eb728be5a77d7a737 assets/byg/blockstates/holly_button.json +2cce94d6eaa74cbb964b3ba950d286b0082ce82b assets/byg/blockstates/holly_crafting_table.json +25e2e375c6fac3588a1133a990c92ef5dccfbb86 assets/byg/blockstates/holly_door.json +1e0d1cb27c47deedb0b594daf1ad96664bc403a1 assets/byg/blockstates/holly_fence.json +c98a61362134c539fa7b3e1c3fbc7a5c4bf29deb assets/byg/blockstates/holly_fence_gate.json +e645b36d4b6491a69555e368685a0a24b5647504 assets/byg/blockstates/holly_leaves.json +acbd15065101f8af93ae367afe071f77b20a8a2e assets/byg/blockstates/holly_log.json +0780b1088202c3522489e6ef57c9b998dcffd05f assets/byg/blockstates/holly_planks.json +d61b3d8e97c943b200e94e10360a2991cd34a96d assets/byg/blockstates/holly_pressure_plate.json +a6d91c6966dcd3f969e18ea0b9261280e5f42053 assets/byg/blockstates/holly_sapling.json +3bd67e3d60b1f435af6e6f2acba3d70cea8b2174 assets/byg/blockstates/holly_slab.json +771a50f13aef7502407cf2700b527d00262600d7 assets/byg/blockstates/holly_stairs.json +9d50a7d25751f6827b7f95531c2d8e6945dc8619 assets/byg/blockstates/holly_trapdoor.json +4f6f2c53fc3e2eabed9d63477e8acb35645fb696 assets/byg/blockstates/holly_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -374,6 +434,138 @@ f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_ 631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json 5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony/trapdoor_top.json d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony/wood.json +9e0c6e392eb1d912d5ff72e203776609ce96c14e assets/byg/models/block/ether/bookshelf.json +951090d2076a3735ef3f278fbc48ff9b049249fb assets/byg/models/block/ether/button.json +866076592f9138f00523b84d5e13a799b4e6efa2 assets/byg/models/block/ether/button_inventory.json +104f0f5187e02447867b327e229926be3a162555 assets/byg/models/block/ether/button_pressed.json +c41e6a776201a7f910757a87011166e8987936b6 assets/byg/models/block/ether/crafting_table.json +ba6029644811e3da9f38a30a833f83879f5c8863 assets/byg/models/block/ether/door_bottom.json +fca2c74157761affd2625c3d01bdfc59d400b22a assets/byg/models/block/ether/door_bottom_hinge.json +67c0a055b1185cd3f743c451a09266d6c8f968ba assets/byg/models/block/ether/door_top.json +c264a88f331c237cdcb39e8f44538045c78ee432 assets/byg/models/block/ether/door_top_hinge.json +15376d763b19e4a4c955a41c4ceb0aa4f94119e8 assets/byg/models/block/ether/fence.json +8a4d20d3d06337018be098aa298b3ad979615e17 assets/byg/models/block/ether/fence_gate.json +728a836dc186fbdc8eec7d740b732405e834e6f4 assets/byg/models/block/ether/fence_gate_open.json +f6e5682ced57a7349ee04ad508e9f366eab2f925 assets/byg/models/block/ether/fence_gate_wall.json +d7c54d30e4e5f228fda2ddeaa1838168efdc62af assets/byg/models/block/ether/fence_gate_wall_open.json +62123d87b9413e6d74a6ee0f21c23d17e9ae8d3a assets/byg/models/block/ether/fence_inv.json +5236d278388cdfba1dbd51103d1f55b06237ff45 assets/byg/models/block/ether/fence_post.json +d43d280f877072e7d0de89b4323db0f02f9d8de6 assets/byg/models/block/ether/grower_item.json +49d19b54b900aa4bf5626d78e8462e73187d3573 assets/byg/models/block/ether/leaves.json +3def3de859e8d73aeb8e38cf17614f1d9b9ed8c8 assets/byg/models/block/ether/leaves_snowy.json +333f0cac0b8fd9f6e1f2157bad1ad1188bb27906 assets/byg/models/block/ether/log.json +236e28fced889460da9920b94396337ee98a61e2 assets/byg/models/block/ether/planks.json +ebc12a0a9686c90e3739bd23d96c05fe4a906eae assets/byg/models/block/ether/pressure_plate.json +b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_plate_down.json +4dea4efd0c474f8d542ff0e97d7e74455e9ed0fe assets/byg/models/block/ether/slab.json +4bcb19b6c5b3b28f3ae1cf2ef4727c5d76b904f6 assets/byg/models/block/ether/slab_top.json +3b042a717fb7d7d77fcf6aaef5995f32eff724e1 assets/byg/models/block/ether/stairs.json +054c6e18bf7f9fb503bc85349ef8ecfdfe7623a5 assets/byg/models/block/ether/stairs_inner.json +c07c6397816d8afa502c4a04dca385d1b4baf6d9 assets/byg/models/block/ether/stairs_outer.json +989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/block/ether/trapdoor.json +c4a2b8bfb456f821304933ac4e019e889fa0f28d assets/byg/models/block/ether/trapdoor_bottom.json +b9d4409a33e153601f0d7d07239ab95fbbeef32a assets/byg/models/block/ether/trapdoor_open.json +6742fee7cc5a67fe8944089e6afe561c27e7e3bc assets/byg/models/block/ether/trapdoor_top.json +b655ed9379b701c7e61e3395a2ffefedf40f7414 assets/byg/models/block/ether/wood.json +a7e92e3c0fb139149d866674a84eb57cb2f5cb11 assets/byg/models/block/fir/bookshelf.json +9b22c969a48258018e47de62cba0d45a5e5fbec8 assets/byg/models/block/fir/button.json +bcba00ff1b39dbfeaab6189bbb97feb0f9bef0eb assets/byg/models/block/fir/button_inventory.json +8ed14cb40a48a44365ba06a25ba58f98db0fccfd assets/byg/models/block/fir/button_pressed.json +0e2a2c71659882db111a65fa35f4b985f0d6c5de assets/byg/models/block/fir/crafting_table.json +2523cc0d8c2ba87e617c614768738039d63a3e6f assets/byg/models/block/fir/door_bottom.json +44881fd2ce4d728d84dc0585a45f0873db30c775 assets/byg/models/block/fir/door_bottom_hinge.json +6a71589344f83ceb986fafc27cccf04c274ce1a4 assets/byg/models/block/fir/door_top.json +244da6703d55e372f6be0347d49acacfe3965cf4 assets/byg/models/block/fir/door_top_hinge.json +2058ab0ef8a3b5ca3ff23d9e086f6de2df71e992 assets/byg/models/block/fir/fence.json +60267b055dc9ae420430c6719e244fcdc9681d35 assets/byg/models/block/fir/fence_gate.json +5b3248dfcfd36b46cd0b98a48b1ebb7e6e2fb383 assets/byg/models/block/fir/fence_gate_open.json +43c17a1a89967a3fc741394ad77e0c1dcff5f805 assets/byg/models/block/fir/fence_gate_wall.json +b9170c724f5f0572b4e33bbe0fc9feea87dd3ec6 assets/byg/models/block/fir/fence_gate_wall_open.json +13fdf8f8762038e8ee7e55e80a9c2dd5c1154e31 assets/byg/models/block/fir/fence_inv.json +3ca339e31fcc65647a22848e138086c4b3b2b1d0 assets/byg/models/block/fir/fence_post.json +b2a3d94c89f75f7424bd07e98d268239d03341c8 assets/byg/models/block/fir/grower_item.json +c4c6d480cfc95341506916c3f4835bfb01ba25f5 assets/byg/models/block/fir/leaves.json +9288d58312649629be6a87adf22d9774d5460cef assets/byg/models/block/fir/leaves_snowy.json +033464821424a67f8ee0621159616df389d343be assets/byg/models/block/fir/log.json +43840c4c9e7dd4430d9a7af358826b7fd01d1748 assets/byg/models/block/fir/planks.json +3d19719c8bf30a354941f8913542ea943bb712a3 assets/byg/models/block/fir/pressure_plate.json +047484e298e9f14ba276fae5dbe602d0333c29df assets/byg/models/block/fir/pressure_plate_down.json +abed894765b64afc6e9139c64a4f9c938350e8a1 assets/byg/models/block/fir/slab.json +934ae08917776b8c02af61846307a6ea5cb5b34e assets/byg/models/block/fir/slab_top.json +69d1df741a76c57d97eff7c77d333bcbf4a872ad assets/byg/models/block/fir/stairs.json +d289d31b8f91829b11464e6807b6e0765b77d28e assets/byg/models/block/fir/stairs_inner.json +d278d64e67bdc2dd38541b9bf5bf24336f2994a9 assets/byg/models/block/fir/stairs_outer.json +74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/block/fir/trapdoor.json +9cd3d0bcaf638bf1f8501d7dfe0cb677e7f2a259 assets/byg/models/block/fir/trapdoor_bottom.json +1e2e5714b08875fb2ee503a97b36ef1a402fcc48 assets/byg/models/block/fir/trapdoor_open.json +45a90c6129284331a4805899ff38c8797c97d1db assets/byg/models/block/fir/trapdoor_top.json +837b5fca69deb6f4b49ce4575731576b683bb3e3 assets/byg/models/block/fir/wood.json +2a0946cbdbbafb3a3e4e2b096f762dc70372b73e assets/byg/models/block/green_enchanted/bookshelf.json +22b1a113d9f9eca21b60785a7c880cd3ffa892eb assets/byg/models/block/green_enchanted/button.json +fdfc492699a7beb1cbf5b866708d85d387563161 assets/byg/models/block/green_enchanted/button_inventory.json +a78f517dc6dae6d2471f913277be7b56328957dc assets/byg/models/block/green_enchanted/button_pressed.json +02dade169fde794a2e4c862f05b3b3e68474e47c assets/byg/models/block/green_enchanted/crafting_table.json +e17ce505515042e106d33be8aa67c00233fac404 assets/byg/models/block/green_enchanted/door_bottom.json +db4a62fbd1c101a4598f0d1ee081c34d840c55a3 assets/byg/models/block/green_enchanted/door_bottom_hinge.json +f264cf1ac8e16e7236635e88048b392eb459130c assets/byg/models/block/green_enchanted/door_top.json +40dd2bb34a5b7d2bf5785a442ebe33419221e184 assets/byg/models/block/green_enchanted/door_top_hinge.json +dd7e8b14a8dce40381305730bd2ad57adbdb1a84 assets/byg/models/block/green_enchanted/fence.json +8597ddca7000ee48d31bcfe325c9a417c7ffeb3f assets/byg/models/block/green_enchanted/fence_gate.json +722926cd99fae9f7316df500133a6e8194889dac assets/byg/models/block/green_enchanted/fence_gate_open.json +7f791a58ab5526c6b7c010b9cc7265020a276510 assets/byg/models/block/green_enchanted/fence_gate_wall.json +81e1720e9066eb43024bfcb398fd4f605447a9a8 assets/byg/models/block/green_enchanted/fence_gate_wall_open.json +0db91ff3da46fc1c44f1ca0541fb77cd30c52f8e assets/byg/models/block/green_enchanted/fence_inv.json +c83a741fa92ce99e49e11568f3d4b687f01d48d2 assets/byg/models/block/green_enchanted/fence_post.json +25d66c39f80e8b9aa30c632e14907bb4ca859bac assets/byg/models/block/green_enchanted/grower_item.json +ea1a5f701b6700c4b09ea0eb117d15968a8997b6 assets/byg/models/block/green_enchanted/leaves.json +eeb54b895bd56056a8560a853c7fd2b8ddedfa97 assets/byg/models/block/green_enchanted/leaves_snowy.json +eea2c5a58d034a68c04ab97323f15265dd1a26a0 assets/byg/models/block/green_enchanted/log.json +a9bb32322b035cfb409ddd523934bc31f67d2ecf assets/byg/models/block/green_enchanted/planks.json +19e1280be2ea5be08fd4e2eaa1edb094428d0e5b assets/byg/models/block/green_enchanted/pressure_plate.json +1acc016884ce274e82fa55ef2a4ba713648c51f0 assets/byg/models/block/green_enchanted/pressure_plate_down.json +d193fe41d62d1432cc6dec8e8fdbd260db7cfc61 assets/byg/models/block/green_enchanted/slab.json +769ce0b35b5e56864aac74d6296c6050ba16768e assets/byg/models/block/green_enchanted/slab_top.json +09003ed5b44621cb46ceede1b10cdcd74e037391 assets/byg/models/block/green_enchanted/stairs.json +6e0a6811eb26b37eb338671b77647797a89cabb1 assets/byg/models/block/green_enchanted/stairs_inner.json +5349f05565f57fff8f1d7537c4a87a24898e0b09 assets/byg/models/block/green_enchanted/stairs_outer.json +cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/block/green_enchanted/trapdoor.json +f437f0d36f5821c5b6af79240c6c77a624cbd5c9 assets/byg/models/block/green_enchanted/trapdoor_bottom.json +75c08b16536de2ea25702aa4a3cdfbc20b194300 assets/byg/models/block/green_enchanted/trapdoor_open.json +1fdc5c64c607718910dab2aed97189c7cc3f2baf assets/byg/models/block/green_enchanted/trapdoor_top.json +7a35344ba6e729fd7fcf76d901320363e79c6111 assets/byg/models/block/green_enchanted/wood.json +5408e4793dcc59ccaee3d389f85a3a529e2a007a assets/byg/models/block/holly/bookshelf.json +200caf896bee3db6e964cdcc2964f87ac73e1635 assets/byg/models/block/holly/button.json +30fbc45579b46d414f9876d4b53d50b375b0b387 assets/byg/models/block/holly/button_inventory.json +4a2d1e4aa5cdb234bd29f0753490e304ad9bc866 assets/byg/models/block/holly/button_pressed.json +39d69921ae099784241f0371d02656eb6702375d assets/byg/models/block/holly/crafting_table.json +1e2129a0fee626ea0a2c7dbff6e8fd5e50fdcbb8 assets/byg/models/block/holly/door_bottom.json +74d7f63613bc9e6184bfba5cb8ad8d33f7f3df7a assets/byg/models/block/holly/door_bottom_hinge.json +e29c7069f15ed21939bf336cedddfbef13868fcc assets/byg/models/block/holly/door_top.json +cd807b37b5fd14a91f79c4365ee6e3229007ad40 assets/byg/models/block/holly/door_top_hinge.json +3201c07f78afa2845513b3b2349593e90bc15156 assets/byg/models/block/holly/fence.json +06860cd5944ca70ed39364bdce629a28de5d65c5 assets/byg/models/block/holly/fence_gate.json +a93322724929cf38480d7365dcea56a9be3c6fb2 assets/byg/models/block/holly/fence_gate_open.json +07263a22ab6d8213f178768d49b2bcbb1fc76537 assets/byg/models/block/holly/fence_gate_wall.json +b8eb8293ff29d6064bbc9c9a9e523bfd80b91eed assets/byg/models/block/holly/fence_gate_wall_open.json +96d2e210c6216c92ac87b256bad74d459961da29 assets/byg/models/block/holly/fence_inv.json +d8ade96134e0921470b4618d76fea2173d31298e assets/byg/models/block/holly/fence_post.json +99894c65f6fd2fc263ac67690a9c9f84b53435ed assets/byg/models/block/holly/grower_item.json +98d4fa4cbf9039fd02fd17ef2253a55749c8d35c assets/byg/models/block/holly/leaves.json +04c1b89a1a709a4dce455f5a0048a6b6e3cc7473 assets/byg/models/block/holly/leaves_snowy.json +563ef1dc3e7db69a8b854d0dcafe8c5b34518433 assets/byg/models/block/holly/log.json +6d5b9268a25046565765e78d1d9f322954a2b30f assets/byg/models/block/holly/planks.json +e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_plate.json +628a888a542382f0145454de9575b9395ad7b366 assets/byg/models/block/holly/pressure_plate_down.json +4980db3734e72d9ece421d5e4d4ce7941a1b9d3f assets/byg/models/block/holly/slab.json +6851b00bf067998abfcc173790774c7704fbd34d assets/byg/models/block/holly/slab_top.json +28dbba88f7fb307616f27bb4565e0f6c24702b2f assets/byg/models/block/holly/stairs.json +97a02e92c7565f38c20ce3a912b84aee5049ba94 assets/byg/models/block/holly/stairs_inner.json +9e8e60ee1f78dd15b676d9167c31cc68af4e91f5 assets/byg/models/block/holly/stairs_outer.json +e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/block/holly/trapdoor.json +bd80774ceff6624eb26328d1f05d96de380c3f80 assets/byg/models/block/holly/trapdoor_bottom.json +ce4c9cd9d585aaf14cde2255d2671494020a4f1b assets/byg/models/block/holly/trapdoor_open.json +b035788f20b4673957ae7eae1c48599633bd1e86 assets/byg/models/block/holly/trapdoor_top.json +a71ed16290f8fc469f4615ef5d20ec55f914f03e assets/byg/models/block/holly/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -482,6 +674,61 @@ e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.jso a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json 98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json ee030f03a491ef8d7d845da92ffd106d935d4b6c assets/byg/models/item/ebony_wood.json +a738b98393a906c3370fc2264d085148d74382a9 assets/byg/models/item/ether_bookshelf.json +0d764181101f212f7cb89c9d1982e08cea89e65a assets/byg/models/item/ether_button.json +bf33776a7202fc417bc0cc4a73f9c2529fc83295 assets/byg/models/item/ether_crafting_table.json +1b5fe275fd8f068048a998cf8e59bb8febdc7b72 assets/byg/models/item/ether_door.json +d3b25f93ce5afebe19090c439b042f68a903d1f0 assets/byg/models/item/ether_fence.json +817160672eae7be5b3981c8ce7a783a46c841530 assets/byg/models/item/ether_leaves.json +13b70520358170e237438ae742a0d88f4af77db8 assets/byg/models/item/ether_log.json +f2694503a9059e64da730806ba63d1fa4f4cfbe1 assets/byg/models/item/ether_planks.json +cc9ba8a7a057f3edb876b15530f6b5698a94d628 assets/byg/models/item/ether_pressure_plate.json +d565b9cd6d02a2f5d0ada6f498cb3a2ecad8f2d6 assets/byg/models/item/ether_sapling.json +dc795894c62ad433cebfcbf9591d9c9545a9925a assets/byg/models/item/ether_slab.json +f7a7ea114db3b06c36b122e4c860ac10804945ff assets/byg/models/item/ether_stairs.json +b408c6a95c7acfcc6d351d965d76d4a7c0f7d007 assets/byg/models/item/ether_wood.json +ca2cd2bf18242ac31c980bec455d9b6fb12e8523 assets/byg/models/item/fir_boat.json +aab8154b012e7bb92e26bf940672be14149d9eb6 assets/byg/models/item/fir_bookshelf.json +d8ede5ddc5573fe10b33697e89e7eba8243ebd09 assets/byg/models/item/fir_button.json +fc2bd0fdc8b661517bb6046ba6c6c510414fd518 assets/byg/models/item/fir_crafting_table.json +17cb6978461f5e0b18f37a3ba37394a717c816b7 assets/byg/models/item/fir_door.json +dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence.json +2346803c9b4067515f18ca71965000c4c8a2ad0b assets/byg/models/item/fir_leaves.json +5eb6e30de7798c0ef4c4592b762fa6ac62cdee4f assets/byg/models/item/fir_log.json +062a663882fb45967220ab155328abd01f953c01 assets/byg/models/item/fir_planks.json +8639f85022556f339405fb3f0ac66a994d2b40a9 assets/byg/models/item/fir_pressure_plate.json +b3ca097c89198092e4d6933879cec153a980f707 assets/byg/models/item/fir_sapling.json +378ff5a2eb5451b027f4e9b8adfa281edf88d045 assets/byg/models/item/fir_slab.json +4fcf3d712a70e48ec98bdcf5fea15d56644fa306 assets/byg/models/item/fir_stairs.json +ced3e6c7f5220906d5d11da641f1194642b0dba5 assets/byg/models/item/fir_wood.json +c698fcdde72e29eacae6d36b08793e00f7c6ea35 assets/byg/models/item/green_enchanted_boat.json +2c1af4590b2f20540c2cd8f7a4eb564da05138ba assets/byg/models/item/green_enchanted_bookshelf.json +792e5bf60f873773e6da3a8907231c096b4c70f6 assets/byg/models/item/green_enchanted_button.json +9cc14826a44a094931e93a9d0ec49fee8f34d0f8 assets/byg/models/item/green_enchanted_crafting_table.json +ea9952290b491b30fbe263683dcb82e8504256cd assets/byg/models/item/green_enchanted_door.json +cf9a214f8f431447f301d6a3da4ea1c8ded3014a assets/byg/models/item/green_enchanted_fence.json +4fc0e145707e20f1fd52bc2661e245486cc7a794 assets/byg/models/item/green_enchanted_leaves.json +d82a38272fd002efdc918a1830f365748cd49888 assets/byg/models/item/green_enchanted_log.json +2d3ab24ccb420052a423e89ea780b97468bb7938 assets/byg/models/item/green_enchanted_planks.json +3441740912cb1911af5b77d446703342febfc115 assets/byg/models/item/green_enchanted_pressure_plate.json +ce18a380e57d37ead5cbee1628e5d255313963f5 assets/byg/models/item/green_enchanted_sapling.json +e4ba9b69838b94276fb3fcb07c14c685bb374827 assets/byg/models/item/green_enchanted_slab.json +ada026c9ece852649aacca39d70428180619426c assets/byg/models/item/green_enchanted_stairs.json +35b75f67fed51a6987f7da81d571eeae34f6dda5 assets/byg/models/item/green_enchanted_wood.json +6f09e4719d8ca0c0112d05560df19ff4d10f7011 assets/byg/models/item/holly_boat.json +df5a129c735e07c4e878d452392d8e3872c2a33d assets/byg/models/item/holly_bookshelf.json +a017d4f7f115c6d10b01ee723250ec2ec0532235 assets/byg/models/item/holly_button.json +8ce0421196b97286ba44c49a54fbb7f2bdf09c6e assets/byg/models/item/holly_crafting_table.json +be84506996a338d85a16c7f0e2011a30a9d6b5d3 assets/byg/models/item/holly_door.json +38aad837131642a5537e5811902f0bd8811d4bd1 assets/byg/models/item/holly_fence.json +612ca7ce9ac3e0eed46dfc90f4c33f552a751098 assets/byg/models/item/holly_leaves.json +7f6011fcd44e106a8cb7bc380e2054befe56f354 assets/byg/models/item/holly_log.json +e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.json +49410ad86799caa3a32d98e271b1684e1a124122 assets/byg/models/item/holly_pressure_plate.json +5be333046661c77987e36265af74c7c54bbcf0e2 assets/byg/models/item/holly_sapling.json +f26a75321b0865a70718812f9896b96aac1b5a3a assets/byg/models/item/holly_slab.json +c59089c2f12b84d35e1bb31670eab2b343402bc3 assets/byg/models/item/holly_stairs.json +aece276ad34ec46ae26292fc9c22ca8f790a9d7b assets/byg/models/item/holly_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -585,6 +832,57 @@ c11c95a814d930a9a9128fdbcc8138c651a1a0db data/byg/advancements/recipes/byg.byg/w c146cebcc5cda2004d61257e4c2deb4ff421e9de data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json 9dd64acb1012c36dbcf979f00f680b3f716465b4 data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json bc237fdfe5a01a5caf21ae87675b4fe144caa9d6 data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json +b6d69417231d8bb1214b34f21c92748c6ff9f367 data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json +b767921c7c0f4fc620be688ea605184ce99f2c43 data/byg/advancements/recipes/byg.byg/wood/ether/button.json +83ead00ef090545b87617c944c6eeeb7c6268e27 data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json +468a3778aed31d1b3b1a1663184fa864386fcf7c data/byg/advancements/recipes/byg.byg/wood/ether/door.json +d6aaa33a010ad1cbea45f91268d42c8c76ac1c92 data/byg/advancements/recipes/byg.byg/wood/ether/fence.json +e4a8688990d64c704fe7aa5428f30426c7d7d3a2 data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json +d68f20e0ec94d8d8eecf15a1ef6063036875367b data/byg/advancements/recipes/byg.byg/wood/ether/planks.json +d98639a6ccf4e011f162f02574cee6555ca1e8de data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json +715a1fe551746f7a1b389ad3a7b1666d18c82b73 data/byg/advancements/recipes/byg.byg/wood/ether/slab.json +775f6170cff6aef3714388add618c14e020ef8b6 data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json +f9116fff9b742d987945bc396246b41b5a3bf12c data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json +ee31a189af0cdb306aa33ac45ae388cd8cb31421 data/byg/advancements/recipes/byg.byg/wood/ether/wood.json +887a184d8e6a28fb4eebc40c6ce7bded4ee010b7 data/byg/advancements/recipes/byg.byg/wood/fir/boat.json +e90b7de79cbe42f3b0c4c4a0b4785e80a9ee5ad9 data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json +1a29e8d41bfce15aeb107e1b6735966b6c7c0f85 data/byg/advancements/recipes/byg.byg/wood/fir/button.json +fbc8554852c60e1773694ae1eb3a7650fdc4c0c2 data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json +24976181393c7bdab8dcb152b5735bd835662a44 data/byg/advancements/recipes/byg.byg/wood/fir/door.json +d7a335cf63c00f03382f7f789152eabb3ac239ee data/byg/advancements/recipes/byg.byg/wood/fir/fence.json +95737ca56cacec4ad5ed80b082b00368c4f1cf5d data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json +e298d7496d24bb85a66eaea0e2046dafb45648e4 data/byg/advancements/recipes/byg.byg/wood/fir/planks.json +8e456a2336d2dc21b4dcba3065046232f94fb5d7 data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json +c6401f67edcd9707b45b10b2c9560e304cf3be7a data/byg/advancements/recipes/byg.byg/wood/fir/slab.json +c400e09dcf59ab7f73b0ac154397a9cad91ec87a data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json +3c1c1585f83dfc80c4186cd8c770798e4a490c77 data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json +7f3747e660c9287e6e7bc6ae223a4cd87cce5d65 data/byg/advancements/recipes/byg.byg/wood/fir/wood.json +4aa153eb5f694060e46d37ef226aa34b7ba6cf09 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json +3b7cc54950d05734d6e287bfebca15995c41a4b7 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json +59ad623f9a29c639eb4d38fb2b85c4613690a090 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json +d9fb0402b196fba9bcc0864c13c0540620fff4fb data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json +48a321256166b1b84a3a57be4f444b3f440bdca8 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json +bebbb2fbcc6a1225668a050d6a0b222bb5a79491 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json +68dcda315f00202e49dbcb472fcf1b661ed24bd8 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json +218356c5e4f374c61bf58b550b705a2fabd07890 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json +d43f52cc90905d4898f973a27d338a63a8fd3db6 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json +0cacea4b7f3fd744f07bcfde562a016ac1508f0f data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json +10dcdf764a5544180480a21b04592e313d0553ba data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json +06c3958dc0ec2b7f80fa4050851e39cecfd41580 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json +c01c05346a96fa455e198821d964fbd956446251 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json +61ac31a79039ca512d310874adc7d78e0c24212f data/byg/advancements/recipes/byg.byg/wood/holly/boat.json +49a7f92c4ea36d8da1f497fbd9ea183774741c5c data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json +1c4821639533d50462b277304aa75d34043eafba data/byg/advancements/recipes/byg.byg/wood/holly/button.json +9f708ea38d8a0f9d9f693624122c7f9fa7401ff3 data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json +7973e5c80a2e21093c7af0a05e8c157191216005 data/byg/advancements/recipes/byg.byg/wood/holly/door.json +f1a32e7e0c01275e64bc728f792b179f485f4dd5 data/byg/advancements/recipes/byg.byg/wood/holly/fence.json +63797ab6e35fbeeba288b9567f335701ad16cae7 data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json +98e27ec36fc04cc29d6efb765dccba93d84f652a data/byg/advancements/recipes/byg.byg/wood/holly/planks.json +1cbf4262c545c09d1765a3f0824b678f382ab058 data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json +936142a10cdea1fe8c61b747f2180e16cca306a6 data/byg/advancements/recipes/byg.byg/wood/holly/slab.json +6f33d35a03824ffe3bda33c1e7b72e124d8fd2aa data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json +78e889d6619efb1d8e8d1be701e640b2968dee46 data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json +df0d7e8f0280269736ac22d62e84b3db7c2e6c39 data/byg/advancements/recipes/byg.byg/wood/holly/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -688,6 +986,57 @@ ecd292502b1ba405da5b7cd6dc907e6741a7ab34 data/byg/recipes/wood/ebony/slab.json b03173249150fb57da7ea0b5fc3272530c0333e1 data/byg/recipes/wood/ebony/stairs.json cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.json 7ef6d2286f911144c5a1fd7bfb95974631517438 data/byg/recipes/wood/ebony/wood.json +86d3edbb975fd920b866562841a1a4368c5f5551 data/byg/recipes/wood/ether/bookshelf.json +74876a43f8e763fe5bd418f95b65b02fff554be6 data/byg/recipes/wood/ether/button.json +a434b4d028fd5b097f88886c6fce58641204bed5 data/byg/recipes/wood/ether/crafting_table.json +52faa07cde0a3d4c4bc49393244b8e990b3751ee data/byg/recipes/wood/ether/door.json +3290b2244194f3581a11308e63e8a69806bc71b4 data/byg/recipes/wood/ether/fence.json +070557e4753efcf76363f559a6c6605d63eff796 data/byg/recipes/wood/ether/fence_gate.json +9507b8fd3f1eae3c4acf6e10f74c9a6084cf89f7 data/byg/recipes/wood/ether/planks.json +b48bac9b7aaa14fd286e4e71149fc78dd381ea5c data/byg/recipes/wood/ether/pressure_plate.json +eda83001030b0dfac6c3ccd92c9c7f452eee6f7b data/byg/recipes/wood/ether/slab.json +7764e07cb9aa3053869082917560c5985b9b1bb6 data/byg/recipes/wood/ether/stairs.json +e308f8d569ee3f59be3884908821c4d5c66a58b7 data/byg/recipes/wood/ether/trapdoor.json +2a9be6b7846ea71700d30cb99ffb31ec9faeb8a7 data/byg/recipes/wood/ether/wood.json +b533ac19abbd2dbd6270ebf3b0ba54e2c133fa9e data/byg/recipes/wood/fir/boat.json +04e0159f15aed0f0ba47c04e4bed8481c2d4ebe9 data/byg/recipes/wood/fir/bookshelf.json +e6a9f18b10d3b48f7fd2fe855e6039080eb517c2 data/byg/recipes/wood/fir/button.json +a627b1aa2a568bf4ee9310b52517667a6cb922ee data/byg/recipes/wood/fir/crafting_table.json +19a468ff39297c013f5b0875e0c5d519eacd7b20 data/byg/recipes/wood/fir/door.json +855156f8f955233ecce478b342ee9ae91d38c395 data/byg/recipes/wood/fir/fence.json +ef31fdf7b6014cea5e6b81217f14256b200ad30a data/byg/recipes/wood/fir/fence_gate.json +37bc3c333eac8a46c60c454532e936d3653684d7 data/byg/recipes/wood/fir/planks.json +b245db81b6ec383a91df91673ae90fc3dad0f850 data/byg/recipes/wood/fir/pressure_plate.json +65b20003f1b266d431be4bfcbc51d2dbd7b64b66 data/byg/recipes/wood/fir/slab.json +4493f95748ed40595d49ac0e87a5363381d1fc96 data/byg/recipes/wood/fir/stairs.json +e9a451281d8d3cb683acec506e9b8e78608cce43 data/byg/recipes/wood/fir/trapdoor.json +dbadfa96e072ebce74b5b5e591a2819fd2ff273a data/byg/recipes/wood/fir/wood.json +00849130adccd6cd99c8844e83b94f0e1c2ef3a5 data/byg/recipes/wood/green_enchanted/boat.json +42ef2ff3f21222aeef9afabf463a406f4fe09fef data/byg/recipes/wood/green_enchanted/bookshelf.json +dcaabfe86ea6ec5dc7dcd37a9ac9dd58ab30d67f data/byg/recipes/wood/green_enchanted/button.json +d0380a692f02a3d60ad98bfb692c201430da8c05 data/byg/recipes/wood/green_enchanted/crafting_table.json +2589e2b9e995fbe3c8140a7b62fb0d79a5610ac9 data/byg/recipes/wood/green_enchanted/door.json +5e5094a9fad5d379908c529a2fbf7f606e74f208 data/byg/recipes/wood/green_enchanted/fence.json +e98e8d98c76900bab625bdd600c0fdfe3341c342 data/byg/recipes/wood/green_enchanted/fence_gate.json +c7d0e4ee4be1a208fdf212b86fdf0a2db4c18be0 data/byg/recipes/wood/green_enchanted/planks.json +f553c9c526821bc0db3aff458c4aeeef2d915ad6 data/byg/recipes/wood/green_enchanted/pressure_plate.json +6208b13057c1da578a2ac8aba7af65d4ecdcf2aa data/byg/recipes/wood/green_enchanted/slab.json +b519845d4d931b9e50a74d1be071b0301e1638cc data/byg/recipes/wood/green_enchanted/stairs.json +9e87eebd551c977e3ef7ba14c442bfa7a51e3b52 data/byg/recipes/wood/green_enchanted/trapdoor.json +c0400126b1da6b09625d144d5b7a3e45290295a0 data/byg/recipes/wood/green_enchanted/wood.json +9aaac9a584af1f0fc5fa09282a7642af1dafe9e8 data/byg/recipes/wood/holly/boat.json +6728383d21cef715f2519e7c9f1f6ebf4a13554c data/byg/recipes/wood/holly/bookshelf.json +7ed678397ba3356fef446b9e9208c177d8e17ad6 data/byg/recipes/wood/holly/button.json +94cb01fe12e818480c5a7cb29758b8f9011d00dc data/byg/recipes/wood/holly/crafting_table.json +ab5fe57e1951ed5875bd86823d50b95a88b1bde7 data/byg/recipes/wood/holly/door.json +a616a23b829b524d58c5a688d188209189198eb7 data/byg/recipes/wood/holly/fence.json +54bd22cc31320218e0ce45babbfe16091b09eda4 data/byg/recipes/wood/holly/fence_gate.json +38e375959973d1b42f2efa4b2536938c4908e764 data/byg/recipes/wood/holly/planks.json +9fa3efad105acdd7b7f9c7e4fcf2196fc3bf1a55 data/byg/recipes/wood/holly/pressure_plate.json +52ed1932b6579679c372be18c832d7727ae26625 data/byg/recipes/wood/holly/slab.json +0621b9364a6d328033e2053fc429244482dfa00f data/byg/recipes/wood/holly/stairs.json +86046c7ccfd2aa099c32b40ed0180fcbe5112b74 data/byg/recipes/wood/holly/trapdoor.json +f26dab6058245ffa50a299bef00e25fa2644866f data/byg/recipes/wood/holly/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -820,4 +1169,8 @@ bcdbea8a4817d523a8fa8975d98164bc12532cf3 data/byg/tags/items/wood/baobab_logs.js e629914e0c0a5c9aace6f7c8a410142ec1b2b539 data/byg/tags/items/wood/cika_logs.json be12ec3d68eee6eb8bbf5dac855a337bc7d1b788 data/byg/tags/items/wood/cypress_logs.json be75a061b10665d7e7aa7af3ca4f14d21a660c30 data/byg/tags/items/wood/ebony_logs.json +202109b1c66a54bd1cfae7449e7c0ac27c927e83 data/byg/tags/items/wood/ether_logs.json +c1a1d312dd318773b2291d7dc43675175b85e3a3 data/byg/tags/items/wood/fir_logs.json +06c5ce60b03ed3a3d6d5584318fab3aa21dd2a45 data/byg/tags/items/wood/green_enchanted_logs.json +9b70ec5f499ecb1382ef296cd4f8495d5d235566 data/byg/tags/items/wood/holly_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/ether_bookshelf.json new file mode 100644 index 0000000000..99dee3132d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_button.json b/Common/src/generated/resources/assets/byg/blockstates/ether_button.json new file mode 100644 index 0000000000..c3b4c81c0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/ether/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/ether/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/ether/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/ether/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/ether/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/ether/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/ether/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/ether/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/ether/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/ether_crafting_table.json new file mode 100644 index 0000000000..e864516ba5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_door.json b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json new file mode 100644 index 0000000000..3c414791aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_wall.json b/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json similarity index 69% rename from Common/src/main/resources/assets/byg/blockstates/fir_wall.json rename to Common/src/generated/resources/assets/byg/blockstates/ether_fence.json index df416e3ace..a41e8c58c8 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_wall.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json @@ -1,11 +1,8 @@ { "multipart": [ { - "when": { - "up": "true" - }, "apply": { - "model": "byg:block/fir_wall_post" + "model": "byg:block/ether/fence_post" } }, { @@ -13,7 +10,7 @@ "north": "true" }, "apply": { - "model": "byg:block/fir_wall", + "model": "byg:block/ether/fence", "uvlock": true } }, @@ -22,7 +19,7 @@ "south": "true" }, "apply": { - "model": "byg:block/fir_wall", + "model": "byg:block/ether/fence", "y": 180, "uvlock": true } @@ -32,7 +29,7 @@ "west": "true" }, "apply": { - "model": "byg:block/fir_wall", + "model": "byg:block/ether/fence", "y": 270, "uvlock": true } @@ -42,7 +39,7 @@ "east": "true" }, "apply": { - "model": "byg:block/fir_wall", + "model": "byg:block/ether/fence", "y": 90, "uvlock": true } diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json new file mode 100644 index 0000000000..eb4f897f07 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/ether_leaves.json new file mode 100644 index 0000000000..f3d165316c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_log.json b/Common/src/generated/resources/assets/byg/blockstates/ether_log.json new file mode 100644 index 0000000000..bfbca4a708 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ether/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ether/log" + }, + "axis=z": { + "model": "byg:block/ether/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_planks.json b/Common/src/generated/resources/assets/byg/blockstates/ether_planks.json new file mode 100644 index 0000000000..ad97d0150a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/ether_pressure_plate.json new file mode 100644 index 0000000000..fd2aae3b1b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/ether/pressure_plate" + }, + "powered=true": { + "model": "byg:block/ether/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/ether_sapling.json new file mode 100644 index 0000000000..a382781f9f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json b/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json new file mode 100644 index 0000000000..d1b0f57c6b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/ether/slab_top" + }, + "type=bottom": { + "model": "byg:block/ether/slab" + }, + "type=double": { + "model": "byg:block/ether/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json new file mode 100644 index 0000000000..5571f0b045 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json new file mode 100644 index 0000000000..17933f93c4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/ether/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/ether/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/ether/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/ether/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_wood.json b/Common/src/generated/resources/assets/byg/blockstates/ether_wood.json new file mode 100644 index 0000000000..c6ad066147 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ether/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ether/wood" + }, + "axis=z": { + "model": "byg:block/ether/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/fir_bookshelf.json new file mode 100644 index 0000000000..c9de2152f3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_button.json b/Common/src/generated/resources/assets/byg/blockstates/fir_button.json similarity index 53% rename from Common/src/main/resources/assets/byg/blockstates/fir_button.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_button.json index 2d9e92ab67..3ef6785258 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_button.json @@ -1,118 +1,118 @@ { "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/fir_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/fir_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/fir_button", - "y": 180 - }, "face=floor,facing=north,powered=false": { - "model": "byg:block/fir_button" + "model": "byg:block/fir/button_inventory" }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/fir_button", - "uvlock": true, + "face=wall,facing=north,powered=false": { + "model": "byg:block/fir/button_inventory", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/fir_button", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/fir/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/fir/button_inventory", + "y": 180 }, "face=wall,facing=south,powered=false": { - "model": "byg:block/fir_button", - "uvlock": true, + "model": "byg:block/fir/button_inventory", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/fir_button", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/fir/button_inventory", + "x": 180 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/fir_button", - "x": 180, + "face=floor,facing=west,powered=false": { + "model": "byg:block/fir/button_inventory", "y": 270 }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/fir/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=false": { - "model": "byg:block/fir_button", + "model": "byg:block/fir/button_inventory", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/fir_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/fir_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/fir_button_pressed", + "face=floor,facing=east,powered=false": { + "model": "byg:block/fir/button_inventory", "y": 90 }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/fir_button_pressed", - "y": 270 + "face=wall,facing=east,powered=false": { + "model": "byg:block/fir/button_inventory", + "x": 90, + "y": 90, + "uvlock": true }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/fir_button_pressed", - "y": 180 + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/fir/button_inventory", + "x": 180, + "y": 270 }, "face=floor,facing=north,powered=true": { - "model": "byg:block/fir_button_pressed" + "model": "byg:block/fir/button_pressed" }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/fir_button_pressed", - "uvlock": true, + "face=wall,facing=north,powered=true": { + "model": "byg:block/fir/button_pressed", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/fir_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/fir/button_pressed", + "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "byg:block/fir_button_pressed", - "uvlock": true, + "model": "byg:block/fir/button_pressed", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/fir_button_pressed", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180 }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/fir_button_pressed", - "x": 180, + "face=floor,facing=west,powered=true": { + "model": "byg:block/fir/button_pressed", "y": 270 }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=true": { - "model": "byg:block/fir_button_pressed", + "model": "byg:block/fir/button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/fir_button_pressed", - "x": 180 + "face=floor,facing=east,powered=true": { + "model": "byg:block/fir/button_pressed", + "y": 90 }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/fir_button_pressed", + "face=wall,facing=east,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/fir/button_pressed", "x": 180, - "y": 180 + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/fir_crafting_table.json new file mode 100644 index 0000000000..342c246435 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_door.json b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json similarity index 61% rename from Common/src/main/resources/assets/byg/blockstates/fir_door.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_door.json index 36571d1c6f..a02a3d2ce5 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/fir_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door_top", + "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/fir_door_bottom", + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door_top", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/fir_door_bottom", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door_top", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door_top" + }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/fir_door_bottom", + "model": "byg:block/fir/door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/fir_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/fir_door_bottom_hinge", + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/fir_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/fir_door_bottom_hinge", + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/fir_door_bottom_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/fir_door_bottom_hinge", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/fir_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/fir_door_bottom_hinge" + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/fir_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/fir_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/fir_door_bottom", + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/fir_door_bottom", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/fir_door_top" + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door_bottom_hinge" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/fir_door_top", - "y": 90 + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge" }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/fir_door_top", + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/fir_door_top", + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/fir_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/fir_door_top_hinge", + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/fir_door_top_hinge", + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/fir_door_top_hinge", + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/fir_door_top_hinge", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door_bottom_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/fir_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door_top", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/fir_door_top_hinge", - "y": 270 + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door_top" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/fir_door_top_hinge" + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door_top", + "y": 90 }, "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/fir_door_top", + "model": "byg:block/fir/door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/fir_door_top" + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door_bottom", + "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/fir_door_top", + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door_bottom", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/fir_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door_bottom", + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_fence.json b/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json similarity index 73% rename from Common/src/main/resources/assets/byg/blockstates/fir_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_fence.json index 06135728c7..314ebb34ce 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "byg:block/fir_fence_post" + "model": "byg:block/fir/fence_post" } }, { @@ -10,7 +10,7 @@ "north": "true" }, "apply": { - "model": "byg:block/fir_fence", + "model": "byg:block/fir/fence", "uvlock": true } }, @@ -19,7 +19,7 @@ "south": "true" }, "apply": { - "model": "byg:block/fir_fence", + "model": "byg:block/fir/fence", "y": 180, "uvlock": true } @@ -29,7 +29,7 @@ "west": "true" }, "apply": { - "model": "byg:block/fir_fence", + "model": "byg:block/fir/fence", "y": 270, "uvlock": true } @@ -39,7 +39,7 @@ "east": "true" }, "apply": { - "model": "byg:block/fir_fence", + "model": "byg:block/fir/fence", "y": 90, "uvlock": true } diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json new file mode 100644 index 0000000000..5be9ecad6d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/fir_leaves.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/fir_sapling.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_leaves.json index 3083284785..cc86596167 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_sapling.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_leaves.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/fir_sapling" + "model": "byg:block/fir/leaves" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_log.json b/Common/src/generated/resources/assets/byg/blockstates/fir_log.json similarity index 54% rename from Common/src/main/resources/assets/byg/blockstates/fir_log.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_log.json index dff96ade82..d27f39f19b 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_log.json @@ -1,17 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/fir/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/fir_log" + "model": "byg:block/fir/log" }, "axis=z": { - "model": "byg:block/fir_log", + "model": "byg:block/fir/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/fir_log", - "x": 90, - "y": 90 } } -} - +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_planks.json b/Common/src/generated/resources/assets/byg/blockstates/fir_planks.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/fir_planks.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_planks.json index 283346fec6..4088d65d8c 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_planks.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_planks.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/fir_planks" + "model": "byg:block/fir/planks" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/fir_pressure_plate.json new file mode 100644 index 0000000000..6a65a95af1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/fir/pressure_plate" + }, + "powered=true": { + "model": "byg:block/fir/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/fir_sapling.json new file mode 100644 index 0000000000..1dedc2322d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json b/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json new file mode 100644 index 0000000000..3b430b6138 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/fir/slab_top" + }, + "type=bottom": { + "model": "byg:block/fir/slab" + }, + "type=double": { + "model": "byg:block/fir/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json similarity index 68% rename from Common/src/main/resources/assets/byg/blockstates/fir_stairs.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json index 3df1afed8f..da8592388e 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/fir_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/fir_stairs", - "y": 180, + "facing=north,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "x": 180, + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/fir_stairs", + "facing=south,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/fir_stairs", - "y": 270, + "facing=west,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "x": 180, + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/fir_stairs_inner" + "facing=east,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "x": 180, + "uvlock": true }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", - "y": 180, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", - "y": 270, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "x": 180, "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "x": 180, "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/fir_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/fir_stairs", + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/fir_stairs", - "x": 180, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/fir_stairs", - "x": 180, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/fir_stairs", - "x": 180, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", "x": 180, - "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", "x": 180, + "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", "x": 180, + "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", - "x": 180, - "y": 180, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", + "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", - "x": 180, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", "y": 90, "uvlock": true }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner" + }, "facing=north,half=top,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", + "model": "byg:block/fir/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", "x": 180, - "y": 270, + "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/fir_stairs_inner", - "x": 180, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "y": 90, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "y": 270, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", "x": 180, - "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", "x": 180, - "y": 90, + "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/fir_stairs_inner", + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/fir_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", + "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/fir_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", + "model": "byg:block/fir/stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/fir_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/fir_stairs_outer", + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", "y": 180, "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/fir/stairs_outer" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json similarity index 57% rename from Common/src/main/resources/assets/byg/blockstates/fir_trapdoor.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json index 51c15ee181..a78a23178a 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json @@ -1,69 +1,68 @@ { "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/fir_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/fir_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/fir_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/fir_trapdoor_bottom", - "y": 270 - }, "facing=north,half=top,open=false": { - "model": "byg:block/fir_trapdoor_top" + "model": "byg:block/fir/trapdoor_top" }, "facing=south,half=top,open=false": { - "model": "byg:block/fir_trapdoor_top", + "model": "byg:block/fir/trapdoor_top", "y": 180 }, - "facing=east,half=top,open=false": { - "model": "byg:block/fir_trapdoor_top", - "y": 90 - }, "facing=west,half=top,open=false": { - "model": "byg:block/fir_trapdoor_top", + "model": "byg:block/fir/trapdoor_top", "y": 270 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/fir_trapdoor_open" + "facing=east,half=top,open=false": { + "model": "byg:block/fir/trapdoor_top", + "y": 90 }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/fir_trapdoor_open", - "y": 180 + "facing=north,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom" }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/fir_trapdoor_open", - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", + "y": 180 }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/fir_trapdoor_open", + "facing=west,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", "y": 270 }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", + "y": 90 + }, "facing=north,half=top,open=true": { - "model": "byg:block/fir_trapdoor_open", + "model": "byg:block/fir/trapdoor_open", "x": 180, "y": 180 }, "facing=south,half=top,open=true": { - "model": "byg:block/fir_trapdoor_open", + "model": "byg:block/fir/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/fir/trapdoor_open", "x": 180, - "y": 0 + "y": 90 }, "facing=east,half=top,open=true": { - "model": "byg:block/fir_trapdoor_open", + "model": "byg:block/fir/trapdoor_open", "x": 180, "y": 270 }, - "facing=west,half=top,open=true": { - "model": "byg:block/fir_trapdoor_open", - "x": 180, + "facing=north,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open", "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_wood.json b/Common/src/generated/resources/assets/byg/blockstates/fir_wood.json similarity index 54% rename from Common/src/main/resources/assets/byg/blockstates/fir_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/fir_wood.json index dc3b21b902..7776d78b9d 100644 --- a/Common/src/main/resources/assets/byg/blockstates/fir_wood.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_wood.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/fir/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/fir_wood" + "model": "byg:block/fir/wood" }, "axis=z": { - "model": "byg:block/fir_wood", + "model": "byg:block/fir/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/fir_wood", - "x": 90, - "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_bookshelf.json new file mode 100644 index 0000000000..efa21db256 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json new file mode 100644 index 0000000000..68426c52e3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/green_enchanted/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/green_enchanted/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_crafting_table.json new file mode 100644 index 0000000000..124f80b1da --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json new file mode 100644 index 0000000000..33f1e126d9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json new file mode 100644 index 0000000000..71b7d4853e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/green_enchanted/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/green_enchanted/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/green_enchanted/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/green_enchanted/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/green_enchanted/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json new file mode 100644 index 0000000000..3c03c88fc6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_leaves.json new file mode 100644 index 0000000000..0685ac0ca8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_log.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_log.json new file mode 100644 index 0000000000..ee41456601 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/green_enchanted/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/green_enchanted/log" + }, + "axis=z": { + "model": "byg:block/green_enchanted/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_planks.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_planks.json new file mode 100644 index 0000000000..73a2085e91 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json new file mode 100644 index 0000000000..e13ca304f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/green_enchanted/pressure_plate" + }, + "powered=true": { + "model": "byg:block/green_enchanted/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sapling.json new file mode 100644 index 0000000000..9d6c5b4dfd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json new file mode 100644 index 0000000000..b6499d8113 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/green_enchanted/slab_top" + }, + "type=bottom": { + "model": "byg:block/green_enchanted/slab" + }, + "type=double": { + "model": "byg:block/green_enchanted/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json new file mode 100644 index 0000000000..5512a84957 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json new file mode 100644 index 0000000000..e51ba6dce4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wood.json new file mode 100644 index 0000000000..5bdfed8815 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/green_enchanted/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/green_enchanted/wood" + }, + "axis=z": { + "model": "byg:block/green_enchanted/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/holly_bookshelf.json new file mode 100644 index 0000000000..0841f0ce48 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_button.json b/Common/src/generated/resources/assets/byg/blockstates/holly_button.json new file mode 100644 index 0000000000..e3d1d42c39 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/holly/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/holly/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/holly/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/holly/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/holly/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/holly/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/holly/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/holly/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/holly/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/holly_crafting_table.json new file mode 100644 index 0000000000..bb51d77254 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_door.json b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json new file mode 100644 index 0000000000..e38735121f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json b/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json new file mode 100644 index 0000000000..194d0a33b8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/holly/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/holly/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/holly/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/holly/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/holly/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json new file mode 100644 index 0000000000..b036e8152b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/holly_leaves.json new file mode 100644 index 0000000000..5cecaa5a01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_log.json b/Common/src/generated/resources/assets/byg/blockstates/holly_log.json new file mode 100644 index 0000000000..691f3dd3cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/holly/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/holly/log" + }, + "axis=z": { + "model": "byg:block/holly/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_planks.json b/Common/src/generated/resources/assets/byg/blockstates/holly_planks.json new file mode 100644 index 0000000000..8fac59f4b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/holly_pressure_plate.json new file mode 100644 index 0000000000..f9cffc98f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/holly/pressure_plate" + }, + "powered=true": { + "model": "byg:block/holly/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/holly_sapling.json new file mode 100644 index 0000000000..dd69123bff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json b/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json new file mode 100644 index 0000000000..1ee941716c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/holly/slab_top" + }, + "type=bottom": { + "model": "byg:block/holly/slab" + }, + "type=double": { + "model": "byg:block/holly/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json new file mode 100644 index 0000000000..52d715f9ec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json new file mode 100644 index 0000000000..87f5b06c7b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/holly/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/holly/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/holly/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/holly/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_wood.json b/Common/src/generated/resources/assets/byg/blockstates/holly_wood.json new file mode 100644 index 0000000000..7919957d18 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/holly/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/holly/wood" + }, + "axis=z": { + "model": "byg:block/holly/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json new file mode 100644 index 0000000000..2e783c607e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ether/planks", + "up": "byg:block/ether/planks", + "north": "byg:block/ether/bookshelf", + "south": "byg:block/ether/bookshelf", + "east": "byg:block/ether/bookshelf", + "west": "byg:block/ether/bookshelf", + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/button.json b/Common/src/generated/resources/assets/byg/models/block/ether/button.json new file mode 100644 index 0000000000..855c00d441 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/ether/button_inventory.json new file mode 100644 index 0000000000..b87036be11 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/ether/button_pressed.json new file mode 100644 index 0000000000..2d16c79061 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json new file mode 100644 index 0000000000..1e5ddc0cf1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ether/planks", + "up": "byg:block/ether/crafting_table_top", + "north": "byg:block/ether/crafting_table_front", + "south": "byg:block/ether/crafting_table_side", + "east": "byg:block/ether/crafting_table_side", + "west": "byg:block/ether/crafting_table_front", + "particle": "byg:block/ether/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json new file mode 100644 index 0000000000..efedd160f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json new file mode 100644 index 0000000000..ccd61707fb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_top.json b/Common/src/generated/resources/assets/byg/models/block/ether/door_top.json new file mode 100644 index 0000000000..76baa88ac4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json new file mode 100644 index 0000000000..863289b4e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence.json new file mode 100644 index 0000000000..e4f7813cc0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/ether/planks", + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate.json new file mode 100644 index 0000000000..5de8e74f6e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_open.json new file mode 100644 index 0000000000..6f88d85485 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall.json new file mode 100644 index 0000000000..330a93c490 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall_open.json new file mode 100644 index 0000000000..a4c453ee62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json new file mode 100644 index 0000000000..96f76face5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/ether/planks", + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json new file mode 100644 index 0000000000..87a03df114 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/ether/planks", + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/ether/grower_item.json new file mode 100644 index 0000000000..1e7538690c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/ether/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json b/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json new file mode 100644 index 0000000000..16fd177310 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ether/leaves", + "up": "byg:block/ether/leaves", + "north": "byg:block/ether/leaves", + "south": "byg:block/ether/leaves", + "east": "byg:block/ether/leaves", + "west": "byg:block/ether/leaves", + "particle": "byg:block/ether/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json new file mode 100644 index 0000000000..5f4fc96885 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ether/leaves_snowy", + "up": "byg:block/ether/leaves_snowy", + "north": "byg:block/ether/leaves_snowy_side", + "south": "byg:block/ether/leaves_snowy_side", + "east": "byg:block/ether/leaves_snowy_side", + "west": "byg:block/ether/leaves_snowy_side", + "particle": "byg:block/ether/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/log.json b/Common/src/generated/resources/assets/byg/models/block/ether/log.json new file mode 100644 index 0000000000..a6d31613e3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/ether/log", + "end": "byg:block/ether/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/planks.json b/Common/src/generated/resources/assets/byg/models/block/ether/planks.json new file mode 100644 index 0000000000..9e7ee31d80 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/ether/planks", + "up": "byg:block/ether/planks", + "north": "byg:block/ether/planks", + "south": "byg:block/ether/planks", + "east": "byg:block/ether/planks", + "west": "byg:block/ether/planks", + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate.json new file mode 100644 index 0000000000..3935a879b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate_down.json new file mode 100644 index 0000000000..459b1c5479 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/slab.json b/Common/src/generated/resources/assets/byg/models/block/ether/slab.json new file mode 100644 index 0000000000..deed540702 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/ether/planks", + "bottom": "byg:block/ether/planks", + "top": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json new file mode 100644 index 0000000000..55d94e19f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/ether/planks", + "bottom": "byg:block/ether/planks", + "top": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json new file mode 100644 index 0000000000..4d6d964069 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/ether/planks", + "bottom": "byg:block/ether/planks", + "top": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json new file mode 100644 index 0000000000..e7d64178a5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/ether/planks", + "bottom": "byg:block/ether/planks", + "top": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json new file mode 100644 index 0000000000..ac764f67c4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/ether/planks", + "bottom": "byg:block/ether/planks", + "top": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json new file mode 100644 index 0000000000..610a01ba88 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_bottom.json new file mode 100644 index 0000000000..100789ef4e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/ether/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_open.json new file mode 100644 index 0000000000..301823b456 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/ether/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_top.json new file mode 100644 index 0000000000..912064e402 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/ether/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/wood.json b/Common/src/generated/resources/assets/byg/models/block/ether/wood.json new file mode 100644 index 0000000000..efc48c3f2f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/ether/log", + "particle": "byg:block/ether/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json new file mode 100644 index 0000000000..d612690fc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/fir/planks", + "up": "byg:block/fir/planks", + "north": "byg:block/fir/bookshelf", + "south": "byg:block/fir/bookshelf", + "east": "byg:block/fir/bookshelf", + "west": "byg:block/fir/bookshelf", + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/button.json b/Common/src/generated/resources/assets/byg/models/block/fir/button.json new file mode 100644 index 0000000000..dfd72f5d95 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/fir/button_inventory.json new file mode 100644 index 0000000000..05ae416c9b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/fir/button_pressed.json new file mode 100644 index 0000000000..290861af84 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json new file mode 100644 index 0000000000..1112da0ddf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/fir/planks", + "up": "byg:block/fir/crafting_table_top", + "north": "byg:block/fir/crafting_table_front", + "south": "byg:block/fir/crafting_table_side", + "east": "byg:block/fir/crafting_table_side", + "west": "byg:block/fir/crafting_table_front", + "particle": "byg:block/fir/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json new file mode 100644 index 0000000000..4fb6254bc8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json new file mode 100644 index 0000000000..4cf2afc77d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_top.json b/Common/src/generated/resources/assets/byg/models/block/fir/door_top.json new file mode 100644 index 0000000000..ce320059d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json new file mode 100644 index 0000000000..d37f58274a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence.json new file mode 100644 index 0000000000..e1c937a93d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/fir/planks", + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate.json new file mode 100644 index 0000000000..b6b79eda62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_open.json new file mode 100644 index 0000000000..0d8b832469 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall.json new file mode 100644 index 0000000000..24889809ef --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall_open.json new file mode 100644 index 0000000000..590bac0e10 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json new file mode 100644 index 0000000000..94b982e2ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/fir/planks", + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json new file mode 100644 index 0000000000..4f6eb3e866 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/fir/planks", + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/fir/grower_item.json new file mode 100644 index 0000000000..191637e862 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/fir/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json b/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json new file mode 100644 index 0000000000..a5b02293d6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/fir/leaves", + "up": "byg:block/fir/leaves", + "north": "byg:block/fir/leaves", + "south": "byg:block/fir/leaves", + "east": "byg:block/fir/leaves", + "west": "byg:block/fir/leaves", + "particle": "byg:block/fir/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json new file mode 100644 index 0000000000..f39b16a28d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/fir/leaves_snowy", + "up": "byg:block/fir/leaves_snowy", + "north": "byg:block/fir/leaves_snowy_side", + "south": "byg:block/fir/leaves_snowy_side", + "east": "byg:block/fir/leaves_snowy_side", + "west": "byg:block/fir/leaves_snowy_side", + "particle": "byg:block/fir/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/log.json b/Common/src/generated/resources/assets/byg/models/block/fir/log.json new file mode 100644 index 0000000000..afe907ab67 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/fir/log", + "end": "byg:block/fir/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/planks.json b/Common/src/generated/resources/assets/byg/models/block/fir/planks.json new file mode 100644 index 0000000000..6d7c558f08 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/fir/planks", + "up": "byg:block/fir/planks", + "north": "byg:block/fir/planks", + "south": "byg:block/fir/planks", + "east": "byg:block/fir/planks", + "west": "byg:block/fir/planks", + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate.json new file mode 100644 index 0000000000..ea80eebd16 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate_down.json new file mode 100644 index 0000000000..52de846483 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/slab.json b/Common/src/generated/resources/assets/byg/models/block/fir/slab.json new file mode 100644 index 0000000000..db3066aa0a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/fir/planks", + "bottom": "byg:block/fir/planks", + "top": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json new file mode 100644 index 0000000000..dd9e319733 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/fir/planks", + "bottom": "byg:block/fir/planks", + "top": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json new file mode 100644 index 0000000000..ff2d795dff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/fir/planks", + "bottom": "byg:block/fir/planks", + "top": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json new file mode 100644 index 0000000000..f8c1e4c9b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/fir/planks", + "bottom": "byg:block/fir/planks", + "top": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json new file mode 100644 index 0000000000..035a567e64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/fir/planks", + "bottom": "byg:block/fir/planks", + "top": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json new file mode 100644 index 0000000000..a789cb00fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_bottom.json new file mode 100644 index 0000000000..e99ba24622 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/fir/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_open.json new file mode 100644 index 0000000000..aaff1d2512 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/fir/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_top.json new file mode 100644 index 0000000000..19088e5148 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/fir/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/wood.json b/Common/src/generated/resources/assets/byg/models/block/fir/wood.json new file mode 100644 index 0000000000..6189900678 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/fir/log", + "particle": "byg:block/fir/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json new file mode 100644 index 0000000000..9f9b306897 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/green_enchanted/planks", + "up": "byg:block/green_enchanted/planks", + "north": "byg:block/green_enchanted/bookshelf", + "south": "byg:block/green_enchanted/bookshelf", + "east": "byg:block/green_enchanted/bookshelf", + "west": "byg:block/green_enchanted/bookshelf", + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button.json new file mode 100644 index 0000000000..2052a58b9a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_inventory.json new file mode 100644 index 0000000000..e0188787ed --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_pressed.json new file mode 100644 index 0000000000..a5e212cd57 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json new file mode 100644 index 0000000000..23552b91ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/green_enchanted/planks", + "up": "byg:block/green_enchanted/crafting_table_top", + "north": "byg:block/green_enchanted/crafting_table_front", + "south": "byg:block/green_enchanted/crafting_table_side", + "east": "byg:block/green_enchanted/crafting_table_side", + "west": "byg:block/green_enchanted/crafting_table_front", + "particle": "byg:block/green_enchanted/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json new file mode 100644 index 0000000000..97b2deb2f6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json new file mode 100644 index 0000000000..71a109e617 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json new file mode 100644 index 0000000000..4e8b96031b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json new file mode 100644 index 0000000000..99a4fc49ed --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json new file mode 100644 index 0000000000..2074bd0448 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/green_enchanted/planks", + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate.json new file mode 100644 index 0000000000..0bce7967bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_open.json new file mode 100644 index 0000000000..f3d19be8bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall.json new file mode 100644 index 0000000000..73354fed64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall_open.json new file mode 100644 index 0000000000..4736ef3a4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json new file mode 100644 index 0000000000..bc3c645052 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/green_enchanted/planks", + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json new file mode 100644 index 0000000000..341e146a65 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/green_enchanted/planks", + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/grower_item.json new file mode 100644 index 0000000000..b078e2d687 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/green_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json new file mode 100644 index 0000000000..1d6df36eb5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/green_enchanted/leaves", + "up": "byg:block/green_enchanted/leaves", + "north": "byg:block/green_enchanted/leaves", + "south": "byg:block/green_enchanted/leaves", + "east": "byg:block/green_enchanted/leaves", + "west": "byg:block/green_enchanted/leaves", + "particle": "byg:block/green_enchanted/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json new file mode 100644 index 0000000000..fd0185dd3c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/green_enchanted/leaves_snowy", + "up": "byg:block/green_enchanted/leaves_snowy", + "north": "byg:block/green_enchanted/leaves_snowy_side", + "south": "byg:block/green_enchanted/leaves_snowy_side", + "east": "byg:block/green_enchanted/leaves_snowy_side", + "west": "byg:block/green_enchanted/leaves_snowy_side", + "particle": "byg:block/green_enchanted/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json new file mode 100644 index 0000000000..172e4d34a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/green_enchanted/log", + "end": "byg:block/green_enchanted/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json new file mode 100644 index 0000000000..02ea832c0e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/green_enchanted/planks", + "up": "byg:block/green_enchanted/planks", + "north": "byg:block/green_enchanted/planks", + "south": "byg:block/green_enchanted/planks", + "east": "byg:block/green_enchanted/planks", + "west": "byg:block/green_enchanted/planks", + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate.json new file mode 100644 index 0000000000..98701465a2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate_down.json new file mode 100644 index 0000000000..f0dc41856b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json new file mode 100644 index 0000000000..14906b2257 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/green_enchanted/planks", + "bottom": "byg:block/green_enchanted/planks", + "top": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json new file mode 100644 index 0000000000..1472268fcb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/green_enchanted/planks", + "bottom": "byg:block/green_enchanted/planks", + "top": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json new file mode 100644 index 0000000000..2df42ecfa8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/green_enchanted/planks", + "bottom": "byg:block/green_enchanted/planks", + "top": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json new file mode 100644 index 0000000000..6e0846b4cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/green_enchanted/planks", + "bottom": "byg:block/green_enchanted/planks", + "top": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json new file mode 100644 index 0000000000..2ed296c447 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/green_enchanted/planks", + "bottom": "byg:block/green_enchanted/planks", + "top": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json new file mode 100644 index 0000000000..5c2622f953 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_bottom.json new file mode 100644 index 0000000000..845a501321 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/green_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_open.json new file mode 100644 index 0000000000..135df86abb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/green_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_top.json new file mode 100644 index 0000000000..28c8460e6e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/green_enchanted/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/wood.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/wood.json new file mode 100644 index 0000000000..0ae88326c0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/green_enchanted/log", + "particle": "byg:block/green_enchanted/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json new file mode 100644 index 0000000000..27c0c946c5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/holly/planks", + "up": "byg:block/holly/planks", + "north": "byg:block/holly/bookshelf", + "south": "byg:block/holly/bookshelf", + "east": "byg:block/holly/bookshelf", + "west": "byg:block/holly/bookshelf", + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/button.json b/Common/src/generated/resources/assets/byg/models/block/holly/button.json new file mode 100644 index 0000000000..ea12cf91bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/holly/button_inventory.json new file mode 100644 index 0000000000..5abc5eb8ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/holly/button_pressed.json new file mode 100644 index 0000000000..60d253d44a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json new file mode 100644 index 0000000000..09702317d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/holly/planks", + "up": "byg:block/holly/crafting_table_top", + "north": "byg:block/holly/crafting_table_front", + "south": "byg:block/holly/crafting_table_side", + "east": "byg:block/holly/crafting_table_side", + "west": "byg:block/holly/crafting_table_front", + "particle": "byg:block/holly/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json new file mode 100644 index 0000000000..a13c7a20cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json new file mode 100644 index 0000000000..a86b8b83a4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_top.json b/Common/src/generated/resources/assets/byg/models/block/holly/door_top.json new file mode 100644 index 0000000000..b3a32ab6c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json new file mode 100644 index 0000000000..362655b8b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence.json new file mode 100644 index 0000000000..119bc68677 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/holly/planks", + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate.json new file mode 100644 index 0000000000..c8577ba249 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_open.json new file mode 100644 index 0000000000..f19a8350f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall.json new file mode 100644 index 0000000000..143a20cb11 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall_open.json new file mode 100644 index 0000000000..0d1a88b94d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json new file mode 100644 index 0000000000..c60a4c03c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/holly/planks", + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json new file mode 100644 index 0000000000..2fc5441e3e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/holly/planks", + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/holly/grower_item.json new file mode 100644 index 0000000000..683d0876ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/holly/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json b/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json new file mode 100644 index 0000000000..478b59b46d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/holly/leaves", + "up": "byg:block/holly/leaves", + "north": "byg:block/holly/leaves", + "south": "byg:block/holly/leaves", + "east": "byg:block/holly/leaves", + "west": "byg:block/holly/leaves", + "particle": "byg:block/holly/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json new file mode 100644 index 0000000000..f24d44b5aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/holly/leaves_snowy", + "up": "byg:block/holly/leaves_snowy", + "north": "byg:block/holly/leaves_snowy_side", + "south": "byg:block/holly/leaves_snowy_side", + "east": "byg:block/holly/leaves_snowy_side", + "west": "byg:block/holly/leaves_snowy_side", + "particle": "byg:block/holly/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/log.json b/Common/src/generated/resources/assets/byg/models/block/holly/log.json new file mode 100644 index 0000000000..ca68985a55 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/holly/log", + "end": "byg:block/holly/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/planks.json b/Common/src/generated/resources/assets/byg/models/block/holly/planks.json new file mode 100644 index 0000000000..eee1fc4158 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/holly/planks", + "up": "byg:block/holly/planks", + "north": "byg:block/holly/planks", + "south": "byg:block/holly/planks", + "east": "byg:block/holly/planks", + "west": "byg:block/holly/planks", + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate.json new file mode 100644 index 0000000000..e2eb7f9790 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate_down.json new file mode 100644 index 0000000000..139a9e9b5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/slab.json b/Common/src/generated/resources/assets/byg/models/block/holly/slab.json new file mode 100644 index 0000000000..1bf1927380 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/holly/planks", + "bottom": "byg:block/holly/planks", + "top": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json new file mode 100644 index 0000000000..433b5f249e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/holly/planks", + "bottom": "byg:block/holly/planks", + "top": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json new file mode 100644 index 0000000000..1cef2d992b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/holly/planks", + "bottom": "byg:block/holly/planks", + "top": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json new file mode 100644 index 0000000000..ad3f2518bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/holly/planks", + "bottom": "byg:block/holly/planks", + "top": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json new file mode 100644 index 0000000000..2a85cf0fd8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/holly/planks", + "bottom": "byg:block/holly/planks", + "top": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json new file mode 100644 index 0000000000..ffdc2d4dca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_bottom.json new file mode 100644 index 0000000000..30074c364f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/holly/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_open.json new file mode 100644 index 0000000000..61b43beb70 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/holly/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_top.json new file mode 100644 index 0000000000..5bae3b4f22 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/holly/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/wood.json b/Common/src/generated/resources/assets/byg/models/block/holly/wood.json new file mode 100644 index 0000000000..8977c109d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/holly/log", + "particle": "byg:block/holly/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json new file mode 100644 index 0000000000..d91ea4eed7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_button.json b/Common/src/generated/resources/assets/byg/models/item/ether_button.json new file mode 100644 index 0000000000..4cbaf3137b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json new file mode 100644 index 0000000000..4f6b4a8023 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_door.json b/Common/src/generated/resources/assets/byg/models/item/ether_door.json new file mode 100644 index 0000000000..7a7f863bce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ether/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_fence.json b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json new file mode 100644 index 0000000000..c443e2cdc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json b/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json new file mode 100644 index 0000000000..dc6b41faff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_log.json b/Common/src/generated/resources/assets/byg/models/item/ether_log.json new file mode 100644 index 0000000000..2cf17c2ec8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_planks.json b/Common/src/generated/resources/assets/byg/models/item/ether_planks.json new file mode 100644 index 0000000000..e0ab81d41d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json new file mode 100644 index 0000000000..a0a8d08a19 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_sapling.json b/Common/src/generated/resources/assets/byg/models/item/ether_sapling.json new file mode 100644 index 0000000000..7f96fd9e2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/ether/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_slab.json b/Common/src/generated/resources/assets/byg/models/item/ether_slab.json new file mode 100644 index 0000000000..ab93ee81fb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json b/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json new file mode 100644 index 0000000000..8542c99166 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_wood.json b/Common/src/generated/resources/assets/byg/models/item/ether_wood.json new file mode 100644 index 0000000000..05db965c08 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_boat.json b/Common/src/generated/resources/assets/byg/models/item/fir_boat.json new file mode 100644 index 0000000000..a2f4ab9819 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/fir/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json new file mode 100644 index 0000000000..e9e074ac7c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_button.json b/Common/src/generated/resources/assets/byg/models/item/fir_button.json new file mode 100644 index 0000000000..a03d21ffbe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json new file mode 100644 index 0000000000..ad2d4b4421 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_door.json b/Common/src/generated/resources/assets/byg/models/item/fir_door.json new file mode 100644 index 0000000000..ceed0fbecf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/fir/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_fence.json b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json new file mode 100644 index 0000000000..e05201a2f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json b/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json new file mode 100644 index 0000000000..d63c2ac389 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_log.json b/Common/src/generated/resources/assets/byg/models/item/fir_log.json new file mode 100644 index 0000000000..643eec79c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_planks.json b/Common/src/generated/resources/assets/byg/models/item/fir_planks.json new file mode 100644 index 0000000000..b78618eabe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json new file mode 100644 index 0000000000..43872420d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_sapling.json b/Common/src/generated/resources/assets/byg/models/item/fir_sapling.json new file mode 100644 index 0000000000..c7720565e3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/fir/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_slab.json b/Common/src/generated/resources/assets/byg/models/item/fir_slab.json new file mode 100644 index 0000000000..2f06cd77f0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json b/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json new file mode 100644 index 0000000000..06b1815ac6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_wood.json b/Common/src/generated/resources/assets/byg/models/item/fir_wood.json new file mode 100644 index 0000000000..ed27dd6c85 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_boat.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_boat.json new file mode 100644 index 0000000000..e60f426995 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/green_enchanted/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json new file mode 100644 index 0000000000..24456588f4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json new file mode 100644 index 0000000000..3572995d07 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json new file mode 100644 index 0000000000..7a278bc3b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_door.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_door.json new file mode 100644 index 0000000000..f8a6cc6932 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/green_enchanted/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json new file mode 100644 index 0000000000..78d2c162bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json new file mode 100644 index 0000000000..940634709e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json new file mode 100644 index 0000000000..dd61b0bee3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json new file mode 100644 index 0000000000..7a3b6390b9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json new file mode 100644 index 0000000000..9715ee55c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sapling.json new file mode 100644 index 0000000000..da7d230f52 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/green_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json new file mode 100644 index 0000000000..d08f7b99d6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json new file mode 100644 index 0000000000..f4c1c06a3a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json new file mode 100644 index 0000000000..60b2c2b18d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_boat.json b/Common/src/generated/resources/assets/byg/models/item/holly_boat.json new file mode 100644 index 0000000000..8e7876249b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/holly/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json new file mode 100644 index 0000000000..f6d4123de3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_button.json b/Common/src/generated/resources/assets/byg/models/item/holly_button.json new file mode 100644 index 0000000000..370cdf135c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json new file mode 100644 index 0000000000..73c80c513e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_door.json b/Common/src/generated/resources/assets/byg/models/item/holly_door.json new file mode 100644 index 0000000000..fb30c1a4bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/holly/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_fence.json b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json new file mode 100644 index 0000000000..8955f9f3ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json b/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json new file mode 100644 index 0000000000..8c0838733d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_log.json b/Common/src/generated/resources/assets/byg/models/item/holly_log.json new file mode 100644 index 0000000000..b9c0c7f4d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_planks.json b/Common/src/generated/resources/assets/byg/models/item/holly_planks.json new file mode 100644 index 0000000000..97619b94af --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json new file mode 100644 index 0000000000..cc24db77e9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_sapling.json b/Common/src/generated/resources/assets/byg/models/item/holly_sapling.json new file mode 100644 index 0000000000..460851abd1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/holly/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_slab.json b/Common/src/generated/resources/assets/byg/models/item/holly_slab.json new file mode 100644 index 0000000000..6a39ef1705 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json b/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json new file mode 100644 index 0000000000..54f184ff04 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_wood.json b/Common/src/generated/resources/assets/byg/models/item/holly_wood.json new file mode 100644 index 0000000000..27ca3c0988 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json new file mode 100644 index 0000000000..d72855d470 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json new file mode 100644 index 0000000000..6795ccd98f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json new file mode 100644 index 0000000000..cdf7a7f22e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json new file mode 100644 index 0000000000..8abe858301 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json new file mode 100644 index 0000000000..428ac9e24b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json new file mode 100644 index 0000000000..64722f8d4c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json new file mode 100644 index 0000000000..056514b75e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/ether_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json new file mode 100644 index 0000000000..ae1bc5695c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json new file mode 100644 index 0000000000..9986d2b869 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json new file mode 100644 index 0000000000..57ef097921 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json new file mode 100644 index 0000000000..ea0dc12587 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json new file mode 100644 index 0000000000..ee32382ba8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json new file mode 100644 index 0000000000..2d52da910d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json new file mode 100644 index 0000000000..556377fa5e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json new file mode 100644 index 0000000000..b045efe2e1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json new file mode 100644 index 0000000000..c650379947 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json new file mode 100644 index 0000000000..778c0acc2c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json new file mode 100644 index 0000000000..1f87e6ad34 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json new file mode 100644 index 0000000000..c5e196f22e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json new file mode 100644 index 0000000000..3b029a381d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/fir_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json new file mode 100644 index 0000000000..978a6e6c92 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json new file mode 100644 index 0000000000..59a9741c0d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json new file mode 100644 index 0000000000..76be370ab3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json new file mode 100644 index 0000000000..cd3f9f7101 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json new file mode 100644 index 0000000000..815e67e153 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json new file mode 100644 index 0000000000..c4e160d927 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json new file mode 100644 index 0000000000..a09ea9ebfc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json new file mode 100644 index 0000000000..e58c5b232b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json new file mode 100644 index 0000000000..ed1b081dd4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json new file mode 100644 index 0000000000..e78637cdbf --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json new file mode 100644 index 0000000000..91b320f65d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json new file mode 100644 index 0000000000..ce620290c2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json new file mode 100644 index 0000000000..eee3380e07 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/green_enchanted_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json new file mode 100644 index 0000000000..fbd2be1df8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json new file mode 100644 index 0000000000..e91e591296 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json new file mode 100644 index 0000000000..819ab5798c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json new file mode 100644 index 0000000000..06cfeedfb7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json new file mode 100644 index 0000000000..a9c7690a04 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json new file mode 100644 index 0000000000..f2e9b97fb3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json new file mode 100644 index 0000000000..57be866e54 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json new file mode 100644 index 0000000000..6048e7675d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json new file mode 100644 index 0000000000..4ed8896080 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json new file mode 100644 index 0000000000..4615152d9d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json new file mode 100644 index 0000000000..e633bf27ae --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json new file mode 100644 index 0000000000..26e224bebd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json new file mode 100644 index 0000000000..80968b5721 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/holly_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json new file mode 100644 index 0000000000..d17e034f0a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json new file mode 100644 index 0000000000..71ee292aeb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json new file mode 100644 index 0000000000..a7b9ad36ad --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json new file mode 100644 index 0000000000..ba861e1110 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json new file mode 100644 index 0000000000..d63e22068c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json new file mode 100644 index 0000000000..91a5ea0111 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:ether_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/button.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/button.json new file mode 100644 index 0000000000..d565717158 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:ether_planks" + } + ], + "result": { + "item": "byg:ether_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json new file mode 100644 index 0000000000..d840ec0f6c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json new file mode 100644 index 0000000000..5f49e1ed51 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json new file mode 100644 index 0000000000..9cd77210ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json new file mode 100644 index 0000000000..b094c5f7eb --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json new file mode 100644 index 0000000000..78a9086971 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/ether_logs" + } + ], + "result": { + "item": "byg:ether_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json new file mode 100644 index 0000000000..ff2e78b81e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json new file mode 100644 index 0000000000..86e2177ee2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json new file mode 100644 index 0000000000..17b5165765 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json new file mode 100644 index 0000000000..65b934e7af --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:ether_planks" + } + }, + "result": { + "item": "byg:ether_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json new file mode 100644 index 0000000000..239daf6a6a --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:ether_log" + } + }, + "result": { + "item": "byg:ether_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json new file mode 100644 index 0000000000..73824468ee --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json new file mode 100644 index 0000000000..40ec4f8590 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:fir_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/button.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/button.json new file mode 100644 index 0000000000..57eb6f7d56 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:fir_planks" + } + ], + "result": { + "item": "byg:fir_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json new file mode 100644 index 0000000000..995a6d9d01 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json new file mode 100644 index 0000000000..11ac8e4422 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json new file mode 100644 index 0000000000..e21595e940 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json new file mode 100644 index 0000000000..33427541d9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json new file mode 100644 index 0000000000..7b1abf5ae2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/fir_logs" + } + ], + "result": { + "item": "byg:fir_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json new file mode 100644 index 0000000000..15dc534a43 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json new file mode 100644 index 0000000000..44edc86c0d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json new file mode 100644 index 0000000000..54f2c8aad6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json new file mode 100644 index 0000000000..57d8c57a07 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:fir_planks" + } + }, + "result": { + "item": "byg:fir_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json new file mode 100644 index 0000000000..88728451ee --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:fir_log" + } + }, + "result": { + "item": "byg:fir_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json new file mode 100644 index 0000000000..6d06fe14e2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json new file mode 100644 index 0000000000..a1babb3940 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:green_enchanted_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/button.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/button.json new file mode 100644 index 0000000000..8e7efaf26c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:green_enchanted_planks" + } + ], + "result": { + "item": "byg:green_enchanted_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json new file mode 100644 index 0000000000..78e7e0d2b2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json new file mode 100644 index 0000000000..8060d3ef4b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json new file mode 100644 index 0000000000..bef7f6de5b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json new file mode 100644 index 0000000000..a349c298e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json new file mode 100644 index 0000000000..45faafc92b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/green_enchanted_logs" + } + ], + "result": { + "item": "byg:green_enchanted_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json new file mode 100644 index 0000000000..788384afaa --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json new file mode 100644 index 0000000000..1d7acf34b7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json new file mode 100644 index 0000000000..81d4cf4c0e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json new file mode 100644 index 0000000000..0c39412c72 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:green_enchanted_planks" + } + }, + "result": { + "item": "byg:green_enchanted_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json new file mode 100644 index 0000000000..efa2406a67 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:green_enchanted_log" + } + }, + "result": { + "item": "byg:green_enchanted_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json new file mode 100644 index 0000000000..401a789ef4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json new file mode 100644 index 0000000000..7c55b73a35 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:holly_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/button.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/button.json new file mode 100644 index 0000000000..b5b025eb1c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:holly_planks" + } + ], + "result": { + "item": "byg:holly_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json new file mode 100644 index 0000000000..19d17bc71c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json new file mode 100644 index 0000000000..c91e890ad4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json new file mode 100644 index 0000000000..b33d9318c8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json new file mode 100644 index 0000000000..b7c78b813d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json new file mode 100644 index 0000000000..04e5e6a722 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/holly_logs" + } + ], + "result": { + "item": "byg:holly_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json new file mode 100644 index 0000000000..f19eaec542 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json new file mode 100644 index 0000000000..367e128680 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json new file mode 100644 index 0000000000..7e3cfa336c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json new file mode 100644 index 0000000000..7fa1b10b35 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:holly_planks" + } + }, + "result": { + "item": "byg:holly_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json new file mode 100644 index 0000000000..9e99ecf6f5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:holly_log" + } + }, + "result": { + "item": "byg:holly_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json new file mode 100644 index 0000000000..fed0eeda69 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:ether_log", + "byg:stripped_ether_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json new file mode 100644 index 0000000000..53c58f13f7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:fir_log", + "byg:stripped_fir_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json new file mode 100644 index 0000000000..1e8a8b657e --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:green_enchanted_log", + "byg:stripped_green_enchanted_log" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json new file mode 100644 index 0000000000..08f1abc4b5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:holly_log", + "byg:stripped_holly_log" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 65427d0245..c3c70ffad1 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -102,7 +102,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.ETHER_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ETHER_GRASS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.THEREAL_BELLFLOWER.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.ETHER_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_ODDITY.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_SHELL.get(), RenderType.translucent()); @@ -141,9 +140,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); //Doors - map.put(BYGBlocks.FIR_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.GREEN_ENCHANTED_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.HOLLY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAHOGANY_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MANGROVE_DOOR.get(), RenderType.cutoutMipped()); @@ -159,14 +155,10 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.SYTHIAN_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.ETHER_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors - map.put(BYGBlocks.FIR_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.GREEN_ENCHANTED_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.HOLLY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAHOGANY_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MANGROVE_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -182,7 +174,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.SYTHIAN_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.ETHER_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -201,9 +192,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.BLUE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_OAK_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.FIR_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.GREEN_ENCHANTED_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.HOLLY_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JACARANDA_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.INDIGO_JACARANDA_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FLOWERING_JACARANDA_BUSH.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 1978e7086b..23d2ad568d 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -27,12 +27,9 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.FIR_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_PALO_VERDE_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.GREEN_ENCHANTED_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.HOLLY_BERRY_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.HOLLY_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_INDIGO_JACARANDA_LEAVES.get()); @@ -61,7 +58,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.PALM_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.ETHER_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_LEAVES.get()); @@ -71,9 +67,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.FIR_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.GREEN_ENCHANTED_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.HOLLY_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.JACARANDA_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.JACARANDA_BUSH.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_JACARANDA_BUSH.get()); @@ -103,7 +96,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.PALM_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.ETHER_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 6a4fa03d3c..95c77c58eb 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -39,9 +39,6 @@ public static void flammablesBYG() { } //Logs - flammableBlock(BYGBlocks.FIR_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.HOLLY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.MAHOGANY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.MANGROVE_LOG.get(), 5, 5); @@ -56,9 +53,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_FIR_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_HOLLY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAHOGANY_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MANGROVE_LOG.get(), 5, 5); @@ -72,9 +66,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.FIR_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.HOLLY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.MAHOGANY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.MANGROVE_WOOD.get(), 5, 5); @@ -89,9 +80,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_FIR_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_HOLLY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAHOGANY_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MANGROVE_WOOD.get(), 5, 5); @@ -105,9 +93,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves - flammableBlock(BYGBlocks.FIR_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.HOLLY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MAHOGANY_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MANGROVE_BOOKSHELF.get(), 5, 20); @@ -122,9 +107,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs - flammableBlock(BYGBlocks.FIR_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.HOLLY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MAHOGANY_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MANGROVE_SLAB.get(), 5, 20); @@ -139,9 +121,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs - flammableBlock(BYGBlocks.FIR_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.HOLLY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MAHOGANY_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MANGROVE_STAIRS.get(), 5, 20); @@ -156,9 +135,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks - flammableBlock(BYGBlocks.FIR_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.HOLLY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MAHOGANY_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MANGROVE_PLANKS.get(), 5, 20); @@ -173,9 +149,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences - flammableBlock(BYGBlocks.FIR_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.HOLLY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MAHOGANY_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MANGROVE_FENCE.get(), 5, 20); @@ -194,12 +167,9 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BROWN_OAK_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.FIR_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.GREEN_ENCHANTED_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.HOLLY_BERRY_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.HOLLY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.JACARANDA_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.MAHOGANY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.MANGROVE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index d55d0037c8..fbb279f517 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -22,9 +22,6 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.FIR_LOG.get(), BYGBlocks.STRIPPED_FIR_LOG.get()); - stripables.put(BYGBlocks.GREEN_ENCHANTED_LOG.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_LOG.get()); - stripables.put(BYGBlocks.HOLLY_LOG.get(), BYGBlocks.STRIPPED_HOLLY_LOG.get()); stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); stripables.put(BYGBlocks.MAHOGANY_LOG.get(), BYGBlocks.STRIPPED_MAHOGANY_LOG.get()); stripables.put(BYGBlocks.MANGROVE_LOG.get(), BYGBlocks.STRIPPED_MANGROVE_LOG.get()); @@ -41,14 +38,10 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.PALM_LOG.get(), BYGBlocks.STRIPPED_PALM_LOG.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); - stripables.put(BYGBlocks.ETHER_LOG.get(), BYGBlocks.STRIPPED_ETHER_LOG.get()); stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); - stripables.put(BYGBlocks.FIR_WOOD.get(), BYGBlocks.STRIPPED_FIR_WOOD.get()); - stripables.put(BYGBlocks.GREEN_ENCHANTED_WOOD.get(), BYGBlocks.STRIPPED_GREEN_ENCHANTED_WOOD.get()); - stripables.put(BYGBlocks.HOLLY_WOOD.get(), BYGBlocks.STRIPPED_HOLLY_WOOD.get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.MAHOGANY_WOOD.get(), BYGBlocks.STRIPPED_MAHOGANY_WOOD.get()); stripables.put(BYGBlocks.MANGROVE_WOOD.get(), BYGBlocks.STRIPPED_MANGROVE_WOOD.get()); @@ -65,7 +58,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.PALM_WOOD.get(), BYGBlocks.STRIPPED_PALM_WOOD.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); - stripables.put(BYGBlocks.ETHER_WOOD.get(), BYGBlocks.STRIPPED_ETHER_WOOD.get()); stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); stripables.put(BYGBlocks.EMBUR_HYPHAE.get(), BYGBlocks.STRIPPED_EMBUR_HYPHAE.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGBlocks.IMPARIUS_HYPHAE.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 21b96a7907..188b67c56a 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -17,8 +17,12 @@ import potionstudios.byg.reg.BlockRegistryObject; import potionstudios.byg.reg.RegistryObject; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; public enum BYGWoodTypes { ASPEN("aspen", new Builder() @@ -72,6 +76,12 @@ public enum BYGWoodTypes { .materialColor(MaterialColor.TERRACOTTA_GREEN) .boatType(BYGBoatEntity.BYGType.HOLLY)); + public static final Map LOOKUP; + static { + LOOKUP = Arrays.stream(values()) + .collect(Collectors.toUnmodifiableMap(BYGWoodTypes::toString, Function.identity())); + } + private final String name; private final WoodType woodType; private final Builder builder; diff --git a/Common/src/main/java/potionstudios/byg/common/block/EtherBulbsBlock.java b/Common/src/main/java/potionstudios/byg/common/block/EtherBulbsBlock.java index db56a176ee..636e8e8653 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/EtherBulbsBlock.java +++ b/Common/src/main/java/potionstudios/byg/common/block/EtherBulbsBlock.java @@ -66,7 +66,7 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) { BlockPos blockpos = pos.above(); BlockState blockstate = worldIn.getBlockState(blockpos); Block block = blockstate.getBlock(); - return block == BYGBlocks.ETHER_LEAVES.get(); + return block == BYGWoodTypes.ETHER.leaves().get(); } @Override diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 2550f51373..b28c95f982 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -47,17 +47,11 @@ public BYGBoatEntity(EntityType boatEntityType, Level worldType) @Override public Item getDropItem() { + final var type = BYGWoodTypes.LOOKUP.get(getBYGBoatType().getName()); + if (type != null) + return type.boat().get(); return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.boat().get(); - case BAOBAB -> BYGWoodTypes.BAOBAB.boat().get(); - case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.boat().get(); - case CHERRY -> BYGWoodTypes.CHERRY.boat().get(); - case CIKA -> BYGWoodTypes.CIKA.boat().get(); - case CYPRESS -> BYGWoodTypes.CYPRESS.boat().get(); - case EBONY -> BYGWoodTypes.EBONY.boat().get(); - case FIR -> BYGItems.FIR_BOAT.get(); - case GREEN_ENCHANTED -> BYGItems.GREEN_ENCHANTED_BOAT.get(); - case HOLLY -> BYGItems.HOLLY_BOAT.get(); case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); case MAHOGANY -> BYGItems.MAHOGANY_BOAT.get(); case MANGROVE -> BYGItems.MANGROVE_BOAT.get(); @@ -74,17 +68,11 @@ public Item getDropItem() { } public Block getPlanks() { + final var type = BYGWoodTypes.LOOKUP.get(getBYGBoatType().getName()); + if (type != null) + return type.planks().get(); return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.planks().get(); - case BAOBAB -> BYGWoodTypes.BAOBAB.planks().get(); - case BLUE_ENCHANTED -> BYGWoodTypes.BLUE_ENCHANTED.planks().get(); - case CHERRY -> BYGWoodTypes.CHERRY.planks().get(); - case CIKA -> BYGWoodTypes.CIKA.planks().get(); - case CYPRESS -> BYGWoodTypes.CYPRESS.planks().get(); - case EBONY -> BYGWoodTypes.EBONY.planks().get(); - case FIR -> BYGBlocks.FIR_PLANKS.get(); - case GREEN_ENCHANTED -> BYGBlocks.GREEN_ENCHANTED_PLANKS.get(); - case HOLLY -> BYGBlocks.HOLLY_PLANKS.get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); case MAHOGANY -> BYGBlocks.MAHOGANY_PLANKS.get(); case MANGROVE -> BYGBlocks.MANGROVE_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java index ee966a26c1..d0057b29c8 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java @@ -90,8 +90,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_BUSH1 = createConfiguredFeature("ether_bush1", BYGFeatures.ETHER_BUSH1, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -100,8 +99,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_BUSH2 = createConfiguredFeature("ether_bush2", BYGFeatures.ETHER_BUSH2, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -110,8 +108,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE1 = createConfiguredFeature("ether_tree1", BYGFeatures.ETHER_TREE1, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -120,8 +117,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE2 = createConfiguredFeature("ether_tree2", BYGFeatures.ETHER_TREE2, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -130,8 +126,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE3 = createConfiguredFeature("ether_tree3", BYGFeatures.ETHER_TREE3, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -140,8 +135,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE4 = createConfiguredFeature("ether_tree4", BYGFeatures.ETHER_TREE4, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -150,8 +144,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE5 = createConfiguredFeature("ether_tree5", BYGFeatures.ETHER_TREE5, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_LOG.get()) - .setLeavesBlock(BYGBlocks.ETHER_LEAVES.get()) + .fromWoodType(BYGWoodTypes.ETHER) .setMaxHeight(30) .setMinHeight(22) .build() @@ -160,7 +153,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE_DEAD1 = createConfiguredFeature("ether_tree_dead1", BYGFeatures.DEAD_ETHER_TREE1, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_WOOD.get()) + .setTrunkBlock(BYGWoodTypes.ETHER.wood().get()) .setLeavesBlock(Blocks.AIR) .setMaxHeight(30) .setMinHeight(22) @@ -170,7 +163,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE_DEAD2 = createConfiguredFeature("ether_tree_dead2", BYGFeatures.DEAD_ETHER_TREE2, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_WOOD.get()) + .setTrunkBlock(BYGWoodTypes.ETHER.wood().get()) .setLeavesBlock(Blocks.AIR) .setMaxHeight(30) .setMinHeight(22) @@ -180,7 +173,7 @@ public class BYGEndVegetationFeatures { public static final Holder> ETHER_TREE_DEAD3 = createConfiguredFeature("ether_tree_dead3", BYGFeatures.DEAD_ETHER_TREE3, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ETHER_WOOD.get()) + .setTrunkBlock(BYGWoodTypes.ETHER.wood().get()) .setLeavesBlock(Blocks.AIR) .setMaxHeight(30) .setMinHeight(22) diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 1af29cf876..2d719fdd3a 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -421,8 +421,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE1 = createConfiguredFeature("conifer_tree1", BYGFeatures.CONIFER_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(25) .setMinHeight(19) .build() @@ -430,8 +429,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE2 = createConfiguredFeature("conifer_tree2", BYGFeatures.CONIFER_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(30) .setMinHeight(23) .build() @@ -439,8 +437,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE3 = createConfiguredFeature("conifer_tree3", BYGFeatures.CONIFER_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(35) .setMinHeight(26) .build() @@ -448,8 +445,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE4 = createConfiguredFeature("conifer_tree4", BYGFeatures.CONIFER_TREE4, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(35) .setMinHeight(25) .build() @@ -457,8 +453,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE5 = createConfiguredFeature("conifer_tree5", BYGFeatures.CONIFER_TREE5, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(21) .setMinHeight(14) .build() @@ -466,8 +461,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE6 = createConfiguredFeature("conifer_tree6", BYGFeatures.CONIFER_TREE6, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(17) .setMinHeight(11) .build() @@ -475,8 +469,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE7 = createConfiguredFeature("conifer_tree7", BYGFeatures.CONIFER_TREE7, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(28) .setMinHeight(18) .build() @@ -484,8 +477,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> CONIFER_TREE8 = createConfiguredFeature("conifer_tree8", BYGFeatures.CONIFER_TREE8, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.FIR_LOG.get()) - .setLeavesBlock(BYGBlocks.FIR_LEAVES.get()) + .fromWoodType(BYGWoodTypes.FIR) .setMaxHeight(28) .setMinHeight(16) .build() @@ -774,24 +766,21 @@ public class BYGOverworldTreeFeatures { BYGFeatures.ENCHANTED_TREE1, () -> new BYGTreeConfig.Builder() .copy(ENCHANTED_BLUE_TREE1.value().config()) - .setTrunkBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.GREEN_ENCHANTED_LEAVES.get()) + .fromWoodType(BYGWoodTypes.GREEN_ENCHANTED) .build() ); public static final Holder> ENCHANTED_GREEN_TREE2 = createConfiguredFeature("green_enchanted_tree2", BYGFeatures.ENCHANTED_TREE2, () -> new BYGTreeConfig.Builder() .copy(ENCHANTED_BLUE_TREE2.value().config()) - .setTrunkBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.GREEN_ENCHANTED_LEAVES.get()) + .fromWoodType(BYGWoodTypes.GREEN_ENCHANTED) .build() ); public static final Holder> ENCHANTED_GREEN_TREE3 = createConfiguredFeature("green_enchanted_tree3", BYGFeatures.ENCHANTED_TREE3, () -> new BYGTreeConfig.Builder() .copy(ENCHANTED_BLUE_TREE3.value().config()) - .setTrunkBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.GREEN_ENCHANTED_LEAVES.get()) + .fromWoodType(BYGWoodTypes.GREEN_ENCHANTED) .build() ); @@ -808,18 +797,17 @@ public class BYGOverworldTreeFeatures { BYGFeatures.ENCHANTED_GROVE_TREE1, () -> new BYGTreeConfig.Builder() .copy(ENCHANTED_BLUE_TREE1.value().config()) - .setTrunkBlock(BYGBlocks.GREEN_ENCHANTED_LOG.get()) - .setLeavesBlock(BYGBlocks.GREEN_ENCHANTED_LEAVES.get()) + .fromWoodType(BYGWoodTypes.GREEN_ENCHANTED) .build() ); public static final Holder> HOLLY_TREE1 = createConfiguredFeature("holly_tree1", BYGFeatures.HOLLY_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.HOLLY_LOG.get()) + .setTrunkBlock(HOLLY.log()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.HOLLY_BERRY_LEAVES.defaultBlockState(), 1) - .add(BYGBlocks.HOLLY_LEAVES.defaultBlockState(), 10))) + .add(HOLLY.leaves().defaultBlockState(), 10))) .setMaxHeight(23) .setMinHeight(17) .build() diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/fir_bookshelf.json deleted file mode 100644 index a4c238c7d3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/fir_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/fir_crafting_table.json deleted file mode 100644 index bba62192ef..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/fir_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/fir_fence_gate.json deleted file mode 100644 index 53e97c1125..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/fir_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/fir_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/fir_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/fir_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/fir_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/fir_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/fir_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/fir_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/fir_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/fir_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/fir_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/fir_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/fir_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/fir_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/fir_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/fir_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_leaves.json b/Common/src/main/resources/assets/byg/blockstates/fir_leaves.json deleted file mode 100644 index 7a59b8fff6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/fir_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/fir_pressure_plate.json deleted file mode 100644 index c4adef81a2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/fir_pressure_plate" - }, - "powered=true": { - "model": "byg:block/fir_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_slab.json b/Common/src/main/resources/assets/byg/blockstates/fir_slab.json deleted file mode 100644 index 80dc8b40b3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/fir_slab" - }, - "type=top": { - "model": "byg:block/fir_slab_top" - }, - "type=double": { - "model": "byg:block/fir_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/fir_bookshelf.json deleted file mode 100644 index c356485dd7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/fir_planks", - "up": "byg:block/fir_planks", - "north": "byg:block/fir_bookshelf", - "east": "byg:block/fir_bookshelf", - "south": "byg:block/fir_bookshelf", - "west": "byg:block/fir_bookshelf", - "particle": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_button.json b/Common/src/main/resources/assets/byg/models/block/fir_button.json deleted file mode 100644 index 1dbb6d230d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/fir_button_inventory.json deleted file mode 100644 index d3047c657b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/fir_button_pressed.json deleted file mode 100644 index c3ea8aa654..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/fir_crafting_table.json deleted file mode 100644 index f8c8b27062..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/fir_crafting_table_front", - "down": "byg:block/fir_planks", - "up": "byg:block/fir_crafting_table_top", - "north": "byg:block/fir_crafting_table_front", - "east": "byg:block/fir_crafting_table_side", - "south": "byg:block/fir_crafting_table_side", - "west": "byg:block/fir_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/fir_door_bottom.json deleted file mode 100644 index 57702fa3e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/fir_door_bottom", - "top": "byg:block/fir_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/fir_door_bottom_hinge.json deleted file mode 100644 index 2e0b7bdb0c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/fir_door_bottom", - "top": "byg:block/fir_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_door_top.json b/Common/src/main/resources/assets/byg/models/block/fir_door_top.json deleted file mode 100644 index e705c0553f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/fir_door_bottom", - "top": "byg:block/fir_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/fir_door_top_hinge.json deleted file mode 100644 index 77db766416..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/fir_door_bottom", - "top": "byg:block/fir_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence.json b/Common/src/main/resources/assets/byg/models/block/fir_fence.json deleted file mode 100644 index d323edd3aa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/fir_planks", - "particle": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_gate.json deleted file mode 100644 index 49aafbd8d8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_open.json deleted file mode 100644 index c56223ea7c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall.json deleted file mode 100644 index f64b97f16b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall_open.json deleted file mode 100644 index e0d7c0ad16..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_inventory.json deleted file mode 100644 index 654470a7b4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/fir_planks", - "particle": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_fence_post.json b/Common/src/main/resources/assets/byg/models/block/fir_fence_post.json deleted file mode 100644 index ec16a90353..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/fir_planks", - "particle": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_leaves.json b/Common/src/main/resources/assets/byg/models/block/fir_leaves.json deleted file mode 100644 index c7946a4c95..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/fir_leaves", - "particle": "byg:block/fir_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/fir_leaves_snowy.json deleted file mode 100644 index 96dfdbbbec..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/fir_leaves_snowy", - "up": "byg:block/fir_leaves_snowy", - "north": "byg:block/fir_leaves_snowy_side", - "east": "byg:block/fir_leaves_snowy_side", - "south": "byg:block/fir_leaves_snowy_side", - "west": "byg:block/fir_leaves_snowy_side", - "particle": "byg:block/fir_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_log.json b/Common/src/main/resources/assets/byg/models/block/fir_log.json deleted file mode 100644 index 558f4393fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/fir_log_top", - "side": "byg:block/fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_planks.json b/Common/src/main/resources/assets/byg/models/block/fir_planks.json deleted file mode 100644 index 2805541f25..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/fir_planks", - "particle": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate.json deleted file mode 100644 index 7aa33cc0a4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate_down.json deleted file mode 100644 index 1c052efe5a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_sapling.json b/Common/src/main/resources/assets/byg/models/block/fir_sapling.json deleted file mode 100644 index 3e911413b3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/fir_sapling", - "particle": "byg:block/fir_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_slab.json b/Common/src/main/resources/assets/byg/models/block/fir_slab.json deleted file mode 100644 index 5f373b5bf0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/fir_planks", - "top": "byg:block/fir_planks", - "side": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_slab_top.json b/Common/src/main/resources/assets/byg/models/block/fir_slab_top.json deleted file mode 100644 index 72faf5b118..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/fir_planks", - "top": "byg:block/fir_planks", - "side": "byg:block/fir_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_stairs.json b/Common/src/main/resources/assets/byg/models/block/fir_stairs.json deleted file mode 100644 index 2a868afd7d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/fir_planks", - "top": "byg:block/fir_planks", - "side": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/fir_stairs_inner.json deleted file mode 100644 index 34c76fa772..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/fir_planks", - "top": "byg:block/fir_planks", - "side": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/fir_stairs_outer.json deleted file mode 100644 index c46e8417ea..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/fir_planks", - "top": "byg:block/fir_planks", - "side": "byg:block/fir_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_bottom.json deleted file mode 100644 index 36b787a926..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/fir_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_open.json deleted file mode 100644 index 1bbc92b862..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/fir_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_top.json deleted file mode 100644 index 8fa6c8ac47..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/fir_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/fir_wall.json b/Common/src/main/resources/assets/byg/models/block/fir_wall.json deleted file mode 100644 index 30031eb60c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_wall.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_side", - "textures": { - "wall": "byg:block/fir_log", - "particle": "byg:block/fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_wall_inventory.json b/Common/src/main/resources/assets/byg/models/block/fir_wall_inventory.json deleted file mode 100644 index c8c442c31f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/wall_inventory", - "textures": { - "wall": "byg:block/fir_log", - "particle": "byg:block/fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_wall_post.json b/Common/src/main/resources/assets/byg/models/block/fir_wall_post.json deleted file mode 100644 index 6346e7007a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_wall_post", - "textures": { - "wall": "byg:block/fir_log", - "particle": "byg:block/fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/fir_wood.json b/Common/src/main/resources/assets/byg/models/block/fir_wood.json deleted file mode 100644 index 92330640c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/fir_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/fir_log", - "particle": "byg:block/fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_boat.json b/Common/src/main/resources/assets/byg/models/item/fir_boat.json deleted file mode 100644 index 9ec670e7da..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/fir_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/fir_bookshelf.json deleted file mode 100644 index 884c2a7ed7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_button.json b/Common/src/main/resources/assets/byg/models/item/fir_button.json deleted file mode 100644 index 5aaab3b18b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/fir_crafting_table.json deleted file mode 100644 index c3845156d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_door.json b/Common/src/main/resources/assets/byg/models/item/fir_door.json deleted file mode 100644 index c511aa9c64..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/fir_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_fence.json b/Common/src/main/resources/assets/byg/models/item/fir_fence.json deleted file mode 100644 index 48757d57bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/fir_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/fir_fence_gate.json deleted file mode 100644 index b694bd2160..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_leaves.json b/Common/src/main/resources/assets/byg/models/item/fir_leaves.json deleted file mode 100644 index c0293b9d08..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_log.json b/Common/src/main/resources/assets/byg/models/item/fir_log.json deleted file mode 100644 index 85a8f88816..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_planks.json b/Common/src/main/resources/assets/byg/models/item/fir_planks.json deleted file mode 100644 index 12d2e2ef87..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/fir_pressure_plate.json deleted file mode 100644 index 1c96154d0a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_sapling.json b/Common/src/main/resources/assets/byg/models/item/fir_sapling.json deleted file mode 100644 index 1533a64d17..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/fir_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_slab.json b/Common/src/main/resources/assets/byg/models/item/fir_slab.json deleted file mode 100644 index 4685a995ae..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_stairs.json b/Common/src/main/resources/assets/byg/models/item/fir_stairs.json deleted file mode 100644 index e09fa76a8d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/fir_trapdoor.json deleted file mode 100644 index aafc2bcf00..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_wall.json b/Common/src/main/resources/assets/byg/models/item/fir_wall.json deleted file mode 100644 index 0e255cf3a7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/fir_wall_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_wood.json b/Common/src/main/resources/assets/byg/models/item/fir_wood.json deleted file mode 100644 index 4078f374db..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/fir_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/sapling.png b/Common/src/main/resources/assets/byg/textures/block/ether/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/ether/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/fir/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/fir/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/fir/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/fir/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_door_top.png b/Common/src/main/resources/assets/byg/textures/block/fir/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/fir/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_sapling.png b/Common/src/main/resources/assets/byg/textures/block/fir/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/fir/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_leaves.png b/Common/src/main/resources/assets/byg/textures/block/fir/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/fir/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_log.png b/Common/src/main/resources/assets/byg/textures/block/fir/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_log.png rename to Common/src/main/resources/assets/byg/textures/block/fir/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_log_top.png b/Common/src/main/resources/assets/byg/textures/block/fir/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/fir/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_planks.png b/Common/src/main/resources/assets/byg/textures/block/fir/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_planks.png rename to Common/src/main/resources/assets/byg/textures/block/fir/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/fir_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/fir/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/fir_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/fir/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/sapling.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/green_enchanted/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/sapling.png b/Common/src/main/resources/assets/byg/textures/block/holly/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/holly/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/holly/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/item/fir_boat.png b/Common/src/main/resources/assets/byg/textures/item/fir/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/fir_boat.png rename to Common/src/main/resources/assets/byg/textures/item/fir/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/fir_door.png b/Common/src/main/resources/assets/byg/textures/item/fir/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/fir_door.png rename to Common/src/main/resources/assets/byg/textures/item/fir/door.png From 4fca85ee780ee7bd8893f746f37834728c9e9901 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 20:22:33 +0300 Subject: [PATCH 27/90] Remove duplicate recipes --- .../data/byg/recipes/ether_bookshelf.json | 19 ------------------ .../data/byg/recipes/ether_button.json | 12 ----------- .../byg/recipes/ether_crafting_table.json | 15 -------------- .../data/byg/recipes/ether_door.json | 18 ----------------- .../data/byg/recipes/ether_fence.json | 20 ------------------- .../data/byg/recipes/ether_fence_gate.json | 19 ------------------ .../data/byg/recipes/ether_planks.json | 13 ------------ .../byg/recipes/ether_pressure_plate.json | 15 -------------- .../data/byg/recipes/ether_slab.json | 16 --------------- .../data/byg/recipes/ether_stairs.json | 18 ----------------- .../data/byg/recipes/ether_trapdoor.json | 17 ---------------- .../data/byg/recipes/ether_wood.json | 16 --------------- .../resources/data/byg/recipes/fir_boat.json | 16 --------------- .../data/byg/recipes/fir_bookshelf.json | 19 ------------------ .../data/byg/recipes/fir_button.json | 12 ----------- .../data/byg/recipes/fir_crafting_table.json | 15 -------------- .../resources/data/byg/recipes/fir_door.json | 18 ----------------- .../resources/data/byg/recipes/fir_fence.json | 20 ------------------- .../data/byg/recipes/fir_fence_gate.json | 19 ------------------ .../data/byg/recipes/fir_planks.json | 13 ------------ .../data/byg/recipes/fir_pressure_plate.json | 15 -------------- .../resources/data/byg/recipes/fir_slab.json | 16 --------------- .../data/byg/recipes/fir_stairs.json | 18 ----------------- .../data/byg/recipes/fir_trapdoor.json | 17 ---------------- .../resources/data/byg/recipes/fir_wood.json | 16 --------------- .../byg/recipes/green_enchanted_boat.json | 16 --------------- .../recipes/green_enchanted_bookshelf.json | 19 ------------------ .../byg/recipes/green_enchanted_button.json | 12 ----------- .../green_enchanted_crafting_table.json | 15 -------------- .../recipes/green_enchanted_door_door.json | 18 ----------------- .../byg/recipes/green_enchanted_fence.json | 20 ------------------- .../recipes/green_enchanted_fence_gate.json | 19 ------------------ .../byg/recipes/green_enchanted_planks.json | 13 ------------ .../green_enchanted_pressure_plate.json | 15 -------------- .../byg/recipes/green_enchanted_slab.json | 16 --------------- .../byg/recipes/green_enchanted_stairs.json | 18 ----------------- .../byg/recipes/green_enchanted_trapdoor.json | 17 ---------------- .../byg/recipes/green_enchanted_wood.json | 16 --------------- .../data/byg/recipes/holly_boat.json | 16 --------------- .../data/byg/recipes/holly_bookshelf.json | 19 ------------------ .../data/byg/recipes/holly_button.json | 12 ----------- .../byg/recipes/holly_crafting_table.json | 15 -------------- .../data/byg/recipes/holly_door.json | 18 ----------------- .../data/byg/recipes/holly_fence.json | 20 ------------------- .../data/byg/recipes/holly_fence_gate.json | 19 ------------------ .../data/byg/recipes/holly_planks.json | 13 ------------ .../byg/recipes/holly_pressure_plate.json | 15 -------------- .../data/byg/recipes/holly_slab.json | 16 --------------- .../data/byg/recipes/holly_stairs.json | 18 ----------------- .../data/byg/recipes/holly_trapdoor.json | 17 ---------------- .../data/byg/recipes/holly_wood.json | 16 --------------- 51 files changed, 840 deletions(-) delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/ether_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/fir_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_door_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/green_enchanted_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/holly_wood.json diff --git a/Common/src/main/resources/data/byg/recipes/ether_bookshelf.json b/Common/src/main/resources/data/byg/recipes/ether_bookshelf.json deleted file mode 100644 index 57d8caa674..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:ether_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:ether_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_button.json b/Common/src/main/resources/data/byg/recipes/ether_button.json deleted file mode 100644 index d565717158..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:ether_planks" - } - ], - "result": { - "item": "byg:ether_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_crafting_table.json b/Common/src/main/resources/data/byg/recipes/ether_crafting_table.json deleted file mode 100644 index e099c0d186..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_door.json b/Common/src/main/resources/data/byg/recipes/ether_door.json deleted file mode 100644 index aff9a37ff8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_fence.json b/Common/src/main/resources/data/byg/recipes/ether_fence.json deleted file mode 100644 index 9cd77210ff..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_fence_gate.json b/Common/src/main/resources/data/byg/recipes/ether_fence_gate.json deleted file mode 100644 index b094c5f7eb..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_planks.json b/Common/src/main/resources/data/byg/recipes/ether_planks.json deleted file mode 100644 index a1dcb46102..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:ether_logs" - } - ], - "result": { - "item": "byg:ether_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/ether_pressure_plate.json deleted file mode 100644 index 7f5b48fc55..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_slab.json b/Common/src/main/resources/data/byg/recipes/ether_slab.json deleted file mode 100644 index 1426b060d6..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_stairs.json b/Common/src/main/resources/data/byg/recipes/ether_stairs.json deleted file mode 100644 index e406236fd1..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "byg:ether_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_trapdoor.json b/Common/src/main/resources/data/byg/recipes/ether_trapdoor.json deleted file mode 100644 index ed270335c5..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:ether_planks" - } - }, - "result": { - "item": "byg:ether_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/ether_wood.json b/Common/src/main/resources/data/byg/recipes/ether_wood.json deleted file mode 100644 index 264080f8e7..0000000000 --- a/Common/src/main/resources/data/byg/recipes/ether_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:ether_log" - } - }, - "result": { - "item": "byg:ether_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_boat.json b/Common/src/main/resources/data/byg/recipes/fir_boat.json deleted file mode 100644 index 92cd595619..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_bookshelf.json b/Common/src/main/resources/data/byg/recipes/fir_bookshelf.json deleted file mode 100644 index f59ad85aa5..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:fir_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:fir_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_button.json b/Common/src/main/resources/data/byg/recipes/fir_button.json deleted file mode 100644 index 57eb6f7d56..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:fir_planks" - } - ], - "result": { - "item": "byg:fir_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_crafting_table.json b/Common/src/main/resources/data/byg/recipes/fir_crafting_table.json deleted file mode 100644 index dc67762a69..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_door.json b/Common/src/main/resources/data/byg/recipes/fir_door.json deleted file mode 100644 index 6b0947fbe3..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_fence.json b/Common/src/main/resources/data/byg/recipes/fir_fence.json deleted file mode 100644 index e21595e940..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_fence_gate.json b/Common/src/main/resources/data/byg/recipes/fir_fence_gate.json deleted file mode 100644 index 33427541d9..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_planks.json b/Common/src/main/resources/data/byg/recipes/fir_planks.json deleted file mode 100644 index 457267c11a..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:fir_logs" - } - ], - "result": { - "item": "byg:fir_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/fir_pressure_plate.json deleted file mode 100644 index 2ea2817de4..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_slab.json b/Common/src/main/resources/data/byg/recipes/fir_slab.json deleted file mode 100644 index 69bb405db1..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_stairs.json b/Common/src/main/resources/data/byg/recipes/fir_stairs.json deleted file mode 100644 index d3029d191d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_trapdoor.json b/Common/src/main/resources/data/byg/recipes/fir_trapdoor.json deleted file mode 100644 index 5fec898645..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:fir_planks" - } - }, - "result": { - "item": "byg:fir_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/fir_wood.json b/Common/src/main/resources/data/byg/recipes/fir_wood.json deleted file mode 100644 index 5c351b5013..0000000000 --- a/Common/src/main/resources/data/byg/recipes/fir_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:fir_log" - } - }, - "result": { - "item": "byg:fir_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_boat.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_boat.json deleted file mode 100644 index 6904a81056..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_bookshelf.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_bookshelf.json deleted file mode 100644 index 034d682dc7..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:green_enchanted_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_button.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_button.json deleted file mode 100644 index 8e7efaf26c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:green_enchanted_planks" - } - ], - "result": { - "item": "byg:green_enchanted_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_crafting_table.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_crafting_table.json deleted file mode 100644 index 4bfaf12195..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_door_door.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_door_door.json deleted file mode 100644 index 991a395351..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_door_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_fence.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_fence.json deleted file mode 100644 index bef7f6de5b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_fence_gate.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_fence_gate.json deleted file mode 100644 index a349c298e9..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_planks.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_planks.json deleted file mode 100644 index dc20300a99..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:green_enchanted_logs" - } - ], - "result": { - "item": "byg:green_enchanted_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_pressure_plate.json deleted file mode 100644 index 6895aefce7..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_slab.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_slab.json deleted file mode 100644 index a26944736d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_stairs.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_stairs.json deleted file mode 100644 index 945647acf1..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_trapdoor.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_trapdoor.json deleted file mode 100644 index 7a8c689836..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:green_enchanted_planks" - } - }, - "result": { - "item": "byg:green_enchanted_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_wood.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_wood.json deleted file mode 100644 index c1de337056..0000000000 --- a/Common/src/main/resources/data/byg/recipes/green_enchanted_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:green_enchanted_log" - } - }, - "result": { - "item": "byg:green_enchanted_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_boat.json b/Common/src/main/resources/data/byg/recipes/holly_boat.json deleted file mode 100644 index 49d08d13cb..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_bookshelf.json b/Common/src/main/resources/data/byg/recipes/holly_bookshelf.json deleted file mode 100644 index 712f877f2f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:holly_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:holly_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_button.json b/Common/src/main/resources/data/byg/recipes/holly_button.json deleted file mode 100644 index b5b025eb1c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:holly_planks" - } - ], - "result": { - "item": "byg:holly_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_crafting_table.json b/Common/src/main/resources/data/byg/recipes/holly_crafting_table.json deleted file mode 100644 index c27859ca0f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_door.json b/Common/src/main/resources/data/byg/recipes/holly_door.json deleted file mode 100644 index 2499337f97..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_fence.json b/Common/src/main/resources/data/byg/recipes/holly_fence.json deleted file mode 100644 index b33d9318c8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_fence_gate.json b/Common/src/main/resources/data/byg/recipes/holly_fence_gate.json deleted file mode 100644 index b7c78b813d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_planks.json b/Common/src/main/resources/data/byg/recipes/holly_planks.json deleted file mode 100644 index 3e34940986..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:holly_logs" - } - ], - "result": { - "item": "byg:holly_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/holly_pressure_plate.json deleted file mode 100644 index 364d461c14..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_slab.json b/Common/src/main/resources/data/byg/recipes/holly_slab.json deleted file mode 100644 index 895d593202..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_stairs.json b/Common/src/main/resources/data/byg/recipes/holly_stairs.json deleted file mode 100644 index c91847eef5..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_trapdoor.json b/Common/src/main/resources/data/byg/recipes/holly_trapdoor.json deleted file mode 100644 index 9d23fa23f1..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:holly_planks" - } - }, - "result": { - "item": "byg:holly_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/holly_wood.json b/Common/src/main/resources/data/byg/recipes/holly_wood.json deleted file mode 100644 index 968bcce428..0000000000 --- a/Common/src/main/resources/data/byg/recipes/holly_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:holly_log" - } - }, - "result": { - "item": "byg:holly_wood", - "count": 3 - } -} \ No newline at end of file From fcb1d9ad47f747f7cff51c84a09137b66146e9a1 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 21:08:23 +0300 Subject: [PATCH 28/90] Imparius stuff --- Common/src/generated/resources/.cache/cache | 125 +++++++++-- .../{bulbis_wood.json => bulbis_hyphae.json} | 0 .../byg/blockstates/imparius_bookshelf.json | 7 + .../byg/blockstates/imparius_button.json | 118 ++++++++++ .../blockstates/imparius_crafting_table.json | 7 + .../assets/byg/blockstates/imparius_door.json | 124 +++++++++++ .../byg/blockstates/imparius_fence.json | 40 ++-- .../byg/blockstates/imparius_fence_gate.json | 80 +++++++ .../byg/blockstates/imparius_hyphae.json | 16 ++ .../byg/blockstates/imparius_mushroom.json | 7 + .../byg/blockstates/imparius_planks.json | 7 + .../blockstates/imparius_pressure_plate.json | 10 + .../assets/byg/blockstates/imparius_slab.json | 13 ++ .../byg/blockstates/imparius_stairs.json | 209 ++++++++++++++++++ .../assets/byg/blockstates/imparius_stem.json | 14 +- .../byg/blockstates/imparius_trapdoor.json | 68 ++++++ .../byg/models/block/imparius/bookshelf.json | 12 + .../byg/models/block/imparius/button.json} | 2 +- .../block/imparius/button_inventory.json} | 2 +- .../block/imparius/button_pressed.json} | 2 +- .../models/block/imparius/crafting_table.json | 12 + .../models/block/imparius/door_bottom.json | 7 + .../block/imparius/door_bottom_hinge.json | 7 + .../byg/models/block/imparius/door_top.json | 7 + .../models/block/imparius/door_top_hinge.json | 7 + .../byg/models/block/imparius/fence.json | 7 + .../models/block/imparius/fence_gate.json} | 2 +- .../block/imparius/fence_gate_open.json} | 2 +- .../block/imparius/fence_gate_wall.json} | 2 +- .../block/imparius/fence_gate_wall_open.json} | 2 +- .../byg/models/block/imparius/fence_inv.json | 7 + .../byg/models/block/imparius/fence_post.json | 7 + .../models/block/imparius/grower_item.json | 6 + .../assets/byg/models/block/imparius/log.json | 7 + .../byg/models/block/imparius/planks.json | 12 + .../block/imparius/pressure_plate.json} | 2 +- .../block/imparius/pressure_plate_down.json} | 2 +- .../byg/models/block/imparius/slab.json | 8 + .../byg/models/block/imparius/slab_top.json | 8 + .../byg/models/block/imparius/stairs.json | 8 + .../models/block/imparius/stairs_inner.json | 8 + .../models/block/imparius/stairs_outer.json | 8 + .../byg/models/block/imparius/trapdoor.json | 39 ++++ .../block/imparius/trapdoor_bottom.json} | 2 +- .../models/block/imparius/trapdoor_open.json} | 2 +- .../models/block/imparius/trapdoor_top.json} | 2 +- .../byg/models/block/imparius/wood.json | 7 + .../{bulbis_wood.json => bulbis_hyphae.json} | 0 .../byg/models/item/imparius_bookshelf.json | 39 ++++ .../byg/models/item/imparius_button.json | 39 ++++ .../models/item/imparius_crafting_table.json | 39 ++++ .../assets/byg/models/item/imparius_door.json | 2 +- .../byg/models/item/imparius_fence.json | 39 ++++ .../byg/models/item/imparius_hyphae.json | 39 ++++ .../byg/models/item/imparius_mushroom.json | 6 + .../byg/models/item/imparius_planks.json | 39 ++++ .../models/item/imparius_pressure_plate.json | 39 ++++ .../assets/byg/models/item/imparius_slab.json | 39 ++++ .../byg/models/item/imparius_stairs.json | 39 ++++ .../assets/byg/models/item/imparius_stem.json | 39 ++++ .../byg.byg/wood/imparius/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/imparius/button.json | 34 +++ .../byg.byg/wood/imparius/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/imparius/door.json | 34 +++ .../recipes/byg.byg/wood/imparius/fence.json | 34 +++ .../byg.byg/wood/imparius/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/imparius/planks.json | 32 +++ .../byg.byg/wood/imparius/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/imparius/slab.json | 34 +++ .../recipes/byg.byg/wood/imparius/stairs.json | 34 +++ .../byg.byg/wood/imparius/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/imparius/wood.json | 34 +++ .../data/byg/recipes/wood/bulbis/wood.json | 2 +- .../byg/recipes/wood/imparius/bookshelf.json} | 11 +- .../byg/recipes/wood/imparius/button.json} | 0 .../wood/imparius/crafting_table.json} | 7 +- .../data/byg/recipes/wood/imparius/door.json} | 8 +- .../byg/recipes/wood/imparius/fence.json} | 0 .../recipes/wood/imparius/fence_gate.json} | 0 .../byg/recipes/wood/imparius/planks.json} | 4 +- .../wood/imparius/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/imparius/slab.json} | 4 +- .../byg/recipes/wood/imparius/stairs.json} | 10 +- .../byg/recipes/wood/imparius/trapdoor.json} | 6 +- .../data/byg/recipes/wood/imparius/wood.json | 17 ++ .../byg/tags/blocks/wood}/aspen_logs.json | 2 +- .../byg/tags/blocks/wood}/baobab_logs.json | 3 +- .../blocks/wood}/blue_enchanted_logs.json | 3 +- .../byg/tags/blocks/wood/bulbis_logs.json | 9 + .../byg/tags/blocks/wood}/cherry_logs.json | 3 +- .../data/byg/tags/blocks/wood}/cika_logs.json | 3 +- .../byg/tags/blocks/wood}/cypress_logs.json | 3 +- .../byg/tags/blocks/wood}/ebony_logs.json | 3 +- .../byg/tags/blocks/wood}/ether_logs.json | 2 +- .../data/byg/tags/blocks/wood}/fir_logs.json | 3 +- .../blocks/wood}/green_enchanted_logs.json | 3 +- .../byg/tags/blocks/wood}/holly_logs.json | 3 +- .../byg/tags/blocks/wood/imparius_logs.json | 7 + .../data/byg/tags/items/wood/aspen_logs.json | 4 +- .../data/byg/tags/items/wood/baobab_logs.json | 4 +- .../tags/items/wood/blue_enchanted_logs.json | 4 +- .../data/byg/tags/items/wood/bulbis_logs.json | 4 +- .../data/byg/tags/items/wood/cherry_logs.json | 4 +- .../data/byg/tags/items/wood/cika_logs.json | 4 +- .../byg/tags/items/wood/cypress_logs.json | 4 +- .../data/byg/tags/items/wood/ebony_logs.json | 4 +- .../data/byg/tags/items/wood/ether_logs.json | 4 +- .../data/byg/tags/items/wood/fir_logs.json | 4 +- .../tags/items/wood/green_enchanted_logs.json | 4 +- .../data/byg/tags/items/wood/holly_logs.json | 4 +- .../byg/tags/items/wood/imparius_logs.json | 7 + .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGStrippables.java | 4 +- .../byg/common/block/BYGBlocks.java | 16 -- .../byg/common/block/BYGWoodTypes.java | 40 +++- .../common/entity/npc/BYGVillagerTrades.java | 3 +- .../byg/common/item/BYGItems.java | 50 ++--- .../end/BYGEndVegetationFeatures.java | 14 +- .../world/feature/gen/end/EndLakeFeature.java | 3 +- .../byg/blockstates/imparius_bookshelf.json | 9 - .../byg/blockstates/imparius_button.json | 118 ---------- .../blockstates/imparius_crafting_table.json | 7 - .../assets/byg/blockstates/imparius_door.json | 124 ----------- .../byg/blockstates/imparius_fence_gate.json | 80 ------- .../byg/blockstates/imparius_mushroom.json | 7 - .../byg/blockstates/imparius_planks.json | 7 - .../blockstates/imparius_pressure_plate.json | 10 - .../assets/byg/blockstates/imparius_slab.json | 13 -- .../byg/blockstates/imparius_stairs.json | 209 ------------------ .../byg/blockstates/imparius_trapdoor.json | 68 ------ .../byg/models/block/imparius_bookshelf.json | 12 - .../models/block/imparius_crafting_table.json | 12 - .../models/block/imparius_door_bottom.json | 7 - .../block/imparius_door_bottom_hinge.json | 7 - .../byg/models/block/imparius_door_top.json | 7 - .../models/block/imparius_door_top_hinge.json | 7 - .../block/imparius_fence_inventory.json | 6 - .../byg/models/block/imparius_fence_post.json | 6 - .../byg/models/block/imparius_mushroom.json | 7 - .../byg/models/block/imparius_planks.json | 6 - .../byg/models/block/imparius_slab.json | 8 - .../byg/models/block/imparius_slab_top.json | 8 - .../byg/models/block/imparius_stairs.json | 8 - .../models/block/imparius_stairs_inner.json | 8 - .../models/block/imparius_stairs_outer.json | 8 - .../assets/byg/models/item/baobab_fruit.json | 2 +- .../byg/models/item/baobab_fruit_block.json | 2 +- .../byg/models/item/bulbis_anomaly.json | 2 +- .../assets/byg/models/item/ether_bulbs.json | 2 +- .../byg/models/item/ether_bulbs_block.json | 2 +- .../assets/byg/models/item/holly_berries.json | 2 +- .../byg/models/item/imparius_bookshelf.json | 22 -- .../byg/models/item/imparius_button.json | 3 - .../models/item/imparius_crafting_table.json | 22 -- .../byg/models/item/imparius_fence.json | 3 - .../byg/models/item/imparius_fence_gate.json | 3 - .../byg/models/item/imparius_mushroom.json | 6 - .../byg/models/item/imparius_planks.json | 3 - .../models/item/imparius_pressure_plate.json | 3 - .../assets/byg/models/item/imparius_slab.json | 3 - .../byg/models/item/imparius_stairs.json | 3 - .../byg/models/item/imparius_trapdoor.json | 3 - ...ulbs_stage0.png => ether_bulbs_stage0.png} | Bin ...ulbs_stage1.png => ether_bulbs_stage1.png} | Bin ...ulbs_stage2.png => ether_bulbs_stage2.png} | Bin ...ulbs_stage3.png => ether_bulbs_stage3.png} | Bin .../block/{ether/bush.png => ether_bush.png} | Bin .../{ether/phylium.png => ether_phylium.png} | Bin .../phylium_top.png => ether_phylium_top.png} | Bin .../block/{ether/soil.png => ether_soil.png} | Bin .../{ether/stone.png => ether_stone.png} | Bin .../stone_top.png => ether_stone_top.png} | Bin .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../{imparius_stem.png => imparius/log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../trapdoor.png} | Bin .../{imparius_door.png => imparius/door.png} | Bin .../data/byg/tags/blocks/baobab_logs.json | 8 - .../byg/tags/blocks/blue_enchanted_logs.json | 8 - .../data/byg/tags/blocks/bulbis_stems.json | 9 - .../data/byg/tags/blocks/cherry_logs.json | 8 - .../data/byg/tags/blocks/cypress_logs.json | 8 - .../data/byg/tags/blocks/ebony_logs.json | 8 - .../data/byg/tags/blocks/embur_pedus.json | 9 - .../data/byg/tags/blocks/ether_logs.json | 9 - .../data/byg/tags/blocks/holly_logs.json | 8 - .../data/byg/tags/blocks/imparius_stems.json | 9 - .../data/byg/tags/blocks/jacaranda_logs.json | 8 - .../data/byg/tags/blocks/lament_logs.json | 9 - .../data/byg/tags/blocks/mahogany_logs.json | 8 - .../data/byg/tags/blocks/mangrove_logs.json | 8 - .../data/byg/tags/blocks/maple_logs.json | 8 - .../data/byg/tags/blocks/nightshade_logs.json | 9 - .../data/byg/tags/blocks/palm_logs.json | 9 - .../data/byg/tags/blocks/palo_verde_logs.json | 8 - .../data/byg/tags/blocks/pine_logs.json | 8 - .../tags/blocks/rainbow_eucalyptus_logs.json | 8 - .../data/byg/tags/blocks/redwood_logs.json | 8 - .../data/byg/tags/blocks/skyris_logs.json | 8 - .../data/byg/tags/blocks/sythian_stems.json | 9 - .../data/byg/tags/blocks/willow_logs.json | 8 - .../byg/tags/blocks/witch_hazel_logs.json | 8 - .../byg/tags/blocks/withering_oak_logs.json | 7 - .../data/byg/tags/blocks/zelkova_logs.json | 8 - .../data/byg/tags/items/aspen_logs.json | 9 - .../data/byg/tags/items/bulbis_stems.json | 9 - .../data/byg/tags/items/cika_logs.json | 8 - .../data/byg/tags/items/embur_pedus.json | 9 - .../data/byg/tags/items/fir_logs.json | 8 - .../byg/tags/items/green_enchanted_logs.json | 8 - .../data/byg/tags/items/imparius_stems.json | 9 - .../data/byg/tags/items/jacaranda_logs.json | 8 - .../data/byg/tags/items/lament_logs.json | 9 - .../data/byg/tags/items/mahogany_logs.json | 8 - .../data/byg/tags/items/mangrove_logs.json | 8 - .../data/byg/tags/items/maple_logs.json | 8 - .../data/byg/tags/items/palm_logs.json | 9 - .../data/byg/tags/items/palo_verde_logs.json | 8 - .../data/byg/tags/items/pine_logs.json | 8 - .../tags/items/rainbow_eucalyptus_logs.json | 8 - .../data/byg/tags/items/redwood_logs.json | 8 - .../data/byg/tags/items/skyris_logs.json | 8 - .../data/byg/tags/items/sythian_stems.json | 9 - .../data/byg/tags/items/willow_logs.json | 8 - .../data/byg/tags/items/witch_hazel_logs.json | 8 - .../byg/tags/items/withering_oak_logs.json | 7 - .../data/byg/tags/items/zelkova_logs.json | 8 - .../providers/BYGBlockTagsProvider.java | 8 +- .../providers/BYGItemTagsProvider.java | 5 +- 236 files changed, 2012 insertions(+), 1434 deletions(-) rename Common/src/generated/resources/assets/byg/blockstates/{bulbis_wood.json => bulbis_hyphae.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_door.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/imparius_fence.json (68%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_mushroom.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/imparius_stem.json (51%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json rename Common/src/{main/resources/assets/byg/models/block/imparius_button.json => generated/resources/assets/byg/models/block/imparius/button.json} (58%) rename Common/src/{main/resources/assets/byg/models/block/imparius_button_inventory.json => generated/resources/assets/byg/models/block/imparius/button_inventory.json} (62%) rename Common/src/{main/resources/assets/byg/models/block/imparius_button_pressed.json => generated/resources/assets/byg/models/block/imparius/button_pressed.json} (61%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/fence.json rename Common/src/{main/resources/assets/byg/models/block/imparius_fence_gate.json => generated/resources/assets/byg/models/block/imparius/fence_gate.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/imparius_fence_gate_open.json => generated/resources/assets/byg/models/block/imparius/fence_gate_open.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/imparius_fence_gate_wall.json => generated/resources/assets/byg/models/block/imparius/fence_gate_wall.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/imparius_fence_gate_wall_open.json => generated/resources/assets/byg/models/block/imparius/fence_gate_wall_open.json} (66%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/planks.json rename Common/src/{main/resources/assets/byg/models/block/imparius_pressure_plate.json => generated/resources/assets/byg/models/block/imparius/pressure_plate.json} (62%) rename Common/src/{main/resources/assets/byg/models/block/imparius_pressure_plate_down.json => generated/resources/assets/byg/models/block/imparius/pressure_plate_down.json} (63%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json rename Common/src/{main/resources/assets/byg/models/block/imparius_trapdoor_bottom.json => generated/resources/assets/byg/models/block/imparius/trapdoor_bottom.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/imparius_trapdoor_open.json => generated/resources/assets/byg/models/block/imparius/trapdoor_open.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/imparius_trapdoor_top.json => generated/resources/assets/byg/models/block/imparius/trapdoor_top.json} (65%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/wood.json rename Common/src/generated/resources/assets/byg/models/item/{bulbis_wood.json => bulbis_hyphae.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/models/item/imparius_door.json (61%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_mushroom.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_stem.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json rename Common/src/{main/resources/data/byg/recipes/imparius_bookshelf.json => generated/resources/data/byg/recipes/wood/imparius/bookshelf.json} (73%) rename Common/src/{main/resources/data/byg/recipes/imparius_button.json => generated/resources/data/byg/recipes/wood/imparius/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/imparius_crafting_table.json => generated/resources/data/byg/recipes/wood/imparius/crafting_table.json} (75%) rename Common/src/{main/resources/data/byg/recipes/imparius_door.json => generated/resources/data/byg/recipes/wood/imparius/door.json} (84%) rename Common/src/{main/resources/data/byg/recipes/imparius_fence.json => generated/resources/data/byg/recipes/wood/imparius/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/imparius_fence_gate.json => generated/resources/data/byg/recipes/wood/imparius/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/imparius_planks.json => generated/resources/data/byg/recipes/wood/imparius/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/imparius_pressure_plate.json => generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/imparius_slab.json => generated/resources/data/byg/recipes/wood/imparius/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/imparius_stairs.json => generated/resources/data/byg/recipes/wood/imparius/stairs.json} (69%) rename Common/src/{main/resources/data/byg/recipes/imparius_trapdoor.json => generated/resources/data/byg/recipes/wood/imparius/trapdoor.json} (87%) create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json rename Common/src/{main/resources/data/byg/tags/blocks => generated/resources/data/byg/tags/blocks/wood}/aspen_logs.json (100%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/baobab_logs.json (86%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/blue_enchanted_logs.json (88%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/cherry_logs.json (86%) rename Common/src/{main/resources/data/byg/tags/blocks => generated/resources/data/byg/tags/blocks/wood}/cika_logs.json (85%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/cypress_logs.json (86%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/ebony_logs.json (86%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/ether_logs.json (100%) rename Common/src/{main/resources/data/byg/tags/blocks => generated/resources/data/byg/tags/blocks/wood}/fir_logs.json (85%) rename Common/src/{main/resources/data/byg/tags/blocks => generated/resources/data/byg/tags/blocks/wood}/green_enchanted_logs.json (89%) rename Common/src/{main/resources/data/byg/tags/items => generated/resources/data/byg/tags/blocks/wood}/holly_logs.json (86%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_mushroom.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_mushroom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_mushroom.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_trapdoor.json rename Common/src/main/resources/assets/byg/textures/block/{ether/bulbs_stage0.png => ether_bulbs_stage0.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/bulbs_stage1.png => ether_bulbs_stage1.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/bulbs_stage2.png => ether_bulbs_stage2.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/bulbs_stage3.png => ether_bulbs_stage3.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/bush.png => ether_bush.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/phylium.png => ether_phylium.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/phylium_top.png => ether_phylium_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/soil.png => ether_soil.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/stone.png => ether_stone.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{ether/stone_top.png => ether_stone_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_bookshelf.png => imparius/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_crafting_table_front.png => imparius/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_crafting_table_side.png => imparius/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_crafting_table_top.png => imparius/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_door_bottom.png => imparius/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_door_top.png => imparius/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_mushroom.png => imparius/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_stem.png => imparius/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_stem_top.png => imparius/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_planks.png => imparius/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{imparius_trapdoor.png => imparius/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{imparius_door.png => imparius/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/baobab_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/blue_enchanted_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/bulbis_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/cherry_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/cypress_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/ebony_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/embur_pedus.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/ether_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/holly_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/imparius_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/jacaranda_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/lament_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/mahogany_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/mangrove_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/maple_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/nightshade_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/palm_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/palo_verde_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/pine_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/rainbow_eucalyptus_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/redwood_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/skyris_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/sythian_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/willow_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/witch_hazel_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/withering_oak_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/blocks/zelkova_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/aspen_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/bulbis_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/cika_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/embur_pedus.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/fir_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/green_enchanted_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/imparius_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/jacaranda_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/lament_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/mahogany_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/mangrove_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/maple_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/palm_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/palo_verde_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/pine_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/rainbow_eucalyptus_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/redwood_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/skyris_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/sythian_stems.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/willow_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/witch_hazel_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/withering_oak_logs.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/zelkova_logs.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index d3937f2c75..4c1c8a1972 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -49,6 +49,7 @@ d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_ e76b9975b21af881fb254fb3b95a03656e34a48c assets/byg/blockstates/bulbis_door.json 05ea3dbc2d1cf74164eccace12632d07284bebfd assets/byg/blockstates/bulbis_fence.json 52f49d50d9a2b1ff65a4ef5579ae87edfe01fa68 assets/byg/blockstates/bulbis_fence_gate.json +34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_hyphae.json aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json 650dfec098bab994309a39150c03ba8bb96103cf assets/byg/blockstates/bulbis_planks.json 93cd0d54e1ed8a0ed2fb7846904e437aa050cf7b assets/byg/blockstates/bulbis_pressure_plate.json @@ -56,7 +57,6 @@ aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.js cd66b534707514f920646728e836d22ba63aba3e assets/byg/blockstates/bulbis_stairs.json f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json 403946f133711ef34624713f7cb037cc9d4bd29a assets/byg/blockstates/bulbis_trapdoor.json -34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_wood.json 2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json 9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_table.json @@ -175,6 +175,20 @@ a6d91c6966dcd3f969e18ea0b9261280e5f42053 assets/byg/blockstates/holly_sapling.js 771a50f13aef7502407cf2700b527d00262600d7 assets/byg/blockstates/holly_stairs.json 9d50a7d25751f6827b7f95531c2d8e6945dc8619 assets/byg/blockstates/holly_trapdoor.json 4f6f2c53fc3e2eabed9d63477e8acb35645fb696 assets/byg/blockstates/holly_wood.json +9cbc47409067352e5896d895c7abce4bcae0ffa8 assets/byg/blockstates/imparius_bookshelf.json +15c7dbe3e482190440242b2f2c76c013556e9605 assets/byg/blockstates/imparius_button.json +66e7425c2020c136138f201825aff3d499721428 assets/byg/blockstates/imparius_crafting_table.json +51c6d9cff656c4a58d495583ca8bcf6c7512fbde assets/byg/blockstates/imparius_door.json +4cab2772b2e557e13e8df7dd485ea5aa78104509 assets/byg/blockstates/imparius_fence.json +b62d39c9e83e6947b28154c3e785c7ed34822233 assets/byg/blockstates/imparius_fence_gate.json +a53e3318418c7549ac4fac5826fff3fc149fc4fe assets/byg/blockstates/imparius_hyphae.json +9cd32a084fec1d5cb33d62ef4b9b80ee22370827 assets/byg/blockstates/imparius_mushroom.json +a4fe9c5cd4d85b0e6510cd4ebd369cd96d94e5bc assets/byg/blockstates/imparius_planks.json +c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressure_plate.json +5ee8423214cb57c829d3a3ae3d4bd35312c293e6 assets/byg/blockstates/imparius_slab.json +bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json +4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json +5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -566,6 +580,37 @@ bd80774ceff6624eb26328d1f05d96de380c3f80 assets/byg/models/block/holly/trapdoor_ ce4c9cd9d585aaf14cde2255d2671494020a4f1b assets/byg/models/block/holly/trapdoor_open.json b035788f20b4673957ae7eae1c48599633bd1e86 assets/byg/models/block/holly/trapdoor_top.json a71ed16290f8fc469f4615ef5d20ec55f914f03e assets/byg/models/block/holly/wood.json +4184d112f3088d08d62ba2585f9dfca3e3675642 assets/byg/models/block/imparius/bookshelf.json +ce2a5f559c484abfa91013401ab59cb034dba233 assets/byg/models/block/imparius/button.json +c6e10204f9c536876aef7350f1d562f19cf58503 assets/byg/models/block/imparius/button_inventory.json +c0ba7861b5e3b573140dc04b9c54607b863536e9 assets/byg/models/block/imparius/button_pressed.json +93be8dc0b0eb174dc56127913757b83cf1fbac85 assets/byg/models/block/imparius/crafting_table.json +d16705aad15aa8157a3c21df1031e37ab4368894 assets/byg/models/block/imparius/door_bottom.json +3b73e7a3bb93de93ef62bb1a97b69f44e7249b81 assets/byg/models/block/imparius/door_bottom_hinge.json +903f9ec305d4914ed78f5bcf1f3009aa3288d0bc assets/byg/models/block/imparius/door_top.json +d24f9f986d561f4cb96dd5ee8fb29f6d3f1c41b3 assets/byg/models/block/imparius/door_top_hinge.json +ec661c277602f19f505a90172a30b1daba553248 assets/byg/models/block/imparius/fence.json +8ae8d6e0e0954175f6cb901222944c9691dfd698 assets/byg/models/block/imparius/fence_gate.json +7afcdf2ea87edde29b73d6baf4cf0a972537171a assets/byg/models/block/imparius/fence_gate_open.json +9026c971359f7f11a9c9958edf642219ac268c06 assets/byg/models/block/imparius/fence_gate_wall.json +a695ee39ab9820e6ff3503fac4b51d120b067503 assets/byg/models/block/imparius/fence_gate_wall_open.json +7f6e9232a729461216af664339818cf1a24461c9 assets/byg/models/block/imparius/fence_inv.json +1a114f7df6c8aec9107555c1b422bf76960a71b0 assets/byg/models/block/imparius/fence_post.json +595a79813160520b9488884d4afc0017abde97af assets/byg/models/block/imparius/grower_item.json +0619139c301ffbdb198989106a9dc6ee627bfc14 assets/byg/models/block/imparius/log.json +40be562f3946b8c589fe888dc49130695bb7df08 assets/byg/models/block/imparius/planks.json +dd857606a752b8aa6e41c50db7d4fb586c68df10 assets/byg/models/block/imparius/pressure_plate.json +1d20c1378d4491976471b0461a9decdaca735247 assets/byg/models/block/imparius/pressure_plate_down.json +76f46acdb37fb5adb52b17346fa6924218347f7b assets/byg/models/block/imparius/slab.json +ff9d3bbe597ebc750b74eb91d259907e02fd6bfc assets/byg/models/block/imparius/slab_top.json +4973077d48e40ccf9bd945c9aa9177d11081ea03 assets/byg/models/block/imparius/stairs.json +ad08407b606c575350be942a8eb273537ea35a20 assets/byg/models/block/imparius/stairs_inner.json +d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs_outer.json +81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/block/imparius/trapdoor.json +33da6501d63e81c2d203619cbc6051c34eb66374 assets/byg/models/block/imparius/trapdoor_bottom.json +ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json +ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json +1f9b271e1f7e94aa33a491ae563799bd9c16b7b2 assets/byg/models/block/imparius/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -613,13 +658,13 @@ a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf 490c0fcfd64530bdd65f2a85319c5c6d756e5f6d assets/byg/models/item/bulbis_crafting_table.json 1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json 8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence.json +1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_hyphae.json 661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json 4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json 9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json 55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json 52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json -1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_wood.json d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json aa216009bf5130342dc1c1043b4c6305d8993657 assets/byg/models/item/cherry_bookshelf.json d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.json @@ -729,6 +774,18 @@ e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.jso f26a75321b0865a70718812f9896b96aac1b5a3a assets/byg/models/item/holly_slab.json c59089c2f12b84d35e1bb31670eab2b343402bc3 assets/byg/models/item/holly_stairs.json aece276ad34ec46ae26292fc9c22ca8f790a9d7b assets/byg/models/item/holly_wood.json +1412cd17546a3734a7502ec2751f09e0552f96d9 assets/byg/models/item/imparius_bookshelf.json +cc3e7859a6d025d865a4a5ed2ebcbbb4bc2a9032 assets/byg/models/item/imparius_button.json +a57f0f8de631a3fd2d4a4ed84f06c062a8145571 assets/byg/models/item/imparius_crafting_table.json +183528a8e2e3311099df714a1526622849650ae3 assets/byg/models/item/imparius_door.json +df3a47f283aa11f3cbb524c2d0efb7464bf66845 assets/byg/models/item/imparius_fence.json +1f65d8c6ad200e87a90f9c4242ea9590e4f35a16 assets/byg/models/item/imparius_hyphae.json +3c2d52bf279e7bb74f599c9bf79f76500368ef5a assets/byg/models/item/imparius_mushroom.json +b154607a7ed1eeac57e787005663d288f4a13d9d assets/byg/models/item/imparius_planks.json +d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressure_plate.json +510283f55fbde7b474a834f9c15980d776122460 assets/byg/models/item/imparius_slab.json +7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json +151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -883,6 +940,18 @@ f1a32e7e0c01275e64bc728f792b179f485f4dd5 data/byg/advancements/recipes/byg.byg/w 6f33d35a03824ffe3bda33c1e7b72e124d8fd2aa data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json 78e889d6619efb1d8e8d1be701e640b2968dee46 data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json df0d7e8f0280269736ac22d62e84b3db7c2e6c39 data/byg/advancements/recipes/byg.byg/wood/holly/wood.json +3ee748d33b86f251c946e125886e4985d61381da data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json +7e48664cdf66d6b1f2c049c350ac29dd7b96ad0e data/byg/advancements/recipes/byg.byg/wood/imparius/button.json +46b67d09a692882cca7e64333ccde583746c8801 data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json +1fa53d9e2e95603aa18c19d521a3a5ac173e9eba data/byg/advancements/recipes/byg.byg/wood/imparius/door.json +8eee91d9377836e4aac7a52368757a1341fc4879 data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json +a36d45d9a4f718aba0a4dd6588d995d0995c24f8 data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json +1d66707ae8a8628874adaedeaefb28d40ceebc9a data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json +39f4a722c4ca867bd464893909002c4be38d8927 data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json +e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json +21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json +f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json +ae49ef7c283fbe64a3b191ec6edf9b54a573b336 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -933,7 +1002,7 @@ f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_p f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json 2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json -5caa3354b5580a44c9394df5f775439b2e186b14 data/byg/recipes/wood/bulbis/wood.json +063cd8ffbe015d85a44841281614c2f72780f91a data/byg/recipes/wood/bulbis/wood.json fcc3ecbb4c7fd0ca85a097eb05af19fb9470f82b data/byg/recipes/wood/cherry/boat.json f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf.json 69a6c51e9be471a4fdf07a0d253b4b3f76026818 data/byg/recipes/wood/cherry/button.json @@ -1037,6 +1106,18 @@ a616a23b829b524d58c5a688d188209189198eb7 data/byg/recipes/wood/holly/fence.json 0621b9364a6d328033e2053fc429244482dfa00f data/byg/recipes/wood/holly/stairs.json 86046c7ccfd2aa099c32b40ed0180fcbe5112b74 data/byg/recipes/wood/holly/trapdoor.json f26dab6058245ffa50a299bef00e25fa2644866f data/byg/recipes/wood/holly/wood.json +a9c1d8af053d39f6eaf0bad7900520cbf829e71e data/byg/recipes/wood/imparius/bookshelf.json +f14e001c77f79df5fc2ba69a2237211512e1a418 data/byg/recipes/wood/imparius/button.json +c193ac4b435da0f1dd58c510e0d89d8a07484e78 data/byg/recipes/wood/imparius/crafting_table.json +590de7ea72c32aaf0054aa4f0d55f924bbebfa44 data/byg/recipes/wood/imparius/door.json +cb6c314ed19538182edc68df0201c75ed9ae2576 data/byg/recipes/wood/imparius/fence.json +fda598130e789b7ae529c1bc27e4bdbe27164238 data/byg/recipes/wood/imparius/fence_gate.json +4e701bf430384fed46f4180d0f4074e5ec4a7265 data/byg/recipes/wood/imparius/planks.json +12e1f28f258a1082813f9dca884af096a9244593 data/byg/recipes/wood/imparius/pressure_plate.json +10860028f3d9b845bb05d85b6d8d7c6e9f3c6419 data/byg/recipes/wood/imparius/slab.json +7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json +67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json +7868a447edb00b506360fadccf7494ef456a775e data/byg/recipes/wood/imparius/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1161,16 +1242,30 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json -289c45b9d1d7c2454275c9e31d84687afce1dd37 data/byg/tags/items/wood/aspen_logs.json -bcdbea8a4817d523a8fa8975d98164bc12532cf3 data/byg/tags/items/wood/baobab_logs.json -6f65a3e60d322faffed59e9f47b03086d41c6358 data/byg/tags/items/wood/blue_enchanted_logs.json -350204f5af4ced581f20c13f034cf6cbb3e557d1 data/byg/tags/items/wood/bulbis_logs.json -3b88dfcc5a9af3f583f02b1eb25d2843cd0641d5 data/byg/tags/items/wood/cherry_logs.json -e629914e0c0a5c9aace6f7c8a410142ec1b2b539 data/byg/tags/items/wood/cika_logs.json -be12ec3d68eee6eb8bbf5dac855a337bc7d1b788 data/byg/tags/items/wood/cypress_logs.json -be75a061b10665d7e7aa7af3ca4f14d21a660c30 data/byg/tags/items/wood/ebony_logs.json -202109b1c66a54bd1cfae7449e7c0ac27c927e83 data/byg/tags/items/wood/ether_logs.json -c1a1d312dd318773b2291d7dc43675175b85e3a3 data/byg/tags/items/wood/fir_logs.json -06c5ce60b03ed3a3d6d5584318fab3aa21dd2a45 data/byg/tags/items/wood/green_enchanted_logs.json -9b70ec5f499ecb1382ef296cd4f8495d5d235566 data/byg/tags/items/wood/holly_logs.json +05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json +fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json +5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/blocks/wood/blue_enchanted_logs.json +30cb6225f90435624555cb4a10c162e47c6fcc77 data/byg/tags/blocks/wood/bulbis_logs.json +92bb19e703dea870b6efd348f6216eb791b07f94 data/byg/tags/blocks/wood/cherry_logs.json +5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/blocks/wood/cika_logs.json +7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/blocks/wood/cypress_logs.json +9b0b2d4870545894723344872062d9317ab188bc data/byg/tags/blocks/wood/ebony_logs.json +80e1953df48855e29d5b55070afdefe2697acade data/byg/tags/blocks/wood/ether_logs.json +b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json +c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json +47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/blocks/wood/holly_logs.json +60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json +7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json +1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json +a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json +97609e80bca8a05d3bb6fb19ce5b43d0fd435069 data/byg/tags/items/wood/bulbis_logs.json +f4980e01bf3950c5b70a5182e932662a5f325afb data/byg/tags/items/wood/cherry_logs.json +068be598420fe871d6b5781c38676dd17f7a0344 data/byg/tags/items/wood/cika_logs.json +29435ee175355151440dccbe35ded08bbcd4bc9c data/byg/tags/items/wood/cypress_logs.json +6a3b0f6dba944ecfc136698dc07826d5493e7507 data/byg/tags/items/wood/ebony_logs.json +f444a358d341fa5f9b75871baf92c032a9a5f0b1 data/byg/tags/items/wood/ether_logs.json +cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json +be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json +664f79bad1ce2f2fcb9938fb32b5feff7501cb53 data/byg/tags/items/wood/holly_logs.json +265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_hyphae.json similarity index 100% rename from Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/bulbis_hyphae.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_bookshelf.json new file mode 100644 index 0000000000..34dc454f74 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json new file mode 100644 index 0000000000..e31b26e1c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/imparius/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/imparius/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/imparius/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/imparius/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/imparius/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/imparius/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/imparius/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/imparius/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/imparius/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_crafting_table.json new file mode 100644 index 0000000000..cf04448cc3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json new file mode 100644 index 0000000000..ee289d1e74 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_fence.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json similarity index 68% rename from Common/src/main/resources/assets/byg/blockstates/imparius_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json index fd53c21878..6e6e95eacc 100644 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json @@ -2,46 +2,46 @@ "multipart": [ { "apply": { - "model": "byg:block/imparius_fence_post" + "model": "byg:block/imparius/fence_post" } }, { - "apply": { - "model": "byg:block/imparius_fence_side", - "uvlock": true - }, "when": { "north": "true" - } - }, - { + }, "apply": { - "model": "byg:block/imparius_fence_side", - "y": 90, + "model": "byg:block/imparius/fence", "uvlock": true - }, - "when": { - "east": "true" } }, { + "when": { + "south": "true" + }, "apply": { - "model": "byg:block/imparius_fence_side", + "model": "byg:block/imparius/fence", "y": 180, "uvlock": true - }, - "when": { - "south": "true" } }, { + "when": { + "west": "true" + }, "apply": { - "model": "byg:block/imparius_fence_side", + "model": "byg:block/imparius/fence", "y": 270, "uvlock": true - }, + } + }, + { "when": { - "west": "true" + "east": "true" + }, + "apply": { + "model": "byg:block/imparius/fence", + "y": 90, + "uvlock": true } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json new file mode 100644 index 0000000000..cfef2c801b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_hyphae.json new file mode 100644 index 0000000000..7d2d69de89 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_hyphae.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/imparius/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/imparius/wood" + }, + "axis=z": { + "model": "byg:block/imparius/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_mushroom.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_mushroom.json new file mode 100644 index 0000000000..a7cab47616 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_mushroom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_planks.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_planks.json new file mode 100644 index 0000000000..0146b58b41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_pressure_plate.json new file mode 100644 index 0000000000..4a3a7ad9d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/imparius/pressure_plate" + }, + "powered=true": { + "model": "byg:block/imparius/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json new file mode 100644 index 0000000000..250a9ce37b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/imparius/slab_top" + }, + "type=bottom": { + "model": "byg:block/imparius/slab" + }, + "type=double": { + "model": "byg:block/imparius/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json new file mode 100644 index 0000000000..191b8b1a84 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_stem.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_stem.json similarity index 51% rename from Common/src/main/resources/assets/byg/blockstates/imparius_stem.json rename to Common/src/generated/resources/assets/byg/blockstates/imparius_stem.json index e2cfadb0ec..84ebb5960f 100644 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_stem.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_stem.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/imparius/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/imparius_stem" + "model": "byg:block/imparius/log" }, "axis=z": { - "model": "byg:block/imparius_stem", + "model": "byg:block/imparius/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/imparius_stem", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json new file mode 100644 index 0000000000..c4fe931ed7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json new file mode 100644 index 0000000000..55b41751a7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/imparius/planks", + "up": "byg:block/imparius/planks", + "north": "byg:block/imparius/bookshelf", + "south": "byg:block/imparius/bookshelf", + "east": "byg:block/imparius/bookshelf", + "west": "byg:block/imparius/bookshelf", + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_button.json b/Common/src/generated/resources/assets/byg/models/block/imparius/button.json similarity index 58% rename from Common/src/main/resources/assets/byg/models/block/imparius_button.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/button.json index 9d4c6b8b3b..ec022fdbe5 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_button.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/imparius/button_inventory.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/imparius_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/button_inventory.json index ed5ae6df35..2574c20d5a 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_button_inventory.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/imparius/button_pressed.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/imparius_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/button_pressed.json index 63a1c9fb2b..6791ebd9f1 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_button_pressed.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json new file mode 100644 index 0000000000..7a0c95aa2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/imparius/planks", + "up": "byg:block/imparius/crafting_table_top", + "north": "byg:block/imparius/crafting_table_front", + "south": "byg:block/imparius/crafting_table_side", + "east": "byg:block/imparius/crafting_table_side", + "west": "byg:block/imparius/crafting_table_front", + "particle": "byg:block/imparius/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json new file mode 100644 index 0000000000..0bbdce3320 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json new file mode 100644 index 0000000000..7feec8d61a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json new file mode 100644 index 0000000000..138a53b439 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json new file mode 100644 index 0000000000..25f5aebea4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json new file mode 100644 index 0000000000..48011976c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/imparius/planks", + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/imparius_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate.json index 1774aae873..a72b90774e 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_open.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_open.json index 1113ece092..6e2dad6c16 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall.json index ea0fc0152d..71e9b43899 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall_open.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall_open.json index ebeb6e155b..7fa4a83373 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_gate_wall_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json new file mode 100644 index 0000000000..3c7544e5a5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/imparius/planks", + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json new file mode 100644 index 0000000000..be6dde5679 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/imparius/planks", + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/imparius/grower_item.json new file mode 100644 index 0000000000..13f89205fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/imparius/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/log.json b/Common/src/generated/resources/assets/byg/models/block/imparius/log.json new file mode 100644 index 0000000000..5b89fabf9a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/imparius/log", + "end": "byg:block/imparius/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json b/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json new file mode 100644 index 0000000000..c9d5eaa257 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/imparius/planks", + "up": "byg:block/imparius/planks", + "north": "byg:block/imparius/planks", + "south": "byg:block/imparius/planks", + "east": "byg:block/imparius/planks", + "west": "byg:block/imparius/planks", + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate.json index e2024893f8..3cd4f5f45f 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate_down.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate_down.json index 49d775bc3d..a80ae57984 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_pressure_plate_down.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "byg:block/imparius_planks" + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json b/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json new file mode 100644 index 0000000000..680190c919 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/imparius/planks", + "bottom": "byg:block/imparius/planks", + "top": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json new file mode 100644 index 0000000000..d5019223b9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/imparius/planks", + "bottom": "byg:block/imparius/planks", + "top": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json new file mode 100644 index 0000000000..4abef9b91b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/imparius/planks", + "bottom": "byg:block/imparius/planks", + "top": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json new file mode 100644 index 0000000000..22aeaa1eb9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/imparius/planks", + "bottom": "byg:block/imparius/planks", + "top": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json new file mode 100644 index 0000000000..6675988ffa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/imparius/planks", + "bottom": "byg:block/imparius/planks", + "top": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json new file mode 100644 index 0000000000..f59baa2077 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_bottom.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_bottom.json index e270d092a0..edca798341 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "byg:block/imparius_trapdoor" + "texture": "byg:block/imparius/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_open.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_open.json index e9bb75a589..3cf0709f5d 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "byg:block/imparius_trapdoor" + "texture": "byg:block/imparius/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_top.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_top.json index 4c161871cf..d5686e32a3 100644 --- a/Common/src/main/resources/assets/byg/models/block/imparius_trapdoor_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "byg:block/imparius_trapdoor" + "texture": "byg:block/imparius/trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/wood.json b/Common/src/generated/resources/assets/byg/models/block/imparius/wood.json new file mode 100644 index 0000000000..939edb76f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/imparius/log", + "particle": "byg:block/imparius/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_hyphae.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json rename to Common/src/generated/resources/assets/byg/models/item/bulbis_hyphae.json diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json new file mode 100644 index 0000000000..a9ca00a6bd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_button.json b/Common/src/generated/resources/assets/byg/models/item/imparius_button.json new file mode 100644 index 0000000000..69988fbbc7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json new file mode 100644 index 0000000000..f703a11eb2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_door.json b/Common/src/generated/resources/assets/byg/models/item/imparius_door.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/item/imparius_door.json rename to Common/src/generated/resources/assets/byg/models/item/imparius_door.json index d52dba0aef..3e039e1b47 100644 --- a/Common/src/main/resources/assets/byg/models/item/imparius_door.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/imparius_door" + "layer0": "byg:item/imparius/door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json new file mode 100644 index 0000000000..e2ccdc724b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json new file mode 100644 index 0000000000..9cfea45809 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_mushroom.json b/Common/src/generated/resources/assets/byg/models/item/imparius_mushroom.json new file mode 100644 index 0000000000..9369196772 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/imparius/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json b/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json new file mode 100644 index 0000000000..a5611a23c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json new file mode 100644 index 0000000000..16fb9a56a9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json b/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json new file mode 100644 index 0000000000..dc07575211 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json b/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json new file mode 100644 index 0000000000..8dcf0d3d09 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json b/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json new file mode 100644 index 0000000000..cffe8d5add --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json new file mode 100644 index 0000000000..bf95fa624c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json new file mode 100644 index 0000000000..748c2c05c4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json new file mode 100644 index 0000000000..3c90f1723c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json new file mode 100644 index 0000000000..b557ad38d4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json new file mode 100644 index 0000000000..b07287fe97 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json new file mode 100644 index 0000000000..7cb4cbdc27 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json new file mode 100644 index 0000000000..7754385e8c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/imparius_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json new file mode 100644 index 0000000000..bf11d9c01e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json new file mode 100644 index 0000000000..4b0037d590 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json new file mode 100644 index 0000000000..860698d99a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json new file mode 100644 index 0000000000..e9aaa1c973 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json new file mode 100644 index 0000000000..3ccd9eafd3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_stem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json index bec7bf4c3f..c38db7d211 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "byg:bulbis_wood", + "item": "byg:bulbis_hyphae", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/imparius_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json similarity index 73% rename from Common/src/main/resources/data/byg/recipes/imparius_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json index c228387d5c..285119a4e1 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/imparius_button.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/imparius_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/button.json diff --git a/Common/src/main/resources/data/byg/recipes/imparius_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json similarity index 75% rename from Common/src/main/resources/data/byg/recipes/imparius_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json index b5116131d2..82da0e87b8 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/imparius_door.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/imparius_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json index 8c816f4ad5..4a9e55780c 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/imparius_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/imparius_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/imparius_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/imparius_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/imparius_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/imparius_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json index 2ca4b83b31..ba3710075e 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:imparius_stems" + "tag": "byg:wood/imparius_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/imparius_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/imparius_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json index 2898ff78b8..c3b1c58a72 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/imparius_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/imparius_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json index 4ba8f398c7..b92a31bfa8 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/imparius_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/imparius_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json index c62c5015f3..874b28a059 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, "result": { - "item": "byg:imparius_stairs", + "item": "byg:imparius_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/imparius_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/imparius_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json index 6b4c645145..2cc7283927 100644 --- a/Common/src/main/resources/data/byg/recipes/imparius_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:imparius_planks" } }, diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json new file mode 100644 index 0000000000..f554d5a63a --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:imparius_stem" + } + }, + "result": { + "item": "byg:imparius_hyphae", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/blocks/aspen_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json index f4cf3ba6f4..77f4029245 100644 --- a/Common/src/main/resources/data/byg/tags/blocks/aspen_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:aspen_log", - "byg:stripped_aspen_log", "byg:aspen_wood", + "byg:stripped_aspen_log", "byg:stripped_aspen_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json similarity index 86% rename from Common/src/main/resources/data/byg/tags/items/baobab_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json index 570d36addc..945a192dd4 100644 --- a/Common/src/main/resources/data/byg/tags/items/baobab_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:baobab_log", - "byg:stripped_baobab_log", "byg:baobab_wood", + "byg:stripped_baobab_log", "byg:stripped_baobab_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json similarity index 88% rename from Common/src/main/resources/data/byg/tags/items/blue_enchanted_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json index 2e988d28fd..694ad5bad2 100644 --- a/Common/src/main/resources/data/byg/tags/items/blue_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:blue_enchanted_log", - "byg:stripped_blue_enchanted_log", "byg:blue_enchanted_wood", + "byg:stripped_blue_enchanted_log", "byg:stripped_blue_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json new file mode 100644 index 0000000000..8f8565035f --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:bulbis_hyphae", + "byg:bulbis_stem", + "byg:stripped_bulbis_hyphae", + "byg:stripped_bulbis_stem" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json similarity index 86% rename from Common/src/main/resources/data/byg/tags/items/cherry_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json index e41f9f78e1..777ae0f22d 100644 --- a/Common/src/main/resources/data/byg/tags/items/cherry_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:cherry_log", - "byg:stripped_cherry_log", "byg:cherry_wood", + "byg:stripped_cherry_log", "byg:stripped_cherry_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/cika_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json similarity index 85% rename from Common/src/main/resources/data/byg/tags/blocks/cika_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json index 12d07e8c20..828a9932e9 100644 --- a/Common/src/main/resources/data/byg/tags/blocks/cika_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:cika_log", - "byg:stripped_cika_log", "byg:cika_wood", + "byg:stripped_cika_log", "byg:stripped_cika_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json similarity index 86% rename from Common/src/main/resources/data/byg/tags/items/cypress_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json index b40c3bdb34..07264a2e36 100644 --- a/Common/src/main/resources/data/byg/tags/items/cypress_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:cypress_log", - "byg:stripped_cypress_log", "byg:cypress_wood", + "byg:stripped_cypress_log", "byg:stripped_cypress_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json similarity index 86% rename from Common/src/main/resources/data/byg/tags/items/ebony_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json index ea9996cafa..7892cf80c4 100644 --- a/Common/src/main/resources/data/byg/tags/items/ebony_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:ebony_log", - "byg:stripped_ebony_log", "byg:ebony_wood", + "byg:stripped_ebony_log", "byg:stripped_ebony_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/ether_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/items/ether_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json index 33f4deb198..7a3e09702d 100644 --- a/Common/src/main/resources/data/byg/tags/items/ether_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:ether_log", - "byg:stripped_ether_log", "byg:ether_wood", + "byg:stripped_ether_log", "byg:stripped_ether_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/fir_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json similarity index 85% rename from Common/src/main/resources/data/byg/tags/blocks/fir_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json index 5fb2fec5fe..a047ac594d 100644 --- a/Common/src/main/resources/data/byg/tags/blocks/fir_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:fir_log", - "byg:stripped_fir_log", "byg:fir_wood", + "byg:stripped_fir_log", "byg:stripped_fir_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json similarity index 89% rename from Common/src/main/resources/data/byg/tags/blocks/green_enchanted_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json index eabc45713c..51c0ddfd61 100644 --- a/Common/src/main/resources/data/byg/tags/blocks/green_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:green_enchanted_log", - "byg:stripped_green_enchanted_log", "byg:green_enchanted_wood", + "byg:stripped_green_enchanted_log", "byg:stripped_green_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/holly_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json similarity index 86% rename from Common/src/main/resources/data/byg/tags/items/holly_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json index e32c639f73..1152c46235 100644 --- a/Common/src/main/resources/data/byg/tags/items/holly_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json @@ -1,8 +1,9 @@ { + "replace": false, "values": [ "byg:holly_log", - "byg:stripped_holly_log", "byg:holly_wood", + "byg:stripped_holly_log", "byg:stripped_holly_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json new file mode 100644 index 0000000000..87dd26fd15 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:imparius_hyphae", + "byg:imparius_stem" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json index da85664bbd..f4cf3ba6f4 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:aspen_log", - "byg:stripped_aspen_log" + "byg:stripped_aspen_log", + "byg:aspen_wood", + "byg:stripped_aspen_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json index ed4b52f23f..8879c428aa 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:baobab_log", - "byg:stripped_baobab_log" + "byg:stripped_baobab_log", + "byg:baobab_wood", + "byg:stripped_baobab_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json index 925a04b42e..b0701df5c1 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:blue_enchanted_log", - "byg:stripped_blue_enchanted_log" + "byg:stripped_blue_enchanted_log", + "byg:blue_enchanted_wood", + "byg:stripped_blue_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json index c47ece67d9..8a94d3b04a 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:bulbis_stem", - "byg:stripped_bulbis_stem" + "byg:stripped_bulbis_stem", + "byg:bulbis_hyphae", + "byg:stripped_bulbis_hyphae" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json index 1d12aee025..7c44d6658e 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:cherry_log", - "byg:stripped_cherry_log" + "byg:stripped_cherry_log", + "byg:cherry_wood", + "byg:stripped_cherry_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json index eed919967f..612eeddba8 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:cika_log", - "byg:stripped_cika_log" + "byg:stripped_cika_log", + "byg:cika_wood", + "byg:stripped_cika_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json index 8eb9b47b40..1eab679012 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:cypress_log", - "byg:stripped_cypress_log" + "byg:stripped_cypress_log", + "byg:cypress_wood", + "byg:stripped_cypress_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json index 5ca12cb47c..d1ba8fb0e0 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:ebony_log", - "byg:stripped_ebony_log" + "byg:stripped_ebony_log", + "byg:ebony_wood", + "byg:stripped_ebony_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json index fed0eeda69..33f4deb198 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:ether_log", - "byg:stripped_ether_log" + "byg:stripped_ether_log", + "byg:ether_wood", + "byg:stripped_ether_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json index 53c58f13f7..ade94a87e3 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:fir_log", - "byg:stripped_fir_log" + "byg:stripped_fir_log", + "byg:fir_wood", + "byg:stripped_fir_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json index 1e8a8b657e..831c74a3d3 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:green_enchanted_log", - "byg:stripped_green_enchanted_log" + "byg:stripped_green_enchanted_log", + "byg:green_enchanted_wood", + "byg:stripped_green_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json index 08f1abc4b5..d1b5db6086 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "byg:holly_log", - "byg:stripped_holly_log" + "byg:stripped_holly_log", + "byg:holly_wood", + "byg:stripped_holly_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json new file mode 100644 index 0000000000..9228a48f45 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:imparius_stem", + "byg:imparius_hyphae" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index c3c70ffad1..3a3ec61328 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -124,7 +124,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.ENDER_LILY.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.CRYPTIC_BRAMBLE.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.IMPARIUS_MUSHROOM.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FUNGAL_IMPARIUS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_VINE.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.IMPARIUS_VINE_PLANT.get(), RenderType.cutoutMipped()); @@ -156,7 +155,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.EMBUR_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.IMPARIUS_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -175,7 +173,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.EMBUR_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.IMPARIUS_TRAPDOOR.get(), RenderType.cutoutMipped()); //Grass map.put(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), RenderType.translucent()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index fbb279f517..7b65ff9302 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -40,7 +40,7 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); - stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGBlocks.IMPARIUS_STEM.get()); + stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.MAHOGANY_WOOD.get(), BYGBlocks.STRIPPED_MAHOGANY_WOOD.get()); @@ -60,7 +60,7 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); stripables.put(BYGBlocks.EMBUR_HYPHAE.get(), BYGBlocks.STRIPPED_EMBUR_HYPHAE.get()); - stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGBlocks.IMPARIUS_HYPHAE.get()); + stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); AxeItemAccess.byg_setStripables(stripables); BYG.LOGGER.info("BYG: Added strippable Blocks..."); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 397543881b..4c74f920e4 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -78,7 +78,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_PLANKS = createPlanks("palm_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); - public static final BlockRegistryObject IMPARIUS_PLANKS = createPlanks("imparius_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAHOGANY_BOOKSHELF = createBookshelf("mahogany_bookshelf"); @@ -96,7 +95,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_BOOKSHELF = createBookshelf("palm_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); - public static final BlockRegistryObject IMPARIUS_BOOKSHELF = createBookshelf("imparius_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAHOGANY_DOOR = createDoor("mahogany_door"); @@ -114,7 +112,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_DOOR = createDoor("palm_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); - public static final BlockRegistryObject IMPARIUS_DOOR = createDoor("imparius_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAHOGANY_PRESSURE_PLATE = createWoodPressurePlate("mahogany_pressure_plate"); @@ -132,7 +129,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_PRESSURE_PLATE = createWoodPressurePlate("palm_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); - public static final BlockRegistryObject IMPARIUS_PRESSURE_PLATE = createWoodPressurePlate("imparius_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAHOGANY_BUTTON = createWoodButton("mahogany_button"); @@ -150,7 +146,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_BUTTON = createWoodButton("palm_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); - public static final BlockRegistryObject IMPARIUS_BUTTON = createWoodButton("imparius_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAHOGANY_TRAPDOOR = createTrapDoor("mahogany_trapdoor"); @@ -168,7 +163,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_TRAPDOOR = createTrapDoor("palm_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); - public static final BlockRegistryObject IMPARIUS_TRAPDOOR = createTrapDoor("imparius_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAHOGANY_CRAFTING_TABLE = createCraftingTable("mahogany_crafting_table"); @@ -186,7 +180,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_CRAFTING_TABLE = createCraftingTable("palm_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); - public static final BlockRegistryObject IMPARIUS_CRAFTING_TABLE = createCraftingTable("imparius_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAHOGANY_FENCE_GATE = createFenceGate("mahogany_fence_gate"); @@ -204,7 +197,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_FENCE_GATE = createFenceGate("palm_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); - public static final BlockRegistryObject IMPARIUS_FENCE_GATE = createFenceGate("imparius_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAHOGANY_SLAB = createWoodSlab("mahogany_slab"); @@ -222,7 +214,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_SLAB = createWoodSlab("palm_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); - public static final BlockRegistryObject IMPARIUS_SLAB = createWoodSlab("imparius_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAHOGANY_STAIRS = createWoodStairs("mahogany_stairs"); @@ -240,7 +231,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_STAIRS = createWoodStairs("palm_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); - public static final BlockRegistryObject IMPARIUS_STAIRS = createWoodStairs("imparius_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAHOGANY_FENCE = createFence("mahogany_fence"); @@ -258,7 +248,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_FENCE = createFence("palm_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); - public static final BlockRegistryObject IMPARIUS_FENCE = createFence("imparius_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_SIGN = createSign("mahogany_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); @@ -276,7 +265,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_SIGN = createSign("palm_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); - public static final BlockRegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAHOGANY_WALL_SIGN = createWallSign("mahogany_wall_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); @@ -294,7 +282,6 @@ public class BYGBlocks { public static final BlockRegistryObject PALM_WALL_SIGN = createWallSign("palm_wall_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); - public static final BlockRegistryObject IMPARIUS_WALL_SIGN = createWallSign("imparius_wall_sign", BYGWoodType.IMPARIUS, IMPARIUS_PLANKS); public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -700,7 +687,6 @@ public class BYGBlocks { public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); - public static final BlockRegistryObject IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "imparius_stem"); public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); @@ -722,7 +708,6 @@ public class BYGBlocks { public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); - public static final BlockRegistryObject IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "imparius_hyphae"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); public static final BlockRegistryObject WHITE_PUFFBALL = createWhitePuffBlock(SoundType.FUNGUS, MaterialColor.TERRACOTTA_WHITE, "white_puffball"); @@ -736,7 +721,6 @@ public class BYGBlocks { public static final BlockRegistryObject PURPLE_BULBIS_ODDITY = createMushroom(BYGBlockTags.GROUND_PURPLE_BULBIS_ODDITY, "purple_bulbis_oddity"); public static final BlockRegistryObject SHULKREN_FUNGUS = createMushroom(BYGBlockTags.GROUND_SHULKREN_FUNGUS, "shulkren_fungus"); - public static final BlockRegistryObject IMPARIUS_MUSHROOM = createMushroom(BYGBlockTags.GROUND_IMPARIUS_MUSHROOM, "imparius_mushroom"); public static final BlockRegistryObject FUNGAL_IMPARIUS = createMushroom(BYGBlockTags.GROUND_FUNGAL_IMPARIUS, "fungal_imparius"); public static final BlockRegistryObject BULBIS_ANOMALY = createTallBulbis("bulbis_anomaly"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 188b67c56a..aca32628c2 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -19,9 +19,11 @@ import java.util.Arrays; import java.util.EnumSet; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collectors; public enum BYGWoodTypes { @@ -74,7 +76,12 @@ public enum BYGWoodTypes { HOLLY("holly", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_HOLLY_SAPLING) .materialColor(MaterialColor.TERRACOTTA_GREEN) - .boatType(BYGBoatEntity.BYGType.HOLLY)); + .boatType(BYGBoatEntity.BYGType.HOLLY)), + IMPARIUS("imparius", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_IMPARIUS_MUSHROOM) + .exclude(BlockType.LEAVES, BlockType.STRIPPED_LOG, BlockType.STRIPPED_WOOD) + .growerItem(GrowerItemType.MUSHROOM) + .stem()); public static final Map LOOKUP; static { @@ -134,6 +141,7 @@ public void init() { case SAPLING -> BYGBlocks.createSapling(builder.growerItemGroundTag, name + "_sapling"); case ODDITY -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_oddity"); case FUNGUS -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_fungus"); + case MUSHROOM -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_mushroom"); }; BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); } @@ -142,13 +150,13 @@ public void init() { BYGItems.createItem(leaves); } - this.log = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_stem") : BYGBlocks.createLog(name + "_log"); + this.log = ifAllowed(BlockType.LOG, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_stem", BlockType.LOG)) : BYGBlocks.createLog(nameOr("%s_log", BlockType.LOG))); BYGItems.createItem(log); - this.wood = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, name + "_wood") : BYGBlocks.createWood(name + "_wood"); + this.wood = ifAllowed(BlockType.WOOD, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_hyphae", BlockType.WOOD)) : BYGBlocks.createWood(nameOr("%s_wood", BlockType.WOOD))); BYGItems.createItem(wood); - this.strippedLog = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_stem") : BYGBlocks.createStrippedLog("stripped_" + name + "_log"); + this.strippedLog = ifAllowed(BlockType.STRIPPED_LOG, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_stem", BlockType.STRIPPED_LOG)) : BYGBlocks.createStrippedLog(nameOr("stripped_%s_log", BlockType.STRIPPED_LOG))); BYGItems.createItem(strippedLog); - this.strippedWood = builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_" + name + "_wood") : BYGBlocks.createWood("stripped_" + name + "_wood"); + this.strippedWood = ifAllowed(BlockType.STRIPPED_WOOD, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_hyphae", BlockType.STRIPPED_WOOD)) : BYGBlocks.createWood(nameOr("stripped_%s_wood", BlockType.STRIPPED_WOOD))); BYGItems.createItem(strippedWood); this.planks = BYGBlocks.createPlanks(name + "_planks"); @@ -187,6 +195,14 @@ public void init() { initialized = true; } + private String nameOr(String defaultName, BlockType blockType) { + return builder.registryName.computeIfAbsent(blockType, k -> defaultName).formatted(name); + } + + private T ifAllowed(BlockType type, Supplier sup) { + return builder.excludes.contains(type) ? null : sup.get(); + } + @Override public String toString() { return name; @@ -285,15 +301,21 @@ public TagKey logTag() { public enum GrowerItemType { SAPLING, ODDITY, - FUNGUS + FUNGUS, + MUSHROOM } public enum BlockType { LEAVES, - SAPLING + SAPLING, + WOOD, + LOG, + STRIPPED_WOOD, + STRIPPED_LOG } public static final class Builder { + private final Map registryName = new HashMap<>(); private GrowerItemType growerItemType = GrowerItemType.SAPLING; private final EnumSet excludes = EnumSet.noneOf(BlockType.class); private TagKey growerItemGroundTag = BlockTags.DIRT; @@ -330,5 +352,9 @@ public Builder stem() { this.isStem = true; return this; } + public Builder registryName(BlockType blockType, String name) { + this.registryName.put(blockType, name); + return this; + } } } diff --git a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java index 91a561ac80..92f42c6a02 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java @@ -9,6 +9,7 @@ import net.minecraft.world.entity.npc.VillagerProfession; import net.minecraft.world.entity.npc.VillagerTrades; import net.minecraft.world.item.Items; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.util.BYGUtil; import potionstudios.byg.util.codec.CodecUtil; @@ -43,7 +44,7 @@ public class BYGVillagerTrades { new VillagerTrades.ItemsForEmeralds(BYGItems.WITCH_HAZEL_BLOSSOM.get(), 10, 1, 10, 2), }, 5, new VillagerTrades.ItemListing[]{ - new VillagerTrades.EmeraldForItems(BYGItems.IMPARIUS_MUSHROOM.get(), 10, 12, 2), + new VillagerTrades.EmeraldForItems(BYGWoodTypes.IMPARIUS.growerItem().asItem(), 10, 12, 2), new VillagerTrades.EmeraldForItems(BYGItems.SHULKREN_FUNGUS.get(), 10, 12, 2), new VillagerTrades.EmeraldForItems(BYGItems.FUNGAL_IMPARIUS.get(), 10, 12, 2), } diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index d990d83a57..b1dd4a2bff 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -275,6 +275,17 @@ public class BYGItems { public static final RegistryObject HOLLY_BERRY_LEAVES; public static final RegistryObject HOLLY_BERRY; + //Imparius Woodtype + public static final RegistryObject IMPARIUS_VINE; + public static final RegistryObject IMPARIUS_MUSHROOM_BRANCH; + public static final RegistryObject IMPARIUS_MUSHROOM_BLOCK; + public static final RegistryObject FUNGAL_IMPARIUS_FILAMENT_BLOCK; + public static final RegistryObject FUNGAL_IMPARIUS_FILAMENT; + public static final RegistryObject FUNGAL_IMPARIUS_BLOCK; + public static final RegistryObject FUNGAL_IMPARIUS; + public static final RegistryObject FUNGAL_IMPARIUS_STEM; + public static final RegistryObject FUNGAL_IMPARIUS_HYPHAE; + static { BYGWoodTypes.ASPEN.init(); @@ -310,33 +321,18 @@ public class BYGItems { HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); BYGWoodTypes.HOLLY.init(); - } - //Imparius Woodtype - public static final RegistryObject IMPARIUS_VINE = createItem(BYGBlocks.IMPARIUS_VINE); - public static final RegistryObject IMPARIUS_MUSHROOM_BRANCH = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BRANCH); - public static final RegistryObject IMPARIUS_MUSHROOM_BLOCK = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK); - public static final RegistryObject IMPARIUS_MUSHROOM = createGrowerItem(BYGBlocks.IMPARIUS_MUSHROOM); - public static final RegistryObject IMPARIUS_STEM = createItem(BYGBlocks.IMPARIUS_STEM); - public static final RegistryObject IMPARIUS_HYPHAE = createItem(BYGBlocks.IMPARIUS_HYPHAE); - public static final RegistryObject FUNGAL_IMPARIUS_FILAMENT_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT_BLOCK); - public static final RegistryObject FUNGAL_IMPARIUS_FILAMENT = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT); - public static final RegistryObject FUNGAL_IMPARIUS_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_BLOCK); - public static final RegistryObject FUNGAL_IMPARIUS = createGrowerItem(BYGBlocks.FUNGAL_IMPARIUS); - public static final RegistryObject FUNGAL_IMPARIUS_STEM = createItem(BYGBlocks.FUNGAL_IMPARIUS_STEM); - public static final RegistryObject FUNGAL_IMPARIUS_HYPHAE = createItem(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE); - public static final RegistryObject IMPARIUS_PLANKS = createItem(BYGBlocks.IMPARIUS_PLANKS); - public static final RegistryObject IMPARIUS_BOOKSHELF = createItem(BYGBlocks.IMPARIUS_BOOKSHELF); - public static final RegistryObject IMPARIUS_CRAFTING_TABLE = createItem(BYGBlocks.IMPARIUS_CRAFTING_TABLE); - public static final RegistryObject IMPARIUS_STAIRS = createItem(BYGBlocks.IMPARIUS_STAIRS); - public static final RegistryObject IMPARIUS_SLAB = createItem(BYGBlocks.IMPARIUS_SLAB); - public static final RegistryObject IMPARIUS_FENCE = createItem(BYGBlocks.IMPARIUS_FENCE); - public static final RegistryObject IMPARIUS_FENCE_GATE = createItem(BYGBlocks.IMPARIUS_FENCE_GATE); - public static final RegistryObject IMPARIUS_DOOR = createItem(BYGBlocks.IMPARIUS_DOOR); - public static final RegistryObject IMPARIUS_TRAPDOOR = createItem(BYGBlocks.IMPARIUS_TRAPDOOR); - public static final RegistryObject IMPARIUS_PRESSURE_PLATE = createItem(BYGBlocks.IMPARIUS_PRESSURE_PLATE); - public static final RegistryObject IMPARIUS_BUTTON = createItem(BYGBlocks.IMPARIUS_BUTTON); - public static final RegistryObject IMPARIUS_SIGN = createSign("imparius_sign", BYGBlocks.IMPARIUS_SIGN, BYGBlocks.IMPARIUS_WALL_SIGN); + IMPARIUS_VINE = createItem(BYGBlocks.IMPARIUS_VINE); + IMPARIUS_MUSHROOM_BRANCH = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BRANCH); + IMPARIUS_MUSHROOM_BLOCK = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK); + FUNGAL_IMPARIUS_FILAMENT_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT_BLOCK); + FUNGAL_IMPARIUS_FILAMENT = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT); + FUNGAL_IMPARIUS_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_BLOCK); + FUNGAL_IMPARIUS = createGrowerItem(BYGBlocks.FUNGAL_IMPARIUS); + FUNGAL_IMPARIUS_STEM = createItem(BYGBlocks.FUNGAL_IMPARIUS_STEM); + FUNGAL_IMPARIUS_HYPHAE = createItem(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE); + BYGWoodTypes.IMPARIUS.init(); + } //Jacaranda Woodtype public static final RegistryObject JACARANDA_BUSH = createItem(BYGBlocks.JACARANDA_BUSH); @@ -1079,7 +1075,7 @@ public class BYGItems { public static final RegistryObject YELLOW_TULIP = createItem(BYGBlocks.YELLOW_TULIP); public static RegistryObject createItem(RegistryObject block) { - return createItem(() -> new BlockItem(block.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), block); + return block == null ? null : createItem(() -> new BlockItem(block.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), block); } public static RegistryObject createSaplingItem(RegistryObject block) { diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java index d0057b29c8..9e2498b70f 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java @@ -54,7 +54,7 @@ public class BYGEndVegetationFeatures { public static final Holder> NIGHTSHADE_SPROUTS = createPatchConfiguredFeature("nightshade_sprouts", BYGBlocks.NIGHTSHADE_SPROUTS.get(), 32); public static final Holder> NIGHTSHADE_ROOTS = createPatchConfiguredFeature("nightshade_roots", BYGBlocks.NIGHTSHADE_ROOTS.get(), 32); public static final Holder> NIGHTSHADE_BERRY_BUSH = createPatchConfiguredFeature("nightshade_berry_bush", BYGBlocks.NIGHTSHADE_BERRY_BUSH.get(), 32); - public static final Holder> IMPARIUS_MUSHROOM = createPatchConfiguredFeature("imparius_mushroom", BYGBlocks.IMPARIUS_MUSHROOM.get(), 32); + public static final Holder> IMPARIUS_MUSHROOM = createPatchConfiguredFeature("imparius_mushroom", BYGWoodTypes.IMPARIUS.growerItem().get(), 32); public static final Holder> FUNGAL_IMPARIUS_PATCH = createPatchConfiguredFeature("fungal_imparius_patch", BYGBlocks.FUNGAL_IMPARIUS.get(), 32); public static final Holder> IMPARIUS_BUSH = createPatchConfiguredFeature("imparius_bush", BYGBlocks.IMPARIUS_BUSH.get(), 32); public static final Holder> SHULKREN_FUNGUS = createPatchConfiguredFeature("shulkren_fungus", BYGBlocks.SHULKREN_FUNGUS.get(), 32); @@ -307,7 +307,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM1 = createConfiguredFeature("imparius_mushroom1", BYGFeatures.IMPARIUS_MUSHROOM1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -317,7 +317,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM2 = createConfiguredFeature("imparius_mushroom2", BYGFeatures.IMPARIUS_MUSHROOM2, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -327,7 +327,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM3 = createConfiguredFeature("imparius_mushroom3", BYGFeatures.IMPARIUS_MUSHROOM3, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -337,7 +337,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM4 = createConfiguredFeature("imparius_mushroom4", BYGFeatures.IMPARIUS_MUSHROOM4, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -347,7 +347,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM5 = createConfiguredFeature("imparius_mushroom5", BYGFeatures.IMPARIUS_MUSHROOM5, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -357,7 +357,7 @@ public class BYGEndVegetationFeatures { public static final Holder> IMPARIUS_MUSHROOM6 = createConfiguredFeature("imparius_mushroom6", BYGFeatures.IMPARIUS_MUSHROOM6, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.IMPARIUS_STEM.get()) + .setStemBlock(BYGWoodTypes.IMPARIUS.log().get()) .setMushroomBlock(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/gen/end/EndLakeFeature.java b/Common/src/main/java/potionstudios/byg/common/world/feature/gen/end/EndLakeFeature.java index 76a7057e33..e96f92fb80 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/gen/end/EndLakeFeature.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/gen/end/EndLakeFeature.java @@ -11,6 +11,7 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Material; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.gen.FeatureGenUtil; import potionstudios.byg.common.world.math.OpenSimplexNoiseEnd; import potionstudios.byg.util.BlockHelper; @@ -210,7 +211,7 @@ private boolean canReplace(BlockState state) { || state.is(MLBlockTags.END_STONES) || state.is(MLBlockTags.ORES) // Handles floating ores || state.is(BYGBlocks.IMPARIUS_BUSH.get()) // Handles other blocks that could be left floating - || state.is(BYGBlocks.IMPARIUS_MUSHROOM.get()) // Handles other blocks that could be left floating + || state.is(BYGWoodTypes.IMPARIUS.growerItem().get()) // Handles other blocks that could be left floating || state.is(BYGBlocks.FUNGAL_IMPARIUS.get()) // Handles other blocks that could be left floating || state.is(BYGBlocks.END_SAND.get()) || state.getMaterial().equals(Material.PLANT) diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/imparius_bookshelf.json deleted file mode 100644 index 6593ce0b0b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_bookshelf.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { "model": "byg:block/imparius_bookshelf" }, - { "model": "byg:block/imparius_bookshelf2" }, - { "model": "byg:block/imparius_bookshelf3" } - ] - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_button.json b/Common/src/main/resources/assets/byg/blockstates/imparius_button.json deleted file mode 100644 index e6329711ba..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/imparius_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/imparius_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/imparius_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/imparius_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/imparius_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/imparius_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/imparius_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/imparius_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/imparius_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/imparius_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/imparius_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/imparius_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/imparius_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/imparius_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/imparius_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/imparius_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/imparius_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/imparius_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/imparius_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/imparius_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/imparius_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/imparius_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/imparius_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/imparius_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/imparius_crafting_table.json deleted file mode 100644 index b61245ca00..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/imparius_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_door.json b/Common/src/main/resources/assets/byg/blockstates/imparius_door.json deleted file mode 100644 index 4d5a38254f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/imparius_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/imparius_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/imparius_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/imparius_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/imparius_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/imparius_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/imparius_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/imparius_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/imparius_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/imparius_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/imparius_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/imparius_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/imparius_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/imparius_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/imparius_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/imparius_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/imparius_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/imparius_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/imparius_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/imparius_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/imparius_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/imparius_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/imparius_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/imparius_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/imparius_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/imparius_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/imparius_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/imparius_fence_gate.json deleted file mode 100644 index a1bb34a8c5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/imparius_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/imparius_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/imparius_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/imparius_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/imparius_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/imparius_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/imparius_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/imparius_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/imparius_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/imparius_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/imparius_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/imparius_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/imparius_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/imparius_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/imparius_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/imparius_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_mushroom.json b/Common/src/main/resources/assets/byg/blockstates/imparius_mushroom.json deleted file mode 100644 index f2ce430691..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_mushroom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/imparius_mushroom" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_planks.json b/Common/src/main/resources/assets/byg/blockstates/imparius_planks.json deleted file mode 100644 index c4496ce4d6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/imparius_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/imparius_pressure_plate.json deleted file mode 100644 index df3b92011b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/imparius_pressure_plate" - }, - "powered=true": { - "model": "byg:block/imparius_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_slab.json b/Common/src/main/resources/assets/byg/blockstates/imparius_slab.json deleted file mode 100644 index 9aa6ce2ef9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/imparius_slab" - }, - "type=double": { - "model": "byg:block/imparius_planks" - }, - "type=top": { - "model": "byg:block/imparius_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_stairs.json b/Common/src/main/resources/assets/byg/blockstates/imparius_stairs.json deleted file mode 100644 index 49dbadc857..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/imparius_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/imparius_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/imparius_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/imparius_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/imparius_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/imparius_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/imparius_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/imparius_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/imparius_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/imparius_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/imparius_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/imparius_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/imparius_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/imparius_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/imparius_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/imparius_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/imparius_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/imparius_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/imparius_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/imparius_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/imparius_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/imparius_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/imparius_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/imparius_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/imparius_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/imparius_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/imparius_trapdoor.json deleted file mode 100644 index 84c4a80317..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/imparius_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/imparius_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/imparius_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/imparius_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/imparius_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/imparius_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/imparius_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/imparius_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/imparius_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/imparius_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/imparius_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/imparius_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/imparius_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/imparius_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/imparius_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/imparius_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/imparius_bookshelf.json deleted file mode 100644 index 8e465252b1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/imparius_planks", - "up": "byg:block/imparius_planks", - "north": "byg:block/imparius_bookshelf", - "east": "byg:block/imparius_bookshelf", - "south": "byg:block/imparius_bookshelf", - "west": "byg:block/imparius_bookshelf", - "particle": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/imparius_crafting_table.json deleted file mode 100644 index c63cae4460..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/imparius_crafting_table_front", - "down": "byg:block/imparius_planks", - "up": "byg:block/imparius_crafting_table_top", - "north": "byg:block/imparius_crafting_table_front", - "east": "byg:block/imparius_crafting_table_side", - "south": "byg:block/imparius_crafting_table_side", - "west": "byg:block/imparius_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom.json deleted file mode 100644 index 19a85d8b24..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/imparius_door_bottom", - "top": "byg:block/imparius_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom_hinge.json deleted file mode 100644 index 9f8ca37141..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/imparius_door_bottom", - "top": "byg:block/imparius_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_door_top.json b/Common/src/main/resources/assets/byg/models/block/imparius_door_top.json deleted file mode 100644 index 37aa2da2ec..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/imparius_door_bottom", - "top": "byg:block/imparius_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/imparius_door_top_hinge.json deleted file mode 100644 index d6495121e9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/imparius_door_bottom", - "top": "byg:block/imparius_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/imparius_fence_inventory.json deleted file mode 100644 index 8a77f61cf7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_fence_post.json b/Common/src/main/resources/assets/byg/models/block/imparius_fence_post.json deleted file mode 100644 index dcc6ef859d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_mushroom.json b/Common/src/main/resources/assets/byg/models/block/imparius_mushroom.json deleted file mode 100644 index 31f490c611..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_mushroom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/imparius_mushroom", - "particle": "byg:block/imparius_mushroom" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_planks.json b/Common/src/main/resources/assets/byg/models/block/imparius_planks.json deleted file mode 100644 index 3f57b93a8e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_slab.json b/Common/src/main/resources/assets/byg/models/block/imparius_slab.json deleted file mode 100644 index eca0c461ee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/imparius_planks", - "top": "byg:block/imparius_planks", - "side": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_slab_top.json b/Common/src/main/resources/assets/byg/models/block/imparius_slab_top.json deleted file mode 100644 index b16e574726..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/imparius_planks", - "top": "byg:block/imparius_planks", - "side": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_stairs.json b/Common/src/main/resources/assets/byg/models/block/imparius_stairs.json deleted file mode 100644 index 9dcab608f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/imparius_planks", - "top": "byg:block/imparius_planks", - "side": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/imparius_stairs_inner.json deleted file mode 100644 index 8739a49c81..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/imparius_planks", - "top": "byg:block/imparius_planks", - "side": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/imparius_stairs_outer.json deleted file mode 100644 index ae521399f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/imparius_planks", - "top": "byg:block/imparius_planks", - "side": "byg:block/imparius_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_fruit.json b/Common/src/main/resources/assets/byg/models/item/baobab_fruit.json index 7f6c182f76..1547990565 100644 --- a/Common/src/main/resources/assets/byg/models/item/baobab_fruit.json +++ b/Common/src/main/resources/assets/byg/models/item/baobab_fruit.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/baobab_fruit" + "layer0": "byg:item/baobab/fruit" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_fruit_block.json b/Common/src/main/resources/assets/byg/models/item/baobab_fruit_block.json index 7f6c182f76..1547990565 100644 --- a/Common/src/main/resources/assets/byg/models/item/baobab_fruit_block.json +++ b/Common/src/main/resources/assets/byg/models/item/baobab_fruit_block.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/baobab_fruit" + "layer0": "byg:item/baobab/fruit" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_anomaly.json b/Common/src/main/resources/assets/byg/models/item/bulbis_anomaly.json index d1959e1784..a86bb4002b 100644 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/models/item/bulbis_anomaly.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/bulbis_anomaly" + "layer0": "byg:item/bulbis/anomaly" } } diff --git a/Common/src/main/resources/assets/byg/models/item/ether_bulbs.json b/Common/src/main/resources/assets/byg/models/item/ether_bulbs.json index ed13e8459e..df1ad5abf9 100644 --- a/Common/src/main/resources/assets/byg/models/item/ether_bulbs.json +++ b/Common/src/main/resources/assets/byg/models/item/ether_bulbs.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/ether_bulbs" + "layer0": "byg:item/ether/bulbs" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_bulbs_block.json b/Common/src/main/resources/assets/byg/models/item/ether_bulbs_block.json index ed13e8459e..df1ad5abf9 100644 --- a/Common/src/main/resources/assets/byg/models/item/ether_bulbs_block.json +++ b/Common/src/main/resources/assets/byg/models/item/ether_bulbs_block.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/ether_bulbs" + "layer0": "byg:item/ether/bulbs" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_berries.json b/Common/src/main/resources/assets/byg/models/item/holly_berries.json index 80f0af2659..54ff50ca76 100644 --- a/Common/src/main/resources/assets/byg/models/item/holly_berries.json +++ b/Common/src/main/resources/assets/byg/models/item/holly_berries.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:item/holly_berries" + "layer0": "byg:item/holly/berries" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/imparius_bookshelf.json deleted file mode 100644 index a87d381cff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/imparius_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_button.json b/Common/src/main/resources/assets/byg/models/item/imparius_button.json deleted file mode 100644 index 6eabb27772..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/imparius_crafting_table.json deleted file mode 100644 index 2424a855f7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/imparius_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_fence.json b/Common/src/main/resources/assets/byg/models/item/imparius_fence.json deleted file mode 100644 index 4c30336306..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/imparius_fence_gate.json deleted file mode 100644 index 440099dc83..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_mushroom.json b/Common/src/main/resources/assets/byg/models/item/imparius_mushroom.json deleted file mode 100644 index 3208c71aa0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/imparius_mushroom" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_planks.json b/Common/src/main/resources/assets/byg/models/item/imparius_planks.json deleted file mode 100644 index 85bb12fd6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/imparius_pressure_plate.json deleted file mode 100644 index 5761ef025c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_slab.json b/Common/src/main/resources/assets/byg/models/item/imparius_slab.json deleted file mode 100644 index 22ffb4b38b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_stairs.json b/Common/src/main/resources/assets/byg/models/item/imparius_stairs.json deleted file mode 100644 index 9f2d794b14..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/imparius_trapdoor.json deleted file mode 100644 index 994d0a1610..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/imparius_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage0.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage0.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage0.png rename to Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage0.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage1.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage1.png rename to Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage2.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage2.png rename to Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage3.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/bulbs_stage3.png rename to Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bush.png b/Common/src/main/resources/assets/byg/textures/block/ether_bush.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/bush.png rename to Common/src/main/resources/assets/byg/textures/block/ether_bush.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/phylium.png b/Common/src/main/resources/assets/byg/textures/block/ether_phylium.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/phylium.png rename to Common/src/main/resources/assets/byg/textures/block/ether_phylium.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/phylium_top.png b/Common/src/main/resources/assets/byg/textures/block/ether_phylium_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/phylium_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether_phylium_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/soil.png b/Common/src/main/resources/assets/byg/textures/block/ether_soil.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/soil.png rename to Common/src/main/resources/assets/byg/textures/block/ether_soil.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/stone.png b/Common/src/main/resources/assets/byg/textures/block/ether_stone.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/stone.png rename to Common/src/main/resources/assets/byg/textures/block/ether_stone.png diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/stone_top.png b/Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/ether/stone_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/imparius/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/imparius/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_door_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_mushroom.png b/Common/src/main/resources/assets/byg/textures/block/imparius/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_mushroom.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_stem.png b/Common/src/main/resources/assets/byg/textures/block/imparius/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_stem.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_stem_top.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_planks.png b/Common/src/main/resources/assets/byg/textures/block/imparius/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_planks.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/imparius/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/imparius_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/imparius/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/imparius_door.png b/Common/src/main/resources/assets/byg/textures/item/imparius/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/imparius_door.png rename to Common/src/main/resources/assets/byg/textures/item/imparius/door.png diff --git a/Common/src/main/resources/data/byg/tags/blocks/baobab_logs.json b/Common/src/main/resources/data/byg/tags/blocks/baobab_logs.json deleted file mode 100644 index 570d36addc..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/baobab_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:baobab_log", - "byg:stripped_baobab_log", - "byg:baobab_wood", - "byg:stripped_baobab_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/blue_enchanted_logs.json b/Common/src/main/resources/data/byg/tags/blocks/blue_enchanted_logs.json deleted file mode 100644 index 2e988d28fd..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/blue_enchanted_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:blue_enchanted_log", - "byg:stripped_blue_enchanted_log", - "byg:blue_enchanted_wood", - "byg:stripped_blue_enchanted_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/bulbis_stems.json b/Common/src/main/resources/data/byg/tags/blocks/bulbis_stems.json deleted file mode 100644 index 5d5515c23d..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/bulbis_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:bulbis_stem", - "byg:stripped_bulbis_stem", - "byg:bulbis_wood", - "byg:stripped_bulbis_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/cherry_logs.json b/Common/src/main/resources/data/byg/tags/blocks/cherry_logs.json deleted file mode 100644 index e41f9f78e1..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/cherry_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:cherry_log", - "byg:stripped_cherry_log", - "byg:cherry_wood", - "byg:stripped_cherry_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/cypress_logs.json b/Common/src/main/resources/data/byg/tags/blocks/cypress_logs.json deleted file mode 100644 index b40c3bdb34..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/cypress_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:cypress_log", - "byg:stripped_cypress_log", - "byg:cypress_wood", - "byg:stripped_cypress_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/ebony_logs.json b/Common/src/main/resources/data/byg/tags/blocks/ebony_logs.json deleted file mode 100644 index ea9996cafa..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/ebony_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:ebony_log", - "byg:stripped_ebony_log", - "byg:ebony_wood", - "byg:stripped_ebony_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/embur_pedus.json b/Common/src/main/resources/data/byg/tags/blocks/embur_pedus.json deleted file mode 100644 index ddc29c759a..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/embur_pedus.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:embur_pedu", - "byg:stripped_embur_pedu", - "byg:embur_hyphae", - "byg:stripped_embur_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/ether_logs.json b/Common/src/main/resources/data/byg/tags/blocks/ether_logs.json deleted file mode 100644 index 33f4deb198..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/ether_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:ether_log", - "byg:stripped_ether_log", - "byg:ether_wood", - "byg:stripped_ether_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/holly_logs.json b/Common/src/main/resources/data/byg/tags/blocks/holly_logs.json deleted file mode 100644 index e32c639f73..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/holly_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:holly_log", - "byg:stripped_holly_log", - "byg:holly_wood", - "byg:stripped_holly_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/imparius_stems.json b/Common/src/main/resources/data/byg/tags/blocks/imparius_stems.json deleted file mode 100644 index bf3924b858..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/imparius_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:imparius_stem", - "byg:imparius_hyphae", - "byg:fungal_imparius_stem", - "byg:fungal_imparius_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/jacaranda_logs.json b/Common/src/main/resources/data/byg/tags/blocks/jacaranda_logs.json deleted file mode 100644 index c1359702fb..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/jacaranda_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:jacaranda_log", - "byg:stripped_jacaranda_log", - "byg:jacaranda_wood", - "byg:stripped_jacaranda_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/lament_logs.json b/Common/src/main/resources/data/byg/tags/blocks/lament_logs.json deleted file mode 100644 index 3ba1cdcc3c..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/lament_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:lament_log", - "byg:stripped_lament_log", - "byg:lament_wood", - "byg:stripped_lament_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/mahogany_logs.json b/Common/src/main/resources/data/byg/tags/blocks/mahogany_logs.json deleted file mode 100644 index 5690451e90..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/mahogany_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:mahogany_log", - "byg:stripped_mahogany_log", - "byg:mahogany_wood", - "byg:stripped_mahogany_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/mangrove_logs.json b/Common/src/main/resources/data/byg/tags/blocks/mangrove_logs.json deleted file mode 100644 index c957ccf2ee..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/mangrove_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:mangrove_log", - "byg:stripped_mangrove_log", - "byg:mangrove_wood", - "byg:stripped_mangrove_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/maple_logs.json b/Common/src/main/resources/data/byg/tags/blocks/maple_logs.json deleted file mode 100644 index 4ae5ddcb8f..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/maple_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:maple_log", - "byg:stripped_maple_log", - "byg:maple_wood", - "byg:stripped_maple_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/nightshade_logs.json b/Common/src/main/resources/data/byg/tags/blocks/nightshade_logs.json deleted file mode 100644 index d5b90f8e91..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/nightshade_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:nightshade_log", - "byg:stripped_nightshade_log", - "byg:nightshade_wood", - "byg:stripped_nightshade_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/palm_logs.json b/Common/src/main/resources/data/byg/tags/blocks/palm_logs.json deleted file mode 100644 index c736a8bda8..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/palm_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:palm_log", - "byg:stripped_palm_log", - "byg:palm_wood", - "byg:stripped_palm_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/palo_verde_logs.json b/Common/src/main/resources/data/byg/tags/blocks/palo_verde_logs.json deleted file mode 100644 index 9d636af2d1..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/palo_verde_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:palo_verde_log", - "byg:stripped_palo_verde_log", - "byg:palo_verde_wood", - "byg:stripped_palo_verde_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/pine_logs.json b/Common/src/main/resources/data/byg/tags/blocks/pine_logs.json deleted file mode 100644 index c20a89ec27..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/pine_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:pine_log", - "byg:stripped_pine_log", - "byg:pine_wood", - "byg:stripped_pine_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/rainbow_eucalyptus_logs.json b/Common/src/main/resources/data/byg/tags/blocks/rainbow_eucalyptus_logs.json deleted file mode 100644 index 80f4aeed39..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/rainbow_eucalyptus_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:rainbow_eucalyptus_log", - "byg:stripped_rainbow_eucalyptus_log", - "byg:rainbow_eucalyptus_wood", - "byg:stripped_rainbow_eucalyptus_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/redwood_logs.json b/Common/src/main/resources/data/byg/tags/blocks/redwood_logs.json deleted file mode 100644 index d751e5a61a..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/redwood_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:redwood_log", - "byg:stripped_redwood_log", - "byg:redwood_wood", - "byg:stripped_redwood_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/skyris_logs.json b/Common/src/main/resources/data/byg/tags/blocks/skyris_logs.json deleted file mode 100644 index 8cbf31a449..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/skyris_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:skyris_log", - "byg:stripped_skyris_log", - "byg:skyris_wood", - "byg:stripped_skyris_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/sythian_stems.json b/Common/src/main/resources/data/byg/tags/blocks/sythian_stems.json deleted file mode 100644 index 2ae61d6aa6..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/sythian_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:sythian_stem", - "byg:stripped_sythian_stem", - "byg:sythian_hyphae", - "byg:stripped_sythian_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/willow_logs.json b/Common/src/main/resources/data/byg/tags/blocks/willow_logs.json deleted file mode 100644 index f80030291e..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/willow_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:willow_log", - "byg:stripped_willow_log", - "byg:willow_wood", - "byg:stripped_willow_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/witch_hazel_logs.json b/Common/src/main/resources/data/byg/tags/blocks/witch_hazel_logs.json deleted file mode 100644 index 5808e9143f..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/witch_hazel_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:witch_hazel_log", - "byg:stripped_witch_hazel_log", - "byg:witch_hazel_wood", - "byg:stripped_witch_hazel_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/withering_oak_logs.json b/Common/src/main/resources/data/byg/tags/blocks/withering_oak_logs.json deleted file mode 100644 index 128286507c..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/withering_oak_logs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:withering_oak_log", - "byg:withering_oak_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/blocks/zelkova_logs.json b/Common/src/main/resources/data/byg/tags/blocks/zelkova_logs.json deleted file mode 100644 index 025485af77..0000000000 --- a/Common/src/main/resources/data/byg/tags/blocks/zelkova_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:zelkova_log", - "byg:stripped_zelkova_log", - "byg:zelkova_wood", - "byg:stripped_zelkova_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/aspen_logs.json b/Common/src/main/resources/data/byg/tags/items/aspen_logs.json deleted file mode 100644 index f4cf3ba6f4..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/aspen_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:aspen_log", - "byg:stripped_aspen_log", - "byg:aspen_wood", - "byg:stripped_aspen_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/bulbis_stems.json b/Common/src/main/resources/data/byg/tags/items/bulbis_stems.json deleted file mode 100644 index 5d5515c23d..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/bulbis_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:bulbis_stem", - "byg:stripped_bulbis_stem", - "byg:bulbis_wood", - "byg:stripped_bulbis_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/cika_logs.json b/Common/src/main/resources/data/byg/tags/items/cika_logs.json deleted file mode 100644 index 12d07e8c20..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/cika_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:cika_log", - "byg:stripped_cika_log", - "byg:cika_wood", - "byg:stripped_cika_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/embur_pedus.json b/Common/src/main/resources/data/byg/tags/items/embur_pedus.json deleted file mode 100644 index ddc29c759a..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/embur_pedus.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:embur_pedu", - "byg:stripped_embur_pedu", - "byg:embur_hyphae", - "byg:stripped_embur_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/fir_logs.json b/Common/src/main/resources/data/byg/tags/items/fir_logs.json deleted file mode 100644 index 5fb2fec5fe..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/fir_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:fir_log", - "byg:stripped_fir_log", - "byg:fir_wood", - "byg:stripped_fir_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/green_enchanted_logs.json b/Common/src/main/resources/data/byg/tags/items/green_enchanted_logs.json deleted file mode 100644 index eabc45713c..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/green_enchanted_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:green_enchanted_log", - "byg:stripped_green_enchanted_log", - "byg:green_enchanted_wood", - "byg:stripped_green_enchanted_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/imparius_stems.json b/Common/src/main/resources/data/byg/tags/items/imparius_stems.json deleted file mode 100644 index bf3924b858..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/imparius_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:imparius_stem", - "byg:imparius_hyphae", - "byg:fungal_imparius_stem", - "byg:fungal_imparius_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/jacaranda_logs.json b/Common/src/main/resources/data/byg/tags/items/jacaranda_logs.json deleted file mode 100644 index c1359702fb..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/jacaranda_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:jacaranda_log", - "byg:stripped_jacaranda_log", - "byg:jacaranda_wood", - "byg:stripped_jacaranda_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/lament_logs.json b/Common/src/main/resources/data/byg/tags/items/lament_logs.json deleted file mode 100644 index 3ba1cdcc3c..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/lament_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:lament_log", - "byg:stripped_lament_log", - "byg:lament_wood", - "byg:stripped_lament_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/mahogany_logs.json b/Common/src/main/resources/data/byg/tags/items/mahogany_logs.json deleted file mode 100644 index 5690451e90..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/mahogany_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:mahogany_log", - "byg:stripped_mahogany_log", - "byg:mahogany_wood", - "byg:stripped_mahogany_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/mangrove_logs.json b/Common/src/main/resources/data/byg/tags/items/mangrove_logs.json deleted file mode 100644 index c957ccf2ee..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/mangrove_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:mangrove_log", - "byg:stripped_mangrove_log", - "byg:mangrove_wood", - "byg:stripped_mangrove_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/maple_logs.json b/Common/src/main/resources/data/byg/tags/items/maple_logs.json deleted file mode 100644 index 4ae5ddcb8f..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/maple_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:maple_log", - "byg:stripped_maple_log", - "byg:maple_wood", - "byg:stripped_maple_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/palm_logs.json b/Common/src/main/resources/data/byg/tags/items/palm_logs.json deleted file mode 100644 index c736a8bda8..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/palm_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:palm_log", - "byg:stripped_palm_log", - "byg:palm_wood", - "byg:stripped_palm_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/palo_verde_logs.json b/Common/src/main/resources/data/byg/tags/items/palo_verde_logs.json deleted file mode 100644 index 9d636af2d1..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/palo_verde_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:palo_verde_log", - "byg:stripped_palo_verde_log", - "byg:palo_verde_wood", - "byg:stripped_palo_verde_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/pine_logs.json b/Common/src/main/resources/data/byg/tags/items/pine_logs.json deleted file mode 100644 index c20a89ec27..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/pine_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:pine_log", - "byg:stripped_pine_log", - "byg:pine_wood", - "byg:stripped_pine_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/rainbow_eucalyptus_logs.json b/Common/src/main/resources/data/byg/tags/items/rainbow_eucalyptus_logs.json deleted file mode 100644 index 80f4aeed39..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/rainbow_eucalyptus_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:rainbow_eucalyptus_log", - "byg:stripped_rainbow_eucalyptus_log", - "byg:rainbow_eucalyptus_wood", - "byg:stripped_rainbow_eucalyptus_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/redwood_logs.json b/Common/src/main/resources/data/byg/tags/items/redwood_logs.json deleted file mode 100644 index d751e5a61a..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/redwood_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:redwood_log", - "byg:stripped_redwood_log", - "byg:redwood_wood", - "byg:stripped_redwood_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/skyris_logs.json b/Common/src/main/resources/data/byg/tags/items/skyris_logs.json deleted file mode 100644 index 8cbf31a449..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/skyris_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:skyris_log", - "byg:stripped_skyris_log", - "byg:skyris_wood", - "byg:stripped_skyris_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/sythian_stems.json b/Common/src/main/resources/data/byg/tags/items/sythian_stems.json deleted file mode 100644 index 2ae61d6aa6..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/sythian_stems.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:sythian_stem", - "byg:stripped_sythian_stem", - "byg:sythian_hyphae", - "byg:stripped_sythian_hyphae" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/willow_logs.json b/Common/src/main/resources/data/byg/tags/items/willow_logs.json deleted file mode 100644 index f80030291e..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/willow_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:willow_log", - "byg:stripped_willow_log", - "byg:willow_wood", - "byg:stripped_willow_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/witch_hazel_logs.json b/Common/src/main/resources/data/byg/tags/items/witch_hazel_logs.json deleted file mode 100644 index 5808e9143f..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/witch_hazel_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:witch_hazel_log", - "byg:stripped_witch_hazel_log", - "byg:witch_hazel_wood", - "byg:stripped_witch_hazel_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/withering_oak_logs.json b/Common/src/main/resources/data/byg/tags/items/withering_oak_logs.json deleted file mode 100644 index 128286507c..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/withering_oak_logs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:withering_oak_log", - "byg:withering_oak_wood" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/zelkova_logs.json b/Common/src/main/resources/data/byg/tags/items/zelkova_logs.json deleted file mode 100644 index 025485af77..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/zelkova_logs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "byg:zelkova_log", - "byg:stripped_zelkova_log", - "byg:zelkova_wood", - "byg:stripped_zelkova_wood" - ] -} \ No newline at end of file diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java index fb4b261d42..2a9e2e4f31 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java @@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; +import potionstudios.byg.common.block.BYGWoodType; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.access.TagBuilderAccess; import potionstudios.byg.mixin.dev.BlockBehaviorAccess; @@ -37,6 +38,7 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.function.Supplier; @@ -103,6 +105,10 @@ protected void addTags() { // .slab(), type.stairs()); // } + for (BYGWoodTypes type : BYGWoodTypes.values()) { + add(tag(TagKey.create(Registry.BLOCK_REGISTRY, BYG.createLocation("wood/" + type + "_logs"))), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); + } + sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); } @@ -120,7 +126,7 @@ private void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries() { @SafeVarargs @SuppressWarnings("ALL") private void tag(TagKey tag, Supplier... blocks) { - this.tag(tag).add(Arrays.stream(blocks).map(Supplier::get).toArray(Block[]::new)); + this.tag(tag).add(Arrays.stream(blocks).filter(Objects::nonNull).map(Supplier::get).toArray(Block[]::new)); } @SafeVarargs diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java index 3bc50a9f92..0fcd1a63eb 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java @@ -13,6 +13,7 @@ import potionstudios.byg.common.block.BYGWoodTypes; import java.util.Arrays; +import java.util.Objects; import java.util.function.Supplier; public class BYGItemTagsProvider extends ItemTagsProvider { @@ -23,13 +24,13 @@ public BYGItemTagsProvider(DataGenerator p_126530_, BlockTagsProvider p_126531_, @Override protected void addTags() { for (BYGWoodTypes type : BYGWoodTypes.values()) { - tag(type.logTag(), type.log(), type.strippedLog()); + tag(type.logTag(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); } } @SafeVarargs @SuppressWarnings("ALL") private void tag(TagKey tag, Supplier... items) { - this.tag(tag).add(Arrays.stream(items).map(Supplier::get).map(ItemLike::asItem).toArray(Item[]::new)); + this.tag(tag).add(Arrays.stream(items).filter(Objects::nonNull).map(Supplier::get).map(ItemLike::asItem).toArray(Item[]::new)); } } From ea9169c88c616b83f23305a5df20b189aa92d39e Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 21:14:03 +0300 Subject: [PATCH 29/90] Move mahogany --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 118 +++++----- .../byg/blockstates/mahogany_bookshelf.json | 7 - .../byg/blockstates/mahogany_button.json | 118 ---------- .../blockstates/mahogany_crafting_table.json | 7 - .../assets/byg/blockstates/mahogany_door.json | 124 ----------- .../byg/blockstates/mahogany_fence.json | 48 ---- .../byg/blockstates/mahogany_fence_gate.json | 80 ------- .../byg/blockstates/mahogany_leaves.json | 7 - .../assets/byg/blockstates/mahogany_log.json | 17 -- .../byg/blockstates/mahogany_planks.json | 7 - .../blockstates/mahogany_pressure_plate.json | 10 - .../byg/blockstates/mahogany_sapling.json | 7 - .../assets/byg/blockstates/mahogany_slab.json | 13 -- .../byg/blockstates/mahogany_stairs.json | 209 ------------------ .../byg/blockstates/mahogany_trapdoor.json | 69 ------ .../assets/byg/blockstates/mahogany_wood.json | 16 -- .../byg/models/block/mahogany_bookshelf.json | 12 - .../byg/models/block/mahogany_button.json | 6 - .../block/mahogany_button_inventory.json | 6 - .../models/block/mahogany_button_pressed.json | 6 - .../models/block/mahogany_crafting_table.json | 12 - .../models/block/mahogany_door_bottom.json | 7 - .../block/mahogany_door_bottom_hinge.json | 7 - .../byg/models/block/mahogany_door_top.json | 7 - .../models/block/mahogany_door_top_hinge.json | 7 - .../byg/models/block/mahogany_fence.json | 7 - .../byg/models/block/mahogany_fence_gate.json | 6 - .../block/mahogany_fence_gate_open.json | 6 - .../block/mahogany_fence_gate_wall.json | 6 - .../block/mahogany_fence_gate_wall_open.json | 6 - .../block/mahogany_fence_inventory.json | 7 - .../byg/models/block/mahogany_fence_post.json | 7 - .../byg/models/block/mahogany_leaves.json | 156 ------------- .../models/block/mahogany_leaves_snowy.json | 158 ------------- .../assets/byg/models/block/mahogany_log.json | 7 - .../byg/models/block/mahogany_planks.json | 7 - .../models/block/mahogany_pressure_plate.json | 6 - .../block/mahogany_pressure_plate_down.json | 6 - .../byg/models/block/mahogany_sapling.json | 7 - .../byg/models/block/mahogany_slab.json | 8 - .../byg/models/block/mahogany_slab_top.json | 8 - .../byg/models/block/mahogany_stairs.json | 8 - .../models/block/mahogany_stairs_inner.json | 8 - .../models/block/mahogany_stairs_outer.json | 8 - .../block/mahogany_trapdoor_bottom.json | 6 - .../models/block/mahogany_trapdoor_open.json | 6 - .../models/block/mahogany_trapdoor_top.json | 6 - .../byg/models/block/mahogany_wood.json | 7 - .../assets/byg/models/item/mahogany_boat.json | 6 - .../byg/models/item/mahogany_bookshelf.json | 22 -- .../byg/models/item/mahogany_button.json | 22 -- .../models/item/mahogany_crafting_table.json | 22 -- .../assets/byg/models/item/mahogany_door.json | 6 - .../byg/models/item/mahogany_fence.json | 3 - .../byg/models/item/mahogany_fence_gate.json | 22 -- .../byg/models/item/mahogany_leaves.json | 22 -- .../assets/byg/models/item/mahogany_log.json | 22 -- .../byg/models/item/mahogany_planks.json | 22 -- .../models/item/mahogany_pressure_plate.json | 22 -- .../byg/models/item/mahogany_sapling.json | 6 - .../assets/byg/models/item/mahogany_slab.json | 22 -- .../byg/models/item/mahogany_stairs.json | 22 -- .../byg/models/item/mahogany_trapdoor.json | 22 -- .../assets/byg/models/item/mahogany_wood.json | 22 -- .../bookshelf.png} | Bin .../leaves.png} | Bin .../{mahogany_log.png => mahogany/log.png} | Bin .../planks.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../{mahogany_boat.png => mahogany/boat.png} | Bin .../{mahogany_door.png => mahogany/door.png} | Bin .../data/byg/recipes/mahogany_boat.json | 16 -- .../data/byg/recipes/mahogany_bookshelf.json | 19 -- .../data/byg/recipes/mahogany_button.json | 12 - .../byg/recipes/mahogany_crafting_table.json | 15 -- .../data/byg/recipes/mahogany_door.json | 18 -- .../data/byg/recipes/mahogany_fence.json | 20 -- .../data/byg/recipes/mahogany_fence_gate.json | 19 -- .../data/byg/recipes/mahogany_planks.json | 13 -- .../byg/recipes/mahogany_pressure_plate.json | 15 -- .../data/byg/recipes/mahogany_slab.json | 16 -- .../data/byg/recipes/mahogany_stairs.json | 18 -- .../data/byg/recipes/mahogany_trapdoor.json | 17 -- .../data/byg/recipes/mahogany_wood.json | 16 -- 88 files changed, 55 insertions(+), 1854 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mahogany_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_wood.json rename Common/src/main/resources/assets/byg/textures/block/{mahogany_bookshelf.png => mahogany/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_leaves.png => mahogany/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_log.png => mahogany/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_planks.png => mahogany/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_sapling.png => mahogany/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_trapdoor.png => mahogany/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mahogany_boat.png => mahogany/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mahogany_door.png => mahogany/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mahogany_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 4c74f920e4..38af5c9051 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -63,7 +63,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); - public static final BlockRegistryObject MAHOGANY_PLANKS = createPlanks("mahogany_planks"); public static final BlockRegistryObject MANGROVE_PLANKS = createPlanks("mangrove_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject PINE_PLANKS = createPlanks("pine_planks"); @@ -80,7 +79,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); - public static final BlockRegistryObject MAHOGANY_BOOKSHELF = createBookshelf("mahogany_bookshelf"); public static final BlockRegistryObject MANGROVE_BOOKSHELF = createBookshelf("mangrove_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject PINE_BOOKSHELF = createBookshelf("pine_bookshelf"); @@ -97,7 +95,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); - public static final BlockRegistryObject MAHOGANY_DOOR = createDoor("mahogany_door"); public static final BlockRegistryObject MANGROVE_DOOR = createDoor("mangrove_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject PINE_DOOR = createDoor("pine_door"); @@ -114,7 +111,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); - public static final BlockRegistryObject MAHOGANY_PRESSURE_PLATE = createWoodPressurePlate("mahogany_pressure_plate"); public static final BlockRegistryObject MANGROVE_PRESSURE_PLATE = createWoodPressurePlate("mangrove_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject PINE_PRESSURE_PLATE = createWoodPressurePlate("pine_pressure_plate"); @@ -131,7 +127,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); - public static final BlockRegistryObject MAHOGANY_BUTTON = createWoodButton("mahogany_button"); public static final BlockRegistryObject MANGROVE_BUTTON = createWoodButton("mangrove_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject PINE_BUTTON = createWoodButton("pine_button"); @@ -148,7 +143,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); - public static final BlockRegistryObject MAHOGANY_TRAPDOOR = createTrapDoor("mahogany_trapdoor"); public static final BlockRegistryObject MANGROVE_TRAPDOOR = createTrapDoor("mangrove_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject PINE_TRAPDOOR = createTrapDoor("pine_trapdoor"); @@ -165,7 +159,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); - public static final BlockRegistryObject MAHOGANY_CRAFTING_TABLE = createCraftingTable("mahogany_crafting_table"); public static final BlockRegistryObject MANGROVE_CRAFTING_TABLE = createCraftingTable("mangrove_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject PINE_CRAFTING_TABLE = createCraftingTable("pine_crafting_table"); @@ -182,7 +175,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); - public static final BlockRegistryObject MAHOGANY_FENCE_GATE = createFenceGate("mahogany_fence_gate"); public static final BlockRegistryObject MANGROVE_FENCE_GATE = createFenceGate("mangrove_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject PINE_FENCE_GATE = createFenceGate("pine_fence_gate"); @@ -199,7 +191,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); - public static final BlockRegistryObject MAHOGANY_SLAB = createWoodSlab("mahogany_slab"); public static final BlockRegistryObject MANGROVE_SLAB = createWoodSlab("mangrove_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject PINE_SLAB = createWoodSlab("pine_slab"); @@ -216,7 +207,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); - public static final BlockRegistryObject MAHOGANY_STAIRS = createWoodStairs("mahogany_stairs"); public static final BlockRegistryObject MANGROVE_STAIRS = createWoodStairs("mangrove_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject PINE_STAIRS = createWoodStairs("pine_stairs"); @@ -233,7 +223,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); - public static final BlockRegistryObject MAHOGANY_FENCE = createFence("mahogany_fence"); public static final BlockRegistryObject MANGROVE_FENCE = createFence("mangrove_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject PINE_FENCE = createFence("pine_fence"); @@ -250,7 +239,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MAHOGANY_SIGN = createSign("mahogany_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); public static final BlockRegistryObject MANGROVE_SIGN = createSign("mangrove_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject PINE_SIGN = createSign("pine_sign", BYGWoodType.PINE, PINE_PLANKS); @@ -267,7 +255,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MAHOGANY_WALL_SIGN = createWallSign("mahogany_wall_sign", BYGWoodType.MAHOGANY, MAHOGANY_PLANKS); public static final BlockRegistryObject MANGROVE_WALL_SIGN = createWallSign("mangrove_wall_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject PINE_WALL_SIGN = createWallSign("pine_wall_sign", BYGWoodType.PINE, PINE_PLANKS); @@ -304,7 +291,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_JACARANDA_SAPLING, "jacaranda_sapling"); public static final BlockRegistryObject INDIGO_JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_INDIGO_JACARANDA_SAPLING, "indigo_jacaranda_sapling"); public static final BlockRegistryObject JOSHUA_SAPLING = createSapling(BYGBlockTags.GROUND_JOSHUA_SAPLING, "joshua_sapling"); - public static final BlockRegistryObject MAHOGANY_SAPLING = createSapling(BYGBlockTags.GROUND_MAHOGANY_SAPLING, "mahogany_sapling"); public static final BlockRegistryObject MANGROVE_SAPLING = createSapling(BYGBlockTags.GROUND_MANGROVE_SAPLING, "mangrove_sapling"); public static final BlockRegistryObject MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_MAPLE_SAPLING, "maple_sapling"); public static final BlockRegistryObject ORANGE_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_BIRCH_SAPLING, "orange_birch_sapling"); @@ -355,7 +341,6 @@ public class BYGBlocks { public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "flowering_indigo_jacaranda_leaves"); public static final BlockRegistryObject JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "joshua_leaves"); public static final BlockRegistryObject RIPE_JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ripe_joshua_leaves"); - public static final BlockRegistryObject MAHOGANY_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "mahogany_leaves"); public static final BlockRegistryObject MANGROVE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "mangrove_leaves"); public static final BlockRegistryObject MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "maple_leaves"); public static final BlockRegistryObject ORANGE_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_birch_leaves"); @@ -669,7 +654,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); - public static final BlockRegistryObject MAHOGANY_LOG = createLog("mahogany_log"); public static final BlockRegistryObject MANGROVE_LOG = createLog("mangrove_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); @@ -691,7 +675,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); - public static final BlockRegistryObject MAHOGANY_WOOD = createWood("mahogany_wood"); public static final BlockRegistryObject MANGROVE_WOOD = createWood("mangrove_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); @@ -836,7 +819,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); - public static final BlockRegistryObject STRIPPED_MAHOGANY_LOG = createStrippedLog("stripped_mahogany_log"); public static final BlockRegistryObject STRIPPED_MANGROVE_LOG = createStrippedLog("stripped_mangrove_log"); public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); @@ -854,7 +836,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); - public static final BlockRegistryObject STRIPPED_MAHOGANY_WOOD = createWood("stripped_mahogany_wood"); public static final BlockRegistryObject STRIPPED_MANGROVE_WOOD = createWood("stripped_mangrove_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 685c303658..aac0d75ed0 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,7 +10,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); - public static final WoodType MAHOGANY = register("mahogany"); public static final WoodType MANGROVE = register("mangrove"); public static final WoodType MAPLE = register("maple"); public static final WoodType PINE = register("pine"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index aca32628c2..2d4d167abe 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -81,7 +81,11 @@ public enum BYGWoodTypes { .growerItemGroundTag(BYGBlockTags.GROUND_IMPARIUS_MUSHROOM) .exclude(BlockType.LEAVES, BlockType.STRIPPED_LOG, BlockType.STRIPPED_WOOD) .growerItem(GrowerItemType.MUSHROOM) - .stem()); + .stem()), + MAHOGANY("mahogany", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) + .boatType(BYGBoatEntity.BYGType.MAHOGANY) + .materialColor(MaterialColor.COLOR_GREEN)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index b1dd4a2bff..6c9c980460 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -286,54 +286,6 @@ public class BYGItems { public static final RegistryObject FUNGAL_IMPARIUS_STEM; public static final RegistryObject FUNGAL_IMPARIUS_HYPHAE; - static { - BYGWoodTypes.ASPEN.init(); - - BAOBAB_FRUIT = createItem(() -> new BaobabFruitItem(BYGBlocks.BAOBAB_FRUIT_BLOCK.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(3).saturationMod(0.5f).alwaysEat().build())), "baobab_fruit"); - BYGWoodTypes.BAOBAB.init(); - - BYGWoodTypes.BLUE_ENCHANTED.init(); - - PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); - PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); - PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); - BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); - BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); - BYGWoodTypes.BULBIS.init(); - - PINK_CHERRY_SAPLING = createSaplingItem(BYGBlocks.PINK_CHERRY_SAPLING); - PINK_CHERRY_FOLIAGE = createItem(BYGBlocks.PINK_CHERRY_FOLIAGE); - PINK_CHERRY_LEAVES = createItem(BYGBlocks.PINK_CHERRY_LEAVES); - WHITE_CHERRY_SAPLING = createSaplingItem(BYGBlocks.WHITE_CHERRY_SAPLING); - WHITE_CHERRY_FOLIAGE = createItem(BYGBlocks.WHITE_CHERRY_FOLIAGE); - WHITE_CHERRY_LEAVES = createItem(BYGBlocks.WHITE_CHERRY_LEAVES); - BYGWoodTypes.CHERRY.init(); - - BYGWoodTypes.CIKA.init(); - BYGWoodTypes.CYPRESS.init(); - BYGWoodTypes.EBONY.init(); - - ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); - BYGWoodTypes.ETHER.init(); - BYGWoodTypes.FIR.init(); - BYGWoodTypes.GREEN_ENCHANTED.init(); - - HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); - HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); - BYGWoodTypes.HOLLY.init(); - - IMPARIUS_VINE = createItem(BYGBlocks.IMPARIUS_VINE); - IMPARIUS_MUSHROOM_BRANCH = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BRANCH); - IMPARIUS_MUSHROOM_BLOCK = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK); - FUNGAL_IMPARIUS_FILAMENT_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT_BLOCK); - FUNGAL_IMPARIUS_FILAMENT = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT); - FUNGAL_IMPARIUS_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_BLOCK); - FUNGAL_IMPARIUS = createGrowerItem(BYGBlocks.FUNGAL_IMPARIUS); - FUNGAL_IMPARIUS_STEM = createItem(BYGBlocks.FUNGAL_IMPARIUS_STEM); - FUNGAL_IMPARIUS_HYPHAE = createItem(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE); - BYGWoodTypes.IMPARIUS.init(); - } - //Jacaranda Woodtype public static final RegistryObject JACARANDA_BUSH = createItem(BYGBlocks.JACARANDA_BUSH); public static final RegistryObject FLOWERING_JACARANDA_BUSH = createItem(BYGBlocks.FLOWERING_JACARANDA_BUSH); @@ -385,26 +337,56 @@ public class BYGItems { public static final RegistryObject LAMENT_BUTTON = createItem(BYGBlocks.LAMENT_BUTTON); public static final RegistryObject LAMENT_SIGN = createSign("lament_sign", BYGBlocks.LAMENT_SIGN, BYGBlocks.LAMENT_WALL_SIGN); - //Mahogany Woodtype - public static final RegistryObject MAHOGANY_SAPLING = createSaplingItem(BYGBlocks.MAHOGANY_SAPLING); - public static final RegistryObject MAHOGANY_LEAVES = createItem(BYGBlocks.MAHOGANY_LEAVES); - public static final RegistryObject MAHOGANY_LOG = createItem(BYGBlocks.MAHOGANY_LOG); - public static final RegistryObject MAHOGANY_WOOD = createItem(BYGBlocks.MAHOGANY_WOOD); - public static final RegistryObject STRIPPED_MAHOGANY_LOG = createItem(BYGBlocks.STRIPPED_MAHOGANY_LOG); - public static final RegistryObject STRIPPED_MAHOGANY_WOOD = createItem(BYGBlocks.STRIPPED_MAHOGANY_WOOD); - public static final RegistryObject MAHOGANY_PLANKS = createItem(BYGBlocks.MAHOGANY_PLANKS); - public static final RegistryObject MAHOGANY_BOOKSHELF = createItem(BYGBlocks.MAHOGANY_BOOKSHELF); - public static final RegistryObject MAHOGANY_CRAFTING_TABLE = createItem(BYGBlocks.MAHOGANY_CRAFTING_TABLE); - public static final RegistryObject MAHOGANY_STAIRS = createItem(BYGBlocks.MAHOGANY_STAIRS); - public static final RegistryObject MAHOGANY_SLAB = createItem(BYGBlocks.MAHOGANY_SLAB); - public static final RegistryObject MAHOGANY_FENCE = createItem(BYGBlocks.MAHOGANY_FENCE); - public static final RegistryObject MAHOGANY_FENCE_GATE = createItem(BYGBlocks.MAHOGANY_FENCE_GATE); - public static final RegistryObject MAHOGANY_DOOR = createItem(BYGBlocks.MAHOGANY_DOOR); - public static final RegistryObject MAHOGANY_TRAPDOOR = createItem(BYGBlocks.MAHOGANY_TRAPDOOR); - public static final RegistryObject MAHOGANY_PRESSURE_PLATE = createItem(BYGBlocks.MAHOGANY_PRESSURE_PLATE); - public static final RegistryObject MAHOGANY_BUTTON = createItem(BYGBlocks.MAHOGANY_BUTTON); - public static final RegistryObject MAHOGANY_SIGN = createSign("mahogany_sign", BYGBlocks.MAHOGANY_SIGN, BYGBlocks.MAHOGANY_WALL_SIGN); - public static final RegistryObject MAHOGANY_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MAHOGANY, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "mahogany_boat"); + static { + BYGWoodTypes.ASPEN.init(); + + BAOBAB_FRUIT = createItem(() -> new BaobabFruitItem(BYGBlocks.BAOBAB_FRUIT_BLOCK.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(3).saturationMod(0.5f).alwaysEat().build())), "baobab_fruit"); + BYGWoodTypes.BAOBAB.init(); + + BYGWoodTypes.BLUE_ENCHANTED.init(); + + PURPLE_BULBIS_ODDITY = createGrowerItem(BYGBlocks.PURPLE_BULBIS_ODDITY); + PURPLE_BULBIS_ANOMALY = createItem(BYGBlocks.PURPLE_BULBIS_ANOMALY); + PURPLE_BULBIS_SHELL = createItem(BYGBlocks.PURPLE_BULBIS_SHELL); + BULBIS_ANOMALY = createItem(BYGBlocks.BULBIS_ANOMALY); + BULBIS_SHELL = createItem(BYGBlocks.BULBIS_SHELL); + BYGWoodTypes.BULBIS.init(); + + PINK_CHERRY_SAPLING = createSaplingItem(BYGBlocks.PINK_CHERRY_SAPLING); + PINK_CHERRY_FOLIAGE = createItem(BYGBlocks.PINK_CHERRY_FOLIAGE); + PINK_CHERRY_LEAVES = createItem(BYGBlocks.PINK_CHERRY_LEAVES); + WHITE_CHERRY_SAPLING = createSaplingItem(BYGBlocks.WHITE_CHERRY_SAPLING); + WHITE_CHERRY_FOLIAGE = createItem(BYGBlocks.WHITE_CHERRY_FOLIAGE); + WHITE_CHERRY_LEAVES = createItem(BYGBlocks.WHITE_CHERRY_LEAVES); + BYGWoodTypes.CHERRY.init(); + + BYGWoodTypes.CIKA.init(); + BYGWoodTypes.CYPRESS.init(); + BYGWoodTypes.EBONY.init(); + + ETHER_BULBS = createItem(() -> new BlockItem(BYGBlocks.ETHER_BULB.get(), new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().saturationMod(5.0f).effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1.0F).alwaysEat().build())), "ether_bulbs"); + BYGWoodTypes.ETHER.init(); + BYGWoodTypes.FIR.init(); + BYGWoodTypes.GREEN_ENCHANTED.init(); + + HOLLY_BERRY_LEAVES = createItem(BYGBlocks.HOLLY_BERRY_LEAVES); + HOLLY_BERRY = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(2).saturationMod(0.1f).effect(new MobEffectInstance(MobEffects.POISON, 200, 0), 1.0F).build())), "holly_berries"); + BYGWoodTypes.HOLLY.init(); + + IMPARIUS_VINE = createItem(BYGBlocks.IMPARIUS_VINE); + IMPARIUS_MUSHROOM_BRANCH = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BRANCH); + IMPARIUS_MUSHROOM_BLOCK = createItem(BYGBlocks.IMPARIUS_MUSHROOM_BLOCK); + FUNGAL_IMPARIUS_FILAMENT_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT_BLOCK); + FUNGAL_IMPARIUS_FILAMENT = createItem(BYGBlocks.FUNGAL_IMPARIUS_FILAMENT); + FUNGAL_IMPARIUS_BLOCK = createItem(BYGBlocks.FUNGAL_IMPARIUS_BLOCK); + FUNGAL_IMPARIUS = createGrowerItem(BYGBlocks.FUNGAL_IMPARIUS); + FUNGAL_IMPARIUS_STEM = createItem(BYGBlocks.FUNGAL_IMPARIUS_STEM); + FUNGAL_IMPARIUS_HYPHAE = createItem(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE); + BYGWoodTypes.IMPARIUS.init(); + + // TODO Lamient, Jacaranda + BYGWoodTypes.MAHOGANY.init(); + } //Mangrove Woodtype public static final RegistryObject MANGROVE_SAPLING = createSaplingItem(BYGBlocks.MANGROVE_SAPLING); diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_bookshelf.json deleted file mode 100644 index efe6da7de1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_button.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_button.json deleted file mode 100644 index 2d3a5ce4aa..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/mahogany_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/mahogany_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/mahogany_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/mahogany_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/mahogany_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/mahogany_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/mahogany_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/mahogany_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/mahogany_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/mahogany_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/mahogany_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/mahogany_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/mahogany_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/mahogany_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_crafting_table.json deleted file mode 100644 index 3c209faa58..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_door.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_door.json deleted file mode 100644 index 2436bcfb7f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_fence.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_fence.json deleted file mode 100644 index e5f61fdd7b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/mahogany_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/mahogany_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/mahogany_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/mahogany_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/mahogany_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_fence_gate.json deleted file mode 100644 index 9b2345b3ed..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/mahogany_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/mahogany_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/mahogany_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/mahogany_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/mahogany_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/mahogany_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/mahogany_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/mahogany_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/mahogany_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/mahogany_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/mahogany_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/mahogany_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/mahogany_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/mahogany_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/mahogany_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/mahogany_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_leaves.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_leaves.json deleted file mode 100644 index 2013371d02..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_log.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_log.json deleted file mode 100644 index 8756695c58..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/mahogany_log" - }, - "axis=z": { - "model": "byg:block/mahogany_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/mahogany_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_planks.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_planks.json deleted file mode 100644 index 7580ebdda6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_pressure_plate.json deleted file mode 100644 index 9cb1c218d0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/mahogany_pressure_plate" - }, - "powered=true": { - "model": "byg:block/mahogany_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_sapling.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_sapling.json deleted file mode 100644 index 0af43a8974..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_slab.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_slab.json deleted file mode 100644 index a43e728420..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/mahogany_slab" - }, - "type=top": { - "model": "byg:block/mahogany_slab_top" - }, - "type=double": { - "model": "byg:block/mahogany_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_stairs.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_stairs.json deleted file mode 100644 index 36dcb7a379..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/mahogany_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/mahogany_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/mahogany_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/mahogany_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/mahogany_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/mahogany_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/mahogany_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/mahogany_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/mahogany_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_trapdoor.json deleted file mode 100644 index aa3c3c19b1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/mahogany_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/mahogany_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/mahogany_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/mahogany_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/mahogany_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/mahogany_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/mahogany_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/mahogany_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/mahogany_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/mahogany_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_wood.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_wood.json deleted file mode 100644 index ddbc27b90e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/mahogany_wood" - }, - "axis=z": { - "model": "byg:block/mahogany_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/mahogany_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/mahogany_bookshelf.json deleted file mode 100644 index 8a657264b3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/mahogany_planks", - "up": "byg:block/mahogany_planks", - "north": "byg:block/mahogany_bookshelf", - "east": "byg:block/mahogany_bookshelf", - "south": "byg:block/mahogany_bookshelf", - "west": "byg:block/mahogany_bookshelf", - "particle": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_button.json b/Common/src/main/resources/assets/byg/models/block/mahogany_button.json deleted file mode 100644 index 8c463749c8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/mahogany_button_inventory.json deleted file mode 100644 index dd61ebed85..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/mahogany_button_pressed.json deleted file mode 100644 index 1252bb629b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/mahogany_crafting_table.json deleted file mode 100644 index 5d9b7f5aca..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/mahogany_crafting_table_front", - "down": "byg:block/mahogany_planks", - "up": "byg:block/mahogany_crafting_table_top", - "north": "byg:block/mahogany_crafting_table_front", - "east": "byg:block/mahogany_crafting_table_side", - "south": "byg:block/mahogany_crafting_table_side", - "west": "byg:block/mahogany_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom.json deleted file mode 100644 index d4bd98ab63..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/mahogany_door_bottom", - "top": "byg:block/mahogany_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom_hinge.json deleted file mode 100644 index f948e9bef3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/mahogany_door_bottom", - "top": "byg:block/mahogany_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_door_top.json b/Common/src/main/resources/assets/byg/models/block/mahogany_door_top.json deleted file mode 100644 index 05bef72920..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/mahogany_door_bottom", - "top": "byg:block/mahogany_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/mahogany_door_top_hinge.json deleted file mode 100644 index 833efc8e44..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/mahogany_door_bottom", - "top": "byg:block/mahogany_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence.json deleted file mode 100644 index 3a2c7fb3d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/mahogany_planks", - "particle": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate.json deleted file mode 100644 index 366f793c30..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_open.json deleted file mode 100644 index 88212c1f54..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall.json deleted file mode 100644 index a43420b2ae..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall_open.json deleted file mode 100644 index 69480d2b1c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_inventory.json deleted file mode 100644 index c2d593b547..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/mahogany_planks", - "particle": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_post.json b/Common/src/main/resources/assets/byg/models/block/mahogany_fence_post.json deleted file mode 100644 index 25d40872eb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/mahogany_planks", - "particle": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_leaves.json b/Common/src/main/resources/assets/byg/models/block/mahogany_leaves.json deleted file mode 100644 index 217ac4c895..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_leaves.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/mahogany_leaves", - "bottom": "byg:block/mahogany_leaves", - "top": "byg:block/mahogany_leaves", - "side": "byg:block/mahogany_leaves", - "overlay": "byg:block/mahogany_leaves_overlay" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#top", - "cullface": "up", - "tintindex": 1 - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "east" - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "down" - } - } - } - ] -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/mahogany_leaves_snowy.json deleted file mode 100644 index 3e302079fa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_leaves_snowy.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/mahogany_leaves_snowy", - "bottom": "byg:block/mahogany_leaves_snowy", - "top": "byg:block/mahogany_leaves_snowy", - "side": "byg:block/mahogany_leaves_snowy_side", - "overlay": "byg:block/mahogany_leaves_snowy_side_overlay", - "overlay2": "byg:block/mahogany_leaves_snowy_side_overlay" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#bottom", - "cullface": "down", - "tintindex": 1 - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#top", - "cullface": "up", - "tintindex": 1 - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "east" - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "down" - } - } - } - ] -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_log.json b/Common/src/main/resources/assets/byg/models/block/mahogany_log.json deleted file mode 100644 index a614813755..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/mahogany_log_top", - "side": "byg:block/mahogany_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_planks.json b/Common/src/main/resources/assets/byg/models/block/mahogany_planks.json deleted file mode 100644 index f845aa8acd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/mahogany_planks", - "particle": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate.json deleted file mode 100644 index 0344d9ba8d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate_down.json deleted file mode 100644 index 6d0de1217c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_sapling.json b/Common/src/main/resources/assets/byg/models/block/mahogany_sapling.json deleted file mode 100644 index c354af46de..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/mahogany_sapling", - "particle": "byg:block/mahogany_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_slab.json b/Common/src/main/resources/assets/byg/models/block/mahogany_slab.json deleted file mode 100644 index 24e624c8d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/mahogany_planks", - "top": "byg:block/mahogany_planks", - "side": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_slab_top.json b/Common/src/main/resources/assets/byg/models/block/mahogany_slab_top.json deleted file mode 100644 index 174bd4875d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/mahogany_planks", - "top": "byg:block/mahogany_planks", - "side": "byg:block/mahogany_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs.json b/Common/src/main/resources/assets/byg/models/block/mahogany_stairs.json deleted file mode 100644 index 761d27c1d2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/mahogany_planks", - "top": "byg:block/mahogany_planks", - "side": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_inner.json deleted file mode 100644 index e3741b0713..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/mahogany_planks", - "top": "byg:block/mahogany_planks", - "side": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_outer.json deleted file mode 100644 index 74a00019ad..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/mahogany_planks", - "top": "byg:block/mahogany_planks", - "side": "byg:block/mahogany_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_bottom.json deleted file mode 100644 index 17c1be2571..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/mahogany_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_open.json deleted file mode 100644 index 2e46f50e41..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/mahogany_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_top.json deleted file mode 100644 index 441801a7dd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/mahogany_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mahogany_wood.json b/Common/src/main/resources/assets/byg/models/block/mahogany_wood.json deleted file mode 100644 index 3a511cc39d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mahogany_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/mahogany_log", - "particle": "byg:block/mahogany_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_boat.json b/Common/src/main/resources/assets/byg/models/item/mahogany_boat.json deleted file mode 100644 index 3f060f317d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/mahogany_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/mahogany_bookshelf.json deleted file mode 100644 index 00cde9fc6f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_button.json b/Common/src/main/resources/assets/byg/models/item/mahogany_button.json deleted file mode 100644 index 5b2fc6ea28..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/mahogany_crafting_table.json deleted file mode 100644 index 3bd27489ad..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_door.json b/Common/src/main/resources/assets/byg/models/item/mahogany_door.json deleted file mode 100644 index 660bdeb418..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/mahogany_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_fence.json b/Common/src/main/resources/assets/byg/models/item/mahogany_fence.json deleted file mode 100644 index facf9dbcef..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/mahogany_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/mahogany_fence_gate.json deleted file mode 100644 index f00e1880f3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_leaves.json b/Common/src/main/resources/assets/byg/models/item/mahogany_leaves.json deleted file mode 100644 index a870b4fcfc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_log.json b/Common/src/main/resources/assets/byg/models/item/mahogany_log.json deleted file mode 100644 index 3532f138fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_planks.json b/Common/src/main/resources/assets/byg/models/item/mahogany_planks.json deleted file mode 100644 index ba0ed09c86..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/mahogany_pressure_plate.json deleted file mode 100644 index 9e1af57a12..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_sapling.json b/Common/src/main/resources/assets/byg/models/item/mahogany_sapling.json deleted file mode 100644 index 5e162dbd3d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/mahogany_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_slab.json b/Common/src/main/resources/assets/byg/models/item/mahogany_slab.json deleted file mode 100644 index 3ea55a082e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_stairs.json b/Common/src/main/resources/assets/byg/models/item/mahogany_stairs.json deleted file mode 100644 index b3ef011bc3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/mahogany_trapdoor.json deleted file mode 100644 index 902ba6acc6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_wood.json b/Common/src/main/resources/assets/byg/models/item/mahogany_wood.json deleted file mode 100644 index 8081261ee7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mahogany_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_leaves.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_log.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_log.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_planks.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_planks.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_sapling.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mahogany_boat.png b/Common/src/main/resources/assets/byg/textures/item/mahogany/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mahogany_boat.png rename to Common/src/main/resources/assets/byg/textures/item/mahogany/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mahogany_door.png b/Common/src/main/resources/assets/byg/textures/item/mahogany/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mahogany_door.png rename to Common/src/main/resources/assets/byg/textures/item/mahogany/door.png diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_boat.json b/Common/src/main/resources/data/byg/recipes/mahogany_boat.json deleted file mode 100644 index 6c201e7e27..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_bookshelf.json b/Common/src/main/resources/data/byg/recipes/mahogany_bookshelf.json deleted file mode 100644 index f18c78c170..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:mahogany_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_button.json b/Common/src/main/resources/data/byg/recipes/mahogany_button.json deleted file mode 100644 index 058b8b6055..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:mahogany_planks" - } - ], - "result": { - "item": "byg:mahogany_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_crafting_table.json b/Common/src/main/resources/data/byg/recipes/mahogany_crafting_table.json deleted file mode 100644 index cba2abc45d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_door.json b/Common/src/main/resources/data/byg/recipes/mahogany_door.json deleted file mode 100644 index 0fa67324e6..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_fence.json b/Common/src/main/resources/data/byg/recipes/mahogany_fence.json deleted file mode 100644 index 2c801829ba..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_fence_gate.json b/Common/src/main/resources/data/byg/recipes/mahogany_fence_gate.json deleted file mode 100644 index 5e2b118710..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_planks.json b/Common/src/main/resources/data/byg/recipes/mahogany_planks.json deleted file mode 100644 index c1ef746ecd..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:mahogany_logs" - } - ], - "result": { - "item": "byg:mahogany_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/mahogany_pressure_plate.json deleted file mode 100644 index 8ac1203a96..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_slab.json b/Common/src/main/resources/data/byg/recipes/mahogany_slab.json deleted file mode 100644 index c78953c510..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_stairs.json b/Common/src/main/resources/data/byg/recipes/mahogany_stairs.json deleted file mode 100644 index 0d7ea95434..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_trapdoor.json b/Common/src/main/resources/data/byg/recipes/mahogany_trapdoor.json deleted file mode 100644 index cbdf9528a7..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:mahogany_planks" - } - }, - "result": { - "item": "byg:mahogany_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_wood.json b/Common/src/main/resources/data/byg/recipes/mahogany_wood.json deleted file mode 100644 index 9b5f4565ec..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mahogany_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mahogany_log" - } - }, - "result": { - "item": "byg:mahogany_wood", - "count": 3 - } -} \ No newline at end of file From 20de7a9b1730b17bcbafc0545da77e502b7fc2fd Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 21:16:23 +0300 Subject: [PATCH 30/90] Move mangrove --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 3 - .../byg/common/block/BYGWoodTypes.java | 4 + .../byg/common/item/BYGItems.java | 22 +- .../byg/blockstates/mangrove_bookshelf.json | 7 - .../byg/blockstates/mangrove_button.json | 118 ---------- .../blockstates/mangrove_crafting_table.json | 7 - .../assets/byg/blockstates/mangrove_door.json | 124 ----------- .../byg/blockstates/mangrove_fence.json | 48 ---- .../byg/blockstates/mangrove_fence_gate.json | 80 ------- .../byg/blockstates/mangrove_leaves.json | 7 - .../assets/byg/blockstates/mangrove_log.json | 17 -- .../byg/blockstates/mangrove_planks.json | 7 - .../blockstates/mangrove_pressure_plate.json | 10 - .../byg/blockstates/mangrove_sapling.json | 7 - .../assets/byg/blockstates/mangrove_slab.json | 13 -- .../byg/blockstates/mangrove_stairs.json | 209 ------------------ .../byg/blockstates/mangrove_trapdoor.json | 69 ------ .../assets/byg/blockstates/mangrove_wood.json | 16 -- .../byg/models/block/mangrove_bookshelf.json | 12 - .../byg/models/block/mangrove_button.json | 6 - .../block/mangrove_button_inventory.json | 6 - .../models/block/mangrove_button_pressed.json | 6 - .../models/block/mangrove_crafting_table.json | 12 - .../models/block/mangrove_door_bottom.json | 7 - .../block/mangrove_door_bottom_hinge.json | 7 - .../byg/models/block/mangrove_door_top.json | 7 - .../models/block/mangrove_door_top_hinge.json | 7 - .../byg/models/block/mangrove_fence.json | 7 - .../byg/models/block/mangrove_fence_gate.json | 6 - .../block/mangrove_fence_gate_open.json | 6 - .../block/mangrove_fence_gate_wall.json | 6 - .../block/mangrove_fence_gate_wall_open.json | 6 - .../block/mangrove_fence_inventory.json | 7 - .../byg/models/block/mangrove_fence_post.json | 7 - .../byg/models/block/mangrove_leaves.json | 7 - .../models/block/mangrove_leaves_snowy.json | 12 - .../assets/byg/models/block/mangrove_log.json | 7 - .../byg/models/block/mangrove_planks.json | 7 - .../models/block/mangrove_pressure_plate.json | 6 - .../block/mangrove_pressure_plate_down.json | 6 - .../byg/models/block/mangrove_sapling.json | 7 - .../byg/models/block/mangrove_slab.json | 8 - .../byg/models/block/mangrove_slab_top.json | 8 - .../byg/models/block/mangrove_stairs.json | 8 - .../models/block/mangrove_stairs_inner.json | 8 - .../models/block/mangrove_stairs_outer.json | 8 - .../block/mangrove_trapdoor_bottom.json | 6 - .../models/block/mangrove_trapdoor_open.json | 6 - .../models/block/mangrove_trapdoor_top.json | 6 - .../byg/models/block/mangrove_wood.json | 7 - .../assets/byg/models/item/mangrove_boat.json | 6 - .../byg/models/item/mangrove_bookshelf.json | 22 -- .../byg/models/item/mangrove_button.json | 22 -- .../models/item/mangrove_crafting_table.json | 22 -- .../assets/byg/models/item/mangrove_door.json | 6 - .../byg/models/item/mangrove_fence.json | 3 - .../byg/models/item/mangrove_fence_gate.json | 22 -- .../byg/models/item/mangrove_leaves.json | 22 -- .../assets/byg/models/item/mangrove_log.json | 22 -- .../byg/models/item/mangrove_planks.json | 22 -- .../models/item/mangrove_pressure_plate.json | 22 -- .../byg/models/item/mangrove_sapling.json | 6 - .../assets/byg/models/item/mangrove_slab.json | 22 -- .../byg/models/item/mangrove_stairs.json | 22 -- .../byg/models/item/mangrove_trapdoor.json | 22 -- .../assets/byg/models/item/mangrove_wood.json | 22 -- .../bookshelf.png} | Bin .../leaves.png} | Bin .../{mangrove_log.png => mangrove/log.png} | Bin .../planks.png} | Bin .../sapling.png} | Bin .../trapdoor.png} | Bin .../{mangrove_boat.png => mangrove/boat.png} | Bin .../{mangrove_door.png => mangrove/door.png} | Bin .../data/byg/recipes/mangrove_boat.json | 16 -- .../data/byg/recipes/mangrove_bookshelf.json | 19 -- .../data/byg/recipes/mangrove_button.json | 12 - .../byg/recipes/mangrove_crafting_table.json | 15 -- .../data/byg/recipes/mangrove_door.json | 18 -- .../data/byg/recipes/mangrove_fence.json | 20 -- .../data/byg/recipes/mangrove_fence_gate.json | 19 -- .../data/byg/recipes/mangrove_planks.json | 13 -- .../byg/recipes/mangrove_pressure_plate.json | 15 -- .../data/byg/recipes/mangrove_slab.json | 16 -- .../data/byg/recipes/mangrove_stairs.json | 18 -- .../data/byg/recipes/mangrove_trapdoor.json | 17 -- .../data/byg/recipes/mangrove_wood.json | 16 -- 88 files changed, 5 insertions(+), 1513 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/mangrove_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_wood.json rename Common/src/main/resources/assets/byg/textures/block/{mangrove_bookshelf.png => mangrove/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_leaves.png => mangrove/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_log.png => mangrove/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_planks.png => mangrove/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_sapling.png => mangrove/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_trapdoor.png => mangrove/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mangrove_boat.png => mangrove/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mangrove_door.png => mangrove/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/mangrove_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 38af5c9051..0827575249 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -63,7 +63,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); - public static final BlockRegistryObject MANGROVE_PLANKS = createPlanks("mangrove_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject PINE_PLANKS = createPlanks("pine_planks"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PLANKS = createPlanks("rainbow_eucalyptus_planks"); @@ -79,7 +78,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); - public static final BlockRegistryObject MANGROVE_BOOKSHELF = createBookshelf("mangrove_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject PINE_BOOKSHELF = createBookshelf("pine_bookshelf"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BOOKSHELF = createBookshelf("rainbow_eucalyptus_bookshelf"); @@ -95,7 +93,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); - public static final BlockRegistryObject MANGROVE_DOOR = createDoor("mangrove_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject PINE_DOOR = createDoor("pine_door"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_DOOR = createDoor("rainbow_eucalyptus_door"); @@ -111,7 +108,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); - public static final BlockRegistryObject MANGROVE_PRESSURE_PLATE = createWoodPressurePlate("mangrove_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject PINE_PRESSURE_PLATE = createWoodPressurePlate("pine_pressure_plate"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PRESSURE_PLATE = createWoodPressurePlate("rainbow_eucalyptus_pressure_plate"); @@ -127,7 +123,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); - public static final BlockRegistryObject MANGROVE_BUTTON = createWoodButton("mangrove_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject PINE_BUTTON = createWoodButton("pine_button"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BUTTON = createWoodButton("rainbow_eucalyptus_button"); @@ -143,7 +138,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); - public static final BlockRegistryObject MANGROVE_TRAPDOOR = createTrapDoor("mangrove_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject PINE_TRAPDOOR = createTrapDoor("pine_trapdoor"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_TRAPDOOR = createTrapDoor("rainbow_eucalyptus_trapdoor"); @@ -159,7 +153,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); - public static final BlockRegistryObject MANGROVE_CRAFTING_TABLE = createCraftingTable("mangrove_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject PINE_CRAFTING_TABLE = createCraftingTable("pine_crafting_table"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_CRAFTING_TABLE = createCraftingTable("rainbow_eucalyptus_crafting_table"); @@ -175,7 +168,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); - public static final BlockRegistryObject MANGROVE_FENCE_GATE = createFenceGate("mangrove_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject PINE_FENCE_GATE = createFenceGate("pine_fence_gate"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE_GATE = createFenceGate("rainbow_eucalyptus_fence_gate"); @@ -191,7 +183,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); - public static final BlockRegistryObject MANGROVE_SLAB = createWoodSlab("mangrove_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject PINE_SLAB = createWoodSlab("pine_slab"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SLAB = createWoodSlab("rainbow_eucalyptus_slab"); @@ -207,7 +198,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); - public static final BlockRegistryObject MANGROVE_STAIRS = createWoodStairs("mangrove_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject PINE_STAIRS = createWoodStairs("pine_stairs"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_STAIRS = createWoodStairs("rainbow_eucalyptus_stairs"); @@ -223,7 +213,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); - public static final BlockRegistryObject MANGROVE_FENCE = createFence("mangrove_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject PINE_FENCE = createFence("pine_fence"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE = createFence("rainbow_eucalyptus_fence"); @@ -239,7 +228,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MANGROVE_SIGN = createSign("mangrove_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject PINE_SIGN = createSign("pine_sign", BYGWoodType.PINE, PINE_PLANKS); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SIGN = createSign("rainbow_eucalyptus_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); @@ -255,7 +243,6 @@ public class BYGBlocks { public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MANGROVE_WALL_SIGN = createWallSign("mangrove_wall_sign", BYGWoodType.MANGROVE, MANGROVE_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject PINE_WALL_SIGN = createWallSign("pine_wall_sign", BYGWoodType.PINE, PINE_PLANKS); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_WALL_SIGN = createWallSign("rainbow_eucalyptus_wall_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); @@ -291,7 +278,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_JACARANDA_SAPLING, "jacaranda_sapling"); public static final BlockRegistryObject INDIGO_JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_INDIGO_JACARANDA_SAPLING, "indigo_jacaranda_sapling"); public static final BlockRegistryObject JOSHUA_SAPLING = createSapling(BYGBlockTags.GROUND_JOSHUA_SAPLING, "joshua_sapling"); - public static final BlockRegistryObject MANGROVE_SAPLING = createSapling(BYGBlockTags.GROUND_MANGROVE_SAPLING, "mangrove_sapling"); public static final BlockRegistryObject MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_MAPLE_SAPLING, "maple_sapling"); public static final BlockRegistryObject ORANGE_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_BIRCH_SAPLING, "orange_birch_sapling"); public static final BlockRegistryObject ORANGE_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_OAK_SAPLING, "orange_oak_sapling"); @@ -341,7 +327,6 @@ public class BYGBlocks { public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "flowering_indigo_jacaranda_leaves"); public static final BlockRegistryObject JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "joshua_leaves"); public static final BlockRegistryObject RIPE_JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ripe_joshua_leaves"); - public static final BlockRegistryObject MANGROVE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "mangrove_leaves"); public static final BlockRegistryObject MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "maple_leaves"); public static final BlockRegistryObject ORANGE_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_birch_leaves"); public static final BlockRegistryObject ORANGE_OAK_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_oak_leaves"); @@ -654,7 +639,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); - public static final BlockRegistryObject MANGROVE_LOG = createLog("mangrove_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject PINE_LOG = createLog("pine_log"); @@ -675,7 +659,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); - public static final BlockRegistryObject MANGROVE_WOOD = createWood("mangrove_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject PINE_WOOD = createWood("pine_wood"); @@ -819,7 +802,6 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); - public static final BlockRegistryObject STRIPPED_MANGROVE_LOG = createStrippedLog("stripped_mangrove_log"); public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_PINE_LOG = createStrippedLog("stripped_pine_log"); @@ -836,7 +818,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); - public static final BlockRegistryObject STRIPPED_MANGROVE_WOOD = createWood("stripped_mangrove_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_PINE_WOOD = createWood("stripped_pine_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index aac0d75ed0..a959475e68 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -10,7 +10,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); - public static final WoodType MANGROVE = register("mangrove"); public static final WoodType MAPLE = register("maple"); public static final WoodType PINE = register("pine"); public static final WoodType RAINBOW_EUCALYPTUS = register("rainbow_eucalyptus"); @@ -24,8 +23,6 @@ public class BYGWoodType { public static final WoodType PALM = register("palm"); public static final WoodType LAMENT = register("lament"); public static final WoodType NIGHTSHADE = register("nightshade"); - public static final WoodType ETHER = register("ether"); - public static final WoodType IMPARIUS = register("imparius"); private static WoodType register(String id) { return BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(id).toString().replace(":", "/"))) : null; diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 2d4d167abe..85ccf272d5 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -85,6 +85,10 @@ public enum BYGWoodTypes { MAHOGANY("mahogany", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MAHOGANY) + .materialColor(MaterialColor.COLOR_GREEN)), + MAGROVE("mangrove", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) + .boatType(BYGBoatEntity.BYGType.MANGROVE) .materialColor(MaterialColor.COLOR_GREEN)); public static final Map LOOKUP; diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 6c9c980460..76816fd100 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -386,29 +386,9 @@ public class BYGItems { // TODO Lamient, Jacaranda BYGWoodTypes.MAHOGANY.init(); + BYGWoodTypes.MAGROVE.init(); } - //Mangrove Woodtype - public static final RegistryObject MANGROVE_SAPLING = createSaplingItem(BYGBlocks.MANGROVE_SAPLING); - public static final RegistryObject MANGROVE_LEAVES = createItem(BYGBlocks.MANGROVE_LEAVES); - public static final RegistryObject MANGROVE_LOG = createItem(BYGBlocks.MANGROVE_LOG); - public static final RegistryObject MANGROVE_WOOD = createItem(BYGBlocks.MANGROVE_WOOD); - public static final RegistryObject STRIPPED_MANGROVE_LOG = createItem(BYGBlocks.STRIPPED_MANGROVE_LOG); - public static final RegistryObject STRIPPED_MANGROVE_WOOD = createItem(BYGBlocks.STRIPPED_MANGROVE_WOOD); - public static final RegistryObject MANGROVE_PLANKS = createItem(BYGBlocks.MANGROVE_PLANKS); - public static final RegistryObject MANGROVE_BOOKSHELF = createItem(BYGBlocks.MANGROVE_BOOKSHELF); - public static final RegistryObject MANGROVE_CRAFTING_TABLE = createItem(BYGBlocks.MANGROVE_CRAFTING_TABLE); - public static final RegistryObject MANGROVE_STAIRS = createItem(BYGBlocks.MANGROVE_STAIRS); - public static final RegistryObject MANGROVE_SLAB = createItem(BYGBlocks.MANGROVE_SLAB); - public static final RegistryObject MANGROVE_FENCE = createItem(BYGBlocks.MANGROVE_FENCE); - public static final RegistryObject MANGROVE_FENCE_GATE = createItem(BYGBlocks.MANGROVE_FENCE_GATE); - public static final RegistryObject MANGROVE_DOOR = createItem(BYGBlocks.MANGROVE_DOOR); - public static final RegistryObject MANGROVE_TRAPDOOR = createItem(BYGBlocks.MANGROVE_TRAPDOOR); - public static final RegistryObject MANGROVE_PRESSURE_PLATE = createItem(BYGBlocks.MANGROVE_PRESSURE_PLATE); - public static final RegistryObject MANGROVE_BUTTON = createItem(BYGBlocks.MANGROVE_BUTTON); - public static final RegistryObject MANGROVE_SIGN = createSign("mangrove_sign", BYGBlocks.MANGROVE_SIGN, BYGBlocks.MANGROVE_WALL_SIGN); - public static final RegistryObject MANGROVE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MANGROVE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "mangrove_boat"); - //Maple Woodtype public static final RegistryObject MAPLE_SAPLING = createSaplingItem(BYGBlocks.MAPLE_SAPLING); public static final RegistryObject MAPLE_LEAVES = createItem(BYGBlocks.MAPLE_LEAVES); diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_bookshelf.json deleted file mode 100644 index 77a7d15ed9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_button.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_button.json deleted file mode 100644 index 07d1bc17c3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/mangrove_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/mangrove_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/mangrove_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/mangrove_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/mangrove_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/mangrove_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/mangrove_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/mangrove_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/mangrove_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/mangrove_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/mangrove_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/mangrove_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/mangrove_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/mangrove_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_crafting_table.json deleted file mode 100644 index 9fb4e18e8b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_door.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_door.json deleted file mode 100644 index 6329fba6b7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_fence.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_fence.json deleted file mode 100644 index 2dc57c2d3e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/mangrove_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/mangrove_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/mangrove_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/mangrove_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/mangrove_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_fence_gate.json deleted file mode 100644 index 25a6303160..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/mangrove_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/mangrove_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/mangrove_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/mangrove_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/mangrove_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/mangrove_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/mangrove_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/mangrove_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/mangrove_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/mangrove_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/mangrove_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/mangrove_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/mangrove_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/mangrove_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/mangrove_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/mangrove_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_leaves.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_leaves.json deleted file mode 100644 index be60b40c09..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_log.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_log.json deleted file mode 100644 index ecf75f06fc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/mangrove_log" - }, - "axis=z": { - "model": "byg:block/mangrove_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/mangrove_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_planks.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_planks.json deleted file mode 100644 index 0a4fe8875f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_pressure_plate.json deleted file mode 100644 index 2b9c672bc4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/mangrove_pressure_plate" - }, - "powered=true": { - "model": "byg:block/mangrove_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_sapling.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_sapling.json deleted file mode 100644 index f07ec58e80..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_slab.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_slab.json deleted file mode 100644 index fe3eaee098..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/mangrove_slab" - }, - "type=top": { - "model": "byg:block/mangrove_slab_top" - }, - "type=double": { - "model": "byg:block/mangrove_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_stairs.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_stairs.json deleted file mode 100644 index 014422a03e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/mangrove_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/mangrove_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/mangrove_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/mangrove_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/mangrove_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/mangrove_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/mangrove_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/mangrove_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/mangrove_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_trapdoor.json deleted file mode 100644 index eb6347ff7d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/mangrove_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/mangrove_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/mangrove_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/mangrove_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/mangrove_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/mangrove_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/mangrove_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/mangrove_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/mangrove_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/mangrove_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_wood.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_wood.json deleted file mode 100644 index e1b4a04718..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/mangrove_wood" - }, - "axis=z": { - "model": "byg:block/mangrove_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/mangrove_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/mangrove_bookshelf.json deleted file mode 100644 index a75e5b0602..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/mangrove_planks", - "up": "byg:block/mangrove_planks", - "north": "byg:block/mangrove_bookshelf", - "east": "byg:block/mangrove_bookshelf", - "south": "byg:block/mangrove_bookshelf", - "west": "byg:block/mangrove_bookshelf", - "particle": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_button.json b/Common/src/main/resources/assets/byg/models/block/mangrove_button.json deleted file mode 100644 index 76e2631fd7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/mangrove_button_inventory.json deleted file mode 100644 index 9ce02ac4b4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/mangrove_button_pressed.json deleted file mode 100644 index d763a5f194..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/mangrove_crafting_table.json deleted file mode 100644 index 7041883440..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/mangrove_crafting_table_front", - "down": "byg:block/mangrove_planks", - "up": "byg:block/mangrove_crafting_table_top", - "north": "byg:block/mangrove_crafting_table_front", - "east": "byg:block/mangrove_crafting_table_side", - "south": "byg:block/mangrove_crafting_table_side", - "west": "byg:block/mangrove_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom.json deleted file mode 100644 index 3f610b9cf6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/mangrove_door_bottom", - "top": "byg:block/mangrove_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom_hinge.json deleted file mode 100644 index 9bdd066b48..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/mangrove_door_bottom", - "top": "byg:block/mangrove_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_door_top.json b/Common/src/main/resources/assets/byg/models/block/mangrove_door_top.json deleted file mode 100644 index 35c45f2e8b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/mangrove_door_bottom", - "top": "byg:block/mangrove_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/mangrove_door_top_hinge.json deleted file mode 100644 index 378b84d3d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/mangrove_door_bottom", - "top": "byg:block/mangrove_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence.json deleted file mode 100644 index cd9385ed37..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/mangrove_planks", - "particle": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate.json deleted file mode 100644 index 186fcbd5b7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_open.json deleted file mode 100644 index 3e37ba4b85..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall.json deleted file mode 100644 index c026d91df1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall_open.json deleted file mode 100644 index 046e72dde1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_inventory.json deleted file mode 100644 index b51c36e571..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/mangrove_planks", - "particle": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_post.json b/Common/src/main/resources/assets/byg/models/block/mangrove_fence_post.json deleted file mode 100644 index 6e8b4ac82d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/mangrove_planks", - "particle": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_leaves.json b/Common/src/main/resources/assets/byg/models/block/mangrove_leaves.json deleted file mode 100644 index 770e5edb80..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/mangrove_leaves", - "particle": "byg:block/mangrove_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/mangrove_leaves_snowy.json deleted file mode 100644 index ad013f741f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/mangrove_leaves_snowy", - "up": "byg:block/mangrove_leaves_snowy", - "north": "byg:block/mangrove_leaves_snowy_side", - "east": "byg:block/mangrove_leaves_snowy_side", - "south": "byg:block/mangrove_leaves_snowy_side", - "west": "byg:block/mangrove_leaves_snowy_side", - "particle": "byg:block/mangrove_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_log.json b/Common/src/main/resources/assets/byg/models/block/mangrove_log.json deleted file mode 100644 index 50f408fc83..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/mangrove_log_top", - "side": "byg:block/mangrove_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_planks.json b/Common/src/main/resources/assets/byg/models/block/mangrove_planks.json deleted file mode 100644 index 9a0f4cbc0f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/mangrove_planks", - "particle": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate.json deleted file mode 100644 index 2eb0ddae70..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate_down.json deleted file mode 100644 index 3524127484..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_sapling.json b/Common/src/main/resources/assets/byg/models/block/mangrove_sapling.json deleted file mode 100644 index 1ae63d747e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/mangrove_sapling", - "particle": "byg:block/mangrove_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_slab.json b/Common/src/main/resources/assets/byg/models/block/mangrove_slab.json deleted file mode 100644 index 4a327e597e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/mangrove_planks", - "top": "byg:block/mangrove_planks", - "side": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_slab_top.json b/Common/src/main/resources/assets/byg/models/block/mangrove_slab_top.json deleted file mode 100644 index 22b5a40d06..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/mangrove_planks", - "top": "byg:block/mangrove_planks", - "side": "byg:block/mangrove_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs.json b/Common/src/main/resources/assets/byg/models/block/mangrove_stairs.json deleted file mode 100644 index f7965aa545..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/mangrove_planks", - "top": "byg:block/mangrove_planks", - "side": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_inner.json deleted file mode 100644 index 48dae4df6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/mangrove_planks", - "top": "byg:block/mangrove_planks", - "side": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_outer.json deleted file mode 100644 index 99c74cee37..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/mangrove_planks", - "top": "byg:block/mangrove_planks", - "side": "byg:block/mangrove_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_bottom.json deleted file mode 100644 index 73b0b818d6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/mangrove_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_open.json deleted file mode 100644 index 37ae7d6dab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/mangrove_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_top.json deleted file mode 100644 index d0ec7bf2f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/mangrove_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/mangrove_wood.json b/Common/src/main/resources/assets/byg/models/block/mangrove_wood.json deleted file mode 100644 index 11cf2428b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/mangrove_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/mangrove_log", - "particle": "byg:block/mangrove_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_boat.json b/Common/src/main/resources/assets/byg/models/item/mangrove_boat.json deleted file mode 100644 index e97a0ff256..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/mangrove_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/mangrove_bookshelf.json deleted file mode 100644 index 74f740bbb0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_button.json b/Common/src/main/resources/assets/byg/models/item/mangrove_button.json deleted file mode 100644 index 127d8c6d8a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/mangrove_crafting_table.json deleted file mode 100644 index 4fe35189c3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_door.json b/Common/src/main/resources/assets/byg/models/item/mangrove_door.json deleted file mode 100644 index bea5fc697c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/mangrove_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_fence.json b/Common/src/main/resources/assets/byg/models/item/mangrove_fence.json deleted file mode 100644 index 95839342c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/mangrove_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/mangrove_fence_gate.json deleted file mode 100644 index 481e8d5582..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_leaves.json b/Common/src/main/resources/assets/byg/models/item/mangrove_leaves.json deleted file mode 100644 index ecad69fb93..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_log.json b/Common/src/main/resources/assets/byg/models/item/mangrove_log.json deleted file mode 100644 index 16026aef56..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_planks.json b/Common/src/main/resources/assets/byg/models/item/mangrove_planks.json deleted file mode 100644 index a902e32a26..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/mangrove_pressure_plate.json deleted file mode 100644 index cba04cd711..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_sapling.json b/Common/src/main/resources/assets/byg/models/item/mangrove_sapling.json deleted file mode 100644 index 62c5bbd9a7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/mangrove_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_slab.json b/Common/src/main/resources/assets/byg/models/item/mangrove_slab.json deleted file mode 100644 index b74e9512c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_stairs.json b/Common/src/main/resources/assets/byg/models/item/mangrove_stairs.json deleted file mode 100644 index 7df4c727fe..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/mangrove_trapdoor.json deleted file mode 100644 index db736def42..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_wood.json b/Common/src/main/resources/assets/byg/models/item/mangrove_wood.json deleted file mode 100644 index 6a04892b1d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/mangrove_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_leaves.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_log.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_log.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_planks.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_planks.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_sapling.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mangrove_boat.png b/Common/src/main/resources/assets/byg/textures/item/mangrove/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mangrove_boat.png rename to Common/src/main/resources/assets/byg/textures/item/mangrove/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mangrove_door.png b/Common/src/main/resources/assets/byg/textures/item/mangrove/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mangrove_door.png rename to Common/src/main/resources/assets/byg/textures/item/mangrove/door.png diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_boat.json b/Common/src/main/resources/data/byg/recipes/mangrove_boat.json deleted file mode 100644 index fb928099a3..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_bookshelf.json b/Common/src/main/resources/data/byg/recipes/mangrove_bookshelf.json deleted file mode 100644 index 3fc9383a36..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:mangrove_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_button.json b/Common/src/main/resources/data/byg/recipes/mangrove_button.json deleted file mode 100644 index c48dd1065b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:mangrove_planks" - } - ], - "result": { - "item": "byg:mangrove_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_crafting_table.json b/Common/src/main/resources/data/byg/recipes/mangrove_crafting_table.json deleted file mode 100644 index ac5023d5b8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_door.json b/Common/src/main/resources/data/byg/recipes/mangrove_door.json deleted file mode 100644 index db6fc84b4e..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_fence.json b/Common/src/main/resources/data/byg/recipes/mangrove_fence.json deleted file mode 100644 index 10887cb102..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_fence_gate.json b/Common/src/main/resources/data/byg/recipes/mangrove_fence_gate.json deleted file mode 100644 index bd5c9e6084..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_planks.json b/Common/src/main/resources/data/byg/recipes/mangrove_planks.json deleted file mode 100644 index 4df6dd4d26..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:mangrove_logs" - } - ], - "result": { - "item": "byg:mangrove_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/mangrove_pressure_plate.json deleted file mode 100644 index a5d16d5813..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_slab.json b/Common/src/main/resources/data/byg/recipes/mangrove_slab.json deleted file mode 100644 index 312e5b58e9..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_stairs.json b/Common/src/main/resources/data/byg/recipes/mangrove_stairs.json deleted file mode 100644 index f38bbcf530..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_trapdoor.json b/Common/src/main/resources/data/byg/recipes/mangrove_trapdoor.json deleted file mode 100644 index 9ed7a89dea..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:mangrove_planks" - } - }, - "result": { - "item": "byg:mangrove_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_wood.json b/Common/src/main/resources/data/byg/recipes/mangrove_wood.json deleted file mode 100644 index c1da78e88c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/mangrove_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:mangrove_log" - } - }, - "result": { - "item": "byg:mangrove_wood", - "count": 3 - } -} \ No newline at end of file From 1196c139f4db13b3ab7709e76c6c4c78ae61370a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 21:50:16 +0300 Subject: [PATCH 31/90] Update mangrove and mahogany --- Common/src/generated/resources/.cache/cache | 180 +++++++++++++++ .../byg/blockstates/mahogany_bookshelf.json | 7 + .../byg/blockstates/mahogany_button.json | 118 ++++++++++ .../blockstates/mahogany_crafting_table.json | 7 + .../assets/byg/blockstates/mahogany_door.json | 124 +++++++++++ .../byg/blockstates/mahogany_fence.json | 48 ++++ .../byg/blockstates/mahogany_fence_gate.json | 80 +++++++ .../byg/blockstates/mahogany_leaves.json | 7 + .../assets/byg/blockstates/mahogany_log.json} | 14 +- .../byg/blockstates/mahogany_planks.json | 7 + .../blockstates/mahogany_pressure_plate.json | 10 + .../byg/blockstates/mahogany_sapling.json | 7 + .../assets/byg/blockstates/mahogany_slab.json | 13 ++ .../byg/blockstates/mahogany_stairs.json | 209 ++++++++++++++++++ .../byg/blockstates/mahogany_trapdoor.json | 68 ++++++ .../assets/byg/blockstates/mahogany_wood.json | 16 ++ .../byg/blockstates/mangrove_bookshelf.json | 7 + .../byg/blockstates/mangrove_button.json | 118 ++++++++++ .../blockstates/mangrove_crafting_table.json | 7 + .../assets/byg/blockstates/mangrove_door.json | 124 +++++++++++ .../byg/blockstates/mangrove_fence.json | 48 ++++ .../byg/blockstates/mangrove_fence_gate.json | 80 +++++++ .../byg/blockstates/mangrove_leaves.json | 7 + .../assets/byg/blockstates/mangrove_log.json | 16 ++ .../byg/blockstates/mangrove_planks.json | 7 + .../blockstates/mangrove_pressure_plate.json | 10 + .../byg/blockstates/mangrove_sapling.json | 7 + .../assets/byg/blockstates/mangrove_slab.json | 13 ++ .../byg/blockstates/mangrove_stairs.json | 209 ++++++++++++++++++ .../byg/blockstates/mangrove_trapdoor.json | 68 ++++++ .../assets/byg/blockstates/mangrove_wood.json | 16 ++ .../byg/models/block/mahogany/bookshelf.json | 12 + .../byg/models/block/mahogany/button.json | 6 + .../block/mahogany/button_inventory.json | 6 + .../models/block/mahogany/button_pressed.json | 6 + .../models/block/mahogany/crafting_table.json | 12 + .../models/block/mahogany/door_bottom.json | 7 + .../block/mahogany/door_bottom_hinge.json | 7 + .../byg/models/block/mahogany/door_top.json | 7 + .../models/block/mahogany/door_top_hinge.json | 7 + .../byg/models/block/mahogany/fence.json | 7 + .../byg/models/block/mahogany/fence_gate.json | 6 + .../block/mahogany/fence_gate_open.json | 6 + .../block/mahogany/fence_gate_wall.json | 6 + .../block/mahogany/fence_gate_wall_open.json | 6 + .../byg/models/block/mahogany/fence_inv.json | 7 + .../byg/models/block/mahogany/fence_post.json | 7 + .../models/block/mahogany/grower_item.json | 6 + .../byg/models/block/mahogany/leaves.json | 12 + .../models/block/mahogany/leaves_snowy.json | 12 + .../assets/byg/models/block/mahogany/log.json | 7 + .../byg/models/block/mahogany/planks.json | 12 + .../models/block/mahogany/pressure_plate.json | 6 + .../block/mahogany/pressure_plate_down.json | 6 + .../byg/models/block/mahogany/slab.json | 8 + .../byg/models/block/mahogany/slab_top.json | 8 + .../byg/models/block/mahogany/stairs.json | 8 + .../models/block/mahogany/stairs_inner.json | 8 + .../models/block/mahogany/stairs_outer.json | 8 + .../byg/models/block/mahogany/trapdoor.json | 39 ++++ .../block/mahogany/trapdoor_bottom.json | 6 + .../models/block/mahogany/trapdoor_open.json | 6 + .../models/block/mahogany/trapdoor_top.json | 6 + .../byg/models/block/mahogany/wood.json | 7 + .../byg/models/block/mangrove/bookshelf.json | 12 + .../byg/models/block/mangrove/button.json | 6 + .../block/mangrove/button_inventory.json | 6 + .../models/block/mangrove/button_pressed.json | 6 + .../models/block/mangrove/crafting_table.json | 12 + .../models/block/mangrove/door_bottom.json | 7 + .../block/mangrove/door_bottom_hinge.json | 7 + .../byg/models/block/mangrove/door_top.json | 7 + .../models/block/mangrove/door_top_hinge.json | 7 + .../byg/models/block/mangrove/fence.json | 7 + .../byg/models/block/mangrove/fence_gate.json | 6 + .../block/mangrove/fence_gate_open.json | 6 + .../block/mangrove/fence_gate_wall.json | 6 + .../block/mangrove/fence_gate_wall_open.json | 6 + .../byg/models/block/mangrove/fence_inv.json | 7 + .../byg/models/block/mangrove/fence_post.json | 7 + .../models/block/mangrove/grower_item.json | 6 + .../byg/models/block/mangrove/leaves.json | 12 + .../models/block/mangrove/leaves_snowy.json | 12 + .../assets/byg/models/block/mangrove/log.json | 7 + .../byg/models/block/mangrove/planks.json | 12 + .../models/block/mangrove/pressure_plate.json | 6 + .../block/mangrove/pressure_plate_down.json | 6 + .../byg/models/block/mangrove/slab.json | 8 + .../byg/models/block/mangrove/slab_top.json | 8 + .../byg/models/block/mangrove/stairs.json | 8 + .../models/block/mangrove/stairs_inner.json | 8 + .../models/block/mangrove/stairs_outer.json | 8 + .../byg/models/block/mangrove/trapdoor.json | 39 ++++ .../block/mangrove/trapdoor_bottom.json | 6 + .../models/block/mangrove/trapdoor_open.json | 6 + .../models/block/mangrove/trapdoor_top.json | 6 + .../byg/models/block/mangrove/wood.json | 7 + .../assets/byg/models/item/mahogany_boat.json | 6 + .../byg/models/item/mahogany_bookshelf.json | 39 ++++ .../byg/models/item/mahogany_button.json | 39 ++++ .../models/item/mahogany_crafting_table.json | 39 ++++ .../assets/byg/models/item/mahogany_door.json | 6 + .../byg/models/item/mahogany_fence.json | 39 ++++ .../byg/models/item/mahogany_leaves.json | 39 ++++ .../assets/byg/models/item/mahogany_log.json | 39 ++++ .../byg/models/item/mahogany_planks.json | 39 ++++ .../models/item/mahogany_pressure_plate.json | 39 ++++ .../byg/models/item/mahogany_sapling.json | 6 + .../assets/byg/models/item/mahogany_slab.json | 39 ++++ .../byg/models/item/mahogany_stairs.json | 39 ++++ .../assets/byg/models/item/mahogany_wood.json | 39 ++++ .../assets/byg/models/item/mangrove_boat.json | 6 + .../byg/models/item/mangrove_bookshelf.json | 39 ++++ .../byg/models/item/mangrove_button.json | 39 ++++ .../models/item/mangrove_crafting_table.json | 39 ++++ .../assets/byg/models/item/mangrove_door.json | 6 + .../byg/models/item/mangrove_fence.json | 39 ++++ .../byg/models/item/mangrove_leaves.json | 39 ++++ .../assets/byg/models/item/mangrove_log.json | 39 ++++ .../byg/models/item/mangrove_planks.json | 39 ++++ .../models/item/mangrove_pressure_plate.json | 39 ++++ .../byg/models/item/mangrove_sapling.json | 6 + .../assets/byg/models/item/mangrove_slab.json | 39 ++++ .../byg/models/item/mangrove_stairs.json | 39 ++++ .../assets/byg/models/item/mangrove_wood.json | 39 ++++ .../recipes/byg.byg/wood/mahogany/boat.json | 34 +++ .../byg.byg/wood/mahogany/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/mahogany/button.json | 34 +++ .../byg.byg/wood/mahogany/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/mahogany/door.json | 34 +++ .../recipes/byg.byg/wood/mahogany/fence.json | 34 +++ .../byg.byg/wood/mahogany/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/mahogany/planks.json | 32 +++ .../byg.byg/wood/mahogany/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/mahogany/slab.json | 34 +++ .../recipes/byg.byg/wood/mahogany/stairs.json | 34 +++ .../byg.byg/wood/mahogany/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/mahogany/wood.json | 34 +++ .../recipes/byg.byg/wood/mangrove/boat.json | 34 +++ .../byg.byg/wood/mangrove/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/mangrove/button.json | 34 +++ .../byg.byg/wood/mangrove/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/mangrove/door.json | 34 +++ .../recipes/byg.byg/wood/mangrove/fence.json | 34 +++ .../byg.byg/wood/mangrove/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/mangrove/planks.json | 32 +++ .../byg.byg/wood/mangrove/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/mangrove/slab.json | 34 +++ .../recipes/byg.byg/wood/mangrove/stairs.json | 34 +++ .../byg.byg/wood/mangrove/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/mangrove/wood.json | 34 +++ .../data/byg/recipes/wood/mahogany/boat.json | 16 ++ .../byg/recipes/wood/mahogany/bookshelf.json | 20 ++ .../byg/recipes/wood/mahogany/button.json | 12 + .../recipes/wood/mahogany/crafting_table.json | 16 ++ .../data/byg/recipes/wood/mahogany/door.json | 18 ++ .../data/byg/recipes/wood/mahogany/fence.json | 20 ++ .../byg/recipes/wood/mahogany/fence_gate.json | 19 ++ .../byg/recipes/wood/mahogany/planks.json | 13 ++ .../recipes/wood/mahogany/pressure_plate.json | 15 ++ .../data/byg/recipes/wood/mahogany/slab.json | 16 ++ .../byg/recipes/wood/mahogany/stairs.json | 18 ++ .../byg/recipes/wood/mahogany/trapdoor.json | 17 ++ .../data/byg/recipes/wood/mahogany/wood.json | 17 ++ .../data/byg/recipes/wood/mangrove/boat.json | 16 ++ .../byg/recipes/wood/mangrove/bookshelf.json | 20 ++ .../byg/recipes/wood/mangrove/button.json | 12 + .../recipes/wood/mangrove/crafting_table.json | 16 ++ .../data/byg/recipes/wood/mangrove/door.json | 18 ++ .../data/byg/recipes/wood/mangrove/fence.json | 20 ++ .../byg/recipes/wood/mangrove/fence_gate.json | 19 ++ .../byg/recipes/wood/mangrove/planks.json | 13 ++ .../recipes/wood/mangrove/pressure_plate.json | 15 ++ .../data/byg/recipes/wood/mangrove/slab.json | 16 ++ .../byg/recipes/wood/mangrove/stairs.json | 18 ++ .../byg/recipes/wood/mangrove/trapdoor.json | 17 ++ .../data/byg/recipes/wood/mangrove/wood.json | 17 ++ .../byg/tags/blocks/wood/mahogany_logs.json | 9 + .../byg/tags/blocks/wood/mangrove_logs.json | 9 + .../byg/tags/items/wood/mahogany_logs.json | 9 + .../byg/tags/items/wood/mangrove_logs.json | 9 + .../byg/client/textures/ColorManager.java | 19 +- .../textures/renders/BYGRenderTypes.java | 6 - .../byg/common/BYGCompostables.java | 4 - .../byg/common/BYGFlammables.java | 20 -- .../byg/common/BYGStrippables.java | 4 - .../byg/common/block/BYGWoodTypes.java | 2 +- .../byg/common/entity/boat/BYGBoatEntity.java | 4 - .../byg/common/item/BYGItems.java | 2 +- .../overworld/BYGOverworldTreeFeatures.java | 64 +++--- .../byg/models/block/imparius_hyphae.json | 7 - .../byg/models/block/imparius_stem.json | 7 - .../byg/models/item/imparius_hyphae.json | 22 -- .../assets/byg/models/item/imparius_stem.json | 22 -- .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../mahogany/{sapling.png => grower_item.png} | Bin .../log_top.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../mangrove/{sapling.png => grower_item.png} | Bin .../log_top.png} | Bin .../providers/BYGWoodAssetsProvider.java | 2 + 209 files changed, 4493 insertions(+), 148 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_leaves.json rename Common/src/{main/resources/assets/byg/blockstates/imparius_hyphae.json => generated/resources/assets/byg/blockstates/mahogany_log.json} (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/imparius_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_stem.json rename Common/src/main/resources/assets/byg/textures/block/{mahogany_crafting_table_front.png => mahogany/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_crafting_table_side.png => mahogany/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_crafting_table_top.png => mahogany/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_door_bottom.png => mahogany/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_door_top.png => mahogany/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/mahogany/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_log_top.png => mahogany/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_crafting_table_front.png => mangrove/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_crafting_table_side.png => mangrove/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_crafting_table_top.png => mangrove/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_door_bottom.png => mangrove/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_door_top.png => mangrove/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/mangrove/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{mangrove_log_top.png => mangrove/log_top.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 4c1c8a1972..a087f454ce 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -189,6 +189,36 @@ c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressur bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json 4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json 5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json +2d64b1e97d9895e66e98faca798866a4ebaee335 assets/byg/blockstates/mahogany_bookshelf.json +718f7b42d87527834f70aa7918447aa98ca7b2a1 assets/byg/blockstates/mahogany_button.json +6f41668ba9e74ca53c6015d50ab82fa974538b89 assets/byg/blockstates/mahogany_crafting_table.json +27649644f47d673038a327d8c3e453be84a064a3 assets/byg/blockstates/mahogany_door.json +6f26d59749aa9ec3c6eaf295afd9a4794d078101 assets/byg/blockstates/mahogany_fence.json +215e498d7d36ad76e71f4f62568d71bf274be85d assets/byg/blockstates/mahogany_fence_gate.json +259c93c1fbce5626b84195720fa59e85b30a2746 assets/byg/blockstates/mahogany_leaves.json +e4d5c8d1f36b4a2a2db3a5f46f44e5d641f68d0f assets/byg/blockstates/mahogany_log.json +b98b6eaea45f5d641cbf8b9371aa4f81ff7f4f07 assets/byg/blockstates/mahogany_planks.json +eb8047b6ffe533f77ea8804aed51564ba69d7b85 assets/byg/blockstates/mahogany_pressure_plate.json +a5a996bdf644ffa4075527c9beaff965d19dce71 assets/byg/blockstates/mahogany_sapling.json +986dfe68d719cc2529ad0d029769ab172f2c9adf assets/byg/blockstates/mahogany_slab.json +19c1800a72a941de5e8348d2badfab0d994fb74d assets/byg/blockstates/mahogany_stairs.json +0b44391beb743408a6adc0dec3e8295b67b1cf7e assets/byg/blockstates/mahogany_trapdoor.json +968339c9821aa2fb276e8b8939fb2358ed4d1120 assets/byg/blockstates/mahogany_wood.json +803d7b6e47598ac0b27596620c4c7a18b149b045 assets/byg/blockstates/mangrove_bookshelf.json +fb877e5603e8bf1df87634856397c7253bfe3c7d assets/byg/blockstates/mangrove_button.json +692070740510de92a95476f38ff6d0643370283d assets/byg/blockstates/mangrove_crafting_table.json +e3357f8929ebb51a9789004b64d57a7cfeb8b0e4 assets/byg/blockstates/mangrove_door.json +d5b8e983181b9c6b3ad3c959f0c50f66d4a0c122 assets/byg/blockstates/mangrove_fence.json +077d8ad9a649d975a7ea4ac0ef9262c4a5a49fc6 assets/byg/blockstates/mangrove_fence_gate.json +065aa9e1eee92080b502986c4128ed5d08f6c896 assets/byg/blockstates/mangrove_leaves.json +e315b86163ca8ebc6d226e87591d7d0347ec8144 assets/byg/blockstates/mangrove_log.json +76007e43389833ec5a4f3d8bdd6e61aeec5f7d4c assets/byg/blockstates/mangrove_planks.json +b11bb0f54a42d1e98910783e570b3bedf82a0477 assets/byg/blockstates/mangrove_pressure_plate.json +a40ff5007072afce4cf01e007b8b248c64ca2b0e assets/byg/blockstates/mangrove_sapling.json +b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.json +91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json +2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json +ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -611,6 +641,72 @@ d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json 1f9b271e1f7e94aa33a491ae563799bd9c16b7b2 assets/byg/models/block/imparius/wood.json +46ddc052ddf8365713e7613550e33d541877bc1c assets/byg/models/block/mahogany/bookshelf.json +1eb51f409ab27de20eb274edf2a0d22761e1e2a1 assets/byg/models/block/mahogany/button.json +fc7da464a0ff5aa5b61230223b3e29e0796938ac assets/byg/models/block/mahogany/button_inventory.json +e3f606173eec52990593569cc40c20612a19e2ee assets/byg/models/block/mahogany/button_pressed.json +7e60ef6f493979ecd552b08afc1c17eb31cfb53b assets/byg/models/block/mahogany/crafting_table.json +302cd8f026d7b3d83f4f0419a79506e9247ba91c assets/byg/models/block/mahogany/door_bottom.json +d6a4b08692c4ba99a41a4c3c627b7bd02733cb21 assets/byg/models/block/mahogany/door_bottom_hinge.json +113463a74e0859ea151a353e30002f2e8ee892c6 assets/byg/models/block/mahogany/door_top.json +dd91e333e75a9740eb52bf2a17bddb6d210c8224 assets/byg/models/block/mahogany/door_top_hinge.json +a4cdd60ccaac5a7145d14a1e931e662bf42289d0 assets/byg/models/block/mahogany/fence.json +a263d21e06176b571603582a047263986a9cbc05 assets/byg/models/block/mahogany/fence_gate.json +6d7ec8f1bd9cacf73f96f645a0c3577d5968dca7 assets/byg/models/block/mahogany/fence_gate_open.json +0639dc9aa547c04971535a1a013a752901966e5a assets/byg/models/block/mahogany/fence_gate_wall.json +d3e7af8e886b2bbeddba4341cb599090889c901d assets/byg/models/block/mahogany/fence_gate_wall_open.json +4b738d591c85fc237166262b07a8a0b07250da1f assets/byg/models/block/mahogany/fence_inv.json +6e79c75c084cd44d3b633d21b98900bd4640c184 assets/byg/models/block/mahogany/fence_post.json +2a734dbc733ebd65667011c9b3f6acbf1b1289c2 assets/byg/models/block/mahogany/grower_item.json +1e9d03ea459738cfa51790e0ff11edad58ec5b83 assets/byg/models/block/mahogany/leaves.json +a3481313f634ce373eddbe96090cc1ffff96ae37 assets/byg/models/block/mahogany/leaves_snowy.json +edfd496ebaa9c5f80edcbc104b1ea54c84cbd411 assets/byg/models/block/mahogany/log.json +47789678c316d2b0d5654ad13f4dfb0be1c1918a assets/byg/models/block/mahogany/planks.json +13c35c96abdc967ccf24364dc7f89dd13098cf85 assets/byg/models/block/mahogany/pressure_plate.json +b5123dd3ab45b2012724f8f126ad6369cc35c7a7 assets/byg/models/block/mahogany/pressure_plate_down.json +c31abb434e8e3a56083dbbd5e208c45dba147edc assets/byg/models/block/mahogany/slab.json +f2fd0bdf26816fcd083222230742f05e92d97bed assets/byg/models/block/mahogany/slab_top.json +219d190d69f4355abf53567687cf967bd849fde8 assets/byg/models/block/mahogany/stairs.json +09bf6710ec3eead86c99262adb6fe280378de6ea assets/byg/models/block/mahogany/stairs_inner.json +89cf846e0a814064fcd02d57648ff8a583ac135a assets/byg/models/block/mahogany/stairs_outer.json +1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/block/mahogany/trapdoor.json +d10f0a6bcae1b16d29c5f292453d92084befbe49 assets/byg/models/block/mahogany/trapdoor_bottom.json +06b76eb6b276363c35a03e7d5d37bba35aa3b154 assets/byg/models/block/mahogany/trapdoor_open.json +e7074ff7eb49bd39ef6fea403cb0de1812eb0c2c assets/byg/models/block/mahogany/trapdoor_top.json +7dee15f914317ba1566c249bf458c66f307a1bf0 assets/byg/models/block/mahogany/wood.json +06fb0aa2983608d3423dc38554f1eff8e1df21b3 assets/byg/models/block/mangrove/bookshelf.json +2a45424cf40551af0906f357328adf217282171e assets/byg/models/block/mangrove/button.json +d77ac2b5226c4331aa14aec35f070eac39136618 assets/byg/models/block/mangrove/button_inventory.json +3f72691009422c36f36539a26193862cfea1d7fc assets/byg/models/block/mangrove/button_pressed.json +a809461e52ffa5c09de0a834d6ec852eca97459b assets/byg/models/block/mangrove/crafting_table.json +e86405476914aaedd3fc49214e91eb9aee51c13b assets/byg/models/block/mangrove/door_bottom.json +90e0902796a8f6efa2649d614d8fc9bbacf7e65b assets/byg/models/block/mangrove/door_bottom_hinge.json +75b5959f4bf78837cfc76ce0c52580dca2685532 assets/byg/models/block/mangrove/door_top.json +7fc0656943e99a9333db5f4d2ab81d8920f3f292 assets/byg/models/block/mangrove/door_top_hinge.json +f52fd364b9161919bfb7ca6ec0bf0348f36bc819 assets/byg/models/block/mangrove/fence.json +043cd8c90f467fdf78055dd88e34fd3737f77aa9 assets/byg/models/block/mangrove/fence_gate.json +237e59f6764a80b5fd15c4137b3b058cd713efcd assets/byg/models/block/mangrove/fence_gate_open.json +b5670973fb23c48b078e8f8435936c006e279549 assets/byg/models/block/mangrove/fence_gate_wall.json +29e651571294d8f47eb2f7f61e45a13aa4b003d1 assets/byg/models/block/mangrove/fence_gate_wall_open.json +e042b1b6d266a6545b6c6e3366f8bbfe4fe8cc6b assets/byg/models/block/mangrove/fence_inv.json +3f077aba9686176cacd47868034e6802fb8ac593 assets/byg/models/block/mangrove/fence_post.json +2c6fc03bb3465f6f26e6fc6e538957f712f51742 assets/byg/models/block/mangrove/grower_item.json +d453ef77f88fcad415c72ca906b401048a71c4cd assets/byg/models/block/mangrove/leaves.json +dd02ad772d32144d4c8f8008ffc2e894b76ccbed assets/byg/models/block/mangrove/leaves_snowy.json +1c8d145ddeff92246ae37f399fc4ba216e4bf494 assets/byg/models/block/mangrove/log.json +e2a68cef72a8896d8ba3c921f96342a1f49deb54 assets/byg/models/block/mangrove/planks.json +a12a60a9c24dfb85d193955490282a569491683e assets/byg/models/block/mangrove/pressure_plate.json +ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressure_plate_down.json +156a4fff72f2395df0d3223292374300d1a8074c assets/byg/models/block/mangrove/slab.json +9bc455c6e527549209b5b9aac6a53637a240f825 assets/byg/models/block/mangrove/slab_top.json +0380d94b824120f82f1850fe5cf50e8603ae53d1 assets/byg/models/block/mangrove/stairs.json +81f32a3bddda583a73a5fdf4fddbac23bd92b0a1 assets/byg/models/block/mangrove/stairs_inner.json +ccaaaf1759a8d518c4fd9a1895c9192bfc081c76 assets/byg/models/block/mangrove/stairs_outer.json +cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/block/mangrove/trapdoor.json +18602dff240e103ebf20972a974ef14eeb6bf0d2 assets/byg/models/block/mangrove/trapdoor_bottom.json +c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json +36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json +db85b26584a130734c0c18b1b8e10e3bf071a97f assets/byg/models/block/mangrove/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -786,6 +882,34 @@ d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressur 510283f55fbde7b474a834f9c15980d776122460 assets/byg/models/item/imparius_slab.json 7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json 151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json +308fdc52954271202cfea5bc7f66e6beb13dd522 assets/byg/models/item/mahogany_boat.json +4492809fcab159e80ab32cdf5ff1b3908836bcb6 assets/byg/models/item/mahogany_bookshelf.json +3675d5f1aae8ed09bb152beab640fcb5d3a82f38 assets/byg/models/item/mahogany_button.json +df0559cf08d0846d1b12afac67fbfbfd5fca75df assets/byg/models/item/mahogany_crafting_table.json +21ccb7bee6299a30f579e3c0c6fafca1114af0e1 assets/byg/models/item/mahogany_door.json +5f51431cc433d64c0b4d0b206cb129163edcfcb8 assets/byg/models/item/mahogany_fence.json +00e4852d45d15459268105e1fedb6e830d407350 assets/byg/models/item/mahogany_leaves.json +6a1f064204a70d8c7e17ba359e95ce8a29d52efa assets/byg/models/item/mahogany_log.json +1517b68ab0172d3e39d1a86464016fdb611d0850 assets/byg/models/item/mahogany_planks.json +af307f8aa6295fb81982c254ce4d15503f579b95 assets/byg/models/item/mahogany_pressure_plate.json +d274bb65e5894078164344c25fc85f2a7ea994a4 assets/byg/models/item/mahogany_sapling.json +2d1f4f1ff605d580bf5b664db434cb382ff0b848 assets/byg/models/item/mahogany_slab.json +5ef059d8995b99cdd60adb5ea46c12e3d9400baa assets/byg/models/item/mahogany_stairs.json +9fe4f0b1c862e4b2120dbbf598d09b6297b1d2e3 assets/byg/models/item/mahogany_wood.json +1faa3c095998b9767b4e1b71ff586d0c566ad90a assets/byg/models/item/mangrove_boat.json +68ca3bb25c7feac21fda46a46b67e83dab6a3a9b assets/byg/models/item/mangrove_bookshelf.json +37f3c3a9e828cb1bec645a0efe95227adcc92595 assets/byg/models/item/mangrove_button.json +724a0cd863cf79d75bb26d05838c3e473a1afd05 assets/byg/models/item/mangrove_crafting_table.json +b3e66440598f233fb8c5b856393037fb063de2f4 assets/byg/models/item/mangrove_door.json +c205646f54043aa1f88c8495efba13103984ee0d assets/byg/models/item/mangrove_fence.json +b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves.json +0cdff58e05cd081158e7d0dbbc0f2d0dd5bbb7b4 assets/byg/models/item/mangrove_log.json +663b1fe6614360a2133136635de85e505363572b assets/byg/models/item/mangrove_planks.json +202d70f947d5f1361bf270a4c7653e17b48be2df assets/byg/models/item/mangrove_pressure_plate.json +2b93482c1bc6c4f91a71e7b7853b2dcd50170cc3 assets/byg/models/item/mangrove_sapling.json +6ae725945788d34d3471f064cf00ffe7b457fb3c assets/byg/models/item/mangrove_slab.json +9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json +b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -952,6 +1076,32 @@ e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/w 21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json ae49ef7c283fbe64a3b191ec6edf9b54a573b336 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json +95786d1aed14c5652fc8682bb9d7fcf359bf734b data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json +0d446dad280dcbe8707ad2c7a5932caf788acc52 data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json +149437419bb7ad500a7c8b60c54da40d0977d6bd data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json +d6b591dee348b32c4942eb45549d8c9cff8ddf02 data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json +49f9d0388d94e30c0ec622d688333004d8bfe8a5 data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json +06b8056113292184693a08a6de3769cfa4de2b4f data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json +3bf65b830f1fb1ff60cad8aa91294e3ec6afab1b data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json +a9e0f8677d35a3447eb658bce8619837156150f8 data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json +44d191e7415b89f3f75961b0e4f9fa028f776843 data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json +dbb51975c5190152740d709a03e264737fe1c2ce data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json +b7f8754d44b9a3833d7ac10d62a9f00ae77af26e data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json +21d421d0b92bd3bb4edfbc901976bc76bbbdfa00 data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json +5e0143c37c59bfd4776c17cbf2a7a06d0646cf63 data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json +01a06e3197352e503c4821be159b3dc7146ea44e data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json +5de3e60bf81882ed9c5ee442408d18de5800fe52 data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json +03c87839e956c174a3ec9cb721900ab050fed5ce data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json +cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json +96d4661b543c9858c768cb02f7095a857ce7ab13 data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json +8f82b68ccefd0ff5b8368070a29517d266960784 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json +8dc550f42ca8270dc3c6d98eaa270e346eeeef20 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json +1ebc0797ea321249ac527b39e383af6e8c81a76e data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json +941a750649fc69ff8dc9629056552085ff0a4f1a data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json +90d4390fe6f7c5bb8246f959a4b34251a8ce9dee data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json +c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json +80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json +8e68638672aded0392ab42d4d99747032a597867 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -1118,6 +1268,32 @@ fda598130e789b7ae529c1bc27e4bdbe27164238 data/byg/recipes/wood/imparius/fence_ga 7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json 67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json 7868a447edb00b506360fadccf7494ef456a775e data/byg/recipes/wood/imparius/wood.json +a0efd20b844663b3dfe5cd5b5861ae78f9b1dd0a data/byg/recipes/wood/mahogany/boat.json +bd227ea44f539c1b70089a8faeab074bf9fb0002 data/byg/recipes/wood/mahogany/bookshelf.json +2c4490731c6f1e34847594539b87684359d4d53b data/byg/recipes/wood/mahogany/button.json +f99aaf03fab34e61bd8f80401533330096c678d1 data/byg/recipes/wood/mahogany/crafting_table.json +9b72e81bca8c9eaa1c4de3da15e989dcac9f94a8 data/byg/recipes/wood/mahogany/door.json +59fa3e0dac96a85801d9bf2a872e2efa7f361e97 data/byg/recipes/wood/mahogany/fence.json +fc9ebe68d5750b4789f65567d1aa16c1963819ab data/byg/recipes/wood/mahogany/fence_gate.json +4250e0784fca1d4c65e0f1b34b1142befdc5120e data/byg/recipes/wood/mahogany/planks.json +e363352d2c68a4b1555dc3a459f75095f6e5423e data/byg/recipes/wood/mahogany/pressure_plate.json +a2b8e800096876b7a50eccdda34bc53fbb0c0677 data/byg/recipes/wood/mahogany/slab.json +ffebea536d574ddafc22ff1ac4a34332cb35f15e data/byg/recipes/wood/mahogany/stairs.json +bbf36d70b55c0251abc6a6adfaef04f0f42366d1 data/byg/recipes/wood/mahogany/trapdoor.json +421d9f59938dbe491d5d68ddef9aa7177906e693 data/byg/recipes/wood/mahogany/wood.json +c1db4438ac17f8f051ba33e0d0a17b4b3948b056 data/byg/recipes/wood/mangrove/boat.json +b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshelf.json +7f509ecbf155c4a6d403d6f1629217babec5aa2f data/byg/recipes/wood/mangrove/button.json +6552b958b35161883cee35b51679b8d082343261 data/byg/recipes/wood/mangrove/crafting_table.json +9b526909e767b9fe1d1b0f6b31556626fa6c4c81 data/byg/recipes/wood/mangrove/door.json +122a5dd663fb0e43f7f07289a82b6bb1d8c41654 data/byg/recipes/wood/mangrove/fence.json +9855dfd884fcb8d9cbc3afc7a3b1d408257b6e4d data/byg/recipes/wood/mangrove/fence_gate.json +83e6bb28f9ae4c6eb46f68d5252a1e845d98dbe1 data/byg/recipes/wood/mangrove/planks.json +028d326cde235b07b5c8934cdfe9dbe63c9156fb data/byg/recipes/wood/mangrove/pressure_plate.json +5e501c611ce5205b97fb14abd195ae4a7cbf56b9 data/byg/recipes/wood/mangrove/slab.json +5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json +9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json +abd1d968c12a7255a1504388adb8d92700c82692 data/byg/recipes/wood/mangrove/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1255,6 +1431,8 @@ b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json 47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/blocks/wood/holly_logs.json 60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json +095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json +5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json @@ -1268,4 +1446,6 @@ cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json 664f79bad1ce2f2fcb9938fb32b5feff7501cb53 data/byg/tags/items/wood/holly_logs.json 265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json +d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json +5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_bookshelf.json new file mode 100644 index 0000000000..596a471301 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json new file mode 100644 index 0000000000..04852241bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/mahogany/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/mahogany/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_crafting_table.json new file mode 100644 index 0000000000..c4b48a14b0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json new file mode 100644 index 0000000000..40a9fe1ac2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json new file mode 100644 index 0000000000..7a8a77bf4d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/mahogany/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/mahogany/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/mahogany/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/mahogany/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/mahogany/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json new file mode 100644 index 0000000000..2cdb1cd2de --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_leaves.json new file mode 100644 index 0000000000..c1c8a22897 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_log.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/imparius_hyphae.json rename to Common/src/generated/resources/assets/byg/blockstates/mahogany_log.json index 7bda2d57df..291bc7547e 100644 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_hyphae.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_log.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/mahogany/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/imparius_hyphae" + "model": "byg:block/mahogany/log" }, "axis=z": { - "model": "byg:block/imparius_hyphae", + "model": "byg:block/mahogany/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/imparius_hyphae", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_planks.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_planks.json new file mode 100644 index 0000000000..d5f4939421 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_pressure_plate.json new file mode 100644 index 0000000000..533c06d40b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/mahogany/pressure_plate" + }, + "powered=true": { + "model": "byg:block/mahogany/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_sapling.json new file mode 100644 index 0000000000..936eb3f863 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json new file mode 100644 index 0000000000..4fcf5521e9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/mahogany/slab_top" + }, + "type=bottom": { + "model": "byg:block/mahogany/slab" + }, + "type=double": { + "model": "byg:block/mahogany/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json new file mode 100644 index 0000000000..00b3bd7ebe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json new file mode 100644 index 0000000000..82e56c1c75 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_wood.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_wood.json new file mode 100644 index 0000000000..b0cd8bc8cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mahogany/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mahogany/wood" + }, + "axis=z": { + "model": "byg:block/mahogany/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_bookshelf.json new file mode 100644 index 0000000000..a2fb9afc29 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json new file mode 100644 index 0000000000..9cbb765394 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/mangrove/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/mangrove/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_crafting_table.json new file mode 100644 index 0000000000..dd41d2d289 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json new file mode 100644 index 0000000000..dedba1878a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json new file mode 100644 index 0000000000..a62bb4bb9e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/mangrove/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/mangrove/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/mangrove/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/mangrove/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/mangrove/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json new file mode 100644 index 0000000000..52b1155a35 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_leaves.json new file mode 100644 index 0000000000..b903f76c98 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_log.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_log.json new file mode 100644 index 0000000000..b3aedeed4e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mangrove/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mangrove/log" + }, + "axis=z": { + "model": "byg:block/mangrove/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_planks.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_planks.json new file mode 100644 index 0000000000..cd8b972362 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_pressure_plate.json new file mode 100644 index 0000000000..df61e21313 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/mangrove/pressure_plate" + }, + "powered=true": { + "model": "byg:block/mangrove/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_sapling.json new file mode 100644 index 0000000000..db98d60790 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json new file mode 100644 index 0000000000..9789b08225 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/mangrove/slab_top" + }, + "type=bottom": { + "model": "byg:block/mangrove/slab" + }, + "type=double": { + "model": "byg:block/mangrove/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json new file mode 100644 index 0000000000..c68660ef82 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json new file mode 100644 index 0000000000..1946571b53 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_wood.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_wood.json new file mode 100644 index 0000000000..363bf888fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mangrove/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mangrove/wood" + }, + "axis=z": { + "model": "byg:block/mangrove/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json new file mode 100644 index 0000000000..fa13f0a2e7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mahogany/planks", + "up": "byg:block/mahogany/planks", + "north": "byg:block/mahogany/bookshelf", + "south": "byg:block/mahogany/bookshelf", + "east": "byg:block/mahogany/bookshelf", + "west": "byg:block/mahogany/bookshelf", + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/button.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/button.json new file mode 100644 index 0000000000..b44f3706b3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/button_inventory.json new file mode 100644 index 0000000000..b9d9601d5f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/button_pressed.json new file mode 100644 index 0000000000..91d5fdd452 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json new file mode 100644 index 0000000000..cfda4ad684 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mahogany/planks", + "up": "byg:block/mahogany/crafting_table_top", + "north": "byg:block/mahogany/crafting_table_front", + "south": "byg:block/mahogany/crafting_table_side", + "east": "byg:block/mahogany/crafting_table_side", + "west": "byg:block/mahogany/crafting_table_front", + "particle": "byg:block/mahogany/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json new file mode 100644 index 0000000000..4524cc38ea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json new file mode 100644 index 0000000000..2753a8b685 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json new file mode 100644 index 0000000000..87454d3bb0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json new file mode 100644 index 0000000000..2bc680596d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json new file mode 100644 index 0000000000..85e1b7ec60 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/mahogany/planks", + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate.json new file mode 100644 index 0000000000..374d689e3f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_open.json new file mode 100644 index 0000000000..a03c43f5a3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall.json new file mode 100644 index 0000000000..2a27e27f94 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall_open.json new file mode 100644 index 0000000000..4d7a366301 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json new file mode 100644 index 0000000000..7b83a47ed8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/mahogany/planks", + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json new file mode 100644 index 0000000000..f6ef911bf7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/mahogany/planks", + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/grower_item.json new file mode 100644 index 0000000000..d46d4c5486 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/mahogany/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json new file mode 100644 index 0000000000..2eddfbccd9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mahogany/leaves", + "up": "byg:block/mahogany/leaves", + "north": "byg:block/mahogany/leaves", + "south": "byg:block/mahogany/leaves", + "east": "byg:block/mahogany/leaves", + "west": "byg:block/mahogany/leaves", + "particle": "byg:block/mahogany/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json new file mode 100644 index 0000000000..39d1f755f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mahogany/leaves_snowy", + "up": "byg:block/mahogany/leaves_snowy", + "north": "byg:block/mahogany/leaves_snowy_side", + "south": "byg:block/mahogany/leaves_snowy_side", + "east": "byg:block/mahogany/leaves_snowy_side", + "west": "byg:block/mahogany/leaves_snowy_side", + "particle": "byg:block/mahogany/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json new file mode 100644 index 0000000000..0e5216bd64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/mahogany/log", + "end": "byg:block/mahogany/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json new file mode 100644 index 0000000000..d368241359 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mahogany/planks", + "up": "byg:block/mahogany/planks", + "north": "byg:block/mahogany/planks", + "south": "byg:block/mahogany/planks", + "east": "byg:block/mahogany/planks", + "west": "byg:block/mahogany/planks", + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate.json new file mode 100644 index 0000000000..c432c46c26 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate_down.json new file mode 100644 index 0000000000..9f949eb6f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json new file mode 100644 index 0000000000..e3d094463d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/mahogany/planks", + "bottom": "byg:block/mahogany/planks", + "top": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json new file mode 100644 index 0000000000..1e98424c9c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/mahogany/planks", + "bottom": "byg:block/mahogany/planks", + "top": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json new file mode 100644 index 0000000000..3337b36f19 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/mahogany/planks", + "bottom": "byg:block/mahogany/planks", + "top": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json new file mode 100644 index 0000000000..bb311edd08 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/mahogany/planks", + "bottom": "byg:block/mahogany/planks", + "top": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json new file mode 100644 index 0000000000..1bcd174845 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/mahogany/planks", + "bottom": "byg:block/mahogany/planks", + "top": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json new file mode 100644 index 0000000000..e0a463c8c1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_bottom.json new file mode 100644 index 0000000000..7f86101818 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/mahogany/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_open.json new file mode 100644 index 0000000000..4878566e86 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/mahogany/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_top.json new file mode 100644 index 0000000000..72ca68bf69 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/mahogany/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/wood.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/wood.json new file mode 100644 index 0000000000..b808134fc8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/mahogany/log", + "particle": "byg:block/mahogany/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json new file mode 100644 index 0000000000..929248c1f6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mangrove/planks", + "up": "byg:block/mangrove/planks", + "north": "byg:block/mangrove/bookshelf", + "south": "byg:block/mangrove/bookshelf", + "east": "byg:block/mangrove/bookshelf", + "west": "byg:block/mangrove/bookshelf", + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/button.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/button.json new file mode 100644 index 0000000000..5d646399a4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/button_inventory.json new file mode 100644 index 0000000000..ceb3b9eab5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/button_pressed.json new file mode 100644 index 0000000000..377184cd06 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json new file mode 100644 index 0000000000..f8df7a06eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mangrove/planks", + "up": "byg:block/mangrove/crafting_table_top", + "north": "byg:block/mangrove/crafting_table_front", + "south": "byg:block/mangrove/crafting_table_side", + "east": "byg:block/mangrove/crafting_table_side", + "west": "byg:block/mangrove/crafting_table_front", + "particle": "byg:block/mangrove/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json new file mode 100644 index 0000000000..fe99f3046d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json new file mode 100644 index 0000000000..7bc39ffc5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json new file mode 100644 index 0000000000..2d672ce9a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json new file mode 100644 index 0000000000..d5076c43ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json new file mode 100644 index 0000000000..6a256b0ba6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/mangrove/planks", + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate.json new file mode 100644 index 0000000000..d24efc84bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_open.json new file mode 100644 index 0000000000..92280332d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall.json new file mode 100644 index 0000000000..f45db7a5cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall_open.json new file mode 100644 index 0000000000..07aa8dbf01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json new file mode 100644 index 0000000000..4576a3c7e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/mangrove/planks", + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json new file mode 100644 index 0000000000..6a0a3e8ca4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/mangrove/planks", + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/grower_item.json new file mode 100644 index 0000000000..90cd1f30ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/mangrove/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json new file mode 100644 index 0000000000..93ce523997 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mangrove/leaves", + "up": "byg:block/mangrove/leaves", + "north": "byg:block/mangrove/leaves", + "south": "byg:block/mangrove/leaves", + "east": "byg:block/mangrove/leaves", + "west": "byg:block/mangrove/leaves", + "particle": "byg:block/mangrove/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json new file mode 100644 index 0000000000..ea87e33818 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mangrove/leaves_snowy", + "up": "byg:block/mangrove/leaves_snowy", + "north": "byg:block/mangrove/leaves_snowy_side", + "south": "byg:block/mangrove/leaves_snowy_side", + "east": "byg:block/mangrove/leaves_snowy_side", + "west": "byg:block/mangrove/leaves_snowy_side", + "particle": "byg:block/mangrove/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json new file mode 100644 index 0000000000..cc991490fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/mangrove/log", + "end": "byg:block/mangrove/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json new file mode 100644 index 0000000000..3ba8ba39c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/mangrove/planks", + "up": "byg:block/mangrove/planks", + "north": "byg:block/mangrove/planks", + "south": "byg:block/mangrove/planks", + "east": "byg:block/mangrove/planks", + "west": "byg:block/mangrove/planks", + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate.json new file mode 100644 index 0000000000..816f888fae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate_down.json new file mode 100644 index 0000000000..4417dec6c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json new file mode 100644 index 0000000000..57c16c0697 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/mangrove/planks", + "bottom": "byg:block/mangrove/planks", + "top": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json new file mode 100644 index 0000000000..6122160580 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/mangrove/planks", + "bottom": "byg:block/mangrove/planks", + "top": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json new file mode 100644 index 0000000000..38d63c2544 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/mangrove/planks", + "bottom": "byg:block/mangrove/planks", + "top": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json new file mode 100644 index 0000000000..4f1462bc9d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/mangrove/planks", + "bottom": "byg:block/mangrove/planks", + "top": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json new file mode 100644 index 0000000000..531520ce07 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/mangrove/planks", + "bottom": "byg:block/mangrove/planks", + "top": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json new file mode 100644 index 0000000000..209b4c4197 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_bottom.json new file mode 100644 index 0000000000..3630d1ed2f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/mangrove/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_open.json new file mode 100644 index 0000000000..2957077295 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/mangrove/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_top.json new file mode 100644 index 0000000000..0c03f244bd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/mangrove/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/wood.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/wood.json new file mode 100644 index 0000000000..5914eb3d97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/mangrove/log", + "particle": "byg:block/mangrove/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_boat.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_boat.json new file mode 100644 index 0000000000..a938d87085 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mahogany/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json new file mode 100644 index 0000000000..7b3db2ccae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json new file mode 100644 index 0000000000..97d8ce8ca9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json new file mode 100644 index 0000000000..57d787bd73 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_door.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_door.json new file mode 100644 index 0000000000..c6d5883311 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mahogany/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json new file mode 100644 index 0000000000..eea1255704 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json new file mode 100644 index 0000000000..9b0ffe46bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json new file mode 100644 index 0000000000..fcdcdf806c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json new file mode 100644 index 0000000000..7b2a6dfbd6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json new file mode 100644 index 0000000000..9969e2cd4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_sapling.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_sapling.json new file mode 100644 index 0000000000..bfc07f38cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/mahogany/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json new file mode 100644 index 0000000000..40d6b9baf1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json new file mode 100644 index 0000000000..869b841b85 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json new file mode 100644 index 0000000000..fc3cd9fe65 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_boat.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_boat.json new file mode 100644 index 0000000000..581d208f77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mangrove/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json new file mode 100644 index 0000000000..7368499583 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json new file mode 100644 index 0000000000..185e348c52 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json new file mode 100644 index 0000000000..b60b31285b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_door.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_door.json new file mode 100644 index 0000000000..b4de503b3f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mangrove/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json new file mode 100644 index 0000000000..307f09b06d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json new file mode 100644 index 0000000000..88dc475842 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json new file mode 100644 index 0000000000..977dd87219 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json new file mode 100644 index 0000000000..d90d8317eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json new file mode 100644 index 0000000000..efcd0e9f7d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_sapling.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_sapling.json new file mode 100644 index 0000000000..d65fdfbc05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/mangrove/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json new file mode 100644 index 0000000000..d56178fed9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json new file mode 100644 index 0000000000..c37faaa949 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json new file mode 100644 index 0000000000..2fc1a1c610 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json new file mode 100644 index 0000000000..6939eefc32 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json new file mode 100644 index 0000000000..fe6b05399d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json new file mode 100644 index 0000000000..0826ef189f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json new file mode 100644 index 0000000000..03dd38b005 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json new file mode 100644 index 0000000000..91f4a7a810 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json new file mode 100644 index 0000000000..ab891178b7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json new file mode 100644 index 0000000000..9665c74e7e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json new file mode 100644 index 0000000000..f90ab4ed14 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/mahogany_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json new file mode 100644 index 0000000000..4f11b105bd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json new file mode 100644 index 0000000000..4c553179b7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json new file mode 100644 index 0000000000..4ecb3e7fac --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json new file mode 100644 index 0000000000..1770d0fa2e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json new file mode 100644 index 0000000000..b90dfdab45 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json new file mode 100644 index 0000000000..5f23536de5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json new file mode 100644 index 0000000000..872fcc3940 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json new file mode 100644 index 0000000000..ba00ad9598 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json new file mode 100644 index 0000000000..36b6f8a7cd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json new file mode 100644 index 0000000000..1b2861ca2a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json new file mode 100644 index 0000000000..a07fc86567 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json new file mode 100644 index 0000000000..5dbcf74765 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json new file mode 100644 index 0000000000..4e55442d44 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/mangrove_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json new file mode 100644 index 0000000000..4869e23228 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json new file mode 100644 index 0000000000..f19332fd5b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json new file mode 100644 index 0000000000..aaeb1ff312 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json new file mode 100644 index 0000000000..722bff044f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json new file mode 100644 index 0000000000..e048e95316 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json new file mode 100644 index 0000000000..34e253af8c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json new file mode 100644 index 0000000000..492b7292a0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:mahogany_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/button.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/button.json new file mode 100644 index 0000000000..058b8b6055 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:mahogany_planks" + } + ], + "result": { + "item": "byg:mahogany_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json new file mode 100644 index 0000000000..1dde55c90b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json new file mode 100644 index 0000000000..44204409b5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json new file mode 100644 index 0000000000..2c801829ba --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json new file mode 100644 index 0000000000..5e2b118710 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json new file mode 100644 index 0000000000..7ff07908d3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/mahogany_logs" + } + ], + "result": { + "item": "byg:mahogany_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json new file mode 100644 index 0000000000..562bc70d2f --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json new file mode 100644 index 0000000000..bdd768c800 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json new file mode 100644 index 0000000000..4c286d5c17 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json new file mode 100644 index 0000000000..ee9ffe06cd --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:mahogany_planks" + } + }, + "result": { + "item": "byg:mahogany_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json new file mode 100644 index 0000000000..c4619a99c4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:mahogany_log" + } + }, + "result": { + "item": "byg:mahogany_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json new file mode 100644 index 0000000000..455c7d3fa0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json new file mode 100644 index 0000000000..0ca58135f8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:mangrove_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/button.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/button.json new file mode 100644 index 0000000000..c48dd1065b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:mangrove_planks" + } + ], + "result": { + "item": "byg:mangrove_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json new file mode 100644 index 0000000000..29ed115ac8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json new file mode 100644 index 0000000000..96c7c36971 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json new file mode 100644 index 0000000000..10887cb102 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json new file mode 100644 index 0000000000..bd5c9e6084 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json new file mode 100644 index 0000000000..c462669e76 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/mangrove_logs" + } + ], + "result": { + "item": "byg:mangrove_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json new file mode 100644 index 0000000000..ed67dbd630 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json new file mode 100644 index 0000000000..bc42e9678d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json new file mode 100644 index 0000000000..8754a8d222 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json new file mode 100644 index 0000000000..e6eaf3e639 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:mangrove_planks" + } + }, + "result": { + "item": "byg:mangrove_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json new file mode 100644 index 0000000000..e055e7e4cd --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:mangrove_log" + } + }, + "result": { + "item": "byg:mangrove_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json new file mode 100644 index 0000000000..64556c0991 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:mahogany_log", + "byg:mahogany_wood", + "byg:stripped_mahogany_log", + "byg:stripped_mahogany_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json new file mode 100644 index 0000000000..cfb588ada2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:mangrove_log", + "byg:mangrove_wood", + "byg:stripped_mangrove_log", + "byg:stripped_mangrove_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json new file mode 100644 index 0000000000..8931afef85 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:mahogany_log", + "byg:stripped_mahogany_log", + "byg:mahogany_wood", + "byg:stripped_mahogany_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json new file mode 100644 index 0000000000..9b67402577 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:mangrove_log", + "byg:stripped_mangrove_log", + "byg:mangrove_wood", + "byg:stripped_mangrove_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java index 40e3e27623..d01df80e1a 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java @@ -17,7 +17,7 @@ public class ColorManager { public static synchronized void onBlockColorsInit(BlockColors blockColors) { //registers the colors for blocks that changes colors based on biome blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageGrassColor(lightReader, pos) : GrassColor.get(0.5D, 1.0D), BYGBlocks.LUSH_GRASS_BLOCK.get(), BYGBlocks.OVERGROWN_STONE.get(), BYGBlocks.OVERGROWN_NETHERRACK.get(), BYGBlocks.TINY_LILYPADS.get(), BYGBlocks.FLOWERING_TINY_LILY_PADS.get(), BYGBlocks.OVERGROWN_DACITE.get(), BYGBlocks.NETHER_BRISTLE.get()); - blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGBlocks.MAHOGANY_LEAVES.get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGBlocks.WILLOW_LEAVES.get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); + blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGWoodTypes.MAHOGANY.leaves().get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGBlocks.WILLOW_LEAVES.get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageWaterColor(lightReader, pos) : -1, BYGBlocks.WATER_BARREL_CACTUS.get()); } @@ -28,15 +28,12 @@ public static synchronized void onItemColorsInit(BlockColors blockColors, ItemCo return blockColors.getColor(state, null, null, tintIndex); }; - - if (itemBlockColourHandler != null) { - itemColors.register(itemBlockColourHandler, - BYGItems.LUSH_GRASS_BLOCK.get(), BYGItems.OVERGROWN_NETHERRACK.get(), BYGItems.MAHOGANY_LEAVES.get(), - BYGItems.POISON_IVY.get(), BYGItems.OVERGROWN_STONE.get(), - BYGItems.TINY_LILYPADS.get(), BYGItems.FLOWERING_TINY_LILY_PADS.get(), BYGItems.NETHER_BRISTLE.get(), BYGItems.OVERGROWN_DACITE.get(), BYGItems.LEAF_PILE.get(), - BYGItems.ORCHARD_LEAVES.get(), BYGItems.FLOWERING_ORCHARD_LEAVES.get(), BYGItems.RIPE_ORCHARD_LEAVES.get(), - BYGItems.WILLOW_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get(), - BYGItems.MAPLE_LEAVES.get(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); - } + itemColors.register(itemBlockColourHandler, + BYGItems.LUSH_GRASS_BLOCK.get(), BYGItems.OVERGROWN_NETHERRACK.get(), BYGWoodTypes.MAHOGANY.leaves().get(), + BYGItems.POISON_IVY.get(), BYGItems.OVERGROWN_STONE.get(), + BYGItems.TINY_LILYPADS.get(), BYGItems.FLOWERING_TINY_LILY_PADS.get(), BYGItems.NETHER_BRISTLE.get(), BYGItems.OVERGROWN_DACITE.get(), BYGItems.LEAF_PILE.get(), + BYGItems.ORCHARD_LEAVES.get(), BYGItems.FLOWERING_ORCHARD_LEAVES.get(), BYGItems.RIPE_ORCHARD_LEAVES.get(), + BYGItems.WILLOW_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get(), + BYGItems.MAPLE_LEAVES.get(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); } } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 3a3ec61328..044293d79c 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -140,8 +140,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Doors map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAHOGANY_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MANGROVE_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.PALM_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINE_DOOR.get(), RenderType.cutoutMipped()); @@ -158,8 +156,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAHOGANY_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MANGROVE_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.PALM_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINE_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -196,8 +192,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.INDIGO_JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JOSHUA_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAHOGANY_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MANGROVE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_OAK_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 23d2ad568d..09b2c9914c 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -34,8 +34,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_INDIGO_JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_JACARANDA_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.MAHOGANY_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.MANGROVE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_OAK_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_SPRUCE_LEAVES.get()); @@ -73,8 +71,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_BUSH.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_INDIGO_JACARANDA_BUSH.get()); - compostibleBlocks(0.3f, BYGItems.MAHOGANY_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.MANGROVE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_OAK_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.ORANGE_SPRUCE_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 95c77c58eb..e7b425247d 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -40,8 +40,6 @@ public static void flammablesBYG() { //Logs flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.MAHOGANY_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.MANGROVE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PINE_LOG.get(), 5, 5); @@ -54,8 +52,6 @@ public static void flammablesBYG() { //Stripped Logs flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MAHOGANY_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MANGROVE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_LOG.get(), 5, 5); @@ -67,8 +63,6 @@ public static void flammablesBYG() { //Wood flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.MAHOGANY_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.MANGROVE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PINE_WOOD.get(), 5, 5); @@ -81,8 +75,6 @@ public static void flammablesBYG() { //Stripped Wood flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MAHOGANY_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MANGROVE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_WOOD.get(), 5, 5); @@ -94,8 +86,6 @@ public static void flammablesBYG() { //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.MAHOGANY_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.MANGROVE_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.PINE_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_BOOKSHELF.get(), 5, 20); @@ -108,8 +98,6 @@ public static void flammablesBYG() { //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.MAHOGANY_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.MANGROVE_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.PINE_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_SLAB.get(), 5, 20); @@ -122,8 +110,6 @@ public static void flammablesBYG() { //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.MAHOGANY_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.MANGROVE_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.PINE_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_STAIRS.get(), 5, 20); @@ -136,8 +122,6 @@ public static void flammablesBYG() { //Planks flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.MAHOGANY_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.MANGROVE_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.PINE_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_PLANKS.get(), 5, 20); @@ -150,8 +134,6 @@ public static void flammablesBYG() { //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.MAHOGANY_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.MANGROVE_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.PINE_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_FENCE.get(), 5, 20); @@ -171,8 +153,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.HOLLY_BERRY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.JACARANDA_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.MAHOGANY_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.MANGROVE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_OAK_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_SPRUCE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 7b65ff9302..add576fe29 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -23,8 +23,6 @@ public static void strippableLogsBYG() { } stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); - stripables.put(BYGBlocks.MAHOGANY_LOG.get(), BYGBlocks.STRIPPED_MAHOGANY_LOG.get()); - stripables.put(BYGBlocks.MANGROVE_LOG.get(), BYGBlocks.STRIPPED_MANGROVE_LOG.get()); stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); stripables.put(BYGBlocks.PINE_LOG.get(), BYGBlocks.STRIPPED_PINE_LOG.get()); @@ -43,8 +41,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); - stripables.put(BYGBlocks.MAHOGANY_WOOD.get(), BYGBlocks.STRIPPED_MAHOGANY_WOOD.get()); - stripables.put(BYGBlocks.MANGROVE_WOOD.get(), BYGBlocks.STRIPPED_MANGROVE_WOOD.get()); stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); stripables.put(BYGBlocks.PINE_WOOD.get(), BYGBlocks.STRIPPED_PINE_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 85ccf272d5..bcf2b87e9d 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -86,7 +86,7 @@ public enum BYGWoodTypes { .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MAHOGANY) .materialColor(MaterialColor.COLOR_GREEN)), - MAGROVE("mangrove", new Builder() + MANGROVE("mangrove", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MANGROVE) .materialColor(MaterialColor.COLOR_GREEN)); diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index b28c95f982..9a8de0da71 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -53,8 +53,6 @@ public Item getDropItem() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.boat().get(); case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); - case MAHOGANY -> BYGItems.MAHOGANY_BOAT.get(); - case MANGROVE -> BYGItems.MANGROVE_BOAT.get(); case MAPLE -> BYGItems.MAPLE_BOAT.get(); case PINE -> BYGItems.PINE_BOAT.get(); case RAINBOW_EUCALYPTUS -> BYGItems.RAINBOW_EUCALYPTUS_BOAT.get(); @@ -74,8 +72,6 @@ public Block getPlanks() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.planks().get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); - case MAHOGANY -> BYGBlocks.MAHOGANY_PLANKS.get(); - case MANGROVE -> BYGBlocks.MANGROVE_PLANKS.get(); case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); case PALM -> BYGBlocks.PALM_PLANKS.get(); case PINE -> BYGBlocks.PINE_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 76816fd100..3568138617 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -386,7 +386,7 @@ public class BYGItems { // TODO Lamient, Jacaranda BYGWoodTypes.MAHOGANY.init(); - BYGWoodTypes.MAGROVE.init(); + BYGWoodTypes.MANGROVE.init(); } //Maple Woodtype diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 2d719fdd3a..81c7eb0d27 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -907,10 +907,10 @@ public class BYGOverworldTreeFeatures { BYG.createLocation("features/trees/mangrove_tree1_base"), BYG.createLocation("features/trees/mangrove_tree1_canopy"), BiasedToBottomInt.of(5, 15), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LOG.get()), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LEAVES.get()), - BYGBlocks.MANGROVE_LOG.get(), - BYGBlocks.MANGROVE_LEAVES.get(), + BlockStateProvider.simple(MANGROVE.log().get()), + BlockStateProvider.simple(MANGROVE.leaves().get()), + MANGROVE.log(), + MANGROVE.leaves(), BYGBlockTags.GROUND_MANGROVE_TREE, 5, ImmutableList.of(new LeaveVineDecorator(), new TrunkVineDecorator()) ) ); @@ -920,10 +920,10 @@ public class BYGOverworldTreeFeatures { BYG.createLocation("features/trees/mangrove_tree2_base"), BYG.createLocation("features/trees/mangrove_tree2_canopy"), BiasedToBottomInt.of(5, 15), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LOG.get()), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LEAVES.get()), - BYGBlocks.MANGROVE_LOG, - BYGBlocks.MANGROVE_LEAVES, + BlockStateProvider.simple(MANGROVE.log().get()), + BlockStateProvider.simple(MANGROVE.leaves().get()), + MANGROVE.log(), + MANGROVE.leaves(), BlockTags.DIRT, 5, ImmutableList.of(new LeaveVineDecorator(), new TrunkVineDecorator()) ) ); @@ -933,10 +933,10 @@ public class BYGOverworldTreeFeatures { BYG.createLocation("features/trees/mangrove_tree3_base"), BYG.createLocation("features/trees/mangrove_tree3_canopy"), BiasedToBottomInt.of(5, 15), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LOG.get()), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LEAVES.get()), - BYGBlocks.MANGROVE_LOG, - BYGBlocks.MANGROVE_LEAVES, + BlockStateProvider.simple(MANGROVE.log().get()), + BlockStateProvider.simple(MANGROVE.leaves().get()), + MANGROVE.log(), + MANGROVE.leaves(), BYGBlockTags.GROUND_MANGROVE_TREE, 5, ImmutableList.of(new LeaveVineDecorator(), new TrunkVineDecorator()) ) ); @@ -946,10 +946,10 @@ public class BYGOverworldTreeFeatures { BYG.createLocation("features/trees/mangrove_tree4_base"), BYG.createLocation("features/trees/mangrove_tree4_canopy"), BiasedToBottomInt.of(5, 15), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LOG.get()), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LEAVES.get()), - BYGBlocks.MANGROVE_LOG, - BYGBlocks.MANGROVE_LEAVES, + BlockStateProvider.simple(MANGROVE.log().get()), + BlockStateProvider.simple(MANGROVE.leaves().get()), + MANGROVE.log(), + MANGROVE.leaves(), BYGBlockTags.GROUND_MANGROVE_TREE, 5, ImmutableList.of(new LeaveVineDecorator(), new TrunkVineDecorator()) ) ); @@ -959,10 +959,10 @@ public class BYGOverworldTreeFeatures { BYG.createLocation("features/trees/mangrove_tree5_base"), BYG.createLocation("features/trees/mangrove_tree5_canopy"), BiasedToBottomInt.of(5, 15), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LOG.get()), - BlockStateProvider.simple(BYGBlocks.MANGROVE_LEAVES.get()), - BYGBlocks.MANGROVE_LOG, - BYGBlocks.MANGROVE_LEAVES, + BlockStateProvider.simple(MANGROVE.log().get()), + BlockStateProvider.simple(MANGROVE.leaves().get()), + MANGROVE.log(), + MANGROVE.leaves(), BYGBlockTags.GROUND_MANGROVE_TREE, 5, ImmutableList.of(new LeaveVineDecorator(), new TrunkVineDecorator()) ) ); @@ -1887,8 +1887,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> TROPICAL_SHRUB1 = createConfiguredFeature("tropical_shrub1", BYGFeatures.SHRUB1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMinHeight(2) .build() ); @@ -1896,8 +1896,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAHOGANY_TREE1 = createConfiguredFeature("mahogany_tree1", BYGFeatures.MAHOGANY_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMaxHeight(18) .setMinHeight(13) .build() @@ -1905,8 +1905,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAHOGANY_TREE2 = createConfiguredFeature("mahogany_tree2", BYGFeatures.MAHOGANY_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMaxHeight(14) .setMinHeight(8) .build() @@ -1914,8 +1914,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAHOGANY_TREE3 = createConfiguredFeature("mahogany_tree3", BYGFeatures.MAHOGANY_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMaxHeight(18) .setMinHeight(13) .build() @@ -1923,8 +1923,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAHOGANY_TREE4 = createConfiguredFeature("mahogany_tree4", BYGFeatures.MAHOGANY_TREE4, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMaxHeight(24) .setMinHeight(18) .build() @@ -1932,8 +1932,8 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAHOGANY_TREE5 = createConfiguredFeature("mahogany_tree5", BYGFeatures.MAHOGANY_TREE5, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAHOGANY_LOG.get()) - .setLeavesBlock(BYGBlocks.MAHOGANY_LEAVES.get()) + .setTrunkBlock(MAHOGANY.log().get()) + .setLeavesBlock(MAHOGANY.leaves().get()) .setMaxHeight(31) .setMinHeight(25) .build() diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_hyphae.json b/Common/src/main/resources/assets/byg/models/block/imparius_hyphae.json deleted file mode 100644 index d8c38a1428..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/imparius_stem_top2", - "side": "byg:block/imparius_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imparius_stem.json b/Common/src/main/resources/assets/byg/models/block/imparius_stem.json deleted file mode 100644 index b0e9c9b675..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/imparius_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/imparius_stem_top", - "side": "byg:block/imparius_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_hyphae.json b/Common/src/main/resources/assets/byg/models/item/imparius_hyphae.json deleted file mode 100644 index 286e3b54cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_hyphae.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/imparius_hyphae", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_stem.json b/Common/src/main/resources/assets/byg/models/item/imparius_stem.json deleted file mode 100644 index 939a32061a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_stem.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/imparius_stem", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_door_top.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/sapling.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_door_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/sapling.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mangrove_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/log_top.png diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index ddf174e1f0..2f2fa9a567 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -19,6 +19,7 @@ import net.minecraftforge.common.data.ExistingFileHelper; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.mixin.dev.ModelProviderAccess; import java.io.IOException; @@ -37,6 +38,7 @@ protected void registerStatesAndModels() { final var typeName = "block/" + type; final var typeLoc = "block/" + type + "/"; final var typeLocItem = "item/" + type + "/"; + final var topPlanks = models().existingFileHelper.exists(rl(typeLoc + "planks_top"), ModelProviderAccess.getTexture()); final var log = models().cubeColumn(typeName + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); From aa4333c32875c25b283502d80b760c07e3b192df Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 21:57:51 +0300 Subject: [PATCH 32/90] Allow planks to have `_top` textures --- Common/src/generated/resources/.cache/cache | 12 ++++++------ .../byg/models/block/blue_enchanted/planks.json | 6 +++--- .../byg/models/block/blue_enchanted/slab.json | 4 ++-- .../models/block/blue_enchanted/slab_top.json | 4 ++-- .../models/block/green_enchanted/planks.json | 6 +++--- .../byg/models/block/green_enchanted/slab.json | 4 ++-- .../models/block/green_enchanted/slab_top.json | 4 ++-- .../providers/BYGWoodAssetsProvider.java | 17 ++++++++++++----- .../byg/mixin/dev/ModelProviderAccess.java | 2 +- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index a087f454ce..34f4839939 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -305,11 +305,11 @@ de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted/ 6f20986996d0fd8e995a1895e0d95303f967c29f assets/byg/models/block/blue_enchanted/leaves.json 30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted/leaves_snowy.json fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted/log.json -e2fd0bbb982161d06a3c5359113df56fb96df5ab assets/byg/models/block/blue_enchanted/planks.json +39bc57ba19dd532abe0120d034cada631a59fd16 assets/byg/models/block/blue_enchanted/planks.json f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted/pressure_plate.json ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted/pressure_plate_down.json -ddfaf3a3114a8727610eeb2a27663ad09f3bd187 assets/byg/models/block/blue_enchanted/slab.json -a6f663a7b9b3dde3ae9a7c7987073a8a19ade11b assets/byg/models/block/blue_enchanted/slab_top.json +35e14c8e67a4d0722c5fec599160118c768fd6a0 assets/byg/models/block/blue_enchanted/slab.json +bb861cc6424f39c44f08c291dce0119836f8a514 assets/byg/models/block/blue_enchanted/slab_top.json eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/stairs.json 5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted/stairs_inner.json 615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted/stairs_outer.json @@ -564,11 +564,11 @@ c83a741fa92ce99e49e11568f3d4b687f01d48d2 assets/byg/models/block/green_enchanted ea1a5f701b6700c4b09ea0eb117d15968a8997b6 assets/byg/models/block/green_enchanted/leaves.json eeb54b895bd56056a8560a853c7fd2b8ddedfa97 assets/byg/models/block/green_enchanted/leaves_snowy.json eea2c5a58d034a68c04ab97323f15265dd1a26a0 assets/byg/models/block/green_enchanted/log.json -a9bb32322b035cfb409ddd523934bc31f67d2ecf assets/byg/models/block/green_enchanted/planks.json +a08a63cf2eb65db51a67bcb4697845789876d9be assets/byg/models/block/green_enchanted/planks.json 19e1280be2ea5be08fd4e2eaa1edb094428d0e5b assets/byg/models/block/green_enchanted/pressure_plate.json 1acc016884ce274e82fa55ef2a4ba713648c51f0 assets/byg/models/block/green_enchanted/pressure_plate_down.json -d193fe41d62d1432cc6dec8e8fdbd260db7cfc61 assets/byg/models/block/green_enchanted/slab.json -769ce0b35b5e56864aac74d6296c6050ba16768e assets/byg/models/block/green_enchanted/slab_top.json +88134b54294516c1f9d108d22da8d63e9776304b assets/byg/models/block/green_enchanted/slab.json +f2343edc3dc92d2d0101eb709c877e190128588e assets/byg/models/block/green_enchanted/slab_top.json 09003ed5b44621cb46ceede1b10cdcd74e037391 assets/byg/models/block/green_enchanted/stairs.json 6e0a6811eb26b37eb338671b77647797a89cabb1 assets/byg/models/block/green_enchanted/stairs_inner.json 5349f05565f57fff8f1d7537c4a87a24898e0b09 assets/byg/models/block/green_enchanted/stairs_outer.json diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json index 4ae0446074..fd69ee25ad 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json @@ -1,12 +1,12 @@ { "parent": "minecraft:block/cube", "textures": { - "down": "byg:block/blue_enchanted/planks", - "up": "byg:block/blue_enchanted/planks", + "down": "byg:block/blue_enchanted/planks_top", + "up": "byg:block/blue_enchanted/planks_top", "north": "byg:block/blue_enchanted/planks", "south": "byg:block/blue_enchanted/planks", "east": "byg:block/blue_enchanted/planks", "west": "byg:block/blue_enchanted/planks", - "particle": "byg:block/blue_enchanted/planks" + "particle": "byg:block/blue_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json index 6138def462..caf7d1ab26 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/slab", "textures": { "side": "byg:block/blue_enchanted/planks", - "bottom": "byg:block/blue_enchanted/planks", - "top": "byg:block/blue_enchanted/planks" + "bottom": "byg:block/blue_enchanted/planks_top", + "top": "byg:block/blue_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json index 24f7777cc8..91fc5bf50f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/slab_top", "textures": { "side": "byg:block/blue_enchanted/planks", - "bottom": "byg:block/blue_enchanted/planks", - "top": "byg:block/blue_enchanted/planks" + "bottom": "byg:block/blue_enchanted/planks_top", + "top": "byg:block/blue_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json index 02ea832c0e..22ad18bbe8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json @@ -1,12 +1,12 @@ { "parent": "minecraft:block/cube", "textures": { - "down": "byg:block/green_enchanted/planks", - "up": "byg:block/green_enchanted/planks", + "down": "byg:block/green_enchanted/planks_top", + "up": "byg:block/green_enchanted/planks_top", "north": "byg:block/green_enchanted/planks", "south": "byg:block/green_enchanted/planks", "east": "byg:block/green_enchanted/planks", "west": "byg:block/green_enchanted/planks", - "particle": "byg:block/green_enchanted/planks" + "particle": "byg:block/green_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json index 14906b2257..3733b7bb38 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/slab", "textures": { "side": "byg:block/green_enchanted/planks", - "bottom": "byg:block/green_enchanted/planks", - "top": "byg:block/green_enchanted/planks" + "bottom": "byg:block/green_enchanted/planks_top", + "top": "byg:block/green_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json index 1472268fcb..926cc07c66 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/slab_top", "textures": { "side": "byg:block/green_enchanted/planks", - "bottom": "byg:block/green_enchanted/planks", - "top": "byg:block/green_enchanted/planks" + "bottom": "byg:block/green_enchanted/planks_top", + "top": "byg:block/green_enchanted/planks_top" } } \ No newline at end of file diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 2f2fa9a567..aaefa13bba 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -38,7 +38,8 @@ protected void registerStatesAndModels() { final var typeName = "block/" + type; final var typeLoc = "block/" + type + "/"; final var typeLocItem = "item/" + type + "/"; - final var topPlanks = models().existingFileHelper.exists(rl(typeLoc + "planks_top"), ModelProviderAccess.getTexture()); + final var topPlanksLoc = rl(typeLoc + "planks_top"); + final var topPlanks = models().existingFileHelper.exists(topPlanksLoc, ModelProviderAccess.getTexture()); final var log = models().cubeColumn(typeName + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); @@ -137,8 +138,14 @@ protected void registerStatesAndModels() { simpleBlock(type.leaves().get(), leaves); // TODO leaves should be snowy as well } final var planksLoc = rl(typeLoc + "planks"); - final var planks = models().cube(typeName + "/planks", planksLoc, planksLoc, planksLoc, planksLoc, planksLoc, planksLoc) - .texture("particle", planksLoc); + final var planks = models().cube(typeName + "/planks", + topPlanks ? topPlanksLoc : planksLoc, + topPlanks ? topPlanksLoc : planksLoc, + planksLoc, + planksLoc, + planksLoc, + planksLoc + ).texture("particle", topPlanks ? topPlanksLoc : planksLoc); configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); simpleBlock(type.planks().get(), planks); @@ -159,8 +166,8 @@ protected void registerStatesAndModels() { configureTransform(item.withExistingParent(type.pressurePlate().getId().getPath(), pressurePlate.getLocation())); pressurePlateBlock((PressurePlateBlock) type.pressurePlate().get(), pressurePlate, pressurePlateDown); - final var slab = models().slab(typeName + "/slab", planksLoc, planksLoc, planksLoc); - final var slabTop = models().slabTop(typeName + "/slab_top", planksLoc, planksLoc, planksLoc); + final var slab = models().slab(typeName + "/slab", planksLoc, topPlanks ? topPlanksLoc : planksLoc, topPlanks ? topPlanksLoc : planksLoc); + final var slabTop = models().slabTop(typeName + "/slab_top", planksLoc, topPlanks ? topPlanksLoc : planksLoc, topPlanks ? topPlanksLoc : planksLoc); configureTransform(item.withExistingParent(type.slab().getId().getPath(), slab.getLocation())); slabBlock((SlabBlock) type.slab().get(), slab, slabTop, planks); diff --git a/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelProviderAccess.java b/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelProviderAccess.java index a6bbdfd78a..7c2952f6bf 100644 --- a/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelProviderAccess.java +++ b/Forge/src/main/java/potionstudios/byg/mixin/dev/ModelProviderAccess.java @@ -7,7 +7,7 @@ @Mixin(ModelProvider.class) public interface ModelProviderAccess { - @Accessor("TEXTURE") + @Accessor(value = "TEXTURE", remap = false) static ExistingFileHelper.ResourceType getTexture() { throw new Error("Mixin failed!"); } From b2246d40e5711b25e268b08a8a50e90cbf718e35 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 22:16:04 +0300 Subject: [PATCH 33/90] Add palm --- Common/src/generated/resources/.cache/cache | 90 ++++++++ .../byg/blockstates/palm_bookshelf.json | 7 + .../assets/byg/blockstates/palm_button.json | 118 ++++++++++ .../byg/blockstates/palm_crafting_table.json | 7 + .../assets/byg/blockstates/palm_door.json | 124 +++++++++++ .../assets/byg/blockstates/palm_fence.json | 40 ++-- .../byg/blockstates/palm_fence_gate.json | 80 +++++++ .../assets/byg/blockstates/palm_leaves.json | 2 +- .../assets/byg/blockstates/palm_log.json | 6 +- .../assets/byg/blockstates/palm_planks.json | 2 +- .../byg/blockstates/palm_pressure_plate.json | 10 + .../assets/byg/blockstates/palm_sapling.json | 7 + .../assets/byg/blockstates/palm_slab.json | 13 ++ .../assets/byg/blockstates/palm_stairs.json | 209 ++++++++++++++++++ .../assets/byg/blockstates/palm_trapdoor.json | 68 ++++++ .../assets/byg/blockstates/palm_wood.json | 16 ++ .../byg/models/block/palm/bookshelf.json | 12 + .../assets/byg/models/block/palm/button.json} | 2 +- .../models/block/palm/button_inventory.json} | 2 +- .../models/block/palm/button_pressed.json} | 2 +- .../byg/models/block/palm/crafting_table.json | 12 + .../byg/models/block/palm/door_bottom.json | 7 + .../models/block/palm/door_bottom_hinge.json | 7 + .../byg/models/block/palm/door_top.json | 7 + .../byg/models/block/palm/door_top_hinge.json | 7 + .../assets/byg/models/block/palm/fence.json | 7 + .../byg/models/block/palm/fence_gate.json} | 2 +- .../models/block/palm/fence_gate_open.json} | 2 +- .../models/block/palm/fence_gate_wall.json} | 2 +- .../block/palm/fence_gate_wall_open.json} | 2 +- .../byg/models/block/palm/fence_inv.json | 7 + .../byg/models/block/palm/fence_post.json | 7 + .../byg/models/block/palm/grower_item.json | 6 + .../assets/byg/models/block/palm/leaves.json | 12 + .../byg/models/block/palm/leaves_snowy.json | 12 + .../assets/byg/models/block/palm/log.json | 7 + .../assets/byg/models/block/palm/planks.json | 12 + .../models/block/palm/pressure_plate.json} | 2 +- .../block/palm/pressure_plate_down.json} | 2 +- .../assets/byg/models/block/palm/slab.json | 8 + .../byg/models/block/palm/slab_top.json | 8 + .../assets/byg/models/block/palm/stairs.json | 8 + .../byg/models/block/palm/stairs_inner.json | 8 + .../byg/models/block/palm/stairs_outer.json | 8 + .../byg/models/block/palm/trapdoor.json | 39 ++++ .../models/block/palm/trapdoor_bottom.json} | 2 +- .../byg/models/block/palm/trapdoor_open.json} | 2 +- .../byg/models/block/palm/trapdoor_top.json} | 2 +- .../assets/byg/models/block/palm/wood.json | 7 + .../assets/byg/models/item/palm_boat.json | 6 + .../byg/models/item/palm_bookshelf.json | 39 ++++ .../assets/byg/models/item/palm_button.json | 39 ++++ .../byg/models/item/palm_crafting_table.json | 39 ++++ .../assets/byg/models/item/palm_door.json | 2 +- .../assets/byg/models/item/palm_fence.json | 39 ++++ .../assets/byg/models/item/palm_leaves.json | 39 ++++ .../assets/byg/models/item/palm_log.json | 39 ++++ .../assets/byg/models/item/palm_planks.json | 39 ++++ .../byg/models/item/palm_pressure_plate.json | 39 ++++ .../assets/byg/models/item/palm_sapling.json | 6 + .../assets/byg/models/item/palm_slab.json | 39 ++++ .../assets/byg/models/item/palm_stairs.json | 39 ++++ .../assets/byg/models/item/palm_wood.json | 39 ++++ .../recipes/byg.byg/wood/palm/boat.json | 34 +++ .../recipes/byg.byg/wood/palm/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/palm/button.json | 34 +++ .../byg.byg/wood/palm/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/palm/door.json | 34 +++ .../recipes/byg.byg/wood/palm/fence.json | 34 +++ .../recipes/byg.byg/wood/palm/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/palm/planks.json | 32 +++ .../byg.byg/wood/palm/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/palm/slab.json | 34 +++ .../recipes/byg.byg/wood/palm/stairs.json | 34 +++ .../recipes/byg.byg/wood/palm/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/palm/wood.json | 34 +++ .../data/byg/recipes/wood/palm/boat.json} | 6 +- .../byg/recipes/wood/palm/bookshelf.json} | 11 +- .../data/byg/recipes/wood/palm/button.json} | 0 .../recipes/wood/palm/crafting_table.json} | 7 +- .../data/byg/recipes/wood/palm/door.json} | 8 +- .../data/byg/recipes/wood/palm/fence.json} | 0 .../byg/recipes/wood/palm/fence_gate.json} | 0 .../data/byg/recipes/wood/palm/planks.json} | 4 +- .../recipes/wood/palm/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/palm/slab.json} | 4 +- .../data/byg/recipes/wood/palm/stairs.json} | 10 +- .../data/byg/recipes/wood/palm/trapdoor.json} | 6 +- .../data/byg/recipes/wood/palm/wood.json} | 7 +- .../data/byg/tags/blocks/wood/palm_logs.json | 9 + .../data/byg/tags/items/wood/palm_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 8 - .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 4 + .../byg/common/entity/boat/BYGBoatEntity.java | 2 - .../byg/common/item/BYGItems.java | 117 ++++------ .../world/feature/BYGPlacedFeatures.java | 3 +- .../overworld/BYGOverworldFeatures.java | 3 +- .../overworld/BYGOverworldTreeFeatures.java | 12 +- .../byg/blockstates/palm_bookshelf.json | 7 - .../assets/byg/blockstates/palm_button.json | 118 ---------- .../byg/blockstates/palm_crafting_table.json | 7 - .../assets/byg/blockstates/palm_door.json | 124 ----------- .../byg/blockstates/palm_fence_gate.json | 80 ------- .../byg/blockstates/palm_pressure_plate.json | 10 - .../assets/byg/blockstates/palm_sapling.json | 7 - .../assets/byg/blockstates/palm_slab.json | 13 -- .../assets/byg/blockstates/palm_stairs.json | 209 ------------------ .../assets/byg/blockstates/palm_trapdoor.json | 68 ------ .../assets/byg/blockstates/palm_wood.json | 16 -- .../byg/models/block/palm_bookshelf.json | 12 - .../byg/models/block/palm_crafting_table.json | 12 - .../byg/models/block/palm_door_bottom.json | 7 - .../models/block/palm_door_bottom_hinge.json | 7 - .../byg/models/block/palm_door_top.json | 7 - .../byg/models/block/palm_door_top_hinge.json | 7 - .../models/block/palm_fence_inventory.json | 6 - .../byg/models/block/palm_fence_post.json | 6 - .../assets/byg/models/block/palm_leaves.json | 6 - .../assets/byg/models/block/palm_log.json | 7 - .../assets/byg/models/block/palm_planks.json | 6 - .../assets/byg/models/block/palm_sapling.json | 7 - .../assets/byg/models/block/palm_slab.json | 8 - .../byg/models/block/palm_slab_top.json | 8 - .../assets/byg/models/block/palm_stairs.json | 8 - .../byg/models/block/palm_stairs_inner.json | 8 - .../byg/models/block/palm_stairs_outer.json | 8 - .../assets/byg/models/block/palm_wood.json | 7 - .../assets/byg/models/item/palm_boat.json | 6 - .../byg/models/item/palm_bookshelf.json | 22 -- .../assets/byg/models/item/palm_button.json | 3 - .../byg/models/item/palm_crafting_table.json | 22 -- .../assets/byg/models/item/palm_fence.json | 3 - .../byg/models/item/palm_fence_gate.json | 3 - .../assets/byg/models/item/palm_leaves.json | 3 - .../assets/byg/models/item/palm_log.json | 3 - .../assets/byg/models/item/palm_planks.json | 3 - .../byg/models/item/palm_pressure_plate.json | 3 - .../assets/byg/models/item/palm_sapling.json | 6 - .../assets/byg/models/item/palm_slab.json | 3 - .../assets/byg/models/item/palm_stairs.json | 3 - .../assets/byg/models/item/palm_trapdoor.json | 3 - .../assets/byg/models/item/palm_wood.json | 3 - .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../{palm_door_top.png => palm/door_top.png} | Bin .../grower_item.png} | Bin .../{palm_leaves.png => palm/leaves.png} | Bin .../block/{palm_log.png => palm/log.png} | Bin .../{palm_log_top.png => palm/log_top.png} | Bin .../{palm_planks.png => palm/planks.png} | Bin .../{palm_trapdoor.png => palm/trapdoor.png} | Bin .../item/{palm_boat.png => palm/boat.png} | Bin .../item/{palm_door.png => palm/door.png} | Bin 161 files changed, 1990 insertions(+), 1070 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_door.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/palm_fence.json (70%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/palm_leaves.json (50%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/palm_log.json (50%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/palm_planks.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json rename Common/src/{main/resources/assets/byg/models/block/palm_button.json => generated/resources/assets/byg/models/block/palm/button.json} (61%) rename Common/src/{main/resources/assets/byg/models/block/palm_button_inventory.json => generated/resources/assets/byg/models/block/palm/button_inventory.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/palm_button_pressed.json => generated/resources/assets/byg/models/block/palm/button_pressed.json} (63%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/fence.json rename Common/src/{main/resources/assets/byg/models/block/palm_fence_gate.json => generated/resources/assets/byg/models/block/palm/fence_gate.json} (65%) rename Common/src/{main/resources/assets/byg/models/block/palm_fence_gate_open.json => generated/resources/assets/byg/models/block/palm/fence_gate_open.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/palm_fence_gate_wall.json => generated/resources/assets/byg/models/block/palm/fence_gate_wall.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/palm_fence_gate_wall_open.json => generated/resources/assets/byg/models/block/palm/fence_gate_wall_open.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/planks.json rename Common/src/{main/resources/assets/byg/models/block/palm_pressure_plate.json => generated/resources/assets/byg/models/block/palm/pressure_plate.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/palm_pressure_plate_down.json => generated/resources/assets/byg/models/block/palm/pressure_plate_down.json} (65%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json rename Common/src/{main/resources/assets/byg/models/block/palm_trapdoor_bottom.json => generated/resources/assets/byg/models/block/palm/trapdoor_bottom.json} (68%) rename Common/src/{main/resources/assets/byg/models/block/palm_trapdoor_open.json => generated/resources/assets/byg/models/block/palm/trapdoor_open.json} (68%) rename Common/src/{main/resources/assets/byg/models/block/palm_trapdoor_top.json => generated/resources/assets/byg/models/block/palm/trapdoor_top.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/models/item/palm_door.json (64%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json rename Common/src/{main/resources/data/byg/recipes/palm_boat.json => generated/resources/data/byg/recipes/wood/palm/boat.json} (84%) rename Common/src/{main/resources/data/byg/recipes/palm_bookshelf.json => generated/resources/data/byg/recipes/wood/palm/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/palm_button.json => generated/resources/data/byg/recipes/wood/palm/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/palm_crafting_table.json => generated/resources/data/byg/recipes/wood/palm/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/palm_door.json => generated/resources/data/byg/recipes/wood/palm/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/palm_fence.json => generated/resources/data/byg/recipes/wood/palm/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/palm_fence_gate.json => generated/resources/data/byg/recipes/wood/palm/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/palm_planks.json => generated/resources/data/byg/recipes/wood/palm/planks.json} (70%) rename Common/src/{main/resources/data/byg/recipes/palm_pressure_plate.json => generated/resources/data/byg/recipes/wood/palm/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/palm_slab.json => generated/resources/data/byg/recipes/wood/palm/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/palm_stairs.json => generated/resources/data/byg/recipes/wood/palm/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/palm_trapdoor.json => generated/resources/data/byg/recipes/wood/palm/trapdoor.json} (86%) rename Common/src/{main/resources/data/byg/recipes/palm_wood.json => generated/resources/data/byg/recipes/wood/palm/wood.json} (78%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/palm_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_wood.json rename Common/src/main/resources/assets/byg/textures/block/{palm_bookshelf.png => palm/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_crafting_table_front.png => palm/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_crafting_table_side.png => palm/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_crafting_table_top.png => palm/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_door_bottom.png => palm/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_door_top.png => palm/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_sapling.png => palm/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_leaves.png => palm/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_log.png => palm/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_log_top.png => palm/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_planks.png => palm/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{palm_trapdoor.png => palm/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{palm_boat.png => palm/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{palm_door.png => palm/door.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 34f4839939..a5c4feaa0b 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -219,6 +219,21 @@ b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.js 91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json 2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json +f0a003b2821eb17ac9cf27388185f531cefe7653 assets/byg/blockstates/palm_bookshelf.json +3466ff62b97c684f6d8ff7abe5a8a3d96b429a90 assets/byg/blockstates/palm_button.json +61377cd034b199721da044ffd0c875a6b49cc67c assets/byg/blockstates/palm_crafting_table.json +3449c0ef09bb0e5f8c92c5c709fdf0f2a56a05a0 assets/byg/blockstates/palm_door.json +93ad90e8289647bbaa141ed6a637bf2dc058ae32 assets/byg/blockstates/palm_fence.json +e335d52b5e98babb8b8a4389d9131d3f0041536c assets/byg/blockstates/palm_fence_gate.json +d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json +2acdc031d487058d845c3329a3827f15d82fe7b0 assets/byg/blockstates/palm_log.json +298d4def743ce4e5ce7c003a7b49c0f7330303ea assets/byg/blockstates/palm_planks.json +45478de6055e297c3e7c48cea64ed01c7d467bda assets/byg/blockstates/palm_pressure_plate.json +41da9cc7e22e224aad2c6e70289dcc24cd118dc6 assets/byg/blockstates/palm_sapling.json +924d7256dc908c9220adb0dccb093c6139706005 assets/byg/blockstates/palm_slab.json +7ea376d4c1145b038ecc0ca79323c3f058b761a6 assets/byg/blockstates/palm_stairs.json +6b58b359208df4fcf6bca915b553ff5651edcf74 assets/byg/blockstates/palm_trapdoor.json +c457911d73a2555da1376d374044c87d794f090c assets/byg/blockstates/palm_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -707,6 +722,39 @@ cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/block/mangrove/trapdo c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json 36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json db85b26584a130734c0c18b1b8e10e3bf071a97f assets/byg/models/block/mangrove/wood.json +73775020269c46d7eed295cd6898a9c700aea43e assets/byg/models/block/palm/bookshelf.json +8335e3f7ec34c1899bc24bda1d2c9f8a1e8be121 assets/byg/models/block/palm/button.json +46315a53d6effb3be613f52987aa17c55d4a092b assets/byg/models/block/palm/button_inventory.json +ed58fe15ff1d283e1d52d1d9e8cd7690bd8f49aa assets/byg/models/block/palm/button_pressed.json +5cf611605dab06abba92679d61ece89391aa36ca assets/byg/models/block/palm/crafting_table.json +4b6fad4024bb79b7c5b1812c62693439ad2fb1ed assets/byg/models/block/palm/door_bottom.json +757688bf70cd9d6e09fe8207c280f1464bbd43ea assets/byg/models/block/palm/door_bottom_hinge.json +dd01e3f77dd538ebffb433401e2abb4749bdc061 assets/byg/models/block/palm/door_top.json +9fec5541017a313b1ba9270977afe0ba1b731254 assets/byg/models/block/palm/door_top_hinge.json +fee846a169981ca459779623143dc02e6d86bdd3 assets/byg/models/block/palm/fence.json +27165ea31d155455c3c8fed9d97b539bbdb7bde5 assets/byg/models/block/palm/fence_gate.json +1e56b93de8e6a1049244435d645ac5b06d264b75 assets/byg/models/block/palm/fence_gate_open.json +f5c31c13dc733a6161974fcc8ef10c52e83ec858 assets/byg/models/block/palm/fence_gate_wall.json +9c263ccbf426b396fb73f5da316aaf9af3fab324 assets/byg/models/block/palm/fence_gate_wall_open.json +7076e4c05d75be039980ce353080b2e3aca6c6b4 assets/byg/models/block/palm/fence_inv.json +a4c294d282211afdd4c2f736adfb26be1452b6bb assets/byg/models/block/palm/fence_post.json +0e5e6e614254e995dbaad57a84644bdc919eb581 assets/byg/models/block/palm/grower_item.json +fd667e5c8b18477e65519b611e8623778ab857da assets/byg/models/block/palm/leaves.json +4f4933f9a710e6df9b6b92f3fc6d7de0e27fd6b5 assets/byg/models/block/palm/leaves_snowy.json +1a042fa111eede6c830941db7040a8f0793d0cc5 assets/byg/models/block/palm/log.json +87d02a07f728a1557a8c0bdc92e4cf4078ca653c assets/byg/models/block/palm/planks.json +5c0275305fb2d94f5b203d646ff655cdb574da88 assets/byg/models/block/palm/pressure_plate.json +15e19f59603d7611419e5bf01ee7dc08bef58519 assets/byg/models/block/palm/pressure_plate_down.json +0705637c3f7703f7fcc3e25846da8c4a8e76877e assets/byg/models/block/palm/slab.json +a450c220fb7e0a98871a0bfe4291792123cdb027 assets/byg/models/block/palm/slab_top.json +b7b8e43c14a1b02612d0a08653aa2dd092031fd6 assets/byg/models/block/palm/stairs.json +d83d60d140d029181ce03d57993a7eb176862497 assets/byg/models/block/palm/stairs_inner.json +67bd4f349f4b6bf162f11bc05fa6e8b8245c56a4 assets/byg/models/block/palm/stairs_outer.json +2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/block/palm/trapdoor.json +c96021f0305bcae8f8d5b28e3580b898f9b885fe assets/byg/models/block/palm/trapdoor_bottom.json +6779b160647712fb544f5d3279f5ba0a81bbce26 assets/byg/models/block/palm/trapdoor_open.json +85806014cd8d8bc66feabfbfad47ca246e70463d assets/byg/models/block/palm/trapdoor_top.json +a0ff5273aa52b8d89e0645aba68d5f917a515f6b assets/byg/models/block/palm/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -910,6 +958,20 @@ b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves. 6ae725945788d34d3471f064cf00ffe7b457fb3c assets/byg/models/item/mangrove_slab.json 9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json +18000c946ed522199aa1da394e8a7d0b5ccf8853 assets/byg/models/item/palm_boat.json +a4ed7d5608be7b13280da58fb439fcc3326621c4 assets/byg/models/item/palm_bookshelf.json +0a1741fe2250f9d95c6d2429b41418f153311a9d assets/byg/models/item/palm_button.json +767d3574ba62ced07e4293c68d00fb825469637f assets/byg/models/item/palm_crafting_table.json +d0073c6fbb4fed6c68ac36135053578c32cd193b assets/byg/models/item/palm_door.json +dd1a1264aa8bf8d4aa600aa3beb9eaaa3ae3dcce assets/byg/models/item/palm_fence.json +6674afdb2ea44229f5ba7c0cc432ab03ebe8a0b8 assets/byg/models/item/palm_leaves.json +36747572f9161d3e79f34c02d26d0dc0289b5aa1 assets/byg/models/item/palm_log.json +02b33321f618cec53691f04382a3f84de5538ab5 assets/byg/models/item/palm_planks.json +b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_plate.json +828ed945909c554046fa0e466626f633a9075dc1 assets/byg/models/item/palm_sapling.json +3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json +ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json +641ded0df8c74eff47030fbf79f9bc373d58fb9a assets/byg/models/item/palm_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -1102,6 +1164,19 @@ cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/w c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json 80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json 8e68638672aded0392ab42d4d99747032a597867 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json +91ec4bd9aa552d0c8185558e473bd37dea9ed4ba data/byg/advancements/recipes/byg.byg/wood/palm/boat.json +ea278f1d625776b8651b4126ca2cbbff65364aaa data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json +742cf53a038d7572b6c0d2c290349c2768e24198 data/byg/advancements/recipes/byg.byg/wood/palm/button.json +8c5f37d7161c4811644c469de9db10b010351dea data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json +7269122ac7f4e3ca77a66fb6ac21b7ca910350dd data/byg/advancements/recipes/byg.byg/wood/palm/door.json +4e24e5388c8c084afdb20663d2dd4e4c5df2a731 data/byg/advancements/recipes/byg.byg/wood/palm/fence.json +44a7dc86b3fe68ce619d6a2b13485fb9b6dd8f92 data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json +45701258292dcade3701dfa6e86536873b530ed2 data/byg/advancements/recipes/byg.byg/wood/palm/planks.json +507824f93c6a3e112a25ef20217669dafaa235d4 data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json +ded595aca78b27ff23c66f8d0584185e2764ffbc data/byg/advancements/recipes/byg.byg/wood/palm/slab.json +40c85e634608fe669547035181bb8c43be47449f data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json +a7caf367c6e2d197bc9d109a3fbc6e1e08bf26c5 data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json +835a274afc35e3c414eedfea46ff3490dd18a98f data/byg/advancements/recipes/byg.byg/wood/palm/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -1294,6 +1369,19 @@ b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshel 5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json 9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json abd1d968c12a7255a1504388adb8d92700c82692 data/byg/recipes/wood/mangrove/wood.json +247270685d75f0d12b2aafa381070f6631892aca data/byg/recipes/wood/palm/boat.json +e01f1b1b87ff1f6511f7cc2d1f04f457b96bfb01 data/byg/recipes/wood/palm/bookshelf.json +64410fa72ab5ce643357c3ba80c2cbc2f2d52310 data/byg/recipes/wood/palm/button.json +4690828bbeff88ab7d98224b91caf4bbaed143af data/byg/recipes/wood/palm/crafting_table.json +821de9401aa3f912f0cb9232a3d466550c6afdbd data/byg/recipes/wood/palm/door.json +d6f56b21d8d030c5c0d7259c4012482588bb016e data/byg/recipes/wood/palm/fence.json +183ca9fb9f223dbd21a30c02afb9a364cd821d54 data/byg/recipes/wood/palm/fence_gate.json +84c066105d39659d690885a593cc9698fa7fc0e2 data/byg/recipes/wood/palm/planks.json +1c06ed0ee707db44cb23332ee623a07efb2187a7 data/byg/recipes/wood/palm/pressure_plate.json +e8fd0779a8eb0c996d45f66461d0391fd77b9d13 data/byg/recipes/wood/palm/slab.json +69ac3c83af773a6a3c9edeaf738306320f72f81c data/byg/recipes/wood/palm/stairs.json +6c73f4e9cd248aa03cf2caad2bf3293356429246 data/byg/recipes/wood/palm/trapdoor.json +2290d2f878ab2585629fc476886d1ed1a0b8899c data/byg/recipes/wood/palm/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1433,6 +1521,7 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant 60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json 095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json 5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json +701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json @@ -1448,4 +1537,5 @@ be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchante 265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json 5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json +cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/palm_bookshelf.json new file mode 100644 index 0000000000..5d356880e6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_button.json b/Common/src/generated/resources/assets/byg/blockstates/palm_button.json new file mode 100644 index 0000000000..56b6efdaf9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/palm/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/palm/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/palm/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/palm/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/palm/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/palm/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/palm/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/palm/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/palm/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/palm_crafting_table.json new file mode 100644 index 0000000000..ba31a53e24 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_door.json b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json new file mode 100644 index 0000000000..5cda3f378b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_fence.json b/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json similarity index 70% rename from Common/src/main/resources/assets/byg/blockstates/palm_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/palm_fence.json index f947f2e5ed..70acc0ea66 100644 --- a/Common/src/main/resources/assets/byg/blockstates/palm_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json @@ -2,46 +2,46 @@ "multipart": [ { "apply": { - "model": "byg:block/palm_fence_post" + "model": "byg:block/palm/fence_post" } }, { - "apply": { - "model": "byg:block/palm_fence_side", - "uvlock": true - }, "when": { "north": "true" - } - }, - { + }, "apply": { - "model": "byg:block/palm_fence_side", - "y": 90, + "model": "byg:block/palm/fence", "uvlock": true - }, - "when": { - "east": "true" } }, { + "when": { + "south": "true" + }, "apply": { - "model": "byg:block/palm_fence_side", + "model": "byg:block/palm/fence", "y": 180, "uvlock": true - }, - "when": { - "south": "true" } }, { + "when": { + "west": "true" + }, "apply": { - "model": "byg:block/palm_fence_side", + "model": "byg:block/palm/fence", "y": 270, "uvlock": true - }, + } + }, + { "when": { - "west": "true" + "east": "true" + }, + "apply": { + "model": "byg:block/palm/fence", + "y": 90, + "uvlock": true } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json new file mode 100644 index 0000000000..1ec179d6a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/palm_leaves.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/palm_leaves.json rename to Common/src/generated/resources/assets/byg/blockstates/palm_leaves.json index ddfb90432c..ed18f26a89 100644 --- a/Common/src/main/resources/assets/byg/blockstates/palm_leaves.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_leaves.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/palm_leaves" + "model": "byg:block/palm/leaves" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_log.json b/Common/src/generated/resources/assets/byg/blockstates/palm_log.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/palm_log.json rename to Common/src/generated/resources/assets/byg/blockstates/palm_log.json index ed7ac14cd6..ae5a96d264 100644 --- a/Common/src/main/resources/assets/byg/blockstates/palm_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_log.json @@ -1,15 +1,15 @@ { "variants": { "axis=x": { - "model": "byg:block/palm_log_horizontal", + "model": "byg:block/palm/log", "x": 90, "y": 90 }, "axis=y": { - "model": "byg:block/palm_log" + "model": "byg:block/palm/log" }, "axis=z": { - "model": "byg:block/palm_log_horizontal", + "model": "byg:block/palm/log", "x": 90 } } diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_planks.json b/Common/src/generated/resources/assets/byg/blockstates/palm_planks.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/palm_planks.json rename to Common/src/generated/resources/assets/byg/blockstates/palm_planks.json index 04f0263c4b..bd3e2d57c3 100644 --- a/Common/src/main/resources/assets/byg/blockstates/palm_planks.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_planks.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/palm_planks" + "model": "byg:block/palm/planks" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/palm_pressure_plate.json new file mode 100644 index 0000000000..1f5a2a8c57 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/palm/pressure_plate" + }, + "powered=true": { + "model": "byg:block/palm/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/palm_sapling.json new file mode 100644 index 0000000000..37ee9225ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json b/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json new file mode 100644 index 0000000000..f7778bfd5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/palm/slab_top" + }, + "type=bottom": { + "model": "byg:block/palm/slab" + }, + "type=double": { + "model": "byg:block/palm/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json new file mode 100644 index 0000000000..08eab5ad4d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json new file mode 100644 index 0000000000..5910c8dd13 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/palm/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/palm/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/palm/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/palm/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_wood.json b/Common/src/generated/resources/assets/byg/blockstates/palm_wood.json new file mode 100644 index 0000000000..d60e451620 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/palm/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/palm/wood" + }, + "axis=z": { + "model": "byg:block/palm/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json new file mode 100644 index 0000000000..3c31b96165 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/palm/planks", + "up": "byg:block/palm/planks", + "north": "byg:block/palm/bookshelf", + "south": "byg:block/palm/bookshelf", + "east": "byg:block/palm/bookshelf", + "west": "byg:block/palm/bookshelf", + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_button.json b/Common/src/generated/resources/assets/byg/models/block/palm/button.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/palm_button.json rename to Common/src/generated/resources/assets/byg/models/block/palm/button.json index 7a7159ccd3..49ffd2c5d5 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_button.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/palm/button_inventory.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/palm_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/palm/button_inventory.json index 1bdd0f14fe..d8369b0919 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_button_inventory.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/palm/button_pressed.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/palm_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/palm/button_pressed.json index 2e6de3ab15..c8cd11df68 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_button_pressed.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json new file mode 100644 index 0000000000..341002606a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/palm/planks", + "up": "byg:block/palm/crafting_table_top", + "north": "byg:block/palm/crafting_table_front", + "south": "byg:block/palm/crafting_table_side", + "east": "byg:block/palm/crafting_table_side", + "west": "byg:block/palm/crafting_table_front", + "particle": "byg:block/palm/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json new file mode 100644 index 0000000000..ae815c0d45 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json new file mode 100644 index 0000000000..493ae97cc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_top.json b/Common/src/generated/resources/assets/byg/models/block/palm/door_top.json new file mode 100644 index 0000000000..9be0b8e20e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json new file mode 100644 index 0000000000..06c175c804 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence.json new file mode 100644 index 0000000000..0d24bb6e0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/palm/planks", + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/palm_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/palm/fence_gate.json index 50e9cd1eb5..559dc9efde 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_open.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/palm_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_open.json index 424b9e0a10..060e2dcd05 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall.json index ef853f5b33..93f94704e5 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall_open.json similarity index 68% rename from Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall_open.json index 1846c841ed..9456f90f2e 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_gate_wall_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json new file mode 100644 index 0000000000..efe13a4256 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/palm/planks", + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json new file mode 100644 index 0000000000..1d4e107af4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/palm/planks", + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/palm/grower_item.json new file mode 100644 index 0000000000..2c0ea196c4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/palm/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json b/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json new file mode 100644 index 0000000000..a6afd0a862 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/palm/leaves", + "up": "byg:block/palm/leaves", + "north": "byg:block/palm/leaves", + "south": "byg:block/palm/leaves", + "east": "byg:block/palm/leaves", + "west": "byg:block/palm/leaves", + "particle": "byg:block/palm/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json new file mode 100644 index 0000000000..35550b64ea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/palm/leaves_snowy", + "up": "byg:block/palm/leaves_snowy", + "north": "byg:block/palm/leaves_snowy_side", + "south": "byg:block/palm/leaves_snowy_side", + "east": "byg:block/palm/leaves_snowy_side", + "west": "byg:block/palm/leaves_snowy_side", + "particle": "byg:block/palm/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/log.json b/Common/src/generated/resources/assets/byg/models/block/palm/log.json new file mode 100644 index 0000000000..088ae709f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/palm/log", + "end": "byg:block/palm/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/planks.json b/Common/src/generated/resources/assets/byg/models/block/palm/planks.json new file mode 100644 index 0000000000..0725e9297b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/palm/planks", + "up": "byg:block/palm/planks", + "north": "byg:block/palm/planks", + "south": "byg:block/palm/planks", + "east": "byg:block/palm/planks", + "west": "byg:block/palm/planks", + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/palm_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate.json index 5d5c53b188..314a4b6b8d 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate_down.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/palm_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate_down.json index e7fdc9e06d..f8d0d4936d 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_pressure_plate_down.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "byg:block/palm_planks" + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/slab.json b/Common/src/generated/resources/assets/byg/models/block/palm/slab.json new file mode 100644 index 0000000000..1b354e0fd7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/palm/planks", + "bottom": "byg:block/palm/planks", + "top": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json new file mode 100644 index 0000000000..9ee96e5e19 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/palm/planks", + "bottom": "byg:block/palm/planks", + "top": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json new file mode 100644 index 0000000000..cc61cd3359 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/palm/planks", + "bottom": "byg:block/palm/planks", + "top": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json new file mode 100644 index 0000000000..573c5f681e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/palm/planks", + "bottom": "byg:block/palm/planks", + "top": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json new file mode 100644 index 0000000000..c863332415 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/palm/planks", + "bottom": "byg:block/palm/planks", + "top": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json new file mode 100644 index 0000000000..a33cec5271 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_bottom.json similarity index 68% rename from Common/src/main/resources/assets/byg/models/block/palm_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_bottom.json index 574604239d..2f64e9117e 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "byg:block/palm_trapdoor" + "texture": "byg:block/palm/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_open.json similarity index 68% rename from Common/src/main/resources/assets/byg/models/block/palm_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_open.json index ac238b4f7e..7a0fbd82b4 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "byg:block/palm_trapdoor" + "texture": "byg:block/palm/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_top.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/palm_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_top.json index 28e6461e6f..f4108986b1 100644 --- a/Common/src/main/resources/assets/byg/models/block/palm_trapdoor_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "byg:block/palm_trapdoor" + "texture": "byg:block/palm/trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/wood.json b/Common/src/generated/resources/assets/byg/models/block/palm/wood.json new file mode 100644 index 0000000000..357293c99b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/palm/log", + "particle": "byg:block/palm/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_boat.json b/Common/src/generated/resources/assets/byg/models/item/palm_boat.json new file mode 100644 index 0000000000..895190774e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/palm/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json new file mode 100644 index 0000000000..c94f2b3301 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_button.json b/Common/src/generated/resources/assets/byg/models/item/palm_button.json new file mode 100644 index 0000000000..be456d3c7f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json new file mode 100644 index 0000000000..0fe83f5d2f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_door.json b/Common/src/generated/resources/assets/byg/models/item/palm_door.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/item/palm_door.json rename to Common/src/generated/resources/assets/byg/models/item/palm_door.json index afdac96f08..ba9fd008f5 100644 --- a/Common/src/main/resources/assets/byg/models/item/palm_door.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/palm_door" + "layer0": "byg:item/palm/door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_fence.json b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json new file mode 100644 index 0000000000..79af9c2dca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json b/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json new file mode 100644 index 0000000000..105dcdf255 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_log.json b/Common/src/generated/resources/assets/byg/models/item/palm_log.json new file mode 100644 index 0000000000..3ac454ff69 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_planks.json b/Common/src/generated/resources/assets/byg/models/item/palm_planks.json new file mode 100644 index 0000000000..f277157b44 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json new file mode 100644 index 0000000000..640a383693 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_sapling.json b/Common/src/generated/resources/assets/byg/models/item/palm_sapling.json new file mode 100644 index 0000000000..7aba921fc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/palm/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_slab.json b/Common/src/generated/resources/assets/byg/models/item/palm_slab.json new file mode 100644 index 0000000000..24844dbada --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json b/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json new file mode 100644 index 0000000000..2bc43a9d68 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_wood.json b/Common/src/generated/resources/assets/byg/models/item/palm_wood.json new file mode 100644 index 0000000000..4376face0e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json new file mode 100644 index 0000000000..37d2e060b4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json new file mode 100644 index 0000000000..519cce6f68 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json new file mode 100644 index 0000000000..7107a1e62f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json new file mode 100644 index 0000000000..c3553843c7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json new file mode 100644 index 0000000000..e9b22e127e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json new file mode 100644 index 0000000000..fb58626403 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json new file mode 100644 index 0000000000..74d02315db --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json new file mode 100644 index 0000000000..8d8bb33f13 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/palm_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json new file mode 100644 index 0000000000..f0b70e80f0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json new file mode 100644 index 0000000000..09bec7be22 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json new file mode 100644 index 0000000000..3a0bb26733 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json new file mode 100644 index 0000000000..ec9f46a9c5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json new file mode 100644 index 0000000000..33ec2608c1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/palm_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/palm_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json index 17d4e51360..b82399a315 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/palm_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json index 9bf668ab1b..da7f2e9f5b 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_button.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/palm_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/button.json diff --git a/Common/src/main/resources/data/byg/recipes/palm_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/palm_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json index 9081c4c56e..675e637d6b 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_door.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/palm_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/door.json index 991550e25b..5009bc74f6 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/palm_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/palm_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/palm_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/palm_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/palm_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json index 1cfa1464a6..4547630bf3 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:palm_logs" + "tag": "byg:wood/palm_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/palm_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/palm_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json index d0f035c02e..77a8739017 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/palm_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json index c836d4eef3..3f5b06d78d 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/palm_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json index 650d2114a3..f17251c039 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, "result": { - "item": "byg:palm_stairs", + "item": "byg:palm_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/palm_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/palm_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json index d0fb4eca05..7123ea4b9e 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:palm_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/palm_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/palm_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json index c069da1007..0e80398554 100644 --- a/Common/src/main/resources/data/byg/recipes/palm_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:palm_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json new file mode 100644 index 0000000000..e479ac2263 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:palm_log", + "byg:palm_wood", + "byg:stripped_palm_log", + "byg:stripped_palm_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json new file mode 100644 index 0000000000..c736a8bda8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:palm_log", + "byg:stripped_palm_log", + "byg:palm_wood", + "byg:stripped_palm_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 044293d79c..b9192d443e 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -141,7 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Doors map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.PALM_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINE_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RAINBOW_EUCALYPTUS_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.REDWOOD_DOOR.get(), RenderType.translucent()); @@ -157,7 +156,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.PALM_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINE_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RAINBOW_EUCALYPTUS_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.REDWOOD_TRAPDOOR.get(), RenderType.translucent()); @@ -197,7 +195,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.ORANGE_OAK_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORCHARD_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.PALM_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PALO_VERDE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINK_CHERRY_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 09b2c9914c..8eef6b8b25 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -54,7 +54,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.PALM_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_LEAVES.get()); @@ -90,7 +89,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.PALM_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index e7b425247d..e23ef718cd 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -48,7 +48,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WILLOW_LOG.get(), 5, 5); flammableBlock(BYGBlocks.WITCH_HAZEL_LOG.get(), 5, 5); flammableBlock(BYGBlocks.ZELKOVA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.PALM_LOG.get(), 5, 5); //Stripped Logs flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); @@ -59,7 +58,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_WILLOW_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_ZELKOVA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_PALM_LOG.get(), 5, 5); //Wood flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); @@ -71,7 +69,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WILLOW_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.WITCH_HAZEL_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.ZELKOVA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.PALM_WOOD.get(), 5, 5); //Stripped Wood flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); @@ -82,7 +79,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_WILLOW_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_ZELKOVA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_PALM_WOOD.get(), 5, 5); //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); @@ -94,7 +90,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WILLOW_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.ZELKOVA_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.PALM_BOOKSHELF.get(), 5, 20); //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); @@ -106,7 +101,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WILLOW_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.ZELKOVA_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.PALM_SLAB.get(), 5, 20); //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); @@ -130,7 +124,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WILLOW_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.ZELKOVA_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.PALM_PLANKS.get(), 5, 20); //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); @@ -174,7 +167,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.WITCH_HAZEL_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_SPRUCE_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.PALM_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FIRECRACKER_LEAVES.get(), 60, 30); flammableBlock(BYGBlocks.ZELKOVA_LEAVES.get(), 60, 30); flammableBlock(BYGBlocks.RED_BIRCH_LEAVES.get(), 60, 30); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index add576fe29..51994963da 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -33,7 +33,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITCH_HAZEL_LOG.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get()); stripables.put(BYGBlocks.ZELKOVA_LOG.get(), BYGBlocks.STRIPPED_ZELKOVA_LOG.get()); stripables.put(BYGBlocks.SYTHIAN_STEM.get(), BYGBlocks.STRIPPED_SYTHIAN_STEM.get()); - stripables.put(BYGBlocks.PALM_LOG.get(), BYGBlocks.STRIPPED_PALM_LOG.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); @@ -51,7 +50,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.WITCH_HAZEL_WOOD.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get()); stripables.put(BYGBlocks.ZELKOVA_WOOD.get(), BYGBlocks.STRIPPED_ZELKOVA_WOOD.get()); stripables.put(BYGBlocks.SYTHIAN_HYPHAE.get(), BYGBlocks.STRIPPED_SYTHIAN_HYPHAE.get()); - stripables.put(BYGBlocks.PALM_WOOD.get(), BYGBlocks.STRIPPED_PALM_WOOD.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 0827575249..844f56a494 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -73,7 +73,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_PLANKS = createPlanks("zelkova_planks"); public static final BlockRegistryObject SYTHIAN_PLANKS = createPlanks("sythian_planks"); public static final BlockRegistryObject EMBUR_PLANKS = createPlanks("embur_planks"); - public static final BlockRegistryObject PALM_PLANKS = createPlanks("palm_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); @@ -88,7 +87,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_BOOKSHELF = createBookshelf("zelkova_bookshelf"); public static final BlockRegistryObject SYTHIAN_BOOKSHELF = createBookshelf("sythian_bookshelf"); public static final BlockRegistryObject EMBUR_BOOKSHELF = createBookshelf("embur_bookshelf"); - public static final BlockRegistryObject PALM_BOOKSHELF = createBookshelf("palm_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); @@ -103,7 +101,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_DOOR = createDoor("zelkova_door"); public static final BlockRegistryObject SYTHIAN_DOOR = createDoor("sythian_door"); public static final BlockRegistryObject EMBUR_DOOR = createDoor("embur_door"); - public static final BlockRegistryObject PALM_DOOR = createDoor("palm_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); @@ -118,7 +115,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_PRESSURE_PLATE = createWoodPressurePlate("zelkova_pressure_plate"); public static final BlockRegistryObject SYTHIAN_PRESSURE_PLATE = createWoodPressurePlate("sythian_pressure_plate"); public static final BlockRegistryObject EMBUR_PRESSURE_PLATE = createWoodPressurePlate("embur_pressure_plate"); - public static final BlockRegistryObject PALM_PRESSURE_PLATE = createWoodPressurePlate("palm_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); @@ -133,7 +129,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_BUTTON = createWoodButton("zelkova_button"); public static final BlockRegistryObject SYTHIAN_BUTTON = createWoodButton("sythian_button"); public static final BlockRegistryObject EMBUR_BUTTON = createWoodButton("embur_button"); - public static final BlockRegistryObject PALM_BUTTON = createWoodButton("palm_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); @@ -148,7 +143,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_TRAPDOOR = createTrapDoor("zelkova_trapdoor"); public static final BlockRegistryObject SYTHIAN_TRAPDOOR = createTrapDoor("sythian_trapdoor"); public static final BlockRegistryObject EMBUR_TRAPDOOR = createTrapDoor("embur_trapdoor"); - public static final BlockRegistryObject PALM_TRAPDOOR = createTrapDoor("palm_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); @@ -163,7 +157,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_CRAFTING_TABLE = createCraftingTable("zelkova_crafting_table"); public static final BlockRegistryObject SYTHIAN_CRAFTING_TABLE = createCraftingTable("sythian_crafting_table"); public static final BlockRegistryObject EMBUR_CRAFTING_TABLE = createCraftingTable("embur_crafting_table"); - public static final BlockRegistryObject PALM_CRAFTING_TABLE = createCraftingTable("palm_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); @@ -178,7 +171,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_FENCE_GATE = createFenceGate("zelkova_fence_gate"); public static final BlockRegistryObject SYTHIAN_FENCE_GATE = createFenceGate("sythian_fence_gate"); public static final BlockRegistryObject EMBUR_FENCE_GATE = createFenceGate("embur_fence_gate"); - public static final BlockRegistryObject PALM_FENCE_GATE = createFenceGate("palm_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); @@ -193,7 +185,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_SLAB = createWoodSlab("zelkova_slab"); public static final BlockRegistryObject SYTHIAN_SLAB = createWoodSlab("sythian_slab"); public static final BlockRegistryObject EMBUR_SLAB = createWoodSlab("embur_slab"); - public static final BlockRegistryObject PALM_SLAB = createWoodSlab("palm_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); @@ -208,7 +199,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_STAIRS = createWoodStairs("zelkova_stairs"); public static final BlockRegistryObject SYTHIAN_STAIRS = createWoodStairs("sythian_stairs"); public static final BlockRegistryObject EMBUR_STAIRS = createWoodStairs("embur_stairs"); - public static final BlockRegistryObject PALM_STAIRS = createWoodStairs("palm_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); @@ -223,7 +213,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_FENCE = createFence("zelkova_fence"); public static final BlockRegistryObject SYTHIAN_FENCE = createFence("sythian_fence"); public static final BlockRegistryObject EMBUR_FENCE = createFence("embur_fence"); - public static final BlockRegistryObject PALM_FENCE = createFence("palm_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); @@ -238,7 +227,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_SIGN = createSign("zelkova_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_SIGN = createSign("embur_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); - public static final BlockRegistryObject PALM_SIGN = createSign("palm_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); @@ -253,7 +241,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_WALL_SIGN = createWallSign("zelkova_wall_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_WALL_SIGN = createWallSign("sythian_wall_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_WALL_SIGN = createWallSign("embur_wall_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); - public static final BlockRegistryObject PALM_WALL_SIGN = createWallSign("palm_wall_sign", BYGWoodType.PALM, PALM_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); @@ -300,7 +287,6 @@ public class BYGBlocks { public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); public static final BlockRegistryObject ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_ZELKOVA_SAPLING, "zelkova_sapling"); - public static final BlockRegistryObject PALM_SAPLING = createSapling(BYGBlockTags.GROUND_PALM_SAPLING, "palm_sapling"); public static final BlockRegistryObject LAMENT_SAPLING = createSapling(BYGBlockTags.GROUND_LAMENT_SAPLING, "lament_sapling"); public static final BlockRegistryObject WITHERING_OAK_SAPLING = createFungus(BYGBlockTags.GROUND_WITHERING_OAK_SAPLING, "withering_oak_sapling"); public static final BlockRegistryObject NIGHTSHADE_SAPLING = createSapling(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING, "nightshade_sapling"); @@ -351,7 +337,6 @@ public class BYGBlocks { public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); public static final BlockRegistryObject ZELKOVA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_RED, "zelkova_leaves"); - public static final BlockRegistryObject PALM_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "palm_leaves"); public static final BlockRegistryObject LAMENT_LEAVES = createLeaves(MaterialColor.COLOR_MAGENTA, "lament_leaves"); public static final BlockRegistryObject WITHERING_OAK_LEAVES = createLeaves(MaterialColor.COLOR_GRAY, "withering_oak_leaves"); public static final BlockRegistryObject FLOWERING_NIGHTSHADE_LEAVES = createGlowingLeaves(MaterialColor.COLOR_ORANGE, 15, "flowering_nightshade_leaves"); @@ -650,7 +635,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_LOG = createLog("zelkova_log"); public static final BlockRegistryObject SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "sythian_stem"); public static final BlockRegistryObject EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "embur_pedu"); - public static final BlockRegistryObject PALM_LOG = createLog("palm_log"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); @@ -670,7 +654,6 @@ public class BYGBlocks { public static final BlockRegistryObject ZELKOVA_WOOD = createWood("zelkova_wood"); public static final BlockRegistryObject SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "sythian_hyphae"); public static final BlockRegistryObject EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "embur_hyphae"); - public static final BlockRegistryObject PALM_WOOD = createWood("palm_wood"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); @@ -813,7 +796,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_ZELKOVA_LOG = createStrippedLog("stripped_zelkova_log"); public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); public static final BlockRegistryObject STRIPPED_EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_embur_pedu"); - public static final BlockRegistryObject STRIPPED_PALM_LOG = createStrippedLog("stripped_palm_log"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); @@ -829,7 +811,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_ZELKOVA_WOOD = createWood("stripped_zelkova_wood"); public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); public static final BlockRegistryObject STRIPPED_EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_embur_hyphae"); - public static final BlockRegistryObject STRIPPED_PALM_WOOD = createWood("stripped_palm_wood"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_WOOD = createWood("stripped_nightshade_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index a959475e68..3f9e5fdd7e 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -20,7 +20,6 @@ public class BYGWoodType { public static final WoodType ZELKOVA = register("zelkova"); public static final WoodType SYTHIAN = register("sythian"); public static final WoodType EMBUR = register("embur"); - public static final WoodType PALM = register("palm"); public static final WoodType LAMENT = register("lament"); public static final WoodType NIGHTSHADE = register("nightshade"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index bcf2b87e9d..638cc0bb25 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -89,6 +89,10 @@ public enum BYGWoodTypes { MANGROVE("mangrove", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MANGROVE) + .materialColor(MaterialColor.COLOR_GREEN)), + PALM("palm", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_PALM_SAPLING) + .boatType(BYGBoatEntity.BYGType.PALM) .materialColor(MaterialColor.COLOR_GREEN)); public static final Map LOOKUP; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 9a8de0da71..3f37648e17 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -61,7 +61,6 @@ public Item getDropItem() { case WILLOW -> BYGItems.WILLOW_BOAT.get(); case WITCH_HAZEL -> BYGItems.WITCH_HAZEL_BOAT.get(); case ZELKOVA -> BYGItems.ZELKOVA_BOAT.get(); - case PALM -> BYGItems.PALM_BOAT.get(); }; } @@ -73,7 +72,6 @@ public Block getPlanks() { default -> BYGWoodTypes.ASPEN.planks().get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); - case PALM -> BYGBlocks.PALM_PLANKS.get(); case PINE -> BYGBlocks.PINE_PLANKS.get(); case RAINBOW_EUCALYPTUS -> BYGBlocks.RAINBOW_EUCALYPTUS_PLANKS.get(); case REDWOOD -> BYGBlocks.REDWOOD_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 3568138617..74172ac0b0 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -337,6 +337,53 @@ public class BYGItems { public static final RegistryObject LAMENT_BUTTON = createItem(BYGBlocks.LAMENT_BUTTON); public static final RegistryObject LAMENT_SIGN = createSign("lament_sign", BYGBlocks.LAMENT_SIGN, BYGBlocks.LAMENT_WALL_SIGN); + //Maple Woodtype + public static final RegistryObject MAPLE_SAPLING = createSaplingItem(BYGBlocks.MAPLE_SAPLING); + public static final RegistryObject MAPLE_LEAVES = createItem(BYGBlocks.MAPLE_LEAVES); + public static final RegistryObject RED_MAPLE_SAPLING = createSaplingItem(BYGBlocks.RED_MAPLE_SAPLING); + public static final RegistryObject RED_MAPLE_LEAVES = createItem(BYGBlocks.RED_MAPLE_LEAVES); + public static final RegistryObject SILVER_MAPLE_SAPLING = createSaplingItem(BYGBlocks.SILVER_MAPLE_SAPLING); + public static final RegistryObject SILVER_MAPLE_LEAVES = createItem(BYGBlocks.SILVER_MAPLE_LEAVES); + public static final RegistryObject MAPLE_LOG = createItem(BYGBlocks.MAPLE_LOG); + public static final RegistryObject MAPLE_WOOD = createItem(BYGBlocks.MAPLE_WOOD); + public static final RegistryObject STRIPPED_MAPLE_LOG = createItem(BYGBlocks.STRIPPED_MAPLE_LOG); + public static final RegistryObject STRIPPED_MAPLE_WOOD = createItem(BYGBlocks.STRIPPED_MAPLE_WOOD); + public static final RegistryObject MAPLE_PLANKS = createItem(BYGBlocks.MAPLE_PLANKS); + public static final RegistryObject MAPLE_BOOKSHELF = createItem(BYGBlocks.MAPLE_BOOKSHELF); + public static final RegistryObject MAPLE_CRAFTING_TABLE = createItem(BYGBlocks.MAPLE_CRAFTING_TABLE); + public static final RegistryObject MAPLE_STAIRS = createItem(BYGBlocks.MAPLE_STAIRS); + public static final RegistryObject MAPLE_SLAB = createItem(BYGBlocks.MAPLE_SLAB); + public static final RegistryObject MAPLE_FENCE = createItem(BYGBlocks.MAPLE_FENCE); + public static final RegistryObject MAPLE_FENCE_GATE = createItem(BYGBlocks.MAPLE_FENCE_GATE); + public static final RegistryObject MAPLE_DOOR = createItem(BYGBlocks.MAPLE_DOOR); + public static final RegistryObject MAPLE_TRAPDOOR = createItem(BYGBlocks.MAPLE_TRAPDOOR); + public static final RegistryObject MAPLE_PRESSURE_PLATE = createItem(BYGBlocks.MAPLE_PRESSURE_PLATE); + public static final RegistryObject MAPLE_BUTTON = createItem(BYGBlocks.MAPLE_BUTTON); + public static final RegistryObject MAPLE_SIGN = createSign("maple_sign", BYGBlocks.MAPLE_SIGN, BYGBlocks.MAPLE_WALL_SIGN); + public static final RegistryObject MAPLE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MAPLE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "maple_boat"); + + //Nightshade Woodtype + public static final RegistryObject NIGHTSHADE_SAPLING = createSaplingItem(BYGBlocks.NIGHTSHADE_SAPLING); + public static final RegistryObject FLOWERING_NIGHTSHADE_LEAVES = createItem(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES); + public static final RegistryObject NIGHTSHADE_LEAVES = createItem(BYGBlocks.NIGHTSHADE_LEAVES); + public static final RegistryObject IMBUED_NIGHTSHADE_LOG = createItem(BYGBlocks.IMBUED_NIGHTSHADE_LOG); + public static final RegistryObject NIGHTSHADE_LOG = createItem(BYGBlocks.NIGHTSHADE_LOG); + public static final RegistryObject NIGHTSHADE_WOOD = createItem(BYGBlocks.NIGHTSHADE_WOOD); + public static final RegistryObject STRIPPED_NIGHTSHADE_LOG = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_LOG); + public static final RegistryObject STRIPPED_NIGHTSHADE_WOOD = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_WOOD); + public static final RegistryObject NIGHTSHADE_PLANKS = createItem(BYGBlocks.NIGHTSHADE_PLANKS); + public static final RegistryObject NIGHTSHADE_BOOKSHELF = createItem(BYGBlocks.NIGHTSHADE_BOOKSHELF); + public static final RegistryObject NIGHTSHADE_CRAFTING_TABLE = createItem(BYGBlocks.NIGHTSHADE_CRAFTING_TABLE); + public static final RegistryObject NIGHTSHADE_STAIRS = createItem(BYGBlocks.NIGHTSHADE_STAIRS); + public static final RegistryObject NIGHTSHADE_SLAB = createItem(BYGBlocks.NIGHTSHADE_SLAB); + public static final RegistryObject NIGHTSHADE_FENCE = createItem(BYGBlocks.NIGHTSHADE_FENCE); + public static final RegistryObject NIGHTSHADE_FENCE_GATE = createItem(BYGBlocks.NIGHTSHADE_FENCE_GATE); + public static final RegistryObject NIGHTSHADE_DOOR = createItem(BYGBlocks.NIGHTSHADE_DOOR); + public static final RegistryObject NIGHTSHADE_TRAPDOOR = createItem(BYGBlocks.NIGHTSHADE_TRAPDOOR); + public static final RegistryObject NIGHTSHADE_PRESSURE_PLATE = createItem(BYGBlocks.NIGHTSHADE_PRESSURE_PLATE); + public static final RegistryObject NIGHTSHADE_BUTTON = createItem(BYGBlocks.NIGHTSHADE_BUTTON); + public static final RegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGBlocks.NIGHTSHADE_SIGN, BYGBlocks.NIGHTSHADE_WALL_SIGN); + static { BYGWoodTypes.ASPEN.init(); @@ -387,76 +434,10 @@ public class BYGItems { // TODO Lamient, Jacaranda BYGWoodTypes.MAHOGANY.init(); BYGWoodTypes.MANGROVE.init(); + // TODO Maple, Nightshade + BYGWoodTypes.PALM.init(); } - //Maple Woodtype - public static final RegistryObject MAPLE_SAPLING = createSaplingItem(BYGBlocks.MAPLE_SAPLING); - public static final RegistryObject MAPLE_LEAVES = createItem(BYGBlocks.MAPLE_LEAVES); - public static final RegistryObject RED_MAPLE_SAPLING = createSaplingItem(BYGBlocks.RED_MAPLE_SAPLING); - public static final RegistryObject RED_MAPLE_LEAVES = createItem(BYGBlocks.RED_MAPLE_LEAVES); - public static final RegistryObject SILVER_MAPLE_SAPLING = createSaplingItem(BYGBlocks.SILVER_MAPLE_SAPLING); - public static final RegistryObject SILVER_MAPLE_LEAVES = createItem(BYGBlocks.SILVER_MAPLE_LEAVES); - public static final RegistryObject MAPLE_LOG = createItem(BYGBlocks.MAPLE_LOG); - public static final RegistryObject MAPLE_WOOD = createItem(BYGBlocks.MAPLE_WOOD); - public static final RegistryObject STRIPPED_MAPLE_LOG = createItem(BYGBlocks.STRIPPED_MAPLE_LOG); - public static final RegistryObject STRIPPED_MAPLE_WOOD = createItem(BYGBlocks.STRIPPED_MAPLE_WOOD); - public static final RegistryObject MAPLE_PLANKS = createItem(BYGBlocks.MAPLE_PLANKS); - public static final RegistryObject MAPLE_BOOKSHELF = createItem(BYGBlocks.MAPLE_BOOKSHELF); - public static final RegistryObject MAPLE_CRAFTING_TABLE = createItem(BYGBlocks.MAPLE_CRAFTING_TABLE); - public static final RegistryObject MAPLE_STAIRS = createItem(BYGBlocks.MAPLE_STAIRS); - public static final RegistryObject MAPLE_SLAB = createItem(BYGBlocks.MAPLE_SLAB); - public static final RegistryObject MAPLE_FENCE = createItem(BYGBlocks.MAPLE_FENCE); - public static final RegistryObject MAPLE_FENCE_GATE = createItem(BYGBlocks.MAPLE_FENCE_GATE); - public static final RegistryObject MAPLE_DOOR = createItem(BYGBlocks.MAPLE_DOOR); - public static final RegistryObject MAPLE_TRAPDOOR = createItem(BYGBlocks.MAPLE_TRAPDOOR); - public static final RegistryObject MAPLE_PRESSURE_PLATE = createItem(BYGBlocks.MAPLE_PRESSURE_PLATE); - public static final RegistryObject MAPLE_BUTTON = createItem(BYGBlocks.MAPLE_BUTTON); - public static final RegistryObject MAPLE_SIGN = createSign("maple_sign", BYGBlocks.MAPLE_SIGN, BYGBlocks.MAPLE_WALL_SIGN); - public static final RegistryObject MAPLE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MAPLE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "maple_boat"); - - //Nightshade Woodtype - public static final RegistryObject NIGHTSHADE_SAPLING = createSaplingItem(BYGBlocks.NIGHTSHADE_SAPLING); - public static final RegistryObject FLOWERING_NIGHTSHADE_LEAVES = createItem(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES); - public static final RegistryObject NIGHTSHADE_LEAVES = createItem(BYGBlocks.NIGHTSHADE_LEAVES); - public static final RegistryObject IMBUED_NIGHTSHADE_LOG = createItem(BYGBlocks.IMBUED_NIGHTSHADE_LOG); - public static final RegistryObject NIGHTSHADE_LOG = createItem(BYGBlocks.NIGHTSHADE_LOG); - public static final RegistryObject NIGHTSHADE_WOOD = createItem(BYGBlocks.NIGHTSHADE_WOOD); - public static final RegistryObject STRIPPED_NIGHTSHADE_LOG = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_LOG); - public static final RegistryObject STRIPPED_NIGHTSHADE_WOOD = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_WOOD); - public static final RegistryObject NIGHTSHADE_PLANKS = createItem(BYGBlocks.NIGHTSHADE_PLANKS); - public static final RegistryObject NIGHTSHADE_BOOKSHELF = createItem(BYGBlocks.NIGHTSHADE_BOOKSHELF); - public static final RegistryObject NIGHTSHADE_CRAFTING_TABLE = createItem(BYGBlocks.NIGHTSHADE_CRAFTING_TABLE); - public static final RegistryObject NIGHTSHADE_STAIRS = createItem(BYGBlocks.NIGHTSHADE_STAIRS); - public static final RegistryObject NIGHTSHADE_SLAB = createItem(BYGBlocks.NIGHTSHADE_SLAB); - public static final RegistryObject NIGHTSHADE_FENCE = createItem(BYGBlocks.NIGHTSHADE_FENCE); - public static final RegistryObject NIGHTSHADE_FENCE_GATE = createItem(BYGBlocks.NIGHTSHADE_FENCE_GATE); - public static final RegistryObject NIGHTSHADE_DOOR = createItem(BYGBlocks.NIGHTSHADE_DOOR); - public static final RegistryObject NIGHTSHADE_TRAPDOOR = createItem(BYGBlocks.NIGHTSHADE_TRAPDOOR); - public static final RegistryObject NIGHTSHADE_PRESSURE_PLATE = createItem(BYGBlocks.NIGHTSHADE_PRESSURE_PLATE); - public static final RegistryObject NIGHTSHADE_BUTTON = createItem(BYGBlocks.NIGHTSHADE_BUTTON); - public static final RegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGBlocks.NIGHTSHADE_SIGN, BYGBlocks.NIGHTSHADE_WALL_SIGN); - - //Palm Woodtype - public static final RegistryObject PALM_SAPLING = createSaplingItem(BYGBlocks.PALM_SAPLING); - public static final RegistryObject PALM_LEAVES = createItem(BYGBlocks.PALM_LEAVES); - public static final RegistryObject PALM_LOG = createItem(BYGBlocks.PALM_LOG); - public static final RegistryObject PALM_WOOD = createItem(BYGBlocks.PALM_WOOD); - public static final RegistryObject STRIPPED_PALM_LOG = createItem(BYGBlocks.STRIPPED_PALM_LOG); - public static final RegistryObject STRIPPED_PALM_WOOD = createItem(BYGBlocks.STRIPPED_PALM_WOOD); - public static final RegistryObject PALM_PLANKS = createItem(BYGBlocks.PALM_PLANKS); - public static final RegistryObject PALM_BOOKSHELF = createItem(BYGBlocks.PALM_BOOKSHELF); - public static final RegistryObject PALM_CRAFTING_TABLE = createItem(BYGBlocks.PALM_CRAFTING_TABLE); - public static final RegistryObject PALM_STAIRS = createItem(BYGBlocks.PALM_STAIRS); - public static final RegistryObject PALM_SLAB = createItem(BYGBlocks.PALM_SLAB); - public static final RegistryObject PALM_FENCE = createItem(BYGBlocks.PALM_FENCE); - public static final RegistryObject PALM_FENCE_GATE = createItem(BYGBlocks.PALM_FENCE_GATE); - public static final RegistryObject PALM_DOOR = createItem(BYGBlocks.PALM_DOOR); - public static final RegistryObject PALM_TRAPDOOR = createItem(BYGBlocks.PALM_TRAPDOOR); - public static final RegistryObject PALM_PRESSURE_PLATE = createItem(BYGBlocks.PALM_PRESSURE_PLATE); - public static final RegistryObject PALM_BUTTON = createItem(BYGBlocks.PALM_BUTTON); - public static final RegistryObject PALM_SIGN = createSign("palm_sign", BYGBlocks.PALM_SIGN, BYGBlocks.PALM_WALL_SIGN); - public static final RegistryObject PALM_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.PALM, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "palm_boat"); - //Palo Verde Woodtype public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); public static final RegistryObject PALO_VERDE_SAPLING = createSaplingItem(BYGBlocks.PALO_VERDE_SAPLING); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java index 6e6c414423..a66282920f 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java @@ -19,6 +19,7 @@ import net.minecraft.world.level.levelgen.placement.*; import net.minecraft.world.level.material.Fluids; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.features.BYGGlobalFeatures; import potionstudios.byg.common.world.feature.features.end.BYGEndFeatures; import potionstudios.byg.common.world.feature.features.end.BYGEndVegetationFeatures; @@ -183,7 +184,7 @@ public class BYGPlacedFeatures { public static final Holder BULBIS_TREES = createPlacedFeature("bulbis_trees", BYGEndVegetationFeatures.BULBIS_TREES, treePlacement(PlacementUtils.countExtra(1, 0.1F, 1))); public static final Holder PURPLE_BULBIS_TREES = createPlacedFeature("purple_bulbis_trees", BYGEndVegetationFeatures.PURPLE_BULBIS_TREES, treePlacement(PlacementUtils.countExtra(1, 0.1F, 1))); public static final Holder SPARSE_PURPLE_BULBIS_TREES = createPlacedFeature("sparse_purple_bulbis_trees", BYGEndVegetationFeatures.PURPLE_BULBIS_TREES, treePlacement(PlacementUtils.countExtra(0, 0.1F, 1))); - public static final Holder PALM_TREES = createPlacedFeature("palm_trees", BYGOverworldTreeFeatures.PALM_TREES, Util.make(new ArrayList<>(clearingTreePlacement(PlacementUtils.countExtra(4, 0.2F, 1), BYGBlocks.PALM_SAPLING.get())), (list) -> { + public static final Holder PALM_TREES = createPlacedFeature("palm_trees", BYGOverworldTreeFeatures.PALM_TREES, Util.make(new ArrayList<>(clearingTreePlacement(PlacementUtils.countExtra(4, 0.2F, 1), BYGWoodTypes.PALM.growerItem().get())), (list) -> { list.add(new NearWaterPlacementFilter(4)); })); public static final Holder RED_OAK_TREES = createPlacedFeature("red_oak_trees", BYGOverworldTreeFeatures.RED_OAK_TREES, clearingTreePlacement(PlacementUtils.countExtra(1, 0.2F, 1))); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldFeatures.java index 2d59c13314..2fa773f9a2 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldFeatures.java @@ -25,6 +25,7 @@ import net.minecraft.world.level.levelgen.synth.NormalNoise; import net.minecraft.world.level.material.Fluids; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.*; import potionstudios.byg.common.world.feature.placement.BYGPlacedFeaturesUtil; @@ -146,7 +147,7 @@ BYGFeatures.WIDE_LAKE, new SimpleBlockProviderConfig(SimpleStateProvider.simple( ), HolderSet.direct( LargeLakeFeatureConfig.createDripLeavesPlacedFeature(8, PlacementUtils.HEIGHTMAP_OCEAN_FLOOR), - createPlacedFeature(BYGOverworldTreeFeatures.PALM_TREES, RarityFilter.onAverageOnceEvery(30), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.wouldSurvive(BYGBlocks.PALM_SAPLING.defaultBlockState(), BlockPos.ZERO))) + createPlacedFeature(BYGOverworldTreeFeatures.PALM_TREES, RarityFilter.onAverageOnceEvery(30), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.wouldSurvive(BYGWoodTypes.PALM.growerItem().defaultBlockState(), BlockPos.ZERO))) ), List.of()) ); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 81c7eb0d27..278209e289 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -1301,8 +1301,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> PALM_TREE1 = createConfiguredFeature("palm_tree1", BYGFeatures.PALM_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PALM_LOG.get()) - .setLeavesBlock(BYGBlocks.PALM_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PALM) .setMaxHeight(5) .setMinHeight(3) .build() @@ -1310,8 +1309,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> PALM_TREE2 = createConfiguredFeature("palm_tree2", BYGFeatures.PALM_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PALM_LOG.get()) - .setLeavesBlock(BYGBlocks.PALM_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PALM) .setMaxHeight(5) .setMinHeight(3) .build() @@ -1319,8 +1317,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> PALM_TREE3 = createConfiguredFeature("palm_tree3", BYGFeatures.PALM_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PALM_LOG.get()) - .setLeavesBlock(BYGBlocks.PALM_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PALM) .setMaxHeight(5) .setMinHeight(3) .build() @@ -1328,8 +1325,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> PALM_TREE4 = createConfiguredFeature("palm_tree4", BYGFeatures.PALM_TREE4, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PALM_LOG.get()) - .setLeavesBlock(BYGBlocks.PALM_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PALM) .setMaxHeight(5) .setMinHeight(3) .build() diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/palm_bookshelf.json deleted file mode 100644 index 7f81d16f7b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/palm_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_button.json b/Common/src/main/resources/assets/byg/blockstates/palm_button.json deleted file mode 100644 index 0018af7357..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/palm_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/palm_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/palm_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/palm_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/palm_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/palm_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/palm_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/palm_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/palm_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/palm_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/palm_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/palm_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/palm_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/palm_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/palm_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/palm_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/palm_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/palm_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/palm_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/palm_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/palm_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/palm_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/palm_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/palm_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/palm_crafting_table.json deleted file mode 100644 index fcfff55b3b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/palm_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_door.json b/Common/src/main/resources/assets/byg/blockstates/palm_door.json deleted file mode 100644 index 3824b2e748..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/palm_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/palm_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/palm_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/palm_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/palm_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/palm_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/palm_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/palm_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/palm_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/palm_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/palm_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/palm_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/palm_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/palm_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/palm_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/palm_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/palm_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/palm_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/palm_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/palm_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/palm_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/palm_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/palm_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/palm_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/palm_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/palm_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/palm_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/palm_fence_gate.json deleted file mode 100644 index 41d859217f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/palm_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/palm_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/palm_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/palm_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/palm_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/palm_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/palm_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/palm_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/palm_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/palm_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/palm_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/palm_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/palm_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/palm_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/palm_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/palm_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/palm_pressure_plate.json deleted file mode 100644 index c417c1acf9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/palm_pressure_plate" - }, - "powered=true": { - "model": "byg:block/palm_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_sapling.json b/Common/src/main/resources/assets/byg/blockstates/palm_sapling.json deleted file mode 100644 index bf492a8cbc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/palm_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_slab.json b/Common/src/main/resources/assets/byg/blockstates/palm_slab.json deleted file mode 100644 index 0234e567e6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/palm_slab" - }, - "type=double": { - "model": "byg:block/palm_planks" - }, - "type=top": { - "model": "byg:block/palm_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_stairs.json b/Common/src/main/resources/assets/byg/blockstates/palm_stairs.json deleted file mode 100644 index 4932975d66..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/palm_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/palm_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/palm_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/palm_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/palm_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/palm_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/palm_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/palm_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/palm_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/palm_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/palm_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/palm_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/palm_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/palm_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/palm_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/palm_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/palm_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/palm_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/palm_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/palm_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/palm_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/palm_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/palm_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/palm_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/palm_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/palm_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/palm_trapdoor.json deleted file mode 100644 index cd2f851766..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/palm_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/palm_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/palm_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/palm_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/palm_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/palm_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/palm_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/palm_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/palm_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/palm_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/palm_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/palm_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/palm_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/palm_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/palm_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/palm_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_wood.json b/Common/src/main/resources/assets/byg/blockstates/palm_wood.json deleted file mode 100644 index 4a0ede1d4c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/palm_wood_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/palm_wood" - }, - "axis=z": { - "model": "byg:block/palm_wood_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/palm_bookshelf.json deleted file mode 100644 index 1689b7d6e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/palm_planks", - "up": "byg:block/palm_planks", - "north": "byg:block/palm_bookshelf", - "east": "byg:block/palm_bookshelf", - "south": "byg:block/palm_bookshelf", - "west": "byg:block/palm_bookshelf", - "particle": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/palm_crafting_table.json deleted file mode 100644 index 7f677cfeaa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/palm_crafting_table_front", - "down": "byg:block/palm_planks", - "up": "byg:block/palm_crafting_table_top", - "north": "byg:block/palm_crafting_table_front", - "east": "byg:block/palm_crafting_table_side", - "south": "byg:block/palm_crafting_table_side", - "west": "byg:block/palm_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/palm_door_bottom.json deleted file mode 100644 index 24d1b77a32..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/palm_door_bottom", - "top": "byg:block/palm_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/palm_door_bottom_hinge.json deleted file mode 100644 index 4a090d12b3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/palm_door_bottom", - "top": "byg:block/palm_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_door_top.json b/Common/src/main/resources/assets/byg/models/block/palm_door_top.json deleted file mode 100644 index b868b3ad2d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/palm_door_bottom", - "top": "byg:block/palm_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/palm_door_top_hinge.json deleted file mode 100644 index b44a106906..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/palm_door_bottom", - "top": "byg:block/palm_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/palm_fence_inventory.json deleted file mode 100644 index 714ee3ffb6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_fence_post.json b/Common/src/main/resources/assets/byg/models/block/palm_fence_post.json deleted file mode 100644 index c2cd56cc81..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_leaves.json b/Common/src/main/resources/assets/byg/models/block/palm_leaves.json deleted file mode 100644 index 5c956cebe1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/palm_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_log.json b/Common/src/main/resources/assets/byg/models/block/palm_log.json deleted file mode 100644 index c38046cf10..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/palm_log", - "end": "byg:block/palm_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_planks.json b/Common/src/main/resources/assets/byg/models/block/palm_planks.json deleted file mode 100644 index 7cd4513971..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_sapling.json b/Common/src/main/resources/assets/byg/models/block/palm_sapling.json deleted file mode 100644 index 9dc1fc05db..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/palm_sapling", - "particle": "byg:block/palm_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_slab.json b/Common/src/main/resources/assets/byg/models/block/palm_slab.json deleted file mode 100644 index 8cd8e4a770..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/palm_planks", - "top": "byg:block/palm_planks", - "side": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_slab_top.json b/Common/src/main/resources/assets/byg/models/block/palm_slab_top.json deleted file mode 100644 index 7b2141cfba..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/palm_planks", - "top": "byg:block/palm_planks", - "side": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_stairs.json b/Common/src/main/resources/assets/byg/models/block/palm_stairs.json deleted file mode 100644 index 9eeaf3e7aa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/palm_planks", - "top": "byg:block/palm_planks", - "side": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/palm_stairs_inner.json deleted file mode 100644 index 1baebe3a5c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/palm_planks", - "top": "byg:block/palm_planks", - "side": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/palm_stairs_outer.json deleted file mode 100644 index 5e3c1ba2fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/palm_planks", - "top": "byg:block/palm_planks", - "side": "byg:block/palm_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/palm_wood.json b/Common/src/main/resources/assets/byg/models/block/palm_wood.json deleted file mode 100644 index 72d6d312eb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/palm_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/palm_log", - "end": "byg:block/palm_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_boat.json b/Common/src/main/resources/assets/byg/models/item/palm_boat.json deleted file mode 100644 index f41d4bfdd8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/palm_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/palm_bookshelf.json deleted file mode 100644 index f77d598abf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/palm_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_button.json b/Common/src/main/resources/assets/byg/models/item/palm_button.json deleted file mode 100644 index da1a8196cb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/palm_crafting_table.json deleted file mode 100644 index e681af8383..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/palm_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_fence.json b/Common/src/main/resources/assets/byg/models/item/palm_fence.json deleted file mode 100644 index a807127ff5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/palm_fence_gate.json deleted file mode 100644 index eab38f2171..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_leaves.json b/Common/src/main/resources/assets/byg/models/item/palm_leaves.json deleted file mode 100644 index 8fc6a1caff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_leaves" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_log.json b/Common/src/main/resources/assets/byg/models/item/palm_log.json deleted file mode 100644 index 6cfbd8b523..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_planks.json b/Common/src/main/resources/assets/byg/models/item/palm_planks.json deleted file mode 100644 index d3d158da84..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/palm_pressure_plate.json deleted file mode 100644 index a3ab4315fd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_sapling.json b/Common/src/main/resources/assets/byg/models/item/palm_sapling.json deleted file mode 100644 index 4179a74e29..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/palm_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_slab.json b/Common/src/main/resources/assets/byg/models/item/palm_slab.json deleted file mode 100644 index 532880b2e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_stairs.json b/Common/src/main/resources/assets/byg/models/item/palm_stairs.json deleted file mode 100644 index 1e205ef370..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/palm_trapdoor.json deleted file mode 100644 index 32a0b892b4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_wood.json b/Common/src/main/resources/assets/byg/models/item/palm_wood.json deleted file mode 100644 index 5887062fc3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/palm_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/palm/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/palm/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/palm/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/palm/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_door_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/palm/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_sapling.png b/Common/src/main/resources/assets/byg/textures/block/palm/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/palm/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_leaves.png b/Common/src/main/resources/assets/byg/textures/block/palm/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/palm/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_log.png b/Common/src/main/resources/assets/byg/textures/block/palm/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_log.png rename to Common/src/main/resources/assets/byg/textures/block/palm/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_log_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/palm/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_planks.png b/Common/src/main/resources/assets/byg/textures/block/palm/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_planks.png rename to Common/src/main/resources/assets/byg/textures/block/palm/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/palm_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/palm/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/palm_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/palm/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/palm_boat.png b/Common/src/main/resources/assets/byg/textures/item/palm/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/palm_boat.png rename to Common/src/main/resources/assets/byg/textures/item/palm/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/palm_door.png b/Common/src/main/resources/assets/byg/textures/item/palm/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/palm_door.png rename to Common/src/main/resources/assets/byg/textures/item/palm/door.png From 6bc359c9f971cade66b029df72739bcd2efa9a96 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 22:45:22 +0300 Subject: [PATCH 34/90] Yes --- Common/src/generated/resources/.cache/cache | 10 +++++----- .../{bulbis_hyphae.json => bulbis_wood.json} | 0 .../item/{bulbis_hyphae.json => bulbis_wood.json} | 0 .../data/byg/recipes/wood/bulbis/wood.json | 2 +- .../data/byg/tags/blocks/wood/bulbis_logs.json | 6 +++--- .../data/byg/tags/items/wood/bulbis_logs.json | 4 ++-- .../potionstudios/byg/common/BYGStrippables.java | 6 ++++-- .../byg/common/block/BYGWoodTypes.java | 2 ++ .../assets/byg/models/block/stripped_aspen_log.json | 7 ------- .../assets/byg/models/block/stripped_palm_log.json | 7 ------- .../models/block/stripped_palm_log_horizontal.json | 7 ------- .../assets/byg/models/block/stripped_palm_wood.json | 7 ------- .../block/aspen/ed_aspen_wood.json} | 0 .../{bulbis/phycelium.png => bulbis_phycelium.png} | Bin .../phycelium_top.png => bulbis_phycelium_top.png} | Bin .../block/palm/ped_palm_wood_horizontal.json} | 0 .../datagen/providers/BYGWoodAssetsProvider.java | 7 +++++++ 17 files changed, 24 insertions(+), 41 deletions(-) rename Common/src/generated/resources/assets/byg/blockstates/{bulbis_hyphae.json => bulbis_wood.json} (100%) rename Common/src/generated/resources/assets/byg/models/item/{bulbis_hyphae.json => bulbis_wood.json} (100%) delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_palm_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_palm_log_horizontal.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_palm_wood.json rename Common/src/main/resources/assets/byg/{models/block/stripped_aspen_wood.json => textures/block/aspen/ed_aspen_wood.json} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis/phycelium.png => bulbis_phycelium.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{bulbis/phycelium_top.png => bulbis_phycelium_top.png} (100%) rename Common/src/main/resources/assets/byg/{models/block/stripped_palm_wood_horizontal.json => textures/block/palm/ped_palm_wood_horizontal.json} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index a5c4feaa0b..f8f69552ca 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -49,7 +49,6 @@ d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_ e76b9975b21af881fb254fb3b95a03656e34a48c assets/byg/blockstates/bulbis_door.json 05ea3dbc2d1cf74164eccace12632d07284bebfd assets/byg/blockstates/bulbis_fence.json 52f49d50d9a2b1ff65a4ef5579ae87edfe01fa68 assets/byg/blockstates/bulbis_fence_gate.json -34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_hyphae.json aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json 650dfec098bab994309a39150c03ba8bb96103cf assets/byg/blockstates/bulbis_planks.json 93cd0d54e1ed8a0ed2fb7846904e437aa050cf7b assets/byg/blockstates/bulbis_pressure_plate.json @@ -57,6 +56,7 @@ aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.js cd66b534707514f920646728e836d22ba63aba3e assets/byg/blockstates/bulbis_stairs.json f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json 403946f133711ef34624713f7cb037cc9d4bd29a assets/byg/blockstates/bulbis_trapdoor.json +34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_wood.json 2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json 9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_table.json @@ -802,13 +802,13 @@ a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf 490c0fcfd64530bdd65f2a85319c5c6d756e5f6d assets/byg/models/item/bulbis_crafting_table.json 1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json 8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence.json -1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_hyphae.json 661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json 4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json 9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json 55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json 52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json +1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_wood.json d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json aa216009bf5130342dc1c1043b4c6305d8993657 assets/byg/models/item/cherry_bookshelf.json d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.json @@ -1227,7 +1227,7 @@ f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_p f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json 2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json -063cd8ffbe015d85a44841281614c2f72780f91a data/byg/recipes/wood/bulbis/wood.json +5caa3354b5580a44c9394df5f775439b2e186b14 data/byg/recipes/wood/bulbis/wood.json fcc3ecbb4c7fd0ca85a097eb05af19fb9470f82b data/byg/recipes/wood/cherry/boat.json f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf.json 69a6c51e9be471a4fdf07a0d253b4b3f76026818 data/byg/recipes/wood/cherry/button.json @@ -1509,7 +1509,7 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json 5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/blocks/wood/blue_enchanted_logs.json -30cb6225f90435624555cb4a10c162e47c6fcc77 data/byg/tags/blocks/wood/bulbis_logs.json +6ba54ede001aeb5d407035a8d9ed38fd9c6b6b85 data/byg/tags/blocks/wood/bulbis_logs.json 92bb19e703dea870b6efd348f6216eb791b07f94 data/byg/tags/blocks/wood/cherry_logs.json 5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/blocks/wood/cika_logs.json 7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/blocks/wood/cypress_logs.json @@ -1525,7 +1525,7 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json -97609e80bca8a05d3bb6fb19ce5b43d0fd435069 data/byg/tags/items/wood/bulbis_logs.json +b2b82b3c0b71053cb3f09d7b4bf3fab281489c41 data/byg/tags/items/wood/bulbis_logs.json f4980e01bf3950c5b70a5182e932662a5f325afb data/byg/tags/items/wood/cherry_logs.json 068be598420fe871d6b5781c38676dd17f7a0344 data/byg/tags/items/wood/cika_logs.json 29435ee175355151440dccbe35ded08bbcd4bc9c data/byg/tags/items/wood/cypress_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/blockstates/bulbis_hyphae.json rename to Common/src/generated/resources/assets/byg/blockstates/bulbis_wood.json diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/item/bulbis_hyphae.json rename to Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json index c38db7d211..bec7bf4c3f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "byg:bulbis_hyphae", + "item": "byg:bulbis_wood", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json index 8f8565035f..2a1e6751db 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:bulbis_hyphae", "byg:bulbis_stem", - "byg:stripped_bulbis_hyphae", - "byg:stripped_bulbis_stem" + "byg:bulbis_wood", + "byg:stripped_bulbis_stem", + "byg:stripped_bulbis_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json index 8a94d3b04a..5d5515c23d 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json @@ -3,7 +3,7 @@ "values": [ "byg:bulbis_stem", "byg:stripped_bulbis_stem", - "byg:bulbis_hyphae", - "byg:stripped_bulbis_hyphae" + "byg:bulbis_wood", + "byg:stripped_bulbis_wood" ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 51994963da..454b7ef284 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -18,8 +18,10 @@ public static void strippableLogsBYG() { Map stripables = new IdentityHashMap<>(AxeItemAccess.byg_getStrippables()); for (final BYGWoodTypes type : BYGWoodTypes.values()) { - stripables.put(type.log().get(), type.strippedLog().get()); - stripables.put(type.wood().get(), type.strippedWood().get()); + if (type.strippedLog() != null && type.log() != null) + stripables.put(type.log().get(), type.strippedLog().get()); + if (type.wood() != null && type.strippedWood() != null) + stripables.put(type.wood().get(), type.strippedWood().get()); } stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 638cc0bb25..e1000b70b2 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -45,6 +45,8 @@ public enum BYGWoodTypes { .growerItemGroundTag(BYGBlockTags.GROUND_BULBIS_ODDITY) .growerItem(GrowerItemType.ODDITY) .exclude(BlockType.LEAVES) + .registryName(BlockType.WOOD, "%s_wood") + .registryName(BlockType.STRIPPED_WOOD, "stripped_%s_wood") .stem()), CHERRY("cherry", new Builder() .exclude(BlockType.SAPLING, BlockType.LEAVES) diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_aspen_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_aspen_log.json deleted file mode 100644 index e61ec4863b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_aspen_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_aspen_log_top", - "side": "byg:block/stripped_aspen_log" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_palm_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_palm_log.json deleted file mode 100644 index 3f814cd8ed..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_palm_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/stripped_palm_log", - "end": "byg:block/stripped_palm_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_palm_log_horizontal.json b/Common/src/main/resources/assets/byg/models/block/stripped_palm_log_horizontal.json deleted file mode 100644 index b65fdf48f3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_palm_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "byg:block/stripped_palm_log_top", - "side": "byg:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_palm_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_palm_wood.json deleted file mode 100644 index 7d4bb11c34..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_palm_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/stripped_palm_log", - "end": "byg:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_aspen_wood.json b/Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json similarity index 100% rename from Common/src/main/resources/assets/byg/models/block/stripped_aspen_wood.json rename to Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium.png b/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium.png diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/bulbis/phycelium_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_palm_wood_horizontal.json b/Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json similarity index 100% rename from Common/src/main/resources/assets/byg/models/block/stripped_palm_wood_horizontal.json rename to Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index aaefa13bba..99ec0e09c5 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -43,6 +43,9 @@ protected void registerStatesAndModels() { final var log = models().cubeColumn(typeName + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); + final var strippedLog = models().cubeColumn(typeName + "/stripped_log", BYG.createLocation(typeLoc + "stripped_log"), BYG.createLocation(typeLoc + "stripped_log_top")); + axisBlock((RotatedPillarBlock) type.strippedLog().get(), strippedLog, strippedLog); + configureTransform(item.withExistingParent(type.strippedLog().getId().getPath(), strippedLog.getLocation())); if (type.boat() != null) item.withExistingParent(type.boat().getId().getPath(), generatedParent) @@ -153,6 +156,10 @@ protected void registerStatesAndModels() { .texture("particle", rl(typeLoc + "log")); configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); axisBlock((RotatedPillarBlock) type.wood().get(), wood, wood); + final var strippedWood = models().cubeAll(typeName + "/stripped_wood", rl(typeLoc + "stripped_wood")) + .texture("particle", rl(typeLoc + "stripped_wood")); + configureTransform(item.withExistingParent(type.strippedWood().getId().getPath(), strippedWood.getLocation())); + axisBlock((RotatedPillarBlock) type.strippedWood().get(), strippedWood, strippedLog); if (type.growerItem() != null) { final var textureLoc = rl(typeLoc + "grower_item"); From 45b4c9937cffe60f9d0751d47c19978c3fe800b7 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 24 May 2022 23:01:56 +0300 Subject: [PATCH 35/90] Add stripped logs and wood --- Common/src/generated/resources/.cache/cache | 122 +++++++++++++++--- .../assets/byg/blockstates/aspen_door.json | 16 +-- .../assets/byg/blockstates/baobab_door.json | 16 +-- .../byg/blockstates/blue_enchanted_door.json | 16 +-- .../assets/byg/blockstates/bulbis_door.json | 16 +-- .../assets/byg/blockstates/cherry_door.json | 16 +-- .../assets/byg/blockstates/cika_door.json | 16 +-- .../assets/byg/blockstates/cypress_door.json | 16 +-- .../assets/byg/blockstates/ebony_door.json | 16 +-- .../assets/byg/blockstates/ether_door.json | 16 +-- .../assets/byg/blockstates/fir_door.json | 16 +-- .../byg/blockstates/green_enchanted_door.json | 16 +-- .../assets/byg/blockstates/holly_door.json | 16 +-- .../assets/byg/blockstates/imparius_door.json | 16 +-- .../assets/byg/blockstates/mahogany_door.json | 16 +-- .../assets/byg/blockstates/mangrove_door.json | 16 +-- .../assets/byg/blockstates/palm_door.json | 16 +-- .../byg/blockstates/stripped_aspen_log.json | 16 +++ .../byg/blockstates/stripped_aspen_wood.json | 16 +++ .../byg/blockstates/stripped_baobab_log.json | 16 +++ .../byg/blockstates/stripped_baobab_wood.json | 16 +++ .../stripped_blue_enchanted_log.json | 16 +++ .../stripped_blue_enchanted_wood.json | 16 +++ .../byg/blockstates/stripped_bulbis_stem.json | 16 +++ .../byg/blockstates/stripped_bulbis_wood.json | 16 +++ .../byg/blockstates/stripped_cherry_log.json | 16 +++ .../byg/blockstates/stripped_cherry_wood.json | 16 +++ .../byg/blockstates/stripped_cika_log.json | 16 +++ .../byg/blockstates/stripped_cika_wood.json | 16 +++ .../byg/blockstates/stripped_cypress_log.json | 16 +++ .../blockstates/stripped_cypress_wood.json | 16 +++ .../byg/blockstates/stripped_ebony_log.json | 16 +++ .../byg/blockstates/stripped_ebony_wood.json | 16 +++ .../byg/blockstates/stripped_ether_log.json | 16 +++ .../byg/blockstates/stripped_ether_wood.json | 16 +++ .../byg/blockstates/stripped_fir_log.json | 16 +++ .../byg/blockstates/stripped_fir_wood.json | 16 +++ .../stripped_green_enchanted_log.json | 16 +++ .../stripped_green_enchanted_wood.json | 16 +++ .../byg/blockstates/stripped_holly_log.json | 16 +++ .../byg/blockstates/stripped_holly_wood.json | 16 +++ .../blockstates/stripped_mahogany_log.json | 16 +++ .../blockstates/stripped_mahogany_wood.json | 16 +++ .../blockstates/stripped_mangrove_log.json | 16 +++ .../blockstates/stripped_mangrove_wood.json | 16 +++ .../byg/blockstates/stripped_palm_log.json | 16 +++ .../byg/blockstates/stripped_palm_wood.json | 16 +++ .../byg/models/block/aspen/stripped_log.json | 7 + .../byg/models/block/aspen/stripped_wood.json | 7 + .../byg/models/block/baobab/stripped_log.json | 7 + .../models/block/baobab/stripped_wood.json | 7 + .../block/blue_enchanted/stripped_log.json | 7 + .../block/blue_enchanted/stripped_wood.json | 7 + .../byg/models/block/bulbis/stripped_log.json | 7 + .../models/block/bulbis/stripped_wood.json | 7 + .../byg/models/block/cherry/stripped_log.json | 7 + .../models/block/cherry/stripped_wood.json | 7 + .../byg/models/block/cika/stripped_log.json | 7 + .../byg/models/block/cika/stripped_wood.json | 7 + .../models/block/cypress/stripped_log.json | 7 + .../models/block/cypress/stripped_wood.json | 7 + .../byg/models/block/ebony/stripped_log.json | 7 + .../byg/models/block/ebony/stripped_wood.json | 7 + .../byg/models/block/ether/stripped_log.json | 7 + .../byg/models/block/ether/stripped_wood.json | 7 + .../byg/models/block/fir/stripped_log.json | 7 + .../byg/models/block/fir/stripped_wood.json | 7 + .../block/green_enchanted/stripped_log.json | 7 + .../block/green_enchanted/stripped_wood.json | 7 + .../byg/models/block/holly/stripped_log.json | 7 + .../byg/models/block/holly/stripped_wood.json | 7 + .../models/block/mahogany/stripped_log.json | 7 + .../models/block/mahogany/stripped_wood.json | 7 + .../models/block/mangrove/stripped_log.json | 7 + .../models/block/mangrove/stripped_wood.json | 7 + .../byg/models/block/palm/stripped_log.json | 7 + .../byg/models/block/palm/stripped_wood.json | 7 + .../byg/models/item/stripped_aspen_log.json | 39 ++++++ .../byg/models/item/stripped_aspen_wood.json | 39 ++++++ .../byg/models/item/stripped_baobab_log.json | 39 ++++++ .../byg/models/item/stripped_baobab_wood.json | 39 ++++++ .../item/stripped_blue_enchanted_log.json | 39 ++++++ .../item/stripped_blue_enchanted_wood.json | 39 ++++++ .../byg/models/item/stripped_bulbis_stem.json | 39 ++++++ .../byg/models/item/stripped_bulbis_wood.json | 39 ++++++ .../byg/models/item/stripped_cherry_log.json | 39 ++++++ .../byg/models/item/stripped_cherry_wood.json | 39 ++++++ .../byg/models/item/stripped_cika_log.json | 39 ++++++ .../byg/models/item/stripped_cika_wood.json | 39 ++++++ .../byg/models/item/stripped_cypress_log.json | 39 ++++++ .../models/item/stripped_cypress_wood.json | 39 ++++++ .../byg/models/item/stripped_ebony_log.json | 39 ++++++ .../byg/models/item/stripped_ebony_wood.json | 39 ++++++ .../byg/models/item/stripped_ether_log.json | 39 ++++++ .../byg/models/item/stripped_ether_wood.json | 39 ++++++ .../byg/models/item/stripped_fir_log.json | 39 ++++++ .../byg/models/item/stripped_fir_wood.json | 39 ++++++ .../item/stripped_green_enchanted_log.json | 39 ++++++ .../item/stripped_green_enchanted_wood.json | 39 ++++++ .../byg/models/item/stripped_holly_log.json | 39 ++++++ .../byg/models/item/stripped_holly_wood.json | 39 ++++++ .../models/item/stripped_mahogany_log.json | 39 ++++++ .../models/item/stripped_mahogany_wood.json | 39 ++++++ .../models/item/stripped_mangrove_log.json | 39 ++++++ .../models/item/stripped_mangrove_wood.json | 39 ++++++ .../byg/models/item/stripped_palm_log.json | 39 ++++++ .../byg/models/item/stripped_palm_wood.json | 39 ++++++ .../byg/models/block/stripped_baobab_log.json | 12 -- .../models/block/stripped_baobab_wood.json | 12 -- .../block/stripped_blue_enchanted_log.json | 12 -- .../block/stripped_blue_enchanted_wood.json | 12 -- .../models/block/stripped_bulbis_stem.json | 7 - .../models/block/stripped_bulbis_wood.json | 7 - .../byg/models/block/stripped_cherry_log.json | 7 - .../models/block/stripped_cherry_wood.json | 12 -- .../byg/models/block/stripped_cika_log.json | 12 -- .../byg/models/block/stripped_cika_wood.json | 7 - .../models/block/stripped_cypress_log.json | 12 -- .../models/block/stripped_cypress_wood.json | 7 - .../byg/models/block/stripped_ebony_log.json | 12 -- .../byg/models/block/stripped_ebony_wood.json | 7 - .../byg/models/block/stripped_ether_log.json | 7 - .../byg/models/block/stripped_ether_wood.json | 7 - .../byg/models/block/stripped_fir_log.json | 12 -- .../byg/models/block/stripped_fir_wood.json | 7 - .../block/stripped_green_enchanted_log.json | 12 -- .../block/stripped_green_enchanted_wood.json | 7 - .../byg/models/block/stripped_holly_log.json | 12 -- .../byg/models/block/stripped_holly_wood.json | 7 - .../models/block/stripped_mahogany_log.json | 12 -- .../models/block/stripped_mahogany_wood.json | 7 - .../models/block/stripped_mangrove_log.json | 12 -- .../models/block/stripped_mangrove_wood.json | 7 - .../byg/models/item/stripped_aspen_log.json | 22 ---- .../byg/models/item/stripped_aspen_wood.json | 22 ---- .../byg/models/item/stripped_baobab_log.json | 22 ---- .../byg/models/item/stripped_baobab_wood.json | 22 ---- .../item/stripped_blue_enchanted_log.json | 22 ---- .../item/stripped_blue_enchanted_wood.json | 22 ---- .../byg/models/item/stripped_bulbis_stem.json | 3 - .../byg/models/item/stripped_bulbis_wood.json | 3 - .../byg/models/item/stripped_cherry_log.json | 22 ---- .../byg/models/item/stripped_cherry_wood.json | 22 ---- .../byg/models/item/stripped_cika_log.json | 22 ---- .../byg/models/item/stripped_cika_wood.json | 22 ---- .../byg/models/item/stripped_cypress_log.json | 22 ---- .../models/item/stripped_cypress_wood.json | 22 ---- .../byg/models/item/stripped_ebony_log.json | 22 ---- .../byg/models/item/stripped_ebony_wood.json | 22 ---- .../byg/models/item/stripped_ether_log.json | 3 - .../byg/models/item/stripped_ether_wood.json | 3 - .../byg/models/item/stripped_fir_log.json | 22 ---- .../byg/models/item/stripped_fir_wood.json | 22 ---- .../item/stripped_green_enchanted_log.json | 22 ---- .../item/stripped_green_enchanted_wood.json | 22 ---- .../byg/models/item/stripped_holly_log.json | 22 ---- .../byg/models/item/stripped_holly_wood.json | 22 ---- .../models/item/stripped_mahogany_log.json | 22 ---- .../models/item/stripped_mahogany_wood.json | 22 ---- .../models/item/stripped_mangrove_log.json | 22 ---- .../models/item/stripped_mangrove_wood.json | 22 ---- .../byg/models/item/stripped_palm_log.json | 3 - .../byg/models/item/stripped_palm_wood.json | 3 - .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../data/byg/recipes/imparius_hyphae.json | 16 --- .../providers/BYGWoodAssetsProvider.java | 30 +++-- 195 files changed, 2112 insertions(+), 965 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_stem.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cika_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cika_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_ether_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_ether_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_fir_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_fir_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_holly_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_holly_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_palm_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_palm_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_baobab_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_bulbis_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_bulbis_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cherry_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cika_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cika_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_cypress_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_ebony_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_ebony_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_ether_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_fir_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_fir_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_holly_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_mahogany_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_mangrove_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_aspen_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_baobab_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_bulbis_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_bulbis_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cherry_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cika_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cika_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_cypress_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_ebony_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_ebony_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_ether_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_fir_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_fir_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_holly_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_mahogany_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_mangrove_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_palm_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_palm_wood.json rename Common/src/main/resources/assets/byg/textures/block/{stripped_aspen_log.png => aspen/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_aspen_log_top.png => aspen/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_baobab_log.png => baobab/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_baobab_log_top.png => baobab/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_blue_enchanted_log.png => blue_enchanted/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_blue_enchanted_log_top.png => blue_enchanted/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_bulbis_stem.png => bulbis/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_bulbis_stem_top.png => bulbis/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cherry_log.png => cherry/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cherry_log_top.png => cherry/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cika_log.png => cika/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cika_log_top.png => cika/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cypress_log.png => cypress/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_cypress_log_top.png => cypress/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_ebony_log.png => ebony/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_ebony_log_top.png => ebony/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_ether_log.png => ether/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_ether_log_top.png => ether/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_fir_log.png => fir/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_fir_log_top.png => fir/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_green_enchanted_log.png => green_enchanted/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_green_enchanted_log_top.png => green_enchanted/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_holly_log.png => holly/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_holly_log_top.png => holly/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_mahogany_log.png => mahogany/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_mahogany_log_top.png => mahogany/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_mangrove_log.png => mangrove/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_mangrove_log_top.png => mangrove/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_palm_log.png => palm/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_palm_log_top.png => palm/stripped_log_top.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/imparius_hyphae.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index f8f69552ca..43df258587 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -1,7 +1,7 @@ b30f441c3c157109846ed8b851ae3fd1a8c7436a assets/byg/blockstates/aspen_bookshelf.json b5c900c1aac808526360ed0175a497b1a382b433 assets/byg/blockstates/aspen_button.json fd3329c171e82f85a18f706ba33da293d70445c8 assets/byg/blockstates/aspen_crafting_table.json -ec33f2ed070a0abe26a29210410740cb34ecf9bb assets/byg/blockstates/aspen_door.json +347ecc08e06663236f3c17c3bedd68378a19f4e1 assets/byg/blockstates/aspen_door.json 1062037f8303186ebdee325277f3536a5c1598f8 assets/byg/blockstates/aspen_fence.json 9102ffbed0ac6db820bc9669b9a93da58866cff7 assets/byg/blockstates/aspen_fence_gate.json 29d25252851409b25de70e0ba0211509fefcdc9f assets/byg/blockstates/aspen_leaves.json @@ -16,7 +16,7 @@ a1cf8cc2fd4e08745aaedb95ca8d8aa565c532b9 assets/byg/blockstates/aspen_trapdoor.j 9b530553a60965f2c1d6df95e793ca5d5df668e7 assets/byg/blockstates/baobab_bookshelf.json 9494e776824d175009ab0c64293294a955c2b1d6 assets/byg/blockstates/baobab_button.json a29d366559c6ddc55a2edbb7c31ffa202a6a967d assets/byg/blockstates/baobab_crafting_table.json -6e770f770815f5eefff82fb64659193468c11f3a assets/byg/blockstates/baobab_door.json +d58aa83bb3250da16d7658371ecb2e27cbe44074 assets/byg/blockstates/baobab_door.json 3e6fce83ee8e0c3f83ef1a4764cfba79439723de assets/byg/blockstates/baobab_fence.json 11d39189a8f092501cbf9c41d92ec8f99747c96f assets/byg/blockstates/baobab_fence_gate.json cb8e0c689ba19dc671b9fbb7810e2f1bc3c2ece4 assets/byg/blockstates/baobab_leaves.json @@ -31,7 +31,7 @@ a407a88762140e840178fe0cc1a9f2fa6fdd7782 assets/byg/blockstates/baobab_wood.json 456c6bb8f7cced890ba8c4bc49319b70d2e9fb97 assets/byg/blockstates/blue_enchanted_bookshelf.json 22ab3ec5237ade7b7763133ce7c0ed28bb28576a assets/byg/blockstates/blue_enchanted_button.json aea28f311eec3ba4950d8fef2ef809de55b5ebe0 assets/byg/blockstates/blue_enchanted_crafting_table.json -2285fbe7ad192e19b9d52f3f09c6b20972c7fb05 assets/byg/blockstates/blue_enchanted_door.json +6f06579f4504cbfb171aa9b57c3529f9f83d1ea8 assets/byg/blockstates/blue_enchanted_door.json a8c0e87fb742bb27bd421145b35983ee3ed5b28e assets/byg/blockstates/blue_enchanted_fence.json 1fdcdad4d62f7529880aef2e8469753b241e61a2 assets/byg/blockstates/blue_enchanted_fence_gate.json 5abfba409f2ab105c80413dc1d386dcf2582a41d assets/byg/blockstates/blue_enchanted_leaves.json @@ -46,7 +46,7 @@ ca04d4d0c482f697ac997c18cd672872d6d5574b assets/byg/blockstates/blue_enchanted_t 11d9fdb3f3fb28605dc1813efddbc0769c7376e7 assets/byg/blockstates/bulbis_bookshelf.json cdc4bb75ce5f65a4105e76f022b24c022329daaa assets/byg/blockstates/bulbis_button.json d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_table.json -e76b9975b21af881fb254fb3b95a03656e34a48c assets/byg/blockstates/bulbis_door.json +7bc91cf41467018ce962141aeaf6ef636a3f863d assets/byg/blockstates/bulbis_door.json 05ea3dbc2d1cf74164eccace12632d07284bebfd assets/byg/blockstates/bulbis_fence.json 52f49d50d9a2b1ff65a4ef5579ae87edfe01fa68 assets/byg/blockstates/bulbis_fence_gate.json aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json @@ -60,7 +60,7 @@ f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json 2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json 9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_table.json -810228e6611128342093cc7b1170ea67d2de7c6b assets/byg/blockstates/cherry_door.json +30dc7678a7d74626d9baacba655550f1f8ea8334 assets/byg/blockstates/cherry_door.json 7837301596305f89a623a2e8f00ae80d4b69c68d assets/byg/blockstates/cherry_fence.json 5f4004b4ebee91256b09d5170dc6000b6482f836 assets/byg/blockstates/cherry_fence_gate.json cac2a6bdf27098f538aad8afa1ef7a4e197d36e6 assets/byg/blockstates/cherry_log.json @@ -73,7 +73,7 @@ b358d54ecbc20cd095b8a3190ecd0b6e5e92d8a1 assets/byg/blockstates/cherry_planks.js 4a3ba90f77e5b20c00636a9fddbdcdaa95556993 assets/byg/blockstates/cika_bookshelf.json 51eb709f9dd4702a5060327b3508fff7aeffd7ed assets/byg/blockstates/cika_button.json 30516f8e13ffb9c627bc8d5183b1b5fd00b18174 assets/byg/blockstates/cika_crafting_table.json -3b05bb426e59fb1ab0b3c7e66652da876cb831f9 assets/byg/blockstates/cika_door.json +6031c903fd27b042a8c096093512cce235c254c4 assets/byg/blockstates/cika_door.json cf27985827685ce0c53261402375bd0d7aa1ad38 assets/byg/blockstates/cika_fence.json d46011fcb0eb1a993ba87cf2b70058331e5ba961 assets/byg/blockstates/cika_fence_gate.json 2437bbe06265b1d51a2bbedc21303b8a882a39ad assets/byg/blockstates/cika_leaves.json @@ -88,7 +88,7 @@ e44b08dca8032672db8b041d632dbcd3be644817 assets/byg/blockstates/cika_wood.json 2f90dccadf676a68cc434d058f16c1745f436fc2 assets/byg/blockstates/cypress_bookshelf.json 7f11b23b79d4ad7decd6a688a1de3b9cc6dfdf40 assets/byg/blockstates/cypress_button.json 9ae2c63c958ade5f3c3c8fb085dc799b6d3e3700 assets/byg/blockstates/cypress_crafting_table.json -0eceb43bf89018ba2116fb858cc0f0fa3eb450d4 assets/byg/blockstates/cypress_door.json +a054c568abd58f389f30bc647c4bd92db63210dd assets/byg/blockstates/cypress_door.json b2fd9cbc00821348f1c6a01570a99c6068f8cd31 assets/byg/blockstates/cypress_fence.json 050aae7a7841ea65d45c2e3d3cbf119ba89afabb assets/byg/blockstates/cypress_fence_gate.json b68b8479abbd2fcb55d41803b00a7c86dc98107f assets/byg/blockstates/cypress_leaves.json @@ -103,7 +103,7 @@ fe5812f696dfecd2386017c2e904d584d651918b assets/byg/blockstates/cypress_trapdoor 0b58b77abeede946897bbe25202bee8368c9d22f assets/byg/blockstates/ebony_bookshelf.json 114efca25fa48660b167082279d1e00a1acd4860 assets/byg/blockstates/ebony_button.json 14075432b69c040e98b3a7e334647f0ad3da71ec assets/byg/blockstates/ebony_crafting_table.json -cda73dd2076e6c513799543a131625409fa156a9 assets/byg/blockstates/ebony_door.json +70bdc383654cb23af3b27ce400b2832349936aa5 assets/byg/blockstates/ebony_door.json 6c61f8ffa9fde9c16aa710bef6bb1e5ae739aa49 assets/byg/blockstates/ebony_fence.json 7f5a17bb8734ffa2664ecfe792d8936417286f17 assets/byg/blockstates/ebony_fence_gate.json d74089c995e6affbc74a457cff279aaa1ac02a46 assets/byg/blockstates/ebony_leaves.json @@ -118,7 +118,7 @@ e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json 75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json 9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json 02861206e3db5520606113efda73aaee0a2d9252 assets/byg/blockstates/ether_crafting_table.json -b8d5330c7b946cc68eab17aebaa53b5fa1a69eb1 assets/byg/blockstates/ether_door.json +da55907f64fafb7b6dee2e2a711baebc50bf94e6 assets/byg/blockstates/ether_door.json 83814c68b112d7c4971b1ab274187057f9a10c6f assets/byg/blockstates/ether_fence.json f9700f487572abb2236c67b992bbbbbf4ad26f0e assets/byg/blockstates/ether_fence_gate.json 38fd59128606055cd47f9d0f5e7dd9a838abad97 assets/byg/blockstates/ether_leaves.json @@ -133,7 +133,7 @@ e3e77c7b000f51269b5f67ecddc512ec96ea05ae assets/byg/blockstates/ether_wood.json f664d6bc826b44c0d13d33f27f57a59e7560edf0 assets/byg/blockstates/fir_bookshelf.json 156771fc3a906babe8931d717fb39aceef675330 assets/byg/blockstates/fir_button.json 33b5cf1acf9ae829ba7cb65eb1b234315d7d85af assets/byg/blockstates/fir_crafting_table.json -66ae513ef2b9c2f5a0988fc4942cd2eed0f13ccd assets/byg/blockstates/fir_door.json +2e43e224bc6bfdd260679cf5c95ac2055523024e assets/byg/blockstates/fir_door.json 082b1775bdb12abcaadf082548ce31498f8f1c68 assets/byg/blockstates/fir_fence.json 97884fc7522e744734612008fba109a49a1332a3 assets/byg/blockstates/fir_fence_gate.json 306bbaf05ba93fa40abdf5778a659bdbebd98518 assets/byg/blockstates/fir_leaves.json @@ -148,7 +148,7 @@ ec0a00c28a345cd8e7651bf0d04ccdf9eed4a44a assets/byg/blockstates/fir_stairs.json 9943f7e2bc7314068fe2d79f4c84b924cb7a0c59 assets/byg/blockstates/green_enchanted_bookshelf.json 04b2a6e84f0c0a930d5d119e5a23f44821f3544d assets/byg/blockstates/green_enchanted_button.json 67c51071904ce0110550b5107e8887987043220c assets/byg/blockstates/green_enchanted_crafting_table.json -05bed9ae2c7571cdf89c889c6f29714fc149a4e1 assets/byg/blockstates/green_enchanted_door.json +a5701ba522045183b41b115f78182d036c3adcce assets/byg/blockstates/green_enchanted_door.json 24c2fc4ab9a92ee26f5f9b9b3e4ba632ae1fca31 assets/byg/blockstates/green_enchanted_fence.json 5cd8bc0e467abb59e3e2489f306426e5d73453ac assets/byg/blockstates/green_enchanted_fence_gate.json 2ae3136bc890f8c9e8fbbfc3593c101393f9713b assets/byg/blockstates/green_enchanted_leaves.json @@ -163,7 +163,7 @@ f983f31f409c8107060d6869689d426cef3aacc1 assets/byg/blockstates/green_enchanted_ b32d0d43ebd88a4bfe468169f24c16d42579f0d7 assets/byg/blockstates/holly_bookshelf.json 198f588b7cb0580ad5ffa48eb728be5a77d7a737 assets/byg/blockstates/holly_button.json 2cce94d6eaa74cbb964b3ba950d286b0082ce82b assets/byg/blockstates/holly_crafting_table.json -25e2e375c6fac3588a1133a990c92ef5dccfbb86 assets/byg/blockstates/holly_door.json +87107c171b4c12de8047c25b4118c3fad97ff0c5 assets/byg/blockstates/holly_door.json 1e0d1cb27c47deedb0b594daf1ad96664bc403a1 assets/byg/blockstates/holly_fence.json c98a61362134c539fa7b3e1c3fbc7a5c4bf29deb assets/byg/blockstates/holly_fence_gate.json e645b36d4b6491a69555e368685a0a24b5647504 assets/byg/blockstates/holly_leaves.json @@ -178,7 +178,7 @@ a6d91c6966dcd3f969e18ea0b9261280e5f42053 assets/byg/blockstates/holly_sapling.js 9cbc47409067352e5896d895c7abce4bcae0ffa8 assets/byg/blockstates/imparius_bookshelf.json 15c7dbe3e482190440242b2f2c76c013556e9605 assets/byg/blockstates/imparius_button.json 66e7425c2020c136138f201825aff3d499721428 assets/byg/blockstates/imparius_crafting_table.json -51c6d9cff656c4a58d495583ca8bcf6c7512fbde assets/byg/blockstates/imparius_door.json +fc97fb03f56ab2a615f455454578f5d149a537ca assets/byg/blockstates/imparius_door.json 4cab2772b2e557e13e8df7dd485ea5aa78104509 assets/byg/blockstates/imparius_fence.json b62d39c9e83e6947b28154c3e785c7ed34822233 assets/byg/blockstates/imparius_fence_gate.json a53e3318418c7549ac4fac5826fff3fc149fc4fe assets/byg/blockstates/imparius_hyphae.json @@ -192,7 +192,7 @@ bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs. 2d64b1e97d9895e66e98faca798866a4ebaee335 assets/byg/blockstates/mahogany_bookshelf.json 718f7b42d87527834f70aa7918447aa98ca7b2a1 assets/byg/blockstates/mahogany_button.json 6f41668ba9e74ca53c6015d50ab82fa974538b89 assets/byg/blockstates/mahogany_crafting_table.json -27649644f47d673038a327d8c3e453be84a064a3 assets/byg/blockstates/mahogany_door.json +60ce84a6ba354e97d1d722eb75b807cd94657417 assets/byg/blockstates/mahogany_door.json 6f26d59749aa9ec3c6eaf295afd9a4794d078101 assets/byg/blockstates/mahogany_fence.json 215e498d7d36ad76e71f4f62568d71bf274be85d assets/byg/blockstates/mahogany_fence_gate.json 259c93c1fbce5626b84195720fa59e85b30a2746 assets/byg/blockstates/mahogany_leaves.json @@ -207,7 +207,7 @@ a5a996bdf644ffa4075527c9beaff965d19dce71 assets/byg/blockstates/mahogany_sapling 803d7b6e47598ac0b27596620c4c7a18b149b045 assets/byg/blockstates/mangrove_bookshelf.json fb877e5603e8bf1df87634856397c7253bfe3c7d assets/byg/blockstates/mangrove_button.json 692070740510de92a95476f38ff6d0643370283d assets/byg/blockstates/mangrove_crafting_table.json -e3357f8929ebb51a9789004b64d57a7cfeb8b0e4 assets/byg/blockstates/mangrove_door.json +5c519fdcbc8af56da26c47ba43e27b89ad428b60 assets/byg/blockstates/mangrove_door.json d5b8e983181b9c6b3ad3c959f0c50f66d4a0c122 assets/byg/blockstates/mangrove_fence.json 077d8ad9a649d975a7ea4ac0ef9262c4a5a49fc6 assets/byg/blockstates/mangrove_fence_gate.json 065aa9e1eee92080b502986c4128ed5d08f6c896 assets/byg/blockstates/mangrove_leaves.json @@ -222,7 +222,7 @@ ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.js f0a003b2821eb17ac9cf27388185f531cefe7653 assets/byg/blockstates/palm_bookshelf.json 3466ff62b97c684f6d8ff7abe5a8a3d96b429a90 assets/byg/blockstates/palm_button.json 61377cd034b199721da044ffd0c875a6b49cc67c assets/byg/blockstates/palm_crafting_table.json -3449c0ef09bb0e5f8c92c5c709fdf0f2a56a05a0 assets/byg/blockstates/palm_door.json +46869def95ae3b506c15a80776886f4bb3c0dac7 assets/byg/blockstates/palm_door.json 93ad90e8289647bbaa141ed6a637bf2dc058ae32 assets/byg/blockstates/palm_fence.json e335d52b5e98babb8b8a4389d9131d3f0041536c assets/byg/blockstates/palm_fence_gate.json d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json @@ -234,6 +234,36 @@ d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json 7ea376d4c1145b038ecc0ca79323c3f058b761a6 assets/byg/blockstates/palm_stairs.json 6b58b359208df4fcf6bca915b553ff5651edcf74 assets/byg/blockstates/palm_trapdoor.json c457911d73a2555da1376d374044c87d794f090c assets/byg/blockstates/palm_wood.json +6566cf7f92aadb61d379dbcaef0473851bf3909e assets/byg/blockstates/stripped_aspen_log.json +b7cef1857889d35956251b732f6dc286b30b7259 assets/byg/blockstates/stripped_aspen_wood.json +18e5da620766a46763e48460bf581be6047b4345 assets/byg/blockstates/stripped_baobab_log.json +562a2469a3a1fbbce26d54bde8afa8e7689b273a assets/byg/blockstates/stripped_baobab_wood.json +c33d4f69ee174ed9ee37dfb8a3aa62fd79cc5a11 assets/byg/blockstates/stripped_blue_enchanted_log.json +e102ca5500277ec3994264f2e0eaeac8074796ef assets/byg/blockstates/stripped_blue_enchanted_wood.json +84f8b063757d80c1324035677bebd22c573b7458 assets/byg/blockstates/stripped_bulbis_stem.json +ef01e82bf5872790295e1beb5c8e6552e3fd9584 assets/byg/blockstates/stripped_bulbis_wood.json +2a309605387f2df90b168e303a9d55dbebb782d8 assets/byg/blockstates/stripped_cherry_log.json +8334bae2083dc84d06a4fb05774056b45abfe6a6 assets/byg/blockstates/stripped_cherry_wood.json +1b88816e58d4019cd5b7276fc6cb6c1070f45b52 assets/byg/blockstates/stripped_cika_log.json +5c9cfd865bbe81e36c6be44f9c0db717bc8c6d97 assets/byg/blockstates/stripped_cika_wood.json +22ff78f6fe934d2eeef4e6c801fb1b4042814054 assets/byg/blockstates/stripped_cypress_log.json +615e6f98b311813ba850e39a306f5de9145ca1be assets/byg/blockstates/stripped_cypress_wood.json +f4e0b9beacb2909fc37fca89d9210a6f322ab2c0 assets/byg/blockstates/stripped_ebony_log.json +4cfd875f5f962a7de3c2ef003d8a887230dec377 assets/byg/blockstates/stripped_ebony_wood.json +84804e789d5378f959a5e14e33a577e55c72e7d5 assets/byg/blockstates/stripped_ether_log.json +3f7eb7b740c1f98a4a660ffb7ef4ffa8451032b5 assets/byg/blockstates/stripped_ether_wood.json +8e23a9ae234ab2d29b2cef26aa908d71a8a1a156 assets/byg/blockstates/stripped_fir_log.json +4607dba89ba1843a9d92805624ae69938580bc0a assets/byg/blockstates/stripped_fir_wood.json +12ed60cb1c6e0bec2509549afbc831c28fdc13a9 assets/byg/blockstates/stripped_green_enchanted_log.json +f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_enchanted_wood.json +883ccd05f2b67a6aeee0e6ee57b7a30585538d7b assets/byg/blockstates/stripped_holly_log.json +6239db53e36bf37f2a8d22d02ea135f6594538b0 assets/byg/blockstates/stripped_holly_wood.json +28d46328ec91e7650f48375c069a7bc8e814bf53 assets/byg/blockstates/stripped_mahogany_log.json +479abf5122246126d85fbe8affd3afaad3f7c531 assets/byg/blockstates/stripped_mahogany_wood.json +60daa9513ff96eac9272602d4e2afe9635718495 assets/byg/blockstates/stripped_mangrove_log.json +3ad3465364f28027741f566d36acea26900b5956 assets/byg/blockstates/stripped_mangrove_wood.json +5d63ae2eafc9d9a3ded5950201a561ab51ea7402 assets/byg/blockstates/stripped_palm_log.json +3e380a2c54db98407de1c8a852bb8bba7ed32f64 assets/byg/blockstates/stripped_palm_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -262,6 +292,8 @@ c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen/slab.json ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen/stairs.json be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen/stairs_inner.json 4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen/stairs_outer.json +450a7e1ee4b8b2e5601f39234714683380eea7e6 assets/byg/models/block/aspen/stripped_log.json +03252d342afe557738c4ffd4a8731fafd91243a6 assets/byg/models/block/aspen/stripped_wood.json 0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/block/aspen/trapdoor.json 76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen/trapdoor_bottom.json d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen/trapdoor_open.json @@ -295,6 +327,8 @@ f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure 17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab/stairs.json 76cd7c13e8a472c170bee401f53816a7146883d3 assets/byg/models/block/baobab/stairs_inner.json 36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab/stairs_outer.json +9bfb0a9533f3ee1d4759837d1d40ad4e36799c0c assets/byg/models/block/baobab/stripped_log.json +99a2ed6e9b60894553a2a8a3044d9e2290fb8708 assets/byg/models/block/baobab/stripped_wood.json 1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/block/baobab/trapdoor.json 71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab/trapdoor_bottom.json 67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab/trapdoor_open.json @@ -328,6 +362,8 @@ bb861cc6424f39c44f08c291dce0119836f8a514 assets/byg/models/block/blue_enchanted/ eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/stairs.json 5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted/stairs_inner.json 615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted/stairs_outer.json +e059c170a4e1a8f1fb0da351888382f545f8109f assets/byg/models/block/blue_enchanted/stripped_log.json +78ba01d70cafa16511a8db427223b30841fe1acf assets/byg/models/block/blue_enchanted/stripped_wood.json 39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/block/blue_enchanted/trapdoor.json dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted/trapdoor_bottom.json 470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted/trapdoor_open.json @@ -359,6 +395,8 @@ eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis/pressure fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis/stairs.json 35c77b8c5bef56b75ec9bd9f77bda8c07eb3e038 assets/byg/models/block/bulbis/stairs_inner.json f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis/stairs_outer.json +04be7aa8be8ecd79357c9a9e8101ff9cda92bb57 assets/byg/models/block/bulbis/stripped_log.json +fa273edd6102c871b49afbbcfe9999a1e2d930d2 assets/byg/models/block/bulbis/stripped_wood.json 38bee46bfbb50d6a6a7d336c53ae2e4a6f5f6621 assets/byg/models/block/bulbis/trapdoor.json 56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis/trapdoor_bottom.json c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis/trapdoor_open.json @@ -389,6 +427,8 @@ e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry/slab.jso fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry/stairs.json 26b9d1ca396822f5f1a09b1ce06b38653fa4ef83 assets/byg/models/block/cherry/stairs_inner.json 1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry/stairs_outer.json +0c7aaf316e7db749f0fc5d59e41912bf93c47424 assets/byg/models/block/cherry/stripped_log.json +9702ca63e2dc8959b8f7cbe37ea36c7bf373298f assets/byg/models/block/cherry/stripped_wood.json c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/block/cherry/trapdoor.json 91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry/trapdoor_bottom.json 36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry/trapdoor_open.json @@ -422,6 +462,8 @@ ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json 869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika/stairs.json 37d8526d628e939746fa4329b3237ca573f22907 assets/byg/models/block/cika/stairs_inner.json d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika/stairs_outer.json +533f31255a60f15e5cd413d60db612da11862055 assets/byg/models/block/cika/stripped_log.json +641c9d05ec91a0aa7610b7f8cc2d03dbed031c7d assets/byg/models/block/cika/stripped_wood.json 93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/block/cika/trapdoor.json c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika/trapdoor_bottom.json c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika/trapdoor_open.json @@ -455,6 +497,8 @@ c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress/pressur b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress/stairs.json c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress/stairs_inner.json c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress/stairs_outer.json +79627de757d17143122fc07cbf1f73261a7aa882 assets/byg/models/block/cypress/stripped_log.json +c6fa7cc125bc14d128fcb2583d44d1faa2e6cd4a assets/byg/models/block/cypress/stripped_wood.json beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/block/cypress/trapdoor.json e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress/trapdoor_bottom.json bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress/trapdoor_open.json @@ -488,6 +532,8 @@ a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_ 9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony/stairs.json 41d73969017926ed2daee4ff4034e6d5622e9da4 assets/byg/models/block/ebony/stairs_inner.json 913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony/stairs_outer.json +d113d4858c242fd47e9ccf3a1597d757abb55241 assets/byg/models/block/ebony/stripped_log.json +401b8101c268f44203f96477c3c853b0ab0cc506 assets/byg/models/block/ebony/stripped_wood.json fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/block/ebony/trapdoor.json f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_bottom.json 631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json @@ -521,6 +567,8 @@ b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_ 3b042a717fb7d7d77fcf6aaef5995f32eff724e1 assets/byg/models/block/ether/stairs.json 054c6e18bf7f9fb503bc85349ef8ecfdfe7623a5 assets/byg/models/block/ether/stairs_inner.json c07c6397816d8afa502c4a04dca385d1b4baf6d9 assets/byg/models/block/ether/stairs_outer.json +e42e71dea28942a62c221712fadd20206cd2acb9 assets/byg/models/block/ether/stripped_log.json +a48f8043336366ab70cdeb9c175a3cea079f2527 assets/byg/models/block/ether/stripped_wood.json 989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/block/ether/trapdoor.json c4a2b8bfb456f821304933ac4e019e889fa0f28d assets/byg/models/block/ether/trapdoor_bottom.json b9d4409a33e153601f0d7d07239ab95fbbeef32a assets/byg/models/block/ether/trapdoor_open.json @@ -554,6 +602,8 @@ abed894765b64afc6e9139c64a4f9c938350e8a1 assets/byg/models/block/fir/slab.json 69d1df741a76c57d97eff7c77d333bcbf4a872ad assets/byg/models/block/fir/stairs.json d289d31b8f91829b11464e6807b6e0765b77d28e assets/byg/models/block/fir/stairs_inner.json d278d64e67bdc2dd38541b9bf5bf24336f2994a9 assets/byg/models/block/fir/stairs_outer.json +a21e03ed8eb17a7fda491459702eb65bc38bdfe6 assets/byg/models/block/fir/stripped_log.json +9b6ef761ecfe28eb821ef4a36f6be483c984226d assets/byg/models/block/fir/stripped_wood.json 74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/block/fir/trapdoor.json 9cd3d0bcaf638bf1f8501d7dfe0cb677e7f2a259 assets/byg/models/block/fir/trapdoor_bottom.json 1e2e5714b08875fb2ee503a97b36ef1a402fcc48 assets/byg/models/block/fir/trapdoor_open.json @@ -587,6 +637,8 @@ f2343edc3dc92d2d0101eb709c877e190128588e assets/byg/models/block/green_enchanted 09003ed5b44621cb46ceede1b10cdcd74e037391 assets/byg/models/block/green_enchanted/stairs.json 6e0a6811eb26b37eb338671b77647797a89cabb1 assets/byg/models/block/green_enchanted/stairs_inner.json 5349f05565f57fff8f1d7537c4a87a24898e0b09 assets/byg/models/block/green_enchanted/stairs_outer.json +4fb234851b72d80630b4a7413fc14725121f9baa assets/byg/models/block/green_enchanted/stripped_log.json +c1c740572675bd3c558fdd45e1a5c863ce321824 assets/byg/models/block/green_enchanted/stripped_wood.json cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/block/green_enchanted/trapdoor.json f437f0d36f5821c5b6af79240c6c77a624cbd5c9 assets/byg/models/block/green_enchanted/trapdoor_bottom.json 75c08b16536de2ea25702aa4a3cdfbc20b194300 assets/byg/models/block/green_enchanted/trapdoor_open.json @@ -620,6 +672,8 @@ e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_ 28dbba88f7fb307616f27bb4565e0f6c24702b2f assets/byg/models/block/holly/stairs.json 97a02e92c7565f38c20ce3a912b84aee5049ba94 assets/byg/models/block/holly/stairs_inner.json 9e8e60ee1f78dd15b676d9167c31cc68af4e91f5 assets/byg/models/block/holly/stairs_outer.json +58a36b650d70b32493438b00520e8dee31c57ad8 assets/byg/models/block/holly/stripped_log.json +bdf84447c044624065e69bac05e703181123c5e2 assets/byg/models/block/holly/stripped_wood.json e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/block/holly/trapdoor.json bd80774ceff6624eb26328d1f05d96de380c3f80 assets/byg/models/block/holly/trapdoor_bottom.json ce4c9cd9d585aaf14cde2255d2671494020a4f1b assets/byg/models/block/holly/trapdoor_open.json @@ -684,6 +738,8 @@ f2fd0bdf26816fcd083222230742f05e92d97bed assets/byg/models/block/mahogany/slab_t 219d190d69f4355abf53567687cf967bd849fde8 assets/byg/models/block/mahogany/stairs.json 09bf6710ec3eead86c99262adb6fe280378de6ea assets/byg/models/block/mahogany/stairs_inner.json 89cf846e0a814064fcd02d57648ff8a583ac135a assets/byg/models/block/mahogany/stairs_outer.json +d511db509813684205cfc172e8edbeaa748ad364 assets/byg/models/block/mahogany/stripped_log.json +bc6f2d0f3901be3e67c986d9cfb46637db1c40ae assets/byg/models/block/mahogany/stripped_wood.json 1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/block/mahogany/trapdoor.json d10f0a6bcae1b16d29c5f292453d92084befbe49 assets/byg/models/block/mahogany/trapdoor_bottom.json 06b76eb6b276363c35a03e7d5d37bba35aa3b154 assets/byg/models/block/mahogany/trapdoor_open.json @@ -717,6 +773,8 @@ ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressu 0380d94b824120f82f1850fe5cf50e8603ae53d1 assets/byg/models/block/mangrove/stairs.json 81f32a3bddda583a73a5fdf4fddbac23bd92b0a1 assets/byg/models/block/mangrove/stairs_inner.json ccaaaf1759a8d518c4fd9a1895c9192bfc081c76 assets/byg/models/block/mangrove/stairs_outer.json +c213f8be3662160dcb2020ec1bac32b6833332aa assets/byg/models/block/mangrove/stripped_log.json +b53c1dbed17db433ca0335e71dd4a1cc38c463ad assets/byg/models/block/mangrove/stripped_wood.json cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/block/mangrove/trapdoor.json 18602dff240e103ebf20972a974ef14eeb6bf0d2 assets/byg/models/block/mangrove/trapdoor_bottom.json c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json @@ -750,6 +808,8 @@ a450c220fb7e0a98871a0bfe4291792123cdb027 assets/byg/models/block/palm/slab_top.j b7b8e43c14a1b02612d0a08653aa2dd092031fd6 assets/byg/models/block/palm/stairs.json d83d60d140d029181ce03d57993a7eb176862497 assets/byg/models/block/palm/stairs_inner.json 67bd4f349f4b6bf162f11bc05fa6e8b8245c56a4 assets/byg/models/block/palm/stairs_outer.json +2dab43e6932f6c5aecc149335760b49950fc4b86 assets/byg/models/block/palm/stripped_log.json +00838868eb00e6e93a725d22892525006c34146f assets/byg/models/block/palm/stripped_wood.json 2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/block/palm/trapdoor.json c96021f0305bcae8f8d5b28e3580b898f9b885fe assets/byg/models/block/palm/trapdoor_bottom.json 6779b160647712fb544f5d3279f5ba0a81bbce26 assets/byg/models/block/palm/trapdoor_open.json @@ -972,6 +1032,36 @@ b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_pl 3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json 641ded0df8c74eff47030fbf79f9bc373d58fb9a assets/byg/models/item/palm_wood.json +5eb73c5eff81302b6160bf99e9a395f4a881710a assets/byg/models/item/stripped_aspen_log.json +d562898c1fd9a5390654b3360b230abe9f2fa357 assets/byg/models/item/stripped_aspen_wood.json +8f311f72bc1785f527a93215c655ee1b7997f4cf assets/byg/models/item/stripped_baobab_log.json +a626dae24f4dd86f6787e23f8d56dfe903f46121 assets/byg/models/item/stripped_baobab_wood.json +7f6ed8e052889bcbefc1beb60915aa8c71211946 assets/byg/models/item/stripped_blue_enchanted_log.json +6a92504572a3332db8868d01ab21a4a70ea3543a assets/byg/models/item/stripped_blue_enchanted_wood.json +e1fdda2bf6df61f3a433c9c783c2010af5852a2f assets/byg/models/item/stripped_bulbis_stem.json +7d09224eab4290421d478e10ed790dcc7b7cb23e assets/byg/models/item/stripped_bulbis_wood.json +5d7063b73fd2ff127cfa3d2b90731a152fdffb46 assets/byg/models/item/stripped_cherry_log.json +0afb17de1f2638703fc9d84dddd7f81dd82bd66a assets/byg/models/item/stripped_cherry_wood.json +2c5edb90d9d8954cc1118543e4856bc061363e90 assets/byg/models/item/stripped_cika_log.json +3dbba3311c4e9c22741d785d0f516560b150f795 assets/byg/models/item/stripped_cika_wood.json +feab6881106cade562fa3b02d82d12e98ee9230b assets/byg/models/item/stripped_cypress_log.json +0692e7e67a4ef4b23e2ff7bf429cf3f742f414fd assets/byg/models/item/stripped_cypress_wood.json +98e91b262a9375d48c381898272f1e01ab00e45a assets/byg/models/item/stripped_ebony_log.json +e4ed1b4f8e97ded9b95e6a4bb8333e62ae08b188 assets/byg/models/item/stripped_ebony_wood.json +d8cf3c34099fa0bd7fd8dbf51a5075b9df29217c assets/byg/models/item/stripped_ether_log.json +2f3615abe3246b8c691c5925ca76a9108763829e assets/byg/models/item/stripped_ether_wood.json +b0d668ef92fa26d739f0fb38fdd5fce090ce6b49 assets/byg/models/item/stripped_fir_log.json +62b05299b4e6f97cdb4661da45ca6f4938ed74b4 assets/byg/models/item/stripped_fir_wood.json +4d76fe19f799a7c3024c04408b33aeabe2c64554 assets/byg/models/item/stripped_green_enchanted_log.json +be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_enchanted_wood.json +700f07776e23d57776aeb0635dcc3b73d16f09db assets/byg/models/item/stripped_holly_log.json +8527fb1522dc86c8fee094163603e6cb39c685a0 assets/byg/models/item/stripped_holly_wood.json +8d712c44b14eee5ab993f13a6d92cc925b483716 assets/byg/models/item/stripped_mahogany_log.json +3cb6f573ba8293f70be4617d65d0238ec7b57324 assets/byg/models/item/stripped_mahogany_wood.json +15b7617de1da389e5b34feb74834b5558c69631b assets/byg/models/item/stripped_mangrove_log.json +9db799e21b94bb971d782aa6642ba2f2a5d19d7f assets/byg/models/item/stripped_mangrove_wood.json +68eb2889df27becb11fe966b959e12d309f72e62 assets/byg/models/item/stripped_palm_log.json +e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json index 48205e0e52..406e0bcda9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json @@ -31,19 +31,19 @@ "model": "byg:block/aspen/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge" + "model": "byg:block/aspen/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/aspen/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/aspen/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge" + "model": "byg:block/aspen/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json index 3540e8764c..9556a40ec4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json @@ -31,19 +31,19 @@ "model": "byg:block/baobab/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge" + "model": "byg:block/baobab/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/baobab/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/baobab/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge" + "model": "byg:block/baobab/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json index b2308f23ad..640451546d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json @@ -31,19 +31,19 @@ "model": "byg:block/blue_enchanted/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge" + "model": "byg:block/blue_enchanted/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/blue_enchanted/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/blue_enchanted/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge" + "model": "byg:block/blue_enchanted/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json index 8468e0ea26..f7a3c44675 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json @@ -31,19 +31,19 @@ "model": "byg:block/bulbis/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge" + "model": "byg:block/bulbis/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/bulbis/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/bulbis/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge" + "model": "byg:block/bulbis/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json index e0f271e0b7..7e9f2b299c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json @@ -31,19 +31,19 @@ "model": "byg:block/cherry/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge" + "model": "byg:block/cherry/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/cherry/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/cherry/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge" + "model": "byg:block/cherry/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_door.json b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json index c5e842821d..f940aa75f2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json @@ -31,19 +31,19 @@ "model": "byg:block/cika/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge" + "model": "byg:block/cika/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/cika/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/cika/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge" + "model": "byg:block/cika/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json index bbce546b96..5862ea420e 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json @@ -31,19 +31,19 @@ "model": "byg:block/cypress/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge" + "model": "byg:block/cypress/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/cypress/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/cypress/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge" + "model": "byg:block/cypress/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json index f10e0c6036..5eb552fb0d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json @@ -31,19 +31,19 @@ "model": "byg:block/ebony/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge" + "model": "byg:block/ebony/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/ebony/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/ebony/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge" + "model": "byg:block/ebony/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_door.json b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json index 3c414791aa..5d101b58c4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json @@ -31,19 +31,19 @@ "model": "byg:block/ether/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge" + "model": "byg:block/ether/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/ether/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/ether/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge" + "model": "byg:block/ether/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_door.json b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json index a02a3d2ce5..b00d75656d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json @@ -31,19 +31,19 @@ "model": "byg:block/fir/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge" + "model": "byg:block/fir/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/fir/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/fir/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge" + "model": "byg:block/fir/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json index 33f1e126d9..8d267a684d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json @@ -31,19 +31,19 @@ "model": "byg:block/green_enchanted/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge" + "model": "byg:block/green_enchanted/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/green_enchanted/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/green_enchanted/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge" + "model": "byg:block/green_enchanted/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_door.json b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json index e38735121f..8063717b3e 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json @@ -31,19 +31,19 @@ "model": "byg:block/holly/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge" + "model": "byg:block/holly/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/holly/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/holly/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge" + "model": "byg:block/holly/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json index ee289d1e74..7b9bd4a0b9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json @@ -31,19 +31,19 @@ "model": "byg:block/imparius/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge" + "model": "byg:block/imparius/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/imparius/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/imparius/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge" + "model": "byg:block/imparius/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json index 40a9fe1ac2..57cf1a7b36 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json @@ -31,19 +31,19 @@ "model": "byg:block/mahogany/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge" + "model": "byg:block/mahogany/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/mahogany/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/mahogany/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge" + "model": "byg:block/mahogany/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json index dedba1878a..b1e04f4356 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json @@ -31,19 +31,19 @@ "model": "byg:block/mangrove/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge" + "model": "byg:block/mangrove/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/mangrove/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/mangrove/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge" + "model": "byg:block/mangrove/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_door.json b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json index 5cda3f378b..db26e2743d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json @@ -31,19 +31,19 @@ "model": "byg:block/palm/door_bottom" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 270 }, "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 90 }, "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 180 }, "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge" + "model": "byg:block/palm/door_top_hinge" }, "facing=north,half=lower,hinge=right,open=false": { "model": "byg:block/palm/door_bottom_hinge", @@ -61,18 +61,18 @@ "model": "byg:block/palm/door_bottom_hinge" }, "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge" + "model": "byg:block/palm/door_top_hinge" }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 180 }, "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 270 }, "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door_top_hinge", "y": 90 }, "facing=north,half=lower,hinge=left,open=true": { diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_log.json new file mode 100644 index 0000000000..8c48d883d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/aspen/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/aspen/stripped_log" + }, + "axis=z": { + "model": "byg:block/aspen/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_wood.json new file mode 100644 index 0000000000..cf427db96f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_aspen_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/aspen/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/aspen/stripped_wood" + }, + "axis=z": { + "model": "byg:block/aspen/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_log.json new file mode 100644 index 0000000000..5c2838b2cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/baobab/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/baobab/stripped_log" + }, + "axis=z": { + "model": "byg:block/baobab/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_wood.json new file mode 100644 index 0000000000..34bdf332d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_baobab_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/baobab/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/baobab/stripped_wood" + }, + "axis=z": { + "model": "byg:block/baobab/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json new file mode 100644 index 0000000000..7d0490dc06 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/blue_enchanted/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/blue_enchanted/stripped_log" + }, + "axis=z": { + "model": "byg:block/blue_enchanted/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json new file mode 100644 index 0000000000..52e3642516 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/blue_enchanted/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/blue_enchanted/stripped_wood" + }, + "axis=z": { + "model": "byg:block/blue_enchanted/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_stem.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_stem.json new file mode 100644 index 0000000000..9f55300d49 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_stem.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/bulbis/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/bulbis/stripped_log" + }, + "axis=z": { + "model": "byg:block/bulbis/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_wood.json new file mode 100644 index 0000000000..ec281d7d0c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_bulbis_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/bulbis/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/bulbis/stripped_wood" + }, + "axis=z": { + "model": "byg:block/bulbis/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_log.json new file mode 100644 index 0000000000..74272de833 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cherry/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cherry/stripped_log" + }, + "axis=z": { + "model": "byg:block/cherry/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_wood.json new file mode 100644 index 0000000000..d99ea9248f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cherry_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cherry/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cherry/stripped_wood" + }, + "axis=z": { + "model": "byg:block/cherry/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_log.json new file mode 100644 index 0000000000..e28fbc1d4f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cika/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cika/stripped_log" + }, + "axis=z": { + "model": "byg:block/cika/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_wood.json new file mode 100644 index 0000000000..92f15a9c86 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cika_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cika/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cika/stripped_wood" + }, + "axis=z": { + "model": "byg:block/cika/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_log.json new file mode 100644 index 0000000000..0b96bbe350 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cypress/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cypress/stripped_log" + }, + "axis=z": { + "model": "byg:block/cypress/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_wood.json new file mode 100644 index 0000000000..30389a110f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_cypress_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/cypress/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/cypress/stripped_wood" + }, + "axis=z": { + "model": "byg:block/cypress/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_log.json new file mode 100644 index 0000000000..a6b1ea2b03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ebony/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ebony/stripped_log" + }, + "axis=z": { + "model": "byg:block/ebony/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_wood.json new file mode 100644 index 0000000000..b9481bee6f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_ebony_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ebony/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ebony/stripped_wood" + }, + "axis=z": { + "model": "byg:block/ebony/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_log.json new file mode 100644 index 0000000000..9e8ca1e08e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ether/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ether/stripped_log" + }, + "axis=z": { + "model": "byg:block/ether/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_wood.json new file mode 100644 index 0000000000..9cccfa42c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_ether_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/ether/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/ether/stripped_wood" + }, + "axis=z": { + "model": "byg:block/ether/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_log.json new file mode 100644 index 0000000000..ea69a73ef1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/fir/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/fir/stripped_log" + }, + "axis=z": { + "model": "byg:block/fir/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_wood.json new file mode 100644 index 0000000000..59b3934917 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_fir_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/fir/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/fir/stripped_wood" + }, + "axis=z": { + "model": "byg:block/fir/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_log.json new file mode 100644 index 0000000000..c1494e8f2d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/green_enchanted/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/green_enchanted/stripped_log" + }, + "axis=z": { + "model": "byg:block/green_enchanted/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json new file mode 100644 index 0000000000..7eed1e8b43 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/green_enchanted/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/green_enchanted/stripped_wood" + }, + "axis=z": { + "model": "byg:block/green_enchanted/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_log.json new file mode 100644 index 0000000000..95a21ec440 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/holly/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/holly/stripped_log" + }, + "axis=z": { + "model": "byg:block/holly/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_wood.json new file mode 100644 index 0000000000..457ff3a0fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_holly_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/holly/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/holly/stripped_wood" + }, + "axis=z": { + "model": "byg:block/holly/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_log.json new file mode 100644 index 0000000000..4c162763cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mahogany/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mahogany/stripped_log" + }, + "axis=z": { + "model": "byg:block/mahogany/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_wood.json new file mode 100644 index 0000000000..c5ee9521ec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_mahogany_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mahogany/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mahogany/stripped_wood" + }, + "axis=z": { + "model": "byg:block/mahogany/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_log.json new file mode 100644 index 0000000000..c34a84faf1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mangrove/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mangrove/stripped_log" + }, + "axis=z": { + "model": "byg:block/mangrove/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_wood.json new file mode 100644 index 0000000000..f629cc8c03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_mangrove_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/mangrove/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/mangrove/stripped_wood" + }, + "axis=z": { + "model": "byg:block/mangrove/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_log.json new file mode 100644 index 0000000000..8a0154a2e6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/palm/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/palm/stripped_log" + }, + "axis=z": { + "model": "byg:block/palm/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_wood.json new file mode 100644 index 0000000000..52ef2483a9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_palm_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/palm/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/palm/stripped_wood" + }, + "axis=z": { + "model": "byg:block/palm/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json new file mode 100644 index 0000000000..7009a6f827 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/aspen/stripped_log", + "end": "byg:block/aspen/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_wood.json new file mode 100644 index 0000000000..bc608abf1d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/aspen/stripped_log", + "particle": "byg:block/aspen/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json new file mode 100644 index 0000000000..2c52044c36 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/baobab/stripped_log", + "end": "byg:block/baobab/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_wood.json new file mode 100644 index 0000000000..2a6b29ec77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/baobab/stripped_log", + "particle": "byg:block/baobab/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json new file mode 100644 index 0000000000..c6a0039687 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/blue_enchanted/stripped_log", + "end": "byg:block/blue_enchanted/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_wood.json new file mode 100644 index 0000000000..7b8b0767ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/blue_enchanted/stripped_log", + "particle": "byg:block/blue_enchanted/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json new file mode 100644 index 0000000000..ef891444b4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/bulbis/stripped_log", + "end": "byg:block/bulbis/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_wood.json new file mode 100644 index 0000000000..5e1aa6a9f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/bulbis/stripped_log", + "particle": "byg:block/bulbis/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json new file mode 100644 index 0000000000..52cdc19547 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cherry/stripped_log", + "end": "byg:block/cherry/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_wood.json new file mode 100644 index 0000000000..e5bc86c466 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cherry/stripped_log", + "particle": "byg:block/cherry/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json new file mode 100644 index 0000000000..14cd87b06a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cika/stripped_log", + "end": "byg:block/cika/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_wood.json new file mode 100644 index 0000000000..c3aa6ff3a6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cika/stripped_log", + "particle": "byg:block/cika/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json new file mode 100644 index 0000000000..bff80ca6e2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/cypress/stripped_log", + "end": "byg:block/cypress/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_wood.json new file mode 100644 index 0000000000..443c08011b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/cypress/stripped_log", + "particle": "byg:block/cypress/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json new file mode 100644 index 0000000000..a88977bd73 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/ebony/stripped_log", + "end": "byg:block/ebony/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_wood.json new file mode 100644 index 0000000000..07de34731e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/ebony/stripped_log", + "particle": "byg:block/ebony/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json new file mode 100644 index 0000000000..eb7b2f4adf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/ether/stripped_log", + "end": "byg:block/ether/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_wood.json new file mode 100644 index 0000000000..ee1c332b09 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/ether/stripped_log", + "particle": "byg:block/ether/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json new file mode 100644 index 0000000000..e5c4c57306 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/fir/stripped_log", + "end": "byg:block/fir/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_wood.json new file mode 100644 index 0000000000..d49c6907ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/fir/stripped_log", + "particle": "byg:block/fir/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json new file mode 100644 index 0000000000..c6fd444974 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/green_enchanted/stripped_log", + "end": "byg:block/green_enchanted/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_wood.json new file mode 100644 index 0000000000..08a8b483df --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/green_enchanted/stripped_log", + "particle": "byg:block/green_enchanted/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json new file mode 100644 index 0000000000..01831abf9c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/holly/stripped_log", + "end": "byg:block/holly/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_wood.json new file mode 100644 index 0000000000..7f5e9582b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/holly/stripped_log", + "particle": "byg:block/holly/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json new file mode 100644 index 0000000000..28098b5c5e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/mahogany/stripped_log", + "end": "byg:block/mahogany/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_wood.json new file mode 100644 index 0000000000..622f09fc16 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/mahogany/stripped_log", + "particle": "byg:block/mahogany/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json new file mode 100644 index 0000000000..ca8363eaad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/mangrove/stripped_log", + "end": "byg:block/mangrove/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_wood.json new file mode 100644 index 0000000000..a9f9e4b98f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/mangrove/stripped_log", + "particle": "byg:block/mangrove/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json new file mode 100644 index 0000000000..845afc1b32 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/palm/stripped_log", + "end": "byg:block/palm/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_wood.json new file mode 100644 index 0000000000..4b45f2481c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/palm/stripped_log", + "particle": "byg:block/palm/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json new file mode 100644 index 0000000000..0417414b75 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json new file mode 100644 index 0000000000..c8e66c6c4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json new file mode 100644 index 0000000000..705c12695b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json new file mode 100644 index 0000000000..d508cda023 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json new file mode 100644 index 0000000000..d870481eea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json new file mode 100644 index 0000000000..4b9f93fe42 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json new file mode 100644 index 0000000000..826211b610 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json new file mode 100644 index 0000000000..ee5932aea4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json new file mode 100644 index 0000000000..01d4fdbbc0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json new file mode 100644 index 0000000000..18b1a24481 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json new file mode 100644 index 0000000000..da5e5be297 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json new file mode 100644 index 0000000000..47cf97e808 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json new file mode 100644 index 0000000000..d472bf66b7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json new file mode 100644 index 0000000000..b4f699f58e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json new file mode 100644 index 0000000000..2b11166316 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json new file mode 100644 index 0000000000..3455b6a854 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json new file mode 100644 index 0000000000..709d7411f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json new file mode 100644 index 0000000000..a5bbccb089 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json new file mode 100644 index 0000000000..b5243793b3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json new file mode 100644 index 0000000000..204d16ac82 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json new file mode 100644 index 0000000000..7dfa1f0fec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json new file mode 100644 index 0000000000..15eec313c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json new file mode 100644 index 0000000000..953501299b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json new file mode 100644 index 0000000000..acda624e84 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json new file mode 100644 index 0000000000..cd0001916b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json new file mode 100644 index 0000000000..2ac7e1ce3d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json new file mode 100644 index 0000000000..9eef9caf77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json new file mode 100644 index 0000000000..23a0687efe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json new file mode 100644 index 0000000000..a15f460520 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json new file mode 100644 index 0000000000..bf0cad9d27 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_baobab_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_baobab_log.json deleted file mode 100644 index 16c49ae222..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_baobab_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_baobab_log_top", - "up": "byg:block/stripped_baobab_log_top", - "north": "byg:block/stripped_baobab_log", - "east": "byg:block/stripped_baobab_log", - "south": "byg:block/stripped_baobab_log", - "west": "byg:block/stripped_baobab_log", - "particle": "byg:block/stripped_baobab_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_baobab_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_baobab_wood.json deleted file mode 100644 index 737dc4405f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_baobab_wood.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_baobab_log", - "up": "byg:block/stripped_baobab_log", - "north": "byg:block/stripped_baobab_log", - "east": "byg:block/stripped_baobab_log", - "south": "byg:block/stripped_baobab_log", - "west": "byg:block/stripped_baobab_log", - "particle": "byg:block/stripped_baobab_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_log.json deleted file mode 100644 index e5eef77709..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_blue_enchanted_log_top", - "up": "byg:block/stripped_blue_enchanted_log_top", - "north": "byg:block/stripped_blue_enchanted_log", - "east": "byg:block/stripped_blue_enchanted_log", - "south": "byg:block/stripped_blue_enchanted_log", - "west": "byg:block/stripped_blue_enchanted_log", - "particle": "byg:block/stripped_blue_enchanted_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_wood.json deleted file mode 100644 index 5c9aae9b34..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_blue_enchanted_wood.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_blue_enchanted_log", - "up": "byg:block/stripped_blue_enchanted_log", - "north": "byg:block/stripped_blue_enchanted_log", - "east": "byg:block/stripped_blue_enchanted_log", - "south": "byg:block/stripped_blue_enchanted_log", - "west": "byg:block/stripped_blue_enchanted_log", - "particle": "byg:block/stripped_blue_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_stem.json b/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_stem.json deleted file mode 100644 index a1a9baa648..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_bulbis_stem_top", - "side": "byg:block/stripped_bulbis_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_wood.json deleted file mode 100644 index 0e085dc2e2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_bulbis_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_bulbis_stem", - "side": "byg:block/stripped_bulbis_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cherry_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_cherry_log.json deleted file mode 100644 index 4a99f88290..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cherry_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_cherry_log_top", - "side": "byg:block/stripped_cherry_log" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cherry_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_cherry_wood.json deleted file mode 100644 index 6e34964722..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cherry_wood.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_cherry_log", - "up": "byg:block/stripped_cherry_log", - "north": "byg:block/stripped_cherry_log", - "east": "byg:block/stripped_cherry_log", - "south": "byg:block/stripped_cherry_log", - "west": "byg:block/stripped_cherry_log", - "particle": "byg:block/stripped_cherry_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cika_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_cika_log.json deleted file mode 100644 index 6e91f0d6e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cika_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_cika_log_top", - "up": "byg:block/stripped_cika_log_top", - "north": "byg:block/stripped_cika_log", - "east": "byg:block/stripped_cika_log", - "south": "byg:block/stripped_cika_log", - "west": "byg:block/stripped_cika_log", - "particle": "byg:block/stripped_cika_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cika_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_cika_wood.json deleted file mode 100644 index 449626bd3b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cika_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_cika_log", - "particle": "byg:block/stripped_cika_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cypress_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_cypress_log.json deleted file mode 100644 index 963a3d3a9e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cypress_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_cypress_log_top", - "up": "byg:block/stripped_cypress_log_top", - "north": "byg:block/stripped_cypress_log", - "east": "byg:block/stripped_cypress_log", - "south": "byg:block/stripped_cypress_log", - "west": "byg:block/stripped_cypress_log", - "particle": "byg:block/stripped_cypress_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_cypress_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_cypress_wood.json deleted file mode 100644 index c459e5ad04..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_cypress_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_cypress_log", - "particle": "byg:block/stripped_cypress_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_ebony_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_ebony_log.json deleted file mode 100644 index a1ee65dd5d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_ebony_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_ebony_log_top", - "up": "byg:block/stripped_ebony_log_top", - "north": "byg:block/stripped_ebony_log", - "east": "byg:block/stripped_ebony_log", - "south": "byg:block/stripped_ebony_log", - "west": "byg:block/stripped_ebony_log", - "particle": "byg:block/stripped_ebony_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_ebony_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_ebony_wood.json deleted file mode 100644 index c5a6051ea9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_ebony_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_ebony_log", - "particle": "byg:block/stripped_ebony_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_ether_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_ether_log.json deleted file mode 100644 index 8a370fd32f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_ether_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_ether_log_top", - "side": "byg:block/stripped_ether_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_ether_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_ether_wood.json deleted file mode 100644 index 3117299ca6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_ether_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_ether_log", - "side": "byg:block/stripped_ether_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_fir_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_fir_log.json deleted file mode 100644 index bbbc3c5f43..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_fir_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_fir_log_top", - "up": "byg:block/stripped_fir_log_top", - "north": "byg:block/stripped_fir_log", - "east": "byg:block/stripped_fir_log", - "south": "byg:block/stripped_fir_log", - "west": "byg:block/stripped_fir_log", - "particle": "byg:block/stripped_fir_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_fir_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_fir_wood.json deleted file mode 100644 index f0ca0e7db6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_fir_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_fir_log", - "particle": "byg:block/stripped_fir_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_log.json deleted file mode 100644 index 036fc3de30..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_green_enchanted_log_top", - "up": "byg:block/stripped_green_enchanted_log_top", - "north": "byg:block/stripped_green_enchanted_log", - "east": "byg:block/stripped_green_enchanted_log", - "south": "byg:block/stripped_green_enchanted_log", - "west": "byg:block/stripped_green_enchanted_log", - "particle": "byg:block/stripped_green_enchanted_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_wood.json deleted file mode 100644 index 9488beb312..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_green_enchanted_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_green_enchanted_log", - "particle": "byg:block/stripped_green_enchanted_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_holly_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_holly_log.json deleted file mode 100644 index 532ce72f6c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_holly_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_holly_log_top", - "up": "byg:block/stripped_holly_log_top", - "north": "byg:block/stripped_holly_log", - "east": "byg:block/stripped_holly_log", - "south": "byg:block/stripped_holly_log", - "west": "byg:block/stripped_holly_log", - "particle": "byg:block/stripped_holly_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_holly_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_holly_wood.json deleted file mode 100644 index 6e48fae79a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_holly_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_holly_log", - "particle": "byg:block/stripped_holly_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_log.json deleted file mode 100644 index a7fa17c38e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_mahogany_log_top", - "up": "byg:block/stripped_mahogany_log_top", - "north": "byg:block/stripped_mahogany_log", - "east": "byg:block/stripped_mahogany_log", - "south": "byg:block/stripped_mahogany_log", - "west": "byg:block/stripped_mahogany_log", - "particle": "byg:block/stripped_mahogany_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_wood.json deleted file mode 100644 index 7bf25c9dcf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_mahogany_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_mahogany_log", - "particle": "byg:block/stripped_mahogany_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_log.json deleted file mode 100644 index 63bb3f42f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_mangrove_log_top", - "up": "byg:block/stripped_mangrove_log_top", - "north": "byg:block/stripped_mangrove_log", - "east": "byg:block/stripped_mangrove_log", - "south": "byg:block/stripped_mangrove_log", - "west": "byg:block/stripped_mangrove_log", - "particle": "byg:block/stripped_mangrove_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_wood.json deleted file mode 100644 index 01cb86ff14..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_mangrove_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_mangrove_log", - "particle": "byg:block/stripped_mangrove_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_aspen_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_aspen_log.json deleted file mode 100644 index 4178c98e80..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_aspen_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_aspen_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_aspen_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_aspen_wood.json deleted file mode 100644 index b218906d89..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_aspen_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_aspen_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_baobab_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_baobab_log.json deleted file mode 100644 index fa4f2d1ff5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_baobab_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_baobab_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_baobab_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_baobab_wood.json deleted file mode 100644 index bfb9ee6169..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_baobab_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_baobab_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_log.json deleted file mode 100644 index a73a023ee1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_blue_enchanted_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json deleted file mode 100644 index 4119550c60..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_blue_enchanted_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_stem.json b/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_stem.json deleted file mode 100644 index 7d7cd55631..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_stem.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_bulbis_stem" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_wood.json deleted file mode 100644 index dcdd3a8f48..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_bulbis_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_bulbis_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cherry_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_cherry_log.json deleted file mode 100644 index defc68a9fe..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cherry_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cherry_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cherry_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_cherry_wood.json deleted file mode 100644 index 4e84a5b19b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cherry_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cherry_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cika_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_cika_log.json deleted file mode 100644 index 114f203102..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cika_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cika_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cika_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_cika_wood.json deleted file mode 100644 index 33c3fb76c3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cika_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cika_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cypress_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_cypress_log.json deleted file mode 100644 index b5888bcf43..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cypress_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cypress_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_cypress_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_cypress_wood.json deleted file mode 100644 index d27a8cafa5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_cypress_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_cypress_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_ebony_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_ebony_log.json deleted file mode 100644 index 065dd7ae7d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_ebony_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_ebony_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_ebony_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_ebony_wood.json deleted file mode 100644 index 41668a97a2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_ebony_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_ebony_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_ether_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_ether_log.json deleted file mode 100644 index e70f81e6fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_ether_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_ether_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_ether_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_ether_wood.json deleted file mode 100644 index 48165e5c1f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_ether_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_ether_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_fir_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_fir_log.json deleted file mode 100644 index f619583883..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_fir_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_fir_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_fir_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_fir_wood.json deleted file mode 100644 index c5d7c3fcda..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_fir_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_fir_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_log.json deleted file mode 100644 index 680741e0ed..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_green_enchanted_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_wood.json deleted file mode 100644 index 350bb8619c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_green_enchanted_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_green_enchanted_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_holly_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_holly_log.json deleted file mode 100644 index 9842d62c9c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_holly_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_holly_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_holly_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_holly_wood.json deleted file mode 100644 index 6667be800d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_holly_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_holly_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_log.json deleted file mode 100644 index 85c5757da3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_mahogany_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_wood.json deleted file mode 100644 index d679cf51f9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_mahogany_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_mahogany_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_log.json deleted file mode 100644 index e454745cf7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_mangrove_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_wood.json deleted file mode 100644 index 8ded85d0bf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_mangrove_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_mangrove_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_palm_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_palm_log.json deleted file mode 100644 index 80ed21a3eb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_palm_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_palm_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_palm_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_palm_wood.json deleted file mode 100644 index 6e2a14789c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_palm_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_palm_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_aspen_log.png b/Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_aspen_log.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_aspen_log_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_aspen_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_baobab_log.png b/Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_baobab_log.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_baobab_log_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_baobab_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_blue_enchanted_log.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_blue_enchanted_log.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_blue_enchanted_log_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_blue_enchanted_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_bulbis_stem.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_bulbis_stem.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_bulbis_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_bulbis_stem_top.png rename to Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cherry_log.png b/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cherry_log.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cherry_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cherry_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cika_log.png b/Common/src/main/resources/assets/byg/textures/block/cika/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cika_log.png rename to Common/src/main/resources/assets/byg/textures/block/cika/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cika_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cika_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cika/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cypress_log.png b/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cypress_log.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_cypress_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_cypress_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ebony_log.png b/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_ebony_log.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ebony_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_ebony_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ether_log.png b/Common/src/main/resources/assets/byg/textures/block/ether/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_ether_log.png rename to Common/src/main/resources/assets/byg/textures/block/ether/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ether_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_ether_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/ether/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_fir_log.png b/Common/src/main/resources/assets/byg/textures/block/fir/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_fir_log.png rename to Common/src/main/resources/assets/byg/textures/block/fir/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_fir_log_top.png b/Common/src/main/resources/assets/byg/textures/block/fir/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_fir_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/fir/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_green_enchanted_log.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_green_enchanted_log.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_green_enchanted_log_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_green_enchanted_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_holly_log.png b/Common/src/main/resources/assets/byg/textures/block/holly/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_holly_log.png rename to Common/src/main/resources/assets/byg/textures/block/holly/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_holly_log_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_holly_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/holly/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_mahogany_log.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_mahogany_log.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_mahogany_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_mahogany_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_mangrove_log.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_mangrove_log.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_mangrove_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_mangrove_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_palm_log.png b/Common/src/main/resources/assets/byg/textures/block/palm/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_palm_log.png rename to Common/src/main/resources/assets/byg/textures/block/palm/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_palm_log_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_palm_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/palm/stripped_log_top.png diff --git a/Common/src/main/resources/data/byg/recipes/imparius_hyphae.json b/Common/src/main/resources/data/byg/recipes/imparius_hyphae.json deleted file mode 100644 index 01bf1b47c9..0000000000 --- a/Common/src/main/resources/data/byg/recipes/imparius_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:imparius_stem" - } - }, - "result": { - "item": "byg:imparius_hyphae", - "count": 3 - } -} \ No newline at end of file diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 99ec0e09c5..cf6d2fc94a 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -43,9 +43,11 @@ protected void registerStatesAndModels() { final var log = models().cubeColumn(typeName + "/log", BYG.createLocation(typeLoc + "log"), BYG.createLocation(typeLoc + "log_top")); axisBlock((RotatedPillarBlock) type.log().get(), log, log); configureTransform(item.withExistingParent(type.log().getId().getPath(), log.getLocation())); - final var strippedLog = models().cubeColumn(typeName + "/stripped_log", BYG.createLocation(typeLoc + "stripped_log"), BYG.createLocation(typeLoc + "stripped_log_top")); - axisBlock((RotatedPillarBlock) type.strippedLog().get(), strippedLog, strippedLog); - configureTransform(item.withExistingParent(type.strippedLog().getId().getPath(), strippedLog.getLocation())); + if (type.strippedLog() != null) { + final var strippedLog = models().cubeColumn(typeName + "/stripped_log", BYG.createLocation(typeLoc + "stripped_log"), BYG.createLocation(typeLoc + "stripped_log_top")); + axisBlock((RotatedPillarBlock) type.strippedLog().get(), strippedLog, strippedLog); + configureTransform(item.withExistingParent(type.strippedLog().getId().getPath(), strippedLog.getLocation())); + } if (type.boat() != null) item.withExistingParent(type.boat().getId().getPath(), generatedParent) @@ -101,7 +103,7 @@ protected void registerStatesAndModels() { rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top") ); - doorBlock((DoorBlock) type.door().get(), doorBottomLeft, doorBottomRight, doorTopLeft, doorBottomRight); + doorBlock((DoorBlock) type.door().get(), doorBottomLeft, doorBottomRight, doorTopLeft, doorTopRight); item.withExistingParent(type.door().getId().getPath(), generatedParent) .texture("layer0", rl(typeLocItem + "door")); @@ -152,14 +154,18 @@ protected void registerStatesAndModels() { configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); simpleBlock(type.planks().get(), planks); - final var wood = models().cubeAll(typeName + "/wood", rl(typeLoc + "log")) - .texture("particle", rl(typeLoc + "log")); - configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); - axisBlock((RotatedPillarBlock) type.wood().get(), wood, wood); - final var strippedWood = models().cubeAll(typeName + "/stripped_wood", rl(typeLoc + "stripped_wood")) - .texture("particle", rl(typeLoc + "stripped_wood")); - configureTransform(item.withExistingParent(type.strippedWood().getId().getPath(), strippedWood.getLocation())); - axisBlock((RotatedPillarBlock) type.strippedWood().get(), strippedWood, strippedLog); + if (type.wood() != null) { + final var wood = models().cubeAll(typeName + "/wood", rl(typeLoc + "log")) + .texture("particle", rl(typeLoc + "log")); + configureTransform(item.withExistingParent(type.wood().getId().getPath(), wood.getLocation())); + axisBlock((RotatedPillarBlock) type.wood().get(), wood, wood); + } + if (type.strippedWood() != null) { + final var strippedWood = models().cubeAll(typeName + "/stripped_wood", rl(typeLoc + "stripped_log")) + .texture("particle", rl(typeLoc + "stripped_log")); + configureTransform(item.withExistingParent(type.strippedWood().getId().getPath(), strippedWood.getLocation())); + axisBlock((RotatedPillarBlock) type.strippedWood().get(), strippedWood, strippedWood); + } if (type.growerItem() != null) { final var textureLoc = rl(typeLoc + "grower_item"); From a0d76610d8db5c3693c6a70852c5b3cd4fa29ab5 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 12:26:14 +0300 Subject: [PATCH 36/90] Pine --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 41 +--- .../byg/blockstates/pine_bookshelf.json | 7 - .../assets/byg/blockstates/pine_button.json | 118 ---------- .../byg/blockstates/pine_crafting_table.json | 7 - .../assets/byg/blockstates/pine_door.json | 124 ----------- .../assets/byg/blockstates/pine_fence.json | 48 ---- .../byg/blockstates/pine_fence_gate.json | 80 ------- .../assets/byg/blockstates/pine_leaves.json | 7 - .../assets/byg/blockstates/pine_log.json | 17 -- .../assets/byg/blockstates/pine_planks.json | 7 - .../byg/blockstates/pine_pressure_plate.json | 10 - .../assets/byg/blockstates/pine_sapling.json | 7 - .../assets/byg/blockstates/pine_slab.json | 13 -- .../assets/byg/blockstates/pine_stairs.json | 209 ------------------ .../assets/byg/blockstates/pine_trapdoor.json | 69 ------ .../assets/byg/blockstates/pine_wood.json | 16 -- .../byg/models/block/pine_bookshelf.json | 12 - .../assets/byg/models/block/pine_button.json | 6 - .../models/block/pine_button_inventory.json | 6 - .../byg/models/block/pine_button_pressed.json | 6 - .../byg/models/block/pine_crafting_table.json | 12 - .../byg/models/block/pine_door_bottom.json | 7 - .../models/block/pine_door_bottom_hinge.json | 7 - .../byg/models/block/pine_door_top.json | 7 - .../byg/models/block/pine_door_top_hinge.json | 7 - .../assets/byg/models/block/pine_fence.json | 7 - .../byg/models/block/pine_fence_gate.json | 6 - .../models/block/pine_fence_gate_open.json | 6 - .../models/block/pine_fence_gate_wall.json | 6 - .../block/pine_fence_gate_wall_open.json | 6 - .../models/block/pine_fence_inventory.json | 7 - .../byg/models/block/pine_fence_post.json | 7 - .../assets/byg/models/block/pine_leaves.json | 7 - .../byg/models/block/pine_leaves_snowy.json | 12 - .../assets/byg/models/block/pine_log.json | 7 - .../assets/byg/models/block/pine_planks.json | 7 - .../byg/models/block/pine_pressure_plate.json | 6 - .../block/pine_pressure_plate_down.json | 6 - .../assets/byg/models/block/pine_sapling.json | 7 - .../assets/byg/models/block/pine_slab.json | 8 - .../byg/models/block/pine_slab_top.json | 8 - .../assets/byg/models/block/pine_stairs.json | 8 - .../byg/models/block/pine_stairs_inner.json | 8 - .../byg/models/block/pine_stairs_outer.json | 8 - .../models/block/pine_trapdoor_bottom.json | 6 - .../byg/models/block/pine_trapdoor_open.json | 6 - .../byg/models/block/pine_trapdoor_top.json | 6 - .../assets/byg/models/block/pine_wood.json | 7 - .../byg/models/block/stripped_pine_log.json | 12 - .../byg/models/block/stripped_pine_wood.json | 7 - .../assets/byg/models/item/pine_boat.json | 6 - .../byg/models/item/pine_bookshelf.json | 22 -- .../assets/byg/models/item/pine_button.json | 22 -- .../byg/models/item/pine_crafting_table.json | 22 -- .../assets/byg/models/item/pine_door.json | 6 - .../assets/byg/models/item/pine_fence.json | 3 - .../byg/models/item/pine_fence_gate.json | 22 -- .../assets/byg/models/item/pine_leaves.json | 22 -- .../assets/byg/models/item/pine_log.json | 22 -- .../assets/byg/models/item/pine_planks.json | 22 -- .../byg/models/item/pine_pressure_plate.json | 22 -- .../assets/byg/models/item/pine_sapling.json | 6 - .../assets/byg/models/item/pine_slab.json | 22 -- .../assets/byg/models/item/pine_stairs.json | 22 -- .../assets/byg/models/item/pine_trapdoor.json | 22 -- .../assets/byg/models/item/pine_wood.json | 22 -- .../byg/models/item/stripped_pine_log.json | 22 -- .../byg/models/item/stripped_pine_wood.json | 22 -- .../textures/block/aspen/ed_aspen_wood.json | 12 - .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../{pine_door_top.png => pine/door_top.png} | Bin .../{pine_leaves.png => pine/leaves.png} | Bin .../block/{pine_log.png => pine/log.png} | Bin .../{pine_log_top.png => pine/log_top.png} | Bin .../{pine_planks.png => pine/planks.png} | Bin .../{pine_sapling.png => pine/sapling.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../{pine_trapdoor.png => pine/trapdoor.png} | Bin .../item/{pine_boat.png => pine/boat.png} | Bin .../item/{pine_door.png => pine/door.png} | Bin .../resources/data/byg/recipes/pine_boat.json | 16 -- .../data/byg/recipes/pine_bookshelf.json | 19 -- .../data/byg/recipes/pine_button.json | 12 - .../data/byg/recipes/pine_crafting_table.json | 15 -- .../resources/data/byg/recipes/pine_door.json | 18 -- .../data/byg/recipes/pine_fence.json | 20 -- .../data/byg/recipes/pine_fence_gate.json | 19 -- .../data/byg/recipes/pine_planks.json | 13 -- .../data/byg/recipes/pine_pressure_plate.json | 15 -- .../resources/data/byg/recipes/pine_slab.json | 16 -- .../data/byg/recipes/pine_stairs.json | 18 -- .../data/byg/recipes/pine_trapdoor.json | 17 -- .../resources/data/byg/recipes/pine_wood.json | 16 -- 100 files changed, 16 insertions(+), 1595 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json rename Common/src/main/resources/assets/byg/textures/block/{pine_bookshelf.png => pine/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_crafting_table_front.png => pine/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_crafting_table_side.png => pine/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_crafting_table_top.png => pine/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_door_bottom.png => pine/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_door_top.png => pine/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_leaves.png => pine/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_log.png => pine/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_log_top.png => pine/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_planks.png => pine/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_sapling.png => pine/sapling.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_pine_log.png => pine/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_pine_log_top.png => pine/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{pine_trapdoor.png => pine/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{pine_boat.png => pine/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{pine_door.png => pine/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/pine_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 844f56a494..9a709407f7 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -64,7 +64,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); - public static final BlockRegistryObject PINE_PLANKS = createPlanks("pine_planks"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PLANKS = createPlanks("rainbow_eucalyptus_planks"); public static final BlockRegistryObject REDWOOD_PLANKS = createPlanks("redwood_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); @@ -78,7 +77,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); - public static final BlockRegistryObject PINE_BOOKSHELF = createBookshelf("pine_bookshelf"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BOOKSHELF = createBookshelf("rainbow_eucalyptus_bookshelf"); public static final BlockRegistryObject REDWOOD_BOOKSHELF = createBookshelf("redwood_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); @@ -92,7 +90,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); - public static final BlockRegistryObject PINE_DOOR = createDoor("pine_door"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_DOOR = createDoor("rainbow_eucalyptus_door"); public static final BlockRegistryObject REDWOOD_DOOR = createDoor("redwood_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); @@ -106,7 +103,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); - public static final BlockRegistryObject PINE_PRESSURE_PLATE = createWoodPressurePlate("pine_pressure_plate"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PRESSURE_PLATE = createWoodPressurePlate("rainbow_eucalyptus_pressure_plate"); public static final BlockRegistryObject REDWOOD_PRESSURE_PLATE = createWoodPressurePlate("redwood_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); @@ -120,7 +116,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); - public static final BlockRegistryObject PINE_BUTTON = createWoodButton("pine_button"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BUTTON = createWoodButton("rainbow_eucalyptus_button"); public static final BlockRegistryObject REDWOOD_BUTTON = createWoodButton("redwood_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); @@ -134,7 +129,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); - public static final BlockRegistryObject PINE_TRAPDOOR = createTrapDoor("pine_trapdoor"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_TRAPDOOR = createTrapDoor("rainbow_eucalyptus_trapdoor"); public static final BlockRegistryObject REDWOOD_TRAPDOOR = createTrapDoor("redwood_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); @@ -148,7 +142,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); - public static final BlockRegistryObject PINE_CRAFTING_TABLE = createCraftingTable("pine_crafting_table"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_CRAFTING_TABLE = createCraftingTable("rainbow_eucalyptus_crafting_table"); public static final BlockRegistryObject REDWOOD_CRAFTING_TABLE = createCraftingTable("redwood_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); @@ -162,7 +155,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); - public static final BlockRegistryObject PINE_FENCE_GATE = createFenceGate("pine_fence_gate"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE_GATE = createFenceGate("rainbow_eucalyptus_fence_gate"); public static final BlockRegistryObject REDWOOD_FENCE_GATE = createFenceGate("redwood_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); @@ -176,7 +168,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); - public static final BlockRegistryObject PINE_SLAB = createWoodSlab("pine_slab"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SLAB = createWoodSlab("rainbow_eucalyptus_slab"); public static final BlockRegistryObject REDWOOD_SLAB = createWoodSlab("redwood_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); @@ -190,7 +181,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); - public static final BlockRegistryObject PINE_STAIRS = createWoodStairs("pine_stairs"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_STAIRS = createWoodStairs("rainbow_eucalyptus_stairs"); public static final BlockRegistryObject REDWOOD_STAIRS = createWoodStairs("redwood_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); @@ -204,7 +194,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); - public static final BlockRegistryObject PINE_FENCE = createFence("pine_fence"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE = createFence("rainbow_eucalyptus_fence"); public static final BlockRegistryObject REDWOOD_FENCE = createFence("redwood_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); @@ -218,7 +207,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject PINE_SIGN = createSign("pine_sign", BYGWoodType.PINE, PINE_PLANKS); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SIGN = createSign("rainbow_eucalyptus_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); public static final BlockRegistryObject REDWOOD_SIGN = createSign("redwood_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); @@ -232,7 +220,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject PINE_WALL_SIGN = createWallSign("pine_wall_sign", BYGWoodType.PINE, PINE_PLANKS); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_WALL_SIGN = createWallSign("rainbow_eucalyptus_wall_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); public static final BlockRegistryObject REDWOOD_WALL_SIGN = createWallSign("redwood_wall_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); @@ -271,7 +258,6 @@ public class BYGBlocks { public static final BlockRegistryObject ORANGE_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_SPRUCE_SAPLING, "orange_spruce_sapling"); public static final BlockRegistryObject ORCHARD_SAPLING = createSapling(BYGBlockTags.GROUND_ORCHARD_SAPLING, "orchard_sapling"); public static final BlockRegistryObject PALO_VERDE_SAPLING = createSapling(BYGBlockTags.GROUND_PALO_VERDE_SAPLING, "palo_verde_sapling"); - public static final BlockRegistryObject PINE_SAPLING = createSapling(BYGBlockTags.GROUND_PINE_SAPLING, "pine_sapling"); public static final BlockRegistryObject PINK_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_PINK_CHERRY_SAPLING, "pink_cherry_sapling"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SAPLING = createSapling(BYGBlockTags.GROUND_RAINBOW_EUCALYPTUS_SAPLING, "rainbow_eucalyptus_sapling"); public static final BlockRegistryObject RED_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_RED_BIRCH_SAPLING, "red_birch_sapling"); @@ -319,7 +305,6 @@ public class BYGBlocks { public static final BlockRegistryObject ORANGE_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_spruce_leaves"); public static final BlockRegistryObject ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "orchard_leaves"); public static final BlockRegistryObject PALO_VERDE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "palo_verde_leaves"); - public static final BlockRegistryObject PINE_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "pine_leaves"); public static final BlockRegistryObject PINK_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_PINK, "pink_cherry_leaves"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "rainbow_eucalyptus_leaves"); public static final BlockRegistryObject RED_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_birch_leaves"); @@ -626,7 +611,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); - public static final BlockRegistryObject PINE_LOG = createLog("pine_log"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_LOG = createLog("rainbow_eucalyptus_log"); public static final BlockRegistryObject REDWOOD_LOG = createLog("redwood_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); @@ -645,7 +629,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); - public static final BlockRegistryObject PINE_WOOD = createWood("pine_wood"); public static final BlockRegistryObject RAINBOW_EUCALYPTUS_WOOD = createWood("rainbow_eucalyptus_wood"); public static final BlockRegistryObject REDWOOD_WOOD = createWood("redwood_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); @@ -787,7 +770,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); - public static final BlockRegistryObject STRIPPED_PINE_LOG = createStrippedLog("stripped_pine_log"); public static final BlockRegistryObject STRIPPED_RAINBOW_EUCALYPTUS_LOG = createStrippedLog("stripped_rainbow_eucalyptus_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); public static final BlockRegistryObject STRIPPED_WILLOW_LOG = createStrippedLog("stripped_willow_log"); @@ -802,7 +784,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); - public static final BlockRegistryObject STRIPPED_PINE_WOOD = createWood("stripped_pine_wood"); public static final BlockRegistryObject STRIPPED_RAINBOW_EUCALYPTUS_WOOD = createWood("stripped_rainbow_eucalyptus_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); public static final BlockRegistryObject STRIPPED_WILLOW_WOOD = createWood("stripped_willow_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index e1000b70b2..4bff9d71b1 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -95,7 +95,11 @@ public enum BYGWoodTypes { PALM("palm", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_PALM_SAPLING) .boatType(BYGBoatEntity.BYGType.PALM) - .materialColor(MaterialColor.COLOR_GREEN)); + .materialColor(MaterialColor.COLOR_GREEN)), + PINE("pine", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_PINE_SAPLING) + .boatType(BYGBoatEntity.BYGType.PINE) + .materialColor(MaterialColor.TERRACOTTA_GREEN)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 74172ac0b0..f990f266bc 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -384,6 +384,15 @@ public class BYGItems { public static final RegistryObject NIGHTSHADE_BUTTON = createItem(BYGBlocks.NIGHTSHADE_BUTTON); public static final RegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGBlocks.NIGHTSHADE_SIGN, BYGBlocks.NIGHTSHADE_WALL_SIGN); + //Palo Verde Woodtype + public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); + public static final RegistryObject PALO_VERDE_SAPLING = createSaplingItem(BYGBlocks.PALO_VERDE_SAPLING); + public static final RegistryObject PALO_VERDE_LEAVES = createItem(BYGBlocks.PALO_VERDE_LEAVES); + public static final RegistryObject PALO_VERDE_LOG = createItem(BYGBlocks.PALO_VERDE_LOG); + public static final RegistryObject PALO_VERDE_WOOD = createItem(BYGBlocks.PALO_VERDE_WOOD); + public static final RegistryObject STRIPPED_PALO_VERDE_LOG = createItem(BYGBlocks.STRIPPED_PALO_VERDE_LOG); + public static final RegistryObject STRIPPED_PALO_VERDE_WOOD = createItem(BYGBlocks.STRIPPED_PALO_VERDE_WOOD); + static { BYGWoodTypes.ASPEN.init(); @@ -436,38 +445,10 @@ public class BYGItems { BYGWoodTypes.MANGROVE.init(); // TODO Maple, Nightshade BYGWoodTypes.PALM.init(); + // TODO palo verde + BYGWoodTypes.PINE.init(); } - //Palo Verde Woodtype - public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); - public static final RegistryObject PALO_VERDE_SAPLING = createSaplingItem(BYGBlocks.PALO_VERDE_SAPLING); - public static final RegistryObject PALO_VERDE_LEAVES = createItem(BYGBlocks.PALO_VERDE_LEAVES); - public static final RegistryObject PALO_VERDE_LOG = createItem(BYGBlocks.PALO_VERDE_LOG); - public static final RegistryObject PALO_VERDE_WOOD = createItem(BYGBlocks.PALO_VERDE_WOOD); - public static final RegistryObject STRIPPED_PALO_VERDE_LOG = createItem(BYGBlocks.STRIPPED_PALO_VERDE_LOG); - public static final RegistryObject STRIPPED_PALO_VERDE_WOOD = createItem(BYGBlocks.STRIPPED_PALO_VERDE_WOOD); - - //Pine Woodtype - public static final RegistryObject PINE_SAPLING = createSaplingItem(BYGBlocks.PINE_SAPLING); - public static final RegistryObject PINE_LEAVES = createItem(BYGBlocks.PINE_LEAVES); - public static final RegistryObject PINE_LOG = createItem(BYGBlocks.PINE_LOG); - public static final RegistryObject PINE_WOOD = createItem(BYGBlocks.PINE_WOOD); - public static final RegistryObject STRIPPED_PINE_LOG = createItem(BYGBlocks.STRIPPED_PINE_LOG); - public static final RegistryObject STRIPPED_PINE_WOOD = createItem(BYGBlocks.STRIPPED_PINE_WOOD); - public static final RegistryObject PINE_PLANKS = createItem(BYGBlocks.PINE_PLANKS); - public static final RegistryObject PINE_BOOKSHELF = createItem(BYGBlocks.PINE_BOOKSHELF); - public static final RegistryObject PINE_CRAFTING_TABLE = createItem(BYGBlocks.PINE_CRAFTING_TABLE); - public static final RegistryObject PINE_STAIRS = createItem(BYGBlocks.PINE_STAIRS); - public static final RegistryObject PINE_SLAB = createItem(BYGBlocks.PINE_SLAB); - public static final RegistryObject PINE_FENCE = createItem(BYGBlocks.PINE_FENCE); - public static final RegistryObject PINE_FENCE_GATE = createItem(BYGBlocks.PINE_FENCE_GATE); - public static final RegistryObject PINE_DOOR = createItem(BYGBlocks.PINE_DOOR); - public static final RegistryObject PINE_TRAPDOOR = createItem(BYGBlocks.PINE_TRAPDOOR); - public static final RegistryObject PINE_PRESSURE_PLATE = createItem(BYGBlocks.PINE_PRESSURE_PLATE); - public static final RegistryObject PINE_BUTTON = createItem(BYGBlocks.PINE_BUTTON); - public static final RegistryObject PINE_SIGN = createSign("pine_sign", BYGBlocks.PINE_SIGN, BYGBlocks.PINE_WALL_SIGN); - public static final RegistryObject PINE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.PINE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "pine_boat"); - //Rainbow Eucalyptus Woodtype public static final RegistryObject RAINBOW_EUCALYPTUS_SAPLING = createSaplingItem(BYGBlocks.RAINBOW_EUCALYPTUS_SAPLING); public static final RegistryObject RAINBOW_EUCALYPTUS_LEAVES = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_LEAVES); diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/pine_bookshelf.json deleted file mode 100644 index 587ef058d4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_button.json b/Common/src/main/resources/assets/byg/blockstates/pine_button.json deleted file mode 100644 index 2426fbd9cf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/pine_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/pine_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/pine_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/pine_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/pine_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/pine_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/pine_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/pine_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/pine_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/pine_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/pine_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/pine_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/pine_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/pine_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/pine_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/pine_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/pine_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/pine_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/pine_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/pine_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/pine_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/pine_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/pine_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/pine_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/pine_crafting_table.json deleted file mode 100644 index 0793034101..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_door.json b/Common/src/main/resources/assets/byg/blockstates/pine_door.json deleted file mode 100644 index c16aa0474c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/pine_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/pine_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/pine_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/pine_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/pine_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/pine_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/pine_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/pine_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/pine_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/pine_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/pine_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/pine_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/pine_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/pine_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/pine_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/pine_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/pine_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/pine_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/pine_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/pine_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/pine_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/pine_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/pine_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/pine_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/pine_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/pine_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/pine_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_fence.json b/Common/src/main/resources/assets/byg/blockstates/pine_fence.json deleted file mode 100644 index 659f2fff45..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/pine_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/pine_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/pine_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/pine_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/pine_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/pine_fence_gate.json deleted file mode 100644 index e7279eb388..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/pine_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/pine_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/pine_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/pine_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/pine_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/pine_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/pine_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/pine_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/pine_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/pine_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/pine_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/pine_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/pine_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/pine_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/pine_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/pine_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_leaves.json b/Common/src/main/resources/assets/byg/blockstates/pine_leaves.json deleted file mode 100644 index f0bfe07e21..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_log.json b/Common/src/main/resources/assets/byg/blockstates/pine_log.json deleted file mode 100644 index e0f778a4d5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/pine_log" - }, - "axis=z": { - "model": "byg:block/pine_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/pine_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_planks.json b/Common/src/main/resources/assets/byg/blockstates/pine_planks.json deleted file mode 100644 index d5b4251bfd..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/pine_pressure_plate.json deleted file mode 100644 index 4fe5a1c355..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/pine_pressure_plate" - }, - "powered=true": { - "model": "byg:block/pine_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_sapling.json b/Common/src/main/resources/assets/byg/blockstates/pine_sapling.json deleted file mode 100644 index 65b387ed16..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_slab.json b/Common/src/main/resources/assets/byg/blockstates/pine_slab.json deleted file mode 100644 index d0fc9e83ff..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/pine_slab" - }, - "type=top": { - "model": "byg:block/pine_slab_top" - }, - "type=double": { - "model": "byg:block/pine_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_stairs.json b/Common/src/main/resources/assets/byg/blockstates/pine_stairs.json deleted file mode 100644 index 69dd7ab0b2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/pine_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/pine_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/pine_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/pine_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/pine_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/pine_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/pine_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/pine_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/pine_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/pine_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/pine_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/pine_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/pine_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/pine_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/pine_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/pine_trapdoor.json deleted file mode 100644 index 5edd487635..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/pine_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/pine_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/pine_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/pine_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/pine_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/pine_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/pine_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/pine_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/pine_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/pine_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/pine_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/pine_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/pine_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/pine_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/pine_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/pine_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_wood.json b/Common/src/main/resources/assets/byg/blockstates/pine_wood.json deleted file mode 100644 index 451f0a01e5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/pine_wood" - }, - "axis=z": { - "model": "byg:block/pine_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/pine_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/pine_bookshelf.json deleted file mode 100644 index 0e6cbc0007..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/pine_planks", - "up": "byg:block/pine_planks", - "north": "byg:block/pine_bookshelf", - "east": "byg:block/pine_bookshelf", - "south": "byg:block/pine_bookshelf", - "west": "byg:block/pine_bookshelf", - "particle": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_button.json b/Common/src/main/resources/assets/byg/models/block/pine_button.json deleted file mode 100644 index a24c40a7d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/pine_button_inventory.json deleted file mode 100644 index 16e52c1318..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/pine_button_pressed.json deleted file mode 100644 index dac3c9ee8e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/pine_crafting_table.json deleted file mode 100644 index 48e79ccdbb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/pine_crafting_table_front", - "down": "byg:block/pine_planks", - "up": "byg:block/pine_crafting_table_top", - "north": "byg:block/pine_crafting_table_front", - "east": "byg:block/pine_crafting_table_side", - "south": "byg:block/pine_crafting_table_side", - "west": "byg:block/pine_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/pine_door_bottom.json deleted file mode 100644 index a6a2f62bd3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/pine_door_bottom", - "top": "byg:block/pine_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/pine_door_bottom_hinge.json deleted file mode 100644 index bef42c82f6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/pine_door_bottom", - "top": "byg:block/pine_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_door_top.json b/Common/src/main/resources/assets/byg/models/block/pine_door_top.json deleted file mode 100644 index e4c93a4b4b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/pine_door_bottom", - "top": "byg:block/pine_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/pine_door_top_hinge.json deleted file mode 100644 index f9a79d5d3b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/pine_door_bottom", - "top": "byg:block/pine_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence.json b/Common/src/main/resources/assets/byg/models/block/pine_fence.json deleted file mode 100644 index ce40e93018..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/pine_planks", - "particle": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_gate.json deleted file mode 100644 index 06f8c472f4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_open.json deleted file mode 100644 index be33e9af4d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall.json deleted file mode 100644 index 2c8486c2c5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall_open.json deleted file mode 100644 index c28aebf997..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_inventory.json deleted file mode 100644 index 6365be4e90..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/pine_planks", - "particle": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_fence_post.json b/Common/src/main/resources/assets/byg/models/block/pine_fence_post.json deleted file mode 100644 index b7d8569e0d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/pine_planks", - "particle": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_leaves.json b/Common/src/main/resources/assets/byg/models/block/pine_leaves.json deleted file mode 100644 index 1a10e18b14..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/pine_leaves", - "particle": "byg:block/pine_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/pine_leaves_snowy.json deleted file mode 100644 index fd258da502..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/pine_leaves_snowy", - "up": "byg:block/pine_leaves_snowy", - "north": "byg:block/pine_leaves_snowy_side", - "east": "byg:block/pine_leaves_snowy_side", - "south": "byg:block/pine_leaves_snowy_side", - "west": "byg:block/pine_leaves_snowy_side", - "particle": "byg:block/pine_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_log.json b/Common/src/main/resources/assets/byg/models/block/pine_log.json deleted file mode 100644 index e2ff460bff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/pine_log_top", - "side": "byg:block/pine_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_planks.json b/Common/src/main/resources/assets/byg/models/block/pine_planks.json deleted file mode 100644 index ff3b7cc2e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/pine_planks", - "particle": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate.json deleted file mode 100644 index 5ea4cd9a71..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate_down.json deleted file mode 100644 index 44158a1b03..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_sapling.json b/Common/src/main/resources/assets/byg/models/block/pine_sapling.json deleted file mode 100644 index 7beed7adeb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/pine_sapling", - "particle": "byg:block/pine_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_slab.json b/Common/src/main/resources/assets/byg/models/block/pine_slab.json deleted file mode 100644 index ddb9aba417..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/pine_planks", - "top": "byg:block/pine_planks", - "side": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_slab_top.json b/Common/src/main/resources/assets/byg/models/block/pine_slab_top.json deleted file mode 100644 index d916882a4a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/pine_planks", - "top": "byg:block/pine_planks", - "side": "byg:block/pine_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_stairs.json b/Common/src/main/resources/assets/byg/models/block/pine_stairs.json deleted file mode 100644 index 54b2c6f7ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/pine_planks", - "top": "byg:block/pine_planks", - "side": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/pine_stairs_inner.json deleted file mode 100644 index c80b23b262..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/pine_planks", - "top": "byg:block/pine_planks", - "side": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/pine_stairs_outer.json deleted file mode 100644 index bce38b9858..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/pine_planks", - "top": "byg:block/pine_planks", - "side": "byg:block/pine_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_bottom.json deleted file mode 100644 index 46e5151219..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/pine_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_open.json deleted file mode 100644 index 37d9245c4d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/pine_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_top.json deleted file mode 100644 index 014ce5db5f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/pine_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/pine_wood.json b/Common/src/main/resources/assets/byg/models/block/pine_wood.json deleted file mode 100644 index f05de04d3d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/pine_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/pine_log", - "particle": "byg:block/pine_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_pine_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_pine_log.json deleted file mode 100644 index e4b65aaf90..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_pine_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_pine_log_top", - "up": "byg:block/stripped_pine_log_top", - "north": "byg:block/stripped_pine_log", - "east": "byg:block/stripped_pine_log", - "south": "byg:block/stripped_pine_log", - "west": "byg:block/stripped_pine_log", - "particle": "byg:block/stripped_pine_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_pine_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_pine_wood.json deleted file mode 100644 index a6139ae553..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_pine_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_pine_log", - "particle": "byg:block/stripped_pine_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_boat.json b/Common/src/main/resources/assets/byg/models/item/pine_boat.json deleted file mode 100644 index fa90ac1343..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/pine_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/pine_bookshelf.json deleted file mode 100644 index 0b68f23e12..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_button.json b/Common/src/main/resources/assets/byg/models/item/pine_button.json deleted file mode 100644 index d5c7924e97..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/pine_crafting_table.json deleted file mode 100644 index 3b38426d1a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_door.json b/Common/src/main/resources/assets/byg/models/item/pine_door.json deleted file mode 100644 index 14bfe8a54c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/pine_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_fence.json b/Common/src/main/resources/assets/byg/models/item/pine_fence.json deleted file mode 100644 index e10581e10a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/pine_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/pine_fence_gate.json deleted file mode 100644 index eee1fccebe..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_leaves.json b/Common/src/main/resources/assets/byg/models/item/pine_leaves.json deleted file mode 100644 index 8d6b92a328..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_log.json b/Common/src/main/resources/assets/byg/models/item/pine_log.json deleted file mode 100644 index c32d56fde5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_planks.json b/Common/src/main/resources/assets/byg/models/item/pine_planks.json deleted file mode 100644 index aa88689b00..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/pine_pressure_plate.json deleted file mode 100644 index 5ca4608a29..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_sapling.json b/Common/src/main/resources/assets/byg/models/item/pine_sapling.json deleted file mode 100644 index 1724eb037f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/pine_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_slab.json b/Common/src/main/resources/assets/byg/models/item/pine_slab.json deleted file mode 100644 index 845f43d5f8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_stairs.json b/Common/src/main/resources/assets/byg/models/item/pine_stairs.json deleted file mode 100644 index 06c4434011..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/pine_trapdoor.json deleted file mode 100644 index 6570f053b3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_wood.json b/Common/src/main/resources/assets/byg/models/item/pine_wood.json deleted file mode 100644 index ac93eb84d1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/pine_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_pine_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_pine_log.json deleted file mode 100644 index 43169ce094..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_pine_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_pine_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_pine_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_pine_wood.json deleted file mode 100644 index 9ef9d50517..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_pine_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_pine_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json b/Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json deleted file mode 100644 index de7e31ffaa..0000000000 --- a/Common/src/main/resources/assets/byg/textures/block/aspen/ed_aspen_wood.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_aspen_log", - "up": "byg:block/stripped_aspen_log", - "north": "byg:block/stripped_aspen_log", - "east": "byg:block/stripped_aspen_log", - "south": "byg:block/stripped_aspen_log", - "west": "byg:block/stripped_aspen_log", - "particle": "byg:block/stripped_aspen_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/pine/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/pine/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/pine/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/pine/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/pine/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_door_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/pine/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_leaves.png b/Common/src/main/resources/assets/byg/textures/block/pine/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/pine/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_log.png b/Common/src/main/resources/assets/byg/textures/block/pine/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_log.png rename to Common/src/main/resources/assets/byg/textures/block/pine/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_log_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/pine/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_planks.png b/Common/src/main/resources/assets/byg/textures/block/pine/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_planks.png rename to Common/src/main/resources/assets/byg/textures/block/pine/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_sapling.png b/Common/src/main/resources/assets/byg/textures/block/pine/sapling.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/pine/sapling.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_pine_log.png b/Common/src/main/resources/assets/byg/textures/block/pine/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_pine_log.png rename to Common/src/main/resources/assets/byg/textures/block/pine/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_pine_log_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_pine_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/pine/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/pine_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/pine/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/pine/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/pine_boat.png b/Common/src/main/resources/assets/byg/textures/item/pine/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/pine_boat.png rename to Common/src/main/resources/assets/byg/textures/item/pine/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/pine_door.png b/Common/src/main/resources/assets/byg/textures/item/pine/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/pine_door.png rename to Common/src/main/resources/assets/byg/textures/item/pine/door.png diff --git a/Common/src/main/resources/data/byg/recipes/pine_boat.json b/Common/src/main/resources/data/byg/recipes/pine_boat.json deleted file mode 100644 index 2ad4894f56..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_bookshelf.json b/Common/src/main/resources/data/byg/recipes/pine_bookshelf.json deleted file mode 100644 index bfa780bd40..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:pine_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:pine_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_button.json b/Common/src/main/resources/data/byg/recipes/pine_button.json deleted file mode 100644 index 01f7007c7d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:pine_planks" - } - ], - "result": { - "item": "byg:pine_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_crafting_table.json b/Common/src/main/resources/data/byg/recipes/pine_crafting_table.json deleted file mode 100644 index c9d4a75345..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_door.json b/Common/src/main/resources/data/byg/recipes/pine_door.json deleted file mode 100644 index 06f91e0066..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_fence.json b/Common/src/main/resources/data/byg/recipes/pine_fence.json deleted file mode 100644 index f3367bab11..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_fence_gate.json b/Common/src/main/resources/data/byg/recipes/pine_fence_gate.json deleted file mode 100644 index 36640e58f1..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_planks.json b/Common/src/main/resources/data/byg/recipes/pine_planks.json deleted file mode 100644 index 654dd67a08..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:pine_logs" - } - ], - "result": { - "item": "byg:pine_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/pine_pressure_plate.json deleted file mode 100644 index c79835805d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_slab.json b/Common/src/main/resources/data/byg/recipes/pine_slab.json deleted file mode 100644 index 8d53f398bb..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_stairs.json b/Common/src/main/resources/data/byg/recipes/pine_stairs.json deleted file mode 100644 index 53adbc2845..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_trapdoor.json b/Common/src/main/resources/data/byg/recipes/pine_trapdoor.json deleted file mode 100644 index dcdea009ad..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:pine_planks" - } - }, - "result": { - "item": "byg:pine_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/pine_wood.json b/Common/src/main/resources/data/byg/recipes/pine_wood.json deleted file mode 100644 index b3fda3716c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/pine_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:pine_log" - } - }, - "result": { - "item": "byg:pine_wood", - "count": 3 - } -} \ No newline at end of file From a9fe0d758b7eea2bc94b43156c413f3310e5d055 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 12:30:01 +0300 Subject: [PATCH 37/90] Rainbow eucalyptus --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 22 +- .../rainbow_eucalyptus_bookshelf.json | 7 - .../rainbow_eucalyptus_button.json | 118 ---------- .../rainbow_eucalyptus_crafting_table.json | 7 - .../blockstates/rainbow_eucalyptus_door.json | 124 ----------- .../blockstates/rainbow_eucalyptus_fence.json | 48 ---- .../rainbow_eucalyptus_fence_gate.json | 80 ------- .../rainbow_eucalyptus_leaves.json | 7 - .../blockstates/rainbow_eucalyptus_log.json | 17 -- .../rainbow_eucalyptus_planks.json | 7 - .../rainbow_eucalyptus_pressure_plate.json | 10 - .../rainbow_eucalyptus_sapling.json | 7 - .../blockstates/rainbow_eucalyptus_slab.json | 13 -- .../rainbow_eucalyptus_stairs.json | 209 ------------------ .../rainbow_eucalyptus_trapdoor.json | 69 ------ .../blockstates/rainbow_eucalyptus_wood.json | 16 -- .../block/rainbow_eucalyptus_bookshelf.json | 12 - .../block/rainbow_eucalyptus_button.json | 6 - .../rainbow_eucalyptus_button_inventory.json | 6 - .../rainbow_eucalyptus_button_pressed.json | 6 - .../rainbow_eucalyptus_crafting_table.json | 12 - .../block/rainbow_eucalyptus_door_bottom.json | 7 - .../rainbow_eucalyptus_door_bottom_hinge.json | 7 - .../block/rainbow_eucalyptus_door_top.json | 7 - .../rainbow_eucalyptus_door_top_hinge.json | 7 - .../block/rainbow_eucalyptus_fence.json | 7 - .../block/rainbow_eucalyptus_fence_gate.json | 6 - .../rainbow_eucalyptus_fence_gate_open.json | 6 - .../rainbow_eucalyptus_fence_gate_wall.json | 6 - ...inbow_eucalyptus_fence_gate_wall_open.json | 6 - .../rainbow_eucalyptus_fence_inventory.json | 7 - .../block/rainbow_eucalyptus_fence_post.json | 7 - .../block/rainbow_eucalyptus_leaves.json | 166 -------------- .../rainbow_eucalyptus_leaves_snowy.json | 12 - .../models/block/rainbow_eucalyptus_log.json | 7 - .../block/rainbow_eucalyptus_planks.json | 7 - .../rainbow_eucalyptus_pressure_plate.json | 6 - ...ainbow_eucalyptus_pressure_plate_down.json | 6 - .../block/rainbow_eucalyptus_sapling.json | 7 - .../models/block/rainbow_eucalyptus_slab.json | 8 - .../block/rainbow_eucalyptus_slab_top.json | 8 - .../block/rainbow_eucalyptus_stairs.json | 8 - .../rainbow_eucalyptus_stairs_inner.json | 8 - .../rainbow_eucalyptus_stairs_outer.json | 8 - .../rainbow_eucalyptus_trapdoor_bottom.json | 6 - .../rainbow_eucalyptus_trapdoor_open.json | 6 - .../rainbow_eucalyptus_trapdoor_top.json | 6 - .../models/block/rainbow_eucalyptus_wood.json | 7 - .../stripped_rainbow_eucalyptus_log.json | 12 - .../stripped_rainbow_eucalyptus_wood.json | 7 - .../models/item/rainbow_eucalyptus_boat.json | 6 - .../item/rainbow_eucalyptus_bookshelf.json | 22 -- .../item/rainbow_eucalyptus_button.json | 22 -- .../rainbow_eucalyptus_crafting_table.json | 22 -- .../models/item/rainbow_eucalyptus_door.json | 6 - .../models/item/rainbow_eucalyptus_fence.json | 3 - .../item/rainbow_eucalyptus_fence_gate.json | 22 -- .../item/rainbow_eucalyptus_leaves.json | 22 -- .../models/item/rainbow_eucalyptus_log.json | 22 -- .../item/rainbow_eucalyptus_planks.json | 22 -- .../rainbow_eucalyptus_pressure_plate.json | 22 -- .../item/rainbow_eucalyptus_sapling.json | 6 - .../models/item/rainbow_eucalyptus_slab.json | 22 -- .../item/rainbow_eucalyptus_stairs.json | 22 -- .../item/rainbow_eucalyptus_trapdoor.json | 22 -- .../models/item/rainbow_eucalyptus_wood.json | 22 -- .../item/stripped_rainbow_eucalyptus_log.json | 22 -- .../stripped_rainbow_eucalyptus_wood.json | 22 -- .../block/palm/ped_palm_wood_horizontal.json | 7 - .../pine/{sapling.png => grower_item.png} | Bin .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../boat.png} | Bin .../door.png} | Bin .../byg/recipes/rainbow_eucalyptus_boat.json | 16 -- .../recipes/rainbow_eucalyptus_bookshelf.json | 19 -- .../recipes/rainbow_eucalyptus_button.json | 12 - .../rainbow_eucalyptus_crafting_table.json | 15 -- .../byg/recipes/rainbow_eucalyptus_fence.json | 20 -- .../rainbow_eucalyptus_fence_gate.json | 19 -- .../recipes/rainbow_eucalyptus_planks.json | 13 -- .../rainbow_eucalyptus_pressure_plate.json | 15 -- .../byg/recipes/rainbow_eucalyptus_slab.json | 16 -- .../recipes/rainbow_eucalyptus_stairs.json | 18 -- .../byg/recipes/rainbow_eucalyptus_wood.json | 16 -- 100 files changed, 6 insertions(+), 1706 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json rename Common/src/main/resources/assets/byg/textures/block/pine/{sapling.png => grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_bookshelf.png => rainbow_eucalyptus/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_crafting_table_front.png => rainbow_eucalyptus/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_crafting_table_side.png => rainbow_eucalyptus/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_crafting_table_top.png => rainbow_eucalyptus/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_door_bottom.png => rainbow_eucalyptus/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_door_top.png => rainbow_eucalyptus/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_sapling.png => rainbow_eucalyptus/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_leaves.png => rainbow_eucalyptus/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_log.png => rainbow_eucalyptus/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_log_top.png => rainbow_eucalyptus/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_planks.png => rainbow_eucalyptus/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_rainbow_eucalyptus_log.png => rainbow_eucalyptus/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_rainbow_eucalyptus_log_top.png => rainbow_eucalyptus/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{rainbow_eucalyptus_trapdoor.png => rainbow_eucalyptus/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{rainbow_eucalyptus_boat.png => rainbow_eucalyptus/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{rainbow_eucalyptus_door.png => rainbow_eucalyptus/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 9a709407f7..179edbfa66 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -64,7 +64,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PLANKS = createPlanks("rainbow_eucalyptus_planks"); public static final BlockRegistryObject REDWOOD_PLANKS = createPlanks("redwood_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); public static final BlockRegistryObject WILLOW_PLANKS = createPlanks("willow_planks"); @@ -77,7 +76,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BOOKSHELF = createBookshelf("rainbow_eucalyptus_bookshelf"); public static final BlockRegistryObject REDWOOD_BOOKSHELF = createBookshelf("redwood_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); public static final BlockRegistryObject WILLOW_BOOKSHELF = createBookshelf("willow_bookshelf"); @@ -90,7 +88,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_DOOR = createDoor("rainbow_eucalyptus_door"); public static final BlockRegistryObject REDWOOD_DOOR = createDoor("redwood_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); public static final BlockRegistryObject WILLOW_DOOR = createDoor("willow_door"); @@ -103,7 +100,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_PRESSURE_PLATE = createWoodPressurePlate("rainbow_eucalyptus_pressure_plate"); public static final BlockRegistryObject REDWOOD_PRESSURE_PLATE = createWoodPressurePlate("redwood_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); public static final BlockRegistryObject WILLOW_PRESSURE_PLATE = createWoodPressurePlate("willow_pressure_plate"); @@ -116,7 +112,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_BUTTON = createWoodButton("rainbow_eucalyptus_button"); public static final BlockRegistryObject REDWOOD_BUTTON = createWoodButton("redwood_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); public static final BlockRegistryObject WILLOW_BUTTON = createWoodButton("willow_button"); @@ -129,7 +124,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_TRAPDOOR = createTrapDoor("rainbow_eucalyptus_trapdoor"); public static final BlockRegistryObject REDWOOD_TRAPDOOR = createTrapDoor("redwood_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); public static final BlockRegistryObject WILLOW_TRAPDOOR = createTrapDoor("willow_trapdoor"); @@ -142,7 +136,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_CRAFTING_TABLE = createCraftingTable("rainbow_eucalyptus_crafting_table"); public static final BlockRegistryObject REDWOOD_CRAFTING_TABLE = createCraftingTable("redwood_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); public static final BlockRegistryObject WILLOW_CRAFTING_TABLE = createCraftingTable("willow_crafting_table"); @@ -155,7 +148,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE_GATE = createFenceGate("rainbow_eucalyptus_fence_gate"); public static final BlockRegistryObject REDWOOD_FENCE_GATE = createFenceGate("redwood_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); public static final BlockRegistryObject WILLOW_FENCE_GATE = createFenceGate("willow_fence_gate"); @@ -168,7 +160,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SLAB = createWoodSlab("rainbow_eucalyptus_slab"); public static final BlockRegistryObject REDWOOD_SLAB = createWoodSlab("redwood_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); public static final BlockRegistryObject WILLOW_SLAB = createWoodSlab("willow_slab"); @@ -181,7 +172,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_STAIRS = createWoodStairs("rainbow_eucalyptus_stairs"); public static final BlockRegistryObject REDWOOD_STAIRS = createWoodStairs("redwood_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); public static final BlockRegistryObject WILLOW_STAIRS = createWoodStairs("willow_stairs"); @@ -194,7 +184,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_FENCE = createFence("rainbow_eucalyptus_fence"); public static final BlockRegistryObject REDWOOD_FENCE = createFence("redwood_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); public static final BlockRegistryObject WILLOW_FENCE = createFence("willow_fence"); @@ -207,7 +196,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SIGN = createSign("rainbow_eucalyptus_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); public static final BlockRegistryObject REDWOOD_SIGN = createSign("redwood_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject WILLOW_SIGN = createSign("willow_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); @@ -220,7 +208,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_WALL_SIGN = createWallSign("rainbow_eucalyptus_wall_sign", BYGWoodType.RAINBOW_EUCALYPTUS, RAINBOW_EUCALYPTUS_PLANKS); public static final BlockRegistryObject REDWOOD_WALL_SIGN = createWallSign("redwood_wall_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject WILLOW_WALL_SIGN = createWallSign("willow_wall_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); @@ -259,7 +246,6 @@ public class BYGBlocks { public static final BlockRegistryObject ORCHARD_SAPLING = createSapling(BYGBlockTags.GROUND_ORCHARD_SAPLING, "orchard_sapling"); public static final BlockRegistryObject PALO_VERDE_SAPLING = createSapling(BYGBlockTags.GROUND_PALO_VERDE_SAPLING, "palo_verde_sapling"); public static final BlockRegistryObject PINK_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_PINK_CHERRY_SAPLING, "pink_cherry_sapling"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_SAPLING = createSapling(BYGBlockTags.GROUND_RAINBOW_EUCALYPTUS_SAPLING, "rainbow_eucalyptus_sapling"); public static final BlockRegistryObject RED_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_RED_BIRCH_SAPLING, "red_birch_sapling"); public static final BlockRegistryObject RED_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_RED_MAPLE_SAPLING, "red_maple_sapling"); public static final BlockRegistryObject RED_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_RED_OAK_SAPLING, "red_oak_sapling"); @@ -306,7 +292,6 @@ public class BYGBlocks { public static final BlockRegistryObject ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "orchard_leaves"); public static final BlockRegistryObject PALO_VERDE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "palo_verde_leaves"); public static final BlockRegistryObject PINK_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_PINK, "pink_cherry_leaves"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "rainbow_eucalyptus_leaves"); public static final BlockRegistryObject RED_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_birch_leaves"); public static final BlockRegistryObject RED_MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_maple_leaves"); public static final BlockRegistryObject RED_OAK_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_oak_leaves"); @@ -611,7 +596,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_LOG = createLog("rainbow_eucalyptus_log"); public static final BlockRegistryObject REDWOOD_LOG = createLog("redwood_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); public static final BlockRegistryObject WILLOW_LOG = createLog("willow_log"); @@ -629,7 +613,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); - public static final BlockRegistryObject RAINBOW_EUCALYPTUS_WOOD = createWood("rainbow_eucalyptus_wood"); public static final BlockRegistryObject REDWOOD_WOOD = createWood("redwood_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); public static final BlockRegistryObject WILLOW_WOOD = createWood("willow_wood"); @@ -770,7 +753,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); - public static final BlockRegistryObject STRIPPED_RAINBOW_EUCALYPTUS_LOG = createStrippedLog("stripped_rainbow_eucalyptus_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); public static final BlockRegistryObject STRIPPED_WILLOW_LOG = createStrippedLog("stripped_willow_log"); public static final BlockRegistryObject STRIPPED_REDWOOD_LOG = createStrippedLog("stripped_redwood_log"); @@ -784,7 +766,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); - public static final BlockRegistryObject STRIPPED_RAINBOW_EUCALYPTUS_WOOD = createWood("stripped_rainbow_eucalyptus_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); public static final BlockRegistryObject STRIPPED_WILLOW_WOOD = createWood("stripped_willow_wood"); public static final BlockRegistryObject STRIPPED_REDWOOD_WOOD = createWood("stripped_redwood_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 3f9e5fdd7e..1c2633320f 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -11,7 +11,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); - public static final WoodType PINE = register("pine"); public static final WoodType RAINBOW_EUCALYPTUS = register("rainbow_eucalyptus"); public static final WoodType REDWOOD = register("redwood"); public static final WoodType SKYRIS = register("skyris"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 4bff9d71b1..6962e422a0 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -99,7 +99,11 @@ public enum BYGWoodTypes { PINE("pine", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_PINE_SAPLING) .boatType(BYGBoatEntity.BYGType.PINE) - .materialColor(MaterialColor.TERRACOTTA_GREEN)); + .materialColor(MaterialColor.TERRACOTTA_GREEN)), + RAINBOW_EUCALYPTUS("rainbow_eucalyptus", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_RAINBOW_EUCALYPTUS_SAPLING) + .boatType(BYGBoatEntity.BYGType.RAINBOW_EUCALYPTUS) + .materialColor(MaterialColor.COLOR_GREEN)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index f990f266bc..3bfb3e33f3 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -447,29 +447,9 @@ public class BYGItems { BYGWoodTypes.PALM.init(); // TODO palo verde BYGWoodTypes.PINE.init(); + BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); } - //Rainbow Eucalyptus Woodtype - public static final RegistryObject RAINBOW_EUCALYPTUS_SAPLING = createSaplingItem(BYGBlocks.RAINBOW_EUCALYPTUS_SAPLING); - public static final RegistryObject RAINBOW_EUCALYPTUS_LEAVES = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_LEAVES); - public static final RegistryObject RAINBOW_EUCALYPTUS_LOG = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_LOG); - public static final RegistryObject RAINBOW_EUCALYPTUS_WOOD = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_WOOD); - public static final RegistryObject STRIPPED_RAINBOW_EUCALYPTUS_LOG = createItem(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_LOG); - public static final RegistryObject STRIPPED_RAINBOW_EUCALYPTUS_WOOD = createItem(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_WOOD); - public static final RegistryObject RAINBOW_EUCALYPTUS_PLANKS = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_PLANKS); - public static final RegistryObject RAINBOW_EUCALYPTUS_BOOKSHELF = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_BOOKSHELF); - public static final RegistryObject RAINBOW_EUCALYPTUS_CRAFTING_TABLE = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_CRAFTING_TABLE); - public static final RegistryObject RAINBOW_EUCALYPTUS_STAIRS = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_STAIRS); - public static final RegistryObject RAINBOW_EUCALYPTUS_SLAB = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_SLAB); - public static final RegistryObject RAINBOW_EUCALYPTUS_FENCE = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_FENCE); - public static final RegistryObject RAINBOW_EUCALYPTUS_FENCE_GATE = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_FENCE_GATE); - public static final RegistryObject RAINBOW_EUCALYPTUS_DOOR = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_DOOR); - public static final RegistryObject RAINBOW_EUCALYPTUS_TRAPDOOR = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_TRAPDOOR); - public static final RegistryObject RAINBOW_EUCALYPTUS_PRESSURE_PLATE = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_PRESSURE_PLATE); - public static final RegistryObject RAINBOW_EUCALYPTUS_BUTTON = createItem(BYGBlocks.RAINBOW_EUCALYPTUS_BUTTON); - public static final RegistryObject RAINBOW_EUCALYPTUS_SIGN = createSign("rainbow_eucalyptus_sign", BYGBlocks.RAINBOW_EUCALYPTUS_SIGN, BYGBlocks.RAINBOW_EUCALYPTUS_WALL_SIGN); - public static final RegistryObject RAINBOW_EUCALYPTUS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.RAINBOW_EUCALYPTUS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "rainbow_eucalyptus_boat"); - //Redwood Woodtype public static final RegistryObject REDWOOD_SAPLING = createSaplingItem(BYGBlocks.REDWOOD_SAPLING); public static final RegistryObject REDWOOD_LEAVES = createItem(BYGBlocks.REDWOOD_LEAVES); diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json deleted file mode 100644 index f6acf59e63..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json deleted file mode 100644 index 930248a9f5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/rainbow_eucalyptus_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/rainbow_eucalyptus_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json deleted file mode 100644 index d2f19dd22c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json deleted file mode 100644 index 4430ddc8e4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json deleted file mode 100644 index 28cb7babb5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/rainbow_eucalyptus_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/rainbow_eucalyptus_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/rainbow_eucalyptus_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/rainbow_eucalyptus_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/rainbow_eucalyptus_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json deleted file mode 100644 index 89c048d8b4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json deleted file mode 100644 index 68707791b2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json deleted file mode 100644 index 745b4106a3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/rainbow_eucalyptus_log" - }, - "axis=z": { - "model": "byg:block/rainbow_eucalyptus_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/rainbow_eucalyptus_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json deleted file mode 100644 index 3c5669b580..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json deleted file mode 100644 index 7b04378c2d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/rainbow_eucalyptus_pressure_plate" - }, - "powered=true": { - "model": "byg:block/rainbow_eucalyptus_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json deleted file mode 100644 index 91fcbf5428..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json deleted file mode 100644 index 4a54043120..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/rainbow_eucalyptus_slab" - }, - "type=top": { - "model": "byg:block/rainbow_eucalyptus_slab_top" - }, - "type=double": { - "model": "byg:block/rainbow_eucalyptus_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json deleted file mode 100644 index 015046d3de..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json deleted file mode 100644 index 2cf943bb99..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json deleted file mode 100644 index ba74fa9949..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/rainbow_eucalyptus_wood" - }, - "axis=z": { - "model": "byg:block/rainbow_eucalyptus_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/rainbow_eucalyptus_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_bookshelf.json deleted file mode 100644 index 6d0079695d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/rainbow_eucalyptus_planks", - "up": "byg:block/rainbow_eucalyptus_planks", - "north": "byg:block/rainbow_eucalyptus_bookshelf", - "east": "byg:block/rainbow_eucalyptus_bookshelf", - "south": "byg:block/rainbow_eucalyptus_bookshelf", - "west": "byg:block/rainbow_eucalyptus_bookshelf", - "particle": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button.json deleted file mode 100644 index 7e65378b82..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_inventory.json deleted file mode 100644 index 54e4c5f99e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_pressed.json deleted file mode 100644 index dfb0b94ddd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_crafting_table.json deleted file mode 100644 index 8aece81cca..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/rainbow_eucalyptus_crafting_table_front", - "down": "byg:block/rainbow_eucalyptus_planks", - "up": "byg:block/rainbow_eucalyptus_crafting_table_top", - "north": "byg:block/rainbow_eucalyptus_crafting_table_front", - "east": "byg:block/rainbow_eucalyptus_crafting_table_side", - "south": "byg:block/rainbow_eucalyptus_crafting_table_side", - "west": "byg:block/rainbow_eucalyptus_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom.json deleted file mode 100644 index 05cec92ad8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_door_bottom", - "top": "byg:block/rainbow_eucalyptus_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom_hinge.json deleted file mode 100644 index f43dccb487..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_door_bottom", - "top": "byg:block/rainbow_eucalyptus_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top.json deleted file mode 100644 index 4bd6c7a2bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_door_bottom", - "top": "byg:block/rainbow_eucalyptus_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top_hinge.json deleted file mode 100644 index 2e5d5cd5f3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_door_bottom", - "top": "byg:block/rainbow_eucalyptus_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence.json deleted file mode 100644 index 09b6bee6c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks", - "particle": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate.json deleted file mode 100644 index 6069afae25..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_open.json deleted file mode 100644 index 3a31747b16..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall.json deleted file mode 100644 index 9cee9ce64e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall_open.json deleted file mode 100644 index c75cfe9b9a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_inventory.json deleted file mode 100644 index ba2c7fcbbc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks", - "particle": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_post.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_post.json deleted file mode 100644 index ccfee58969..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks", - "particle": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves.json deleted file mode 100644 index 53dcc432ec..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/rainbow_eucalyptus_leaves", - "bottom": "byg:block/rainbow_eucalyptus_leaves", - "top": "byg:block/rainbow_eucalyptus_leaves", - "side": "byg:block/rainbow_eucalyptus_leaves", - "overlay": "byg:block/rainbow_eucalyptus_leaves" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#top", - "cullface": "up" - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "east" - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "up" - } - } - } - ] -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves_snowy.json deleted file mode 100644 index 5aa261f0d8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/rainbow_eucalyptus_leaves_snowy", - "up": "byg:block/rainbow_eucalyptus_leaves_snowy", - "north": "byg:block/rainbow_eucalyptus_leaves_snowy_side", - "east": "byg:block/rainbow_eucalyptus_leaves_snowy_side", - "south": "byg:block/rainbow_eucalyptus_leaves_snowy_side", - "west": "byg:block/rainbow_eucalyptus_leaves_snowy_side", - "particle": "byg:block/rainbow_eucalyptus_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_log.json deleted file mode 100644 index 342a9d47f7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/rainbow_eucalyptus_log_top", - "side": "byg:block/rainbow_eucalyptus_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_planks.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_planks.json deleted file mode 100644 index 1036df0053..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/rainbow_eucalyptus_planks", - "particle": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate.json deleted file mode 100644 index ddbbeabddc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate_down.json deleted file mode 100644 index 4c229d5599..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_sapling.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_sapling.json deleted file mode 100644 index 332e8af5c9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/rainbow_eucalyptus_sapling", - "particle": "byg:block/rainbow_eucalyptus_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab.json deleted file mode 100644 index 311d97e70a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_planks", - "top": "byg:block/rainbow_eucalyptus_planks", - "side": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab_top.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab_top.json deleted file mode 100644 index 5971f7a48e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_planks", - "top": "byg:block/rainbow_eucalyptus_planks", - "side": "byg:block/rainbow_eucalyptus_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs.json deleted file mode 100644 index aac11b9d96..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_planks", - "top": "byg:block/rainbow_eucalyptus_planks", - "side": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_inner.json deleted file mode 100644 index e1c5c3597e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_planks", - "top": "byg:block/rainbow_eucalyptus_planks", - "side": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_outer.json deleted file mode 100644 index 06cf5307cd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/rainbow_eucalyptus_planks", - "top": "byg:block/rainbow_eucalyptus_planks", - "side": "byg:block/rainbow_eucalyptus_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_bottom.json deleted file mode 100644 index 53fa105666..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_open.json deleted file mode 100644 index 058459a23f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_top.json deleted file mode 100644 index 821c886f32..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/rainbow_eucalyptus_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_wood.json deleted file mode 100644 index 93f6e8a16a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/rainbow_eucalyptus_log", - "particle": "byg:block/rainbow_eucalyptus_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_log.json deleted file mode 100644 index e57371f7e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_rainbow_eucalyptus_log_top", - "up": "byg:block/stripped_rainbow_eucalyptus_log_top", - "north": "byg:block/stripped_rainbow_eucalyptus_log", - "east": "byg:block/stripped_rainbow_eucalyptus_log", - "south": "byg:block/stripped_rainbow_eucalyptus_log", - "west": "byg:block/stripped_rainbow_eucalyptus_log", - "particle": "byg:block/stripped_rainbow_eucalyptus_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_wood.json deleted file mode 100644 index ec5bcf174f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_rainbow_eucalyptus_log", - "particle": "byg:block/stripped_rainbow_eucalyptus_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json deleted file mode 100644 index a20935974e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/rainbow_eucalyptus_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json deleted file mode 100644 index c7800cd61c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_button.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_button.json deleted file mode 100644 index f859a4b113..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json deleted file mode 100644 index 204d29efd1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_door.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_door.json deleted file mode 100644 index da88b7a246..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/rainbow_eucalyptus_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json deleted file mode 100644 index 2d9b81f81d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json deleted file mode 100644 index 7b044b23c3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json deleted file mode 100644 index b98872ca6b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_log.json deleted file mode 100644 index 173c5d83fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json deleted file mode 100644 index 1e0ea5bc16..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json deleted file mode 100644 index 106a25f8f1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json deleted file mode 100644 index d95a53a311..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/rainbow_eucalyptus_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json deleted file mode 100644 index c4042c9c9d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json deleted file mode 100644 index a2487ff983..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json deleted file mode 100644 index 03dafbc5c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json deleted file mode 100644 index f3c1bcde3b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/rainbow_eucalyptus_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json deleted file mode 100644 index 17fdd2c430..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_rainbow_eucalyptus_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json deleted file mode 100644 index 2e31b22e02..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_rainbow_eucalyptus_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json b/Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json deleted file mode 100644 index 6a367580cf..0000000000 --- a/Common/src/main/resources/assets/byg/textures/block/palm/ped_palm_wood_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "byg:block/stripped_palm_log", - "side": "byg:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/sapling.png b/Common/src/main/resources/assets/byg/textures/block/pine/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/pine/sapling.png rename to Common/src/main/resources/assets/byg/textures/block/pine/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_door_top.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_sapling.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_leaves.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_log.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_log.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_log_top.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_planks.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_planks.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_rainbow_eucalyptus_log.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_rainbow_eucalyptus_log.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_rainbow_eucalyptus_log_top.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_rainbow_eucalyptus_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_boat.png b/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_boat.png rename to Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_door.png b/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_door.png rename to Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/door.png diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_boat.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_boat.json deleted file mode 100644 index 9436951695..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_bookshelf.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_bookshelf.json deleted file mode 100644 index 75af813941..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_button.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_button.json deleted file mode 100644 index 3c6385020a..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:rainbow_eucalyptus_planks" - } - ], - "result": { - "item": "byg:rainbow_eucalyptus_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_crafting_table.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_crafting_table.json deleted file mode 100644 index 3eab8a3cfa..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence.json deleted file mode 100644 index 937501994c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence_gate.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence_gate.json deleted file mode 100644 index a927564569..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_planks.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_planks.json deleted file mode 100644 index 2c5efc26eb..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:rainbow_eucalyptus_logs" - } - ], - "result": { - "item": "byg:rainbow_eucalyptus_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_pressure_plate.json deleted file mode 100644 index ab31a22eb4..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_slab.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_slab.json deleted file mode 100644 index 49595ac4a4..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_stairs.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_stairs.json deleted file mode 100644 index 11cc35561b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_planks" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_wood.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_wood.json deleted file mode 100644 index 2ee3ddff8f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:rainbow_eucalyptus_log" - } - }, - "result": { - "item": "byg:rainbow_eucalyptus_wood", - "count": 3 - } -} \ No newline at end of file From 70b4017ec4c1ccd9b597e947c6fd2af213697a08 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 12:33:59 +0300 Subject: [PATCH 38/90] Redwood --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 2 - .../byg/common/block/BYGWoodTypes.java | 4 + .../byg/common/item/BYGItems.java | 22 +- .../byg/blockstates/redwood_bookshelf.json | 7 - .../byg/blockstates/redwood_button.json | 118 ---------- .../blockstates/redwood_crafting_table.json | 7 - .../assets/byg/blockstates/redwood_door.json | 124 ----------- .../assets/byg/blockstates/redwood_fence.json | 48 ---- .../byg/blockstates/redwood_fence_gate.json | 80 ------- .../byg/blockstates/redwood_leaves.json | 7 - .../assets/byg/blockstates/redwood_log.json | 17 -- .../byg/blockstates/redwood_planks.json | 7 - .../blockstates/redwood_pressure_plate.json | 10 - .../byg/blockstates/redwood_sapling.json | 7 - .../assets/byg/blockstates/redwood_slab.json | 13 -- .../byg/blockstates/redwood_stairs.json | 209 ------------------ .../byg/blockstates/redwood_trapdoor.json | 69 ------ .../assets/byg/blockstates/redwood_wood.json | 16 -- .../byg/models/block/redwood_bookshelf.json | 12 - .../byg/models/block/redwood_button.json | 6 - .../block/redwood_button_inventory.json | 6 - .../models/block/redwood_button_pressed.json | 6 - .../models/block/redwood_crafting_table.json | 12 - .../byg/models/block/redwood_door_bottom.json | 7 - .../block/redwood_door_bottom_hinge.json | 7 - .../byg/models/block/redwood_door_top.json | 7 - .../models/block/redwood_door_top_hinge.json | 7 - .../byg/models/block/redwood_fence.json | 7 - .../byg/models/block/redwood_fence_gate.json | 6 - .../models/block/redwood_fence_gate_open.json | 6 - .../models/block/redwood_fence_gate_wall.json | 6 - .../block/redwood_fence_gate_wall_open.json | 6 - .../models/block/redwood_fence_inventory.json | 7 - .../byg/models/block/redwood_fence_post.json | 7 - .../byg/models/block/redwood_leaves.json | 7 - .../models/block/redwood_leaves_snowy.json | 12 - .../assets/byg/models/block/redwood_log.json | 7 - .../byg/models/block/redwood_planks.json | 7 - .../models/block/redwood_pressure_plate.json | 6 - .../block/redwood_pressure_plate_down.json | 6 - .../byg/models/block/redwood_sapling.json | 7 - .../assets/byg/models/block/redwood_slab.json | 8 - .../byg/models/block/redwood_slab_top.json | 8 - .../byg/models/block/redwood_stairs.json | 8 - .../models/block/redwood_stairs_inner.json | 8 - .../models/block/redwood_stairs_outer.json | 8 - .../models/block/redwood_trapdoor_bottom.json | 6 - .../models/block/redwood_trapdoor_open.json | 6 - .../models/block/redwood_trapdoor_top.json | 6 - .../assets/byg/models/block/redwood_wood.json | 7 - .../models/block/stripped_redwood_log.json | 12 - .../models/block/stripped_redwood_wood.json | 7 - .../assets/byg/models/item/redwood_boat.json | 6 - .../byg/models/item/redwood_bookshelf.json | 22 -- .../byg/models/item/redwood_button.json | 22 -- .../models/item/redwood_crafting_table.json | 22 -- .../assets/byg/models/item/redwood_door.json | 6 - .../assets/byg/models/item/redwood_fence.json | 3 - .../byg/models/item/redwood_fence_gate.json | 22 -- .../byg/models/item/redwood_leaves.json | 22 -- .../assets/byg/models/item/redwood_log.json | 22 -- .../byg/models/item/redwood_planks.json | 22 -- .../models/item/redwood_pressure_plate.json | 22 -- .../byg/models/item/redwood_sapling.json | 6 - .../assets/byg/models/item/redwood_slab.json | 22 -- .../byg/models/item/redwood_stairs.json | 22 -- .../byg/models/item/redwood_trapdoor.json | 22 -- .../assets/byg/models/item/redwood_wood.json | 22 -- .../byg/models/item/stripped_redwood_log.json | 22 -- .../models/item/stripped_redwood_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../{redwood_log.png => redwood/log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../block/stripped_redwood_log_toppng.png | Bin 391 -> 0 bytes .../textures/block/stripped_redwood_top.png | Bin 429 -> 0 bytes .../{redwood_boat.png => redwood/boat.png} | Bin .../{redwood_door.png => redwood/door.png} | Bin .../data/byg/recipes/redwood_boat.json | 16 -- .../data/byg/recipes/redwood_bookshelf.json | 19 -- .../data/byg/recipes/redwood_button.json | 12 - .../byg/recipes/redwood_crafting_table.json | 15 -- .../data/byg/recipes/redwood_door.json | 18 -- .../data/byg/recipes/redwood_fence.json | 20 -- .../data/byg/recipes/redwood_fence_gate.json | 19 -- .../data/byg/recipes/redwood_planks.json | 13 -- .../byg/recipes/redwood_pressure_plate.json | 15 -- .../data/byg/recipes/redwood_slab.json | 16 -- .../data/byg/recipes/redwood_stairs.json | 18 -- .../data/byg/recipes/redwood_trapdoor.json | 17 -- .../data/byg/recipes/redwood_wood.json | 16 -- 102 files changed, 5 insertions(+), 1575 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/redwood_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_redwood_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_redwood_wood.json rename Common/src/main/resources/assets/byg/textures/block/{redwood_bookshelf.png => redwood/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_crafting_table_front.png => redwood/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_crafting_table_side.png => redwood/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_crafting_table_top.png => redwood/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_door_bottom.png => redwood/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_door_top.png => redwood/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_sapling.png => redwood/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_leaves.png => redwood/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_log.png => redwood/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_log_top.png => redwood/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_planks.png => redwood/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_redwood_log.png => redwood/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_redwood_log_top.png => redwood/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{redwood_trapdoor.png => redwood/trapdoor.png} (100%) delete mode 100644 Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log_toppng.png delete mode 100644 Common/src/main/resources/assets/byg/textures/block/stripped_redwood_top.png rename Common/src/main/resources/assets/byg/textures/item/{redwood_boat.png => redwood/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{redwood_door.png => redwood/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/redwood_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 179edbfa66..bfb1ac16da 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -64,7 +64,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); - public static final BlockRegistryObject REDWOOD_PLANKS = createPlanks("redwood_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); public static final BlockRegistryObject WILLOW_PLANKS = createPlanks("willow_planks"); public static final BlockRegistryObject WITCH_HAZEL_PLANKS = createPlanks("witch_hazel_planks"); @@ -76,7 +75,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); - public static final BlockRegistryObject REDWOOD_BOOKSHELF = createBookshelf("redwood_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); public static final BlockRegistryObject WILLOW_BOOKSHELF = createBookshelf("willow_bookshelf"); public static final BlockRegistryObject WITCH_HAZEL_BOOKSHELF = createBookshelf("witch_hazel_bookshelf"); @@ -88,7 +86,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); - public static final BlockRegistryObject REDWOOD_DOOR = createDoor("redwood_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); public static final BlockRegistryObject WILLOW_DOOR = createDoor("willow_door"); public static final BlockRegistryObject WITCH_HAZEL_DOOR = createDoor("witch_hazel_door"); @@ -100,7 +97,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); - public static final BlockRegistryObject REDWOOD_PRESSURE_PLATE = createWoodPressurePlate("redwood_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); public static final BlockRegistryObject WILLOW_PRESSURE_PLATE = createWoodPressurePlate("willow_pressure_plate"); public static final BlockRegistryObject WITCH_HAZEL_PRESSURE_PLATE = createWoodPressurePlate("witch_hazel_pressure_plate"); @@ -112,7 +108,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); - public static final BlockRegistryObject REDWOOD_BUTTON = createWoodButton("redwood_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); public static final BlockRegistryObject WILLOW_BUTTON = createWoodButton("willow_button"); public static final BlockRegistryObject WITCH_HAZEL_BUTTON = createWoodButton("witch_hazel_button"); @@ -124,7 +119,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); - public static final BlockRegistryObject REDWOOD_TRAPDOOR = createTrapDoor("redwood_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); public static final BlockRegistryObject WILLOW_TRAPDOOR = createTrapDoor("willow_trapdoor"); public static final BlockRegistryObject WITCH_HAZEL_TRAPDOOR = createTrapDoor("witch_hazel_trapdoor"); @@ -136,7 +130,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); - public static final BlockRegistryObject REDWOOD_CRAFTING_TABLE = createCraftingTable("redwood_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); public static final BlockRegistryObject WILLOW_CRAFTING_TABLE = createCraftingTable("willow_crafting_table"); public static final BlockRegistryObject WITCH_HAZEL_CRAFTING_TABLE = createCraftingTable("witch_hazel_crafting_table"); @@ -148,7 +141,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); - public static final BlockRegistryObject REDWOOD_FENCE_GATE = createFenceGate("redwood_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); public static final BlockRegistryObject WILLOW_FENCE_GATE = createFenceGate("willow_fence_gate"); public static final BlockRegistryObject WITCH_HAZEL_FENCE_GATE = createFenceGate("witch_hazel_fence_gate"); @@ -160,7 +152,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); - public static final BlockRegistryObject REDWOOD_SLAB = createWoodSlab("redwood_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); public static final BlockRegistryObject WILLOW_SLAB = createWoodSlab("willow_slab"); public static final BlockRegistryObject WITCH_HAZEL_SLAB = createWoodSlab("witch_hazel_slab"); @@ -172,7 +163,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); - public static final BlockRegistryObject REDWOOD_STAIRS = createWoodStairs("redwood_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); public static final BlockRegistryObject WILLOW_STAIRS = createWoodStairs("willow_stairs"); public static final BlockRegistryObject WITCH_HAZEL_STAIRS = createWoodStairs("witch_hazel_stairs"); @@ -184,7 +174,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); - public static final BlockRegistryObject REDWOOD_FENCE = createFence("redwood_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); public static final BlockRegistryObject WILLOW_FENCE = createFence("willow_fence"); public static final BlockRegistryObject WITCH_HAZEL_FENCE = createFence("witch_hazel_fence"); @@ -196,7 +185,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject REDWOOD_SIGN = createSign("redwood_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject WILLOW_SIGN = createSign("willow_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); public static final BlockRegistryObject WITCH_HAZEL_SIGN = createSign("witch_hazel_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); @@ -208,7 +196,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject REDWOOD_WALL_SIGN = createWallSign("redwood_wall_sign", BYGWoodType.REDWOOD, REDWOOD_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject WILLOW_WALL_SIGN = createWallSign("willow_wall_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); public static final BlockRegistryObject WITCH_HAZEL_WALL_SIGN = createWallSign("witch_hazel_wall_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); @@ -250,7 +237,6 @@ public class BYGBlocks { public static final BlockRegistryObject RED_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_RED_MAPLE_SAPLING, "red_maple_sapling"); public static final BlockRegistryObject RED_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_RED_OAK_SAPLING, "red_oak_sapling"); public static final BlockRegistryObject RED_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_RED_SPRUCE_SAPLING, "red_spruce_sapling"); - public static final BlockRegistryObject REDWOOD_SAPLING = createSapling(BYGBlockTags.GROUND_REDWOOD_SAPLING, "redwood_sapling"); public static final BlockRegistryObject SILVER_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_SILVER_MAPLE_SAPLING, "silver_maple_sapling"); public static final BlockRegistryObject SKYRIS_SAPLING = createSapling(BYGBlockTags.GROUND_SKYRIS_SAPLING, "skyris_sapling"); public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); @@ -296,7 +282,6 @@ public class BYGBlocks { public static final BlockRegistryObject RED_MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_maple_leaves"); public static final BlockRegistryObject RED_OAK_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_oak_leaves"); public static final BlockRegistryObject RED_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_RED, "red_spruce_leaves"); - public static final BlockRegistryObject REDWOOD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "redwood_leaves"); public static final BlockRegistryObject RIPE_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ripe_orchard_leaves"); public static final BlockRegistryObject SILVER_MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "silver_maple_leaves"); public static final BlockRegistryObject SKYRIS_LEAVES_GREEN_APPLE = createLeaves(MaterialColor.COLOR_PINK, "green_apple_skyris_leaves"); @@ -596,7 +581,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); - public static final BlockRegistryObject REDWOOD_LOG = createLog("redwood_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); public static final BlockRegistryObject WILLOW_LOG = createLog("willow_log"); public static final BlockRegistryObject WITCH_HAZEL_LOG = createLog("witch_hazel_log"); @@ -613,7 +597,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); - public static final BlockRegistryObject REDWOOD_WOOD = createWood("redwood_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); public static final BlockRegistryObject WILLOW_WOOD = createWood("willow_wood"); public static final BlockRegistryObject WITCH_HAZEL_WOOD = createWood("witch_hazel_wood"); @@ -755,7 +738,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); public static final BlockRegistryObject STRIPPED_WILLOW_LOG = createStrippedLog("stripped_willow_log"); - public static final BlockRegistryObject STRIPPED_REDWOOD_LOG = createStrippedLog("stripped_redwood_log"); public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_LOG = createStrippedLog("stripped_witch_hazel_log"); public static final BlockRegistryObject STRIPPED_ZELKOVA_LOG = createStrippedLog("stripped_zelkova_log"); public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); @@ -768,7 +750,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); public static final BlockRegistryObject STRIPPED_WILLOW_WOOD = createWood("stripped_willow_wood"); - public static final BlockRegistryObject STRIPPED_REDWOOD_WOOD = createWood("stripped_redwood_wood"); public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_WOOD = createWood("stripped_witch_hazel_wood"); public static final BlockRegistryObject STRIPPED_ZELKOVA_WOOD = createWood("stripped_zelkova_wood"); public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 1c2633320f..ecf44ed564 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -11,8 +11,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); - public static final WoodType RAINBOW_EUCALYPTUS = register("rainbow_eucalyptus"); - public static final WoodType REDWOOD = register("redwood"); public static final WoodType SKYRIS = register("skyris"); public static final WoodType WILLOW = register("willow"); public static final WoodType WITCH_HAZEL = register("witch_hazel"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 6962e422a0..6920c5a89d 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -103,6 +103,10 @@ public enum BYGWoodTypes { RAINBOW_EUCALYPTUS("rainbow_eucalyptus", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_RAINBOW_EUCALYPTUS_SAPLING) .boatType(BYGBoatEntity.BYGType.RAINBOW_EUCALYPTUS) + .materialColor(MaterialColor.COLOR_GREEN)), + REDWOOD("redwood", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_REDWOOD_SAPLING) + .boatType(BYGBoatEntity.BYGType.REDWOOD) .materialColor(MaterialColor.COLOR_GREEN)); public static final Map LOOKUP; diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 3bfb3e33f3..25a6594677 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -448,29 +448,9 @@ public class BYGItems { // TODO palo verde BYGWoodTypes.PINE.init(); BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); + BYGWoodTypes.REDWOOD.init(); } - //Redwood Woodtype - public static final RegistryObject REDWOOD_SAPLING = createSaplingItem(BYGBlocks.REDWOOD_SAPLING); - public static final RegistryObject REDWOOD_LEAVES = createItem(BYGBlocks.REDWOOD_LEAVES); - public static final RegistryObject REDWOOD_LOG = createItem(BYGBlocks.REDWOOD_LOG); - public static final RegistryObject REDWOOD_WOOD = createItem(BYGBlocks.REDWOOD_WOOD); - public static final RegistryObject STRIPPED_REDWOOD_LOG = createItem(BYGBlocks.STRIPPED_REDWOOD_LOG); - public static final RegistryObject STRIPPED_REDWOOD_WOOD = createItem(BYGBlocks.STRIPPED_REDWOOD_WOOD); - public static final RegistryObject REDWOOD_PLANKS = createItem(BYGBlocks.REDWOOD_PLANKS); - public static final RegistryObject REDWOOD_BOOKSHELF = createItem(BYGBlocks.REDWOOD_BOOKSHELF); - public static final RegistryObject REDWOOD_CRAFTING_TABLE = createItem(BYGBlocks.REDWOOD_CRAFTING_TABLE); - public static final RegistryObject REDWOOD_STAIRS = createItem(BYGBlocks.REDWOOD_STAIRS); - public static final RegistryObject REDWOOD_SLAB = createItem(BYGBlocks.REDWOOD_SLAB); - public static final RegistryObject REDWOOD_FENCE = createItem(BYGBlocks.REDWOOD_FENCE); - public static final RegistryObject REDWOOD_FENCE_GATE = createItem(BYGBlocks.REDWOOD_FENCE_GATE); - public static final RegistryObject REDWOOD_DOOR = createItem(BYGBlocks.REDWOOD_DOOR); - public static final RegistryObject REDWOOD_TRAPDOOR = createItem(BYGBlocks.REDWOOD_TRAPDOOR); - public static final RegistryObject REDWOOD_PRESSURE_PLATE = createItem(BYGBlocks.REDWOOD_PRESSURE_PLATE); - public static final RegistryObject REDWOOD_BUTTON = createItem(BYGBlocks.REDWOOD_BUTTON); - public static final RegistryObject REDWOOD_SIGN = createSign("redwood_sign", BYGBlocks.REDWOOD_SIGN, BYGBlocks.REDWOOD_WALL_SIGN); - public static final RegistryObject REDWOOD_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.REDWOOD, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "redwood_boat"); - //Skyris Woodtype public static final RegistryObject SKYRIS_LEAVES_GREEN_APPLE = createItem(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE); public static final RegistryObject GREEN_APPLE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.35f).build())), "green_apple"); diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/redwood_bookshelf.json deleted file mode 100644 index 3e9bfe02a1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_button.json b/Common/src/main/resources/assets/byg/blockstates/redwood_button.json deleted file mode 100644 index ce55e72ec9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/redwood_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/redwood_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/redwood_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/redwood_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/redwood_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/redwood_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/redwood_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/redwood_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/redwood_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/redwood_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/redwood_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/redwood_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/redwood_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/redwood_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/redwood_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/redwood_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/redwood_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/redwood_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/redwood_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/redwood_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/redwood_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/redwood_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/redwood_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/redwood_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/redwood_crafting_table.json deleted file mode 100644 index da58d3008a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_door.json b/Common/src/main/resources/assets/byg/blockstates/redwood_door.json deleted file mode 100644 index 8357a1e614..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_fence.json b/Common/src/main/resources/assets/byg/blockstates/redwood_fence.json deleted file mode 100644 index 3197fd65ae..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/redwood_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/redwood_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/redwood_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/redwood_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/redwood_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/redwood_fence_gate.json deleted file mode 100644 index b2ee9c3632..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/redwood_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/redwood_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/redwood_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/redwood_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/redwood_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/redwood_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/redwood_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/redwood_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/redwood_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/redwood_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/redwood_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/redwood_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/redwood_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/redwood_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/redwood_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/redwood_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_leaves.json b/Common/src/main/resources/assets/byg/blockstates/redwood_leaves.json deleted file mode 100644 index 90db5f8181..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_log.json b/Common/src/main/resources/assets/byg/blockstates/redwood_log.json deleted file mode 100644 index 8bc654a7bf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/redwood_log" - }, - "axis=z": { - "model": "byg:block/redwood_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/redwood_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_planks.json b/Common/src/main/resources/assets/byg/blockstates/redwood_planks.json deleted file mode 100644 index 9da23beba0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/redwood_pressure_plate.json deleted file mode 100644 index f9d4902470..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/redwood_pressure_plate" - }, - "powered=true": { - "model": "byg:block/redwood_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_sapling.json b/Common/src/main/resources/assets/byg/blockstates/redwood_sapling.json deleted file mode 100644 index 25b273c8ea..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_slab.json b/Common/src/main/resources/assets/byg/blockstates/redwood_slab.json deleted file mode 100644 index d9a3e512d3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/redwood_slab" - }, - "type=top": { - "model": "byg:block/redwood_slab_top" - }, - "type=double": { - "model": "byg:block/redwood_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_stairs.json b/Common/src/main/resources/assets/byg/blockstates/redwood_stairs.json deleted file mode 100644 index 8ae8bf076a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/redwood_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/redwood_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/redwood_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/redwood_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/redwood_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/redwood_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/redwood_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/redwood_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/redwood_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/redwood_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/redwood_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/redwood_trapdoor.json deleted file mode 100644 index cc659b53ae..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/redwood_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/redwood_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/redwood_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/redwood_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/redwood_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/redwood_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/redwood_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/redwood_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/redwood_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/redwood_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_wood.json b/Common/src/main/resources/assets/byg/blockstates/redwood_wood.json deleted file mode 100644 index aa5150b33a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/redwood_wood" - }, - "axis=z": { - "model": "byg:block/redwood_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/redwood_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/redwood_bookshelf.json deleted file mode 100644 index 2ad13ef886..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/redwood_planks", - "up": "byg:block/redwood_planks", - "north": "byg:block/redwood_bookshelf", - "east": "byg:block/redwood_bookshelf", - "south": "byg:block/redwood_bookshelf", - "west": "byg:block/redwood_bookshelf", - "particle": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_button.json b/Common/src/main/resources/assets/byg/models/block/redwood_button.json deleted file mode 100644 index 4c1013ed32..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/redwood_button_inventory.json deleted file mode 100644 index 2e9ecffff0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/redwood_button_pressed.json deleted file mode 100644 index 11c6736a76..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/redwood_crafting_table.json deleted file mode 100644 index 7f014b960d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/redwood_crafting_table_front", - "down": "byg:block/redwood_planks", - "up": "byg:block/redwood_crafting_table_top", - "north": "byg:block/redwood_crafting_table_front", - "east": "byg:block/redwood_crafting_table_side", - "south": "byg:block/redwood_crafting_table_side", - "west": "byg:block/redwood_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom.json deleted file mode 100644 index d661cd130f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/redwood_door_bottom", - "top": "byg:block/redwood_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom_hinge.json deleted file mode 100644 index 0c8f8e3ca0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/redwood_door_bottom", - "top": "byg:block/redwood_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_door_top.json b/Common/src/main/resources/assets/byg/models/block/redwood_door_top.json deleted file mode 100644 index ea421c6de6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/redwood_door_bottom", - "top": "byg:block/redwood_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/redwood_door_top_hinge.json deleted file mode 100644 index 510599aba8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/redwood_door_bottom", - "top": "byg:block/redwood_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence.json deleted file mode 100644 index 43d41d1d09..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/redwood_planks", - "particle": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate.json deleted file mode 100644 index 639abb40b9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_open.json deleted file mode 100644 index efbd5a2749..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall.json deleted file mode 100644 index 75d353640d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall_open.json deleted file mode 100644 index 9daefa8b44..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_inventory.json deleted file mode 100644 index 9c0f25035a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/redwood_planks", - "particle": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_fence_post.json b/Common/src/main/resources/assets/byg/models/block/redwood_fence_post.json deleted file mode 100644 index 2b0bb23f4a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/redwood_planks", - "particle": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_leaves.json b/Common/src/main/resources/assets/byg/models/block/redwood_leaves.json deleted file mode 100644 index 476916a2e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/redwood_leaves", - "particle": "byg:block/redwood_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/redwood_leaves_snowy.json deleted file mode 100644 index a612bbbe30..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/redwood_leaves_snowy", - "up": "byg:block/redwood_leaves_snowy", - "north": "byg:block/redwood_leaves_snowy_side", - "east": "byg:block/redwood_leaves_snowy_side", - "south": "byg:block/redwood_leaves_snowy_side", - "west": "byg:block/redwood_leaves_snowy_side", - "particle": "byg:block/redwood_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_log.json b/Common/src/main/resources/assets/byg/models/block/redwood_log.json deleted file mode 100644 index cac02f4550..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/redwood_log_top", - "side": "byg:block/redwood_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_planks.json b/Common/src/main/resources/assets/byg/models/block/redwood_planks.json deleted file mode 100644 index 67795c2ff4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/redwood_planks", - "particle": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate.json deleted file mode 100644 index f888be6876..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate_down.json deleted file mode 100644 index 978976c51d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_sapling.json b/Common/src/main/resources/assets/byg/models/block/redwood_sapling.json deleted file mode 100644 index 5c951e54bc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/redwood_sapling", - "particle": "byg:block/redwood_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_slab.json b/Common/src/main/resources/assets/byg/models/block/redwood_slab.json deleted file mode 100644 index 5932e4b717..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/redwood_planks", - "top": "byg:block/redwood_planks", - "side": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_slab_top.json b/Common/src/main/resources/assets/byg/models/block/redwood_slab_top.json deleted file mode 100644 index 61c435e9d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/redwood_planks", - "top": "byg:block/redwood_planks", - "side": "byg:block/redwood_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_stairs.json b/Common/src/main/resources/assets/byg/models/block/redwood_stairs.json deleted file mode 100644 index 7f466ef10d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/redwood_planks", - "top": "byg:block/redwood_planks", - "side": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/redwood_stairs_inner.json deleted file mode 100644 index 5226d65792..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/redwood_planks", - "top": "byg:block/redwood_planks", - "side": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/redwood_stairs_outer.json deleted file mode 100644 index fb80e8b4ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/redwood_planks", - "top": "byg:block/redwood_planks", - "side": "byg:block/redwood_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_bottom.json deleted file mode 100644 index a6d5ca1eb9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/redwood_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_open.json deleted file mode 100644 index beb5171216..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/redwood_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_top.json deleted file mode 100644 index cfffbaf44e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/redwood_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/redwood_wood.json b/Common/src/main/resources/assets/byg/models/block/redwood_wood.json deleted file mode 100644 index 181dcbbc6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/redwood_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/redwood_log", - "particle": "byg:block/redwood_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_redwood_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_redwood_log.json deleted file mode 100644 index 3ca4f29e89..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_redwood_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_redwood_top", - "up": "byg:block/stripped_redwood_top", - "north": "byg:block/stripped_redwood_log", - "east": "byg:block/stripped_redwood_log", - "south": "byg:block/stripped_redwood_log", - "west": "byg:block/stripped_redwood_log", - "particle": "byg:block/stripped_redwood_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_redwood_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_redwood_wood.json deleted file mode 100644 index 7de7a7f097..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_redwood_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_redwood_log", - "particle": "byg:block/stripped_redwood_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_boat.json b/Common/src/main/resources/assets/byg/models/item/redwood_boat.json deleted file mode 100644 index a37987a366..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/redwood_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/redwood_bookshelf.json deleted file mode 100644 index a5758b8204..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_button.json b/Common/src/main/resources/assets/byg/models/item/redwood_button.json deleted file mode 100644 index bda4077e51..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/redwood_crafting_table.json deleted file mode 100644 index fee2d4f5c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_door.json b/Common/src/main/resources/assets/byg/models/item/redwood_door.json deleted file mode 100644 index c536754bbc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/redwood_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_fence.json b/Common/src/main/resources/assets/byg/models/item/redwood_fence.json deleted file mode 100644 index 7810218dd4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/redwood_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/redwood_fence_gate.json deleted file mode 100644 index fd793ef12f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_leaves.json b/Common/src/main/resources/assets/byg/models/item/redwood_leaves.json deleted file mode 100644 index 74c7db362c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_log.json b/Common/src/main/resources/assets/byg/models/item/redwood_log.json deleted file mode 100644 index 27d5cb3aa8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_planks.json b/Common/src/main/resources/assets/byg/models/item/redwood_planks.json deleted file mode 100644 index a4d980cd3c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/redwood_pressure_plate.json deleted file mode 100644 index 2ca2a09ce9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_sapling.json b/Common/src/main/resources/assets/byg/models/item/redwood_sapling.json deleted file mode 100644 index f09dd08ccd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/redwood_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_slab.json b/Common/src/main/resources/assets/byg/models/item/redwood_slab.json deleted file mode 100644 index 01296e4e52..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_stairs.json b/Common/src/main/resources/assets/byg/models/item/redwood_stairs.json deleted file mode 100644 index 4c5fdad9c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/redwood_trapdoor.json deleted file mode 100644 index 2f4154364e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_wood.json b/Common/src/main/resources/assets/byg/models/item/redwood_wood.json deleted file mode 100644 index 8fc54cef4f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/redwood_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_redwood_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_redwood_log.json deleted file mode 100644 index 27e2846a1d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_redwood_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_redwood_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_redwood_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_redwood_wood.json deleted file mode 100644 index 71f70cea94..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_redwood_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_redwood_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/redwood/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/redwood/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_door_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_sapling.png b/Common/src/main/resources/assets/byg/textures/block/redwood/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_leaves.png b/Common/src/main/resources/assets/byg/textures/block/redwood/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_log.png b/Common/src/main/resources/assets/byg/textures/block/redwood/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_log.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_log_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_planks.png b/Common/src/main/resources/assets/byg/textures/block/redwood/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_planks.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log.png b/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/redwood/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/redwood_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/redwood/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log_toppng.png b/Common/src/main/resources/assets/byg/textures/block/stripped_redwood_log_toppng.png deleted file mode 100644 index bc6be02df1cc60e5b76ebbe082204358f34a3db9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)Px$K}keGR5*=&lRa+3FbsvimL?!T&g7w)(y7P^y7v%0a8Ho~bO_SHKu|=606}O6 zi>mA-T3foB9}X=8_V(HZ)(%+8`Hw-{g|=w7 z%(?)~qui_3V)d$5gVQo-nX1SPV0Jj47fk*$OIml~xh&KrC5DCxz>{-#7phYcj?;9t ly5Hq<%9%07>Nlx&{{>l&zPwsgHPx$XGugsR5*=&lS@wnArQxZmZ2{;*~Ei2y_)ps!SCg#^c(cvUQA3)jLjyCj}BWs zEKt@q&IK4?_&+q_$5<$!X+*cJqk6>y{pIqGZ@DDnm<3l*TKAEs? z+gww82yA2Gx;ygRw)hL26E!D-vo^0YDQ7M3Uta)h;+Wtk*mu+EX&q5Z5@WO9<72Ws z41h7YXo&=1G`QjB=iHN!aV+PxwY`YTgPvUkxHTqo z&3dFhi6HVswn66f-ANg;KqIFa7xn1nw9UI?#>H|EsJP6U!zsh~*KWYHaY zEf5VT_z+mmX7K&Zx^4R=NrDv}_czi**|&$P%0Da%Cz9>TdoZwD(q Date: Wed, 25 May 2022 12:45:34 +0300 Subject: [PATCH 39/90] Generate jsons --- Common/src/generated/resources/.cache/cache | 288 ++++++++++++++++++ .../byg/blockstates/pine_bookshelf.json | 7 + .../assets/byg/blockstates/pine_button.json | 118 +++++++ .../byg/blockstates/pine_crafting_table.json | 7 + .../assets/byg/blockstates/pine_door.json | 124 ++++++++ .../assets/byg/blockstates/pine_fence.json | 48 +++ .../byg/blockstates/pine_fence_gate.json | 80 +++++ .../assets/byg/blockstates/pine_leaves.json | 7 + .../assets/byg/blockstates/pine_log.json | 16 + .../assets/byg/blockstates/pine_planks.json | 7 + .../byg/blockstates/pine_pressure_plate.json | 10 + .../assets/byg/blockstates/pine_sapling.json | 7 + .../assets/byg/blockstates/pine_slab.json | 13 + .../assets/byg/blockstates/pine_stairs.json | 209 +++++++++++++ .../assets/byg/blockstates/pine_trapdoor.json | 68 +++++ .../assets/byg/blockstates/pine_wood.json | 16 + .../rainbow_eucalyptus_bookshelf.json | 7 + .../rainbow_eucalyptus_button.json | 118 +++++++ .../rainbow_eucalyptus_crafting_table.json | 7 + .../blockstates/rainbow_eucalyptus_door.json | 124 ++++++++ .../blockstates/rainbow_eucalyptus_fence.json | 48 +++ .../rainbow_eucalyptus_fence_gate.json | 80 +++++ .../rainbow_eucalyptus_leaves.json | 7 + .../blockstates/rainbow_eucalyptus_log.json | 16 + .../rainbow_eucalyptus_planks.json | 7 + .../rainbow_eucalyptus_pressure_plate.json | 10 + .../rainbow_eucalyptus_sapling.json | 7 + .../blockstates/rainbow_eucalyptus_slab.json | 13 + .../rainbow_eucalyptus_stairs.json | 209 +++++++++++++ .../rainbow_eucalyptus_trapdoor.json | 68 +++++ .../blockstates/rainbow_eucalyptus_wood.json | 16 + .../byg/blockstates/redwood_bookshelf.json | 7 + .../byg/blockstates/redwood_button.json | 118 +++++++ .../blockstates/redwood_crafting_table.json | 7 + .../assets/byg/blockstates/redwood_door.json | 124 ++++++++ .../assets/byg/blockstates/redwood_fence.json | 48 +++ .../byg/blockstates/redwood_fence_gate.json | 80 +++++ .../byg/blockstates/redwood_leaves.json | 7 + .../assets/byg/blockstates/redwood_log.json | 16 + .../byg/blockstates/redwood_planks.json | 7 + .../blockstates/redwood_pressure_plate.json | 10 + .../byg/blockstates/redwood_sapling.json | 7 + .../assets/byg/blockstates/redwood_slab.json | 13 + .../byg/blockstates/redwood_stairs.json | 209 +++++++++++++ .../byg/blockstates/redwood_trapdoor.json | 68 +++++ .../assets/byg/blockstates/redwood_wood.json | 16 + .../byg/blockstates/stripped_pine_log.json | 16 + .../byg/blockstates/stripped_pine_wood.json | 16 + .../stripped_rainbow_eucalyptus_log.json | 16 + .../stripped_rainbow_eucalyptus_wood.json | 16 + .../byg/blockstates/stripped_redwood_log.json | 16 + .../blockstates/stripped_redwood_wood.json | 16 + .../byg/models/block/pine/bookshelf.json | 12 + .../assets/byg/models/block/pine/button.json | 6 + .../models/block/pine/button_inventory.json | 6 + .../byg/models/block/pine/button_pressed.json | 6 + .../byg/models/block/pine/crafting_table.json | 12 + .../byg/models/block/pine/door_bottom.json | 7 + .../models/block/pine/door_bottom_hinge.json | 7 + .../byg/models/block/pine/door_top.json | 7 + .../byg/models/block/pine/door_top_hinge.json | 7 + .../assets/byg/models/block/pine/fence.json | 7 + .../byg/models/block/pine/fence_gate.json | 6 + .../models/block/pine/fence_gate_open.json | 6 + .../models/block/pine/fence_gate_wall.json | 6 + .../block/pine/fence_gate_wall_open.json | 6 + .../byg/models/block/pine/fence_inv.json | 7 + .../byg/models/block/pine/fence_post.json | 7 + .../byg/models/block/pine/grower_item.json | 6 + .../assets/byg/models/block/pine/leaves.json | 12 + .../byg/models/block/pine/leaves_snowy.json | 12 + .../assets/byg/models/block/pine/log.json | 7 + .../assets/byg/models/block/pine/planks.json | 12 + .../byg/models/block/pine/pressure_plate.json | 6 + .../block/pine/pressure_plate_down.json | 6 + .../assets/byg/models/block/pine/slab.json | 8 + .../byg/models/block/pine/slab_top.json | 8 + .../assets/byg/models/block/pine/stairs.json | 8 + .../byg/models/block/pine/stairs_inner.json | 8 + .../byg/models/block/pine/stairs_outer.json | 8 + .../byg/models/block/pine/stripped_log.json | 7 + .../byg/models/block/pine/stripped_wood.json | 7 + .../byg/models/block/pine/trapdoor.json | 39 +++ .../models/block/pine/trapdoor_bottom.json | 6 + .../byg/models/block/pine/trapdoor_open.json | 6 + .../byg/models/block/pine/trapdoor_top.json | 6 + .../assets/byg/models/block/pine/wood.json | 7 + .../block/rainbow_eucalyptus/bookshelf.json | 12 + .../block/rainbow_eucalyptus/button.json | 6 + .../rainbow_eucalyptus/button_inventory.json | 6 + .../rainbow_eucalyptus/button_pressed.json | 6 + .../rainbow_eucalyptus/crafting_table.json | 12 + .../block/rainbow_eucalyptus/door_bottom.json | 7 + .../rainbow_eucalyptus/door_bottom_hinge.json | 7 + .../block/rainbow_eucalyptus/door_top.json | 7 + .../rainbow_eucalyptus/door_top_hinge.json | 7 + .../block/rainbow_eucalyptus/fence.json | 7 + .../block/rainbow_eucalyptus/fence_gate.json | 6 + .../rainbow_eucalyptus/fence_gate_open.json | 6 + .../rainbow_eucalyptus/fence_gate_wall.json | 6 + .../fence_gate_wall_open.json | 6 + .../block/rainbow_eucalyptus/fence_inv.json | 7 + .../block/rainbow_eucalyptus/fence_post.json | 7 + .../block/rainbow_eucalyptus/grower_item.json | 6 + .../block/rainbow_eucalyptus/leaves.json | 12 + .../rainbow_eucalyptus/leaves_snowy.json | 12 + .../models/block/rainbow_eucalyptus/log.json | 7 + .../block/rainbow_eucalyptus/planks.json | 12 + .../rainbow_eucalyptus/pressure_plate.json | 6 + .../pressure_plate_down.json | 6 + .../models/block/rainbow_eucalyptus/slab.json | 8 + .../block/rainbow_eucalyptus/slab_top.json | 8 + .../block/rainbow_eucalyptus/stairs.json | 8 + .../rainbow_eucalyptus/stairs_inner.json | 8 + .../rainbow_eucalyptus/stairs_outer.json | 8 + .../rainbow_eucalyptus/stripped_log.json | 7 + .../rainbow_eucalyptus/stripped_wood.json | 7 + .../block/rainbow_eucalyptus/trapdoor.json | 39 +++ .../rainbow_eucalyptus/trapdoor_bottom.json | 6 + .../rainbow_eucalyptus/trapdoor_open.json | 6 + .../rainbow_eucalyptus/trapdoor_top.json | 6 + .../models/block/rainbow_eucalyptus/wood.json | 7 + .../byg/models/block/redwood/bookshelf.json | 12 + .../byg/models/block/redwood/button.json | 6 + .../block/redwood/button_inventory.json | 6 + .../models/block/redwood/button_pressed.json | 6 + .../models/block/redwood/crafting_table.json | 12 + .../byg/models/block/redwood/door_bottom.json | 7 + .../block/redwood/door_bottom_hinge.json | 7 + .../byg/models/block/redwood/door_top.json | 7 + .../models/block/redwood/door_top_hinge.json | 7 + .../byg/models/block/redwood/fence.json | 7 + .../byg/models/block/redwood/fence_gate.json | 6 + .../models/block/redwood/fence_gate_open.json | 6 + .../models/block/redwood/fence_gate_wall.json | 6 + .../block/redwood/fence_gate_wall_open.json | 6 + .../byg/models/block/redwood/fence_inv.json | 7 + .../byg/models/block/redwood/fence_post.json | 7 + .../byg/models/block/redwood/grower_item.json | 6 + .../byg/models/block/redwood/leaves.json | 12 + .../models/block/redwood/leaves_snowy.json | 12 + .../assets/byg/models/block/redwood/log.json | 7 + .../byg/models/block/redwood/planks.json | 12 + .../models/block/redwood/pressure_plate.json | 6 + .../block/redwood/pressure_plate_down.json | 6 + .../assets/byg/models/block/redwood/slab.json | 8 + .../byg/models/block/redwood/slab_top.json | 8 + .../byg/models/block/redwood/stairs.json | 8 + .../models/block/redwood/stairs_inner.json | 8 + .../models/block/redwood/stairs_outer.json | 8 + .../models/block/redwood/stripped_log.json | 7 + .../models/block/redwood/stripped_wood.json | 7 + .../byg/models/block/redwood/trapdoor.json | 39 +++ .../models/block/redwood/trapdoor_bottom.json | 6 + .../models/block/redwood/trapdoor_open.json | 6 + .../models/block/redwood/trapdoor_top.json | 6 + .../assets/byg/models/block/redwood/wood.json | 7 + .../assets/byg/models/item/pine_boat.json | 6 + .../byg/models/item/pine_bookshelf.json | 39 +++ .../assets/byg/models/item/pine_button.json | 39 +++ .../byg/models/item/pine_crafting_table.json | 39 +++ .../assets/byg/models/item/pine_door.json | 6 + .../assets/byg/models/item/pine_fence.json | 39 +++ .../assets/byg/models/item/pine_leaves.json | 39 +++ .../assets/byg/models/item/pine_log.json | 39 +++ .../assets/byg/models/item/pine_planks.json | 39 +++ .../byg/models/item/pine_pressure_plate.json | 39 +++ .../assets/byg/models/item/pine_sapling.json | 6 + .../assets/byg/models/item/pine_slab.json | 39 +++ .../assets/byg/models/item/pine_stairs.json | 39 +++ .../assets/byg/models/item/pine_wood.json | 39 +++ .../models/item/rainbow_eucalyptus_boat.json | 6 + .../item/rainbow_eucalyptus_bookshelf.json | 39 +++ .../item/rainbow_eucalyptus_button.json | 39 +++ .../rainbow_eucalyptus_crafting_table.json | 39 +++ .../models/item/rainbow_eucalyptus_door.json | 6 + .../models/item/rainbow_eucalyptus_fence.json | 39 +++ .../item/rainbow_eucalyptus_leaves.json | 39 +++ .../models/item/rainbow_eucalyptus_log.json | 39 +++ .../item/rainbow_eucalyptus_planks.json | 39 +++ .../rainbow_eucalyptus_pressure_plate.json | 39 +++ .../item/rainbow_eucalyptus_sapling.json | 6 + .../models/item/rainbow_eucalyptus_slab.json | 39 +++ .../item/rainbow_eucalyptus_stairs.json | 39 +++ .../models/item/rainbow_eucalyptus_wood.json | 39 +++ .../assets/byg/models/item/redwood_boat.json | 6 + .../byg/models/item/redwood_bookshelf.json | 39 +++ .../byg/models/item/redwood_button.json | 39 +++ .../models/item/redwood_crafting_table.json | 39 +++ .../assets/byg/models/item/redwood_door.json | 6 + .../assets/byg/models/item/redwood_fence.json | 39 +++ .../byg/models/item/redwood_leaves.json | 39 +++ .../assets/byg/models/item/redwood_log.json | 39 +++ .../byg/models/item/redwood_planks.json | 39 +++ .../models/item/redwood_pressure_plate.json | 39 +++ .../byg/models/item/redwood_sapling.json | 6 + .../assets/byg/models/item/redwood_slab.json | 39 +++ .../byg/models/item/redwood_stairs.json | 39 +++ .../assets/byg/models/item/redwood_wood.json | 39 +++ .../byg/models/item/stripped_pine_log.json | 39 +++ .../byg/models/item/stripped_pine_wood.json | 39 +++ .../item/stripped_rainbow_eucalyptus_log.json | 39 +++ .../stripped_rainbow_eucalyptus_wood.json | 39 +++ .../byg/models/item/stripped_redwood_log.json | 39 +++ .../models/item/stripped_redwood_wood.json | 39 +++ .../recipes/byg.byg/wood/pine/boat.json | 34 +++ .../recipes/byg.byg/wood/pine/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/pine/button.json | 34 +++ .../byg.byg/wood/pine/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/pine/door.json | 34 +++ .../recipes/byg.byg/wood/pine/fence.json | 34 +++ .../recipes/byg.byg/wood/pine/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/pine/planks.json | 32 ++ .../byg.byg/wood/pine/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/pine/slab.json | 34 +++ .../recipes/byg.byg/wood/pine/stairs.json | 34 +++ .../recipes/byg.byg/wood/pine/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/pine/wood.json | 34 +++ .../byg.byg/wood/rainbow_eucalyptus/boat.json | 34 +++ .../wood/rainbow_eucalyptus/bookshelf.json | 34 +++ .../wood/rainbow_eucalyptus/button.json | 34 +++ .../rainbow_eucalyptus/crafting_table.json | 34 +++ .../byg.byg/wood/rainbow_eucalyptus/door.json | 34 +++ .../wood/rainbow_eucalyptus/fence.json | 34 +++ .../wood/rainbow_eucalyptus/fence_gate.json | 34 +++ .../wood/rainbow_eucalyptus/planks.json | 32 ++ .../rainbow_eucalyptus/pressure_plate.json | 34 +++ .../byg.byg/wood/rainbow_eucalyptus/slab.json | 34 +++ .../wood/rainbow_eucalyptus/stairs.json | 34 +++ .../wood/rainbow_eucalyptus/trapdoor.json | 34 +++ .../byg.byg/wood/rainbow_eucalyptus/wood.json | 34 +++ .../recipes/byg.byg/wood/redwood/boat.json | 34 +++ .../byg.byg/wood/redwood/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/redwood/button.json | 34 +++ .../byg.byg/wood/redwood/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/redwood/door.json | 34 +++ .../recipes/byg.byg/wood/redwood/fence.json | 34 +++ .../byg.byg/wood/redwood/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/redwood/planks.json | 32 ++ .../byg.byg/wood/redwood/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/redwood/slab.json | 34 +++ .../recipes/byg.byg/wood/redwood/stairs.json | 34 +++ .../byg.byg/wood/redwood/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/redwood/wood.json | 34 +++ .../data/byg/recipes/wood/pine/boat.json | 16 + .../data/byg/recipes/wood/pine/bookshelf.json | 20 ++ .../data/byg/recipes/wood/pine/button.json | 12 + .../byg/recipes/wood/pine/crafting_table.json | 16 + .../data/byg/recipes/wood/pine/door.json | 18 ++ .../data/byg/recipes/wood/pine/fence.json | 20 ++ .../byg/recipes/wood/pine/fence_gate.json | 19 ++ .../data/byg/recipes/wood/pine/planks.json | 13 + .../byg/recipes/wood/pine/pressure_plate.json | 15 + .../data/byg/recipes/wood/pine/slab.json | 16 + .../data/byg/recipes/wood/pine/stairs.json | 18 ++ .../data/byg/recipes/wood/pine/trapdoor.json | 17 ++ .../data/byg/recipes/wood/pine/wood.json | 17 ++ .../recipes/wood/rainbow_eucalyptus/boat.json | 16 + .../wood/rainbow_eucalyptus/bookshelf.json | 20 ++ .../wood/rainbow_eucalyptus/button.json | 12 + .../rainbow_eucalyptus/crafting_table.json | 16 + .../recipes/wood/rainbow_eucalyptus/door.json | 18 ++ .../wood/rainbow_eucalyptus/fence.json | 20 ++ .../wood/rainbow_eucalyptus/fence_gate.json | 19 ++ .../wood/rainbow_eucalyptus/planks.json | 13 + .../rainbow_eucalyptus/pressure_plate.json | 15 + .../recipes/wood/rainbow_eucalyptus/slab.json | 16 + .../wood/rainbow_eucalyptus/stairs.json | 18 ++ .../wood/rainbow_eucalyptus/trapdoor.json | 17 ++ .../recipes/wood/rainbow_eucalyptus/wood.json | 17 ++ .../data/byg/recipes/wood/redwood/boat.json | 16 + .../byg/recipes/wood/redwood/bookshelf.json | 20 ++ .../data/byg/recipes/wood/redwood/button.json | 12 + .../recipes/wood/redwood/crafting_table.json | 16 + .../data/byg/recipes/wood/redwood/door.json | 18 ++ .../data/byg/recipes/wood/redwood/fence.json | 20 ++ .../byg/recipes/wood/redwood/fence_gate.json | 19 ++ .../data/byg/recipes/wood/redwood/planks.json | 13 + .../recipes/wood/redwood/pressure_plate.json | 15 + .../data/byg/recipes/wood/redwood/slab.json | 16 + .../data/byg/recipes/wood/redwood/stairs.json | 18 ++ .../byg/recipes/wood/redwood/trapdoor.json | 17 ++ .../data/byg/recipes/wood/redwood/wood.json | 17 ++ .../data/byg/tags/blocks/wood/pine_logs.json | 9 + .../blocks/wood/rainbow_eucalyptus_logs.json | 9 + .../byg/tags/blocks/wood/redwood_logs.json | 9 + .../data/byg/tags/items/wood/pine_logs.json | 9 + .../items/wood/rainbow_eucalyptus_logs.json | 9 + .../byg/tags/items/wood/redwood_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 9 - .../byg/common/BYGCompostables.java | 6 - .../byg/common/BYGFlammables.java | 26 -- .../byg/common/BYGStrippables.java | 6 - .../byg/common/entity/boat/BYGBoatEntity.java | 6 - .../overworld/BYGOverworldTreeFeatures.java | 31 +- .../byg/blockstates/stripped_aspen_log.json | 16 - .../byg/blockstates/stripped_aspen_wood.json | 16 - .../byg/blockstates/stripped_baobab_log.json | 16 - .../byg/blockstates/stripped_baobab_wood.json | 16 - .../stripped_blue_enchanted_log.json | 16 - .../stripped_blue_enchanted_wood.json | 16 - .../byg/blockstates/stripped_bulbis_stem.json | 16 - .../byg/blockstates/stripped_bulbis_wood.json | 16 - .../byg/blockstates/stripped_cherry_log.json | 16 - .../byg/blockstates/stripped_cherry_wood.json | 16 - .../byg/blockstates/stripped_cika_log.json | 16 - .../byg/blockstates/stripped_cika_wood.json | 16 - .../byg/blockstates/stripped_cypress_log.json | 16 - .../blockstates/stripped_cypress_wood.json | 16 - .../byg/blockstates/stripped_ebony_log.json | 16 - .../byg/blockstates/stripped_ebony_wood.json | 16 - .../blockstates/stripped_embur_hyphae.json | 16 - .../byg/blockstates/stripped_embur_pedu.json | 16 - .../byg/blockstates/stripped_ether_log.json | 16 - .../byg/blockstates/stripped_ether_wood.json | 16 - .../byg/blockstates/stripped_fir_log.json | 16 - .../byg/blockstates/stripped_fir_wood.json | 16 - .../stripped_green_enchanted_log.json | 16 - .../stripped_green_enchanted_wood.json | 16 - .../byg/blockstates/stripped_holly_log.json | 16 - .../byg/blockstates/stripped_holly_wood.json | 16 - .../blockstates/stripped_mahogany_log.json | 16 - .../blockstates/stripped_mahogany_wood.json | 16 - .../blockstates/stripped_mangrove_log.json | 16 - .../blockstates/stripped_mangrove_wood.json | 16 - .../byg/blockstates/stripped_palm_log.json | 16 - .../byg/blockstates/stripped_palm_wood.json | 16 - .../byg/blockstates/stripped_pine_log.json | 16 - .../byg/blockstates/stripped_pine_wood.json | 16 - .../stripped_rainbow_eucalyptus_log.json | 16 - .../stripped_rainbow_eucalyptus_wood.json | 16 - .../byg/blockstates/stripped_redwood_log.json | 16 - .../blockstates/stripped_redwood_wood.json | 16 - .../providers/BYGBlockTagsProvider.java | 2 +- 334 files changed, 7089 insertions(+), 682 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_pine_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_pine_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_aspen_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_aspen_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_baobab_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_baobab_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_stem.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cherry_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cherry_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cika_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cika_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cypress_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_cypress_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_ebony_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_ebony_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_embur_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_embur_pedu.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_ether_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_ether_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_fir_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_fir_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_holly_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_holly_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_palm_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_palm_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_pine_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_pine_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_redwood_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_redwood_wood.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 43df258587..6fc8309bb4 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -234,6 +234,51 @@ d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json 7ea376d4c1145b038ecc0ca79323c3f058b761a6 assets/byg/blockstates/palm_stairs.json 6b58b359208df4fcf6bca915b553ff5651edcf74 assets/byg/blockstates/palm_trapdoor.json c457911d73a2555da1376d374044c87d794f090c assets/byg/blockstates/palm_wood.json +8842cf1eb81bdc4638df8c043ddc03a9f58fec74 assets/byg/blockstates/pine_bookshelf.json +94f66dd2c294da9bf5b9ba4887501310cef618fd assets/byg/blockstates/pine_button.json +70befa552262fc314d1942e62a11009466f75a13 assets/byg/blockstates/pine_crafting_table.json +c46bfb50138413abc29eb139f2cdba0b04407dc5 assets/byg/blockstates/pine_door.json +96c5d91fc6549443c4bcb7473c675eef82d3be5d assets/byg/blockstates/pine_fence.json +bb6d184c956d8c07badb71813d6f932b7708f04c assets/byg/blockstates/pine_fence_gate.json +82e27758a251e21a12151e21574a11c32e21436f assets/byg/blockstates/pine_leaves.json +873ad55f7764c4f69e1a391bf4257f711b7e060a assets/byg/blockstates/pine_log.json +36fda5cab1cf57cdbacd3a6bd5600737423406d2 assets/byg/blockstates/pine_planks.json +cd69f0063fff124a2c723fe08c3c43503189f5ae assets/byg/blockstates/pine_pressure_plate.json +449927b5a2fd20b5de00ba9e0f539b2765efba7f assets/byg/blockstates/pine_sapling.json +dea74144da93023c2b52f18f04904bf25bcd9a56 assets/byg/blockstates/pine_slab.json +ccf77c708569ce44463425705f001bef06ea6306 assets/byg/blockstates/pine_stairs.json +ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.json +5cb8488fa26b7fe8a2bec41747add021dc4153e1 assets/byg/blockstates/pine_wood.json +03c251ad1ceb61010086c8f3b1fcd412c30237f8 assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json +1ea6045c6c6262c54679b884e2225f66162e0a34 assets/byg/blockstates/rainbow_eucalyptus_button.json +8163991471aa2021036c26ecf77872d84d745c9c assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json +ae1c8951cd32c14207545989ea732b349502c5d7 assets/byg/blockstates/rainbow_eucalyptus_door.json +f7cada891a9aab1fc774925dfcdb74d1d579f508 assets/byg/blockstates/rainbow_eucalyptus_fence.json +185a0e3ba3b25a723a1f801caf390f0151ac1b4a assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json +f111f72f65a41f1219579ccb1dcea215699d58c3 assets/byg/blockstates/rainbow_eucalyptus_leaves.json +62b6d58e63f11a7e2c5890caab10dcccf4453f10 assets/byg/blockstates/rainbow_eucalyptus_log.json +e9688fc58b13569be30059f78d95e589b9151816 assets/byg/blockstates/rainbow_eucalyptus_planks.json +ac5373ec55bd933e36e266efbb58e02ed3583b67 assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json +9c697302648e720e473bc3b1b766552e311dfda8 assets/byg/blockstates/rainbow_eucalyptus_sapling.json +bf9934aef9c14b76e2f73375c9735e0011a7013c assets/byg/blockstates/rainbow_eucalyptus_slab.json +c98058ed16baf212aeb74011e71b3cef0eaeeee9 assets/byg/blockstates/rainbow_eucalyptus_stairs.json +647930adaef9dbf7ef55d592cc201a282788c3f4 assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json +899c56bb15a21a98c1aa2ae7abcc97c0caa1bcff assets/byg/blockstates/rainbow_eucalyptus_wood.json +aba79cac4c0de1e15ae9e6bbbbf9fd0cdd240e5d assets/byg/blockstates/redwood_bookshelf.json +4d4d22dc817363aad9a26dff8e6a2c02ef18fe0d assets/byg/blockstates/redwood_button.json +ae4b7c410795711d53c22e42853646c09c9ae84a assets/byg/blockstates/redwood_crafting_table.json +ebfec6deb713ba9fc507c4951191e3c999a3554c assets/byg/blockstates/redwood_door.json +200c1fc9a78ef1848b22ee371bd0ad75cd3c9d67 assets/byg/blockstates/redwood_fence.json +2c2a0273636cf0ff62ef21cd68a80b76b9154a5f assets/byg/blockstates/redwood_fence_gate.json +242ba34e6be3ce78e54982256206823c94f5b131 assets/byg/blockstates/redwood_leaves.json +d6e5a8a76f5276b9441e00abb8abff6e46d1801e assets/byg/blockstates/redwood_log.json +2c6bd5b2389f7251549833beca587abc49b48806 assets/byg/blockstates/redwood_planks.json +1397d911f77fbcde93d184699828162ab5944e06 assets/byg/blockstates/redwood_pressure_plate.json +a99e0b739010290bb7c3d10e39ae0a0768a8b357 assets/byg/blockstates/redwood_sapling.json +5b3c32baab17ce65c6788c558176ee12f5e0c6a3 assets/byg/blockstates/redwood_slab.json +aa37e62134eeb2ec5ddd1e6d1d11a7d45c9f2ebe assets/byg/blockstates/redwood_stairs.json +4a93cd3f90e44278c2e51d38cc981b76c33e6fa8 assets/byg/blockstates/redwood_trapdoor.json +08db9f7765cc53b997727d649f366dc944063c7f assets/byg/blockstates/redwood_wood.json 6566cf7f92aadb61d379dbcaef0473851bf3909e assets/byg/blockstates/stripped_aspen_log.json b7cef1857889d35956251b732f6dc286b30b7259 assets/byg/blockstates/stripped_aspen_wood.json 18e5da620766a46763e48460bf581be6047b4345 assets/byg/blockstates/stripped_baobab_log.json @@ -264,6 +309,12 @@ f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_e 3ad3465364f28027741f566d36acea26900b5956 assets/byg/blockstates/stripped_mangrove_wood.json 5d63ae2eafc9d9a3ded5950201a561ab51ea7402 assets/byg/blockstates/stripped_palm_log.json 3e380a2c54db98407de1c8a852bb8bba7ed32f64 assets/byg/blockstates/stripped_palm_wood.json +dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_log.json +0086696b42d7662139a276fc95a6280ed62b7e8a assets/byg/blockstates/stripped_pine_wood.json +507f729ba8e8cea738284534dc8b31c8fb769e68 assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json +ba8af5af681e7a4c1fd9fa346be84fca1d132a53 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json +67e9d9e8018903bb568c09d12767a0338c1bce68 assets/byg/blockstates/stripped_redwood_log.json +625fa0a3b477df439a0acf1655277bd844068167 assets/byg/blockstates/stripped_redwood_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -815,6 +866,111 @@ c96021f0305bcae8f8d5b28e3580b898f9b885fe assets/byg/models/block/palm/trapdoor_b 6779b160647712fb544f5d3279f5ba0a81bbce26 assets/byg/models/block/palm/trapdoor_open.json 85806014cd8d8bc66feabfbfad47ca246e70463d assets/byg/models/block/palm/trapdoor_top.json a0ff5273aa52b8d89e0645aba68d5f917a515f6b assets/byg/models/block/palm/wood.json +d99e634fbf06b52578f95fed65a8c70de8e20bd1 assets/byg/models/block/pine/bookshelf.json +4af8ae6f61ab700449c4efa91ea586a58cb6e165 assets/byg/models/block/pine/button.json +7f6d647c94ef21dbec7f7a4c356ea3889de172f8 assets/byg/models/block/pine/button_inventory.json +60d2a278cd42d4ebeffb6a2118de023c18579405 assets/byg/models/block/pine/button_pressed.json +d94c23ee22b8b160aaab471268e75e9f15eb3fcc assets/byg/models/block/pine/crafting_table.json +651b4505c693a42484fba712bcbaa7fd8092f753 assets/byg/models/block/pine/door_bottom.json +33b83ba09a2f36f9d125ec684ef41045bb147287 assets/byg/models/block/pine/door_bottom_hinge.json +51cf1df1357a6f0c9655aa0c2512cbded87cde0a assets/byg/models/block/pine/door_top.json +1ab90554955030e16a8ba90983bc0b8391f73a8b assets/byg/models/block/pine/door_top_hinge.json +33ed99a4941f4356aebb0d80e5e9b8e4f87cbb42 assets/byg/models/block/pine/fence.json +7e729228c564f70827c9f81b8c432b994d787ea9 assets/byg/models/block/pine/fence_gate.json +07f5880a1b28c9f19aa64d91539003d542679124 assets/byg/models/block/pine/fence_gate_open.json +c7a129d7c3b086cf7559474d101d1e99c6160ea8 assets/byg/models/block/pine/fence_gate_wall.json +e39c5acf3419fbb329afae4559fa581769bc3dd6 assets/byg/models/block/pine/fence_gate_wall_open.json +80a9ca9407adf3ca7aac87ebee512d494bbee27d assets/byg/models/block/pine/fence_inv.json +69ca360a8316da955ae88211a472393c96f86a98 assets/byg/models/block/pine/fence_post.json +ec602439e995c63d80924644c23aa19fc81c8158 assets/byg/models/block/pine/grower_item.json +ff2051addd1684bfdeb17b77ff49b7b72201b932 assets/byg/models/block/pine/leaves.json +a2cc2b1edc2c73dbb187da6cd99837fd395b3b2e assets/byg/models/block/pine/leaves_snowy.json +1056173174feb8e341342e7b784bde308469160c assets/byg/models/block/pine/log.json +c99cab0d28edb569e7fcfbb9b56cf7a4ab51064b assets/byg/models/block/pine/planks.json +f9a1b1e75e4b5df2eb03d5398628a56ba87a4d9d assets/byg/models/block/pine/pressure_plate.json +c5639b72db2422b06d8915dfd3b855a304a514e7 assets/byg/models/block/pine/pressure_plate_down.json +85c94add76039124b8d533d863ff79031f2ea525 assets/byg/models/block/pine/slab.json +4441b7ca282312f4f1a5f0e2591c9503f70d3386 assets/byg/models/block/pine/slab_top.json +6bcb7022cf360abd33f662d10374f81ee0ead557 assets/byg/models/block/pine/stairs.json +48cb58088cc67a85019bf10aa6519bb4a580a061 assets/byg/models/block/pine/stairs_inner.json +d9150073be35eb509213cf92e71e88edb268252b assets/byg/models/block/pine/stairs_outer.json +247315f1bb16240dad01a8fd55da1ef6151b9823 assets/byg/models/block/pine/stripped_log.json +9ca78752ac2794846b6877b2bd1175c5f2abbce7 assets/byg/models/block/pine/stripped_wood.json +fe36b59918baf0e0fd54834ff95ab1babbaf9cbd assets/byg/models/block/pine/trapdoor.json +26612a52df17b7a3b0faa99f7f0b5617838d4c4d assets/byg/models/block/pine/trapdoor_bottom.json +6b20555505980dcbfd39584ef029883c26be7d17 assets/byg/models/block/pine/trapdoor_open.json +bf660b7bbf0f0590d50da4fe652b3781b102068d assets/byg/models/block/pine/trapdoor_top.json +83538082034a242e4ce03c5acafca4bb0b3eb085 assets/byg/models/block/pine/wood.json +fc6b85bea6163bce40ec11b113f2809f53e03890 assets/byg/models/block/rainbow_eucalyptus/bookshelf.json +6b68e76b2c0b735cc7279ea51dbf6c89ca957d05 assets/byg/models/block/rainbow_eucalyptus/button.json +921c3eded354e901eb874b87e06f6cf391675be5 assets/byg/models/block/rainbow_eucalyptus/button_inventory.json +476c1ae6f1343b418bdd37ce2579a3d85a137bd5 assets/byg/models/block/rainbow_eucalyptus/button_pressed.json +41fb848723f32a32b8358f087b4106135a69346e assets/byg/models/block/rainbow_eucalyptus/crafting_table.json +55a28e75ef5802541959269ad014ef63c8b6aeb4 assets/byg/models/block/rainbow_eucalyptus/door_bottom.json +1e9060114cd8a83ac61dea10f650cb5f423d4b4c assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json +6289605a604c6c01596e1fa18e3ccc54d852bd9e assets/byg/models/block/rainbow_eucalyptus/door_top.json +60a12db60b18342b68778dadca1df7ac8a25ba84 assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json +43d99dcc5ea8a5057295a5db949068e3db195e9d assets/byg/models/block/rainbow_eucalyptus/fence.json +9288df40c561670d4b2759dd7d8bcc3fead8cca5 assets/byg/models/block/rainbow_eucalyptus/fence_gate.json +d4ce9dc4f614b515b82a14abd94cad7d450f241b assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json +6c4c071fca6879f7d9bec24dc9963eccdebe614d assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json +935c6228a9c3e7754852486dcbdafcc663e2cb78 assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json +015cb261df5eb515c8b38dab404aed1d5d2810bf assets/byg/models/block/rainbow_eucalyptus/fence_inv.json +942bb6841d7eda5e4d9b9de7473c06fc39848d1d assets/byg/models/block/rainbow_eucalyptus/fence_post.json +fdcad5fbaf61b6afb60d96aa24163af95f196a6c assets/byg/models/block/rainbow_eucalyptus/grower_item.json +3c1fa59a86d502734bb0f53b04b588842b271b3b assets/byg/models/block/rainbow_eucalyptus/leaves.json +6e44d3e23b6fe711c82aaefd8101397305e0d032 assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json +625555feb0a745ac4037afc66929885988008296 assets/byg/models/block/rainbow_eucalyptus/log.json +d13948e62ac414d46208e114c84a3b223ddc1048 assets/byg/models/block/rainbow_eucalyptus/planks.json +790b4249c297b7d8d893ba076f550b6364aaeadd assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json +3eba8300da3b54415678dc051ef495c1057f59e9 assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json +92df78f84617c95fd91993f0689351dea799284c assets/byg/models/block/rainbow_eucalyptus/slab.json +dc2d6a466adb3322f3a8e5569eb37a46841413e9 assets/byg/models/block/rainbow_eucalyptus/slab_top.json +770f556efe82f8aece831f7fea6941c217f78b25 assets/byg/models/block/rainbow_eucalyptus/stairs.json +28c9c8c34a27779e44b6af6315da4a1ba98e03e4 assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json +b57828f7441725fd3138a192d46e429e90f0d9b2 assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json +7b70e44b06d85c7e328ac7f9ed65a8f1766a993f assets/byg/models/block/rainbow_eucalyptus/stripped_log.json +76a8e3a0242e2d5f010db04ab88d12cafb2e3e56 assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json +bd453cf6d9a973cc05eca497d1e2b9873507ab0f assets/byg/models/block/rainbow_eucalyptus/trapdoor.json +d957291f73a03ab141686ec524c9075affc0e159 assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json +0e339b867aa9d1346515dd4563e5f6571fee0289 assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json +9e5bbaf520d42d9ebc00d51ca9857d5f357ff751 assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json +4d1db3cbc836b0682fefe852506eb3a71d656935 assets/byg/models/block/rainbow_eucalyptus/wood.json +0e5dc61a6bee3d6446e9c5501932b49a4b9a3bed assets/byg/models/block/redwood/bookshelf.json +62597a4689ed82c8a93e186eb107e46e19051840 assets/byg/models/block/redwood/button.json +4a5ab3e7e74a2d88ae6676063882a95e2a45b000 assets/byg/models/block/redwood/button_inventory.json +fc7994c04aa8427a9652953c032b64bc12e82f76 assets/byg/models/block/redwood/button_pressed.json +7da2f476a6c7898698ebcb03b3847691e173cba7 assets/byg/models/block/redwood/crafting_table.json +669aca11efff0e53c3bc87524fdae718a71fe912 assets/byg/models/block/redwood/door_bottom.json +2c769b92b827f3965708f24fa7100fa8288ae1e1 assets/byg/models/block/redwood/door_bottom_hinge.json +0bdef1d9d524efae43cb96b9cb7170b605d596d2 assets/byg/models/block/redwood/door_top.json +1dae3cdc089866fb878ddad8319dd7558f370e4b assets/byg/models/block/redwood/door_top_hinge.json +d0d3c2d38448d3a14e7dc276eb93573ec586fb23 assets/byg/models/block/redwood/fence.json +8b540d87647683815dafd3853059428c67290e3f assets/byg/models/block/redwood/fence_gate.json +44d9222a5894c9f412dc53223bd730bfdec10b52 assets/byg/models/block/redwood/fence_gate_open.json +48c9f09b557644b9a477eeb81a046a5a294ee3d2 assets/byg/models/block/redwood/fence_gate_wall.json +b9445a01055c5ef5758f6fd64463c5ac3a74c751 assets/byg/models/block/redwood/fence_gate_wall_open.json +e795542472cf9752cf492bc3706572fd203356c0 assets/byg/models/block/redwood/fence_inv.json +7558b37a188383d3534b88483d565795d635038f assets/byg/models/block/redwood/fence_post.json +9c9cceb3724a609ea3b4fc4b5074ac1465a49fb9 assets/byg/models/block/redwood/grower_item.json +69d96947d604565ab2987ce540f3cf099d4a6e94 assets/byg/models/block/redwood/leaves.json +7e0a42bfeaaa27446d5a985dfbb224293ded0a10 assets/byg/models/block/redwood/leaves_snowy.json +48a3e474de1fcefb0a1a77234a95f64a502d3c0e assets/byg/models/block/redwood/log.json +bb3ebb55ed613c372c05c64cdec881ad0cb74b3d assets/byg/models/block/redwood/planks.json +861d9dc4071f590543890ffc44588eb09106b36a assets/byg/models/block/redwood/pressure_plate.json +77da2cac360d8c6175c37a6b785493305f15c793 assets/byg/models/block/redwood/pressure_plate_down.json +15e4ffcc05ad3522c2486b1be63cf328bd3bafb5 assets/byg/models/block/redwood/slab.json +e2ac3f180cac701f5754a63cd140b73a5fe152a7 assets/byg/models/block/redwood/slab_top.json +3e20d8d44b26a20ae4bf256ceb0e28b5930bbbd3 assets/byg/models/block/redwood/stairs.json +20d8e4c21c80aa24cc61f27bfa1444e90d054417 assets/byg/models/block/redwood/stairs_inner.json +1c8659d7db7b60c6e01a66ae5e84bbea17b3ca97 assets/byg/models/block/redwood/stairs_outer.json +d24b712b8eb17c4834d12ee9cf1516823151cf51 assets/byg/models/block/redwood/stripped_log.json +a1b1d64d36cf817b36611e323b42d2750b053bba assets/byg/models/block/redwood/stripped_wood.json +bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/block/redwood/trapdoor.json +9a9cde020b938a575dddb0fc4473fdcb1ad0eb2b assets/byg/models/block/redwood/trapdoor_bottom.json +c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json +304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json +b92686745b20a33080cb669a5d23b8e8e0b4915c assets/byg/models/block/redwood/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -1032,6 +1188,48 @@ b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_pl 3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json 641ded0df8c74eff47030fbf79f9bc373d58fb9a assets/byg/models/item/palm_wood.json +1f65f41935457796948289ca9e84d97322821c02 assets/byg/models/item/pine_boat.json +71158e2ccf57dfc90fccc4b3c3218c74cd2ebb71 assets/byg/models/item/pine_bookshelf.json +2fcf1ffa10662a12b5adf2bcd154a8bf4025fa38 assets/byg/models/item/pine_button.json +d541974e54d7b6bda195849d4db35549081a041a assets/byg/models/item/pine_crafting_table.json +b687c999f9786e4ae51b8e99f79625f607930ccd assets/byg/models/item/pine_door.json +9985e192c1021b4c7f406c1000e7649490ac4fc2 assets/byg/models/item/pine_fence.json +1137af14ade751523450facaa608c9a92134ab6d assets/byg/models/item/pine_leaves.json +7d98dd94a72dd9d51d027fb33a698c5893aa84cc assets/byg/models/item/pine_log.json +fba9a9fd473aa9eb770970dda91e63855a5b1ccf assets/byg/models/item/pine_planks.json +ead4c243f01620607f91b993be085bcebb214cf2 assets/byg/models/item/pine_pressure_plate.json +9826776657d6273054a685e72caf5bbf30725957 assets/byg/models/item/pine_sapling.json +94d803b73017692991f46ea0371dc099a2362580 assets/byg/models/item/pine_slab.json +db6fe228afbac567186d648a6aec8262d1ee6a14 assets/byg/models/item/pine_stairs.json +c6353e6e98765496bc28411805a2040ed5b1c4c0 assets/byg/models/item/pine_wood.json +f3829eb3a12c1513c6e8f74f09c224988790086d assets/byg/models/item/rainbow_eucalyptus_boat.json +355ac7f53a857d8564a1ec89b66797216dab29d2 assets/byg/models/item/rainbow_eucalyptus_bookshelf.json +18a404c4088832ccb6d1bd55d0fd37f239b7d484 assets/byg/models/item/rainbow_eucalyptus_button.json +d10c2a42336f2b423cd096001238e55a7ff02095 assets/byg/models/item/rainbow_eucalyptus_crafting_table.json +39e3cd49c8c8d8c56e9db764703220908a171f54 assets/byg/models/item/rainbow_eucalyptus_door.json +e56ec0e81887b3784d1bed19ab6cba99947f2a58 assets/byg/models/item/rainbow_eucalyptus_fence.json +f226d4c0634aa06076e51c4dc5844d9d39f9b1d7 assets/byg/models/item/rainbow_eucalyptus_leaves.json +40a9046036b077d96734acc31634b14f16c50b7d assets/byg/models/item/rainbow_eucalyptus_log.json +9149e920185851a997066860ffa95c6ccf0fab4b assets/byg/models/item/rainbow_eucalyptus_planks.json +e845c8591c0f3300544797e09c45a5e787ded391 assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json +c1320dd256a425c6bf3df619c023f419b450eaeb assets/byg/models/item/rainbow_eucalyptus_sapling.json +caaf1f7aa3a6e42e3ac2c392e0d8256cccddc45c assets/byg/models/item/rainbow_eucalyptus_slab.json +dfd60e8e00afd42f7d88a1571ca5cfce155f80da assets/byg/models/item/rainbow_eucalyptus_stairs.json +6a38eafae03cae9d2c59409679a29deac2e79430 assets/byg/models/item/rainbow_eucalyptus_wood.json +7172ad671c1a08c35e27bcee2cef8fcc742ed278 assets/byg/models/item/redwood_boat.json +10a826907d0d0fb0595ddf2ad9c7568df2c59f79 assets/byg/models/item/redwood_bookshelf.json +b542b7ea6e8cad348d274157fea0ba80bc97bcac assets/byg/models/item/redwood_button.json +652550c75aef18aaa6b285afd2216e4af43cdca6 assets/byg/models/item/redwood_crafting_table.json +d4a311d8c584e1584b298dbfe331158624fa3a90 assets/byg/models/item/redwood_door.json +cca49455c6d9341aa6ff3d426b604b901992f028 assets/byg/models/item/redwood_fence.json +ebf4e0f3e7b9a74dd65fe879b3c073be4275f65a assets/byg/models/item/redwood_leaves.json +99778c2901f546c05ef6f5f5fce7d2f4819e1000 assets/byg/models/item/redwood_log.json +bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.json +2ccad4ae6350593f534f95af9360bc1e1c8f0de2 assets/byg/models/item/redwood_pressure_plate.json +4b4f90dfc96b44c0fa7551ffe2319002212f47b7 assets/byg/models/item/redwood_sapling.json +6bc04400c70e382e07b2b11fb981cf03727b9fa7 assets/byg/models/item/redwood_slab.json +68d710d727c23617894f7e70dfa8f788966e0911 assets/byg/models/item/redwood_stairs.json +30853e542fa6fd325fb9b54db516b5cf6c9ff71a assets/byg/models/item/redwood_wood.json 5eb73c5eff81302b6160bf99e9a395f4a881710a assets/byg/models/item/stripped_aspen_log.json d562898c1fd9a5390654b3360b230abe9f2fa357 assets/byg/models/item/stripped_aspen_wood.json 8f311f72bc1785f527a93215c655ee1b7997f4cf assets/byg/models/item/stripped_baobab_log.json @@ -1062,6 +1260,12 @@ be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_e 9db799e21b94bb971d782aa6642ba2f2a5d19d7f assets/byg/models/item/stripped_mangrove_wood.json 68eb2889df27becb11fe966b959e12d309f72e62 assets/byg/models/item/stripped_palm_log.json e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wood.json +4c39f243be0cd275197a200ed0ace2061d6b413c assets/byg/models/item/stripped_pine_log.json +22eed6f1c69f582927c07a9550251f5fa488e682 assets/byg/models/item/stripped_pine_wood.json +7cec0f98353fad65f9f5552bdb93fab566867635 assets/byg/models/item/stripped_rainbow_eucalyptus_log.json +03df4f31d47d36fd31fdc70002686f80dc3cb46f assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json +a86cac25410f11ccd308ab3cbf1217e18eb73895 assets/byg/models/item/stripped_redwood_log.json +db8a7ece8ae147b5b60a97bdaaa461d45185bb09 assets/byg/models/item/stripped_redwood_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -1267,6 +1471,45 @@ ded595aca78b27ff23c66f8d0584185e2764ffbc data/byg/advancements/recipes/byg.byg/w 40c85e634608fe669547035181bb8c43be47449f data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json a7caf367c6e2d197bc9d109a3fbc6e1e08bf26c5 data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json 835a274afc35e3c414eedfea46ff3490dd18a98f data/byg/advancements/recipes/byg.byg/wood/palm/wood.json +2601f00ad181a8241c41b4532a3b392ba5edb88b data/byg/advancements/recipes/byg.byg/wood/pine/boat.json +57646d0e8e563af6a06a6594f5d56c04166324c9 data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json +4329d9bfde52e9a0f1a200b4774f292502bb1677 data/byg/advancements/recipes/byg.byg/wood/pine/button.json +2e42c00057017485865d9d7de15270bb0488ef4b data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json +81e54278d436a6d512fd4398bf831eeab382bf62 data/byg/advancements/recipes/byg.byg/wood/pine/door.json +9c33fcee7a64cf151b8d382271a798bddcd94b1f data/byg/advancements/recipes/byg.byg/wood/pine/fence.json +b780788a4c989154d95b64d41aeb9c9cfc039e7f data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json +f35deddb85ba57119510eb56ebffd267c2ebd557 data/byg/advancements/recipes/byg.byg/wood/pine/planks.json +6cc95e191de6ba78c7555673c2c388d367223b30 data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json +afbaf9dab1f1c68e97f3ca96cd99dc5b7ba04467 data/byg/advancements/recipes/byg.byg/wood/pine/slab.json +daa17726d156767ba4cbd318e8100b4ddc859561 data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json +7b1a7bb2a7e121fa7ae90e6060047368f7b9fe00 data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json +661b37dee58147b43c2380768c7e0ebd885237c3 data/byg/advancements/recipes/byg.byg/wood/pine/wood.json +11a02212eb35328204dbe54673bc85fa73e49023 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json +a8e6b01c7ad678cec2989535165cdfbffee15890 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json +bc9cac67350bfa0000edc13ff435dafe5cb33ae0 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json +13278094485b41341a5e7adb2ea05608146a92f3 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json +c43e07541d41471e3f6392e31f2d9fe7f0a33811 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json +eadce2b6426ac50951f1aa732979c4019cff07f5 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json +7d8ce6ad138fddf06b324945be9a96ff4b9c3528 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json +e8b1b41d81dac589ecf150cf0e82d57faa4a107a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json +6227f328f4b447d2f36e97c8d72e5ccb76a66424 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json +7c133afaff2bb99301724866abb2596fa4da4cc4 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json +1fc9cd0e17b8ac252188befd4b65402ffbc3907d data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json +028ad9ae534f745665b580f11ea2d474eb2ff19a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json +68b1c6e22a781e22a90ecf025f18ecafdfc56b01 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json +5303b5bcda5e21c4d95e7b22859c6d61d90cb8d2 data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json +be69c1d9eb87be384841071b2f14ac154472f0f7 data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json +8cbf0f0522b814da6c47df545012edbbfa648b1b data/byg/advancements/recipes/byg.byg/wood/redwood/button.json +979c74fca934a4030705cce98237737564fb62e7 data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json +090a9d6d26f4b203b7c50aa3b2c3625120569d49 data/byg/advancements/recipes/byg.byg/wood/redwood/door.json +005d5d1488814462294bb7faced90409513eaed3 data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json +fbebcc53fe2b597c287a30264edda80ced5d92dd data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json +b7bcbecfef8c29248d0ca0f0c1d87a8b424e8fb9 data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json +f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json +4246aff3798c80f6f7548f1b83f1b5bc9a749525 data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json +48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json +f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json +ce977027d630e1d18301bbff458916b11621daa9 data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -1472,6 +1715,45 @@ e8fd0779a8eb0c996d45f66461d0391fd77b9d13 data/byg/recipes/wood/palm/slab.json 69ac3c83af773a6a3c9edeaf738306320f72f81c data/byg/recipes/wood/palm/stairs.json 6c73f4e9cd248aa03cf2caad2bf3293356429246 data/byg/recipes/wood/palm/trapdoor.json 2290d2f878ab2585629fc476886d1ed1a0b8899c data/byg/recipes/wood/palm/wood.json +36ab816316e9b1e2c8ac41f80e2d48612302a5f5 data/byg/recipes/wood/pine/boat.json +b467b0cee4750a02504e2841f552bb70366c534b data/byg/recipes/wood/pine/bookshelf.json +d70141a9e3f6abc78ea5826d4e9079d05e80cbb3 data/byg/recipes/wood/pine/button.json +47d74161d4c0e71724130894f512264e75c0891a data/byg/recipes/wood/pine/crafting_table.json +7fb68840968c00f6bfcf0a86c727b06fa5b21d5e data/byg/recipes/wood/pine/door.json +0a2818245b716a54d048bae968fe0978a5ac5aac data/byg/recipes/wood/pine/fence.json +7550eed2ed6fcf35f19c09f6828ba7b517c51074 data/byg/recipes/wood/pine/fence_gate.json +cb2f512e683654d888dba39147e7aaddde714747 data/byg/recipes/wood/pine/planks.json +aa599d4693145fbe6640eb641a8e6a146aa1979c data/byg/recipes/wood/pine/pressure_plate.json +52a3c129ef1b5eee710d0c93f1075a76dc3661bc data/byg/recipes/wood/pine/slab.json +f8c29c9be3523c673696e74de77789e8e963c913 data/byg/recipes/wood/pine/stairs.json +1633e25a0a403bb814a843fb69091912be0b79dc data/byg/recipes/wood/pine/trapdoor.json +c3384ce5f0653c602e061e84f02ffcc558f6d80d data/byg/recipes/wood/pine/wood.json +a2ac2986c80994b03e07782fe3aa14fce9fb52a3 data/byg/recipes/wood/rainbow_eucalyptus/boat.json +cc3bc70c4f94d4fe78810876d6aa3e53666daf6c data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json +d006ff219554dc0604eba87f187c6bcdd1175292 data/byg/recipes/wood/rainbow_eucalyptus/button.json +6a1569afe56172370459a5e4edc475ac384c6240 data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json +9c321fb29c2cd975b6be0f2ff8089c23fed4a5a3 data/byg/recipes/wood/rainbow_eucalyptus/door.json +c30eed790cfe5039e70d933e3a4b295732094d5c data/byg/recipes/wood/rainbow_eucalyptus/fence.json +ed5e3811254a16559b251aa022b17482acd88dc4 data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json +15ed565185c7121779d81681d21786827f7da2a9 data/byg/recipes/wood/rainbow_eucalyptus/planks.json +b9fc1e92cc85df382bafe5ac98f4aec5be98bb78 data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json +2fa6aa1168283859d5c8f6838d63b5fa4cd02637 data/byg/recipes/wood/rainbow_eucalyptus/slab.json +bd4f1e62614b1103516a6a14161ca565e6c9239a data/byg/recipes/wood/rainbow_eucalyptus/stairs.json +1d588f35d134aefdde6bd3218c669e2b4f89981d data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json +75d87d74b45ebf91db21b3899b76efee6ef07f37 data/byg/recipes/wood/rainbow_eucalyptus/wood.json +a27297d25d52fcafdaf6f312e16ac71e10fcb7f4 data/byg/recipes/wood/redwood/boat.json +f7a5ae59fa7ed24c1c058c763f1091ec2e4f7781 data/byg/recipes/wood/redwood/bookshelf.json +22dc47db0d6ff52a8d64533ba0357e0a17a16d97 data/byg/recipes/wood/redwood/button.json +d214073ed8a1c702de6a76839e0cf1dd99795f29 data/byg/recipes/wood/redwood/crafting_table.json +8672046a5beeb30c27e0713d4884711af402915d data/byg/recipes/wood/redwood/door.json +8db0cac9701161e68d6136c2a544eeaa50450919 data/byg/recipes/wood/redwood/fence.json +530770b1a0ff8a804ebd3eeca5eae2cbe47c1a25 data/byg/recipes/wood/redwood/fence_gate.json +8b57e4a5d837d62b149b51643670eade7e7ef8cc data/byg/recipes/wood/redwood/planks.json +a264a4076ca765cfce6f1a4de2c78fb7808bb11e data/byg/recipes/wood/redwood/pressure_plate.json +e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json +5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json +87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json +77068fa435484d2dfd95ba3a45308c36d6593157 data/byg/recipes/wood/redwood/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1612,6 +1894,9 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant 095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json 5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json 701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json +be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json +a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json +9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json @@ -1628,4 +1913,7 @@ be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchante d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json 5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json +ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json +52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json +4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/pine_bookshelf.json new file mode 100644 index 0000000000..e7f6246aa3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_button.json b/Common/src/generated/resources/assets/byg/blockstates/pine_button.json new file mode 100644 index 0000000000..9cd4762912 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/pine/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/pine/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/pine/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/pine/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/pine/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/pine/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/pine/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/pine/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/pine/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/pine_crafting_table.json new file mode 100644 index 0000000000..791b4fdce1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_door.json b/Common/src/generated/resources/assets/byg/blockstates/pine_door.json new file mode 100644 index 0000000000..2e632486e7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json b/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json new file mode 100644 index 0000000000..166ad7b260 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/pine/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/pine/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/pine/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/pine/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/pine/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json new file mode 100644 index 0000000000..d302d8c626 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/pine_leaves.json new file mode 100644 index 0000000000..f0879a1f3c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_log.json b/Common/src/generated/resources/assets/byg/blockstates/pine_log.json new file mode 100644 index 0000000000..90d9cbced8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/pine/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/pine/log" + }, + "axis=z": { + "model": "byg:block/pine/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_planks.json b/Common/src/generated/resources/assets/byg/blockstates/pine_planks.json new file mode 100644 index 0000000000..63710fba12 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/pine_pressure_plate.json new file mode 100644 index 0000000000..e42a9096c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/pine/pressure_plate" + }, + "powered=true": { + "model": "byg:block/pine/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/pine_sapling.json new file mode 100644 index 0000000000..841bc9536a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json b/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json new file mode 100644 index 0000000000..38f4ab8ecd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/pine/slab_top" + }, + "type=bottom": { + "model": "byg:block/pine/slab" + }, + "type=double": { + "model": "byg:block/pine/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json new file mode 100644 index 0000000000..8adb849c0c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json new file mode 100644 index 0000000000..f4b95a551b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/pine/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/pine/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/pine/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/pine/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_wood.json b/Common/src/generated/resources/assets/byg/blockstates/pine_wood.json new file mode 100644 index 0000000000..010e0c2464 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/pine/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/pine/wood" + }, + "axis=z": { + "model": "byg:block/pine/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json new file mode 100644 index 0000000000..980a71d612 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json new file mode 100644 index 0000000000..5ed8ffd426 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json new file mode 100644 index 0000000000..d660f65ca7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json new file mode 100644 index 0000000000..8481275ea1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json new file mode 100644 index 0000000000..84d613518f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/rainbow_eucalyptus/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/rainbow_eucalyptus/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/rainbow_eucalyptus/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/rainbow_eucalyptus/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/rainbow_eucalyptus/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json new file mode 100644 index 0000000000..927252810d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json new file mode 100644 index 0000000000..7fd11e4ecf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json new file mode 100644 index 0000000000..32a7326355 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/rainbow_eucalyptus/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/rainbow_eucalyptus/log" + }, + "axis=z": { + "model": "byg:block/rainbow_eucalyptus/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json new file mode 100644 index 0000000000..616e89a37d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json new file mode 100644 index 0000000000..6e33fd4f44 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/rainbow_eucalyptus/pressure_plate" + }, + "powered=true": { + "model": "byg:block/rainbow_eucalyptus/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json new file mode 100644 index 0000000000..9a6d01b078 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json new file mode 100644 index 0000000000..695e9e62d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/rainbow_eucalyptus/slab_top" + }, + "type=bottom": { + "model": "byg:block/rainbow_eucalyptus/slab" + }, + "type=double": { + "model": "byg:block/rainbow_eucalyptus/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json new file mode 100644 index 0000000000..28c69c77b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json new file mode 100644 index 0000000000..4009d6c630 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json new file mode 100644 index 0000000000..3ef32a6303 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/rainbow_eucalyptus/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/rainbow_eucalyptus/wood" + }, + "axis=z": { + "model": "byg:block/rainbow_eucalyptus/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_bookshelf.json new file mode 100644 index 0000000000..cb38db2e7a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json new file mode 100644 index 0000000000..f08e06cc03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/redwood/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/redwood/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/redwood/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/redwood/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/redwood/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/redwood/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/redwood/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/redwood/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/redwood/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_crafting_table.json new file mode 100644 index 0000000000..b7c3069aec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json new file mode 100644 index 0000000000..40b08cf6f5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json new file mode 100644 index 0000000000..954ef33dcc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/redwood/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/redwood/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/redwood/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/redwood/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/redwood/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json new file mode 100644 index 0000000000..704abd82d9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_leaves.json new file mode 100644 index 0000000000..090a70e835 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_log.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_log.json new file mode 100644 index 0000000000..6c9a00b570 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/redwood/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/redwood/log" + }, + "axis=z": { + "model": "byg:block/redwood/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_planks.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_planks.json new file mode 100644 index 0000000000..e7d0bbad2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_pressure_plate.json new file mode 100644 index 0000000000..3b32e45081 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/redwood/pressure_plate" + }, + "powered=true": { + "model": "byg:block/redwood/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_sapling.json new file mode 100644 index 0000000000..9ae2f0b099 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json new file mode 100644 index 0000000000..5026711e6b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/redwood/slab_top" + }, + "type=bottom": { + "model": "byg:block/redwood/slab" + }, + "type=double": { + "model": "byg:block/redwood/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json new file mode 100644 index 0000000000..5b9140664f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json new file mode 100644 index 0000000000..20152d7a57 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_wood.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_wood.json new file mode 100644 index 0000000000..876539a682 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/redwood/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/redwood/wood" + }, + "axis=z": { + "model": "byg:block/redwood/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_log.json new file mode 100644 index 0000000000..16c0820268 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/pine/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/pine/stripped_log" + }, + "axis=z": { + "model": "byg:block/pine/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_wood.json new file mode 100644 index 0000000000..12fdd4eaf0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_pine_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/pine/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/pine/stripped_wood" + }, + "axis=z": { + "model": "byg:block/pine/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json new file mode 100644 index 0000000000..f6c7d2c31c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/rainbow_eucalyptus/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/rainbow_eucalyptus/stripped_log" + }, + "axis=z": { + "model": "byg:block/rainbow_eucalyptus/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json new file mode 100644 index 0000000000..466456ccfc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/rainbow_eucalyptus/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/rainbow_eucalyptus/stripped_wood" + }, + "axis=z": { + "model": "byg:block/rainbow_eucalyptus/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_log.json new file mode 100644 index 0000000000..86abfb6f0c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/redwood/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/redwood/stripped_log" + }, + "axis=z": { + "model": "byg:block/redwood/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_wood.json new file mode 100644 index 0000000000..130a691baf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_redwood_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/redwood/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/redwood/stripped_wood" + }, + "axis=z": { + "model": "byg:block/redwood/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json new file mode 100644 index 0000000000..93e8a7c48e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/pine/planks", + "up": "byg:block/pine/planks", + "north": "byg:block/pine/bookshelf", + "south": "byg:block/pine/bookshelf", + "east": "byg:block/pine/bookshelf", + "west": "byg:block/pine/bookshelf", + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/button.json b/Common/src/generated/resources/assets/byg/models/block/pine/button.json new file mode 100644 index 0000000000..81d84cb9a6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/pine/button_inventory.json new file mode 100644 index 0000000000..e0b84e824c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/pine/button_pressed.json new file mode 100644 index 0000000000..6d71b4510e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json new file mode 100644 index 0000000000..a11b3f13ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/pine/planks", + "up": "byg:block/pine/crafting_table_top", + "north": "byg:block/pine/crafting_table_front", + "south": "byg:block/pine/crafting_table_side", + "east": "byg:block/pine/crafting_table_side", + "west": "byg:block/pine/crafting_table_front", + "particle": "byg:block/pine/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json new file mode 100644 index 0000000000..d78fd13811 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json new file mode 100644 index 0000000000..a3e8daa0e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_top.json b/Common/src/generated/resources/assets/byg/models/block/pine/door_top.json new file mode 100644 index 0000000000..12f9af552a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json new file mode 100644 index 0000000000..65d5d35cda --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence.json new file mode 100644 index 0000000000..42cdbb87e2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/pine/planks", + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate.json new file mode 100644 index 0000000000..3a9f83040a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_open.json new file mode 100644 index 0000000000..bb6278b428 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall.json new file mode 100644 index 0000000000..735985a5b0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall_open.json new file mode 100644 index 0000000000..ea2c8dbe89 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json new file mode 100644 index 0000000000..2e21aeb901 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/pine/planks", + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json new file mode 100644 index 0000000000..c5e23d2562 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/pine/planks", + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/pine/grower_item.json new file mode 100644 index 0000000000..52703e3dbd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/pine/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json b/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json new file mode 100644 index 0000000000..f648088629 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/pine/leaves", + "up": "byg:block/pine/leaves", + "north": "byg:block/pine/leaves", + "south": "byg:block/pine/leaves", + "east": "byg:block/pine/leaves", + "west": "byg:block/pine/leaves", + "particle": "byg:block/pine/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json new file mode 100644 index 0000000000..4b45a43508 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/pine/leaves_snowy", + "up": "byg:block/pine/leaves_snowy", + "north": "byg:block/pine/leaves_snowy_side", + "south": "byg:block/pine/leaves_snowy_side", + "east": "byg:block/pine/leaves_snowy_side", + "west": "byg:block/pine/leaves_snowy_side", + "particle": "byg:block/pine/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/log.json b/Common/src/generated/resources/assets/byg/models/block/pine/log.json new file mode 100644 index 0000000000..5d0b3d7034 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/pine/log", + "end": "byg:block/pine/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/planks.json b/Common/src/generated/resources/assets/byg/models/block/pine/planks.json new file mode 100644 index 0000000000..68b3815bfd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/pine/planks", + "up": "byg:block/pine/planks", + "north": "byg:block/pine/planks", + "south": "byg:block/pine/planks", + "east": "byg:block/pine/planks", + "west": "byg:block/pine/planks", + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate.json new file mode 100644 index 0000000000..099eb7c0f6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate_down.json new file mode 100644 index 0000000000..244f7dd7fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/slab.json b/Common/src/generated/resources/assets/byg/models/block/pine/slab.json new file mode 100644 index 0000000000..dcab917ee5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/pine/planks", + "bottom": "byg:block/pine/planks", + "top": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json new file mode 100644 index 0000000000..927ec51989 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/pine/planks", + "bottom": "byg:block/pine/planks", + "top": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json new file mode 100644 index 0000000000..799716f1f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/pine/planks", + "bottom": "byg:block/pine/planks", + "top": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json new file mode 100644 index 0000000000..acfb0e2af7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/pine/planks", + "bottom": "byg:block/pine/planks", + "top": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json new file mode 100644 index 0000000000..df54aa6a97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/pine/planks", + "bottom": "byg:block/pine/planks", + "top": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json new file mode 100644 index 0000000000..64399d4546 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/pine/stripped_log", + "end": "byg:block/pine/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_wood.json new file mode 100644 index 0000000000..185104a4ad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/pine/stripped_log", + "particle": "byg:block/pine/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json new file mode 100644 index 0000000000..7e91f1fa18 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_bottom.json new file mode 100644 index 0000000000..3ffe942471 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/pine/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_open.json new file mode 100644 index 0000000000..e2b9dbf096 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/pine/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_top.json new file mode 100644 index 0000000000..d689ee68d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/pine/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/wood.json b/Common/src/generated/resources/assets/byg/models/block/pine/wood.json new file mode 100644 index 0000000000..c3dccef590 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/pine/log", + "particle": "byg:block/pine/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json new file mode 100644 index 0000000000..24469add33 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/rainbow_eucalyptus/planks", + "up": "byg:block/rainbow_eucalyptus/planks", + "north": "byg:block/rainbow_eucalyptus/bookshelf", + "south": "byg:block/rainbow_eucalyptus/bookshelf", + "east": "byg:block/rainbow_eucalyptus/bookshelf", + "west": "byg:block/rainbow_eucalyptus/bookshelf", + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button.json new file mode 100644 index 0000000000..d006269000 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_inventory.json new file mode 100644 index 0000000000..f256de556b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_pressed.json new file mode 100644 index 0000000000..0702ab5adb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json new file mode 100644 index 0000000000..08b8385b80 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/rainbow_eucalyptus/planks", + "up": "byg:block/rainbow_eucalyptus/crafting_table_top", + "north": "byg:block/rainbow_eucalyptus/crafting_table_front", + "south": "byg:block/rainbow_eucalyptus/crafting_table_side", + "east": "byg:block/rainbow_eucalyptus/crafting_table_side", + "west": "byg:block/rainbow_eucalyptus/crafting_table_front", + "particle": "byg:block/rainbow_eucalyptus/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json new file mode 100644 index 0000000000..3f939d2a5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json new file mode 100644 index 0000000000..2644c598c9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json new file mode 100644 index 0000000000..7e5bfd9616 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json new file mode 100644 index 0000000000..8afed4ece7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json new file mode 100644 index 0000000000..542fb94960 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks", + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate.json new file mode 100644 index 0000000000..c4de5e4399 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json new file mode 100644 index 0000000000..3d061365f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json new file mode 100644 index 0000000000..ddd6ca6603 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json new file mode 100644 index 0000000000..77f4d784e9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json new file mode 100644 index 0000000000..9eedd7693d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks", + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json new file mode 100644 index 0000000000..4f2e38b7a2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks", + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/grower_item.json new file mode 100644 index 0000000000..aa1d47e6d8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/rainbow_eucalyptus/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json new file mode 100644 index 0000000000..30bd10007b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/rainbow_eucalyptus/leaves", + "up": "byg:block/rainbow_eucalyptus/leaves", + "north": "byg:block/rainbow_eucalyptus/leaves", + "south": "byg:block/rainbow_eucalyptus/leaves", + "east": "byg:block/rainbow_eucalyptus/leaves", + "west": "byg:block/rainbow_eucalyptus/leaves", + "particle": "byg:block/rainbow_eucalyptus/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json new file mode 100644 index 0000000000..d617fb3fa9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/rainbow_eucalyptus/leaves_snowy", + "up": "byg:block/rainbow_eucalyptus/leaves_snowy", + "north": "byg:block/rainbow_eucalyptus/leaves_snowy_side", + "south": "byg:block/rainbow_eucalyptus/leaves_snowy_side", + "east": "byg:block/rainbow_eucalyptus/leaves_snowy_side", + "west": "byg:block/rainbow_eucalyptus/leaves_snowy_side", + "particle": "byg:block/rainbow_eucalyptus/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json new file mode 100644 index 0000000000..94e0faedb8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/rainbow_eucalyptus/log", + "end": "byg:block/rainbow_eucalyptus/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json new file mode 100644 index 0000000000..051d77fa00 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/rainbow_eucalyptus/planks", + "up": "byg:block/rainbow_eucalyptus/planks", + "north": "byg:block/rainbow_eucalyptus/planks", + "south": "byg:block/rainbow_eucalyptus/planks", + "east": "byg:block/rainbow_eucalyptus/planks", + "west": "byg:block/rainbow_eucalyptus/planks", + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json new file mode 100644 index 0000000000..7220350e14 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json new file mode 100644 index 0000000000..1a027e77be --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json new file mode 100644 index 0000000000..ef97e4fe38 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/rainbow_eucalyptus/planks", + "bottom": "byg:block/rainbow_eucalyptus/planks", + "top": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json new file mode 100644 index 0000000000..78da0975c5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/rainbow_eucalyptus/planks", + "bottom": "byg:block/rainbow_eucalyptus/planks", + "top": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json new file mode 100644 index 0000000000..6ee764e13c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/rainbow_eucalyptus/planks", + "bottom": "byg:block/rainbow_eucalyptus/planks", + "top": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json new file mode 100644 index 0000000000..8b43f5d39c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/rainbow_eucalyptus/planks", + "bottom": "byg:block/rainbow_eucalyptus/planks", + "top": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json new file mode 100644 index 0000000000..bb898e96b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/rainbow_eucalyptus/planks", + "bottom": "byg:block/rainbow_eucalyptus/planks", + "top": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json new file mode 100644 index 0000000000..e0cd626a38 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/rainbow_eucalyptus/stripped_log", + "end": "byg:block/rainbow_eucalyptus/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json new file mode 100644 index 0000000000..117075c5d6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/rainbow_eucalyptus/stripped_log", + "particle": "byg:block/rainbow_eucalyptus/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json new file mode 100644 index 0000000000..3f541f0a4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json new file mode 100644 index 0000000000..694760d289 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json new file mode 100644 index 0000000000..6f5c796cec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json new file mode 100644 index 0000000000..38e844cc23 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/rainbow_eucalyptus/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/wood.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/wood.json new file mode 100644 index 0000000000..b190483b1f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/rainbow_eucalyptus/log", + "particle": "byg:block/rainbow_eucalyptus/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json new file mode 100644 index 0000000000..c7a758ccbc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/redwood/planks", + "up": "byg:block/redwood/planks", + "north": "byg:block/redwood/bookshelf", + "south": "byg:block/redwood/bookshelf", + "east": "byg:block/redwood/bookshelf", + "west": "byg:block/redwood/bookshelf", + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/button.json b/Common/src/generated/resources/assets/byg/models/block/redwood/button.json new file mode 100644 index 0000000000..cdaba0e3bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/redwood/button_inventory.json new file mode 100644 index 0000000000..cc2441c694 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/redwood/button_pressed.json new file mode 100644 index 0000000000..6fc448330f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json new file mode 100644 index 0000000000..308edebc54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/redwood/planks", + "up": "byg:block/redwood/crafting_table_top", + "north": "byg:block/redwood/crafting_table_front", + "south": "byg:block/redwood/crafting_table_side", + "east": "byg:block/redwood/crafting_table_side", + "west": "byg:block/redwood/crafting_table_front", + "particle": "byg:block/redwood/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json new file mode 100644 index 0000000000..8924859e74 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json new file mode 100644 index 0000000000..0c8e6c8922 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json new file mode 100644 index 0000000000..205d9f7176 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json new file mode 100644 index 0000000000..49ddd28714 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json new file mode 100644 index 0000000000..598b95de8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/redwood/planks", + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate.json new file mode 100644 index 0000000000..9d972c0a0b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_open.json new file mode 100644 index 0000000000..091e38a8c0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall.json new file mode 100644 index 0000000000..bb6028f44c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall_open.json new file mode 100644 index 0000000000..a60284fdae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json new file mode 100644 index 0000000000..2c2e27c2d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/redwood/planks", + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json new file mode 100644 index 0000000000..2bfe6a384e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/redwood/planks", + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/redwood/grower_item.json new file mode 100644 index 0000000000..12777c34a3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/redwood/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json new file mode 100644 index 0000000000..621f34a0b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/redwood/leaves", + "up": "byg:block/redwood/leaves", + "north": "byg:block/redwood/leaves", + "south": "byg:block/redwood/leaves", + "east": "byg:block/redwood/leaves", + "west": "byg:block/redwood/leaves", + "particle": "byg:block/redwood/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json new file mode 100644 index 0000000000..46247343bb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/redwood/leaves_snowy", + "up": "byg:block/redwood/leaves_snowy", + "north": "byg:block/redwood/leaves_snowy_side", + "south": "byg:block/redwood/leaves_snowy_side", + "east": "byg:block/redwood/leaves_snowy_side", + "west": "byg:block/redwood/leaves_snowy_side", + "particle": "byg:block/redwood/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/log.json b/Common/src/generated/resources/assets/byg/models/block/redwood/log.json new file mode 100644 index 0000000000..200c91342f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/redwood/log", + "end": "byg:block/redwood/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json b/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json new file mode 100644 index 0000000000..99142bf1dd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/redwood/planks", + "up": "byg:block/redwood/planks", + "north": "byg:block/redwood/planks", + "south": "byg:block/redwood/planks", + "east": "byg:block/redwood/planks", + "west": "byg:block/redwood/planks", + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate.json new file mode 100644 index 0000000000..92973e89ad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate_down.json new file mode 100644 index 0000000000..a7c4f39daf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json b/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json new file mode 100644 index 0000000000..058b159e8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/redwood/planks", + "bottom": "byg:block/redwood/planks", + "top": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json new file mode 100644 index 0000000000..3be9a015db --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/redwood/planks", + "bottom": "byg:block/redwood/planks", + "top": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json new file mode 100644 index 0000000000..8a3d3171de --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/redwood/planks", + "bottom": "byg:block/redwood/planks", + "top": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json new file mode 100644 index 0000000000..cea5a3cf0c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/redwood/planks", + "bottom": "byg:block/redwood/planks", + "top": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json new file mode 100644 index 0000000000..7065520061 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/redwood/planks", + "bottom": "byg:block/redwood/planks", + "top": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json new file mode 100644 index 0000000000..272fd7ed3d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/redwood/stripped_log", + "end": "byg:block/redwood/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_wood.json new file mode 100644 index 0000000000..d436a3c788 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/redwood/stripped_log", + "particle": "byg:block/redwood/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json new file mode 100644 index 0000000000..fdda7e8b9b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_bottom.json new file mode 100644 index 0000000000..a09359a578 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/redwood/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_open.json new file mode 100644 index 0000000000..5a9f6bbc99 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/redwood/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_top.json new file mode 100644 index 0000000000..3f42f74424 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/redwood/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/wood.json b/Common/src/generated/resources/assets/byg/models/block/redwood/wood.json new file mode 100644 index 0000000000..364e6b8531 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/redwood/log", + "particle": "byg:block/redwood/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_boat.json b/Common/src/generated/resources/assets/byg/models/item/pine_boat.json new file mode 100644 index 0000000000..2616daf035 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/pine/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json new file mode 100644 index 0000000000..5effb2f6be --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_button.json b/Common/src/generated/resources/assets/byg/models/item/pine_button.json new file mode 100644 index 0000000000..4aa1435b3e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json new file mode 100644 index 0000000000..cdc87b4b9d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_door.json b/Common/src/generated/resources/assets/byg/models/item/pine_door.json new file mode 100644 index 0000000000..aa35f25fb3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/pine/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_fence.json b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json new file mode 100644 index 0000000000..c626704972 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json b/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json new file mode 100644 index 0000000000..0c5e42d8f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_log.json b/Common/src/generated/resources/assets/byg/models/item/pine_log.json new file mode 100644 index 0000000000..31f577418e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_planks.json b/Common/src/generated/resources/assets/byg/models/item/pine_planks.json new file mode 100644 index 0000000000..6b49f59260 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json new file mode 100644 index 0000000000..590e2947bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_sapling.json b/Common/src/generated/resources/assets/byg/models/item/pine_sapling.json new file mode 100644 index 0000000000..d6712b4ec7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/pine/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_slab.json b/Common/src/generated/resources/assets/byg/models/item/pine_slab.json new file mode 100644 index 0000000000..b8663860f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json b/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json new file mode 100644 index 0000000000..ef282a6957 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_wood.json b/Common/src/generated/resources/assets/byg/models/item/pine_wood.json new file mode 100644 index 0000000000..264dcb2669 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json new file mode 100644 index 0000000000..5e9c1e26c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/rainbow_eucalyptus/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json new file mode 100644 index 0000000000..77a983da53 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json new file mode 100644 index 0000000000..34d7eec59b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json new file mode 100644 index 0000000000..48554a5cbb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_door.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_door.json new file mode 100644 index 0000000000..233a787109 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/rainbow_eucalyptus/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json new file mode 100644 index 0000000000..a871d2fe39 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json new file mode 100644 index 0000000000..9d68f8f141 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json new file mode 100644 index 0000000000..15c4465fa0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json new file mode 100644 index 0000000000..c0cfd7cde0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json new file mode 100644 index 0000000000..4974cac46c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json new file mode 100644 index 0000000000..f626957c80 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/rainbow_eucalyptus/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json new file mode 100644 index 0000000000..c9c44a0913 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json new file mode 100644 index 0000000000..ef5c6c8c38 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json new file mode 100644 index 0000000000..ffd2baaec8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_boat.json b/Common/src/generated/resources/assets/byg/models/item/redwood_boat.json new file mode 100644 index 0000000000..b59c9cf5fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/redwood/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json new file mode 100644 index 0000000000..5f8a3c2410 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_button.json b/Common/src/generated/resources/assets/byg/models/item/redwood_button.json new file mode 100644 index 0000000000..ceae0042b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json new file mode 100644 index 0000000000..1d77cb2d03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_door.json b/Common/src/generated/resources/assets/byg/models/item/redwood_door.json new file mode 100644 index 0000000000..4e0010beb5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/redwood/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json new file mode 100644 index 0000000000..d0eebf4c81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json b/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json new file mode 100644 index 0000000000..edb18769c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_log.json b/Common/src/generated/resources/assets/byg/models/item/redwood_log.json new file mode 100644 index 0000000000..ea149118e4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json b/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json new file mode 100644 index 0000000000..b5a4b0469f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json new file mode 100644 index 0000000000..9ccd3cfb93 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_sapling.json b/Common/src/generated/resources/assets/byg/models/item/redwood_sapling.json new file mode 100644 index 0000000000..a587b800c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/redwood/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json b/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json new file mode 100644 index 0000000000..6aa423ba2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json b/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json new file mode 100644 index 0000000000..7a98754d54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json b/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json new file mode 100644 index 0000000000..5abc2b4b84 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json new file mode 100644 index 0000000000..896d9d1ac3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json new file mode 100644 index 0000000000..d6dacfed88 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json new file mode 100644 index 0000000000..ea7554a96c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json new file mode 100644 index 0000000000..1098402c0f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json new file mode 100644 index 0000000000..2cef11fe22 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json new file mode 100644 index 0000000000..db3f09e224 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json new file mode 100644 index 0000000000..2245bef6ca --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json new file mode 100644 index 0000000000..f2e1792daf --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json new file mode 100644 index 0000000000..d112769bd8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json new file mode 100644 index 0000000000..a98048ee47 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json new file mode 100644 index 0000000000..ae7644a105 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json new file mode 100644 index 0000000000..ad5a7252e1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json new file mode 100644 index 0000000000..4ab4e40a24 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json new file mode 100644 index 0000000000..3ad0ce7c96 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/pine_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json new file mode 100644 index 0000000000..96ecfb186b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json new file mode 100644 index 0000000000..223ec02e24 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json new file mode 100644 index 0000000000..4be492d42c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json new file mode 100644 index 0000000000..299a14fe1a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json new file mode 100644 index 0000000000..d20fb3a314 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json new file mode 100644 index 0000000000..edfd67c532 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json new file mode 100644 index 0000000000..996f02ce93 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json new file mode 100644 index 0000000000..bf275b8f76 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json new file mode 100644 index 0000000000..410e8f36e7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json new file mode 100644 index 0000000000..05f888c71b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json new file mode 100644 index 0000000000..56c9a8fe87 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json new file mode 100644 index 0000000000..83b6689f65 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json new file mode 100644 index 0000000000..dfec4f8003 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/rainbow_eucalyptus_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json new file mode 100644 index 0000000000..7f6c45e2f2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json new file mode 100644 index 0000000000..a349977e07 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json new file mode 100644 index 0000000000..a7d971c16a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json new file mode 100644 index 0000000000..7373265b26 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json new file mode 100644 index 0000000000..807a300a15 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json new file mode 100644 index 0000000000..dea4e8151e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json new file mode 100644 index 0000000000..d10f509292 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json new file mode 100644 index 0000000000..5cd8775877 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json new file mode 100644 index 0000000000..1cdda26e39 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json new file mode 100644 index 0000000000..f576cca481 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json new file mode 100644 index 0000000000..f3d22e688d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json new file mode 100644 index 0000000000..e17f5014f3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json new file mode 100644 index 0000000000..fb1dd319a3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/redwood_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json new file mode 100644 index 0000000000..697e74f637 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json new file mode 100644 index 0000000000..d50d73c974 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json new file mode 100644 index 0000000000..24b4df1037 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json new file mode 100644 index 0000000000..14dd07db53 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json new file mode 100644 index 0000000000..9b51ed4d04 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json new file mode 100644 index 0000000000..235b9142da --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json new file mode 100644 index 0000000000..dc3664f944 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:pine_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/button.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/button.json new file mode 100644 index 0000000000..01f7007c7d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:pine_planks" + } + ], + "result": { + "item": "byg:pine_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json new file mode 100644 index 0000000000..bafc88c64f --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json new file mode 100644 index 0000000000..502d2ae0a2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json new file mode 100644 index 0000000000..f3367bab11 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json new file mode 100644 index 0000000000..36640e58f1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json new file mode 100644 index 0000000000..43550865c4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/pine_logs" + } + ], + "result": { + "item": "byg:pine_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json new file mode 100644 index 0000000000..5cb7fd0aea --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json new file mode 100644 index 0000000000..631df49a4c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json new file mode 100644 index 0000000000..4988c3114d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json new file mode 100644 index 0000000000..2409148cfa --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:pine_planks" + } + }, + "result": { + "item": "byg:pine_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json new file mode 100644 index 0000000000..15a140efff --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:pine_log" + } + }, + "result": { + "item": "byg:pine_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json new file mode 100644 index 0000000000..9e7ac23ee4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json new file mode 100644 index 0000000000..83618fb973 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/button.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/button.json new file mode 100644 index 0000000000..3c6385020a --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:rainbow_eucalyptus_planks" + } + ], + "result": { + "item": "byg:rainbow_eucalyptus_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json new file mode 100644 index 0000000000..230c5318bd --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json new file mode 100644 index 0000000000..ef3a25cbb7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json new file mode 100644 index 0000000000..937501994c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json new file mode 100644 index 0000000000..a927564569 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json new file mode 100644 index 0000000000..150b83dd7d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/rainbow_eucalyptus_logs" + } + ], + "result": { + "item": "byg:rainbow_eucalyptus_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json new file mode 100644 index 0000000000..34a9edf5ce --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json new file mode 100644 index 0000000000..9c166cb60c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json new file mode 100644 index 0000000000..d8b57246a0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json new file mode 100644 index 0000000000..ebf9d200cd --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:rainbow_eucalyptus_planks" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json new file mode 100644 index 0000000000..c04166c66e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:rainbow_eucalyptus_log" + } + }, + "result": { + "item": "byg:rainbow_eucalyptus_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json new file mode 100644 index 0000000000..480f24b29e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json new file mode 100644 index 0000000000..37cc6e57fa --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:redwood_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/button.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/button.json new file mode 100644 index 0000000000..e861a170e5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:redwood_planks" + } + ], + "result": { + "item": "byg:redwood_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json new file mode 100644 index 0000000000..112e23777e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json new file mode 100644 index 0000000000..ae9d25076f --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json new file mode 100644 index 0000000000..c6cceed9ec --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json new file mode 100644 index 0000000000..2b29726f4f --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json new file mode 100644 index 0000000000..dcef0e7a73 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/redwood_logs" + } + ], + "result": { + "item": "byg:redwood_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json new file mode 100644 index 0000000000..3c20f6285c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json new file mode 100644 index 0000000000..a013c5afc2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json new file mode 100644 index 0000000000..0f32a9e85a --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json new file mode 100644 index 0000000000..f2dd585063 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:redwood_planks" + } + }, + "result": { + "item": "byg:redwood_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json new file mode 100644 index 0000000000..302c337d96 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:redwood_log" + } + }, + "result": { + "item": "byg:redwood_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json new file mode 100644 index 0000000000..0b1fdebcf7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:pine_log", + "byg:pine_wood", + "byg:stripped_pine_log", + "byg:stripped_pine_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json new file mode 100644 index 0000000000..698520ab0c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:rainbow_eucalyptus_log", + "byg:rainbow_eucalyptus_wood", + "byg:stripped_rainbow_eucalyptus_log", + "byg:stripped_rainbow_eucalyptus_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json new file mode 100644 index 0000000000..7027988498 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:redwood_log", + "byg:redwood_wood", + "byg:stripped_redwood_log", + "byg:stripped_redwood_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json new file mode 100644 index 0000000000..2afbd875e5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:pine_log", + "byg:stripped_pine_log", + "byg:pine_wood", + "byg:stripped_pine_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json new file mode 100644 index 0000000000..1faa27f3a3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:rainbow_eucalyptus_log", + "byg:stripped_rainbow_eucalyptus_log", + "byg:rainbow_eucalyptus_wood", + "byg:stripped_rainbow_eucalyptus_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json new file mode 100644 index 0000000000..c85ade522e --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:redwood_log", + "byg:stripped_redwood_log", + "byg:redwood_wood", + "byg:stripped_redwood_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index b9192d443e..304bdae766 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -141,9 +141,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Doors map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.PINE_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.RAINBOW_EUCALYPTUS_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.REDWOOD_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.WILLOW_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WITCH_HAZEL_DOOR.get(), RenderType.translucent()); @@ -156,9 +153,6 @@ public static void renderTypes(Consumer> mapConsumer) { //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.PINE_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.RAINBOW_EUCALYPTUS_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.REDWOOD_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.WILLOW_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WITCH_HAZEL_TRAPDOOR.get(), RenderType.translucent()); @@ -196,14 +190,11 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.ORANGE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORCHARD_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PALO_VERDE_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.PINE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PINK_CHERRY_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.RAINBOW_EUCALYPTUS_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RED_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RED_MAPLE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RED_OAK_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RED_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.REDWOOD_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SILVER_MAPLE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SKYRIS_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WHITE_CHERRY_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 8eef6b8b25..18bd3a37ee 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -39,10 +39,7 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.ORANGE_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.PALO_VERDE_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.PINE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.PINK_CHERRY_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.RAINBOW_EUCALYPTUS_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.REDWOOD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.RED_MAPLE_LEAVES.get()); compostibleBlocks(0.6f, BYGItems.RIPE_ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.SILVER_MAPLE_LEAVES.get()); @@ -75,10 +72,7 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.ORANGE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.ORCHARD_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.PALO_VERDE_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.PINE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.PINK_CHERRY_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.RAINBOW_EUCALYPTUS_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.REDWOOD_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_MAPLE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_OAK_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.SILVER_MAPLE_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index e23ef718cd..3784a26d2c 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -42,9 +42,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.PINE_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.REDWOOD_LOG.get(), 5, 5); flammableBlock(BYGBlocks.WILLOW_LOG.get(), 5, 5); flammableBlock(BYGBlocks.WITCH_HAZEL_LOG.get(), 5, 5); flammableBlock(BYGBlocks.ZELKOVA_LOG.get(), 5, 5); @@ -53,7 +50,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_SKYRIS_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WILLOW_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get(), 5, 5); @@ -63,9 +59,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.PINE_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.REDWOOD_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.WILLOW_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.WITCH_HAZEL_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.ZELKOVA_WOOD.get(), 5, 5); @@ -74,7 +67,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_SKYRIS_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WILLOW_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get(), 5, 5); @@ -83,9 +75,6 @@ public static void flammablesBYG() { //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.PINE_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.REDWOOD_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.WILLOW_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_BOOKSHELF.get(), 5, 20); @@ -94,9 +83,6 @@ public static void flammablesBYG() { //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.PINE_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.REDWOOD_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.WILLOW_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_SLAB.get(), 5, 20); @@ -105,9 +91,6 @@ public static void flammablesBYG() { //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.PINE_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.REDWOOD_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.WILLOW_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_STAIRS.get(), 5, 20); @@ -117,9 +100,6 @@ public static void flammablesBYG() { //Planks flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.PINE_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.REDWOOD_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.WILLOW_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_PLANKS.get(), 5, 20); @@ -128,9 +108,6 @@ public static void flammablesBYG() { //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.PINE_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.REDWOOD_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.WILLOW_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.WITCH_HAZEL_FENCE.get(), 5, 20); @@ -151,10 +128,7 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.ORANGE_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.PALO_VERDE_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.PINE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.PINK_CHERRY_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.REDWOOD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.RED_OAK_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.RIPE_ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.SILVER_MAPLE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 454b7ef284..51ab38e872 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -27,9 +27,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); - stripables.put(BYGBlocks.PINE_LOG.get(), BYGBlocks.STRIPPED_PINE_LOG.get()); - stripables.put(BYGBlocks.RAINBOW_EUCALYPTUS_LOG.get(), BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_LOG.get()); - stripables.put(BYGBlocks.REDWOOD_LOG.get(), BYGBlocks.STRIPPED_REDWOOD_LOG.get()); stripables.put(BYGBlocks.SKYRIS_LOG.get(), BYGBlocks.STRIPPED_SKYRIS_LOG.get()); stripables.put(BYGBlocks.WILLOW_LOG.get(), BYGBlocks.STRIPPED_WILLOW_LOG.get()); stripables.put(BYGBlocks.WITCH_HAZEL_LOG.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get()); @@ -44,9 +41,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); - stripables.put(BYGBlocks.PINE_WOOD.get(), BYGBlocks.STRIPPED_PINE_WOOD.get()); - stripables.put(BYGBlocks.RAINBOW_EUCALYPTUS_WOOD.get(), BYGBlocks.STRIPPED_RAINBOW_EUCALYPTUS_WOOD.get()); - stripables.put(BYGBlocks.REDWOOD_WOOD.get(), BYGBlocks.STRIPPED_REDWOOD_WOOD.get()); stripables.put(BYGBlocks.SKYRIS_WOOD.get(), BYGBlocks.STRIPPED_SKYRIS_WOOD.get()); stripables.put(BYGBlocks.WILLOW_WOOD.get(), BYGBlocks.STRIPPED_WILLOW_WOOD.get()); stripables.put(BYGBlocks.WITCH_HAZEL_WOOD.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 3f37648e17..f22d955fe9 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -54,9 +54,6 @@ public Item getDropItem() { default -> BYGWoodTypes.ASPEN.boat().get(); case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); case MAPLE -> BYGItems.MAPLE_BOAT.get(); - case PINE -> BYGItems.PINE_BOAT.get(); - case RAINBOW_EUCALYPTUS -> BYGItems.RAINBOW_EUCALYPTUS_BOAT.get(); - case REDWOOD -> BYGItems.REDWOOD_BOAT.get(); case SKYRIS -> BYGItems.SKYRIS_BOAT.get(); case WILLOW -> BYGItems.WILLOW_BOAT.get(); case WITCH_HAZEL -> BYGItems.WITCH_HAZEL_BOAT.get(); @@ -72,9 +69,6 @@ public Block getPlanks() { default -> BYGWoodTypes.ASPEN.planks().get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); - case PINE -> BYGBlocks.PINE_PLANKS.get(); - case RAINBOW_EUCALYPTUS -> BYGBlocks.RAINBOW_EUCALYPTUS_PLANKS.get(); - case REDWOOD -> BYGBlocks.REDWOOD_PLANKS.get(); case SKYRIS -> BYGBlocks.SKYRIS_PLANKS.get(); case WILLOW -> BYGBlocks.WILLOW_PLANKS.get(); case WITCH_HAZEL -> BYGBlocks.WITCH_HAZEL_PLANKS.get(); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 278209e289..c4eb396fae 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -35,7 +35,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ARAUCARIA_TREE1 = createConfiguredFeature("araucaria_tree1", BYGFeatures.ARAUCARIA_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) + .setTrunkBlock(PINE.log()) .setLeavesBlock(BYGBlocks.ARAUCARIA_LEAVES.get()) .setMaxHeight(24) .setMinHeight(16) @@ -44,7 +44,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ARAUCARIA_TREE2 = createConfiguredFeature("araucaria_tree2", BYGFeatures.ARAUCARIA_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) + .setTrunkBlock(PINE.log()) .setLeavesBlock(BYGBlocks.ARAUCARIA_LEAVES.get()) .setMaxHeight(24) .setMinHeight(16) @@ -1333,32 +1333,28 @@ public class BYGOverworldTreeFeatures { public static final Holder> PINE_LARGE_TREE1 = createConfiguredFeature("large_pine_tree1", BYGFeatures.PINE_LARGE_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) - .setLeavesBlock(BYGBlocks.PINE_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PINE) .setMaxHeight(28) .setMinHeight(23) .build() ); public static final Holder> PINE_LARGE_TREE2 = createConfiguredFeature("large_pine_tree2", BYGFeatures.PINE_LARGE_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) - .setLeavesBlock(BYGBlocks.PINE_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PINE) .setMaxHeight(31) .setMinHeight(26) .build() ); public static final Holder> PINE_TREE1 = createConfiguredFeature("pine_tree1", BYGFeatures.PINE_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) - .setLeavesBlock(BYGBlocks.PINE_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PINE) .setMaxHeight(20) .setMinHeight(15) .build() ); public static final Holder> PINE_TREE2 = createConfiguredFeature("pine_tree2", BYGFeatures.PINE_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.PINE_LOG.get()) - .setLeavesBlock(BYGBlocks.PINE_LEAVES.get()) + .fromWoodType(BYGWoodTypes.PINE) .setMaxHeight(21) .setMinHeight(16) .build() @@ -1392,8 +1388,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> RAINBOW_TREE1 = createConfiguredFeature("rainbow_eucalyptus_tree1", BYGFeatures.RAINBOW_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LOG.get()) - .setLeavesBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LEAVES.get()) + .fromWoodType(BYGWoodTypes.RAINBOW_EUCALYPTUS) .setMaxHeight(32) .setMinHeight(27) .build() @@ -1401,8 +1396,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> RAINBOW_LARGE_TREE1 = createConfiguredFeature("large_rainbow_eucalyptus_tree1", BYGFeatures.RAINBOW_LARGE_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LOG.get()) - .setLeavesBlock(BYGBlocks.RAINBOW_EUCALYPTUS_LEAVES.get()) + .fromWoodType(BYGWoodTypes.RAINBOW_EUCALYPTUS) .setMaxHeight(19) .setMinHeight(16) .build() @@ -1411,8 +1405,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> REDWOOD_TREE1 = createConfiguredFeature("redwood_tree1", BYGFeatures.REDWOOD_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.REDWOOD_LOG.get()) - .setLeavesBlock(BYGBlocks.REDWOOD_LEAVES.get()) + .fromWoodType(BYGWoodTypes.REDWOOD) .setMaxHeight(37) .setMinHeight(36) .build() @@ -1420,8 +1413,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> REDWOOD_TREE2 = createConfiguredFeature("redwood_tree2", BYGFeatures.REDWOOD_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.REDWOOD_LOG.get()) - .setLeavesBlock(BYGBlocks.REDWOOD_LEAVES.get()) + .fromWoodType(BYGWoodTypes.REDWOOD) .setMaxHeight(34) .setMinHeight(31) .build() @@ -1429,8 +1421,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> REDWOOD_TREE3 = createConfiguredFeature("redwood_tree3", BYGFeatures.REDWOOD_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.REDWOOD_LOG.get()) - .setLeavesBlock(BYGBlocks.REDWOOD_LEAVES.get()) + .fromWoodType(BYGWoodTypes.REDWOOD) .setMaxHeight(25) .setMinHeight(18) .build() diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_log.json deleted file mode 100644 index bfc3d08bf2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_aspen_log" - }, - "axis=z": { - "model": "byg:block/stripped_aspen_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_aspen_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_wood.json deleted file mode 100644 index 37b65da1fc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_aspen_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_aspen_wood" - }, - "axis=z": { - "model": "byg:block/stripped_aspen_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_aspen_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_log.json deleted file mode 100644 index f78490700d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_baobab_log" - }, - "axis=z": { - "model": "byg:block/stripped_baobab_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_baobab_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_wood.json deleted file mode 100644 index 7488f504b8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_baobab_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_baobab_wood" - }, - "axis=z": { - "model": "byg:block/stripped_baobab_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_baobab_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json deleted file mode 100644 index 7a575f23c9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_blue_enchanted_log" - }, - "axis=z": { - "model": "byg:block/stripped_blue_enchanted_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_blue_enchanted_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json deleted file mode 100644 index e52e8511af..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_blue_enchanted_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_blue_enchanted_wood" - }, - "axis=z": { - "model": "byg:block/stripped_blue_enchanted_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_blue_enchanted_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_stem.json b/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_stem.json deleted file mode 100644 index 7b76e449b7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_bulbis_stem" - }, - "axis=z": { - "model": "byg:block/stripped_bulbis_stem", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_bulbis_stem", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_wood.json deleted file mode 100644 index ea81e76d77..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_bulbis_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_bulbis_wood" - }, - "axis=z": { - "model": "byg:block/stripped_bulbis_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_bulbis_wood", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_log.json deleted file mode 100644 index d0bae55772..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cherry_log" - }, - "axis=z": { - "model": "byg:block/stripped_cherry_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cherry_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_wood.json deleted file mode 100644 index 485a7c6908..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cherry_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cherry_wood" - }, - "axis=z": { - "model": "byg:block/stripped_cherry_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cherry_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cika_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cika_log.json deleted file mode 100644 index 885f22ad23..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cika_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cika_log" - }, - "axis=z": { - "model": "byg:block/stripped_cika_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cika_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cika_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cika_wood.json deleted file mode 100644 index 2dd25914ea..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cika_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cika_wood" - }, - "axis=z": { - "model": "byg:block/stripped_cika_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cika_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_log.json deleted file mode 100644 index be8481fd92..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cypress_log" - }, - "axis=z": { - "model": "byg:block/stripped_cypress_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cypress_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_wood.json deleted file mode 100644 index 92403ab60a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_cypress_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_cypress_wood" - }, - "axis=z": { - "model": "byg:block/stripped_cypress_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_cypress_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_log.json deleted file mode 100644 index 00990c7c4e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_ebony_log" - }, - "axis=z": { - "model": "byg:block/stripped_ebony_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_ebony_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_wood.json deleted file mode 100644 index 737e3cb583..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_ebony_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_ebony_wood" - }, - "axis=z": { - "model": "byg:block/stripped_ebony_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_ebony_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_embur_hyphae.json b/Common/src/main/resources/assets/byg/blockstates/stripped_embur_hyphae.json deleted file mode 100644 index b23b2e1ed8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_embur_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_embur_hyphae" - }, - "axis=z": { - "model": "byg:block/stripped_embur_hyphae", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_embur_hyphae", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_embur_pedu.json b/Common/src/main/resources/assets/byg/blockstates/stripped_embur_pedu.json deleted file mode 100644 index 31e6ef562e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_embur_pedu.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_embur_pedu" - }, - "axis=z": { - "model": "byg:block/stripped_embur_pedu", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_embur_pedu", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_ether_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_ether_log.json deleted file mode 100644 index 63bbde283a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_ether_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_ether_log" - }, - "axis=z": { - "model": "byg:block/stripped_ether_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_ether_log", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_ether_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_ether_wood.json deleted file mode 100644 index df9b957572..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_ether_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_ether_wood" - }, - "axis=z": { - "model": "byg:block/stripped_ether_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_ether_wood", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_fir_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_fir_log.json deleted file mode 100644 index 5f78d31c40..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_fir_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_fir_log" - }, - "axis=z": { - "model": "byg:block/stripped_fir_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_fir_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_fir_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_fir_wood.json deleted file mode 100644 index 2ec676071d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_fir_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_fir_wood" - }, - "axis=z": { - "model": "byg:block/stripped_fir_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_fir_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_log.json deleted file mode 100644 index 5e9a2e63fe..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_green_enchanted_log" - }, - "axis=z": { - "model": "byg:block/stripped_green_enchanted_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_green_enchanted_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json deleted file mode 100644 index 58792d8342..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_green_enchanted_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_green_enchanted_wood" - }, - "axis=z": { - "model": "byg:block/stripped_green_enchanted_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_green_enchanted_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_holly_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_holly_log.json deleted file mode 100644 index 4e9d9a5873..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_holly_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_holly_log" - }, - "axis=z": { - "model": "byg:block/stripped_holly_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_holly_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_holly_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_holly_wood.json deleted file mode 100644 index 2047bcc8d4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_holly_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_holly_wood" - }, - "axis=z": { - "model": "byg:block/stripped_holly_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_holly_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_log.json deleted file mode 100644 index e56d3f8bfc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_mahogany_log" - }, - "axis=z": { - "model": "byg:block/stripped_mahogany_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_mahogany_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_wood.json deleted file mode 100644 index 2ebece2573..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_mahogany_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_mahogany_wood" - }, - "axis=z": { - "model": "byg:block/stripped_mahogany_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_mahogany_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_log.json deleted file mode 100644 index 605afa062a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_mangrove_log" - }, - "axis=z": { - "model": "byg:block/stripped_mangrove_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_mangrove_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_wood.json deleted file mode 100644 index 629414a5da..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_mangrove_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_mangrove_wood" - }, - "axis=z": { - "model": "byg:block/stripped_mangrove_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_mangrove_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_palm_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_palm_log.json deleted file mode 100644 index 2237518de6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_palm_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/stripped_palm_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/stripped_palm_log" - }, - "axis=z": { - "model": "byg:block/stripped_palm_log_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_palm_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_palm_wood.json deleted file mode 100644 index c2baa76b29..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_palm_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/stripped_palm_wood_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/stripped_palm_wood" - }, - "axis=z": { - "model": "byg:block/stripped_palm_wood_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_pine_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_pine_log.json deleted file mode 100644 index 620e225067..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_pine_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_pine_log" - }, - "axis=z": { - "model": "byg:block/stripped_pine_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_pine_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_pine_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_pine_wood.json deleted file mode 100644 index 016228d9dc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_pine_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_pine_wood" - }, - "axis=z": { - "model": "byg:block/stripped_pine_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_pine_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json deleted file mode 100644 index fd27a8b696..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_rainbow_eucalyptus_log" - }, - "axis=z": { - "model": "byg:block/stripped_rainbow_eucalyptus_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_rainbow_eucalyptus_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json deleted file mode 100644 index b0a4abe868..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_rainbow_eucalyptus_wood" - }, - "axis=z": { - "model": "byg:block/stripped_rainbow_eucalyptus_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_rainbow_eucalyptus_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_log.json deleted file mode 100644 index 3fa4feedc8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_redwood_log" - }, - "axis=z": { - "model": "byg:block/stripped_redwood_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_redwood_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_wood.json deleted file mode 100644 index 9cd0328b06..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_redwood_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_redwood_wood" - }, - "axis=z": { - "model": "byg:block/stripped_redwood_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_redwood_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java index 2a9e2e4f31..f9fa4a7628 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java @@ -138,6 +138,6 @@ private void add(TagAppender tag, Supplier... values) { @Override public String getName() { - return "BYG Blocks"; + return "BYG Block Tags"; } } From 27f94c249386f1d530b52bdb229f19a6a4af83e0 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 12:54:01 +0300 Subject: [PATCH 40/90] Willow --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/entity/BYGEntities.java | 1 - .../byg/common/item/BYGItems.java | 72 +++--- .../byg/blockstates/stripped_willow_log.json | 16 -- .../byg/blockstates/stripped_willow_wood.json | 16 -- .../byg/blockstates/willow_bookshelf.json | 7 - .../assets/byg/blockstates/willow_button.json | 118 ---------- .../blockstates/willow_crafting_table.json | 7 - .../assets/byg/blockstates/willow_door.json | 124 ----------- .../assets/byg/blockstates/willow_fence.json | 48 ---- .../byg/blockstates/willow_fence_gate.json | 80 ------- .../assets/byg/blockstates/willow_leaves.json | 7 - .../assets/byg/blockstates/willow_log.json | 17 -- .../assets/byg/blockstates/willow_planks.json | 7 - .../blockstates/willow_pressure_plate.json | 10 - .../byg/blockstates/willow_sapling.json | 7 - .../assets/byg/blockstates/willow_slab.json | 13 -- .../assets/byg/blockstates/willow_stairs.json | 209 ------------------ .../byg/blockstates/willow_trapdoor.json | 69 ------ .../assets/byg/blockstates/willow_wood.json | 16 -- .../byg/models/block/stripped_willow_log.json | 12 - .../models/block/stripped_willow_wood.json | 7 - .../byg/models/block/willow_bookshelf.json | 12 - .../byg/models/block/willow_button.json | 6 - .../models/block/willow_button_inventory.json | 6 - .../models/block/willow_button_pressed.json | 6 - .../models/block/willow_crafting_table.json | 12 - .../byg/models/block/willow_door_bottom.json | 7 - .../block/willow_door_bottom_hinge.json | 7 - .../byg/models/block/willow_door_top.json | 7 - .../models/block/willow_door_top_hinge.json | 7 - .../assets/byg/models/block/willow_fence.json | 7 - .../byg/models/block/willow_fence_gate.json | 6 - .../models/block/willow_fence_gate_open.json | 6 - .../models/block/willow_fence_gate_wall.json | 6 - .../block/willow_fence_gate_wall_open.json | 6 - .../models/block/willow_fence_inventory.json | 7 - .../byg/models/block/willow_fence_post.json | 7 - .../byg/models/block/willow_leaves.json | 166 -------------- .../byg/models/block/willow_leaves_snowy.json | 12 - .../assets/byg/models/block/willow_log.json | 7 - .../byg/models/block/willow_planks.json | 7 - .../models/block/willow_pressure_plate.json | 6 - .../block/willow_pressure_plate_down.json | 6 - .../byg/models/block/willow_sapling.json | 7 - .../assets/byg/models/block/willow_slab.json | 8 - .../byg/models/block/willow_slab_top.json | 8 - .../byg/models/block/willow_stairs.json | 8 - .../byg/models/block/willow_stairs_inner.json | 8 - .../byg/models/block/willow_stairs_outer.json | 8 - .../models/block/willow_trapdoor_bottom.json | 6 - .../models/block/willow_trapdoor_open.json | 6 - .../byg/models/block/willow_trapdoor_top.json | 6 - .../assets/byg/models/block/willow_wood.json | 7 - .../byg/models/item/stripped_willow_log.json | 22 -- .../byg/models/item/stripped_willow_wood.json | 22 -- .../assets/byg/models/item/willow_boat.json | 6 - .../byg/models/item/willow_bookshelf.json | 22 -- .../assets/byg/models/item/willow_button.json | 22 -- .../models/item/willow_crafting_table.json | 22 -- .../assets/byg/models/item/willow_door.json | 6 - .../assets/byg/models/item/willow_fence.json | 3 - .../byg/models/item/willow_fence_gate.json | 22 -- .../assets/byg/models/item/willow_leaves.json | 22 -- .../assets/byg/models/item/willow_log.json | 22 -- .../assets/byg/models/item/willow_planks.json | 22 -- .../models/item/willow_pressure_plate.json | 22 -- .../byg/models/item/willow_sapling.json | 6 - .../assets/byg/models/item/willow_slab.json | 22 -- .../assets/byg/models/item/willow_stairs.json | 22 -- .../byg/models/item/willow_trapdoor.json | 22 -- .../assets/byg/models/item/willow_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../{willow_leaves.png => willow/leaves.png} | Bin .../block/{willow_log.png => willow/log.png} | Bin .../log_top.png} | Bin .../{willow_planks.png => willow/planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../item/{willow_boat.png => willow/boat.png} | Bin .../item/{willow_door.png => willow/door.png} | Bin .../byg/recipes/stripped_willow_wood.json | 16 -- .../data/byg/recipes/willow_boat.json | 16 -- .../data/byg/recipes/willow_bookshelf.json | 19 -- .../data/byg/recipes/willow_button.json | 12 - .../byg/recipes/willow_crafting_table.json | 15 -- .../data/byg/recipes/willow_door.json | 18 -- .../data/byg/recipes/willow_fence.json | 20 -- .../data/byg/recipes/willow_fence_gate.json | 19 -- .../data/byg/recipes/willow_planks.json | 13 -- .../byg/recipes/willow_pressure_plate.json | 15 -- .../data/byg/recipes/willow_slab.json | 16 -- .../data/byg/recipes/willow_stairs.json | 18 -- .../data/byg/recipes/willow_trapdoor.json | 17 -- .../data/byg/recipes/willow_wood.json | 16 -- 104 files changed, 31 insertions(+), 1808 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_willow_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_willow_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/willow_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_willow_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_wood.json rename Common/src/main/resources/assets/byg/textures/block/{willow_bookshelf.png => willow/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_crafting_table_front.png => willow/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_crafting_table_side.png => willow/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_crafting_table_top.png => willow/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_door_bottom.png => willow/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_door_top.png => willow/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_sapling.png => willow/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_leaves.png => willow/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_log.png => willow/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_log_top.png => willow/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_planks.png => willow/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_willow_log.png => willow/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_willow_log_top.png => willow/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{willow_trapdoor.png => willow/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{willow_boat.png => willow/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{willow_door.png => willow/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_willow_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/willow_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index bfb1ac16da..484af1628c 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -65,7 +65,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); - public static final BlockRegistryObject WILLOW_PLANKS = createPlanks("willow_planks"); public static final BlockRegistryObject WITCH_HAZEL_PLANKS = createPlanks("witch_hazel_planks"); public static final BlockRegistryObject ZELKOVA_PLANKS = createPlanks("zelkova_planks"); public static final BlockRegistryObject SYTHIAN_PLANKS = createPlanks("sythian_planks"); @@ -76,7 +75,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); - public static final BlockRegistryObject WILLOW_BOOKSHELF = createBookshelf("willow_bookshelf"); public static final BlockRegistryObject WITCH_HAZEL_BOOKSHELF = createBookshelf("witch_hazel_bookshelf"); public static final BlockRegistryObject ZELKOVA_BOOKSHELF = createBookshelf("zelkova_bookshelf"); public static final BlockRegistryObject SYTHIAN_BOOKSHELF = createBookshelf("sythian_bookshelf"); @@ -87,7 +85,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); - public static final BlockRegistryObject WILLOW_DOOR = createDoor("willow_door"); public static final BlockRegistryObject WITCH_HAZEL_DOOR = createDoor("witch_hazel_door"); public static final BlockRegistryObject ZELKOVA_DOOR = createDoor("zelkova_door"); public static final BlockRegistryObject SYTHIAN_DOOR = createDoor("sythian_door"); @@ -98,7 +95,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); - public static final BlockRegistryObject WILLOW_PRESSURE_PLATE = createWoodPressurePlate("willow_pressure_plate"); public static final BlockRegistryObject WITCH_HAZEL_PRESSURE_PLATE = createWoodPressurePlate("witch_hazel_pressure_plate"); public static final BlockRegistryObject ZELKOVA_PRESSURE_PLATE = createWoodPressurePlate("zelkova_pressure_plate"); public static final BlockRegistryObject SYTHIAN_PRESSURE_PLATE = createWoodPressurePlate("sythian_pressure_plate"); @@ -109,7 +105,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); - public static final BlockRegistryObject WILLOW_BUTTON = createWoodButton("willow_button"); public static final BlockRegistryObject WITCH_HAZEL_BUTTON = createWoodButton("witch_hazel_button"); public static final BlockRegistryObject ZELKOVA_BUTTON = createWoodButton("zelkova_button"); public static final BlockRegistryObject SYTHIAN_BUTTON = createWoodButton("sythian_button"); @@ -120,7 +115,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); - public static final BlockRegistryObject WILLOW_TRAPDOOR = createTrapDoor("willow_trapdoor"); public static final BlockRegistryObject WITCH_HAZEL_TRAPDOOR = createTrapDoor("witch_hazel_trapdoor"); public static final BlockRegistryObject ZELKOVA_TRAPDOOR = createTrapDoor("zelkova_trapdoor"); public static final BlockRegistryObject SYTHIAN_TRAPDOOR = createTrapDoor("sythian_trapdoor"); @@ -131,7 +125,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); - public static final BlockRegistryObject WILLOW_CRAFTING_TABLE = createCraftingTable("willow_crafting_table"); public static final BlockRegistryObject WITCH_HAZEL_CRAFTING_TABLE = createCraftingTable("witch_hazel_crafting_table"); public static final BlockRegistryObject ZELKOVA_CRAFTING_TABLE = createCraftingTable("zelkova_crafting_table"); public static final BlockRegistryObject SYTHIAN_CRAFTING_TABLE = createCraftingTable("sythian_crafting_table"); @@ -142,7 +135,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); - public static final BlockRegistryObject WILLOW_FENCE_GATE = createFenceGate("willow_fence_gate"); public static final BlockRegistryObject WITCH_HAZEL_FENCE_GATE = createFenceGate("witch_hazel_fence_gate"); public static final BlockRegistryObject ZELKOVA_FENCE_GATE = createFenceGate("zelkova_fence_gate"); public static final BlockRegistryObject SYTHIAN_FENCE_GATE = createFenceGate("sythian_fence_gate"); @@ -153,7 +145,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); - public static final BlockRegistryObject WILLOW_SLAB = createWoodSlab("willow_slab"); public static final BlockRegistryObject WITCH_HAZEL_SLAB = createWoodSlab("witch_hazel_slab"); public static final BlockRegistryObject ZELKOVA_SLAB = createWoodSlab("zelkova_slab"); public static final BlockRegistryObject SYTHIAN_SLAB = createWoodSlab("sythian_slab"); @@ -164,7 +155,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); - public static final BlockRegistryObject WILLOW_STAIRS = createWoodStairs("willow_stairs"); public static final BlockRegistryObject WITCH_HAZEL_STAIRS = createWoodStairs("witch_hazel_stairs"); public static final BlockRegistryObject ZELKOVA_STAIRS = createWoodStairs("zelkova_stairs"); public static final BlockRegistryObject SYTHIAN_STAIRS = createWoodStairs("sythian_stairs"); @@ -175,7 +165,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); - public static final BlockRegistryObject WILLOW_FENCE = createFence("willow_fence"); public static final BlockRegistryObject WITCH_HAZEL_FENCE = createFence("witch_hazel_fence"); public static final BlockRegistryObject ZELKOVA_FENCE = createFence("zelkova_fence"); public static final BlockRegistryObject SYTHIAN_FENCE = createFence("sythian_fence"); @@ -186,7 +175,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject WILLOW_SIGN = createSign("willow_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); public static final BlockRegistryObject WITCH_HAZEL_SIGN = createSign("witch_hazel_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); public static final BlockRegistryObject ZELKOVA_SIGN = createSign("zelkova_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); @@ -197,7 +185,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject WILLOW_WALL_SIGN = createWallSign("willow_wall_sign", BYGWoodType.WILLOW, WILLOW_PLANKS); public static final BlockRegistryObject WITCH_HAZEL_WALL_SIGN = createWallSign("witch_hazel_wall_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); public static final BlockRegistryObject ZELKOVA_WALL_SIGN = createWallSign("zelkova_wall_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_WALL_SIGN = createWallSign("sythian_wall_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); @@ -240,7 +227,6 @@ public class BYGBlocks { public static final BlockRegistryObject SILVER_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_SILVER_MAPLE_SAPLING, "silver_maple_sapling"); public static final BlockRegistryObject SKYRIS_SAPLING = createSapling(BYGBlockTags.GROUND_SKYRIS_SAPLING, "skyris_sapling"); public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); - public static final BlockRegistryObject WILLOW_SAPLING = createSapling(BYGBlockTags.GROUND_WILLOW_SAPLING, "willow_sapling"); public static final BlockRegistryObject WITCH_HAZEL_SAPLING = createSapling(BYGBlockTags.GROUND_WITCH_HAZEL_SAPLING, "witch_hazel_sapling"); public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); @@ -287,7 +273,6 @@ public class BYGBlocks { public static final BlockRegistryObject SKYRIS_LEAVES_GREEN_APPLE = createLeaves(MaterialColor.COLOR_PINK, "green_apple_skyris_leaves"); public static final BlockRegistryObject SKYRIS_LEAVES = createLeaves(MaterialColor.COLOR_PINK, "skyris_leaves"); public static final BlockRegistryObject WHITE_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "white_cherry_leaves"); - public static final BlockRegistryObject WILLOW_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "willow_leaves"); public static final BlockRegistryObject WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "witch_hazel_leaves"); public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); @@ -582,7 +567,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); - public static final BlockRegistryObject WILLOW_LOG = createLog("willow_log"); public static final BlockRegistryObject WITCH_HAZEL_LOG = createLog("witch_hazel_log"); public static final BlockRegistryObject ZELKOVA_LOG = createLog("zelkova_log"); public static final BlockRegistryObject SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "sythian_stem"); @@ -598,7 +582,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); - public static final BlockRegistryObject WILLOW_WOOD = createWood("willow_wood"); public static final BlockRegistryObject WITCH_HAZEL_WOOD = createWood("witch_hazel_wood"); public static final BlockRegistryObject ZELKOVA_WOOD = createWood("zelkova_wood"); public static final BlockRegistryObject SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "sythian_hyphae"); @@ -737,7 +720,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); - public static final BlockRegistryObject STRIPPED_WILLOW_LOG = createStrippedLog("stripped_willow_log"); public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_LOG = createStrippedLog("stripped_witch_hazel_log"); public static final BlockRegistryObject STRIPPED_ZELKOVA_LOG = createStrippedLog("stripped_zelkova_log"); public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); @@ -749,7 +731,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); - public static final BlockRegistryObject STRIPPED_WILLOW_WOOD = createWood("stripped_willow_wood"); public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_WOOD = createWood("stripped_witch_hazel_wood"); public static final BlockRegistryObject STRIPPED_ZELKOVA_WOOD = createWood("stripped_zelkova_wood"); public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index ecf44ed564..e62d007413 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -12,7 +12,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); - public static final WoodType WILLOW = register("willow"); public static final WoodType WITCH_HAZEL = register("witch_hazel"); public static final WoodType ZELKOVA = register("zelkova"); public static final WoodType SYTHIAN = register("sythian"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 6920c5a89d..83b796a0dd 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -107,7 +107,11 @@ public enum BYGWoodTypes { REDWOOD("redwood", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_REDWOOD_SAPLING) .boatType(BYGBoatEntity.BYGType.REDWOOD) - .materialColor(MaterialColor.COLOR_GREEN)); + .materialColor(MaterialColor.COLOR_GREEN)), + WILLOW("willow", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_WILLOW_SAPLING) + .boatType(BYGBoatEntity.BYGType.WILLOW) + .materialColor(MaterialColor.TERRACOTTA_GREEN)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java b/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java index 89cf9066a4..e437bcb70d 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java @@ -9,7 +9,6 @@ import potionstudios.byg.reg.RegistrationProvider; import potionstudios.byg.reg.RegistryObject; -@SuppressWarnings("deprecation") public class BYGEntities { private static final RegistrationProvider> PROVIDER = RegistrationProvider.get(Registry.ENTITY_TYPE_REGISTRY, BYG.MOD_ID); diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 25a6594677..5091e4a1fd 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -393,6 +393,31 @@ public class BYGItems { public static final RegistryObject STRIPPED_PALO_VERDE_LOG = createItem(BYGBlocks.STRIPPED_PALO_VERDE_LOG); public static final RegistryObject STRIPPED_PALO_VERDE_WOOD = createItem(BYGBlocks.STRIPPED_PALO_VERDE_WOOD); + //Skyris Woodtype + public static final RegistryObject SKYRIS_LEAVES_GREEN_APPLE = createItem(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE); + public static final RegistryObject GREEN_APPLE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.35f).build())), "green_apple"); + public static final RegistryObject GREEN_APPLE_PIE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.4f).effect(new MobEffectInstance(MobEffects.DIG_SPEED, 200, 0), 1.0F).build())), "green_apple_pie"); + public static final RegistryObject SKYRIS_SAPLING = createSaplingItem(BYGBlocks.SKYRIS_SAPLING); + public static final RegistryObject SKYRIS_VINE = createItem(BYGBlocks.SKYRIS_VINE); + public static final RegistryObject SKYRIS_LEAVES = createItem(BYGBlocks.SKYRIS_LEAVES); + public static final RegistryObject SKYRIS_LOG = createItem(BYGBlocks.SKYRIS_LOG); + public static final RegistryObject SKYRIS_WOOD = createItem(BYGBlocks.SKYRIS_WOOD); + public static final RegistryObject STRIPPED_SKYRIS_LOG = createItem(BYGBlocks.STRIPPED_SKYRIS_LOG); + public static final RegistryObject STRIPPED_SKYRIS_WOOD = createItem(BYGBlocks.STRIPPED_SKYRIS_WOOD); + public static final RegistryObject SKYRIS_PLANKS = createItem(BYGBlocks.SKYRIS_PLANKS); + public static final RegistryObject SKYRIS_BOOKSHELF = createItem(BYGBlocks.SKYRIS_BOOKSHELF); + public static final RegistryObject SKYRIS_CRAFTING_TABLE = createItem(BYGBlocks.SKYRIS_CRAFTING_TABLE); + public static final RegistryObject SKYRIS_STAIRS = createItem(BYGBlocks.SKYRIS_STAIRS); + public static final RegistryObject SKYRIS_SLAB = createItem(BYGBlocks.SKYRIS_SLAB); + public static final RegistryObject SKYRIS_FENCE = createItem(BYGBlocks.SKYRIS_FENCE); + public static final RegistryObject SKYRIS_FENCE_GATE = createItem(BYGBlocks.SKYRIS_FENCE_GATE); + public static final RegistryObject SKYRIS_DOOR = createItem(BYGBlocks.SKYRIS_DOOR); + public static final RegistryObject SKYRIS_TRAPDOOR = createItem(BYGBlocks.SKYRIS_TRAPDOOR); + public static final RegistryObject SKYRIS_PRESSURE_PLATE = createItem(BYGBlocks.SKYRIS_PRESSURE_PLATE); + public static final RegistryObject SKYRIS_BUTTON = createItem(BYGBlocks.SKYRIS_BUTTON); + public static final RegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGBlocks.SKYRIS_SIGN, BYGBlocks.SKYRIS_WALL_SIGN); + public static final RegistryObject SKYRIS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.SKYRIS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "skyris_boat"); + static { BYGWoodTypes.ASPEN.init(); @@ -449,54 +474,9 @@ public class BYGItems { BYGWoodTypes.PINE.init(); BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); BYGWoodTypes.REDWOOD.init(); + // TODO skyris } - //Skyris Woodtype - public static final RegistryObject SKYRIS_LEAVES_GREEN_APPLE = createItem(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE); - public static final RegistryObject GREEN_APPLE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.35f).build())), "green_apple"); - public static final RegistryObject GREEN_APPLE_PIE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.4f).effect(new MobEffectInstance(MobEffects.DIG_SPEED, 200, 0), 1.0F).build())), "green_apple_pie"); - public static final RegistryObject SKYRIS_SAPLING = createSaplingItem(BYGBlocks.SKYRIS_SAPLING); - public static final RegistryObject SKYRIS_VINE = createItem(BYGBlocks.SKYRIS_VINE); - public static final RegistryObject SKYRIS_LEAVES = createItem(BYGBlocks.SKYRIS_LEAVES); - public static final RegistryObject SKYRIS_LOG = createItem(BYGBlocks.SKYRIS_LOG); - public static final RegistryObject SKYRIS_WOOD = createItem(BYGBlocks.SKYRIS_WOOD); - public static final RegistryObject STRIPPED_SKYRIS_LOG = createItem(BYGBlocks.STRIPPED_SKYRIS_LOG); - public static final RegistryObject STRIPPED_SKYRIS_WOOD = createItem(BYGBlocks.STRIPPED_SKYRIS_WOOD); - public static final RegistryObject SKYRIS_PLANKS = createItem(BYGBlocks.SKYRIS_PLANKS); - public static final RegistryObject SKYRIS_BOOKSHELF = createItem(BYGBlocks.SKYRIS_BOOKSHELF); - public static final RegistryObject SKYRIS_CRAFTING_TABLE = createItem(BYGBlocks.SKYRIS_CRAFTING_TABLE); - public static final RegistryObject SKYRIS_STAIRS = createItem(BYGBlocks.SKYRIS_STAIRS); - public static final RegistryObject SKYRIS_SLAB = createItem(BYGBlocks.SKYRIS_SLAB); - public static final RegistryObject SKYRIS_FENCE = createItem(BYGBlocks.SKYRIS_FENCE); - public static final RegistryObject SKYRIS_FENCE_GATE = createItem(BYGBlocks.SKYRIS_FENCE_GATE); - public static final RegistryObject SKYRIS_DOOR = createItem(BYGBlocks.SKYRIS_DOOR); - public static final RegistryObject SKYRIS_TRAPDOOR = createItem(BYGBlocks.SKYRIS_TRAPDOOR); - public static final RegistryObject SKYRIS_PRESSURE_PLATE = createItem(BYGBlocks.SKYRIS_PRESSURE_PLATE); - public static final RegistryObject SKYRIS_BUTTON = createItem(BYGBlocks.SKYRIS_BUTTON); - public static final RegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGBlocks.SKYRIS_SIGN, BYGBlocks.SKYRIS_WALL_SIGN); - public static final RegistryObject SKYRIS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.SKYRIS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "skyris_boat"); - - //Willow Woodtype - public static final RegistryObject WILLOW_SAPLING = createSaplingItem(BYGBlocks.WILLOW_SAPLING); - public static final RegistryObject WILLOW_LEAVES = createItem(BYGBlocks.WILLOW_LEAVES); - public static final RegistryObject WILLOW_LOG = createItem(BYGBlocks.WILLOW_LOG); - public static final RegistryObject WILLOW_WOOD = createItem(BYGBlocks.WILLOW_WOOD); - public static final RegistryObject STRIPPED_WILLOW_LOG = createItem(BYGBlocks.STRIPPED_WILLOW_LOG); - public static final RegistryObject STRIPPED_WILLOW_WOOD = createItem(BYGBlocks.STRIPPED_WILLOW_WOOD); - public static final RegistryObject WILLOW_PLANKS = createItem(BYGBlocks.WILLOW_PLANKS); - public static final RegistryObject WILLOW_BOOKSHELF = createItem(BYGBlocks.WILLOW_BOOKSHELF); - public static final RegistryObject WILLOW_CRAFTING_TABLE = createItem(BYGBlocks.WILLOW_CRAFTING_TABLE); - public static final RegistryObject WILLOW_STAIRS = createItem(BYGBlocks.WILLOW_STAIRS); - public static final RegistryObject WILLOW_SLAB = createItem(BYGBlocks.WILLOW_SLAB); - public static final RegistryObject WILLOW_FENCE = createItem(BYGBlocks.WILLOW_FENCE); - public static final RegistryObject WILLOW_FENCE_GATE = createItem(BYGBlocks.WILLOW_FENCE_GATE); - public static final RegistryObject WILLOW_DOOR = createItem(BYGBlocks.WILLOW_DOOR); - public static final RegistryObject WILLOW_TRAPDOOR = createItem(BYGBlocks.WILLOW_TRAPDOOR); - public static final RegistryObject WILLOW_PRESSURE_PLATE = createItem(BYGBlocks.WILLOW_PRESSURE_PLATE); - public static final RegistryObject WILLOW_BUTTON = createItem(BYGBlocks.WILLOW_BUTTON); - public static final RegistryObject WILLOW_SIGN = createSign("willow_sign", BYGBlocks.WILLOW_SIGN, BYGBlocks.WILLOW_WALL_SIGN); - public static final RegistryObject WILLOW_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.WILLOW, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "willow_boat"); - //Witch-Hazel Woodtype public static final RegistryObject WITCH_HAZEL_BLOSSOM = createItem(BYGBlocks.WITCH_HAZEL_BLOSSOM); public static final RegistryObject WITCH_HAZEL_BRANCH = createItem(BYGBlocks.WITCH_HAZEL_BRANCH); diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_willow_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_willow_log.json deleted file mode 100644 index c3f9056e88..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_willow_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_willow_log" - }, - "axis=z": { - "model": "byg:block/stripped_willow_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_willow_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_willow_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_willow_wood.json deleted file mode 100644 index 4ffb200265..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_willow_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_willow_wood" - }, - "axis=z": { - "model": "byg:block/stripped_willow_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_willow_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/willow_bookshelf.json deleted file mode 100644 index 2b69706c71..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_button.json b/Common/src/main/resources/assets/byg/blockstates/willow_button.json deleted file mode 100644 index 9b4bcdfaf8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/willow_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/willow_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/willow_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/willow_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/willow_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/willow_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/willow_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/willow_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/willow_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/willow_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/willow_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/willow_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/willow_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/willow_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/willow_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/willow_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/willow_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/willow_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/willow_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/willow_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/willow_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/willow_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/willow_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/willow_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/willow_crafting_table.json deleted file mode 100644 index 5725e7839f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_door.json b/Common/src/main/resources/assets/byg/blockstates/willow_door.json deleted file mode 100644 index 203ec59992..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/willow_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/willow_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/willow_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/willow_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/willow_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/willow_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/willow_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/willow_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/willow_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/willow_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/willow_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/willow_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/willow_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/willow_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/willow_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/willow_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/willow_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/willow_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/willow_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/willow_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/willow_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/willow_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/willow_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/willow_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/willow_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/willow_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/willow_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_fence.json b/Common/src/main/resources/assets/byg/blockstates/willow_fence.json deleted file mode 100644 index 1dce841f98..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/willow_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/willow_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/willow_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/willow_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/willow_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/willow_fence_gate.json deleted file mode 100644 index d0fc3a4737..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/willow_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/willow_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/willow_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/willow_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/willow_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/willow_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/willow_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/willow_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/willow_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/willow_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/willow_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/willow_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/willow_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/willow_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/willow_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/willow_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_leaves.json b/Common/src/main/resources/assets/byg/blockstates/willow_leaves.json deleted file mode 100644 index e7ff922afc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_log.json b/Common/src/main/resources/assets/byg/blockstates/willow_log.json deleted file mode 100644 index 4b5365ad6c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/willow_log" - }, - "axis=z": { - "model": "byg:block/willow_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/willow_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_planks.json b/Common/src/main/resources/assets/byg/blockstates/willow_planks.json deleted file mode 100644 index 165179227a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/willow_pressure_plate.json deleted file mode 100644 index c2420a9fb4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/willow_pressure_plate" - }, - "powered=true": { - "model": "byg:block/willow_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_sapling.json b/Common/src/main/resources/assets/byg/blockstates/willow_sapling.json deleted file mode 100644 index 6e2a7cf844..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_slab.json b/Common/src/main/resources/assets/byg/blockstates/willow_slab.json deleted file mode 100644 index 570bf799a3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/willow_slab" - }, - "type=top": { - "model": "byg:block/willow_slab_top" - }, - "type=double": { - "model": "byg:block/willow_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_stairs.json b/Common/src/main/resources/assets/byg/blockstates/willow_stairs.json deleted file mode 100644 index 47d2c7f0a6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/willow_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/willow_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/willow_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/willow_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/willow_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/willow_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/willow_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/willow_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/willow_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/willow_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/willow_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/willow_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/willow_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/willow_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/willow_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/willow_trapdoor.json deleted file mode 100644 index 107c9ffafd..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/willow_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/willow_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/willow_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/willow_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/willow_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/willow_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/willow_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/willow_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/willow_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/willow_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/willow_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/willow_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/willow_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/willow_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/willow_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/willow_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_wood.json b/Common/src/main/resources/assets/byg/blockstates/willow_wood.json deleted file mode 100644 index 5664b4f41e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/willow_wood" - }, - "axis=z": { - "model": "byg:block/willow_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/willow_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_willow_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_willow_log.json deleted file mode 100644 index 9a61a77ecd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_willow_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_willow_log_top", - "up": "byg:block/stripped_willow_log_top", - "north": "byg:block/stripped_willow_log", - "east": "byg:block/stripped_willow_log", - "south": "byg:block/stripped_willow_log", - "west": "byg:block/stripped_willow_log", - "particle": "byg:block/stripped_willow_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_willow_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_willow_wood.json deleted file mode 100644 index 358d31a80d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_willow_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_willow_log", - "particle": "byg:block/stripped_willow_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/willow_bookshelf.json deleted file mode 100644 index a1e8c28f8d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/willow_planks", - "up": "byg:block/willow_planks", - "north": "byg:block/willow_bookshelf", - "east": "byg:block/willow_bookshelf", - "south": "byg:block/willow_bookshelf", - "west": "byg:block/willow_bookshelf", - "particle": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_button.json b/Common/src/main/resources/assets/byg/models/block/willow_button.json deleted file mode 100644 index 7eb2d586b7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/willow_button_inventory.json deleted file mode 100644 index 22694a15d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/willow_button_pressed.json deleted file mode 100644 index de565742f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/willow_crafting_table.json deleted file mode 100644 index d3e360c96d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/willow_crafting_table_front", - "down": "byg:block/willow_planks", - "up": "byg:block/willow_crafting_table_top", - "north": "byg:block/willow_crafting_table_front", - "east": "byg:block/willow_crafting_table_side", - "south": "byg:block/willow_crafting_table_side", - "west": "byg:block/willow_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/willow_door_bottom.json deleted file mode 100644 index 936dad258a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/willow_door_bottom", - "top": "byg:block/willow_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/willow_door_bottom_hinge.json deleted file mode 100644 index b094b28233..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/willow_door_bottom", - "top": "byg:block/willow_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_door_top.json b/Common/src/main/resources/assets/byg/models/block/willow_door_top.json deleted file mode 100644 index 74452d21cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/willow_door_bottom", - "top": "byg:block/willow_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/willow_door_top_hinge.json deleted file mode 100644 index ee63a1fac9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/willow_door_bottom", - "top": "byg:block/willow_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence.json b/Common/src/main/resources/assets/byg/models/block/willow_fence.json deleted file mode 100644 index e1d4c4b5bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/willow_planks", - "particle": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_gate.json deleted file mode 100644 index cd83859d98..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_open.json deleted file mode 100644 index f1e50d1b2e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall.json deleted file mode 100644 index 9c231bee1a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall_open.json deleted file mode 100644 index 9b3cbf8bf9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_inventory.json deleted file mode 100644 index 870cf4fc36..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/willow_planks", - "particle": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_fence_post.json b/Common/src/main/resources/assets/byg/models/block/willow_fence_post.json deleted file mode 100644 index 5262261ae1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/willow_planks", - "particle": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_leaves.json b/Common/src/main/resources/assets/byg/models/block/willow_leaves.json deleted file mode 100644 index 1a3a53798d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_leaves.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/willow_leaves", - "bottom": "byg:block/willow_leaves", - "top": "byg:block/willow_leaves", - "side": "byg:block/willow_leaves", - "overlay": "byg:block/willow_leaves" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#top", - "cullface": "up" - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "east" - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "up" - } - } - } - ] -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/willow_leaves_snowy.json deleted file mode 100644 index d503f87878..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/willow_leaves_snowy", - "up": "byg:block/willow_leaves_snowy", - "north": "byg:block/willow_leaves_snowy_side", - "east": "byg:block/willow_leaves_snowy_side", - "south": "byg:block/willow_leaves_snowy_side", - "west": "byg:block/willow_leaves_snowy_side", - "particle": "byg:block/willow_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_log.json b/Common/src/main/resources/assets/byg/models/block/willow_log.json deleted file mode 100644 index 88baaf8b8a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/willow_log_top", - "side": "byg:block/willow_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_planks.json b/Common/src/main/resources/assets/byg/models/block/willow_planks.json deleted file mode 100644 index 6d3fb4bfb2..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/willow_planks", - "particle": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate.json deleted file mode 100644 index e802c27b29..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate_down.json deleted file mode 100644 index 7b69b9c123..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_sapling.json b/Common/src/main/resources/assets/byg/models/block/willow_sapling.json deleted file mode 100644 index d1069fd60e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/willow_sapling", - "particle": "byg:block/willow_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_slab.json b/Common/src/main/resources/assets/byg/models/block/willow_slab.json deleted file mode 100644 index 1b2e86f5b6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/willow_planks", - "top": "byg:block/willow_planks", - "side": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_slab_top.json b/Common/src/main/resources/assets/byg/models/block/willow_slab_top.json deleted file mode 100644 index 77f5d6a35b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/willow_planks", - "top": "byg:block/willow_planks", - "side": "byg:block/willow_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_stairs.json b/Common/src/main/resources/assets/byg/models/block/willow_stairs.json deleted file mode 100644 index a550cd0e05..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/willow_planks", - "top": "byg:block/willow_planks", - "side": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/willow_stairs_inner.json deleted file mode 100644 index 94a33beb88..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/willow_planks", - "top": "byg:block/willow_planks", - "side": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/willow_stairs_outer.json deleted file mode 100644 index 2997d7896a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/willow_planks", - "top": "byg:block/willow_planks", - "side": "byg:block/willow_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_bottom.json deleted file mode 100644 index cefdd0ab4e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/willow_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_open.json deleted file mode 100644 index 3d6b00c215..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/willow_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_top.json deleted file mode 100644 index 5cc1ab84c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/willow_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/willow_wood.json b/Common/src/main/resources/assets/byg/models/block/willow_wood.json deleted file mode 100644 index d5687e8ea6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/willow_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/willow_log", - "particle": "byg:block/willow_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_willow_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_willow_log.json deleted file mode 100644 index 3cd90614e5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_willow_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_willow_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_willow_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_willow_wood.json deleted file mode 100644 index 606b814676..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_willow_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_willow_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_boat.json b/Common/src/main/resources/assets/byg/models/item/willow_boat.json deleted file mode 100644 index 2375f30946..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/willow_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/willow_bookshelf.json deleted file mode 100644 index 8e435293ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_button.json b/Common/src/main/resources/assets/byg/models/item/willow_button.json deleted file mode 100644 index 3933624d6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/willow_crafting_table.json deleted file mode 100644 index f0a7c2b3d0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_door.json b/Common/src/main/resources/assets/byg/models/item/willow_door.json deleted file mode 100644 index ccc1e5e0e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/willow_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_fence.json b/Common/src/main/resources/assets/byg/models/item/willow_fence.json deleted file mode 100644 index f22a05debc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/willow_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/willow_fence_gate.json deleted file mode 100644 index 7758a6d33d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_leaves.json b/Common/src/main/resources/assets/byg/models/item/willow_leaves.json deleted file mode 100644 index ffb443ea1e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_log.json b/Common/src/main/resources/assets/byg/models/item/willow_log.json deleted file mode 100644 index 3cc6773816..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_planks.json b/Common/src/main/resources/assets/byg/models/item/willow_planks.json deleted file mode 100644 index 7f069c1dad..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/willow_pressure_plate.json deleted file mode 100644 index 052d93cf84..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_sapling.json b/Common/src/main/resources/assets/byg/models/item/willow_sapling.json deleted file mode 100644 index 4f33371b53..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/willow_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_slab.json b/Common/src/main/resources/assets/byg/models/item/willow_slab.json deleted file mode 100644 index 4983768477..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_stairs.json b/Common/src/main/resources/assets/byg/models/item/willow_stairs.json deleted file mode 100644 index ad314c654a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/willow_trapdoor.json deleted file mode 100644 index 628b440fc7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_wood.json b/Common/src/main/resources/assets/byg/models/item/willow_wood.json deleted file mode 100644 index 8763b6b446..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/willow_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/willow/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/willow/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/willow/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/willow/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_door_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/willow/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_sapling.png b/Common/src/main/resources/assets/byg/textures/block/willow/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/willow/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_leaves.png b/Common/src/main/resources/assets/byg/textures/block/willow/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/willow/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_log.png b/Common/src/main/resources/assets/byg/textures/block/willow/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_log.png rename to Common/src/main/resources/assets/byg/textures/block/willow/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_log_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/willow/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_planks.png b/Common/src/main/resources/assets/byg/textures/block/willow/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_planks.png rename to Common/src/main/resources/assets/byg/textures/block/willow/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_willow_log.png b/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_willow_log.png rename to Common/src/main/resources/assets/byg/textures/block/willow/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_willow_log_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_willow_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/willow/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/willow_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/willow/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/willow_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/willow/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/willow_boat.png b/Common/src/main/resources/assets/byg/textures/item/willow/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/willow_boat.png rename to Common/src/main/resources/assets/byg/textures/item/willow/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/willow_door.png b/Common/src/main/resources/assets/byg/textures/item/willow/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/willow_door.png rename to Common/src/main/resources/assets/byg/textures/item/willow/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_willow_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_willow_wood.json deleted file mode 100644 index ef04026e50..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_willow_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_willow_log" - } - }, - "result": { - "item": "byg:stripped_willow_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_boat.json b/Common/src/main/resources/data/byg/recipes/willow_boat.json deleted file mode 100644 index 343b87b415..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_bookshelf.json b/Common/src/main/resources/data/byg/recipes/willow_bookshelf.json deleted file mode 100644 index ac6194774e..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:willow_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:willow_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_button.json b/Common/src/main/resources/data/byg/recipes/willow_button.json deleted file mode 100644 index 3e27b992b6..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:willow_planks" - } - ], - "result": { - "item": "byg:willow_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_crafting_table.json b/Common/src/main/resources/data/byg/recipes/willow_crafting_table.json deleted file mode 100644 index d5f3fd5c83..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_door.json b/Common/src/main/resources/data/byg/recipes/willow_door.json deleted file mode 100644 index 32b6cc7704..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_fence.json b/Common/src/main/resources/data/byg/recipes/willow_fence.json deleted file mode 100644 index 1844792486..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_fence_gate.json b/Common/src/main/resources/data/byg/recipes/willow_fence_gate.json deleted file mode 100644 index 7c00658110..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_planks.json b/Common/src/main/resources/data/byg/recipes/willow_planks.json deleted file mode 100644 index ff64211124..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:willow_logs" - } - ], - "result": { - "item": "byg:willow_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/willow_pressure_plate.json deleted file mode 100644 index bac321a87f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_slab.json b/Common/src/main/resources/data/byg/recipes/willow_slab.json deleted file mode 100644 index d70ccbc2ee..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_stairs.json b/Common/src/main/resources/data/byg/recipes/willow_stairs.json deleted file mode 100644 index 6b43b9a6da..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_trapdoor.json b/Common/src/main/resources/data/byg/recipes/willow_trapdoor.json deleted file mode 100644 index dc514c2548..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:willow_planks" - } - }, - "result": { - "item": "byg:willow_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/willow_wood.json b/Common/src/main/resources/data/byg/recipes/willow_wood.json deleted file mode 100644 index 3bf30e6f4c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/willow_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:willow_log" - } - }, - "result": { - "item": "byg:willow_wood", - "count": 3 - } -} \ No newline at end of file From 767ca6d3534bf298feb92ef1bf3c9a9ccb020bf8 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 12:58:54 +0300 Subject: [PATCH 41/90] Witch hazel --- .../byg/common/block/BYGBlocks.java | 21 +- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 36 +-- .../blockstates/stripped_witch_hazel_log.json | 16 -- .../stripped_witch_hazel_wood.json | 16 -- .../blockstates/witch_hazel_bookshelf.json | 7 - .../byg/blockstates/witch_hazel_button.json | 118 ---------- .../witch_hazel_crafting_table.json | 7 - .../byg/blockstates/witch_hazel_door.json | 124 ----------- .../byg/blockstates/witch_hazel_fence.json | 48 ---- .../blockstates/witch_hazel_fence_gate.json | 80 ------- .../byg/blockstates/witch_hazel_leaves.json | 7 - .../byg/blockstates/witch_hazel_log.json | 17 -- .../byg/blockstates/witch_hazel_planks.json | 7 - .../witch_hazel_pressure_plate.json | 10 - .../byg/blockstates/witch_hazel_sapling.json | 7 - .../byg/blockstates/witch_hazel_slab.json | 13 -- .../byg/blockstates/witch_hazel_stairs.json | 209 ------------------ .../byg/blockstates/witch_hazel_trapdoor.json | 69 ------ .../byg/blockstates/witch_hazel_wood.json | 16 -- .../block/stripped_witch_hazel_log.json | 12 - .../block/stripped_witch_hazel_wood.json | 7 - .../models/block/witch_hazel_bookshelf.json | 12 - .../byg/models/block/witch_hazel_button.json | 6 - .../block/witch_hazel_button_inventory.json | 6 - .../block/witch_hazel_button_pressed.json | 6 - .../block/witch_hazel_crafting_table.json | 12 - .../models/block/witch_hazel_door_bottom.json | 7 - .../block/witch_hazel_door_bottom_hinge.json | 7 - .../models/block/witch_hazel_door_top.json | 7 - .../block/witch_hazel_door_top_hinge.json | 7 - .../byg/models/block/witch_hazel_fence.json | 7 - .../models/block/witch_hazel_fence_gate.json | 6 - .../block/witch_hazel_fence_gate_open.json | 6 - .../block/witch_hazel_fence_gate_wall.json | 6 - .../witch_hazel_fence_gate_wall_open.json | 6 - .../block/witch_hazel_fence_inventory.json | 7 - .../models/block/witch_hazel_fence_post.json | 7 - .../byg/models/block/witch_hazel_leaves.json | 7 - .../block/witch_hazel_leaves_snowy.json | 12 - .../byg/models/block/witch_hazel_log.json | 7 - .../byg/models/block/witch_hazel_planks.json | 7 - .../block/witch_hazel_pressure_plate.json | 6 - .../witch_hazel_pressure_plate_down.json | 6 - .../byg/models/block/witch_hazel_sapling.json | 7 - .../byg/models/block/witch_hazel_slab.json | 8 - .../models/block/witch_hazel_slab_top.json | 8 - .../byg/models/block/witch_hazel_stairs.json | 8 - .../block/witch_hazel_stairs_inner.json | 8 - .../block/witch_hazel_stairs_outer.json | 8 - .../block/witch_hazel_trapdoor_bottom.json | 6 - .../block/witch_hazel_trapdoor_open.json | 6 - .../block/witch_hazel_trapdoor_top.json | 6 - .../byg/models/block/witch_hazel_wood.json | 7 - .../models/item/stripped_witch_hazel_log.json | 22 -- .../item/stripped_witch_hazel_wood.json | 22 -- .../byg/models/item/witch_hazel_boat.json | 6 - .../models/item/witch_hazel_bookshelf.json | 22 -- .../byg/models/item/witch_hazel_button.json | 22 -- .../item/witch_hazel_crafting_table.json | 22 -- .../byg/models/item/witch_hazel_door.json | 6 - .../byg/models/item/witch_hazel_fence.json | 3 - .../models/item/witch_hazel_fence_gate.json | 22 -- .../byg/models/item/witch_hazel_leaves.json | 22 -- .../byg/models/item/witch_hazel_log.json | 22 -- .../byg/models/item/witch_hazel_planks.json | 22 -- .../item/witch_hazel_pressure_plate.json | 22 -- .../byg/models/item/witch_hazel_sapling.json | 6 - .../byg/models/item/witch_hazel_slab.json | 22 -- .../byg/models/item/witch_hazel_stairs.json | 22 -- .../byg/models/item/witch_hazel_trapdoor.json | 22 -- .../byg/models/item/witch_hazel_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../boat.png} | Bin .../door.png} | Bin .../recipes/stripped_witch_hazel_wood.json | 16 -- .../data/byg/recipes/witch_hazel_boat.json | 16 -- .../byg/recipes/witch_hazel_bookshelf.json | 19 -- .../data/byg/recipes/witch_hazel_button.json | 12 - .../recipes/witch_hazel_crafting_table.json | 15 -- .../data/byg/recipes/witch_hazel_door.json | 18 -- .../data/byg/recipes/witch_hazel_fence.json | 20 -- .../byg/recipes/witch_hazel_fence_gate.json | 19 -- .../data/byg/recipes/witch_hazel_planks.json | 13 -- .../recipes/witch_hazel_pressure_plate.json | 15 -- .../data/byg/recipes/witch_hazel_slab.json | 16 -- .../data/byg/recipes/witch_hazel_stairs.json | 18 -- .../byg/recipes/witch_hazel_trapdoor.json | 17 -- .../data/byg/recipes/witch_hazel_wood.json | 16 -- 104 files changed, 17 insertions(+), 1628 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/witch_hazel_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_wood.json rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_bookshelf.png => witch_hazel/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_crafting_table.png => witch_hazel/crafting_table.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_crafting_table_front.png => witch_hazel/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_crafting_table_side.png => witch_hazel/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_crafting_table_top.png => witch_hazel/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_door_bottom.png => witch_hazel/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_door_top.png => witch_hazel/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_sapling.png => witch_hazel/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_leaves.png => witch_hazel/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_log.png => witch_hazel/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_log_top.png => witch_hazel/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_planks.png => witch_hazel/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_witch_hazel_log.png => witch_hazel/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_witch_hazel_log_top.png => witch_hazel/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{witch_hazel_trapdoor.png => witch_hazel/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{witch_hazel_boat.png => witch_hazel/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{witch_hazel_door.png => witch_hazel/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_witch_hazel_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/witch_hazel_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 484af1628c..535148e081 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -65,7 +65,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); - public static final BlockRegistryObject WITCH_HAZEL_PLANKS = createPlanks("witch_hazel_planks"); public static final BlockRegistryObject ZELKOVA_PLANKS = createPlanks("zelkova_planks"); public static final BlockRegistryObject SYTHIAN_PLANKS = createPlanks("sythian_planks"); public static final BlockRegistryObject EMBUR_PLANKS = createPlanks("embur_planks"); @@ -75,7 +74,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); - public static final BlockRegistryObject WITCH_HAZEL_BOOKSHELF = createBookshelf("witch_hazel_bookshelf"); public static final BlockRegistryObject ZELKOVA_BOOKSHELF = createBookshelf("zelkova_bookshelf"); public static final BlockRegistryObject SYTHIAN_BOOKSHELF = createBookshelf("sythian_bookshelf"); public static final BlockRegistryObject EMBUR_BOOKSHELF = createBookshelf("embur_bookshelf"); @@ -85,7 +83,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); - public static final BlockRegistryObject WITCH_HAZEL_DOOR = createDoor("witch_hazel_door"); public static final BlockRegistryObject ZELKOVA_DOOR = createDoor("zelkova_door"); public static final BlockRegistryObject SYTHIAN_DOOR = createDoor("sythian_door"); public static final BlockRegistryObject EMBUR_DOOR = createDoor("embur_door"); @@ -95,7 +92,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); - public static final BlockRegistryObject WITCH_HAZEL_PRESSURE_PLATE = createWoodPressurePlate("witch_hazel_pressure_plate"); public static final BlockRegistryObject ZELKOVA_PRESSURE_PLATE = createWoodPressurePlate("zelkova_pressure_plate"); public static final BlockRegistryObject SYTHIAN_PRESSURE_PLATE = createWoodPressurePlate("sythian_pressure_plate"); public static final BlockRegistryObject EMBUR_PRESSURE_PLATE = createWoodPressurePlate("embur_pressure_plate"); @@ -105,7 +101,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); - public static final BlockRegistryObject WITCH_HAZEL_BUTTON = createWoodButton("witch_hazel_button"); public static final BlockRegistryObject ZELKOVA_BUTTON = createWoodButton("zelkova_button"); public static final BlockRegistryObject SYTHIAN_BUTTON = createWoodButton("sythian_button"); public static final BlockRegistryObject EMBUR_BUTTON = createWoodButton("embur_button"); @@ -115,7 +110,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); - public static final BlockRegistryObject WITCH_HAZEL_TRAPDOOR = createTrapDoor("witch_hazel_trapdoor"); public static final BlockRegistryObject ZELKOVA_TRAPDOOR = createTrapDoor("zelkova_trapdoor"); public static final BlockRegistryObject SYTHIAN_TRAPDOOR = createTrapDoor("sythian_trapdoor"); public static final BlockRegistryObject EMBUR_TRAPDOOR = createTrapDoor("embur_trapdoor"); @@ -125,7 +119,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); - public static final BlockRegistryObject WITCH_HAZEL_CRAFTING_TABLE = createCraftingTable("witch_hazel_crafting_table"); public static final BlockRegistryObject ZELKOVA_CRAFTING_TABLE = createCraftingTable("zelkova_crafting_table"); public static final BlockRegistryObject SYTHIAN_CRAFTING_TABLE = createCraftingTable("sythian_crafting_table"); public static final BlockRegistryObject EMBUR_CRAFTING_TABLE = createCraftingTable("embur_crafting_table"); @@ -135,7 +128,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); - public static final BlockRegistryObject WITCH_HAZEL_FENCE_GATE = createFenceGate("witch_hazel_fence_gate"); public static final BlockRegistryObject ZELKOVA_FENCE_GATE = createFenceGate("zelkova_fence_gate"); public static final BlockRegistryObject SYTHIAN_FENCE_GATE = createFenceGate("sythian_fence_gate"); public static final BlockRegistryObject EMBUR_FENCE_GATE = createFenceGate("embur_fence_gate"); @@ -145,7 +137,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); - public static final BlockRegistryObject WITCH_HAZEL_SLAB = createWoodSlab("witch_hazel_slab"); public static final BlockRegistryObject ZELKOVA_SLAB = createWoodSlab("zelkova_slab"); public static final BlockRegistryObject SYTHIAN_SLAB = createWoodSlab("sythian_slab"); public static final BlockRegistryObject EMBUR_SLAB = createWoodSlab("embur_slab"); @@ -155,7 +146,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); - public static final BlockRegistryObject WITCH_HAZEL_STAIRS = createWoodStairs("witch_hazel_stairs"); public static final BlockRegistryObject ZELKOVA_STAIRS = createWoodStairs("zelkova_stairs"); public static final BlockRegistryObject SYTHIAN_STAIRS = createWoodStairs("sythian_stairs"); public static final BlockRegistryObject EMBUR_STAIRS = createWoodStairs("embur_stairs"); @@ -165,7 +155,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); - public static final BlockRegistryObject WITCH_HAZEL_FENCE = createFence("witch_hazel_fence"); public static final BlockRegistryObject ZELKOVA_FENCE = createFence("zelkova_fence"); public static final BlockRegistryObject SYTHIAN_FENCE = createFence("sythian_fence"); public static final BlockRegistryObject EMBUR_FENCE = createFence("embur_fence"); @@ -175,7 +164,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject WITCH_HAZEL_SIGN = createSign("witch_hazel_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); public static final BlockRegistryObject ZELKOVA_SIGN = createSign("zelkova_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_SIGN = createSign("embur_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); @@ -185,7 +173,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject WITCH_HAZEL_WALL_SIGN = createWallSign("witch_hazel_wall_sign", BYGWoodType.WITCH_HAZEL, WITCH_HAZEL_PLANKS); public static final BlockRegistryObject ZELKOVA_WALL_SIGN = createWallSign("zelkova_wall_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_WALL_SIGN = createWallSign("sythian_wall_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_WALL_SIGN = createWallSign("embur_wall_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); @@ -227,7 +214,6 @@ public class BYGBlocks { public static final BlockRegistryObject SILVER_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_SILVER_MAPLE_SAPLING, "silver_maple_sapling"); public static final BlockRegistryObject SKYRIS_SAPLING = createSapling(BYGBlockTags.GROUND_SKYRIS_SAPLING, "skyris_sapling"); public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); - public static final BlockRegistryObject WITCH_HAZEL_SAPLING = createSapling(BYGBlockTags.GROUND_WITCH_HAZEL_SAPLING, "witch_hazel_sapling"); public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); public static final BlockRegistryObject ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_ZELKOVA_SAPLING, "zelkova_sapling"); @@ -243,8 +229,8 @@ public class BYGBlocks { public static final BlockRegistryObject WITCH_HAZEL_BLOSSOM = createWitchHazelBlossomBlock(MaterialColor.COLOR_YELLOW, "witch_hazel_blossom"); public static final BlockRegistryObject ARAUCARIA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "araucaria_leaves"); - public static final BlockRegistryObject BLOOMING_WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "blooming_witch_hazel_leaves"); public static final BlockRegistryObject BLUE_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_BLUE, "blue_spruce_leaves"); + public static final BlockRegistryObject BLOOMING_WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "blooming_witch_hazel_leaves"); public static final BlockRegistryObject BROWN_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_birch_leaves"); public static final BlockRegistryObject BROWN_OAK_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_oak_leaves"); public static final BlockRegistryObject BROWN_ZELKOVA_LEAVES = createLeaves(MaterialColor.COLOR_BROWN, "brown_zelkova_leaves"); @@ -273,7 +259,6 @@ public class BYGBlocks { public static final BlockRegistryObject SKYRIS_LEAVES_GREEN_APPLE = createLeaves(MaterialColor.COLOR_PINK, "green_apple_skyris_leaves"); public static final BlockRegistryObject SKYRIS_LEAVES = createLeaves(MaterialColor.COLOR_PINK, "skyris_leaves"); public static final BlockRegistryObject WHITE_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "white_cherry_leaves"); - public static final BlockRegistryObject WITCH_HAZEL_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "witch_hazel_leaves"); public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); public static final BlockRegistryObject ZELKOVA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_RED, "zelkova_leaves"); @@ -567,7 +552,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); - public static final BlockRegistryObject WITCH_HAZEL_LOG = createLog("witch_hazel_log"); public static final BlockRegistryObject ZELKOVA_LOG = createLog("zelkova_log"); public static final BlockRegistryObject SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "sythian_stem"); public static final BlockRegistryObject EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "embur_pedu"); @@ -582,7 +566,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); - public static final BlockRegistryObject WITCH_HAZEL_WOOD = createWood("witch_hazel_wood"); public static final BlockRegistryObject ZELKOVA_WOOD = createWood("zelkova_wood"); public static final BlockRegistryObject SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "sythian_hyphae"); public static final BlockRegistryObject EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "embur_hyphae"); @@ -720,7 +703,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); - public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_LOG = createStrippedLog("stripped_witch_hazel_log"); public static final BlockRegistryObject STRIPPED_ZELKOVA_LOG = createStrippedLog("stripped_zelkova_log"); public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); public static final BlockRegistryObject STRIPPED_EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_embur_pedu"); @@ -731,7 +713,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); - public static final BlockRegistryObject STRIPPED_WITCH_HAZEL_WOOD = createWood("stripped_witch_hazel_wood"); public static final BlockRegistryObject STRIPPED_ZELKOVA_WOOD = createWood("stripped_zelkova_wood"); public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); public static final BlockRegistryObject STRIPPED_EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_embur_hyphae"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index e62d007413..adb9b5b0a2 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -12,7 +12,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); - public static final WoodType WITCH_HAZEL = register("witch_hazel"); public static final WoodType ZELKOVA = register("zelkova"); public static final WoodType SYTHIAN = register("sythian"); public static final WoodType EMBUR = register("embur"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 83b796a0dd..f07ec468f8 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -111,7 +111,11 @@ public enum BYGWoodTypes { WILLOW("willow", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_WILLOW_SAPLING) .boatType(BYGBoatEntity.BYGType.WILLOW) - .materialColor(MaterialColor.TERRACOTTA_GREEN)); + .materialColor(MaterialColor.TERRACOTTA_GREEN)), + WITCH_HAZEL("witch_hazel", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_WITCH_HAZEL_SAPLING) + .boatType(BYGBoatEntity.BYGType.WITCH_HAZEL) + .materialColor(MaterialColor.COLOR_ORANGE)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 5091e4a1fd..dc278cd6e1 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -418,6 +418,12 @@ public class BYGItems { public static final RegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGBlocks.SKYRIS_SIGN, BYGBlocks.SKYRIS_WALL_SIGN); public static final RegistryObject SKYRIS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.SKYRIS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "skyris_boat"); + //Witch-Hazel Woodtype + public static final RegistryObject WITCH_HAZEL_BLOSSOM; + public static final RegistryObject WITCH_HAZEL_BRANCH; + + public static final RegistryObject BLOOMING_WITCH_HAZEL_LEAVES; + static { BYGWoodTypes.ASPEN.init(); @@ -475,32 +481,12 @@ public class BYGItems { BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); BYGWoodTypes.REDWOOD.init(); // TODO skyris - } - //Witch-Hazel Woodtype - public static final RegistryObject WITCH_HAZEL_BLOSSOM = createItem(BYGBlocks.WITCH_HAZEL_BLOSSOM); - public static final RegistryObject WITCH_HAZEL_BRANCH = createItem(BYGBlocks.WITCH_HAZEL_BRANCH); - - public static final RegistryObject BLOOMING_WITCH_HAZEL_LEAVES = createItem(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES); - public static final RegistryObject WITCH_HAZEL_SAPLING = createSaplingItem(BYGBlocks.WITCH_HAZEL_SAPLING); - public static final RegistryObject WITCH_HAZEL_LEAVES = createItem(BYGBlocks.WITCH_HAZEL_LEAVES); - public static final RegistryObject WITCH_HAZEL_LOG = createItem(BYGBlocks.WITCH_HAZEL_LOG); - public static final RegistryObject WITCH_HAZEL_WOOD = createItem(BYGBlocks.WITCH_HAZEL_WOOD); - public static final RegistryObject STRIPPED_WITCH_HAZEL_LOG = createItem(BYGBlocks.STRIPPED_WITCH_HAZEL_LOG); - public static final RegistryObject STRIPPED_WITCH_HAZEL_WOOD = createItem(BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD); - public static final RegistryObject WITCH_HAZEL_PLANKS = createItem(BYGBlocks.WITCH_HAZEL_PLANKS); - public static final RegistryObject WITCH_HAZEL_BOOKSHELF = createItem(BYGBlocks.WITCH_HAZEL_BOOKSHELF); - public static final RegistryObject WITCH_HAZEL_CRAFTING_TABLE = createItem(BYGBlocks.WITCH_HAZEL_CRAFTING_TABLE); - public static final RegistryObject WITCH_HAZEL_STAIRS = createItem(BYGBlocks.WITCH_HAZEL_STAIRS); - public static final RegistryObject WITCH_HAZEL_SLAB = createItem(BYGBlocks.WITCH_HAZEL_SLAB); - public static final RegistryObject WITCH_HAZEL_FENCE = createItem(BYGBlocks.WITCH_HAZEL_FENCE); - public static final RegistryObject WITCH_HAZEL_FENCE_GATE = createItem(BYGBlocks.WITCH_HAZEL_FENCE_GATE); - public static final RegistryObject WITCH_HAZEL_DOOR = createItem(BYGBlocks.WITCH_HAZEL_DOOR); - public static final RegistryObject WITCH_HAZEL_TRAPDOOR = createItem(BYGBlocks.WITCH_HAZEL_TRAPDOOR); - public static final RegistryObject WITCH_HAZEL_PRESSURE_PLATE = createItem(BYGBlocks.WITCH_HAZEL_PRESSURE_PLATE); - public static final RegistryObject WITCH_HAZEL_BUTTON = createItem(BYGBlocks.WITCH_HAZEL_BUTTON); - public static final RegistryObject WITCH_HAZEL_SIGN = createSign("witch_hazel_sign", BYGBlocks.WITCH_HAZEL_SIGN, BYGBlocks.WITCH_HAZEL_WALL_SIGN); - public static final RegistryObject WITCH_HAZEL_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.WITCH_HAZEL, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "witch_hazel_boat"); + WITCH_HAZEL_BLOSSOM = createItem(BYGBlocks.WITCH_HAZEL_BLOSSOM); + WITCH_HAZEL_BRANCH = createItem(BYGBlocks.WITCH_HAZEL_BRANCH); + BLOOMING_WITCH_HAZEL_LEAVES = createItem(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES); + BYGWoodTypes.WITCH_HAZEL.init(); + } //Zelkova Woodtype public static final RegistryObject ZELKOVA_SAPLING = createSaplingItem(BYGBlocks.ZELKOVA_SAPLING); diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_log.json deleted file mode 100644 index 9f7621386e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_witch_hazel_log" - }, - "axis=z": { - "model": "byg:block/stripped_witch_hazel_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_witch_hazel_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json deleted file mode 100644 index e0f230acb2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_witch_hazel_wood" - }, - "axis=z": { - "model": "byg:block/stripped_witch_hazel_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_witch_hazel_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_bookshelf.json deleted file mode 100644 index 7701696915..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_button.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_button.json deleted file mode 100644 index 7b1eb7f4ff..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/witch_hazel_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/witch_hazel_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/witch_hazel_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/witch_hazel_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/witch_hazel_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/witch_hazel_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/witch_hazel_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/witch_hazel_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/witch_hazel_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/witch_hazel_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/witch_hazel_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/witch_hazel_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/witch_hazel_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/witch_hazel_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_crafting_table.json deleted file mode 100644 index fe9061a24d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_door.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_door.json deleted file mode 100644 index 6e1a55e236..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence.json deleted file mode 100644 index d33f890374..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/witch_hazel_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/witch_hazel_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/witch_hazel_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/witch_hazel_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/witch_hazel_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence_gate.json deleted file mode 100644 index 85957c1312..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/witch_hazel_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/witch_hazel_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/witch_hazel_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/witch_hazel_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/witch_hazel_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/witch_hazel_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/witch_hazel_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/witch_hazel_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/witch_hazel_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/witch_hazel_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/witch_hazel_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/witch_hazel_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/witch_hazel_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/witch_hazel_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/witch_hazel_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/witch_hazel_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_leaves.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_leaves.json deleted file mode 100644 index 15eca454e4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_log.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_log.json deleted file mode 100644 index 3477014f0a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/witch_hazel_log" - }, - "axis=z": { - "model": "byg:block/witch_hazel_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/witch_hazel_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_planks.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_planks.json deleted file mode 100644 index 933aa67d7b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json deleted file mode 100644 index 7e26a17118..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/witch_hazel_pressure_plate" - }, - "powered=true": { - "model": "byg:block/witch_hazel_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sapling.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sapling.json deleted file mode 100644 index fdabd7fb09..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_slab.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_slab.json deleted file mode 100644 index 9ed57f4b8b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/witch_hazel_slab" - }, - "type=top": { - "model": "byg:block/witch_hazel_slab_top" - }, - "type=double": { - "model": "byg:block/witch_hazel_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_stairs.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_stairs.json deleted file mode 100644 index 7cd824fec7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/witch_hazel_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_trapdoor.json deleted file mode 100644 index 179c2de7a1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/witch_hazel_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/witch_hazel_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/witch_hazel_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/witch_hazel_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/witch_hazel_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/witch_hazel_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/witch_hazel_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/witch_hazel_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/witch_hazel_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wood.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wood.json deleted file mode 100644 index cf6de07c2f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/witch_hazel_wood" - }, - "axis=z": { - "model": "byg:block/witch_hazel_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/witch_hazel_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_log.json deleted file mode 100644 index fd6ce4e37b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_witch_hazel_log_top", - "up": "byg:block/stripped_witch_hazel_log_top", - "north": "byg:block/stripped_witch_hazel_log", - "east": "byg:block/stripped_witch_hazel_log", - "south": "byg:block/stripped_witch_hazel_log", - "west": "byg:block/stripped_witch_hazel_log", - "particle": "byg:block/stripped_witch_hazel_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_wood.json deleted file mode 100644 index 6d460827e7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_witch_hazel_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_witch_hazel_log", - "particle": "byg:block/stripped_witch_hazel_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_bookshelf.json deleted file mode 100644 index 39d667ff58..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/witch_hazel_planks", - "up": "byg:block/witch_hazel_planks", - "north": "byg:block/witch_hazel_bookshelf", - "east": "byg:block/witch_hazel_bookshelf", - "south": "byg:block/witch_hazel_bookshelf", - "west": "byg:block/witch_hazel_bookshelf", - "particle": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_button.json deleted file mode 100644 index b5127a4cc3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_inventory.json deleted file mode 100644 index 63d4e0fddf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_pressed.json deleted file mode 100644 index 7badc9a3fa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_crafting_table.json deleted file mode 100644 index f875e2660f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/witch_hazel_crafting_table_front", - "down": "byg:block/witch_hazel_planks", - "up": "byg:block/witch_hazel_crafting_table_top", - "north": "byg:block/witch_hazel_crafting_table_front", - "east": "byg:block/witch_hazel_crafting_table_side", - "south": "byg:block/witch_hazel_crafting_table_side", - "west": "byg:block/witch_hazel_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom.json deleted file mode 100644 index 49fa252c34..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/witch_hazel_door_bottom", - "top": "byg:block/witch_hazel_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom_hinge.json deleted file mode 100644 index e0ae6d4d25..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/witch_hazel_door_bottom", - "top": "byg:block/witch_hazel_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top.json deleted file mode 100644 index a619a262ff..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/witch_hazel_door_bottom", - "top": "byg:block/witch_hazel_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top_hinge.json deleted file mode 100644 index 6ce82207ec..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/witch_hazel_door_bottom", - "top": "byg:block/witch_hazel_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence.json deleted file mode 100644 index 9fcd4dfc6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/witch_hazel_planks", - "particle": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate.json deleted file mode 100644 index 01dadd50fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_open.json deleted file mode 100644 index 5f19a817f8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall.json deleted file mode 100644 index 2f38916c37..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall_open.json deleted file mode 100644 index f8375beff6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_inventory.json deleted file mode 100644 index abdfdb3883..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/witch_hazel_planks", - "particle": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_post.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_post.json deleted file mode 100644 index 64e7d9db55..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/witch_hazel_planks", - "particle": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves.json deleted file mode 100644 index d7cde9b8fd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/witch_hazel_leaves", - "particle": "byg:block/witch_hazel_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves_snowy.json deleted file mode 100644 index e0d7165746..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/witch_hazel_leaves_snowy", - "up": "byg:block/witch_hazel_leaves_snowy", - "north": "byg:block/witch_hazel_leaves_snowy_side", - "east": "byg:block/witch_hazel_leaves_snowy_side", - "south": "byg:block/witch_hazel_leaves_snowy_side", - "west": "byg:block/witch_hazel_leaves_snowy_side", - "particle": "byg:block/witch_hazel_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_log.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_log.json deleted file mode 100644 index 9d4da9217b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/witch_hazel_log_top", - "side": "byg:block/witch_hazel_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_planks.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_planks.json deleted file mode 100644 index b700500cdb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/witch_hazel_planks", - "particle": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate.json deleted file mode 100644 index 544579f630..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate_down.json deleted file mode 100644 index 5580a361ee..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_sapling.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_sapling.json deleted file mode 100644 index 00ed3d1cc4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/witch_hazel_sapling", - "particle": "byg:block/witch_hazel_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab.json deleted file mode 100644 index d69bb70079..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/witch_hazel_planks", - "top": "byg:block/witch_hazel_planks", - "side": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab_top.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab_top.json deleted file mode 100644 index e0ca44d174..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/witch_hazel_planks", - "top": "byg:block/witch_hazel_planks", - "side": "byg:block/witch_hazel_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs.json deleted file mode 100644 index 483077f337..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/witch_hazel_planks", - "top": "byg:block/witch_hazel_planks", - "side": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_inner.json deleted file mode 100644 index ad35467b74..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/witch_hazel_planks", - "top": "byg:block/witch_hazel_planks", - "side": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_outer.json deleted file mode 100644 index 80408a414d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/witch_hazel_planks", - "top": "byg:block/witch_hazel_planks", - "side": "byg:block/witch_hazel_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_bottom.json deleted file mode 100644 index b8ae52fa42..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/witch_hazel_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_open.json deleted file mode 100644 index 0086573fd6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/witch_hazel_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_top.json deleted file mode 100644 index b44bf3e763..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/witch_hazel_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/witch_hazel_wood.json b/Common/src/main/resources/assets/byg/models/block/witch_hazel_wood.json deleted file mode 100644 index e0b9ddf387..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/witch_hazel_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/witch_hazel_log", - "particle": "byg:block/witch_hazel_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_log.json deleted file mode 100644 index ba7dfb0db1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_witch_hazel_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_wood.json deleted file mode 100644 index 54e93d8cf2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_witch_hazel_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_witch_hazel_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_boat.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_boat.json deleted file mode 100644 index 689fb2ed51..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/witch_hazel_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_bookshelf.json deleted file mode 100644 index 2c2612427d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_button.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_button.json deleted file mode 100644 index a58b8a94d0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_crafting_table.json deleted file mode 100644 index 1a245d099e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_door.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_door.json deleted file mode 100644 index 285a799b34..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/witch_hazel_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence.json deleted file mode 100644 index 96b71c3aa2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence_gate.json deleted file mode 100644 index ba2dc693e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_leaves.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_leaves.json deleted file mode 100644 index 69e08fb8e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_log.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_log.json deleted file mode 100644 index ff01346f4a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_planks.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_planks.json deleted file mode 100644 index ff53468017..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_pressure_plate.json deleted file mode 100644 index 9a241454c6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_sapling.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_sapling.json deleted file mode 100644 index f9c6ed9db8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/witch_hazel_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_slab.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_slab.json deleted file mode 100644 index 9f84945b39..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_stairs.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_stairs.json deleted file mode 100644 index 0a5ea7ee67..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_trapdoor.json deleted file mode 100644 index eb1065e075..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_wood.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_wood.json deleted file mode 100644 index eec6b5eb15..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/witch_hazel_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_door_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_sapling.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_leaves.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_log.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_log.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_log_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_planks.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_planks.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_witch_hazel_log.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_witch_hazel_log.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_witch_hazel_log_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_witch_hazel_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/witch_hazel_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/witch_hazel/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/witch_hazel_boat.png b/Common/src/main/resources/assets/byg/textures/item/witch_hazel/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/witch_hazel_boat.png rename to Common/src/main/resources/assets/byg/textures/item/witch_hazel/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/witch_hazel_door.png b/Common/src/main/resources/assets/byg/textures/item/witch_hazel/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/witch_hazel_door.png rename to Common/src/main/resources/assets/byg/textures/item/witch_hazel/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_witch_hazel_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_witch_hazel_wood.json deleted file mode 100644 index fc09b6d096..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_witch_hazel_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_witch_hazel_log" - } - }, - "result": { - "item": "byg:stripped_witch_hazel_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_boat.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_boat.json deleted file mode 100644 index 36519513f7..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_bookshelf.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_bookshelf.json deleted file mode 100644 index cf28a6b207..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:witch_hazel_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_button.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_button.json deleted file mode 100644 index 409a029523..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:witch_hazel_planks" - } - ], - "result": { - "item": "byg:witch_hazel_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_crafting_table.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_crafting_table.json deleted file mode 100644 index 30acdb19f8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_door.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_door.json deleted file mode 100644 index ab19b48222..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_fence.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_fence.json deleted file mode 100644 index 8cb4e5a2c9..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_fence_gate.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_fence_gate.json deleted file mode 100644 index 1c7b065d8d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_planks.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_planks.json deleted file mode 100644 index 338970704d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:witch_hazel_logs" - } - ], - "result": { - "item": "byg:witch_hazel_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_pressure_plate.json deleted file mode 100644 index 959bed3b7a..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_slab.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_slab.json deleted file mode 100644 index cbea3e7da8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_stairs.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_stairs.json deleted file mode 100644 index 8395cdbaf5..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_trapdoor.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_trapdoor.json deleted file mode 100644 index f935de6b8f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:witch_hazel_planks" - } - }, - "result": { - "item": "byg:witch_hazel_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_wood.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_wood.json deleted file mode 100644 index 0e876ee5ab..0000000000 --- a/Common/src/main/resources/data/byg/recipes/witch_hazel_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:witch_hazel_log" - } - }, - "result": { - "item": "byg:witch_hazel_wood", - "count": 3 - } -} \ No newline at end of file From 834a0c6a2793f003f940518f64ee91ff5078d76d Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 13:04:16 +0300 Subject: [PATCH 42/90] Zelkova --- .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/item/BYGItems.java | 23 +- .../byg/blockstates/stripped_zelkova_log.json | 16 -- .../blockstates/stripped_zelkova_wood.json | 16 -- .../byg/blockstates/zelkova_bookshelf.json | 7 - .../byg/blockstates/zelkova_button.json | 118 ---------- .../blockstates/zelkova_crafting_table.json | 7 - .../assets/byg/blockstates/zelkova_door.json | 124 ----------- .../assets/byg/blockstates/zelkova_fence.json | 48 ---- .../byg/blockstates/zelkova_fence_gate.json | 80 ------- .../byg/blockstates/zelkova_leaves.json | 7 - .../assets/byg/blockstates/zelkova_log.json | 17 -- .../byg/blockstates/zelkova_planks.json | 7 - .../blockstates/zelkova_pressure_plate.json | 10 - .../byg/blockstates/zelkova_sapling.json | 7 - .../assets/byg/blockstates/zelkova_slab.json | 13 -- .../byg/blockstates/zelkova_stairs.json | 209 ------------------ .../byg/blockstates/zelkova_trapdoor.json | 69 ------ .../assets/byg/blockstates/zelkova_wood.json | 16 -- .../models/block/stripped_zelkova_log.json | 12 - .../models/block/stripped_zelkova_wood.json | 7 - .../byg/models/block/zelkova_bookshelf.json | 12 - .../byg/models/block/zelkova_button.json | 6 - .../block/zelkova_button_inventory.json | 6 - .../models/block/zelkova_button_pressed.json | 6 - .../models/block/zelkova_crafting_table.json | 12 - .../byg/models/block/zelkova_door_bottom.json | 7 - .../block/zelkova_door_bottom_hinge.json | 7 - .../byg/models/block/zelkova_door_top.json | 7 - .../models/block/zelkova_door_top_hinge.json | 7 - .../byg/models/block/zelkova_fence.json | 7 - .../byg/models/block/zelkova_fence_gate.json | 6 - .../models/block/zelkova_fence_gate_open.json | 6 - .../models/block/zelkova_fence_gate_wall.json | 6 - .../block/zelkova_fence_gate_wall_open.json | 6 - .../models/block/zelkova_fence_inventory.json | 7 - .../byg/models/block/zelkova_fence_post.json | 7 - .../byg/models/block/zelkova_leaves.json | 7 - .../models/block/zelkova_leaves_snowy.json | 12 - .../assets/byg/models/block/zelkova_log.json | 7 - .../byg/models/block/zelkova_planks.json | 7 - .../models/block/zelkova_pressure_plate.json | 6 - .../block/zelkova_pressure_plate_down.json | 6 - .../byg/models/block/zelkova_sapling.json | 7 - .../assets/byg/models/block/zelkova_slab.json | 8 - .../byg/models/block/zelkova_slab_top.json | 8 - .../byg/models/block/zelkova_stairs.json | 8 - .../models/block/zelkova_stairs_inner.json | 8 - .../models/block/zelkova_stairs_outer.json | 8 - .../models/block/zelkova_trapdoor_bottom.json | 6 - .../models/block/zelkova_trapdoor_open.json | 6 - .../models/block/zelkova_trapdoor_top.json | 6 - .../assets/byg/models/block/zelkova_wood.json | 7 - .../byg/models/item/stripped_zelkova_log.json | 22 -- .../models/item/stripped_zelkova_wood.json | 22 -- .../assets/byg/models/item/zelkova_boat.json | 6 - .../byg/models/item/zelkova_bookshelf.json | 22 -- .../byg/models/item/zelkova_button.json | 22 -- .../models/item/zelkova_crafting_table.json | 22 -- .../assets/byg/models/item/zelkova_door.json | 6 - .../assets/byg/models/item/zelkova_fence.json | 3 - .../byg/models/item/zelkova_fence_gate.json | 22 -- .../byg/models/item/zelkova_leaves.json | 22 -- .../assets/byg/models/item/zelkova_log.json | 22 -- .../byg/models/item/zelkova_planks.json | 22 -- .../models/item/zelkova_pressure_plate.json | 22 -- .../byg/models/item/zelkova_sapling.json | 6 - .../assets/byg/models/item/zelkova_slab.json | 22 -- .../byg/models/item/zelkova_stairs.json | 22 -- .../byg/models/item/zelkova_trapdoor.json | 22 -- .../assets/byg/models/item/zelkova_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../{zelkova_log.png => zelkova/log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../{zelkova_boat.png => zelkova/boat.png} | Bin .../{zelkova_door.png => zelkova/door.png} | Bin .../byg/recipes/stripped_zelkova_wood.json | 16 -- .../data/byg/recipes/zelkova_boat.json | 16 -- .../data/byg/recipes/zelkova_bookshelf.json | 19 -- .../data/byg/recipes/zelkova_button.json | 12 - .../byg/recipes/zelkova_crafting_table.json | 15 -- .../data/byg/recipes/zelkova_door.json | 18 -- .../data/byg/recipes/zelkova_fence.json | 20 -- .../data/byg/recipes/zelkova_fence_gate.json | 19 -- .../data/byg/recipes/zelkova_planks.json | 13 -- .../byg/recipes/zelkova_pressure_plate.json | 15 -- .../data/byg/recipes/zelkova_slab.json | 16 -- .../data/byg/recipes/zelkova_stairs.json | 18 -- .../data/byg/recipes/zelkova_trapdoor.json | 17 -- .../data/byg/recipes/zelkova_wood.json | 16 -- 103 files changed, 7 insertions(+), 1623 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_zelkova_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/zelkova_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_zelkova_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_wood.json rename Common/src/main/resources/assets/byg/textures/block/{zelkova_bookshelf.png => zelkova/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_crafting_table_front.png => zelkova/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_crafting_table_side.png => zelkova/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_crafting_table_top.png => zelkova/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_door_bottom.png => zelkova/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_door_top.png => zelkova/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_sapling.png => zelkova/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_leaves.png => zelkova/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_log.png => zelkova/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_log_top.png => zelkova/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_planks.png => zelkova/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_zelkova_log.png => zelkova/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_zelkova_log_top.png => zelkova/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{zelkova_trapdoor.png => zelkova/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{zelkova_boat.png => zelkova/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{zelkova_door.png => zelkova/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_zelkova_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_boat.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/recipes/zelkova_wood.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 535148e081..6915ff70c3 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -65,7 +65,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); - public static final BlockRegistryObject ZELKOVA_PLANKS = createPlanks("zelkova_planks"); public static final BlockRegistryObject SYTHIAN_PLANKS = createPlanks("sythian_planks"); public static final BlockRegistryObject EMBUR_PLANKS = createPlanks("embur_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); @@ -74,7 +73,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); - public static final BlockRegistryObject ZELKOVA_BOOKSHELF = createBookshelf("zelkova_bookshelf"); public static final BlockRegistryObject SYTHIAN_BOOKSHELF = createBookshelf("sythian_bookshelf"); public static final BlockRegistryObject EMBUR_BOOKSHELF = createBookshelf("embur_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); @@ -83,7 +81,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); - public static final BlockRegistryObject ZELKOVA_DOOR = createDoor("zelkova_door"); public static final BlockRegistryObject SYTHIAN_DOOR = createDoor("sythian_door"); public static final BlockRegistryObject EMBUR_DOOR = createDoor("embur_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); @@ -92,7 +89,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); - public static final BlockRegistryObject ZELKOVA_PRESSURE_PLATE = createWoodPressurePlate("zelkova_pressure_plate"); public static final BlockRegistryObject SYTHIAN_PRESSURE_PLATE = createWoodPressurePlate("sythian_pressure_plate"); public static final BlockRegistryObject EMBUR_PRESSURE_PLATE = createWoodPressurePlate("embur_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); @@ -101,7 +97,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); - public static final BlockRegistryObject ZELKOVA_BUTTON = createWoodButton("zelkova_button"); public static final BlockRegistryObject SYTHIAN_BUTTON = createWoodButton("sythian_button"); public static final BlockRegistryObject EMBUR_BUTTON = createWoodButton("embur_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); @@ -110,7 +105,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); - public static final BlockRegistryObject ZELKOVA_TRAPDOOR = createTrapDoor("zelkova_trapdoor"); public static final BlockRegistryObject SYTHIAN_TRAPDOOR = createTrapDoor("sythian_trapdoor"); public static final BlockRegistryObject EMBUR_TRAPDOOR = createTrapDoor("embur_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); @@ -119,7 +113,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); - public static final BlockRegistryObject ZELKOVA_CRAFTING_TABLE = createCraftingTable("zelkova_crafting_table"); public static final BlockRegistryObject SYTHIAN_CRAFTING_TABLE = createCraftingTable("sythian_crafting_table"); public static final BlockRegistryObject EMBUR_CRAFTING_TABLE = createCraftingTable("embur_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); @@ -128,7 +121,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); - public static final BlockRegistryObject ZELKOVA_FENCE_GATE = createFenceGate("zelkova_fence_gate"); public static final BlockRegistryObject SYTHIAN_FENCE_GATE = createFenceGate("sythian_fence_gate"); public static final BlockRegistryObject EMBUR_FENCE_GATE = createFenceGate("embur_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); @@ -137,7 +129,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); - public static final BlockRegistryObject ZELKOVA_SLAB = createWoodSlab("zelkova_slab"); public static final BlockRegistryObject SYTHIAN_SLAB = createWoodSlab("sythian_slab"); public static final BlockRegistryObject EMBUR_SLAB = createWoodSlab("embur_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); @@ -146,7 +137,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); - public static final BlockRegistryObject ZELKOVA_STAIRS = createWoodStairs("zelkova_stairs"); public static final BlockRegistryObject SYTHIAN_STAIRS = createWoodStairs("sythian_stairs"); public static final BlockRegistryObject EMBUR_STAIRS = createWoodStairs("embur_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); @@ -155,7 +145,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); - public static final BlockRegistryObject ZELKOVA_FENCE = createFence("zelkova_fence"); public static final BlockRegistryObject SYTHIAN_FENCE = createFence("sythian_fence"); public static final BlockRegistryObject EMBUR_FENCE = createFence("embur_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); @@ -164,7 +153,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject ZELKOVA_SIGN = createSign("zelkova_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_SIGN = createSign("embur_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); @@ -173,7 +161,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject ZELKOVA_WALL_SIGN = createWallSign("zelkova_wall_sign", BYGWoodType.ZELKOVA, ZELKOVA_PLANKS); public static final BlockRegistryObject SYTHIAN_WALL_SIGN = createWallSign("sythian_wall_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); public static final BlockRegistryObject EMBUR_WALL_SIGN = createWallSign("embur_wall_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); @@ -216,7 +203,6 @@ public class BYGBlocks { public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); - public static final BlockRegistryObject ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_ZELKOVA_SAPLING, "zelkova_sapling"); public static final BlockRegistryObject LAMENT_SAPLING = createSapling(BYGBlockTags.GROUND_LAMENT_SAPLING, "lament_sapling"); public static final BlockRegistryObject WITHERING_OAK_SAPLING = createFungus(BYGBlockTags.GROUND_WITHERING_OAK_SAPLING, "withering_oak_sapling"); public static final BlockRegistryObject NIGHTSHADE_SAPLING = createSapling(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING, "nightshade_sapling"); @@ -261,7 +247,6 @@ public class BYGBlocks { public static final BlockRegistryObject WHITE_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "white_cherry_leaves"); public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); - public static final BlockRegistryObject ZELKOVA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_RED, "zelkova_leaves"); public static final BlockRegistryObject LAMENT_LEAVES = createLeaves(MaterialColor.COLOR_MAGENTA, "lament_leaves"); public static final BlockRegistryObject WITHERING_OAK_LEAVES = createLeaves(MaterialColor.COLOR_GRAY, "withering_oak_leaves"); public static final BlockRegistryObject FLOWERING_NIGHTSHADE_LEAVES = createGlowingLeaves(MaterialColor.COLOR_ORANGE, 15, "flowering_nightshade_leaves"); @@ -552,7 +537,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); - public static final BlockRegistryObject ZELKOVA_LOG = createLog("zelkova_log"); public static final BlockRegistryObject SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "sythian_stem"); public static final BlockRegistryObject EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "embur_pedu"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); @@ -566,7 +550,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); - public static final BlockRegistryObject ZELKOVA_WOOD = createWood("zelkova_wood"); public static final BlockRegistryObject SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "sythian_hyphae"); public static final BlockRegistryObject EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "embur_hyphae"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); @@ -703,7 +686,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); - public static final BlockRegistryObject STRIPPED_ZELKOVA_LOG = createStrippedLog("stripped_zelkova_log"); public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); public static final BlockRegistryObject STRIPPED_EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_embur_pedu"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); @@ -713,7 +695,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); - public static final BlockRegistryObject STRIPPED_ZELKOVA_WOOD = createWood("stripped_zelkova_wood"); public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); public static final BlockRegistryObject STRIPPED_EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_embur_hyphae"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index adb9b5b0a2..ec86f46dfa 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -12,7 +12,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); - public static final WoodType ZELKOVA = register("zelkova"); public static final WoodType SYTHIAN = register("sythian"); public static final WoodType EMBUR = register("embur"); public static final WoodType LAMENT = register("lament"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index f07ec468f8..e9f68ccda6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -115,7 +115,11 @@ public enum BYGWoodTypes { WITCH_HAZEL("witch_hazel", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_WITCH_HAZEL_SAPLING) .boatType(BYGBoatEntity.BYGType.WITCH_HAZEL) - .materialColor(MaterialColor.COLOR_ORANGE)); + .materialColor(MaterialColor.COLOR_ORANGE)), + ZELKOVA("zelkova", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_ZELKOVA_SAPLING) + .boatType(BYGBoatEntity.BYGType.ZELKOVA) + .materialColor(MaterialColor.TERRACOTTA_RED)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index dc278cd6e1..1a69818e99 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -486,28 +486,9 @@ public class BYGItems { WITCH_HAZEL_BRANCH = createItem(BYGBlocks.WITCH_HAZEL_BRANCH); BLOOMING_WITCH_HAZEL_LEAVES = createItem(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES); BYGWoodTypes.WITCH_HAZEL.init(); - } - //Zelkova Woodtype - public static final RegistryObject ZELKOVA_SAPLING = createSaplingItem(BYGBlocks.ZELKOVA_SAPLING); - public static final RegistryObject ZELKOVA_LEAVES = createItem(BYGBlocks.ZELKOVA_LEAVES); - public static final RegistryObject ZELKOVA_LOG = createItem(BYGBlocks.ZELKOVA_LOG); - public static final RegistryObject ZELKOVA_WOOD = createItem(BYGBlocks.ZELKOVA_WOOD); - public static final RegistryObject STRIPPED_ZELKOVA_LOG = createItem(BYGBlocks.STRIPPED_ZELKOVA_LOG); - public static final RegistryObject STRIPPED_ZELKOVA_WOOD = createItem(BYGBlocks.STRIPPED_ZELKOVA_WOOD); - public static final RegistryObject ZELKOVA_PLANKS = createItem(BYGBlocks.ZELKOVA_PLANKS); - public static final RegistryObject ZELKOVA_BOOKSHELF = createItem(BYGBlocks.ZELKOVA_BOOKSHELF); - public static final RegistryObject ZELKOVA_CRAFTING_TABLE = createItem(BYGBlocks.ZELKOVA_CRAFTING_TABLE); - public static final RegistryObject ZELKOVA_STAIRS = createItem(BYGBlocks.ZELKOVA_STAIRS); - public static final RegistryObject ZELKOVA_SLAB = createItem(BYGBlocks.ZELKOVA_SLAB); - public static final RegistryObject ZELKOVA_FENCE = createItem(BYGBlocks.ZELKOVA_FENCE); - public static final RegistryObject ZELKOVA_FENCE_GATE = createItem(BYGBlocks.ZELKOVA_FENCE_GATE); - public static final RegistryObject ZELKOVA_DOOR = createItem(BYGBlocks.ZELKOVA_DOOR); - public static final RegistryObject ZELKOVA_TRAPDOOR = createItem(BYGBlocks.ZELKOVA_TRAPDOOR); - public static final RegistryObject ZELKOVA_PRESSURE_PLATE = createItem(BYGBlocks.ZELKOVA_PRESSURE_PLATE); - public static final RegistryObject ZELKOVA_BUTTON = createItem(BYGBlocks.ZELKOVA_BUTTON); - public static final RegistryObject ZELKOVA_SIGN = createSign("zelkova_sign", BYGBlocks.ZELKOVA_SIGN, BYGBlocks.ZELKOVA_WALL_SIGN); - public static final RegistryObject ZELKOVA_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.ZELKOVA, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "zelkova_boat"); + BYGWoodTypes.ZELKOVA.init(); + } //Sythian Woodtype public static final RegistryObject SYTHIAN_WART_BLOCK = createItem(BYGBlocks.SYTHIAN_WART_BLOCK); diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_log.json deleted file mode 100644 index f9b4970d97..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_zelkova_log" - }, - "axis=z": { - "model": "byg:block/stripped_zelkova_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_zelkova_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_wood.json deleted file mode 100644 index 28a6534b4d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_zelkova_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_zelkova_wood" - }, - "axis=z": { - "model": "byg:block/stripped_zelkova_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_zelkova_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_bookshelf.json deleted file mode 100644 index 4c9c346236..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_button.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_button.json deleted file mode 100644 index 95175dc0e2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/zelkova_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/zelkova_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/zelkova_button", - "y": 180 - }, - "face=floor,facing=north,powered=false": { - "model": "byg:block/zelkova_button" - }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/zelkova_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/zelkova_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/zelkova_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/zelkova_button", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/zelkova_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=false": { - "model": "byg:block/zelkova_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/zelkova_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/zelkova_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "y": 90 - }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "y": 270 - }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "y": 180 - }, - "face=floor,facing=north,powered=true": { - "model": "byg:block/zelkova_button_pressed" - }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=west,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "x": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/zelkova_button_pressed", - "x": 180, - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_crafting_table.json deleted file mode 100644 index 685d18e893..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_door.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_door.json deleted file mode 100644 index 6f2f3012ec..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova_door_bottom" - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova_door_bottom", - "y": 90 - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova_door_bottom", - "y": 180 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova_door_bottom", - "y": 270 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 90 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 180 - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 270 - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova_door_bottom_hinge" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova_door_bottom", - "y": 270 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova_door_bottom", - "y": 90 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova_door_bottom", - "y": 180 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova_door_top" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova_door_top", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova_door_top", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova_door_top", - "y": 270 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 180 - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova_door_top_hinge", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova_door_top_hinge" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova_door_top", - "y": 270 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova_door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova_door_top", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova_door_top", - "y": 180 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_fence.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_fence.json deleted file mode 100644 index d1c1e14e90..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/zelkova_fence_post" - } - }, - { - "when": { - "north": "true" - }, - "apply": { - "model": "byg:block/zelkova_fence", - "uvlock": true - } - }, - { - "when": { - "south": "true" - }, - "apply": { - "model": "byg:block/zelkova_fence", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "true" - }, - "apply": { - "model": "byg:block/zelkova_fence", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "east": "true" - }, - "apply": { - "model": "byg:block/zelkova_fence", - "y": 90, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_fence_gate.json deleted file mode 100644 index ebf8d606ce..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/zelkova_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/zelkova_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/zelkova_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/zelkova_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/zelkova_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/zelkova_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/zelkova_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/zelkova_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/zelkova_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/zelkova_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/zelkova_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/zelkova_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/zelkova_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/zelkova_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/zelkova_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/zelkova_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_leaves.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_leaves.json deleted file mode 100644 index bbeadcbf6e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_log.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_log.json deleted file mode 100644 index d916678925..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_log.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/zelkova_log" - }, - "axis=z": { - "model": "byg:block/zelkova_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/zelkova_log", - "x": 90, - "y": 90 - } - } -} - diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_planks.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_planks.json deleted file mode 100644 index e62dc202c7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_pressure_plate.json deleted file mode 100644 index 91f95805dc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/zelkova_pressure_plate" - }, - "powered=true": { - "model": "byg:block/zelkova_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_sapling.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_sapling.json deleted file mode 100644 index 625d1b2f0f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_slab.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_slab.json deleted file mode 100644 index 22cc0993d0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/zelkova_slab" - }, - "type=top": { - "model": "byg:block/zelkova_slab_top" - }, - "type=double": { - "model": "byg:block/zelkova_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_stairs.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_stairs.json deleted file mode 100644 index d254fe7114..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/zelkova_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/zelkova_stairs", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/zelkova_stairs", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/zelkova_stairs", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/zelkova_stairs", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/zelkova_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/zelkova_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/zelkova_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/zelkova_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova_stairs_outer", - "y": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_trapdoor.json deleted file mode 100644 index 36290e7f13..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_trapdoor.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/zelkova_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/zelkova_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/zelkova_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/zelkova_trapdoor_bottom", - "y": 270 - }, - "facing=north,half=top,open=false": { - "model": "byg:block/zelkova_trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/zelkova_trapdoor_top", - "y": 180 - }, - "facing=east,half=top,open=false": { - "model": "byg:block/zelkova_trapdoor_top", - "y": 90 - }, - "facing=west,half=top,open=false": { - "model": "byg:block/zelkova_trapdoor_top", - "y": 270 - }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/zelkova_trapdoor_open" - }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "y": 180 - }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "y": 90 - }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "y": 270 - }, - "facing=north,half=top,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "x": 180, - "y": 180 - }, - "facing=south,half=top,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "x": 180, - "y": 0 - }, - "facing=east,half=top,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "x": 180, - "y": 270 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/zelkova_trapdoor_open", - "x": 180, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_wood.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_wood.json deleted file mode 100644 index 6d5ba56ef8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/zelkova_wood" - }, - "axis=z": { - "model": "byg:block/zelkova_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/zelkova_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_log.json deleted file mode 100644 index 435401f7e5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_zelkova_log_top", - "up": "byg:block/stripped_zelkova_log_top", - "north": "byg:block/stripped_zelkova_log", - "east": "byg:block/stripped_zelkova_log", - "south": "byg:block/stripped_zelkova_log", - "west": "byg:block/stripped_zelkova_log", - "particle": "byg:block/stripped_zelkova_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_wood.json deleted file mode 100644 index 2e36e38524..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_zelkova_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_zelkova_log", - "particle": "byg:block/stripped_zelkova_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/zelkova_bookshelf.json deleted file mode 100644 index 494206a83b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/zelkova_planks", - "up": "byg:block/zelkova_planks", - "north": "byg:block/zelkova_bookshelf", - "east": "byg:block/zelkova_bookshelf", - "south": "byg:block/zelkova_bookshelf", - "west": "byg:block/zelkova_bookshelf", - "particle": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_button.json b/Common/src/main/resources/assets/byg/models/block/zelkova_button.json deleted file mode 100644 index d78e6a9028..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/zelkova_button_inventory.json deleted file mode 100644 index 8f5293ce7c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/zelkova_button_pressed.json deleted file mode 100644 index bcd6a8731c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/zelkova_crafting_table.json deleted file mode 100644 index 072b8807f0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/zelkova_crafting_table_front", - "down": "byg:block/zelkova_planks", - "up": "byg:block/zelkova_crafting_table_top", - "north": "byg:block/zelkova_crafting_table_front", - "east": "byg:block/zelkova_crafting_table_side", - "south": "byg:block/zelkova_crafting_table_side", - "west": "byg:block/zelkova_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom.json deleted file mode 100644 index 34d148f9fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/zelkova_door_bottom", - "top": "byg:block/zelkova_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom_hinge.json deleted file mode 100644 index 304969f658..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/zelkova_door_bottom", - "top": "byg:block/zelkova_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_door_top.json b/Common/src/main/resources/assets/byg/models/block/zelkova_door_top.json deleted file mode 100644 index 4b83504670..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/zelkova_door_bottom", - "top": "byg:block/zelkova_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/zelkova_door_top_hinge.json deleted file mode 100644 index 35c11e800d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/zelkova_door_bottom", - "top": "byg:block/zelkova_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence.json deleted file mode 100644 index 7b4d828069..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/zelkova_planks", - "particle": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate.json deleted file mode 100644 index 7c51323b6f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_open.json deleted file mode 100644 index 715775eaf5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall.json deleted file mode 100644 index 506e4991f7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall_open.json deleted file mode 100644 index e19f1f9e6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_inventory.json deleted file mode 100644 index c3d77937a8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/zelkova_planks", - "particle": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_post.json b/Common/src/main/resources/assets/byg/models/block/zelkova_fence_post.json deleted file mode 100644 index ba132c754d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/zelkova_planks", - "particle": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_leaves.json b/Common/src/main/resources/assets/byg/models/block/zelkova_leaves.json deleted file mode 100644 index 055fd0431b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/zelkova_leaves", - "particle": "byg:block/zelkova_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/zelkova_leaves_snowy.json deleted file mode 100644 index 171fdf0f65..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/zelkova_leaves_snowy", - "up": "byg:block/zelkova_leaves_snowy", - "north": "byg:block/zelkova_leaves_snowy_side", - "east": "byg:block/zelkova_leaves_snowy_side", - "south": "byg:block/zelkova_leaves_snowy_side", - "west": "byg:block/zelkova_leaves_snowy_side", - "particle": "byg:block/zelkova_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_log.json b/Common/src/main/resources/assets/byg/models/block/zelkova_log.json deleted file mode 100644 index 6f030cc268..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/zelkova_log_top", - "side": "byg:block/zelkova_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_planks.json b/Common/src/main/resources/assets/byg/models/block/zelkova_planks.json deleted file mode 100644 index bc8d8c5e47..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/zelkova_planks", - "particle": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate.json deleted file mode 100644 index e948043c80..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate_down.json deleted file mode 100644 index ff44bec7b8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_sapling.json b/Common/src/main/resources/assets/byg/models/block/zelkova_sapling.json deleted file mode 100644 index 56cb08f57b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/zelkova_sapling", - "particle": "byg:block/zelkova_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_slab.json b/Common/src/main/resources/assets/byg/models/block/zelkova_slab.json deleted file mode 100644 index 1cf9420dfa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/zelkova_planks", - "top": "byg:block/zelkova_planks", - "side": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_slab_top.json b/Common/src/main/resources/assets/byg/models/block/zelkova_slab_top.json deleted file mode 100644 index 0dcd3e44e8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/zelkova_planks", - "top": "byg:block/zelkova_planks", - "side": "byg:block/zelkova_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs.json b/Common/src/main/resources/assets/byg/models/block/zelkova_stairs.json deleted file mode 100644 index 01f5c2cda1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/zelkova_planks", - "top": "byg:block/zelkova_planks", - "side": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_inner.json deleted file mode 100644 index ce860e517c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/zelkova_planks", - "top": "byg:block/zelkova_planks", - "side": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_outer.json deleted file mode 100644 index cb2d859aab..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/zelkova_planks", - "top": "byg:block/zelkova_planks", - "side": "byg:block/zelkova_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_bottom.json deleted file mode 100644 index 9b89653dfa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/zelkova_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_open.json deleted file mode 100644 index 95dd564310..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/zelkova_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_top.json deleted file mode 100644 index 563cd943ed..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/zelkova_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/zelkova_wood.json b/Common/src/main/resources/assets/byg/models/block/zelkova_wood.json deleted file mode 100644 index 0133bbd980..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/zelkova_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/zelkova_log", - "particle": "byg:block/zelkova_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_log.json deleted file mode 100644 index 3f017cf081..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_zelkova_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_wood.json deleted file mode 100644 index b581324a35..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_zelkova_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_zelkova_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_boat.json b/Common/src/main/resources/assets/byg/models/item/zelkova_boat.json deleted file mode 100644 index 82668ef1ab..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/zelkova_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/zelkova_bookshelf.json deleted file mode 100644 index cf2edcce9b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_button.json b/Common/src/main/resources/assets/byg/models/item/zelkova_button.json deleted file mode 100644 index dd444a5b89..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/zelkova_crafting_table.json deleted file mode 100644 index 3c841cb9ab..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_door.json b/Common/src/main/resources/assets/byg/models/item/zelkova_door.json deleted file mode 100644 index 4b1aa57ca3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/zelkova_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_fence.json b/Common/src/main/resources/assets/byg/models/item/zelkova_fence.json deleted file mode 100644 index b61896c1fa..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/zelkova_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/zelkova_fence_gate.json deleted file mode 100644 index d74aeb20dd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_leaves.json b/Common/src/main/resources/assets/byg/models/item/zelkova_leaves.json deleted file mode 100644 index bc2b37d91b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_log.json b/Common/src/main/resources/assets/byg/models/item/zelkova_log.json deleted file mode 100644 index e56c6652be..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_planks.json b/Common/src/main/resources/assets/byg/models/item/zelkova_planks.json deleted file mode 100644 index fc53d25109..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/zelkova_pressure_plate.json deleted file mode 100644 index 897a5f5c6e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_sapling.json b/Common/src/main/resources/assets/byg/models/item/zelkova_sapling.json deleted file mode 100644 index 3bc66b74fa..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/zelkova_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_slab.json b/Common/src/main/resources/assets/byg/models/item/zelkova_slab.json deleted file mode 100644 index 2d3c159fe3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_stairs.json b/Common/src/main/resources/assets/byg/models/item/zelkova_stairs.json deleted file mode 100644 index c93e9ade7d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/zelkova_trapdoor.json deleted file mode 100644 index bef6e74d61..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_wood.json b/Common/src/main/resources/assets/byg/models/item/zelkova_wood.json deleted file mode 100644 index c912becc8c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/zelkova_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_door_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_sapling.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_leaves.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_log.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_log.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_log_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_planks.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_planks.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_zelkova_log.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_zelkova_log.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_zelkova_log_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_zelkova_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/zelkova_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/zelkova/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/zelkova_boat.png b/Common/src/main/resources/assets/byg/textures/item/zelkova/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/zelkova_boat.png rename to Common/src/main/resources/assets/byg/textures/item/zelkova/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/zelkova_door.png b/Common/src/main/resources/assets/byg/textures/item/zelkova/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/zelkova_door.png rename to Common/src/main/resources/assets/byg/textures/item/zelkova/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_zelkova_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_zelkova_wood.json deleted file mode 100644 index caf7e5482b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_zelkova_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_zelkova_log" - } - }, - "result": { - "item": "byg:stripped_zelkova_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_boat.json b/Common/src/main/resources/data/byg/recipes/zelkova_boat.json deleted file mode 100644 index ce9a8af231..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "pattern": [ - "# #", - "###" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_bookshelf.json b/Common/src/main/resources/data/byg/recipes/zelkova_bookshelf.json deleted file mode 100644 index 8b8809f479..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:zelkova_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_button.json b/Common/src/main/resources/data/byg/recipes/zelkova_button.json deleted file mode 100644 index 3a42013a58..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:zelkova_planks" - } - ], - "result": { - "item": "byg:zelkova_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_crafting_table.json b/Common/src/main/resources/data/byg/recipes/zelkova_crafting_table.json deleted file mode 100644 index 16b4462056..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_door.json b/Common/src/main/resources/data/byg/recipes/zelkova_door.json deleted file mode 100644 index 4bae685625..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_fence.json b/Common/src/main/resources/data/byg/recipes/zelkova_fence.json deleted file mode 100644 index 513fe46e03..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_fence_gate.json b/Common/src/main/resources/data/byg/recipes/zelkova_fence_gate.json deleted file mode 100644 index fada05c890..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_planks.json b/Common/src/main/resources/data/byg/recipes/zelkova_planks.json deleted file mode 100644 index 21d21ab8ac..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:zelkova_logs" - } - ], - "result": { - "item": "byg:zelkova_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/zelkova_pressure_plate.json deleted file mode 100644 index 05bb57f2d3..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_slab.json b/Common/src/main/resources/data/byg/recipes/zelkova_slab.json deleted file mode 100644 index d1f0e115a6..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_stairs.json b/Common/src/main/resources/data/byg/recipes/zelkova_stairs.json deleted file mode 100644 index b12ec03c26..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_trapdoor.json b/Common/src/main/resources/data/byg/recipes/zelkova_trapdoor.json deleted file mode 100644 index 9aa76cf928..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:zelkova_planks" - } - }, - "result": { - "item": "byg:zelkova_trapdoor", - "count": 2 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_wood.json b/Common/src/main/resources/data/byg/recipes/zelkova_wood.json deleted file mode 100644 index 7ce211348e..0000000000 --- a/Common/src/main/resources/data/byg/recipes/zelkova_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:zelkova_log" - } - }, - "result": { - "item": "byg:zelkova_wood", - "count": 3 - } -} \ No newline at end of file From 9c7a0fd6eda9e7ee63645c57cbcac19471747cd4 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 13:22:40 +0300 Subject: [PATCH 43/90] Generate data --- Common/src/generated/resources/.cache/cache | 288 ++++++++++++++++++ .../byg/blockstates/stripped_willow_log.json | 16 + .../byg/blockstates/stripped_willow_wood.json | 16 + .../blockstates/stripped_witch_hazel_log.json | 16 + .../stripped_witch_hazel_wood.json | 16 + .../byg/blockstates/stripped_zelkova_log.json | 16 + .../blockstates/stripped_zelkova_wood.json | 16 + .../byg/blockstates/willow_bookshelf.json | 7 + .../assets/byg/blockstates/willow_button.json | 118 +++++++ .../blockstates/willow_crafting_table.json | 7 + .../assets/byg/blockstates/willow_door.json | 124 ++++++++ .../assets/byg/blockstates/willow_fence.json | 48 +++ .../byg/blockstates/willow_fence_gate.json | 80 +++++ .../assets/byg/blockstates/willow_leaves.json | 7 + .../assets/byg/blockstates/willow_log.json | 16 + .../assets/byg/blockstates/willow_planks.json | 7 + .../blockstates/willow_pressure_plate.json | 10 + .../byg/blockstates/willow_sapling.json | 7 + .../assets/byg/blockstates/willow_slab.json | 13 + .../assets/byg/blockstates/willow_stairs.json | 209 +++++++++++++ .../byg/blockstates/willow_trapdoor.json | 68 +++++ .../assets/byg/blockstates/willow_wood.json | 16 + .../blockstates/witch_hazel_bookshelf.json | 7 + .../byg/blockstates/witch_hazel_button.json | 118 +++++++ .../witch_hazel_crafting_table.json | 7 + .../byg/blockstates/witch_hazel_door.json | 124 ++++++++ .../byg/blockstates/witch_hazel_fence.json | 48 +++ .../blockstates/witch_hazel_fence_gate.json | 80 +++++ .../byg/blockstates/witch_hazel_leaves.json | 7 + .../byg/blockstates/witch_hazel_log.json | 16 + .../byg/blockstates/witch_hazel_planks.json | 7 + .../witch_hazel_pressure_plate.json | 10 + .../byg/blockstates/witch_hazel_sapling.json | 7 + .../byg/blockstates/witch_hazel_slab.json | 13 + .../byg/blockstates/witch_hazel_stairs.json | 209 +++++++++++++ .../byg/blockstates/witch_hazel_trapdoor.json | 68 +++++ .../byg/blockstates/witch_hazel_wood.json | 16 + .../byg/blockstates/zelkova_bookshelf.json | 7 + .../byg/blockstates/zelkova_button.json | 118 +++++++ .../blockstates/zelkova_crafting_table.json | 7 + .../assets/byg/blockstates/zelkova_door.json | 124 ++++++++ .../assets/byg/blockstates/zelkova_fence.json | 48 +++ .../byg/blockstates/zelkova_fence_gate.json | 80 +++++ .../byg/blockstates/zelkova_leaves.json | 7 + .../assets/byg/blockstates/zelkova_log.json | 16 + .../byg/blockstates/zelkova_planks.json | 7 + .../blockstates/zelkova_pressure_plate.json | 10 + .../byg/blockstates/zelkova_sapling.json | 7 + .../assets/byg/blockstates/zelkova_slab.json | 13 + .../byg/blockstates/zelkova_stairs.json | 209 +++++++++++++ .../byg/blockstates/zelkova_trapdoor.json | 68 +++++ .../assets/byg/blockstates/zelkova_wood.json | 16 + .../byg/models/block/willow/bookshelf.json | 12 + .../byg/models/block/willow/button.json | 6 + .../models/block/willow/button_inventory.json | 6 + .../models/block/willow/button_pressed.json | 6 + .../models/block/willow/crafting_table.json | 12 + .../byg/models/block/willow/door_bottom.json | 7 + .../block/willow/door_bottom_hinge.json | 7 + .../byg/models/block/willow/door_top.json | 7 + .../models/block/willow/door_top_hinge.json | 7 + .../assets/byg/models/block/willow/fence.json | 7 + .../byg/models/block/willow/fence_gate.json | 6 + .../models/block/willow/fence_gate_open.json | 6 + .../models/block/willow/fence_gate_wall.json | 6 + .../block/willow/fence_gate_wall_open.json | 6 + .../byg/models/block/willow/fence_inv.json | 7 + .../byg/models/block/willow/fence_post.json | 7 + .../byg/models/block/willow/grower_item.json | 6 + .../byg/models/block/willow/leaves.json | 12 + .../byg/models/block/willow/leaves_snowy.json | 12 + .../assets/byg/models/block/willow/log.json | 7 + .../byg/models/block/willow/planks.json | 12 + .../models/block/willow/pressure_plate.json | 6 + .../block/willow/pressure_plate_down.json | 6 + .../assets/byg/models/block/willow/slab.json | 8 + .../byg/models/block/willow/slab_top.json | 8 + .../byg/models/block/willow/stairs.json | 8 + .../byg/models/block/willow/stairs_inner.json | 8 + .../byg/models/block/willow/stairs_outer.json | 8 + .../byg/models/block/willow/stripped_log.json | 7 + .../models/block/willow/stripped_wood.json | 7 + .../byg/models/block/willow/trapdoor.json | 39 +++ .../models/block/willow/trapdoor_bottom.json | 6 + .../models/block/willow/trapdoor_open.json | 6 + .../byg/models/block/willow/trapdoor_top.json | 6 + .../assets/byg/models/block/willow/wood.json | 7 + .../models/block/witch_hazel/bookshelf.json | 12 + .../byg/models/block/witch_hazel/button.json | 6 + .../block/witch_hazel/button_inventory.json | 6 + .../block/witch_hazel/button_pressed.json | 6 + .../block/witch_hazel/crafting_table.json | 12 + .../models/block/witch_hazel/door_bottom.json | 7 + .../block/witch_hazel/door_bottom_hinge.json | 7 + .../models/block/witch_hazel/door_top.json | 7 + .../block/witch_hazel/door_top_hinge.json | 7 + .../byg/models/block/witch_hazel/fence.json | 7 + .../models/block/witch_hazel/fence_gate.json | 6 + .../block/witch_hazel/fence_gate_open.json | 6 + .../block/witch_hazel/fence_gate_wall.json | 6 + .../witch_hazel/fence_gate_wall_open.json | 6 + .../models/block/witch_hazel/fence_inv.json | 7 + .../models/block/witch_hazel/fence_post.json | 7 + .../models/block/witch_hazel/grower_item.json | 6 + .../byg/models/block/witch_hazel/leaves.json | 12 + .../block/witch_hazel/leaves_snowy.json | 12 + .../byg/models/block/witch_hazel/log.json | 7 + .../byg/models/block/witch_hazel/planks.json | 12 + .../block/witch_hazel/pressure_plate.json | 6 + .../witch_hazel/pressure_plate_down.json | 6 + .../byg/models/block/witch_hazel/slab.json | 8 + .../models/block/witch_hazel/slab_top.json | 8 + .../byg/models/block/witch_hazel/stairs.json | 8 + .../block/witch_hazel/stairs_inner.json | 8 + .../block/witch_hazel/stairs_outer.json | 8 + .../block/witch_hazel/stripped_log.json | 7 + .../block/witch_hazel/stripped_wood.json | 7 + .../models/block/witch_hazel/trapdoor.json | 39 +++ .../block/witch_hazel/trapdoor_bottom.json | 6 + .../block/witch_hazel/trapdoor_open.json | 6 + .../block/witch_hazel/trapdoor_top.json | 6 + .../byg/models/block/witch_hazel/wood.json | 7 + .../byg/models/block/zelkova/bookshelf.json | 12 + .../byg/models/block/zelkova/button.json | 6 + .../block/zelkova/button_inventory.json | 6 + .../models/block/zelkova/button_pressed.json | 6 + .../models/block/zelkova/crafting_table.json | 12 + .../byg/models/block/zelkova/door_bottom.json | 7 + .../block/zelkova/door_bottom_hinge.json | 7 + .../byg/models/block/zelkova/door_top.json | 7 + .../models/block/zelkova/door_top_hinge.json | 7 + .../byg/models/block/zelkova/fence.json | 7 + .../byg/models/block/zelkova/fence_gate.json | 6 + .../models/block/zelkova/fence_gate_open.json | 6 + .../models/block/zelkova/fence_gate_wall.json | 6 + .../block/zelkova/fence_gate_wall_open.json | 6 + .../byg/models/block/zelkova/fence_inv.json | 7 + .../byg/models/block/zelkova/fence_post.json | 7 + .../byg/models/block/zelkova/grower_item.json | 6 + .../byg/models/block/zelkova/leaves.json | 12 + .../models/block/zelkova/leaves_snowy.json | 12 + .../assets/byg/models/block/zelkova/log.json | 7 + .../byg/models/block/zelkova/planks.json | 12 + .../models/block/zelkova/pressure_plate.json | 6 + .../block/zelkova/pressure_plate_down.json | 6 + .../assets/byg/models/block/zelkova/slab.json | 8 + .../byg/models/block/zelkova/slab_top.json | 8 + .../byg/models/block/zelkova/stairs.json | 8 + .../models/block/zelkova/stairs_inner.json | 8 + .../models/block/zelkova/stairs_outer.json | 8 + .../models/block/zelkova/stripped_log.json | 7 + .../models/block/zelkova/stripped_wood.json | 7 + .../byg/models/block/zelkova/trapdoor.json | 39 +++ .../models/block/zelkova/trapdoor_bottom.json | 6 + .../models/block/zelkova/trapdoor_open.json | 6 + .../models/block/zelkova/trapdoor_top.json | 6 + .../assets/byg/models/block/zelkova/wood.json | 7 + .../byg/models/item/stripped_willow_log.json | 39 +++ .../byg/models/item/stripped_willow_wood.json | 39 +++ .../models/item/stripped_witch_hazel_log.json | 39 +++ .../item/stripped_witch_hazel_wood.json | 39 +++ .../byg/models/item/stripped_zelkova_log.json | 39 +++ .../models/item/stripped_zelkova_wood.json | 39 +++ .../assets/byg/models/item/willow_boat.json | 6 + .../byg/models/item/willow_bookshelf.json | 39 +++ .../assets/byg/models/item/willow_button.json | 39 +++ .../models/item/willow_crafting_table.json | 39 +++ .../assets/byg/models/item/willow_door.json | 6 + .../assets/byg/models/item/willow_fence.json | 39 +++ .../assets/byg/models/item/willow_leaves.json | 39 +++ .../assets/byg/models/item/willow_log.json | 39 +++ .../assets/byg/models/item/willow_planks.json | 39 +++ .../models/item/willow_pressure_plate.json | 39 +++ .../byg/models/item/willow_sapling.json | 6 + .../assets/byg/models/item/willow_slab.json | 39 +++ .../assets/byg/models/item/willow_stairs.json | 39 +++ .../assets/byg/models/item/willow_wood.json | 39 +++ .../byg/models/item/witch_hazel_boat.json | 6 + .../models/item/witch_hazel_bookshelf.json | 39 +++ .../byg/models/item/witch_hazel_button.json | 39 +++ .../item/witch_hazel_crafting_table.json | 39 +++ .../byg/models/item/witch_hazel_door.json | 6 + .../byg/models/item/witch_hazel_fence.json | 39 +++ .../byg/models/item/witch_hazel_leaves.json | 39 +++ .../byg/models/item/witch_hazel_log.json | 39 +++ .../byg/models/item/witch_hazel_planks.json | 39 +++ .../item/witch_hazel_pressure_plate.json | 39 +++ .../byg/models/item/witch_hazel_sapling.json | 6 + .../byg/models/item/witch_hazel_slab.json | 39 +++ .../byg/models/item/witch_hazel_stairs.json | 39 +++ .../byg/models/item/witch_hazel_wood.json | 39 +++ .../assets/byg/models/item/zelkova_boat.json | 6 + .../byg/models/item/zelkova_bookshelf.json | 39 +++ .../byg/models/item/zelkova_button.json | 39 +++ .../models/item/zelkova_crafting_table.json | 39 +++ .../assets/byg/models/item/zelkova_door.json | 6 + .../assets/byg/models/item/zelkova_fence.json | 39 +++ .../byg/models/item/zelkova_leaves.json | 39 +++ .../assets/byg/models/item/zelkova_log.json | 39 +++ .../byg/models/item/zelkova_planks.json | 39 +++ .../models/item/zelkova_pressure_plate.json | 39 +++ .../byg/models/item/zelkova_sapling.json | 6 + .../assets/byg/models/item/zelkova_slab.json | 39 +++ .../byg/models/item/zelkova_stairs.json | 39 +++ .../assets/byg/models/item/zelkova_wood.json | 39 +++ .../recipes/byg.byg/wood/willow/boat.json | 34 +++ .../byg.byg/wood/willow/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/willow/button.json | 34 +++ .../byg.byg/wood/willow/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/willow/door.json | 34 +++ .../recipes/byg.byg/wood/willow/fence.json | 34 +++ .../byg.byg/wood/willow/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/willow/planks.json | 32 ++ .../byg.byg/wood/willow/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/willow/slab.json | 34 +++ .../recipes/byg.byg/wood/willow/stairs.json | 34 +++ .../recipes/byg.byg/wood/willow/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/willow/wood.json | 34 +++ .../byg.byg/wood/witch_hazel/boat.json | 34 +++ .../byg.byg/wood/witch_hazel/bookshelf.json | 34 +++ .../byg.byg/wood/witch_hazel/button.json | 34 +++ .../wood/witch_hazel/crafting_table.json | 34 +++ .../byg.byg/wood/witch_hazel/door.json | 34 +++ .../byg.byg/wood/witch_hazel/fence.json | 34 +++ .../byg.byg/wood/witch_hazel/fence_gate.json | 34 +++ .../byg.byg/wood/witch_hazel/planks.json | 32 ++ .../wood/witch_hazel/pressure_plate.json | 34 +++ .../byg.byg/wood/witch_hazel/slab.json | 34 +++ .../byg.byg/wood/witch_hazel/stairs.json | 34 +++ .../byg.byg/wood/witch_hazel/trapdoor.json | 34 +++ .../byg.byg/wood/witch_hazel/wood.json | 34 +++ .../recipes/byg.byg/wood/zelkova/boat.json | 34 +++ .../byg.byg/wood/zelkova/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/zelkova/button.json | 34 +++ .../byg.byg/wood/zelkova/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/zelkova/door.json | 34 +++ .../recipes/byg.byg/wood/zelkova/fence.json | 34 +++ .../byg.byg/wood/zelkova/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/zelkova/planks.json | 32 ++ .../byg.byg/wood/zelkova/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/zelkova/slab.json | 34 +++ .../recipes/byg.byg/wood/zelkova/stairs.json | 34 +++ .../byg.byg/wood/zelkova/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/zelkova/wood.json | 34 +++ .../data/byg/recipes/wood/willow/boat.json | 16 + .../byg/recipes/wood/willow/bookshelf.json | 20 ++ .../data/byg/recipes/wood/willow/button.json | 12 + .../recipes/wood/willow/crafting_table.json | 16 + .../data/byg/recipes/wood/willow/door.json | 18 ++ .../data/byg/recipes/wood/willow/fence.json | 20 ++ .../byg/recipes/wood/willow/fence_gate.json | 19 ++ .../data/byg/recipes/wood/willow/planks.json | 13 + .../recipes/wood/willow/pressure_plate.json | 15 + .../data/byg/recipes/wood/willow/slab.json | 16 + .../data/byg/recipes/wood/willow/stairs.json | 18 ++ .../byg/recipes/wood/willow/trapdoor.json | 17 ++ .../data/byg/recipes/wood/willow/wood.json | 17 ++ .../byg/recipes/wood/witch_hazel/boat.json | 16 + .../recipes/wood/witch_hazel/bookshelf.json | 20 ++ .../byg/recipes/wood/witch_hazel/button.json | 12 + .../wood/witch_hazel/crafting_table.json | 16 + .../byg/recipes/wood/witch_hazel/door.json | 18 ++ .../byg/recipes/wood/witch_hazel/fence.json | 20 ++ .../recipes/wood/witch_hazel/fence_gate.json | 19 ++ .../byg/recipes/wood/witch_hazel/planks.json | 13 + .../wood/witch_hazel/pressure_plate.json | 15 + .../byg/recipes/wood/witch_hazel/slab.json | 16 + .../byg/recipes/wood/witch_hazel/stairs.json | 18 ++ .../recipes/wood/witch_hazel/trapdoor.json | 17 ++ .../byg/recipes/wood/witch_hazel/wood.json | 17 ++ .../data/byg/recipes/wood/zelkova/boat.json | 16 + .../byg/recipes/wood/zelkova/bookshelf.json | 20 ++ .../data/byg/recipes/wood/zelkova/button.json | 12 + .../recipes/wood/zelkova/crafting_table.json | 16 + .../data/byg/recipes/wood/zelkova/door.json | 18 ++ .../data/byg/recipes/wood/zelkova/fence.json | 20 ++ .../byg/recipes/wood/zelkova/fence_gate.json | 19 ++ .../data/byg/recipes/wood/zelkova/planks.json | 13 + .../recipes/wood/zelkova/pressure_plate.json | 15 + .../data/byg/recipes/wood/zelkova/slab.json | 16 + .../data/byg/recipes/wood/zelkova/stairs.json | 18 ++ .../byg/recipes/wood/zelkova/trapdoor.json | 17 ++ .../data/byg/recipes/wood/zelkova/wood.json | 17 ++ .../byg/tags/blocks/wood/willow_logs.json | 9 + .../tags/blocks/wood/witch_hazel_logs.json | 9 + .../byg/tags/blocks/wood/zelkova_logs.json | 9 + .../data/byg/tags/items/wood/willow_logs.json | 9 + .../byg/tags/items/wood/witch_hazel_logs.json | 9 + .../byg/tags/items/wood/zelkova_logs.json | 9 + .../byg/client/textures/ColorManager.java | 4 +- .../textures/renders/BYGRenderTypes.java | 9 - .../byg/common/BYGCompostables.java | 4 - .../byg/common/BYGFlammables.java | 32 -- .../byg/common/BYGStrippables.java | 6 - .../byg/common/entity/boat/BYGBoatEntity.java | 6 - .../byg/common/item/BYGItems.java | 1 + .../overworld/BYGOverworldTreeFeatures.java | 46 ++- 297 files changed, 7099 insertions(+), 86 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_willow_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_willow_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 6fc8309bb4..862865cec5 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -315,6 +315,57 @@ dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_lo ba8af5af681e7a4c1fd9fa346be84fca1d132a53 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json 67e9d9e8018903bb568c09d12767a0338c1bce68 assets/byg/blockstates/stripped_redwood_log.json 625fa0a3b477df439a0acf1655277bd844068167 assets/byg/blockstates/stripped_redwood_wood.json +f6b1aaf5a69ad8142f6e0834c64a73d0c4e74ae4 assets/byg/blockstates/stripped_willow_log.json +4e222bb9e50ce841de407afed467b9592f06053b assets/byg/blockstates/stripped_willow_wood.json +d32dc40358cf3a6f064ff9cbf0394e30f724aef3 assets/byg/blockstates/stripped_witch_hazel_log.json +7583d67b5af5c8dd63df91afb381d422c7bdbfee assets/byg/blockstates/stripped_witch_hazel_wood.json +211ce630315180eff72fe37b3edc00cde4325481 assets/byg/blockstates/stripped_zelkova_log.json +f9ff642efd907765efd82e5b17a8ebde73474ebd assets/byg/blockstates/stripped_zelkova_wood.json +cfabafc13af51dd19cbb65e84db364d9f4784baa assets/byg/blockstates/willow_bookshelf.json +5c55fa6f5f1a648ceed10158984177b3cbfa5c58 assets/byg/blockstates/willow_button.json +0ff45eb69b7ff16882c602f499f0e0186fe58036 assets/byg/blockstates/willow_crafting_table.json +44d5de32e53eade160a4557e74e70e49e14a4109 assets/byg/blockstates/willow_door.json +6a86aeb6cc31aa1d9f0d20cf12b557c1122c62d9 assets/byg/blockstates/willow_fence.json +a70fee5b5ae5e30e90ce21a9b4598d2b9b16fb8f assets/byg/blockstates/willow_fence_gate.json +90633186aaec4825f29775ca9c8f5da8cb4854a1 assets/byg/blockstates/willow_leaves.json +f4db1abd6f31aef65b621d8353ed382bb0cc240c assets/byg/blockstates/willow_log.json +83b169d650b6222eb942543fe1140e309a6a08c2 assets/byg/blockstates/willow_planks.json +f10243db6a3ed19ef8791f010ad836735c28daac assets/byg/blockstates/willow_pressure_plate.json +2e58bfb5cca5b81c82875592e3778fc715b25546 assets/byg/blockstates/willow_sapling.json +979ec1504964051252f99e14fcab62c19bcd3db0 assets/byg/blockstates/willow_slab.json +dfe04810897e0afdb5c84f07c5dbad37fbec7141 assets/byg/blockstates/willow_stairs.json +378999d9ab09119c17126bf03907cbc361c87fc8 assets/byg/blockstates/willow_trapdoor.json +13fc391fbc63c88a79d83d37b06348c8fcec9e69 assets/byg/blockstates/willow_wood.json +d219633b047d88b81c11fd0bf76ca92aa89a9936 assets/byg/blockstates/witch_hazel_bookshelf.json +54ea91ad393144ad0f4a79fb39de301d2462ac90 assets/byg/blockstates/witch_hazel_button.json +82514e3ad622f3cb9c7f3bb05eff534a0c86a1ec assets/byg/blockstates/witch_hazel_crafting_table.json +5abbc5c86c12fd5a55f5c618a8e8474a1b446317 assets/byg/blockstates/witch_hazel_door.json +096b518ba68ff93d9f0e83953f156633a652795c assets/byg/blockstates/witch_hazel_fence.json +aed2ce6d2c25fda5c82aadb93b9574053eb874fc assets/byg/blockstates/witch_hazel_fence_gate.json +9623a1e01a18cdfe70d13c830ce786e5deecfd4c assets/byg/blockstates/witch_hazel_leaves.json +7b888cbda62be1ec69c07c5a1de3ba4edc1b8d01 assets/byg/blockstates/witch_hazel_log.json +c7d6b38c5e613ec2936a6ccd51f1f81d6693ad69 assets/byg/blockstates/witch_hazel_planks.json +37205d5de01417cbbeceb6e3364ee14d143267df assets/byg/blockstates/witch_hazel_pressure_plate.json +651f517493b10ec2e796303f99abb2ecdef9c4d0 assets/byg/blockstates/witch_hazel_sapling.json +265e86b316bfea772301ea174c7e3cd253674bd3 assets/byg/blockstates/witch_hazel_slab.json +949b1d15d430b84552aae30bc6ec1ae800220eb0 assets/byg/blockstates/witch_hazel_stairs.json +70cb0a4b54d7fe54052466a0fea2cf50f9016888 assets/byg/blockstates/witch_hazel_trapdoor.json +815d1018df138deb48666990fef1f246f1dfd982 assets/byg/blockstates/witch_hazel_wood.json +1ba4b9692641d0f04cfe61192c49a03bc9163007 assets/byg/blockstates/zelkova_bookshelf.json +c91e56660a8d88a0eb5047e7eb7ac7d0a04bf8ec assets/byg/blockstates/zelkova_button.json +400bd875276ad87ef8d80260130e60a711019323 assets/byg/blockstates/zelkova_crafting_table.json +eca4f9fb81c2c99e66c84aeb231c80dc7f8a9b62 assets/byg/blockstates/zelkova_door.json +4beb0ddebac10fff254f987ce63ab42f3f1375d6 assets/byg/blockstates/zelkova_fence.json +c647568c770c350b9b87be7aece3cdd2117c2bb8 assets/byg/blockstates/zelkova_fence_gate.json +182f557f77eaa5f9b92b56788c633ce01698f24b assets/byg/blockstates/zelkova_leaves.json +4929b02119edf9fb5f49be310a98425a9d232554 assets/byg/blockstates/zelkova_log.json +289b98bffc2185a5e2928394722ba95c9c3e4bb1 assets/byg/blockstates/zelkova_planks.json +85b2f81280239d4da5798b0449ea92512b4ae72e assets/byg/blockstates/zelkova_pressure_plate.json +5666a379ce4aaff7b94b148430676c3ae6833bac assets/byg/blockstates/zelkova_sapling.json +4e31b34369aec5063a3feb692205a40df794d494 assets/byg/blockstates/zelkova_slab.json +16b0cf6c437d96d9f67f8b52bfd18bb3052b8774 assets/byg/blockstates/zelkova_stairs.json +b8531f52886d3c3d253a11ec632b055756bcdbed assets/byg/blockstates/zelkova_trapdoor.json +e6d361ed053df5b3512c7c74713f504e4a7143d6 assets/byg/blockstates/zelkova_wood.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -971,6 +1022,111 @@ bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/block/redwood/trapdoo c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json 304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json b92686745b20a33080cb669a5d23b8e8e0b4915c assets/byg/models/block/redwood/wood.json +ce80e9118013200e66d532e869d8bd249cb1b8ec assets/byg/models/block/willow/bookshelf.json +26bd534315d6f49619fd4388fd0d72a81678c85c assets/byg/models/block/willow/button.json +2febb5a4bc0e0bdc4cf65b5cea798a66e2c689cd assets/byg/models/block/willow/button_inventory.json +3808bdaa9e533368754057c0a57f9326648470ae assets/byg/models/block/willow/button_pressed.json +df258b499d6d218de285d77bfea54b6fdd0f3232 assets/byg/models/block/willow/crafting_table.json +29f69671719975515e1bfb601d114b8eb441f398 assets/byg/models/block/willow/door_bottom.json +284b695e83aacb6e14aa738ed8b1f1b8572047cb assets/byg/models/block/willow/door_bottom_hinge.json +02c84d5f5c0c25ed13d4a0d5b5592b7c882dd16d assets/byg/models/block/willow/door_top.json +54cba9a43f22a6bd842f17baa76cc518dadd04cd assets/byg/models/block/willow/door_top_hinge.json +ab254ed8b8ee500ea9a643152e9437864274dc08 assets/byg/models/block/willow/fence.json +982436fb978a70f47e2e74d40f1747a598030846 assets/byg/models/block/willow/fence_gate.json +9bf199fc5b5c09bc6dcd07c55daeab84ccc99d50 assets/byg/models/block/willow/fence_gate_open.json +38426261cbef23ffc84241073daa615f14cf5958 assets/byg/models/block/willow/fence_gate_wall.json +21aed1e945f984af538f8070948e21a7b07cb662 assets/byg/models/block/willow/fence_gate_wall_open.json +10bf9b4a419147e792d4156dcd285111e8935048 assets/byg/models/block/willow/fence_inv.json +8799c88ebdb1f508f86f62b77a244e01e87a6b46 assets/byg/models/block/willow/fence_post.json +5e5afb7a3890d8f48d5e23a2c87b1188619506c8 assets/byg/models/block/willow/grower_item.json +e084f73a142b28074820921a4efeb33fa8d23abd assets/byg/models/block/willow/leaves.json +1301c5e2999f537a044d5111e5e8a7cd7722173b assets/byg/models/block/willow/leaves_snowy.json +feac0b2ff67fbfc5a7e6db13829acf57fec39f5a assets/byg/models/block/willow/log.json +9ec37312d1e64d6921417500edc74171330e4253 assets/byg/models/block/willow/planks.json +a792ac13a4ff8673d6da1efbaef9502337887236 assets/byg/models/block/willow/pressure_plate.json +f86b9b5f611d5a5833ab40d32752f704e75e8c61 assets/byg/models/block/willow/pressure_plate_down.json +c451ec6b5682d7f358994d02b496fb2457a09207 assets/byg/models/block/willow/slab.json +a8cd96ef4db07698687493aa5a643b2be51b1ced assets/byg/models/block/willow/slab_top.json +5c58b009e7b933a978784bf64e309c37020c52b2 assets/byg/models/block/willow/stairs.json +36c8ed21c916724d472c27c8bcba3fc04f1ab613 assets/byg/models/block/willow/stairs_inner.json +87b1013ab54b467e3de04f961bf90edec6a88042 assets/byg/models/block/willow/stairs_outer.json +ab687571198ebfe95437d9a7ca9bfa92bb52fbe8 assets/byg/models/block/willow/stripped_log.json +ecccd0297dae87e55fb0581341059f43e22b59e9 assets/byg/models/block/willow/stripped_wood.json +bce10e0702e13c2c6d95cf6a1bfec374da67b3de assets/byg/models/block/willow/trapdoor.json +a9d4c98f65f333f4b644724ef23aee3d39cee3dd assets/byg/models/block/willow/trapdoor_bottom.json +bafd010c91e98b5d4abb2bf5e5ad58dddec6da54 assets/byg/models/block/willow/trapdoor_open.json +eea8e81a8e46a407ab529f289e23f35f518d6cb1 assets/byg/models/block/willow/trapdoor_top.json +48594802914937e97f96bd10e136561e89b4767e assets/byg/models/block/willow/wood.json +bc45417c620440c2f7254065312783e86728f486 assets/byg/models/block/witch_hazel/bookshelf.json +f6c16fa1fb634538da55ac73a6b2c2aee73d8fbb assets/byg/models/block/witch_hazel/button.json +1c23dc9498629d724641837effb1011080f56167 assets/byg/models/block/witch_hazel/button_inventory.json +a03373fc37a3c06ad52f489015de96c5ff04db4c assets/byg/models/block/witch_hazel/button_pressed.json +adaad4fd3577891198b3b0e5d921a728ca77dc0c assets/byg/models/block/witch_hazel/crafting_table.json +324d430498c855ccff09fda9a1f29779f9374543 assets/byg/models/block/witch_hazel/door_bottom.json +7bd71f5d7645af883ab9cdc24d3609c7a6590b02 assets/byg/models/block/witch_hazel/door_bottom_hinge.json +62ad094d8953e251431cd031527155afb2f5bb3d assets/byg/models/block/witch_hazel/door_top.json +37ed8b791711cb32d71cee976e7d7d0cc37d07e4 assets/byg/models/block/witch_hazel/door_top_hinge.json +4730178a0c9e8b639f5d5c529480c8a133ef0a2c assets/byg/models/block/witch_hazel/fence.json +4a2ed118ac0d20b440b41ac6d4e115061ec26bb1 assets/byg/models/block/witch_hazel/fence_gate.json +f1451d64a7092c39582be1f9067ac2ec31a2746f assets/byg/models/block/witch_hazel/fence_gate_open.json +15bf64b70e942f07636701e027037755038b1cf8 assets/byg/models/block/witch_hazel/fence_gate_wall.json +c0e1f1335039334bf52f0e97f23e4ac133d5b74e assets/byg/models/block/witch_hazel/fence_gate_wall_open.json +2bc9cf3284f9c3881ebc5dd7352e2020ff12cf00 assets/byg/models/block/witch_hazel/fence_inv.json +6065975d5c2136efc85bec1ccb75651e55a9cbb8 assets/byg/models/block/witch_hazel/fence_post.json +90c0b9e7082cc7e8f34f66035f76ad78d38db60b assets/byg/models/block/witch_hazel/grower_item.json +878ae2b39bf110b29b15098c8cb201c96290e50d assets/byg/models/block/witch_hazel/leaves.json +63e8e8531d90ab450275f3170dfa414353a42bf4 assets/byg/models/block/witch_hazel/leaves_snowy.json +2d4d8b8a6a14cc280d4e3fe57a43657d3a52cd96 assets/byg/models/block/witch_hazel/log.json +02de0b41a02a93dafa542e2fa4764f2c66b5f8f1 assets/byg/models/block/witch_hazel/planks.json +c313a30572d7f13e67b72e54a6ddab2c99c6acbb assets/byg/models/block/witch_hazel/pressure_plate.json +6fe041a932e5200da73db3bcbed5dff8d9ad7c6c assets/byg/models/block/witch_hazel/pressure_plate_down.json +0674f0ad27ac6b8a8a52909fc9bfeff01933c79c assets/byg/models/block/witch_hazel/slab.json +22d6e82975e62c5b4459ccf2d3d24e459d7a1fa3 assets/byg/models/block/witch_hazel/slab_top.json +334718206820ba5730ad12f9676df1b1eb072cfd assets/byg/models/block/witch_hazel/stairs.json +48fae63331777725f1bb94b478f2f351cd97f9ca assets/byg/models/block/witch_hazel/stairs_inner.json +249fdd1e2148ee5330b0a950b0e4972b82b47853 assets/byg/models/block/witch_hazel/stairs_outer.json +e33216927e9498cad7077b8addf05a62e00370fd assets/byg/models/block/witch_hazel/stripped_log.json +de970385fdad67acf439f77049948149e164bc4b assets/byg/models/block/witch_hazel/stripped_wood.json +24f0246e7234ac365aa0593fb4fec098acca5f4b assets/byg/models/block/witch_hazel/trapdoor.json +2c4c660fa225986d8826f7e282eff588d4b1101c assets/byg/models/block/witch_hazel/trapdoor_bottom.json +8d2e5c3f8d523a99dc0a514124d5c57e952a2c16 assets/byg/models/block/witch_hazel/trapdoor_open.json +f655421c46282f56f4391129b6a092796c60ef8b assets/byg/models/block/witch_hazel/trapdoor_top.json +abbecc266513275fe07c9da9414768ec7317c0d2 assets/byg/models/block/witch_hazel/wood.json +061fce9a782781f733567363590edc04cf164d46 assets/byg/models/block/zelkova/bookshelf.json +08cef593cf20d9202a630e08f9d4fffe649dbf34 assets/byg/models/block/zelkova/button.json +0bd0b1dcfef2d9be2ab7ac69cf72865118447ffe assets/byg/models/block/zelkova/button_inventory.json +07dbb98ea1e165dc1bd0b9e658d135f957f6a644 assets/byg/models/block/zelkova/button_pressed.json +e94f133773a11276377d6f54a7345d97e9b6f757 assets/byg/models/block/zelkova/crafting_table.json +18a63dccf6ddc0d031f922d2a2bca5f0c95680fe assets/byg/models/block/zelkova/door_bottom.json +8a2d99d8313ae02af77cd38d2c775b38e6c167fe assets/byg/models/block/zelkova/door_bottom_hinge.json +df084f24d6003ab9a77f3cacd8367d41495ca082 assets/byg/models/block/zelkova/door_top.json +fb37012a3c6ad454ecc5cd530ab838c840c1d58f assets/byg/models/block/zelkova/door_top_hinge.json +6d5aa8f76cfd3a4900bda86f7437e7469b48220f assets/byg/models/block/zelkova/fence.json +996e3dfe4c2b56b84b046bd79fd65e4b2b302c01 assets/byg/models/block/zelkova/fence_gate.json +ad1adc3e30e9b0ff25b5fe9a89b15e0f2be2f6db assets/byg/models/block/zelkova/fence_gate_open.json +6c5dde7889eec48d2ee39f8206b53a675c268b38 assets/byg/models/block/zelkova/fence_gate_wall.json +7f18a04c6385aa5d1240da7055902c405db011d1 assets/byg/models/block/zelkova/fence_gate_wall_open.json +18c9ea64f78c53360d0a35b2e7275380c4a3ddef assets/byg/models/block/zelkova/fence_inv.json +27d92c9201e4b17e28d5cfff614059862227d776 assets/byg/models/block/zelkova/fence_post.json +2f9a2ee25192c73a00f4dce1af55688765b00e04 assets/byg/models/block/zelkova/grower_item.json +4df30cff616f6a4f6434ec669d14840634245fbc assets/byg/models/block/zelkova/leaves.json +ef5f55349ca4c1196d94c67884f0035085323a90 assets/byg/models/block/zelkova/leaves_snowy.json +63de24837aa2f58fbd5de80ee4a4e584bdfeabb5 assets/byg/models/block/zelkova/log.json +aeeb64d84bd50fb58c48e64c0b921a7e83d16363 assets/byg/models/block/zelkova/planks.json +a4c7aa319e522820d079bcbaf0faaea764a7f2ec assets/byg/models/block/zelkova/pressure_plate.json +db7bee9ad1470f8004d6312b37558e63e1806e98 assets/byg/models/block/zelkova/pressure_plate_down.json +87bc547fc289441746b4a7e4424caee026f6b5d6 assets/byg/models/block/zelkova/slab.json +b4fd33232e23ed2bfaed1ebee0b8cc38dd504ad2 assets/byg/models/block/zelkova/slab_top.json +1b25f295105359b99d88f260504b9f6124e27d20 assets/byg/models/block/zelkova/stairs.json +695136a22be4dbb26f7b78c97c1351e1e32254ac assets/byg/models/block/zelkova/stairs_inner.json +013a773f702d7cdba882d237c4f36cb32657ef28 assets/byg/models/block/zelkova/stairs_outer.json +ff054988ef39777460903aea64b1c3b18a18032f assets/byg/models/block/zelkova/stripped_log.json +c3c4a88adef021e550fb5fc37a89a6e5640fe492 assets/byg/models/block/zelkova/stripped_wood.json +c558d204496231acfc2f07b1763894108894a676 assets/byg/models/block/zelkova/trapdoor.json +ab1675e50a3e6091219fbe83b79a9e7c5c5f6b1f assets/byg/models/block/zelkova/trapdoor_bottom.json +8f9be3415ad1ddd69d7960b635e06ffaed679d9a assets/byg/models/block/zelkova/trapdoor_open.json +918fff9aa98157ae0666e10d17dc3d22844fe4f2 assets/byg/models/block/zelkova/trapdoor_top.json +8b83de88f16c43627c40020e3984f1e71dca53c1 assets/byg/models/block/zelkova/wood.json 331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json 78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json @@ -1266,6 +1422,54 @@ e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wo 03df4f31d47d36fd31fdc70002686f80dc3cb46f assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json a86cac25410f11ccd308ab3cbf1217e18eb73895 assets/byg/models/item/stripped_redwood_log.json db8a7ece8ae147b5b60a97bdaaa461d45185bb09 assets/byg/models/item/stripped_redwood_wood.json +fb93ad2185e85033120d127bd82f62c6a31f7e4c assets/byg/models/item/stripped_willow_log.json +adeebea04044107c674e2d9f0507120d622647b5 assets/byg/models/item/stripped_willow_wood.json +e6950d73dc47a1084f96c6718bcd1a9c8f99f54e assets/byg/models/item/stripped_witch_hazel_log.json +b5ace128271a547e9aec54d9654f961e1eedb37b assets/byg/models/item/stripped_witch_hazel_wood.json +8b1eac54f1510cc94903fff54021c459a615665d assets/byg/models/item/stripped_zelkova_log.json +24e453300046cb72733d5332321d36aea2e077fb assets/byg/models/item/stripped_zelkova_wood.json +a52bc875d6707a1b1d65472af872f38341d74862 assets/byg/models/item/willow_boat.json +8d8cfcfd12b3742a693df688c8db073d3bfdbaf0 assets/byg/models/item/willow_bookshelf.json +866026b225ba45574007e994aecb293b5dad7d6d assets/byg/models/item/willow_button.json +7246dbe95b4571df2432246d54cdbe4a24105936 assets/byg/models/item/willow_crafting_table.json +5b445b7a9b68810e95dc20e56ac12ef45ae331cf assets/byg/models/item/willow_door.json +302cfa6da893bc2017fc76deae0cff01467e8076 assets/byg/models/item/willow_fence.json +b02d9b57bb6db0d6763d8cb1305c747462324142 assets/byg/models/item/willow_leaves.json +8112375ad6a7805e63fe3ce73e0ef74837d15936 assets/byg/models/item/willow_log.json +0ae4dba613603a07fd48c79830781f02a6026a7c assets/byg/models/item/willow_planks.json +29c830fcf5349965bbd73bd87caf004cb2d5b8c4 assets/byg/models/item/willow_pressure_plate.json +d34a3f4732fd8f597e8359c2a8db3f6fce144919 assets/byg/models/item/willow_sapling.json +27d9f5b070024aaf18da4fc85617bdcc355c465a assets/byg/models/item/willow_slab.json +77d5d392878fe1a28710e6ee6823bfcd3215c8e2 assets/byg/models/item/willow_stairs.json +7f9b973b3da73098a0e08bd9503e68e62826f421 assets/byg/models/item/willow_wood.json +af8dfa8b8ebfa5767941d15d53e89e12cbdb2afc assets/byg/models/item/witch_hazel_boat.json +4f4fa7f12faa772ee1e689d02ed121cbe128236a assets/byg/models/item/witch_hazel_bookshelf.json +e3663b382d3fb093f89d56b82299b20997dc8cb4 assets/byg/models/item/witch_hazel_button.json +9827a52d0694bb47dcac5b8c4634dc78b524f3d9 assets/byg/models/item/witch_hazel_crafting_table.json +b4f5e02b694a88d383c667d6a701f0aaaac82c98 assets/byg/models/item/witch_hazel_door.json +d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fence.json +2fc78d259246515fa7db39b816a74afa69ebc7c0 assets/byg/models/item/witch_hazel_leaves.json +9270f668d4fb0cc7afddc07a9d7d29259df8047a assets/byg/models/item/witch_hazel_log.json +1ac92832148124b4b1277d8994bedf57782e19a5 assets/byg/models/item/witch_hazel_planks.json +3abb227e0d75fd6f8bdeab5a4e25dfe86a397c8b assets/byg/models/item/witch_hazel_pressure_plate.json +c0d2d67481fe5702a0256109243698d3a117818e assets/byg/models/item/witch_hazel_sapling.json +efb86376aef5cfb09e69e9fe444ac115d4db0eb2 assets/byg/models/item/witch_hazel_slab.json +a75f89ed619c4602a1a89f52515757744d0bd530 assets/byg/models/item/witch_hazel_stairs.json +8b2170e50f1b5b782b82c649aea4194a4985ff5d assets/byg/models/item/witch_hazel_wood.json +c859ebb6fc1693e4e35b6df16641ffc54c91861c assets/byg/models/item/zelkova_boat.json +7f7c5801191562e8d9d8abff53e2b81ee174be5c assets/byg/models/item/zelkova_bookshelf.json +9a0711bbc8efa06dccac1b75b20268ddc27ac679 assets/byg/models/item/zelkova_button.json +61c10955c42198ca23e6796410dfdd34ff338978 assets/byg/models/item/zelkova_crafting_table.json +5364a3067040014f67fd87da38f5398393cbfc7b assets/byg/models/item/zelkova_door.json +4a2c09b90687604332a4c863e3c785dbe5fb3bc6 assets/byg/models/item/zelkova_fence.json +83ef1f99f43336cbb03bae053eaa204b7248a531 assets/byg/models/item/zelkova_leaves.json +a6396600e00f4b4d0b53fd1fd7c2938b57f22f93 assets/byg/models/item/zelkova_log.json +bc785e1c1efec9f89265a5cb5474b3f88eac5064 assets/byg/models/item/zelkova_planks.json +613fa17c691ac2b320f967ebf3a14ec09127ae60 assets/byg/models/item/zelkova_pressure_plate.json +41d236f7a48a2d7493af11495db0579977ab11ff assets/byg/models/item/zelkova_sapling.json +d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.json +7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json +5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -1510,6 +1714,45 @@ f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/w 48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json ce977027d630e1d18301bbff458916b11621daa9 data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json +48dbd2f4c71c5116e529c19ef8033dee0b232fda data/byg/advancements/recipes/byg.byg/wood/willow/boat.json +13bfcd87821c7ea0d55a275910defa7dbc7a1a00 data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json +34f9f4691439d3288e486685671b53c5f2e30ba1 data/byg/advancements/recipes/byg.byg/wood/willow/button.json +249a772fdd1e4196d027deca01982a5b38830ab9 data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json +6691deb6b35bde56911fb640a71c5ea4fddbe8b9 data/byg/advancements/recipes/byg.byg/wood/willow/door.json +e29da2c4e8fd38b40d92e8b6e320afb8d1bb56db data/byg/advancements/recipes/byg.byg/wood/willow/fence.json +5f7c4ceae94bc2ff3aa19ce230ef6d66cc0c18ed data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json +8f1a00431112150c0c0044fea6ad876d8c9495e5 data/byg/advancements/recipes/byg.byg/wood/willow/planks.json +d04480bf1d069032f9466601054d79b6e8b40296 data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json +dd4b6fd9c90c3ce98f842957d2aee4f2fb1dcd39 data/byg/advancements/recipes/byg.byg/wood/willow/slab.json +812032f12d83f5125bfc7113c6592491ec8911f6 data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json +44da6f86672f69a1e64351f411b9ae7a3e445518 data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json +940bf82aab8c2b9588754696772c658a2aa920a9 data/byg/advancements/recipes/byg.byg/wood/willow/wood.json +9f805ae39e7c572808e8c976de35ca965ae2cf2d data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json +ec86022bc854cf72b10c54b04f05b7b757af4fbd data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json +897cdf37e19452bc0907e3691dba6beffa093bf7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json +cf525bbbb4bb959682827f7c862ee986115d639c data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json +a186210030093ba5c30b6820e7bb2325b8cd9a6c data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json +04ba72598f109172c525f8fb471bfc29d46cf57e data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json +6c7c8dcbf4a3f58ed04126f191c5b75fbeb0ee40 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json +cef8647c4e6d4fd7167fe917133ece74cfc11a61 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json +816ef82b64f6e7859c006d51164e180c560d77e4 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json +6e1be4972fd1e7b9d8ec96f0f933b2c666c26fae data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json +bb44865b80806f1bc536521caecfbd752f4d12c7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json +5384dd297cf8df2c86d6ccad6832bf54fd640fbe data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json +75e7d4fdf4c5ff2864b418c43dd8eaf1c14bfacb data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json +736dd39bb9d8dae6da8d3ac2d43332a4fc2d26cb data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json +efab17ac82f54c8f3a9ba30d45db96b398457518 data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json +91bbbf24b0ec85585a30322410cadc45e5a135b6 data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json +0b5b85ec3cb786c0b55c51fc4ef6e0e2004c1cf0 data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json +57696b92a14bbd456d045df4e5251674710445ea data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json +c59b21fdafb3dc04832f154d75c9baed1033b052 data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json +747a3bb3e57b40c834af5aba294ee78364fddb0e data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json +ba9f51cd727d9e0365d68153fc5d2a25e9c4035b data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json +d7c781e47dc8891cbb9a0c2660c64dca75fcf983 data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json +3bf8c396e8086903d0eb0c71dcde3f2e305423a7 data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json +b0cbd5fdb61a5c8ccf6a5a58a4bfad85b3acde92 data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json +83eb246f22ed55bd11083437fbf8df5221ef5089 data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json +2e794f722e70ffdda0a17dbf28c0f8716abdf426 data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -1754,6 +1997,45 @@ e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json 5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json 87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json 77068fa435484d2dfd95ba3a45308c36d6593157 data/byg/recipes/wood/redwood/wood.json +837cb000ce0acb14670412f3dfb5e5fd666216fc data/byg/recipes/wood/willow/boat.json +06e9a5a74e213645a9b491c89f968100d8d37d96 data/byg/recipes/wood/willow/bookshelf.json +331708c6a157e1c2b5f43c57e7c65c0b80886e34 data/byg/recipes/wood/willow/button.json +a3c68bcafe458a0b2d459cbf8614f0f4d47a5401 data/byg/recipes/wood/willow/crafting_table.json +5e9c71117e0307036ead5af0e2d5729613fb7fc9 data/byg/recipes/wood/willow/door.json +7f2fec1c3c43065f88c5fafaca070e1617afa749 data/byg/recipes/wood/willow/fence.json +f88432533a32bfddee27c824aae37198c6c7b67e data/byg/recipes/wood/willow/fence_gate.json +0725f98b1ad68bf6d8564b1618c6c247b7e80ef8 data/byg/recipes/wood/willow/planks.json +14eeff76c2beb34eaf7d817ba4494c38c84e8bbc data/byg/recipes/wood/willow/pressure_plate.json +cb9a56bb7cdcca02a6936cc3bf47dc65ded746f8 data/byg/recipes/wood/willow/slab.json +3a751748a2b9069d0a425f13056cd7c51e3f8721 data/byg/recipes/wood/willow/stairs.json +da344558dd48b0428d760f60d8d47ad0a1cf3d0f data/byg/recipes/wood/willow/trapdoor.json +51fa8f011040ffcd63eb1eb948bdb14e154498ab data/byg/recipes/wood/willow/wood.json +8be04d919c768ca504a362376a377abe5068491e data/byg/recipes/wood/witch_hazel/boat.json +4d89b78838e5a87d93d000e6b644b0c15fb5a134 data/byg/recipes/wood/witch_hazel/bookshelf.json +e1b3fe1dce1b76bc2f177e84e8ea7db1f2645015 data/byg/recipes/wood/witch_hazel/button.json +f3051a1922fe1afeda7d43b1335a90f63f5695d8 data/byg/recipes/wood/witch_hazel/crafting_table.json +a7b74ca3edfc8f597f716b644c559d760732e42a data/byg/recipes/wood/witch_hazel/door.json +eb27a528dbcb12b8e5d40a66ef8d2bba046f997a data/byg/recipes/wood/witch_hazel/fence.json +d70e49110b3b8441a2aa0211cd86c6cfad508c2d data/byg/recipes/wood/witch_hazel/fence_gate.json +d5f8f3331d7268d45e382b896c7664665a7d5dd9 data/byg/recipes/wood/witch_hazel/planks.json +a4b642fd4648e4691ab27e6dd2e45f6a9ea10308 data/byg/recipes/wood/witch_hazel/pressure_plate.json +cf423f46d8a554275b125d46fe11589c44b089d7 data/byg/recipes/wood/witch_hazel/slab.json +bcb31b82d756d66eaf2ba6ac42175f065f055a6c data/byg/recipes/wood/witch_hazel/stairs.json +3237525986cf267bcebfdec1d9679c7cae8de1f4 data/byg/recipes/wood/witch_hazel/trapdoor.json +4526c524259ce1746cf07bff23079a4f74c92731 data/byg/recipes/wood/witch_hazel/wood.json +e3a1b871d0ad4c86097b356c06d343b8d96129fd data/byg/recipes/wood/zelkova/boat.json +31c15fd989c1090a19f488a9f6c0a39b491037fa data/byg/recipes/wood/zelkova/bookshelf.json +34c2d86ebff26218427b83e7a09cf1b6907032d8 data/byg/recipes/wood/zelkova/button.json +83aed9be1c7d230ffa7fca714539021bc495e32a data/byg/recipes/wood/zelkova/crafting_table.json +55f02f16c273e1f3359af8520a422d922905cc11 data/byg/recipes/wood/zelkova/door.json +705b4dd446242ca58f4215dae2de57fbff052c48 data/byg/recipes/wood/zelkova/fence.json +03051c467ed5bee881bc36d6cd047226a5e812a8 data/byg/recipes/wood/zelkova/fence_gate.json +1fdf7c8c242c238c0025521a400d69eac31dd289 data/byg/recipes/wood/zelkova/planks.json +2ee988906823ce6d7ba83fd772b693dee61e4089 data/byg/recipes/wood/zelkova/pressure_plate.json +65b4c7eba317fbcc85d56bccf004458b9aae1f6e data/byg/recipes/wood/zelkova/slab.json +5cc3d6c5d4ad75828481945934c82b9b4681d1f1 data/byg/recipes/wood/zelkova/stairs.json +7d1bd145500fbeffd22edc9d35239aa995d48815 data/byg/recipes/wood/zelkova/trapdoor.json +514cc64fb5a8f37d6e6520a28705223d917f7478 data/byg/recipes/wood/zelkova/wood.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1897,6 +2179,9 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json 9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json +7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/blocks/wood/willow_logs.json +7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/blocks/wood/witch_hazel_logs.json +a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json @@ -1916,4 +2201,7 @@ cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json 52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json 4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json +5343112857899942ab8f37d883a572166eba5b13 data/byg/tags/items/wood/willow_logs.json +7832a5cc7d64149d49991f418ffc960adc4ae871 data/byg/tags/items/wood/witch_hazel_logs.json +b488cad37e845f24abd0bc83f7d7e4646e5b668d data/byg/tags/items/wood/zelkova_logs.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_log.json new file mode 100644 index 0000000000..65b943fce3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/willow/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/willow/stripped_log" + }, + "axis=z": { + "model": "byg:block/willow/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_wood.json new file mode 100644 index 0000000000..5f7e6daf97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_willow_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/willow/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/willow/stripped_wood" + }, + "axis=z": { + "model": "byg:block/willow/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_log.json new file mode 100644 index 0000000000..f744918cf7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/witch_hazel/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/witch_hazel/stripped_log" + }, + "axis=z": { + "model": "byg:block/witch_hazel/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json new file mode 100644 index 0000000000..9aae2b6eaa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_witch_hazel_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/witch_hazel/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/witch_hazel/stripped_wood" + }, + "axis=z": { + "model": "byg:block/witch_hazel/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_log.json new file mode 100644 index 0000000000..246e8a180d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/zelkova/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/zelkova/stripped_log" + }, + "axis=z": { + "model": "byg:block/zelkova/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_wood.json new file mode 100644 index 0000000000..673562fcbf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_zelkova_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/zelkova/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/zelkova/stripped_wood" + }, + "axis=z": { + "model": "byg:block/zelkova/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/willow_bookshelf.json new file mode 100644 index 0000000000..ea1146897a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_button.json b/Common/src/generated/resources/assets/byg/blockstates/willow_button.json new file mode 100644 index 0000000000..1042622bc9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/willow/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/willow/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/willow/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/willow/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/willow/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/willow/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/willow/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/willow/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/willow/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/willow_crafting_table.json new file mode 100644 index 0000000000..b56a65eb4c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_door.json b/Common/src/generated/resources/assets/byg/blockstates/willow_door.json new file mode 100644 index 0000000000..78fcebed8f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json b/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json new file mode 100644 index 0000000000..a170969ab6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/willow/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/willow/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/willow/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/willow/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/willow/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json new file mode 100644 index 0000000000..bbc6c795ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/willow_leaves.json new file mode 100644 index 0000000000..9dd8c8d5f4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_log.json b/Common/src/generated/resources/assets/byg/blockstates/willow_log.json new file mode 100644 index 0000000000..a361cb0a0b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/willow/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/willow/log" + }, + "axis=z": { + "model": "byg:block/willow/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_planks.json b/Common/src/generated/resources/assets/byg/blockstates/willow_planks.json new file mode 100644 index 0000000000..b1c3cd9333 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/willow_pressure_plate.json new file mode 100644 index 0000000000..6a49bdad41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/willow/pressure_plate" + }, + "powered=true": { + "model": "byg:block/willow/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/willow_sapling.json new file mode 100644 index 0000000000..1a046b7f14 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json b/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json new file mode 100644 index 0000000000..d527adb581 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/willow/slab_top" + }, + "type=bottom": { + "model": "byg:block/willow/slab" + }, + "type=double": { + "model": "byg:block/willow/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json new file mode 100644 index 0000000000..496a9c0dcd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json new file mode 100644 index 0000000000..887f37f6cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/willow/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/willow/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/willow/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/willow/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_wood.json b/Common/src/generated/resources/assets/byg/blockstates/willow_wood.json new file mode 100644 index 0000000000..3b5e65a0d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/willow/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/willow/wood" + }, + "axis=z": { + "model": "byg:block/willow/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_bookshelf.json new file mode 100644 index 0000000000..64ed313185 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json new file mode 100644 index 0000000000..5fdb847869 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/witch_hazel/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/witch_hazel/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_crafting_table.json new file mode 100644 index 0000000000..e9c2f60f71 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json new file mode 100644 index 0000000000..e722504d1b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json new file mode 100644 index 0000000000..bf614e8965 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/witch_hazel/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/witch_hazel/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/witch_hazel/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/witch_hazel/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/witch_hazel/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json new file mode 100644 index 0000000000..a6d3cf39da --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_leaves.json new file mode 100644 index 0000000000..d95534ef7c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_log.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_log.json new file mode 100644 index 0000000000..5c5451c7b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/witch_hazel/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/witch_hazel/log" + }, + "axis=z": { + "model": "byg:block/witch_hazel/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_planks.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_planks.json new file mode 100644 index 0000000000..8803a0d7e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json new file mode 100644 index 0000000000..d4155f6095 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/witch_hazel/pressure_plate" + }, + "powered=true": { + "model": "byg:block/witch_hazel/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sapling.json new file mode 100644 index 0000000000..a16405518c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json new file mode 100644 index 0000000000..f4bd8d17ff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/witch_hazel/slab_top" + }, + "type=bottom": { + "model": "byg:block/witch_hazel/slab" + }, + "type=double": { + "model": "byg:block/witch_hazel/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json new file mode 100644 index 0000000000..ad928a06f2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json new file mode 100644 index 0000000000..751c721b51 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wood.json new file mode 100644 index 0000000000..d5f41d8861 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/witch_hazel/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/witch_hazel/wood" + }, + "axis=z": { + "model": "byg:block/witch_hazel/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_bookshelf.json new file mode 100644 index 0000000000..45002b3f93 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json new file mode 100644 index 0000000000..ce0a5d903a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/zelkova/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/zelkova/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_crafting_table.json new file mode 100644 index 0000000000..922d0dd7a1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json new file mode 100644 index 0000000000..16693092a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json new file mode 100644 index 0000000000..07f43b9fc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/zelkova/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/zelkova/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/zelkova/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/zelkova/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/zelkova/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json new file mode 100644 index 0000000000..a923822d76 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_leaves.json new file mode 100644 index 0000000000..431cf61532 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_log.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_log.json new file mode 100644 index 0000000000..e1890a394b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/zelkova/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/zelkova/log" + }, + "axis=z": { + "model": "byg:block/zelkova/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_planks.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_planks.json new file mode 100644 index 0000000000..24062e2e67 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_pressure_plate.json new file mode 100644 index 0000000000..e9214381f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/zelkova/pressure_plate" + }, + "powered=true": { + "model": "byg:block/zelkova/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_sapling.json new file mode 100644 index 0000000000..2d6bfb3a15 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json new file mode 100644 index 0000000000..5f0b775de9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/zelkova/slab_top" + }, + "type=bottom": { + "model": "byg:block/zelkova/slab" + }, + "type=double": { + "model": "byg:block/zelkova/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json new file mode 100644 index 0000000000..8be2eec455 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json new file mode 100644 index 0000000000..1b206bbce8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_wood.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_wood.json new file mode 100644 index 0000000000..06d26e9dea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/zelkova/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/zelkova/wood" + }, + "axis=z": { + "model": "byg:block/zelkova/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json new file mode 100644 index 0000000000..8fd6acafab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/willow/planks", + "up": "byg:block/willow/planks", + "north": "byg:block/willow/bookshelf", + "south": "byg:block/willow/bookshelf", + "east": "byg:block/willow/bookshelf", + "west": "byg:block/willow/bookshelf", + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/button.json b/Common/src/generated/resources/assets/byg/models/block/willow/button.json new file mode 100644 index 0000000000..be2d505e36 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/willow/button_inventory.json new file mode 100644 index 0000000000..16af279785 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/willow/button_pressed.json new file mode 100644 index 0000000000..47387ef216 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json new file mode 100644 index 0000000000..78edca2df8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/willow/planks", + "up": "byg:block/willow/crafting_table_top", + "north": "byg:block/willow/crafting_table_front", + "south": "byg:block/willow/crafting_table_side", + "east": "byg:block/willow/crafting_table_side", + "west": "byg:block/willow/crafting_table_front", + "particle": "byg:block/willow/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json new file mode 100644 index 0000000000..18eaba88b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json new file mode 100644 index 0000000000..c3e23e77da --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_top.json b/Common/src/generated/resources/assets/byg/models/block/willow/door_top.json new file mode 100644 index 0000000000..f728ff8b81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json new file mode 100644 index 0000000000..8cef307892 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence.json new file mode 100644 index 0000000000..9f7bd05e1c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/willow/planks", + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate.json new file mode 100644 index 0000000000..2d8c7efd3e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_open.json new file mode 100644 index 0000000000..6ef452f779 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall.json new file mode 100644 index 0000000000..bcdbb4d738 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall_open.json new file mode 100644 index 0000000000..aface56744 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json new file mode 100644 index 0000000000..4faa0149c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/willow/planks", + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json new file mode 100644 index 0000000000..e18ca3927d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/willow/planks", + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/willow/grower_item.json new file mode 100644 index 0000000000..78ed1f180a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/willow/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json new file mode 100644 index 0000000000..b1de7a9e68 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/willow/leaves", + "up": "byg:block/willow/leaves", + "north": "byg:block/willow/leaves", + "south": "byg:block/willow/leaves", + "east": "byg:block/willow/leaves", + "west": "byg:block/willow/leaves", + "particle": "byg:block/willow/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json new file mode 100644 index 0000000000..90e1ca20cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/willow/leaves_snowy", + "up": "byg:block/willow/leaves_snowy", + "north": "byg:block/willow/leaves_snowy_side", + "south": "byg:block/willow/leaves_snowy_side", + "east": "byg:block/willow/leaves_snowy_side", + "west": "byg:block/willow/leaves_snowy_side", + "particle": "byg:block/willow/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/log.json b/Common/src/generated/resources/assets/byg/models/block/willow/log.json new file mode 100644 index 0000000000..16663213b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/willow/log", + "end": "byg:block/willow/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/planks.json b/Common/src/generated/resources/assets/byg/models/block/willow/planks.json new file mode 100644 index 0000000000..0fd02bc430 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/willow/planks", + "up": "byg:block/willow/planks", + "north": "byg:block/willow/planks", + "south": "byg:block/willow/planks", + "east": "byg:block/willow/planks", + "west": "byg:block/willow/planks", + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate.json new file mode 100644 index 0000000000..8cdd78def9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate_down.json new file mode 100644 index 0000000000..bb9ead4a62 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/slab.json b/Common/src/generated/resources/assets/byg/models/block/willow/slab.json new file mode 100644 index 0000000000..dfe2825f8a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/willow/planks", + "bottom": "byg:block/willow/planks", + "top": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json new file mode 100644 index 0000000000..e2c85b3357 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/willow/planks", + "bottom": "byg:block/willow/planks", + "top": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json new file mode 100644 index 0000000000..1e398a28e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/willow/planks", + "bottom": "byg:block/willow/planks", + "top": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json new file mode 100644 index 0000000000..6722d14a26 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/willow/planks", + "bottom": "byg:block/willow/planks", + "top": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json new file mode 100644 index 0000000000..646905884a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/willow/planks", + "bottom": "byg:block/willow/planks", + "top": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json new file mode 100644 index 0000000000..3c5b5028ec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/willow/stripped_log", + "end": "byg:block/willow/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_wood.json new file mode 100644 index 0000000000..1e050c664d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/willow/stripped_log", + "particle": "byg:block/willow/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json new file mode 100644 index 0000000000..f99225355c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_bottom.json new file mode 100644 index 0000000000..600fbcda34 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/willow/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_open.json new file mode 100644 index 0000000000..4f086d55cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/willow/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_top.json new file mode 100644 index 0000000000..53ed7ded43 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/willow/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/wood.json b/Common/src/generated/resources/assets/byg/models/block/willow/wood.json new file mode 100644 index 0000000000..2bb9b3b00a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/willow/log", + "particle": "byg:block/willow/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json new file mode 100644 index 0000000000..ff78397eab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/witch_hazel/planks", + "up": "byg:block/witch_hazel/planks", + "north": "byg:block/witch_hazel/bookshelf", + "south": "byg:block/witch_hazel/bookshelf", + "east": "byg:block/witch_hazel/bookshelf", + "west": "byg:block/witch_hazel/bookshelf", + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button.json new file mode 100644 index 0000000000..5605ea12c9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_inventory.json new file mode 100644 index 0000000000..b85f8ea1ae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_pressed.json new file mode 100644 index 0000000000..c364f3edec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json new file mode 100644 index 0000000000..200354e350 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/witch_hazel/planks", + "up": "byg:block/witch_hazel/crafting_table_top", + "north": "byg:block/witch_hazel/crafting_table_front", + "south": "byg:block/witch_hazel/crafting_table_side", + "east": "byg:block/witch_hazel/crafting_table_side", + "west": "byg:block/witch_hazel/crafting_table_front", + "particle": "byg:block/witch_hazel/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json new file mode 100644 index 0000000000..70bd162243 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json new file mode 100644 index 0000000000..e78f9974e4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json new file mode 100644 index 0000000000..7f683b511f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json new file mode 100644 index 0000000000..2ac692ff01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json new file mode 100644 index 0000000000..a6c4edfffa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/witch_hazel/planks", + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate.json new file mode 100644 index 0000000000..edd6ef5659 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_open.json new file mode 100644 index 0000000000..e0e6cac8f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall.json new file mode 100644 index 0000000000..00ef4df479 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall_open.json new file mode 100644 index 0000000000..13ba723cfd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json new file mode 100644 index 0000000000..776bb0207c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/witch_hazel/planks", + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json new file mode 100644 index 0000000000..48ceadc0d8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/witch_hazel/planks", + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/grower_item.json new file mode 100644 index 0000000000..84e577947e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/witch_hazel/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json new file mode 100644 index 0000000000..b28e8481d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/witch_hazel/leaves", + "up": "byg:block/witch_hazel/leaves", + "north": "byg:block/witch_hazel/leaves", + "south": "byg:block/witch_hazel/leaves", + "east": "byg:block/witch_hazel/leaves", + "west": "byg:block/witch_hazel/leaves", + "particle": "byg:block/witch_hazel/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json new file mode 100644 index 0000000000..b5d8dd0884 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/witch_hazel/leaves_snowy", + "up": "byg:block/witch_hazel/leaves_snowy", + "north": "byg:block/witch_hazel/leaves_snowy_side", + "south": "byg:block/witch_hazel/leaves_snowy_side", + "east": "byg:block/witch_hazel/leaves_snowy_side", + "west": "byg:block/witch_hazel/leaves_snowy_side", + "particle": "byg:block/witch_hazel/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json new file mode 100644 index 0000000000..e4a9326182 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/witch_hazel/log", + "end": "byg:block/witch_hazel/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json new file mode 100644 index 0000000000..9096b30f78 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/witch_hazel/planks", + "up": "byg:block/witch_hazel/planks", + "north": "byg:block/witch_hazel/planks", + "south": "byg:block/witch_hazel/planks", + "east": "byg:block/witch_hazel/planks", + "west": "byg:block/witch_hazel/planks", + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate.json new file mode 100644 index 0000000000..f96e09d06a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate_down.json new file mode 100644 index 0000000000..5a5be8dd37 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json new file mode 100644 index 0000000000..bdc5dacfc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/witch_hazel/planks", + "bottom": "byg:block/witch_hazel/planks", + "top": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json new file mode 100644 index 0000000000..534c581650 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/witch_hazel/planks", + "bottom": "byg:block/witch_hazel/planks", + "top": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json new file mode 100644 index 0000000000..05e923955d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/witch_hazel/planks", + "bottom": "byg:block/witch_hazel/planks", + "top": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json new file mode 100644 index 0000000000..b12f7ea303 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/witch_hazel/planks", + "bottom": "byg:block/witch_hazel/planks", + "top": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json new file mode 100644 index 0000000000..42e0427975 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/witch_hazel/planks", + "bottom": "byg:block/witch_hazel/planks", + "top": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json new file mode 100644 index 0000000000..8adbf9987d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/witch_hazel/stripped_log", + "end": "byg:block/witch_hazel/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_wood.json new file mode 100644 index 0000000000..24c6200c60 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/witch_hazel/stripped_log", + "particle": "byg:block/witch_hazel/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json new file mode 100644 index 0000000000..87f44a2432 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_bottom.json new file mode 100644 index 0000000000..446c661418 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/witch_hazel/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_open.json new file mode 100644 index 0000000000..0ed9ed0e44 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/witch_hazel/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_top.json new file mode 100644 index 0000000000..2be1678fe5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/witch_hazel/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/wood.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/wood.json new file mode 100644 index 0000000000..0f3cbb08a3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/witch_hazel/log", + "particle": "byg:block/witch_hazel/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json new file mode 100644 index 0000000000..8a167cd115 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/zelkova/planks", + "up": "byg:block/zelkova/planks", + "north": "byg:block/zelkova/bookshelf", + "south": "byg:block/zelkova/bookshelf", + "east": "byg:block/zelkova/bookshelf", + "west": "byg:block/zelkova/bookshelf", + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/button.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/button.json new file mode 100644 index 0000000000..90038c20f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/button_inventory.json new file mode 100644 index 0000000000..ea28691a35 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/button_pressed.json new file mode 100644 index 0000000000..3cc0dd060c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json new file mode 100644 index 0000000000..c7ce314b91 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/zelkova/planks", + "up": "byg:block/zelkova/crafting_table_top", + "north": "byg:block/zelkova/crafting_table_front", + "south": "byg:block/zelkova/crafting_table_side", + "east": "byg:block/zelkova/crafting_table_side", + "west": "byg:block/zelkova/crafting_table_front", + "particle": "byg:block/zelkova/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json new file mode 100644 index 0000000000..1fe9eeeeb4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json new file mode 100644 index 0000000000..2f83cb41cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json new file mode 100644 index 0000000000..2f179d86a3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json new file mode 100644 index 0000000000..4acf1db9ce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json new file mode 100644 index 0000000000..92bedf42b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/zelkova/planks", + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate.json new file mode 100644 index 0000000000..24d4900a52 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_open.json new file mode 100644 index 0000000000..596a07d275 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall.json new file mode 100644 index 0000000000..09ba3b0ecd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall_open.json new file mode 100644 index 0000000000..5da6e6ade0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json new file mode 100644 index 0000000000..16104652eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/zelkova/planks", + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json new file mode 100644 index 0000000000..e953fd47ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/zelkova/planks", + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/grower_item.json new file mode 100644 index 0000000000..a26e3302cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/zelkova/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json new file mode 100644 index 0000000000..3ddbd59908 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/zelkova/leaves", + "up": "byg:block/zelkova/leaves", + "north": "byg:block/zelkova/leaves", + "south": "byg:block/zelkova/leaves", + "east": "byg:block/zelkova/leaves", + "west": "byg:block/zelkova/leaves", + "particle": "byg:block/zelkova/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json new file mode 100644 index 0000000000..ffbda64b32 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/zelkova/leaves_snowy", + "up": "byg:block/zelkova/leaves_snowy", + "north": "byg:block/zelkova/leaves_snowy_side", + "south": "byg:block/zelkova/leaves_snowy_side", + "east": "byg:block/zelkova/leaves_snowy_side", + "west": "byg:block/zelkova/leaves_snowy_side", + "particle": "byg:block/zelkova/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json new file mode 100644 index 0000000000..0f02da4b16 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/zelkova/log", + "end": "byg:block/zelkova/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json new file mode 100644 index 0000000000..01da49cbc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/zelkova/planks", + "up": "byg:block/zelkova/planks", + "north": "byg:block/zelkova/planks", + "south": "byg:block/zelkova/planks", + "east": "byg:block/zelkova/planks", + "west": "byg:block/zelkova/planks", + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate.json new file mode 100644 index 0000000000..6ecbf34512 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate_down.json new file mode 100644 index 0000000000..d783a2f7f8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json new file mode 100644 index 0000000000..cf211201a8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/zelkova/planks", + "bottom": "byg:block/zelkova/planks", + "top": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json new file mode 100644 index 0000000000..689ac4f333 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/zelkova/planks", + "bottom": "byg:block/zelkova/planks", + "top": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json new file mode 100644 index 0000000000..f4527d4b64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/zelkova/planks", + "bottom": "byg:block/zelkova/planks", + "top": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json new file mode 100644 index 0000000000..05a90b5ffb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/zelkova/planks", + "bottom": "byg:block/zelkova/planks", + "top": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json new file mode 100644 index 0000000000..66cbaaabfd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/zelkova/planks", + "bottom": "byg:block/zelkova/planks", + "top": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json new file mode 100644 index 0000000000..0c1964025c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/zelkova/stripped_log", + "end": "byg:block/zelkova/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_wood.json new file mode 100644 index 0000000000..b40e337021 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/zelkova/stripped_log", + "particle": "byg:block/zelkova/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json new file mode 100644 index 0000000000..0e29b0a9de --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_bottom.json new file mode 100644 index 0000000000..9cba61865c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/zelkova/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_open.json new file mode 100644 index 0000000000..e216a6e45f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/zelkova/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_top.json new file mode 100644 index 0000000000..05a7974baf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/zelkova/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/wood.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/wood.json new file mode 100644 index 0000000000..2de5db1a76 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/zelkova/log", + "particle": "byg:block/zelkova/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json new file mode 100644 index 0000000000..88523cc265 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json new file mode 100644 index 0000000000..509377122d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json new file mode 100644 index 0000000000..1c7b751f53 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json new file mode 100644 index 0000000000..58acbe2a99 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json new file mode 100644 index 0000000000..b759756e3f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json new file mode 100644 index 0000000000..d3e1aed247 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_boat.json b/Common/src/generated/resources/assets/byg/models/item/willow_boat.json new file mode 100644 index 0000000000..30e8abf53f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/willow/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json new file mode 100644 index 0000000000..f6794713da --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_button.json b/Common/src/generated/resources/assets/byg/models/item/willow_button.json new file mode 100644 index 0000000000..64c7cebf97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json new file mode 100644 index 0000000000..fe564b8888 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_door.json b/Common/src/generated/resources/assets/byg/models/item/willow_door.json new file mode 100644 index 0000000000..68961fbe1c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/willow/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_fence.json b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json new file mode 100644 index 0000000000..6a82965db6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json b/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json new file mode 100644 index 0000000000..4ede1fc275 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_log.json b/Common/src/generated/resources/assets/byg/models/item/willow_log.json new file mode 100644 index 0000000000..78c6d57f8e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_planks.json b/Common/src/generated/resources/assets/byg/models/item/willow_planks.json new file mode 100644 index 0000000000..e51d460239 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json new file mode 100644 index 0000000000..b378980a87 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_sapling.json b/Common/src/generated/resources/assets/byg/models/item/willow_sapling.json new file mode 100644 index 0000000000..1744d7f856 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/willow/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_slab.json b/Common/src/generated/resources/assets/byg/models/item/willow_slab.json new file mode 100644 index 0000000000..8d8270cec7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json b/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json new file mode 100644 index 0000000000..1699295467 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_wood.json b/Common/src/generated/resources/assets/byg/models/item/willow_wood.json new file mode 100644 index 0000000000..f7dcf6bd24 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_boat.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_boat.json new file mode 100644 index 0000000000..f75123ed95 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/witch_hazel/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json new file mode 100644 index 0000000000..0922228d64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json new file mode 100644 index 0000000000..6fa84b8b00 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json new file mode 100644 index 0000000000..30fa9cd329 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_door.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_door.json new file mode 100644 index 0000000000..e2fff48cf6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/witch_hazel/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json new file mode 100644 index 0000000000..20a8b47df4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json new file mode 100644 index 0000000000..85c3a5fc55 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json new file mode 100644 index 0000000000..4a4bef629c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json new file mode 100644 index 0000000000..5d74db9688 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json new file mode 100644 index 0000000000..e0a00602d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sapling.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sapling.json new file mode 100644 index 0000000000..76ba16ae44 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/witch_hazel/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json new file mode 100644 index 0000000000..b0b86dd705 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json new file mode 100644 index 0000000000..4fcb5939d6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json new file mode 100644 index 0000000000..2c865b896b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_boat.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_boat.json new file mode 100644 index 0000000000..6991dd2b8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/zelkova/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json new file mode 100644 index 0000000000..b4c9423551 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json new file mode 100644 index 0000000000..5cbbb7167f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json new file mode 100644 index 0000000000..3c4f2b20cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_door.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_door.json new file mode 100644 index 0000000000..37bf1ff78b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/zelkova/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json new file mode 100644 index 0000000000..4b45755c3f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json new file mode 100644 index 0000000000..256537239a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json new file mode 100644 index 0000000000..13854b78b9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json new file mode 100644 index 0000000000..16c35a3427 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json new file mode 100644 index 0000000000..6e6980232e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_sapling.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_sapling.json new file mode 100644 index 0000000000..9ebe043c56 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/zelkova/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json new file mode 100644 index 0000000000..3c01e1853c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json new file mode 100644 index 0000000000..28c669eaf4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json new file mode 100644 index 0000000000..1812008b4f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json new file mode 100644 index 0000000000..49113af163 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json new file mode 100644 index 0000000000..10bef64b26 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json new file mode 100644 index 0000000000..8128a8b5fc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json new file mode 100644 index 0000000000..55eaeee42c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json new file mode 100644 index 0000000000..ef756b64e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json new file mode 100644 index 0000000000..207a3baa4c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json new file mode 100644 index 0000000000..a53024994c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json new file mode 100644 index 0000000000..7808ef9432 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/willow_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json new file mode 100644 index 0000000000..2d7832f85a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json new file mode 100644 index 0000000000..5203affa93 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json new file mode 100644 index 0000000000..2d1b6f7cdf --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json new file mode 100644 index 0000000000..b5e2e2a8c1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json new file mode 100644 index 0000000000..e1e231decd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json new file mode 100644 index 0000000000..432a9bde08 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json new file mode 100644 index 0000000000..76f5e688d1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json new file mode 100644 index 0000000000..f28a49feb6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json new file mode 100644 index 0000000000..643a92b008 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json new file mode 100644 index 0000000000..2ebcfa4590 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json new file mode 100644 index 0000000000..69b014b3a6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json new file mode 100644 index 0000000000..44bb5dfa26 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json new file mode 100644 index 0000000000..0d418669ab --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/witch_hazel_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json new file mode 100644 index 0000000000..a6a3453927 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json new file mode 100644 index 0000000000..5578b456a8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json new file mode 100644 index 0000000000..303c0563d8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json new file mode 100644 index 0000000000..9db7121ad5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json new file mode 100644 index 0000000000..4abb6bd90b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json new file mode 100644 index 0000000000..5a208e5315 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json new file mode 100644 index 0000000000..c60d2a4473 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json new file mode 100644 index 0000000000..1be776ea1a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json new file mode 100644 index 0000000000..35316c4248 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json new file mode 100644 index 0000000000..9b6adad3ef --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json new file mode 100644 index 0000000000..875d6c9e35 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json new file mode 100644 index 0000000000..44b630d44f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json new file mode 100644 index 0000000000..9b126b25b3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/zelkova_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json new file mode 100644 index 0000000000..02eea726fc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json new file mode 100644 index 0000000000..3e95aff3d5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json new file mode 100644 index 0000000000..a864265fe7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json new file mode 100644 index 0000000000..0f946b6c9a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json new file mode 100644 index 0000000000..c8431d025f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json new file mode 100644 index 0000000000..42b11bbe62 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json new file mode 100644 index 0000000000..ba572f0204 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:willow_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/button.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/button.json new file mode 100644 index 0000000000..3e27b992b6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:willow_planks" + } + ], + "result": { + "item": "byg:willow_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json new file mode 100644 index 0000000000..0661fe70d8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json new file mode 100644 index 0000000000..fedce55e8d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json new file mode 100644 index 0000000000..1844792486 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json new file mode 100644 index 0000000000..7c00658110 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json new file mode 100644 index 0000000000..78fd6a719a --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/willow_logs" + } + ], + "result": { + "item": "byg:willow_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json new file mode 100644 index 0000000000..e2e377b090 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json new file mode 100644 index 0000000000..12e9972c35 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json new file mode 100644 index 0000000000..f661147d28 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json new file mode 100644 index 0000000000..5d6ee57465 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:willow_planks" + } + }, + "result": { + "item": "byg:willow_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json new file mode 100644 index 0000000000..0bd51edf37 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:willow_log" + } + }, + "result": { + "item": "byg:willow_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json new file mode 100644 index 0000000000..7d825192fa --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json new file mode 100644 index 0000000000..58cbe04f6b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:witch_hazel_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/button.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/button.json new file mode 100644 index 0000000000..409a029523 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:witch_hazel_planks" + } + ], + "result": { + "item": "byg:witch_hazel_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json new file mode 100644 index 0000000000..05cdbb236e --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json new file mode 100644 index 0000000000..db9f837c57 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json new file mode 100644 index 0000000000..8cb4e5a2c9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json new file mode 100644 index 0000000000..1c7b065d8d --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json new file mode 100644 index 0000000000..044f90dbe1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/witch_hazel_logs" + } + ], + "result": { + "item": "byg:witch_hazel_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json new file mode 100644 index 0000000000..8934d8fbb4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json new file mode 100644 index 0000000000..4b035fe4d1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json new file mode 100644 index 0000000000..d356b17f89 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json new file mode 100644 index 0000000000..3d977467fb --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:witch_hazel_planks" + } + }, + "result": { + "item": "byg:witch_hazel_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json new file mode 100644 index 0000000000..5e2f8f0aaa --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:witch_hazel_log" + } + }, + "result": { + "item": "byg:witch_hazel_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json new file mode 100644 index 0000000000..fbebadc0b4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "boat", + "pattern": [ + "P P", + "PPP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json new file mode 100644 index 0000000000..386f9a3cbc --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:zelkova_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/button.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/button.json new file mode 100644 index 0000000000..3a42013a58 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:zelkova_planks" + } + ], + "result": { + "item": "byg:zelkova_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json new file mode 100644 index 0000000000..e4fb7061af --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json new file mode 100644 index 0000000000..a7ffc58247 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json new file mode 100644 index 0000000000..513fe46e03 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json new file mode 100644 index 0000000000..fada05c890 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json new file mode 100644 index 0000000000..116651c562 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/zelkova_logs" + } + ], + "result": { + "item": "byg:zelkova_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json new file mode 100644 index 0000000000..ad51d827ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json new file mode 100644 index 0000000000..4a303e1963 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json new file mode 100644 index 0000000000..a09bc85830 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json new file mode 100644 index 0000000000..4d87b2e87b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:zelkova_planks" + } + }, + "result": { + "item": "byg:zelkova_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json new file mode 100644 index 0000000000..a09ff1359c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:zelkova_log" + } + }, + "result": { + "item": "byg:zelkova_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json new file mode 100644 index 0000000000..e8903dcfb6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:stripped_willow_log", + "byg:stripped_willow_wood", + "byg:willow_log", + "byg:willow_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json new file mode 100644 index 0000000000..75dadab27a --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:stripped_witch_hazel_log", + "byg:stripped_witch_hazel_wood", + "byg:witch_hazel_log", + "byg:witch_hazel_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json new file mode 100644 index 0000000000..5e4ee869e3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:stripped_zelkova_log", + "byg:stripped_zelkova_wood", + "byg:zelkova_log", + "byg:zelkova_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json new file mode 100644 index 0000000000..eaae03d6b1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:willow_log", + "byg:stripped_willow_log", + "byg:willow_wood", + "byg:stripped_willow_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json new file mode 100644 index 0000000000..af500fae70 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:witch_hazel_log", + "byg:stripped_witch_hazel_log", + "byg:witch_hazel_wood", + "byg:stripped_witch_hazel_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json new file mode 100644 index 0000000000..cdd7204f2d --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:zelkova_log", + "byg:stripped_zelkova_log", + "byg:zelkova_wood", + "byg:stripped_zelkova_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java index d01df80e1a..cde78eba9b 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java @@ -17,7 +17,7 @@ public class ColorManager { public static synchronized void onBlockColorsInit(BlockColors blockColors) { //registers the colors for blocks that changes colors based on biome blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageGrassColor(lightReader, pos) : GrassColor.get(0.5D, 1.0D), BYGBlocks.LUSH_GRASS_BLOCK.get(), BYGBlocks.OVERGROWN_STONE.get(), BYGBlocks.OVERGROWN_NETHERRACK.get(), BYGBlocks.TINY_LILYPADS.get(), BYGBlocks.FLOWERING_TINY_LILY_PADS.get(), BYGBlocks.OVERGROWN_DACITE.get(), BYGBlocks.NETHER_BRISTLE.get()); - blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGWoodTypes.MAHOGANY.leaves().get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGBlocks.WILLOW_LEAVES.get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); + blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGWoodTypes.MAHOGANY.leaves().get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGWoodTypes.WILLOW.leaves().get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageWaterColor(lightReader, pos) : -1, BYGBlocks.WATER_BARREL_CACTUS.get()); } @@ -33,7 +33,7 @@ public static synchronized void onItemColorsInit(BlockColors blockColors, ItemCo BYGItems.POISON_IVY.get(), BYGItems.OVERGROWN_STONE.get(), BYGItems.TINY_LILYPADS.get(), BYGItems.FLOWERING_TINY_LILY_PADS.get(), BYGItems.NETHER_BRISTLE.get(), BYGItems.OVERGROWN_DACITE.get(), BYGItems.LEAF_PILE.get(), BYGItems.ORCHARD_LEAVES.get(), BYGItems.FLOWERING_ORCHARD_LEAVES.get(), BYGItems.RIPE_ORCHARD_LEAVES.get(), - BYGItems.WILLOW_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get(), + BYGWoodTypes.WILLOW.leaves(), BYGWoodTypes.CYPRESS.leaves().get(), BYGItems.MAPLE_LEAVES.get(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); } } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 304bdae766..98a6cc26b4 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -142,9 +142,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.WILLOW_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.WITCH_HAZEL_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.ZELKOVA_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SYTHIAN_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); @@ -154,9 +151,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.WILLOW_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.WITCH_HAZEL_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.ZELKOVA_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SYTHIAN_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); @@ -198,9 +192,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.SILVER_MAPLE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SKYRIS_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WHITE_CHERRY_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.WILLOW_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.WITCH_HAZEL_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.ZELKOVA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.YELLOW_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.YELLOW_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_ZELKOVA_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 18bd3a37ee..cf08d6868e 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -46,8 +46,6 @@ public static void compostablesBYG() { compostibleBlocks(0.6f, BYGItems.SKYRIS_LEAVES_GREEN_APPLE.get()); compostibleBlocks(0.3f, BYGItems.SKYRIS_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.WHITE_CHERRY_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.WILLOW_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.WITCH_HAZEL_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_LEAVES.get()); @@ -78,8 +76,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.SILVER_MAPLE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.SKYRIS_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.WHITE_CHERRY_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.WILLOW_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.WITCH_HAZEL_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 3784a26d2c..9f15ae7911 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -42,77 +42,48 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.WILLOW_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.WITCH_HAZEL_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.ZELKOVA_LOG.get(), 5, 5); //Stripped Logs flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_SKYRIS_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_WILLOW_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_ZELKOVA_LOG.get(), 5, 5); //Wood flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.WILLOW_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.WITCH_HAZEL_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.ZELKOVA_WOOD.get(), 5, 5); //Stripped Wood flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_SKYRIS_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_WILLOW_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_ZELKOVA_WOOD.get(), 5, 5); //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.WILLOW_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.WITCH_HAZEL_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_BOOKSHELF.get(), 5, 20); //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.WILLOW_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.WITCH_HAZEL_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_SLAB.get(), 5, 20); //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.WILLOW_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.WITCH_HAZEL_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_STAIRS.get(), 5, 20); //Planks flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.WILLOW_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.WITCH_HAZEL_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_PLANKS.get(), 5, 20); //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.SKYRIS_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.WILLOW_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.WITCH_HAZEL_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.ZELKOVA_FENCE.get(), 5, 20); //Leaves flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); @@ -137,12 +108,9 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.get(), 30, 60); flammableBlock(BYGBlocks.SKYRIS_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.WHITE_CHERRY_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.WILLOW_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.WITCH_HAZEL_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_SPRUCE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FIRECRACKER_LEAVES.get(), 60, 30); - flammableBlock(BYGBlocks.ZELKOVA_LEAVES.get(), 60, 30); flammableBlock(BYGBlocks.RED_BIRCH_LEAVES.get(), 60, 30); flammableBlock(BYGBlocks.RED_SPRUCE_LEAVES.get(), 60, 30); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 51ab38e872..9efe85070a 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -28,9 +28,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); stripables.put(BYGBlocks.SKYRIS_LOG.get(), BYGBlocks.STRIPPED_SKYRIS_LOG.get()); - stripables.put(BYGBlocks.WILLOW_LOG.get(), BYGBlocks.STRIPPED_WILLOW_LOG.get()); - stripables.put(BYGBlocks.WITCH_HAZEL_LOG.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_LOG.get()); - stripables.put(BYGBlocks.ZELKOVA_LOG.get(), BYGBlocks.STRIPPED_ZELKOVA_LOG.get()); stripables.put(BYGBlocks.SYTHIAN_STEM.get(), BYGBlocks.STRIPPED_SYTHIAN_STEM.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); @@ -42,9 +39,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); stripables.put(BYGBlocks.SKYRIS_WOOD.get(), BYGBlocks.STRIPPED_SKYRIS_WOOD.get()); - stripables.put(BYGBlocks.WILLOW_WOOD.get(), BYGBlocks.STRIPPED_WILLOW_WOOD.get()); - stripables.put(BYGBlocks.WITCH_HAZEL_WOOD.get(), BYGBlocks.STRIPPED_WITCH_HAZEL_WOOD.get()); - stripables.put(BYGBlocks.ZELKOVA_WOOD.get(), BYGBlocks.STRIPPED_ZELKOVA_WOOD.get()); stripables.put(BYGBlocks.SYTHIAN_HYPHAE.get(), BYGBlocks.STRIPPED_SYTHIAN_HYPHAE.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index f22d955fe9..9752dd1320 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -55,9 +55,6 @@ public Item getDropItem() { case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); case MAPLE -> BYGItems.MAPLE_BOAT.get(); case SKYRIS -> BYGItems.SKYRIS_BOAT.get(); - case WILLOW -> BYGItems.WILLOW_BOAT.get(); - case WITCH_HAZEL -> BYGItems.WITCH_HAZEL_BOAT.get(); - case ZELKOVA -> BYGItems.ZELKOVA_BOAT.get(); }; } @@ -70,9 +67,6 @@ public Block getPlanks() { case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); case SKYRIS -> BYGBlocks.SKYRIS_PLANKS.get(); - case WILLOW -> BYGBlocks.WILLOW_PLANKS.get(); - case WITCH_HAZEL -> BYGBlocks.WITCH_HAZEL_PLANKS.get(); - case ZELKOVA -> BYGBlocks.ZELKOVA_PLANKS.get(); }; } diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 1a69818e99..0e274f5ed3 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -481,6 +481,7 @@ public class BYGItems { BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); BYGWoodTypes.REDWOOD.init(); // TODO skyris + BYGWoodTypes.WILLOW.init(); WITCH_HAZEL_BLOSSOM = createItem(BYGBlocks.WITCH_HAZEL_BLOSSOM); WITCH_HAZEL_BRANCH = createItem(BYGBlocks.WITCH_HAZEL_BRANCH); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index c4eb396fae..2b0bf37db0 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -511,12 +511,12 @@ public class BYGOverworldTreeFeatures { public static final Holder> HAZEL_TREE1 = createConfiguredFeature("hazel_tree1", BYGFeatures.HAZEL_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WITCH_HAZEL_LOG.get()) + .setTrunkBlock(WITCH_HAZEL.log().get()) .setLeavesBlock( new WeightedStateProvider( SimpleWeightedRandomList.builder() .add(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.defaultBlockState(), 1) - .add(BYGBlocks.WITCH_HAZEL_LEAVES.defaultBlockState(), 4) + .add(WITCH_HAZEL.leaves().defaultBlockState(), 4) .build() )) .setMaxHeight(15) @@ -527,10 +527,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> HAZEL_TREE2 = createConfiguredFeature("hazel_tree2", BYGFeatures.HAZEL_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WITCH_HAZEL_LOG.get()) + .setTrunkBlock(WITCH_HAZEL.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.defaultBlockState(), 1) - .add(BYGBlocks.WITCH_HAZEL_LEAVES.defaultBlockState(), 4) + .add(WITCH_HAZEL.leaves().defaultBlockState(), 4) .build() )) .setMaxHeight(12) @@ -540,11 +540,11 @@ public class BYGOverworldTreeFeatures { public static final Holder> DEAD_HAZEL_TREE1 = createConfiguredFeature("dead_hazel_tree1", BYGFeatures.DEAD_HAZEL_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WITCH_HAZEL_LOG.get()) + .setTrunkBlock(WITCH_HAZEL.log().get()) .setLeavesBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.defaultBlockState(), 1) - .add(BYGBlocks.WITCH_HAZEL_LEAVES.defaultBlockState(), 4) + .add(WITCH_HAZEL.leaves().defaultBlockState(), 4) .build() )) .setMaxHeight(16) @@ -554,10 +554,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> DEAD_HAZEL_TREE2 = createConfiguredFeature("dead_hazel_tree2", BYGFeatures.DEAD_HAZEL_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WITCH_HAZEL_LOG.get()) + .setTrunkBlock(WITCH_HAZEL.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.defaultBlockState(), 1) - .add(BYGBlocks.WITCH_HAZEL_LEAVES.defaultBlockState(), 4) + .add(WITCH_HAZEL.leaves().defaultBlockState(), 4) .build() )) .setMaxHeight(7) @@ -1941,8 +1941,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> WILLOW_DEAD_TREE1 = createConfiguredFeature("dead_willow_tree1", BYGFeatures.WILLOW_DEAD_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WILLOW_LOG.get()) - .setLeavesBlock(BYGBlocks.WILLOW_LEAVES.get()) + .fromWoodType(WILLOW) .setMaxHeight(12) .setMinHeight(7) .build() @@ -1950,8 +1949,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> WILLOW_TREE1 = createConfiguredFeature("willow_tree1", BYGFeatures.WILLOW_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WILLOW_LOG.get()) - .setLeavesBlock(BYGBlocks.WILLOW_LEAVES.get()) + .fromWoodType(WILLOW) .setMaxHeight(14) .setMinHeight(8) .build() @@ -1959,8 +1957,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> WILLOW_TREE2 = createConfiguredFeature("willow_tree2", BYGFeatures.WILLOW_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WILLOW_LOG.get()) - .setLeavesBlock(BYGBlocks.WILLOW_LEAVES.get()) + .fromWoodType(WILLOW) .setMaxHeight(12) .setMinHeight(7) .build() @@ -1968,8 +1965,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> WILLOW_TREE3 = createConfiguredFeature("willow_tree3", BYGFeatures.WILLOW_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WILLOW_LOG.get()) - .setLeavesBlock(BYGBlocks.WILLOW_LEAVES.get()) + .fromWoodType(WILLOW) .setMaxHeight(12) .setMinHeight(7) .build() @@ -1977,8 +1973,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> WILLOW_TREE4 = createConfiguredFeature("willow_tree4", BYGFeatures.WILLOW_TREE4, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.WILLOW_LOG.get()) - .setLeavesBlock(BYGBlocks.WILLOW_LEAVES.get()) + .fromWoodType(WILLOW) .setMaxHeight(21) .setMinHeight(13) .build() @@ -1987,8 +1982,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_TREE1 = createConfiguredFeature("zelkova_tree1", BYGFeatures.ZELKOVA_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) - .setLeavesBlock(BYGBlocks.ZELKOVA_LEAVES.get()) + .fromWoodType(ZELKOVA) .setMaxHeight(20) .setMinHeight(13) .build() @@ -1996,8 +1990,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_TREE2 = createConfiguredFeature("zelkova_tree2", BYGFeatures.ZELKOVA_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) - .setLeavesBlock(BYGBlocks.ZELKOVA_LEAVES.get()) + .fromWoodType(ZELKOVA) .setMaxHeight(28) .setMinHeight(18) .build() @@ -2005,8 +1998,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_TREE3 = createConfiguredFeature("zelkova_tree3", BYGFeatures.ZELKOVA_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) - .setLeavesBlock(BYGBlocks.ZELKOVA_LEAVES.get()) + .fromWoodType(ZELKOVA) .setMaxHeight(30) .setMinHeight(22) .build() @@ -2015,7 +2007,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_BROWN_TREE1 = createConfiguredFeature("zelkova_brown_tree1", BYGFeatures.ZELKOVA_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) + .setTrunkBlock(ZELKOVA.log().get()) .setLeavesBlock(BYGBlocks.BROWN_ZELKOVA_LEAVES.get()) .setMaxHeight(21) .setMinHeight(11) @@ -2024,7 +2016,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_BROWN_TREE2 = createConfiguredFeature("zelkova_brown_tree2", BYGFeatures.ZELKOVA_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) + .setTrunkBlock(ZELKOVA.log().get()) .setLeavesBlock(BYGBlocks.BROWN_ZELKOVA_LEAVES.get()) .setMaxHeight(20) .setMinHeight(10) @@ -2033,7 +2025,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ZELKOVA_BROWN_TREE3 = createConfiguredFeature("zelkova_brown_tree3", BYGFeatures.ZELKOVA_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.ZELKOVA_LOG.get()) + .setTrunkBlock(ZELKOVA.log().get()) .setLeavesBlock(BYGBlocks.BROWN_ZELKOVA_LEAVES.get()) .setMaxHeight(30) .setMinHeight(22) From d9756fdc47c9bbfecda030de47dec6bdb0c16862 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 13:35:11 +0300 Subject: [PATCH 44/90] Sythian --- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 29 ++- .../byg/common/item/BYGItems.java | 21 +- .../blockstates/stripped_sythian_hyphae.json | 16 -- .../blockstates/stripped_sythian_stem.json | 16 -- .../byg/blockstates/sythian_bookshelf.json | 7 - .../byg/blockstates/sythian_button.json | 118 ---------- .../blockstates/sythian_crafting_table.json | 7 - .../assets/byg/blockstates/sythian_door.json | 124 ----------- .../assets/byg/blockstates/sythian_fence.json | 48 ---- .../byg/blockstates/sythian_fence_gate.json | 80 ------- .../byg/blockstates/sythian_fungus.json | 7 - .../byg/blockstates/sythian_hyphae.json | 16 -- .../byg/blockstates/sythian_planks.json | 7 - .../blockstates/sythian_pressure_plate.json | 10 - .../byg/blockstates/sythian_sapling.json | 7 - .../assets/byg/blockstates/sythian_slab.json | 13 -- .../byg/blockstates/sythian_stairs.json | 209 ------------------ .../assets/byg/blockstates/sythian_stem.json | 16 -- .../byg/blockstates/sythian_trapdoor.json | 68 ------ .../byg/blockstates/sythian_wart_block.json | 7 - .../models/block/stripped_sythian_hyphae.json | 7 - .../models/block/stripped_sythian_stem.json | 7 - .../byg/models/block/sythian_bookshelf.json | 12 - .../byg/models/block/sythian_button.json | 6 - .../block/sythian_button_inventory.json | 6 - .../models/block/sythian_button_pressed.json | 6 - .../models/block/sythian_crafting_table.json | 12 - .../byg/models/block/sythian_door_bottom.json | 7 - .../block/sythian_door_bottom_hinge.json | 7 - .../byg/models/block/sythian_door_top.json | 7 - .../models/block/sythian_door_top_hinge.json | 7 - .../byg/models/block/sythian_fence_gate.json | 6 - .../models/block/sythian_fence_gate_open.json | 6 - .../models/block/sythian_fence_gate_wall.json | 6 - .../block/sythian_fence_gate_wall_open.json | 6 - .../models/block/sythian_fence_inventory.json | 6 - .../byg/models/block/sythian_fence_post.json | 6 - .../byg/models/block/sythian_fungus.json | 7 - .../byg/models/block/sythian_hyphae.json | 7 - .../byg/models/block/sythian_planks.json | 6 - .../models/block/sythian_pressure_plate.json | 6 - .../block/sythian_pressure_plate_down.json | 6 - .../byg/models/block/sythian_sapling.json | 7 - .../assets/byg/models/block/sythian_slab.json | 8 - .../byg/models/block/sythian_slab_top.json | 8 - .../byg/models/block/sythian_stairs.json | 8 - .../models/block/sythian_stairs_inner.json | 8 - .../models/block/sythian_stairs_outer.json | 8 - .../assets/byg/models/block/sythian_stem.json | 7 - .../models/block/sythian_trapdoor_bottom.json | 6 - .../models/block/sythian_trapdoor_open.json | 6 - .../models/block/sythian_trapdoor_top.json | 6 - .../byg/models/block/sythian_wart_block.json | 7 - .../models/item/stripped_sythian_hyphae.json | 22 -- .../models/item/stripped_sythian_stem.json | 22 -- .../byg/models/item/sythian_bookshelf.json | 22 -- .../byg/models/item/sythian_button.json | 3 - .../models/item/sythian_crafting_table.json | 22 -- .../assets/byg/models/item/sythian_door.json | 6 - .../assets/byg/models/item/sythian_fence.json | 3 - .../byg/models/item/sythian_fence_gate.json | 3 - .../byg/models/item/sythian_fungus.json | 6 - .../byg/models/item/sythian_hyphae.json | 22 -- .../byg/models/item/sythian_planks.json | 3 - .../models/item/sythian_pressure_plate.json | 3 - .../assets/byg/models/item/sythian_slab.json | 3 - .../byg/models/item/sythian_stairs.json | 3 - .../assets/byg/models/item/sythian_stem.json | 22 -- .../byg/models/item/sythian_trapdoor.json | 3 - .../byg/models/item/sythian_wart_block.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../{sythian_stem.png => sythian/log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../{sythian_door.png => sythian/door.png} | Bin .../byg/recipes/stripped_sythian_hyphae.json | 16 -- .../data/byg/recipes/sythian_bookshelf.json | 19 -- .../data/byg/recipes/sythian_button.json | 12 - .../byg/recipes/sythian_crafting_table.json | 15 -- .../data/byg/recipes/sythian_door.json | 18 -- .../data/byg/recipes/sythian_fence.json | 20 -- .../data/byg/recipes/sythian_fence_gate.json | 19 -- .../data/byg/recipes/sythian_hyphae.json | 16 -- .../data/byg/recipes/sythian_planks.json | 13 -- .../byg/recipes/sythian_pressure_plate.json | 15 -- .../data/byg/recipes/sythian_slab.json | 16 -- .../data/byg/recipes/sythian_stairs.json | 18 -- .../data/byg/recipes/sythian_trapdoor.json | 17 -- 99 files changed, 19 insertions(+), 1443 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_fence.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_fungus.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_wart_block.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_fungus.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_wart_block.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_fungus.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_stem.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_wart_block.json rename Common/src/main/resources/assets/byg/textures/block/{sythian_bookshelf.png => sythian/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_crafting_table_front.png => sythian/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_crafting_table_side.png => sythian/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_crafting_table_top.png => sythian/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_door_bottom.png => sythian/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_door_top.png => sythian/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_fungus.png => sythian/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_wart_block.png => sythian/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_stem.png => sythian/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_stem_top.png => sythian/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_planks.png => sythian/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_sythian_stem.png => sythian/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_sythian_stem_top.png => sythian/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{sythian_trapdoor.png => sythian/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{sythian_door.png => sythian/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_sythian_hyphae.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_button.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_door.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_fence.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_hyphae.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_planks.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_slab.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_stairs.json delete mode 100644 Common/src/main/resources/data/byg/recipes/sythian_trapdoor.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index ec86f46dfa..5e29e17282 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -12,7 +12,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); - public static final WoodType SYTHIAN = register("sythian"); public static final WoodType EMBUR = register("embur"); public static final WoodType LAMENT = register("lament"); public static final WoodType NIGHTSHADE = register("nightshade"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index e9f68ccda6..29f3cfdccc 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -47,7 +47,7 @@ public enum BYGWoodTypes { .exclude(BlockType.LEAVES) .registryName(BlockType.WOOD, "%s_wood") .registryName(BlockType.STRIPPED_WOOD, "stripped_%s_wood") - .stem()), + .nether()), CHERRY("cherry", new Builder() .exclude(BlockType.SAPLING, BlockType.LEAVES) .boatType(BYGBoatEntity.BYGType.CHERRY)), @@ -83,7 +83,7 @@ public enum BYGWoodTypes { .growerItemGroundTag(BYGBlockTags.GROUND_IMPARIUS_MUSHROOM) .exclude(BlockType.LEAVES, BlockType.STRIPPED_LOG, BlockType.STRIPPED_WOOD) .growerItem(GrowerItemType.MUSHROOM) - .stem()), + .nether()), MAHOGANY("mahogany", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MAHOGANY) @@ -119,7 +119,11 @@ public enum BYGWoodTypes { ZELKOVA("zelkova", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_ZELKOVA_SAPLING) .boatType(BYGBoatEntity.BYGType.ZELKOVA) - .materialColor(MaterialColor.TERRACOTTA_RED)); + .materialColor(MaterialColor.TERRACOTTA_RED)), + SYTHIAN("sythian", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_SYTHIAN_FUNGUS) + .growerItem(GrowerItemType.FUNGUS) + .nether()); public static final Map LOOKUP; static { @@ -184,17 +188,20 @@ public void init() { BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); } if (!builder.excludes.contains(BlockType.LEAVES)) { - this.leaves = builder.leavesLightLevel == null ? BYGBlocks.createLeaves(builder.materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(builder.materialColor, builder.leavesLightLevel, name + "_leaves"); + if (builder.isNether) + this.leaves = BYGBlocks.createBlock(BYGBlockProperties.BYGWartBlock::new, nameOr("%s_wart_block", BlockType.LEAVES)); + else + this.leaves = builder.leavesLightLevel == null ? BYGBlocks.createLeaves(builder.materialColor, name + "_leaves") : BYGBlocks.createGlowingLeaves(builder.materialColor, builder.leavesLightLevel, name + "_leaves"); BYGItems.createItem(leaves); } - this.log = ifAllowed(BlockType.LOG, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_stem", BlockType.LOG)) : BYGBlocks.createLog(nameOr("%s_log", BlockType.LOG))); + this.log = ifAllowed(BlockType.LOG, () -> builder.isNether ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_stem", BlockType.LOG)) : BYGBlocks.createLog(nameOr("%s_log", BlockType.LOG))); BYGItems.createItem(log); - this.wood = ifAllowed(BlockType.WOOD, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_hyphae", BlockType.WOOD)) : BYGBlocks.createWood(nameOr("%s_wood", BlockType.WOOD))); + this.wood = ifAllowed(BlockType.WOOD, () -> builder.isNether ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("%s_hyphae", BlockType.WOOD)) : BYGBlocks.createWood(nameOr("%s_wood", BlockType.WOOD))); BYGItems.createItem(wood); - this.strippedLog = ifAllowed(BlockType.STRIPPED_LOG, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_stem", BlockType.STRIPPED_LOG)) : BYGBlocks.createStrippedLog(nameOr("stripped_%s_log", BlockType.STRIPPED_LOG))); + this.strippedLog = ifAllowed(BlockType.STRIPPED_LOG, () -> builder.isNether ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_stem", BlockType.STRIPPED_LOG)) : BYGBlocks.createStrippedLog(nameOr("stripped_%s_log", BlockType.STRIPPED_LOG))); BYGItems.createItem(strippedLog); - this.strippedWood = ifAllowed(BlockType.STRIPPED_WOOD, () -> builder.isStem ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_hyphae", BlockType.STRIPPED_WOOD)) : BYGBlocks.createWood(nameOr("stripped_%s_wood", BlockType.STRIPPED_WOOD))); + this.strippedWood = ifAllowed(BlockType.STRIPPED_WOOD, () -> builder.isNether ? BYGBlocks.createBlock(BYGBlockProperties.BYGNetherLog::new, nameOr("stripped_%s_hyphae", BlockType.STRIPPED_WOOD)) : BYGBlocks.createWood(nameOr("stripped_%s_wood", BlockType.STRIPPED_WOOD))); BYGItems.createItem(strippedWood); this.planks = BYGBlocks.createPlanks(name + "_planks"); @@ -360,7 +367,7 @@ public static final class Builder { private BYGBoatEntity.BYGType boatType; private MaterialColor materialColor; private Integer leavesLightLevel; - private boolean isStem; + private boolean isNether; public Builder growerItem(GrowerItemType type) { this.growerItemType = type; @@ -386,8 +393,8 @@ public Builder leavesLightLevel(Integer leavesLightLevel) { this.leavesLightLevel = leavesLightLevel; return this; } - public Builder stem() { - this.isStem = true; + public Builder nether() { + this.isNether = true; return this; } public Builder registryName(BlockType blockType, String name) { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 0e274f5ed3..378098b301 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -489,28 +489,9 @@ public class BYGItems { BYGWoodTypes.WITCH_HAZEL.init(); BYGWoodTypes.ZELKOVA.init(); + BYGWoodTypes.SYTHIAN.init(); } - //Sythian Woodtype - public static final RegistryObject SYTHIAN_WART_BLOCK = createItem(BYGBlocks.SYTHIAN_WART_BLOCK); - public static final RegistryObject SYTHIAN_FUNGUS = createGrowerItem(BYGBlocks.SYTHIAN_FUNGUS); - public static final RegistryObject SYTHIAN_STEM = createItem(BYGBlocks.SYTHIAN_STEM); - public static final RegistryObject SYTHIAN_HYPHAE = createItem(BYGBlocks.SYTHIAN_HYPHAE); - public static final RegistryObject STRIPPED_SYTHIAN_STEM = createItem(BYGBlocks.STRIPPED_SYTHIAN_STEM); - public static final RegistryObject STRIPPED_SYTHIAN_HYPHAE = createItem(BYGBlocks.STRIPPED_SYTHIAN_HYPHAE); - public static final RegistryObject SYTHIAN_PLANKS = createItem(BYGBlocks.SYTHIAN_PLANKS); - public static final RegistryObject SYTHIAN_BOOKSHELF = createItem(BYGBlocks.SYTHIAN_BOOKSHELF); - public static final RegistryObject SYTHIAN_CRAFTING_TABLE = createItem(BYGBlocks.SYTHIAN_CRAFTING_TABLE); - public static final RegistryObject SYTHIAN_STAIRS = createItem(BYGBlocks.SYTHIAN_STAIRS); - public static final RegistryObject SYTHIAN_SLAB = createItem(BYGBlocks.SYTHIAN_SLAB); - public static final RegistryObject SYTHIAN_FENCE = createItem(BYGBlocks.SYTHIAN_FENCE); - public static final RegistryObject SYTHIAN_FENCE_GATE = createItem(BYGBlocks.SYTHIAN_FENCE_GATE); - public static final RegistryObject SYTHIAN_DOOR = createItem(BYGBlocks.SYTHIAN_DOOR); - public static final RegistryObject SYTHIAN_TRAPDOOR = createItem(BYGBlocks.SYTHIAN_TRAPDOOR); - public static final RegistryObject SYTHIAN_PRESSURE_PLATE = createItem(BYGBlocks.SYTHIAN_PRESSURE_PLATE); - public static final RegistryObject SYTHIAN_BUTTON = createItem(BYGBlocks.SYTHIAN_BUTTON); - public static final RegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGBlocks.SYTHIAN_SIGN, BYGBlocks.SYTHIAN_WALL_SIGN); - //Embur Woodtype public static final RegistryObject EMBUR_GEL_BALL = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), "embur_gel_ball"); public static final RegistryObject EMBUR_GEL_BLOCK = createItem(BYGBlocks.EMBUR_GEL_BLOCK); diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_hyphae.json b/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_hyphae.json deleted file mode 100644 index 6dfbc0dbca..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_sythian_hyphae" - }, - "axis=z": { - "model": "byg:block/stripped_sythian_hyphae", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_sythian_hyphae", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_stem.json b/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_stem.json deleted file mode 100644 index 7f116f85e4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_sythian_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_sythian_stem" - }, - "axis=z": { - "model": "byg:block/stripped_sythian_stem", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_sythian_stem", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/sythian_bookshelf.json deleted file mode 100644 index 1846d74e98..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_button.json b/Common/src/main/resources/assets/byg/blockstates/sythian_button.json deleted file mode 100644 index 205ce8349d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/sythian_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/sythian_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/sythian_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/sythian_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/sythian_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/sythian_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/sythian_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/sythian_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/sythian_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/sythian_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/sythian_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/sythian_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/sythian_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/sythian_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/sythian_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/sythian_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/sythian_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/sythian_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/sythian_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/sythian_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/sythian_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/sythian_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/sythian_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/sythian_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/sythian_crafting_table.json deleted file mode 100644 index 156b787cf1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_door.json b/Common/src/main/resources/assets/byg/blockstates/sythian_door.json deleted file mode 100644 index 77f1b1b8d3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/sythian_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/sythian_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/sythian_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/sythian_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/sythian_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/sythian_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/sythian_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/sythian_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/sythian_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/sythian_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/sythian_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/sythian_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/sythian_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/sythian_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/sythian_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/sythian_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/sythian_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/sythian_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/sythian_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/sythian_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/sythian_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/sythian_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/sythian_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/sythian_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/sythian_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/sythian_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/sythian_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_fence.json b/Common/src/main/resources/assets/byg/blockstates/sythian_fence.json deleted file mode 100644 index 259bf0116b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "byg:block/sythian_fence_post" - } - }, - { - "apply": { - "model": "byg:block/sythian_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "byg:block/sythian_fence_side", - "y": 90, - "uvlock": true - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "byg:block/sythian_fence_side", - "y": 180, - "uvlock": true - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "byg:block/sythian_fence_side", - "y": 270, - "uvlock": true - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/sythian_fence_gate.json deleted file mode 100644 index 4c24b977de..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/sythian_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/sythian_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/sythian_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/sythian_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/sythian_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/sythian_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/sythian_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/sythian_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/sythian_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/sythian_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/sythian_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/sythian_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/sythian_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/sythian_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/sythian_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/sythian_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_fungus.json b/Common/src/main/resources/assets/byg/blockstates/sythian_fungus.json deleted file mode 100644 index 38184ee410..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_fungus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_fungus" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_hyphae.json b/Common/src/main/resources/assets/byg/blockstates/sythian_hyphae.json deleted file mode 100644 index f3b32f1c89..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/sythian_hyphae" - }, - "axis=z": { - "model": "byg:block/sythian_hyphae", - "x": 90 - }, - "axis=x": { - "model": "byg:block/sythian_hyphae", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_planks.json b/Common/src/main/resources/assets/byg/blockstates/sythian_planks.json deleted file mode 100644 index 6d21487432..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/sythian_pressure_plate.json deleted file mode 100644 index e0b317df62..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/sythian_pressure_plate" - }, - "powered=true": { - "model": "byg:block/sythian_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json b/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json deleted file mode 100644 index 370be701e0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_slab.json b/Common/src/main/resources/assets/byg/blockstates/sythian_slab.json deleted file mode 100644 index a12ffed41b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/sythian_slab" - }, - "type=double": { - "model": "byg:block/sythian_planks" - }, - "type=top": { - "model": "byg:block/sythian_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_stairs.json b/Common/src/main/resources/assets/byg/blockstates/sythian_stairs.json deleted file mode 100644 index 8c03ef034c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/sythian_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/sythian_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/sythian_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/sythian_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/sythian_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/sythian_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/sythian_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/sythian_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/sythian_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/sythian_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/sythian_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/sythian_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/sythian_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/sythian_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/sythian_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/sythian_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/sythian_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/sythian_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/sythian_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/sythian_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/sythian_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/sythian_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/sythian_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/sythian_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/sythian_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/sythian_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_stem.json b/Common/src/main/resources/assets/byg/blockstates/sythian_stem.json deleted file mode 100644 index cd47574de2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_stem.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/sythian_stem" - }, - "axis=z": { - "model": "byg:block/sythian_stem", - "x": 90 - }, - "axis=x": { - "model": "byg:block/sythian_stem", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/sythian_trapdoor.json deleted file mode 100644 index fc04bfc973..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/sythian_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/sythian_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/sythian_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/sythian_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/sythian_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/sythian_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/sythian_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/sythian_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/sythian_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/sythian_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/sythian_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/sythian_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/sythian_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/sythian_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/sythian_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/sythian_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_wart_block.json b/Common/src/main/resources/assets/byg/blockstates/sythian_wart_block.json deleted file mode 100644 index ed914bf9f2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_wart_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_wart_block" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_sythian_hyphae.json b/Common/src/main/resources/assets/byg/models/block/stripped_sythian_hyphae.json deleted file mode 100644 index bbe78a1afe..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_sythian_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_sythian_stem", - "side": "byg:block/stripped_sythian_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_sythian_stem.json b/Common/src/main/resources/assets/byg/models/block/stripped_sythian_stem.json deleted file mode 100644 index 72b3612811..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_sythian_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_sythian_stem_top", - "side": "byg:block/stripped_sythian_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/sythian_bookshelf.json deleted file mode 100644 index 45a4dd8959..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/sythian_planks", - "up": "byg:block/sythian_planks", - "north": "byg:block/sythian_bookshelf", - "east": "byg:block/sythian_bookshelf", - "south": "byg:block/sythian_bookshelf", - "west": "byg:block/sythian_bookshelf", - "particle": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_button.json b/Common/src/main/resources/assets/byg/models/block/sythian_button.json deleted file mode 100644 index beafee18c0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/sythian_button_inventory.json deleted file mode 100644 index b44f413176..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/sythian_button_pressed.json deleted file mode 100644 index ed99610d50..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/sythian_crafting_table.json deleted file mode 100644 index df717f3b05..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/sythian_crafting_table_front", - "down": "byg:block/sythian_planks", - "up": "byg:block/sythian_crafting_table_top", - "north": "byg:block/sythian_crafting_table_front", - "east": "byg:block/sythian_crafting_table_side", - "south": "byg:block/sythian_crafting_table_side", - "west": "byg:block/sythian_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom.json deleted file mode 100644 index ad559d81af..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/sythian_door_bottom", - "top": "byg:block/sythian_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom_hinge.json deleted file mode 100644 index 8210a7a980..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/sythian_door_bottom", - "top": "byg:block/sythian_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_door_top.json b/Common/src/main/resources/assets/byg/models/block/sythian_door_top.json deleted file mode 100644 index 71a4b68fbc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/sythian_door_bottom", - "top": "byg:block/sythian_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/sythian_door_top_hinge.json deleted file mode 100644 index 5bb3ed83d9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/sythian_door_bottom", - "top": "byg:block/sythian_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate.json deleted file mode 100644 index 941dbed352..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_open.json deleted file mode 100644 index a81cce6c77..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall.json deleted file mode 100644 index dcfddb666d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall_open.json deleted file mode 100644 index 939c2316ca..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_inventory.json deleted file mode 100644 index e5d6cb4766..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fence_post.json b/Common/src/main/resources/assets/byg/models/block/sythian_fence_post.json deleted file mode 100644 index ef4667fe0e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_fungus.json b/Common/src/main/resources/assets/byg/models/block/sythian_fungus.json deleted file mode 100644 index 7c3fcf7626..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_fungus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/sythian_fungus", - "particle": "byg:block/sythian_fungus" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_hyphae.json b/Common/src/main/resources/assets/byg/models/block/sythian_hyphae.json deleted file mode 100644 index dc23b45f83..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/sythian_stem", - "side": "byg:block/sythian_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_planks.json b/Common/src/main/resources/assets/byg/models/block/sythian_planks.json deleted file mode 100644 index d5e9eec555..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate.json deleted file mode 100644 index b58bb06e34..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate_down.json deleted file mode 100644 index 8b986df01e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json b/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json deleted file mode 100644 index 61338f0219..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/sythian_stalk_stage0", - "particle": "byg:block/sythian_stalk_stage0" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_slab.json b/Common/src/main/resources/assets/byg/models/block/sythian_slab.json deleted file mode 100644 index 0f0428ed75..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/sythian_planks", - "top": "byg:block/sythian_planks", - "side": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_slab_top.json b/Common/src/main/resources/assets/byg/models/block/sythian_slab_top.json deleted file mode 100644 index f8bfb85899..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/sythian_planks", - "top": "byg:block/sythian_planks", - "side": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_stairs.json b/Common/src/main/resources/assets/byg/models/block/sythian_stairs.json deleted file mode 100644 index 74628e1f56..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/sythian_planks", - "top": "byg:block/sythian_planks", - "side": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/sythian_stairs_inner.json deleted file mode 100644 index 1ad7ba7080..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/sythian_planks", - "top": "byg:block/sythian_planks", - "side": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/sythian_stairs_outer.json deleted file mode 100644 index 66c48282d5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/sythian_planks", - "top": "byg:block/sythian_planks", - "side": "byg:block/sythian_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_stem.json b/Common/src/main/resources/assets/byg/models/block/sythian_stem.json deleted file mode 100644 index 3be653dbcd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_stem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/sythian_stem_top", - "side": "byg:block/sythian_stem" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_bottom.json deleted file mode 100644 index 2cc1ace069..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/sythian_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_open.json deleted file mode 100644 index 7ab52fba78..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/sythian_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_top.json deleted file mode 100644 index 960a89795f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/sythian_trapdoor" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_wart_block.json b/Common/src/main/resources/assets/byg/models/block/sythian_wart_block.json deleted file mode 100644 index 95dacc83aa..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/sythian_wart_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/sythian_wart_block", - "particle": "byg:block/sythian_wart_block" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_sythian_hyphae.json b/Common/src/main/resources/assets/byg/models/item/stripped_sythian_hyphae.json deleted file mode 100644 index 5e813ad57e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_sythian_hyphae.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_sythian_hyphae", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_sythian_stem.json b/Common/src/main/resources/assets/byg/models/item/stripped_sythian_stem.json deleted file mode 100644 index 91b5ec0594..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_sythian_stem.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_sythian_stem", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/sythian_bookshelf.json deleted file mode 100644 index 3331c24f9f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/sythian_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_button.json b/Common/src/main/resources/assets/byg/models/item/sythian_button.json deleted file mode 100644 index 9005e1da77..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/sythian_crafting_table.json deleted file mode 100644 index c228c40ada..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/sythian_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_door.json b/Common/src/main/resources/assets/byg/models/item/sythian_door.json deleted file mode 100644 index 59a1dd73d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/sythian_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_fence.json b/Common/src/main/resources/assets/byg/models/item/sythian_fence.json deleted file mode 100644 index 4c8a6ebc68..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/sythian_fence_gate.json deleted file mode 100644 index 9176416e23..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_fungus.json b/Common/src/main/resources/assets/byg/models/item/sythian_fungus.json deleted file mode 100644 index a8bd7364ba..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_fungus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/sythian_fungus" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_hyphae.json b/Common/src/main/resources/assets/byg/models/item/sythian_hyphae.json deleted file mode 100644 index d79a34bb25..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_hyphae.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/sythian_hyphae", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_planks.json b/Common/src/main/resources/assets/byg/models/item/sythian_planks.json deleted file mode 100644 index 4acb94294d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/sythian_pressure_plate.json deleted file mode 100644 index 5a08fc137e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_slab.json b/Common/src/main/resources/assets/byg/models/item/sythian_slab.json deleted file mode 100644 index 6418980936..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_stairs.json b/Common/src/main/resources/assets/byg/models/item/sythian_stairs.json deleted file mode 100644 index 82185932da..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_stem.json b/Common/src/main/resources/assets/byg/models/item/sythian_stem.json deleted file mode 100644 index 344f1fe184..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_stem.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/sythian_stem", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/sythian_trapdoor.json deleted file mode 100644 index 0e6de79ec2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/sythian_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_wart_block.json b/Common/src/main/resources/assets/byg/models/item/sythian_wart_block.json deleted file mode 100644 index 8957818902..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_wart_block.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/sythian_wart_block", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/sythian/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/sythian/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_door_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_fungus.png b/Common/src/main/resources/assets/byg/textures/block/sythian/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_fungus.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_wart_block.png b/Common/src/main/resources/assets/byg/textures/block/sythian/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_wart_block.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_stem.png b/Common/src/main/resources/assets/byg/textures/block/sythian/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_stem.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_stem_top.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_planks.png b/Common/src/main/resources/assets/byg/textures/block/sythian/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_planks.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_sythian_stem.png b/Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_sythian_stem.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_sythian_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_sythian_stem_top.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/sythian/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/sythian_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/sythian/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/sythian_door.png b/Common/src/main/resources/assets/byg/textures/item/sythian/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/sythian_door.png rename to Common/src/main/resources/assets/byg/textures/item/sythian/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_sythian_hyphae.json b/Common/src/main/resources/data/byg/recipes/stripped_sythian_hyphae.json deleted file mode 100644 index 84f1ce5149..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_sythian_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_sythian_stem" - } - }, - "result": { - "item": "byg:stripped_sythian_hyphae", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_bookshelf.json b/Common/src/main/resources/data/byg/recipes/sythian_bookshelf.json deleted file mode 100644 index 41510fc046..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_bookshelf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "XXX", - "###" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - }, - "X": { - "item": "minecraft:book" - } - }, - "result": { - "item": "byg:sythian_bookshelf" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_button.json b/Common/src/main/resources/data/byg/recipes/sythian_button.json deleted file mode 100644 index 57955c177c..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "byg:sythian_planks" - } - ], - "result": { - "item": "byg:sythian_button" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_crafting_table.json b/Common/src/main/resources/data/byg/recipes/sythian_crafting_table.json deleted file mode 100644 index ba3180588b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_crafting_table.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_crafting_table" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_door.json b/Common/src/main/resources/data/byg/recipes/sythian_door.json deleted file mode 100644 index ab6e4588ad..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "pattern": [ - "##", - "##", - "##" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_door", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_fence.json b/Common/src/main/resources/data/byg/recipes/sythian_fence.json deleted file mode 100644 index 987defa062..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_fence", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_fence_gate.json b/Common/src/main/resources/data/byg/recipes/sythian_fence_gate.json deleted file mode 100644 index d1e1fb446b..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_fence_gate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_hyphae.json b/Common/src/main/resources/data/byg/recipes/sythian_hyphae.json deleted file mode 100644 index 8a2edd2432..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_hyphae.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:sythian_stem" - } - }, - "result": { - "item": "byg:sythian_hyphae", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_planks.json b/Common/src/main/resources/data/byg/recipes/sythian_planks.json deleted file mode 100644 index b820f28a42..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_planks.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "planks", - "ingredients": [ - { - "tag": "byg:sythian_stems" - } - ], - "result": { - "item": "byg:sythian_planks", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_pressure_plate.json b/Common/src/main/resources/data/byg/recipes/sythian_pressure_plate.json deleted file mode 100644 index f705330d32..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "pattern": [ - "##" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_pressure_plate" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_slab.json b/Common/src/main/resources/data/byg/recipes/sythian_slab.json deleted file mode 100644 index 99bd875af8..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "pattern": [ - "###" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_slab", - "count": 6 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_stairs.json b/Common/src/main/resources/data/byg/recipes/sythian_stairs.json deleted file mode 100644 index 164f334ca4..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "pattern": [ - "# ", - "## ", - "###" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_stairs", - "count": 4 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/sythian_trapdoor.json b/Common/src/main/resources/data/byg/recipes/sythian_trapdoor.json deleted file mode 100644 index ce06faf21f..0000000000 --- a/Common/src/main/resources/data/byg/recipes/sythian_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "pattern": [ - "###", - "###" - ], - "key": { - "#": { - "item": "byg:sythian_planks" - } - }, - "result": { - "item": "byg:sythian_trapdoor", - "count": 2 - } -} \ No newline at end of file From fbfae7c3bb4b131844c28c7d6f4474a62bea14a7 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 13:57:15 +0300 Subject: [PATCH 45/90] Generate data --- Common/src/generated/resources/.cache/cache | 182 +++++++++++++++ .../byg/blockstates/embur_bookshelf.json | 7 + .../assets/byg/blockstates/embur_button.json | 118 ++++++++++ .../byg/blockstates/embur_crafting_table.json | 7 + .../assets/byg/blockstates/embur_door.json | 124 +++++++++++ .../assets/byg/blockstates/embur_fence.json | 40 ++-- .../byg/blockstates/embur_fence_gate.json | 80 +++++++ .../assets/byg/blockstates/embur_fungus.json | 7 + .../assets/byg/blockstates/embur_hyphae.json | 14 +- .../assets/byg/blockstates/embur_pedu.json | 14 +- .../assets/byg/blockstates/embur_planks.json | 7 + .../byg/blockstates/embur_pressure_plate.json | 10 + .../assets/byg/blockstates/embur_slab.json | 13 ++ .../assets/byg/blockstates/embur_stairs.json | 209 ++++++++++++++++++ .../byg/blockstates/embur_trapdoor.json | 68 ++++++ .../blockstates/stripped_embur_hyphae.json | 16 ++ .../byg/blockstates/stripped_embur_pedu.json | 16 ++ .../blockstates/stripped_sythian_hyphae.json | 16 ++ .../blockstates/stripped_sythian_stem.json | 16 ++ .../byg/blockstates/sythian_bookshelf.json | 7 + .../byg/blockstates/sythian_button.json | 118 ++++++++++ .../blockstates/sythian_crafting_table.json | 7 + .../assets/byg/blockstates/sythian_door.json | 124 +++++++++++ .../assets/byg/blockstates/sythian_fence.json | 48 ++++ .../byg/blockstates/sythian_fence_gate.json | 80 +++++++ .../byg/blockstates/sythian_fungus.json | 7 + .../byg/blockstates/sythian_hyphae.json | 16 ++ .../byg/blockstates/sythian_planks.json | 7 + .../blockstates/sythian_pressure_plate.json | 10 + .../assets/byg/blockstates/sythian_slab.json | 13 ++ .../byg/blockstates/sythian_stairs.json | 209 ++++++++++++++++++ .../assets/byg/blockstates/sythian_stem.json | 16 ++ .../byg/blockstates/sythian_trapdoor.json | 68 ++++++ .../byg/blockstates/sythian_wart_block.json | 7 + .../byg/models/block/embur/bookshelf.json | 12 + .../byg/models/block/embur/button.json} | 2 +- .../models/block/embur/button_inventory.json} | 2 +- .../models/block/embur/button_pressed.json} | 2 +- .../models/block/embur/crafting_table.json | 12 + .../byg/models/block/embur/door_bottom.json | 7 + .../models/block/embur/door_bottom_hinge.json | 7 + .../byg/models/block/embur/door_top.json | 7 + .../models/block/embur/door_top_hinge.json | 7 + .../assets/byg/models/block/embur/fence.json | 7 + .../byg/models/block/embur/fence_gate.json} | 2 +- .../models/block/embur/fence_gate_open.json} | 2 +- .../models/block/embur/fence_gate_wall.json} | 2 +- .../block/embur/fence_gate_wall_open.json} | 2 +- .../byg/models/block/embur/fence_inv.json | 7 + .../byg/models/block/embur/fence_post.json | 7 + .../byg/models/block/embur/grower_item.json | 6 + .../assets/byg/models/block/embur/log.json | 7 + .../assets/byg/models/block/embur/planks.json | 12 + .../models/block/embur/pressure_plate.json} | 2 +- .../block/embur/pressure_plate_down.json} | 2 +- .../assets/byg/models/block/embur/slab.json | 8 + .../byg/models/block/embur/slab_top.json | 8 + .../assets/byg/models/block/embur/stairs.json | 8 + .../byg/models/block/embur/stairs_inner.json | 8 + .../byg/models/block/embur/stairs_outer.json | 8 + .../byg/models/block/embur/stripped_log.json | 7 + .../byg/models/block/embur/stripped_wood.json | 7 + .../byg/models/block/embur/trapdoor.json | 39 ++++ .../models/block/embur/trapdoor_bottom.json} | 2 +- .../models/block/embur/trapdoor_open.json} | 2 +- .../byg/models/block/embur/trapdoor_top.json} | 2 +- .../assets/byg/models/block/embur/wood.json | 7 + .../byg/models/block/sythian/bookshelf.json | 12 + .../byg/models/block/sythian/button.json | 6 + .../block/sythian/button_inventory.json | 6 + .../models/block/sythian/button_pressed.json | 6 + .../models/block/sythian/crafting_table.json | 12 + .../byg/models/block/sythian/door_bottom.json | 7 + .../block/sythian/door_bottom_hinge.json | 7 + .../byg/models/block/sythian/door_top.json | 7 + .../models/block/sythian/door_top_hinge.json | 7 + .../byg/models/block/sythian/fence.json | 7 + .../byg/models/block/sythian/fence_gate.json | 6 + .../models/block/sythian/fence_gate_open.json | 6 + .../models/block/sythian/fence_gate_wall.json | 6 + .../block/sythian/fence_gate_wall_open.json | 6 + .../byg/models/block/sythian/fence_inv.json | 7 + .../byg/models/block/sythian/fence_post.json | 7 + .../byg/models/block/sythian/grower_item.json | 6 + .../byg/models/block/sythian/leaves.json | 12 + .../models/block/sythian/leaves_snowy.json | 12 + .../assets/byg/models/block/sythian/log.json | 7 + .../byg/models/block/sythian/planks.json | 12 + .../models/block/sythian/pressure_plate.json | 6 + .../block/sythian/pressure_plate_down.json | 6 + .../assets/byg/models/block/sythian/slab.json | 8 + .../byg/models/block/sythian/slab_top.json | 8 + .../byg/models/block/sythian/stairs.json | 8 + .../models/block/sythian/stairs_inner.json | 8 + .../models/block/sythian/stairs_outer.json | 8 + .../models/block/sythian/stripped_log.json | 7 + .../models/block/sythian/stripped_wood.json | 7 + .../byg/models/block/sythian/trapdoor.json | 39 ++++ .../models/block/sythian/trapdoor_bottom.json | 6 + .../models/block/sythian/trapdoor_open.json | 6 + .../models/block/sythian/trapdoor_top.json | 6 + .../assets/byg/models/block/sythian/wood.json | 7 + .../byg/models/item/embur_bookshelf.json | 39 ++++ .../assets/byg/models/item/embur_button.json | 39 ++++ .../byg/models/item/embur_crafting_table.json | 39 ++++ .../assets/byg/models/item/embur_door.json | 2 +- .../assets/byg/models/item/embur_fence.json | 39 ++++ .../assets/byg/models/item/embur_fungus.json | 6 + .../assets/byg/models/item/embur_hyphae.json | 39 ++++ .../assets/byg/models/item/embur_pedu.json | 39 ++++ .../assets/byg/models/item/embur_planks.json | 39 ++++ .../byg/models/item/embur_pressure_plate.json | 39 ++++ .../assets/byg/models/item/embur_slab.json | 39 ++++ .../assets/byg/models/item/embur_stairs.json | 39 ++++ .../models/item/stripped_embur_hyphae.json | 39 ++++ .../byg/models/item/stripped_embur_pedu.json | 39 ++++ .../models/item/stripped_sythian_hyphae.json | 39 ++++ .../models/item/stripped_sythian_stem.json | 39 ++++ .../byg/models/item/sythian_bookshelf.json | 39 ++++ .../byg/models/item/sythian_button.json | 39 ++++ .../models/item/sythian_crafting_table.json | 39 ++++ .../assets/byg/models/item/sythian_door.json | 6 + .../assets/byg/models/item/sythian_fence.json | 39 ++++ .../byg/models/item/sythian_fungus.json | 6 + .../byg/models/item/sythian_hyphae.json | 39 ++++ .../byg/models/item/sythian_planks.json | 39 ++++ .../models/item/sythian_pressure_plate.json | 39 ++++ .../assets/byg/models/item/sythian_slab.json | 39 ++++ .../byg/models/item/sythian_stairs.json | 39 ++++ .../assets/byg/models/item/sythian_stem.json | 39 ++++ .../byg/models/item/sythian_wart_block.json | 39 ++++ .../recipes/byg.byg/wood/embur/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/embur/button.json | 34 +++ .../byg.byg/wood/embur/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/embur/door.json | 34 +++ .../recipes/byg.byg/wood/embur/fence.json | 34 +++ .../byg.byg/wood/embur/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/embur/planks.json | 32 +++ .../byg.byg/wood/embur/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/embur/slab.json | 34 +++ .../recipes/byg.byg/wood/embur/stairs.json | 34 +++ .../recipes/byg.byg/wood/embur/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/embur/wood.json | 34 +++ .../byg.byg/wood/sythian/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/sythian/button.json | 34 +++ .../byg.byg/wood/sythian/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/sythian/door.json | 34 +++ .../recipes/byg.byg/wood/sythian/fence.json | 34 +++ .../byg.byg/wood/sythian/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/sythian/planks.json | 32 +++ .../byg.byg/wood/sythian/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/sythian/slab.json | 34 +++ .../recipes/byg.byg/wood/sythian/stairs.json | 34 +++ .../byg.byg/wood/sythian/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/sythian/wood.json | 34 +++ .../byg/recipes/wood/embur/bookshelf.json} | 11 +- .../data/byg/recipes/wood/embur/button.json} | 0 .../recipes/wood/embur/crafting_table.json} | 7 +- .../data/byg/recipes/wood/embur/door.json} | 8 +- .../data/byg/recipes/wood/embur/fence.json} | 0 .../byg/recipes/wood/embur/fence_gate.json} | 0 .../data/byg/recipes/wood/embur/planks.json} | 4 +- .../recipes/wood/embur/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/embur/slab.json} | 4 +- .../data/byg/recipes/wood/embur/stairs.json} | 10 +- .../byg/recipes/wood/embur/trapdoor.json} | 6 +- .../data/byg/recipes/wood/embur/wood.json | 17 ++ .../byg/recipes/wood/sythian/bookshelf.json | 20 ++ .../data/byg/recipes/wood/sythian/button.json | 12 + .../recipes/wood/sythian/crafting_table.json | 16 ++ .../data/byg/recipes/wood/sythian/door.json | 18 ++ .../data/byg/recipes/wood/sythian/fence.json | 20 ++ .../byg/recipes/wood/sythian/fence_gate.json | 19 ++ .../data/byg/recipes/wood/sythian/planks.json | 13 ++ .../recipes/wood/sythian/pressure_plate.json | 15 ++ .../data/byg/recipes/wood/sythian/slab.json | 16 ++ .../data/byg/recipes/wood/sythian/stairs.json | 18 ++ .../byg/recipes/wood/sythian/trapdoor.json | 17 ++ .../data/byg/recipes/wood/sythian/wood.json | 17 ++ .../data/byg/tags/blocks/wood/embur_logs.json | 9 + .../byg/tags/blocks/wood/sythian_logs.json | 9 + .../data/byg/tags/items/wood/embur_logs.json | 9 + .../byg/tags/items/wood/sythian_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 7 - .../byg/common/BYGCompostables.java | 4 - .../byg/common/BYGStrippables.java | 4 - .../byg/common/block/BYGBlocks.java | 40 +--- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 13 +- .../nether/sythian/SythianStalkBlock.java | 5 +- .../common/entity/npc/BYGVillagerTrades.java | 2 +- .../byg/common/item/BYGItems.java | 31 +-- .../features/nether/BYGNetherFeatures.java | 3 +- .../nether/BYGNetherVegetationFeatures.java | 31 +-- .../byg/blockstates/embur_bookshelf.json | 7 - .../assets/byg/blockstates/embur_button.json | 118 ---------- .../byg/blockstates/embur_crafting_table.json | 7 - .../assets/byg/blockstates/embur_door.json | 124 ----------- .../byg/blockstates/embur_fence_gate.json | 80 ------- .../assets/byg/blockstates/embur_planks.json | 7 - .../byg/blockstates/embur_pressure_plate.json | 10 - .../assets/byg/blockstates/embur_slab.json | 13 -- .../assets/byg/blockstates/embur_stairs.json | 209 ------------------ .../byg/blockstates/embur_trapdoor.json | 68 ------ .../byg/models/block/embur_bookshelf.json | 12 - .../models/block/embur_crafting_table.json | 12 - .../byg/models/block/embur_door_bottom.json | 7 - .../models/block/embur_door_bottom_hinge.json | 7 - .../byg/models/block/embur_door_top.json | 7 - .../models/block/embur_door_top_hinge.json | 7 - .../models/block/embur_fence_inventory.json | 6 - .../byg/models/block/embur_fence_post.json | 6 - .../assets/byg/models/block/embur_hyphae.json | 7 - .../assets/byg/models/block/embur_pedu.json | 7 - .../assets/byg/models/block/embur_planks.json | 6 - .../assets/byg/models/block/embur_slab.json | 8 - .../byg/models/block/embur_slab_top.json | 8 - .../assets/byg/models/block/embur_stairs.json | 8 - .../byg/models/block/embur_stairs_inner.json | 8 - .../byg/models/block/embur_stairs_outer.json | 8 - .../models/block/stripped_embur_hyphae.json | 7 - .../byg/models/block/stripped_embur_pedu.json | 7 - .../byg/models/item/embur_bookshelf.json | 22 -- .../assets/byg/models/item/embur_button.json | 3 - .../byg/models/item/embur_crafting_table.json | 22 -- .../assets/byg/models/item/embur_fence.json | 3 - .../byg/models/item/embur_fence_gate.json | 3 - .../assets/byg/models/item/embur_hyphae.json | 22 -- .../assets/byg/models/item/embur_pedu.json | 22 -- .../assets/byg/models/item/embur_planks.json | 3 - .../byg/models/item/embur_pressure_plate.json | 3 - .../assets/byg/models/item/embur_slab.json | 3 - .../assets/byg/models/item/embur_stairs.json | 3 - .../byg/models/item/embur_trapdoor.json | 3 - .../models/item/stripped_embur_hyphae.json | 22 -- .../byg/models/item/stripped_embur_pedu.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../{embur_wart.png => embur/grower_item.png} | Bin .../block/{embur_pedu.png => embur/log.png} | Bin .../log.png.mcmeta} | 0 .../{embur_pedu_top.png => embur/log_top.png} | Bin .../{embur_planks.png => embur/planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../item/{embur_door.png => embur/door.png} | Bin 251 files changed, 4300 insertions(+), 1110 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_door.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/embur_fence.json (70%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/embur_hyphae.json (52%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/embur_pedu.json (53%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_embur_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_embur_pedu.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_stem.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_door.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_fungus.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_stem.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_wart_block.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json rename Common/src/{main/resources/assets/byg/models/block/embur_button.json => generated/resources/assets/byg/models/block/embur/button.json} (60%) rename Common/src/{main/resources/assets/byg/models/block/embur_button_inventory.json => generated/resources/assets/byg/models/block/embur/button_inventory.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/embur_button_pressed.json => generated/resources/assets/byg/models/block/embur/button_pressed.json} (63%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/fence.json rename Common/src/{main/resources/assets/byg/models/block/embur_fence_gate.json => generated/resources/assets/byg/models/block/embur/fence_gate.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/embur_fence_gate_open.json => generated/resources/assets/byg/models/block/embur/fence_gate_open.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/embur_fence_gate_wall.json => generated/resources/assets/byg/models/block/embur/fence_gate_wall.json} (66%) rename Common/src/{main/resources/assets/byg/models/block/embur_fence_gate_wall_open.json => generated/resources/assets/byg/models/block/embur/fence_gate_wall_open.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/planks.json rename Common/src/{main/resources/assets/byg/models/block/embur_pressure_plate.json => generated/resources/assets/byg/models/block/embur/pressure_plate.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/embur_pressure_plate_down.json => generated/resources/assets/byg/models/block/embur/pressure_plate_down.json} (64%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json rename Common/src/{main/resources/assets/byg/models/block/embur_trapdoor_bottom.json => generated/resources/assets/byg/models/block/embur/trapdoor_bottom.json} (68%) rename Common/src/{main/resources/assets/byg/models/block/embur_trapdoor_open.json => generated/resources/assets/byg/models/block/embur/trapdoor_open.json} (67%) rename Common/src/{main/resources/assets/byg/models/block/embur_trapdoor_top.json => generated/resources/assets/byg/models/block/embur/trapdoor_top.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/models/item/embur_door.json (63%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_fungus.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_pedu.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_fungus.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_stem.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json rename Common/src/{main/resources/data/byg/recipes/embur_bookshelf.json => generated/resources/data/byg/recipes/wood/embur/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/embur_button.json => generated/resources/data/byg/recipes/wood/embur/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/embur_crafting_table.json => generated/resources/data/byg/recipes/wood/embur/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/embur_door.json => generated/resources/data/byg/recipes/wood/embur/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/embur_fence.json => generated/resources/data/byg/recipes/wood/embur/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/embur_fence_gate.json => generated/resources/data/byg/recipes/wood/embur/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/embur_planks.json => generated/resources/data/byg/recipes/wood/embur/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/embur_pressure_plate.json => generated/resources/data/byg/recipes/wood/embur/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/embur_slab.json => generated/resources/data/byg/recipes/wood/embur/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/embur_stairs.json => generated/resources/data/byg/recipes/wood/embur/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/embur_trapdoor.json => generated/resources/data/byg/recipes/wood/embur/trapdoor.json} (86%) create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/button.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_pedu.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/embur_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_embur_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_embur_pedu.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_pedu.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_embur_hyphae.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_embur_pedu.json rename Common/src/main/resources/assets/byg/textures/block/{embur_bookshelf.png => embur/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_crafting_table_front.png => embur/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_crafting_table_side.png => embur/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_crafting_table_top.png => embur/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_door_bottom.png => embur/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_door_top.png => embur/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_wart.png => embur/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_pedu.png => embur/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_pedu.png.mcmeta => embur/log.png.mcmeta} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_pedu_top.png => embur/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_planks.png => embur/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_embur_pedu.png => embur/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_embur_pedu_top.png => embur/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{embur_trapdoor.png => embur/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{embur_door.png => embur/door.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 862865cec5..bab3aad67e 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -115,6 +115,20 @@ d698358e14d5b800a34701c887b3c102420d37db assets/byg/blockstates/ebony_slab.json 159597001403dce617cec0b09015229f82a692fa assets/byg/blockstates/ebony_stairs.json 7093b45027148af44c5a09e2dd072b01d4cc0dd0 assets/byg/blockstates/ebony_trapdoor.json e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json +200459a4e3443e80749671ca91140e98546574ac assets/byg/blockstates/embur_bookshelf.json +bbec1f7607f6b94ca03945848b01f04561b2c323 assets/byg/blockstates/embur_button.json +512bea274ea8d1bb4b92ce997aedce20610a3d54 assets/byg/blockstates/embur_crafting_table.json +e7dd6c47208c5ad4bb856bdd5931a6151a0602c5 assets/byg/blockstates/embur_door.json +d6313fcb9d257839feb4117b7f284d7658932720 assets/byg/blockstates/embur_fence.json +f8cff1e012779ef2568929c38ea45d880efce0dc assets/byg/blockstates/embur_fence_gate.json +bbfdcfa6e93d2a9e423eb19f06880fa3c644c8c9 assets/byg/blockstates/embur_fungus.json +46e831a1dba9de011c9322957107a5c1d062dd2a assets/byg/blockstates/embur_hyphae.json +b6d9488386debda019aece59c0634c2c24258736 assets/byg/blockstates/embur_pedu.json +8b239412b7b13874dd0a12acd09dce1a10cbc851 assets/byg/blockstates/embur_planks.json +8c5ddd130c78b32e4e39a821d24119707d76040c assets/byg/blockstates/embur_pressure_plate.json +cacd2f9cf0ff0c18fcda66fce0eb2624d46a80d8 assets/byg/blockstates/embur_slab.json +94999f2516a5f601dd7dd9370b5689d4f0b917f4 assets/byg/blockstates/embur_stairs.json +3c2e6d1f27880ebfd5c437976e3e23c8a0c85998 assets/byg/blockstates/embur_trapdoor.json 75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json 9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json 02861206e3db5520606113efda73aaee0a2d9252 assets/byg/blockstates/ether_crafting_table.json @@ -295,6 +309,8 @@ ef01e82bf5872790295e1beb5c8e6552e3fd9584 assets/byg/blockstates/stripped_bulbis_ 615e6f98b311813ba850e39a306f5de9145ca1be assets/byg/blockstates/stripped_cypress_wood.json f4e0b9beacb2909fc37fca89d9210a6f322ab2c0 assets/byg/blockstates/stripped_ebony_log.json 4cfd875f5f962a7de3c2ef003d8a887230dec377 assets/byg/blockstates/stripped_ebony_wood.json +edf913aff7aeb91fddd90e245648d7b20a214eb3 assets/byg/blockstates/stripped_embur_hyphae.json +8d0dc4f228890a6c3af57b031836029a7cfb287d assets/byg/blockstates/stripped_embur_pedu.json 84804e789d5378f959a5e14e33a577e55c72e7d5 assets/byg/blockstates/stripped_ether_log.json 3f7eb7b740c1f98a4a660ffb7ef4ffa8451032b5 assets/byg/blockstates/stripped_ether_wood.json 8e23a9ae234ab2d29b2cef26aa908d71a8a1a156 assets/byg/blockstates/stripped_fir_log.json @@ -315,12 +331,29 @@ dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_lo ba8af5af681e7a4c1fd9fa346be84fca1d132a53 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json 67e9d9e8018903bb568c09d12767a0338c1bce68 assets/byg/blockstates/stripped_redwood_log.json 625fa0a3b477df439a0acf1655277bd844068167 assets/byg/blockstates/stripped_redwood_wood.json +80f81ef6eadf7614e1b101bd2d420b2a67b82180 assets/byg/blockstates/stripped_sythian_hyphae.json +4fd8e8dc0c0d9ea8178f1a7b563e1f6bfd074a7b assets/byg/blockstates/stripped_sythian_stem.json f6b1aaf5a69ad8142f6e0834c64a73d0c4e74ae4 assets/byg/blockstates/stripped_willow_log.json 4e222bb9e50ce841de407afed467b9592f06053b assets/byg/blockstates/stripped_willow_wood.json d32dc40358cf3a6f064ff9cbf0394e30f724aef3 assets/byg/blockstates/stripped_witch_hazel_log.json 7583d67b5af5c8dd63df91afb381d422c7bdbfee assets/byg/blockstates/stripped_witch_hazel_wood.json 211ce630315180eff72fe37b3edc00cde4325481 assets/byg/blockstates/stripped_zelkova_log.json f9ff642efd907765efd82e5b17a8ebde73474ebd assets/byg/blockstates/stripped_zelkova_wood.json +9f72739a086d1ed9c26e74ec1bb8acb743b29511 assets/byg/blockstates/sythian_bookshelf.json +d9daecb4ca9fdf4e92ac04888ca65c470d442c41 assets/byg/blockstates/sythian_button.json +6ccab11d1b2631ca93a562ebaa9f2e58aeff7b6f assets/byg/blockstates/sythian_crafting_table.json +b4364d5ed940dc2ccc356e1753798e6542571df2 assets/byg/blockstates/sythian_door.json +722b3a9d27dd5d94f740f8b7109b19be88b5b652 assets/byg/blockstates/sythian_fence.json +90903c520f3b42ed1d2043cbd365c3bc281c5c4f assets/byg/blockstates/sythian_fence_gate.json +4a0715a61a12e7e63b7e165c7aa0ee4947adc47d assets/byg/blockstates/sythian_fungus.json +de4dd8b35a7d719f20a31186435ceca02e3dd985 assets/byg/blockstates/sythian_hyphae.json +b6de4593dc9024b5729953b6f36e409b173e7160 assets/byg/blockstates/sythian_planks.json +bddf7dc4d22f2f0b62a92f4c63615968304235fa assets/byg/blockstates/sythian_pressure_plate.json +4f74b31c3cdc195042788613e580a99c6b17c8f6 assets/byg/blockstates/sythian_slab.json +00e5d541748d124159bba40363aa2ffe5a28c69b assets/byg/blockstates/sythian_stairs.json +890058f1798aff0661b951fdc29caba6ab6ce770 assets/byg/blockstates/sythian_stem.json +2ecd05f365d0eb361931753cc3ab3e563fef9029 assets/byg/blockstates/sythian_trapdoor.json +9459f29313e8a25885dd915b223e14356b4fa1c2 assets/byg/blockstates/sythian_wart_block.json cfabafc13af51dd19cbb65e84db364d9f4784baa assets/byg/blockstates/willow_bookshelf.json 5c55fa6f5f1a648ceed10158984177b3cbfa5c58 assets/byg/blockstates/willow_button.json 0ff45eb69b7ff16882c602f499f0e0186fe58036 assets/byg/blockstates/willow_crafting_table.json @@ -641,6 +674,39 @@ f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_ 631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json 5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony/trapdoor_top.json d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony/wood.json +91d303d1f62f05a447ca1dc83a8ac7b402150a96 assets/byg/models/block/embur/bookshelf.json +34b8140f662b8618151a0aff332be6604e6b113f assets/byg/models/block/embur/button.json +22d327d12983ef38c8edd76d284985a70ab5c336 assets/byg/models/block/embur/button_inventory.json +52c272edf2e9b3942170fd20ca35c6178ecfa6f9 assets/byg/models/block/embur/button_pressed.json +ed697a5208d80cbe68845180bb51e1e84fff8ce3 assets/byg/models/block/embur/crafting_table.json +55848fe86c6d02588f4fc106da9df0d2e61e8200 assets/byg/models/block/embur/door_bottom.json +692564f31cf01771196a4eebf65e7b4b31408705 assets/byg/models/block/embur/door_bottom_hinge.json +8d81a6c44055aeccd91819495fc7486e34a198f5 assets/byg/models/block/embur/door_top.json +d8f63e8f15f52d81e27d7b49bfc7503d78e35f15 assets/byg/models/block/embur/door_top_hinge.json +7901bf71acac4bd302f199953d2b5e907306c665 assets/byg/models/block/embur/fence.json +650aa09a1eaca8cd1a49f77243b065d9b6cfde56 assets/byg/models/block/embur/fence_gate.json +0ab21432675dd4a4df4f38c6aaef5c73c5afa711 assets/byg/models/block/embur/fence_gate_open.json +cb9f854236862b2408afb4b2580433324051d637 assets/byg/models/block/embur/fence_gate_wall.json +bbf1baca8a5f781d6a92472b724903062ba492eb assets/byg/models/block/embur/fence_gate_wall_open.json +e7640f1f638b63f534bcadb1b2ee21350fb9255f assets/byg/models/block/embur/fence_inv.json +718f61914ed2d2776671f9016da0380d5d7938c1 assets/byg/models/block/embur/fence_post.json +5eb77faf112951059af41767d2ab6abda5c034ed assets/byg/models/block/embur/grower_item.json +59c73d96ba72b1c77a7b129eeb5fe805655d45bb assets/byg/models/block/embur/log.json +a321195a5cab309c682469d5345cda230e1e52dc assets/byg/models/block/embur/planks.json +0ecfebb6a60ddec2417b671dcec162b7f57b2b07 assets/byg/models/block/embur/pressure_plate.json +e0c9a248f41c021407657c2be36ff0179e4b4b9a assets/byg/models/block/embur/pressure_plate_down.json +4dd00cdbfe34d61a74070a1f488f6db897e77c2b assets/byg/models/block/embur/slab.json +84b5d1beee1d2e9bcc4f55ade9bb061297b1994a assets/byg/models/block/embur/slab_top.json +9c2c2b2d0e43407e9d0d87a1a6ec74ca2a6b60bb assets/byg/models/block/embur/stairs.json +b195fbc8d6ddec2d778d619a0ba3e1e958cd54cf assets/byg/models/block/embur/stairs_inner.json +7523a6754e538b0b33e465e4f6e97d88bdc57257 assets/byg/models/block/embur/stairs_outer.json +a4dd05982a73e8b686d2a9b241f4781d72d87a37 assets/byg/models/block/embur/stripped_log.json +ddb00c9808cd83d55a16fc39599c1fd6df5f6f5c assets/byg/models/block/embur/stripped_wood.json +5f1772effcfeb533a5f44759d0bf90a26d8430bb assets/byg/models/block/embur/trapdoor.json +392a9aaa805522c07b7f8654ed39920ae8782c7e assets/byg/models/block/embur/trapdoor_bottom.json +02d1895e71d5b4fb9866bee6b953fc811f60fad0 assets/byg/models/block/embur/trapdoor_open.json +eff5a660c4e9edab9d29d31e12952c721dedd756 assets/byg/models/block/embur/trapdoor_top.json +60e5bc353ed2c25862cdfe37f9d517d4ef1472ac assets/byg/models/block/embur/wood.json 9e0c6e392eb1d912d5ff72e203776609ce96c14e assets/byg/models/block/ether/bookshelf.json 951090d2076a3735ef3f278fbc48ff9b049249fb assets/byg/models/block/ether/button.json 866076592f9138f00523b84d5e13a799b4e6efa2 assets/byg/models/block/ether/button_inventory.json @@ -1022,6 +1088,41 @@ bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/block/redwood/trapdoo c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json 304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json b92686745b20a33080cb669a5d23b8e8e0b4915c assets/byg/models/block/redwood/wood.json +f609435c668bc7df2b4629289101e1c3f38641e0 assets/byg/models/block/sythian/bookshelf.json +35767dee2ac8093d6860bfb48a4c665b9adfbd26 assets/byg/models/block/sythian/button.json +d053689fb4513489f8f1ebcb7f0c24d13001530c assets/byg/models/block/sythian/button_inventory.json +6af9a2372487e6689cd96525ec76b5d42e40b961 assets/byg/models/block/sythian/button_pressed.json +4b6afe0de91bbe56b8844d8bae7d7eaa4f924e69 assets/byg/models/block/sythian/crafting_table.json +4b8ee4e134914edc1fa2bba8286287228a1467e8 assets/byg/models/block/sythian/door_bottom.json +52fe8d461b9cc9c26fe35222ba5feac9b122f0c9 assets/byg/models/block/sythian/door_bottom_hinge.json +8b280bdaab142ef23553dfb2cd0f7de155ed42f3 assets/byg/models/block/sythian/door_top.json +e0aae6d183e126c13e240ab9beccba93894ee3c6 assets/byg/models/block/sythian/door_top_hinge.json +6ebd4789bed71d54a8585152887d5c37dc61194e assets/byg/models/block/sythian/fence.json +eb16ce7bf5d643faad41e10426a8aad9c6890964 assets/byg/models/block/sythian/fence_gate.json +6592c226abb3df359ce235656daf152d6304bd7a assets/byg/models/block/sythian/fence_gate_open.json +713d4d6b47fb4347a987498825441f546c21b60f assets/byg/models/block/sythian/fence_gate_wall.json +d851529253a077698465aea91d4c5c0f543f9a6e assets/byg/models/block/sythian/fence_gate_wall_open.json +5f018cd797232f7108eaa89edaf52d87ee62d661 assets/byg/models/block/sythian/fence_inv.json +c52bc83170ce1da40740286d513fde0c86f39654 assets/byg/models/block/sythian/fence_post.json +474b96982097f737c00ae889033e4acf46e35c8d assets/byg/models/block/sythian/grower_item.json +40d0cb59e096772da5f14f0492dc6238eb00ab3a assets/byg/models/block/sythian/leaves.json +d7487e5fb582e7d48328d29ab7977219147c4857 assets/byg/models/block/sythian/leaves_snowy.json +ff337b115b474c3a8c8b4d6dc2aa8f3568e71d2e assets/byg/models/block/sythian/log.json +560cb6f859f056369ba030379dc5e887c910f832 assets/byg/models/block/sythian/planks.json +a2ca9f484ae49db9f5aef858a248e00adcb9fdc2 assets/byg/models/block/sythian/pressure_plate.json +efcb96e91be1632af3f7d673c23ad6bb88fb8764 assets/byg/models/block/sythian/pressure_plate_down.json +b32f3bb03f67f61c9b4b90e62ad6d91c7bedb139 assets/byg/models/block/sythian/slab.json +1f8825b8ed8f6534c2e6b2f2dec5570e0919acb2 assets/byg/models/block/sythian/slab_top.json +d5321722d9a7b0a48a83eedbb6e47040862cb889 assets/byg/models/block/sythian/stairs.json +fae89cf926080190113b2b388ec15d9f6cbd210b assets/byg/models/block/sythian/stairs_inner.json +6361ceda50b4328315d992e248368cc65da42cae assets/byg/models/block/sythian/stairs_outer.json +379c6cfb5a35f0d79acc384f95b129be8e392c4d assets/byg/models/block/sythian/stripped_log.json +6487e298a7254dad1b8fcdbe91f941844819731e assets/byg/models/block/sythian/stripped_wood.json +6f14d5a024475a25ac31e60609eee006d61de568 assets/byg/models/block/sythian/trapdoor.json +43e7b7b4d79fb9634d34473711092bfdeb1f916c assets/byg/models/block/sythian/trapdoor_bottom.json +bdf701686c9f92e84f27c756a65efff5d0144d8f assets/byg/models/block/sythian/trapdoor_open.json +3f31fb04e431956d3f6c05358a262621a2a301e9 assets/byg/models/block/sythian/trapdoor_top.json +64e57c8c9552cd26c7311c41db04f51d9394b759 assets/byg/models/block/sythian/wood.json ce80e9118013200e66d532e869d8bd249cb1b8ec assets/byg/models/block/willow/bookshelf.json 26bd534315d6f49619fd4388fd0d72a81678c85c assets/byg/models/block/willow/button.json 2febb5a4bc0e0bdc4cf65b5cea798a66e2c689cd assets/byg/models/block/willow/button_inventory.json @@ -1235,6 +1336,18 @@ e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.jso a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json 98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json ee030f03a491ef8d7d845da92ffd106d935d4b6c assets/byg/models/item/ebony_wood.json +2841ca8e8bbc38b5058d0c832c7a23a35d3b7839 assets/byg/models/item/embur_bookshelf.json +d6450f4fd0ce2fe7a31b659129b929b28ff6ff4b assets/byg/models/item/embur_button.json +d191034e27b30671a3e935e988d55d1ec3759da7 assets/byg/models/item/embur_crafting_table.json +b31773b495b434b1390c212dc64cfb9bd465c28d assets/byg/models/item/embur_door.json +35315685e38fd251a84f6786845821bcbeb985c3 assets/byg/models/item/embur_fence.json +362ff4592e0b862d7b382f567ac0de57b71cfb85 assets/byg/models/item/embur_fungus.json +6bc1ae48d3839516cc2f66f61c97d6f9d6a0b194 assets/byg/models/item/embur_hyphae.json +1ea72d91c1202c6105450188d3ae00fb5e7d11bd assets/byg/models/item/embur_pedu.json +017edeb29f425654dce2a9d685154cbb78a39c6d assets/byg/models/item/embur_planks.json +99354ff5e260dd8416cc5cb6c1c4abde2bfe1b79 assets/byg/models/item/embur_pressure_plate.json +28a053a792a97989455294e072af93c91dd01799 assets/byg/models/item/embur_slab.json +de0fe12925ca27d70084852ac3c6ccb4c7d4ed2e assets/byg/models/item/embur_stairs.json a738b98393a906c3370fc2264d085148d74382a9 assets/byg/models/item/ether_bookshelf.json 0d764181101f212f7cb89c9d1982e08cea89e65a assets/byg/models/item/ether_button.json bf33776a7202fc417bc0cc4a73f9c2529fc83295 assets/byg/models/item/ether_crafting_table.json @@ -1402,6 +1515,8 @@ feab6881106cade562fa3b02d82d12e98ee9230b assets/byg/models/item/stripped_cypress 0692e7e67a4ef4b23e2ff7bf429cf3f742f414fd assets/byg/models/item/stripped_cypress_wood.json 98e91b262a9375d48c381898272f1e01ab00e45a assets/byg/models/item/stripped_ebony_log.json e4ed1b4f8e97ded9b95e6a4bb8333e62ae08b188 assets/byg/models/item/stripped_ebony_wood.json +e0c73411518c49829bf7ccaeb17d7508cc81be46 assets/byg/models/item/stripped_embur_hyphae.json +a9e46b97e764b54f226eb975fc3a12911b63919e assets/byg/models/item/stripped_embur_pedu.json d8cf3c34099fa0bd7fd8dbf51a5075b9df29217c assets/byg/models/item/stripped_ether_log.json 2f3615abe3246b8c691c5925ca76a9108763829e assets/byg/models/item/stripped_ether_wood.json b0d668ef92fa26d739f0fb38fdd5fce090ce6b49 assets/byg/models/item/stripped_fir_log.json @@ -1422,12 +1537,27 @@ e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wo 03df4f31d47d36fd31fdc70002686f80dc3cb46f assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json a86cac25410f11ccd308ab3cbf1217e18eb73895 assets/byg/models/item/stripped_redwood_log.json db8a7ece8ae147b5b60a97bdaaa461d45185bb09 assets/byg/models/item/stripped_redwood_wood.json +db07f156bfbdffbeea263bd9d6d42ed1183b37c7 assets/byg/models/item/stripped_sythian_hyphae.json +5f18b3cba93df79fb8333a6dfe6b62a5fa65ebe9 assets/byg/models/item/stripped_sythian_stem.json fb93ad2185e85033120d127bd82f62c6a31f7e4c assets/byg/models/item/stripped_willow_log.json adeebea04044107c674e2d9f0507120d622647b5 assets/byg/models/item/stripped_willow_wood.json e6950d73dc47a1084f96c6718bcd1a9c8f99f54e assets/byg/models/item/stripped_witch_hazel_log.json b5ace128271a547e9aec54d9654f961e1eedb37b assets/byg/models/item/stripped_witch_hazel_wood.json 8b1eac54f1510cc94903fff54021c459a615665d assets/byg/models/item/stripped_zelkova_log.json 24e453300046cb72733d5332321d36aea2e077fb assets/byg/models/item/stripped_zelkova_wood.json +56c2ae6989c34d18bf77e79aa43e17bcdb6ed6aa assets/byg/models/item/sythian_bookshelf.json +65081a6849dda77648fa6ffb72fbcfacd0d61293 assets/byg/models/item/sythian_button.json +4a419e0817c9b2d888c1957c3e5b76f18976fda3 assets/byg/models/item/sythian_crafting_table.json +4717b6a27bc6e6366ea444541ac7514266df7f41 assets/byg/models/item/sythian_door.json +8d100561293c599f2655ea992850b676d74ea26a assets/byg/models/item/sythian_fence.json +7c839ca5ebb6803862952edf853e9361a4d41c8e assets/byg/models/item/sythian_fungus.json +f624822fa4960cab4ca1aeefaab1b0778b78a149 assets/byg/models/item/sythian_hyphae.json +3785ffb871d4033aa77d7b1ba2beb8d0c022afa5 assets/byg/models/item/sythian_planks.json +f59df2cf798a5b7d6d2040046a40cc781e4a41ba assets/byg/models/item/sythian_pressure_plate.json +cc130597a10b0e61ed51c8fb16f9c797605d60ed assets/byg/models/item/sythian_slab.json +3e45f23c56a1e0b3fdb339c8626375bce2d3e931 assets/byg/models/item/sythian_stairs.json +66e8914249bfb56050995582985166330e9ff9de assets/byg/models/item/sythian_stem.json +0bb134aa65e3884ba001c390d578cf155722df3b assets/byg/models/item/sythian_wart_block.json a52bc875d6707a1b1d65472af872f38341d74862 assets/byg/models/item/willow_boat.json 8d8cfcfd12b3742a693df688c8db073d3bfdbaf0 assets/byg/models/item/willow_bookshelf.json 866026b225ba45574007e994aecb293b5dad7d6d assets/byg/models/item/willow_button.json @@ -1573,6 +1703,18 @@ c11c95a814d930a9a9128fdbcc8138c651a1a0db data/byg/advancements/recipes/byg.byg/w c146cebcc5cda2004d61257e4c2deb4ff421e9de data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json 9dd64acb1012c36dbcf979f00f680b3f716465b4 data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json bc237fdfe5a01a5caf21ae87675b4fe144caa9d6 data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json +cbcd24147b96d8fd638fdd20408334d90e7c5872 data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json +7c572067ed8844b4e2642d14df2baada8483930e data/byg/advancements/recipes/byg.byg/wood/embur/button.json +838fa47a687aae593073a41ce1172e922524a064 data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json +94d9bb0db7da38e62133f48762ab72450b44ec2b data/byg/advancements/recipes/byg.byg/wood/embur/door.json +4aeb2936898e9d9437ffdfa3d45513307605a596 data/byg/advancements/recipes/byg.byg/wood/embur/fence.json +b5ef8379f588abfdd1371574f7ccbffa33b390f8 data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json +7d3dfe79e35bf36008c981751cea61947d7a5f29 data/byg/advancements/recipes/byg.byg/wood/embur/planks.json +f9d2ff3b2735a14c7a67c360ec9ad3d37757e4ab data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json +2ab26df6c178f0e2b2ec97a223cfbec14025b82a data/byg/advancements/recipes/byg.byg/wood/embur/slab.json +59a7be5ea54968e4ba14615daca8072d133a059c data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json +bfa220a3176ed010f6cb184120033569e5d744f0 data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json +df93bb888ddb2b7c355042d18dd4bb529395654d data/byg/advancements/recipes/byg.byg/wood/embur/wood.json b6d69417231d8bb1214b34f21c92748c6ff9f367 data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json b767921c7c0f4fc620be688ea605184ce99f2c43 data/byg/advancements/recipes/byg.byg/wood/ether/button.json 83ead00ef090545b87617c944c6eeeb7c6268e27 data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json @@ -1714,6 +1856,18 @@ f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/w 48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json ce977027d630e1d18301bbff458916b11621daa9 data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json +57ee2ed86380b7aa0205fea50d7418d03aaa71b6 data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json +93a68ce74502ff43c1dcaac2c0a3bc1b69af1b5f data/byg/advancements/recipes/byg.byg/wood/sythian/button.json +bed0fe7f9f783c594170979ab9af60abe160f5c7 data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json +3d16bd72a5351057df108a5d8ff1dae34e481a82 data/byg/advancements/recipes/byg.byg/wood/sythian/door.json +9b28b5d51bb6bcb049ec344a25a015f0d4c0054a data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json +4fddc714997fcbe7e2c371553ea37de3772c8739 data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json +07dcd4470b107c239d1a00488eec0772816b45ed data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json +1eb44357bceb6eebb4cf88464d9e2dfd1d3eff52 data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json +1eb658f6cd7e634bace3ed76afc5f7733e3a358f data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json +6ae698e128fcf2fd1020eabaff033be7788dfcf6 data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json +b8d75b0c9d037bf5d186265c3a2b8f92f8f6a5e9 data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json +b32eee896d4570b91f505cf05117e2e76d3f68a3 data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json 48dbd2f4c71c5116e529c19ef8033dee0b232fda data/byg/advancements/recipes/byg.byg/wood/willow/boat.json 13bfcd87821c7ea0d55a275910defa7dbc7a1a00 data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json 34f9f4691439d3288e486685671b53c5f2e30ba1 data/byg/advancements/recipes/byg.byg/wood/willow/button.json @@ -1856,6 +2010,18 @@ ecd292502b1ba405da5b7cd6dc907e6741a7ab34 data/byg/recipes/wood/ebony/slab.json b03173249150fb57da7ea0b5fc3272530c0333e1 data/byg/recipes/wood/ebony/stairs.json cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.json 7ef6d2286f911144c5a1fd7bfb95974631517438 data/byg/recipes/wood/ebony/wood.json +770adbbd61f7a0b7c4c95b0305959835264282c0 data/byg/recipes/wood/embur/bookshelf.json +7a5e21e999d6bc461b8934c2a073f3d8da4a3f6d data/byg/recipes/wood/embur/button.json +c0248cde772f05bb5267e8eea2edff9918c04129 data/byg/recipes/wood/embur/crafting_table.json +0a8bf0fdedbbde1757e57746687eb7e9be2657dd data/byg/recipes/wood/embur/door.json +0a226581ca43a6c77873fa18f31fd36c4fe8ed10 data/byg/recipes/wood/embur/fence.json +5c85109e1af8dba86bb0a30cf3375ad45de2d50b data/byg/recipes/wood/embur/fence_gate.json +c8eb7b747c73416ee2825910308480af5dde6d70 data/byg/recipes/wood/embur/planks.json +a8b7439e42a12200de7d26d484cfa55e6dc887e0 data/byg/recipes/wood/embur/pressure_plate.json +eed8be018b86684fc516f039fb94e3a45306e02c data/byg/recipes/wood/embur/slab.json +917ef07f88a9f0dc7c9e0aeed83e9bc664704387 data/byg/recipes/wood/embur/stairs.json +30d2582c69bde3513ec61e48a523f39844193cb5 data/byg/recipes/wood/embur/trapdoor.json +ea032914737512f8483a9325d5e96d760cb190ad data/byg/recipes/wood/embur/wood.json 86d3edbb975fd920b866562841a1a4368c5f5551 data/byg/recipes/wood/ether/bookshelf.json 74876a43f8e763fe5bd418f95b65b02fff554be6 data/byg/recipes/wood/ether/button.json a434b4d028fd5b097f88886c6fce58641204bed5 data/byg/recipes/wood/ether/crafting_table.json @@ -1997,6 +2163,18 @@ e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json 5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json 87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json 77068fa435484d2dfd95ba3a45308c36d6593157 data/byg/recipes/wood/redwood/wood.json +39a5771eb4c4416d1f1c0e0301ba8fa706bc828e data/byg/recipes/wood/sythian/bookshelf.json +aacccae5dbf9ab6190d494d9321b7af851aef0fc data/byg/recipes/wood/sythian/button.json +7ac944da1dfe8ffcfa39b910be5b8c9a481bd47d data/byg/recipes/wood/sythian/crafting_table.json +7ae2280ffbdb41f6f3297e7caba1868b63a20dd0 data/byg/recipes/wood/sythian/door.json +de5bd13afa0090b9fadd9f3ff8aed61ad7187db5 data/byg/recipes/wood/sythian/fence.json +fef20da37df03ee4d29e91b23ade55d4118a4aa2 data/byg/recipes/wood/sythian/fence_gate.json +fd1dcb3bc09c335e9581d95213d3af165744118f data/byg/recipes/wood/sythian/planks.json +51d9e735a6333c2a179a95a9f4563a4db6ffa1af data/byg/recipes/wood/sythian/pressure_plate.json +61667e39c7df0009f3c8aa324fea644f4c64dfc9 data/byg/recipes/wood/sythian/slab.json +26cf9803288adde5e8f5a1466c980be751e92be8 data/byg/recipes/wood/sythian/stairs.json +505117e54a49ffef4fc44cc52b3f7a5d790acdcf data/byg/recipes/wood/sythian/trapdoor.json +2b04684a700790f200755a005338328e1490158d data/byg/recipes/wood/sythian/wood.json 837cb000ce0acb14670412f3dfb5e5fd666216fc data/byg/recipes/wood/willow/boat.json 06e9a5a74e213645a9b491c89f968100d8d37d96 data/byg/recipes/wood/willow/bookshelf.json 331708c6a157e1c2b5f43c57e7c65c0b80886e34 data/byg/recipes/wood/willow/button.json @@ -2168,6 +2346,7 @@ fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.j 5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/blocks/wood/cika_logs.json 7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/blocks/wood/cypress_logs.json 9b0b2d4870545894723344872062d9317ab188bc data/byg/tags/blocks/wood/ebony_logs.json +088b5d14f042e63b6bcbff1f8487ba3a4f3b3182 data/byg/tags/blocks/wood/embur_logs.json 80e1953df48855e29d5b55070afdefe2697acade data/byg/tags/blocks/wood/ether_logs.json b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json @@ -2179,6 +2358,7 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json 9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json +629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/blocks/wood/sythian_logs.json 7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/blocks/wood/willow_logs.json 7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/blocks/wood/witch_hazel_logs.json a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json @@ -2190,6 +2370,7 @@ f4980e01bf3950c5b70a5182e932662a5f325afb data/byg/tags/items/wood/cherry_logs.js 068be598420fe871d6b5781c38676dd17f7a0344 data/byg/tags/items/wood/cika_logs.json 29435ee175355151440dccbe35ded08bbcd4bc9c data/byg/tags/items/wood/cypress_logs.json 6a3b0f6dba944ecfc136698dc07826d5493e7507 data/byg/tags/items/wood/ebony_logs.json +a6613f4ac0ee9f2975b0e7c9833e642ed73e734a data/byg/tags/items/wood/embur_logs.json f444a358d341fa5f9b75871baf92c032a9a5f0b1 data/byg/tags/items/wood/ether_logs.json cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json @@ -2201,6 +2382,7 @@ cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json 52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json 4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json +1e5d0e7d58c86949b1d2eaa8de318a1f4b13139d data/byg/tags/items/wood/sythian_logs.json 5343112857899942ab8f37d883a572166eba5b13 data/byg/tags/items/wood/willow_logs.json 7832a5cc7d64149d49991f418ffc960adc4ae871 data/byg/tags/items/wood/witch_hazel_logs.json b488cad37e845f24abd0bc83f7d7e4646e5b668d data/byg/tags/items/wood/zelkova_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/embur_bookshelf.json new file mode 100644 index 0000000000..b79146e97e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_button.json b/Common/src/generated/resources/assets/byg/blockstates/embur_button.json new file mode 100644 index 0000000000..32b23cf5a2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/embur/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/embur/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/embur/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/embur/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/embur/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/embur/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/embur/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/embur/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/embur/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/embur_crafting_table.json new file mode 100644 index 0000000000..1f3f87e58a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_door.json b/Common/src/generated/resources/assets/byg/blockstates/embur_door.json new file mode 100644 index 0000000000..6e63ce1eec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_fence.json b/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json similarity index 70% rename from Common/src/main/resources/assets/byg/blockstates/embur_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/embur_fence.json index ce55e8ee8c..504ab501a6 100644 --- a/Common/src/main/resources/assets/byg/blockstates/embur_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json @@ -2,46 +2,46 @@ "multipart": [ { "apply": { - "model": "byg:block/embur_fence_post" + "model": "byg:block/embur/fence_post" } }, { - "apply": { - "model": "byg:block/embur_fence_side", - "uvlock": true - }, "when": { "north": "true" - } - }, - { + }, "apply": { - "model": "byg:block/embur_fence_side", - "y": 90, + "model": "byg:block/embur/fence", "uvlock": true - }, - "when": { - "east": "true" } }, { + "when": { + "south": "true" + }, "apply": { - "model": "byg:block/embur_fence_side", + "model": "byg:block/embur/fence", "y": 180, "uvlock": true - }, - "when": { - "south": "true" } }, { + "when": { + "west": "true" + }, "apply": { - "model": "byg:block/embur_fence_side", + "model": "byg:block/embur/fence", "y": 270, "uvlock": true - }, + } + }, + { "when": { - "west": "true" + "east": "true" + }, + "apply": { + "model": "byg:block/embur/fence", + "y": 90, + "uvlock": true } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json new file mode 100644 index 0000000000..8823cbb111 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json b/Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json new file mode 100644 index 0000000000..ffbf7b60c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/embur_hyphae.json similarity index 52% rename from Common/src/main/resources/assets/byg/blockstates/embur_hyphae.json rename to Common/src/generated/resources/assets/byg/blockstates/embur_hyphae.json index 8c4dbf56a0..bf342cdb1b 100644 --- a/Common/src/main/resources/assets/byg/blockstates/embur_hyphae.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_hyphae.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/embur/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/embur_hyphae" + "model": "byg:block/embur/wood" }, "axis=z": { - "model": "byg:block/embur_hyphae", + "model": "byg:block/embur/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/embur_hyphae", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_pedu.json b/Common/src/generated/resources/assets/byg/blockstates/embur_pedu.json similarity index 53% rename from Common/src/main/resources/assets/byg/blockstates/embur_pedu.json rename to Common/src/generated/resources/assets/byg/blockstates/embur_pedu.json index c094ffbc58..f0ab2ad0d8 100644 --- a/Common/src/main/resources/assets/byg/blockstates/embur_pedu.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_pedu.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/embur/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/embur_pedu" + "model": "byg:block/embur/log" }, "axis=z": { - "model": "byg:block/embur_pedu", + "model": "byg:block/embur/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/embur_pedu", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_planks.json b/Common/src/generated/resources/assets/byg/blockstates/embur_planks.json new file mode 100644 index 0000000000..f88a16c9b2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/embur_pressure_plate.json new file mode 100644 index 0000000000..ea0d233e06 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/embur/pressure_plate" + }, + "powered=true": { + "model": "byg:block/embur/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json b/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json new file mode 100644 index 0000000000..38a4b8374c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/embur/slab_top" + }, + "type=bottom": { + "model": "byg:block/embur/slab" + }, + "type=double": { + "model": "byg:block/embur/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json new file mode 100644 index 0000000000..678a53b0f5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json new file mode 100644 index 0000000000..f96fa89188 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/embur/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/embur/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/embur/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/embur/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_hyphae.json new file mode 100644 index 0000000000..52259e318f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_hyphae.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/embur/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/embur/stripped_wood" + }, + "axis=z": { + "model": "byg:block/embur/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_pedu.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_pedu.json new file mode 100644 index 0000000000..93014bad5a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_embur_pedu.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/embur/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/embur/stripped_log" + }, + "axis=z": { + "model": "byg:block/embur/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_hyphae.json new file mode 100644 index 0000000000..1756bd3612 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_hyphae.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/sythian/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/sythian/stripped_wood" + }, + "axis=z": { + "model": "byg:block/sythian/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_stem.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_stem.json new file mode 100644 index 0000000000..7e2acfa548 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_sythian_stem.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/sythian/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/sythian/stripped_log" + }, + "axis=z": { + "model": "byg:block/sythian/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_bookshelf.json new file mode 100644 index 0000000000..dbefc611b6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json new file mode 100644 index 0000000000..9b391d0144 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/sythian/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/sythian/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/sythian/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/sythian/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/sythian/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/sythian/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/sythian/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/sythian/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/sythian/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_crafting_table.json new file mode 100644 index 0000000000..6dac3efae6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json new file mode 100644 index 0000000000..5e90d4b76c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json new file mode 100644 index 0000000000..06e5433b49 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "byg:block/sythian/fence_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "byg:block/sythian/fence", + "uvlock": true + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "byg:block/sythian/fence", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "byg:block/sythian/fence", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "byg:block/sythian/fence", + "y": 90, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json new file mode 100644 index 0000000000..4a3211fa20 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_fungus.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_fungus.json new file mode 100644 index 0000000000..c8d21a5a58 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_fungus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_hyphae.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_hyphae.json new file mode 100644 index 0000000000..43bc4e1b5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_hyphae.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/sythian/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/sythian/wood" + }, + "axis=z": { + "model": "byg:block/sythian/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_planks.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_planks.json new file mode 100644 index 0000000000..3d3f5fa86f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_pressure_plate.json new file mode 100644 index 0000000000..57f6c8b340 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/sythian/pressure_plate" + }, + "powered=true": { + "model": "byg:block/sythian/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json new file mode 100644 index 0000000000..a9306e4504 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/sythian/slab_top" + }, + "type=bottom": { + "model": "byg:block/sythian/slab" + }, + "type=double": { + "model": "byg:block/sythian/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json new file mode 100644 index 0000000000..bed4072344 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_stem.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_stem.json new file mode 100644 index 0000000000..fba841437c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_stem.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/sythian/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/sythian/log" + }, + "axis=z": { + "model": "byg:block/sythian/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json new file mode 100644 index 0000000000..76b69d3bc2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_wart_block.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_wart_block.json new file mode 100644 index 0000000000..067ced7514 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_wart_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json new file mode 100644 index 0000000000..8918507928 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/embur/planks", + "up": "byg:block/embur/planks", + "north": "byg:block/embur/bookshelf", + "south": "byg:block/embur/bookshelf", + "east": "byg:block/embur/bookshelf", + "west": "byg:block/embur/bookshelf", + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_button.json b/Common/src/generated/resources/assets/byg/models/block/embur/button.json similarity index 60% rename from Common/src/main/resources/assets/byg/models/block/embur_button.json rename to Common/src/generated/resources/assets/byg/models/block/embur/button.json index 4f36549e7b..3b3c3f8f41 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_button.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/embur/button_inventory.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/embur_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/embur/button_inventory.json index 24f3b1d44c..4d36f5c8fc 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_button_inventory.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/embur/button_pressed.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/embur_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/embur/button_pressed.json index e9595b0d73..173fcf0b19 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_button_pressed.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json new file mode 100644 index 0000000000..d8ea99b5a7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/embur/planks", + "up": "byg:block/embur/crafting_table_top", + "north": "byg:block/embur/crafting_table_front", + "south": "byg:block/embur/crafting_table_side", + "east": "byg:block/embur/crafting_table_side", + "west": "byg:block/embur/crafting_table_front", + "particle": "byg:block/embur/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json new file mode 100644 index 0000000000..1723e728d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json new file mode 100644 index 0000000000..6cb92eed0e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_top.json b/Common/src/generated/resources/assets/byg/models/block/embur/door_top.json new file mode 100644 index 0000000000..e88a8206ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json new file mode 100644 index 0000000000..f23181d368 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence.json new file mode 100644 index 0000000000..73b0f7a998 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/embur/planks", + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/embur_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/embur/fence_gate.json index 7d13ebe210..ff5de86656 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_open.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/embur_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_open.json index 969cf9226f..c881918b0b 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall.json index fa909472df..efecdcdb6a 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall_open.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall_open.json index 8c7cf5e383..68ecec07bb 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_gate_wall_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json new file mode 100644 index 0000000000..0bf1bbcd21 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/embur/planks", + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json new file mode 100644 index 0000000000..cba64136aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/embur/planks", + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/embur/grower_item.json new file mode 100644 index 0000000000..a207876493 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/embur/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/log.json b/Common/src/generated/resources/assets/byg/models/block/embur/log.json new file mode 100644 index 0000000000..15eb1f1392 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/embur/log", + "end": "byg:block/embur/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/planks.json b/Common/src/generated/resources/assets/byg/models/block/embur/planks.json new file mode 100644 index 0000000000..c733364b59 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/embur/planks", + "up": "byg:block/embur/planks", + "north": "byg:block/embur/planks", + "south": "byg:block/embur/planks", + "east": "byg:block/embur/planks", + "west": "byg:block/embur/planks", + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/embur_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate.json index 116a5a9557..03305fa312 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate_down.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/embur_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate_down.json index 918f364311..2d859ab563 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_pressure_plate_down.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "byg:block/embur_planks" + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/slab.json b/Common/src/generated/resources/assets/byg/models/block/embur/slab.json new file mode 100644 index 0000000000..721c57274c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/embur/planks", + "bottom": "byg:block/embur/planks", + "top": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json new file mode 100644 index 0000000000..bdc8e2c2c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/embur/planks", + "bottom": "byg:block/embur/planks", + "top": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json new file mode 100644 index 0000000000..1fb8d92a45 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/embur/planks", + "bottom": "byg:block/embur/planks", + "top": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json new file mode 100644 index 0000000000..9c3d14d00b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/embur/planks", + "bottom": "byg:block/embur/planks", + "top": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json new file mode 100644 index 0000000000..2fe174a33c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/embur/planks", + "bottom": "byg:block/embur/planks", + "top": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json new file mode 100644 index 0000000000..af17571a02 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/embur/stripped_log", + "end": "byg:block/embur/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_wood.json new file mode 100644 index 0000000000..ecb8aeea90 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/embur/stripped_log", + "particle": "byg:block/embur/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json new file mode 100644 index 0000000000..88c0f240fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_bottom.json similarity index 68% rename from Common/src/main/resources/assets/byg/models/block/embur_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_bottom.json index a7a6478b42..7704591fde 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "byg:block/embur_trapdoor" + "texture": "byg:block/embur/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_open.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/embur_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_open.json index 2fba7cb870..c3d3806754 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "byg:block/embur_trapdoor" + "texture": "byg:block/embur/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_top.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/embur_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_top.json index 0d4acf9079..942037ab0f 100644 --- a/Common/src/main/resources/assets/byg/models/block/embur_trapdoor_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "byg:block/embur_trapdoor" + "texture": "byg:block/embur/trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/wood.json b/Common/src/generated/resources/assets/byg/models/block/embur/wood.json new file mode 100644 index 0000000000..d7da61160e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/embur/log", + "particle": "byg:block/embur/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json new file mode 100644 index 0000000000..873eb67eea --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/sythian/planks", + "up": "byg:block/sythian/planks", + "north": "byg:block/sythian/bookshelf", + "south": "byg:block/sythian/bookshelf", + "east": "byg:block/sythian/bookshelf", + "west": "byg:block/sythian/bookshelf", + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/button.json b/Common/src/generated/resources/assets/byg/models/block/sythian/button.json new file mode 100644 index 0000000000..91edc42697 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/sythian/button_inventory.json new file mode 100644 index 0000000000..39646f26dd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/sythian/button_pressed.json new file mode 100644 index 0000000000..9e914582f6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json new file mode 100644 index 0000000000..f3d20e2fe1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/sythian/planks", + "up": "byg:block/sythian/crafting_table_top", + "north": "byg:block/sythian/crafting_table_front", + "south": "byg:block/sythian/crafting_table_side", + "east": "byg:block/sythian/crafting_table_side", + "west": "byg:block/sythian/crafting_table_front", + "particle": "byg:block/sythian/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json new file mode 100644 index 0000000000..ae74f92ea0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json new file mode 100644 index 0000000000..99758f4026 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json new file mode 100644 index 0000000000..822f4a0ef2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json new file mode 100644 index 0000000000..1989b45039 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json new file mode 100644 index 0000000000..33e9b4c425 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/sythian/planks", + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate.json new file mode 100644 index 0000000000..603e1f2322 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_open.json new file mode 100644 index 0000000000..66435838c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall.json new file mode 100644 index 0000000000..609935e744 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall_open.json new file mode 100644 index 0000000000..d2de52587b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json new file mode 100644 index 0000000000..8145883256 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/sythian/planks", + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json new file mode 100644 index 0000000000..cbeccf36cc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/sythian/planks", + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/sythian/grower_item.json new file mode 100644 index 0000000000..3b77842552 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/sythian/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json new file mode 100644 index 0000000000..e390a438ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/sythian/leaves", + "up": "byg:block/sythian/leaves", + "north": "byg:block/sythian/leaves", + "south": "byg:block/sythian/leaves", + "east": "byg:block/sythian/leaves", + "west": "byg:block/sythian/leaves", + "particle": "byg:block/sythian/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json new file mode 100644 index 0000000000..925ac5f2d8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/sythian/leaves_snowy", + "up": "byg:block/sythian/leaves_snowy", + "north": "byg:block/sythian/leaves_snowy_side", + "south": "byg:block/sythian/leaves_snowy_side", + "east": "byg:block/sythian/leaves_snowy_side", + "west": "byg:block/sythian/leaves_snowy_side", + "particle": "byg:block/sythian/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/log.json b/Common/src/generated/resources/assets/byg/models/block/sythian/log.json new file mode 100644 index 0000000000..4936558bb9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/sythian/log", + "end": "byg:block/sythian/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json b/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json new file mode 100644 index 0000000000..158a37510f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/sythian/planks", + "up": "byg:block/sythian/planks", + "north": "byg:block/sythian/planks", + "south": "byg:block/sythian/planks", + "east": "byg:block/sythian/planks", + "west": "byg:block/sythian/planks", + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate.json new file mode 100644 index 0000000000..fb20d95b63 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate_down.json new file mode 100644 index 0000000000..f75264820d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json b/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json new file mode 100644 index 0000000000..249aada4e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/sythian/planks", + "bottom": "byg:block/sythian/planks", + "top": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json new file mode 100644 index 0000000000..29399c1788 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/sythian/planks", + "bottom": "byg:block/sythian/planks", + "top": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json new file mode 100644 index 0000000000..fa4819a073 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/sythian/planks", + "bottom": "byg:block/sythian/planks", + "top": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json new file mode 100644 index 0000000000..7ddf7af873 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/sythian/planks", + "bottom": "byg:block/sythian/planks", + "top": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json new file mode 100644 index 0000000000..4654c09375 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/sythian/planks", + "bottom": "byg:block/sythian/planks", + "top": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json new file mode 100644 index 0000000000..959c604bf4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/sythian/stripped_log", + "end": "byg:block/sythian/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_wood.json new file mode 100644 index 0000000000..219d353703 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/sythian/stripped_log", + "particle": "byg:block/sythian/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json new file mode 100644 index 0000000000..77637bc791 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_bottom.json new file mode 100644 index 0000000000..3e5cbc077b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/sythian/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_open.json new file mode 100644 index 0000000000..1bfd80c04b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/sythian/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_top.json new file mode 100644 index 0000000000..b21fc7e49b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/sythian/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/wood.json b/Common/src/generated/resources/assets/byg/models/block/sythian/wood.json new file mode 100644 index 0000000000..3d84c08a08 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/sythian/log", + "particle": "byg:block/sythian/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json new file mode 100644 index 0000000000..a54ca8a48b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_button.json b/Common/src/generated/resources/assets/byg/models/item/embur_button.json new file mode 100644 index 0000000000..465065c89a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json new file mode 100644 index 0000000000..9dd62b0487 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_door.json b/Common/src/generated/resources/assets/byg/models/item/embur_door.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/item/embur_door.json rename to Common/src/generated/resources/assets/byg/models/item/embur_door.json index 294afa7729..274e8e5470 100644 --- a/Common/src/main/resources/assets/byg/models/item/embur_door.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/embur_door" + "layer0": "byg:item/embur/door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fence.json b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json new file mode 100644 index 0000000000..acf3a38d69 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fungus.json b/Common/src/generated/resources/assets/byg/models/item/embur_fungus.json new file mode 100644 index 0000000000..5bfaae422e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fungus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/embur/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json new file mode 100644 index 0000000000..69c7389da6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json b/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json new file mode 100644 index 0000000000..dd9e5d79f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_planks.json b/Common/src/generated/resources/assets/byg/models/item/embur_planks.json new file mode 100644 index 0000000000..1000802d14 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json new file mode 100644 index 0000000000..3de996a694 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_slab.json b/Common/src/generated/resources/assets/byg/models/item/embur_slab.json new file mode 100644 index 0000000000..c4cf159915 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json b/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json new file mode 100644 index 0000000000..35746e5f55 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json new file mode 100644 index 0000000000..080c3176dd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json new file mode 100644 index 0000000000..fef57e4d2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json new file mode 100644 index 0000000000..10308970ff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json new file mode 100644 index 0000000000..d4246b6a83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json new file mode 100644 index 0000000000..03281e846a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_button.json b/Common/src/generated/resources/assets/byg/models/item/sythian_button.json new file mode 100644 index 0000000000..d71728176b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json new file mode 100644 index 0000000000..4f571a9696 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_door.json b/Common/src/generated/resources/assets/byg/models/item/sythian_door.json new file mode 100644 index 0000000000..8a63d3841d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/sythian/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json new file mode 100644 index 0000000000..91c6c85f64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fungus.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fungus.json new file mode 100644 index 0000000000..8aae928776 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fungus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/sythian/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json new file mode 100644 index 0000000000..2067d49dc8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json b/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json new file mode 100644 index 0000000000..02261b7a60 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json new file mode 100644 index 0000000000..5c892ee155 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json b/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json new file mode 100644 index 0000000000..b62a0efdf7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json b/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json new file mode 100644 index 0000000000..52f191196a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json b/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json new file mode 100644 index 0000000000..7f0ac72f28 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json b/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json new file mode 100644 index 0000000000..59fcfb23c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json new file mode 100644 index 0000000000..481445003c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json new file mode 100644 index 0000000000..6540dbec59 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json new file mode 100644 index 0000000000..882e1ed12b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json new file mode 100644 index 0000000000..e9e14556cf --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json new file mode 100644 index 0000000000..891c36225a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json new file mode 100644 index 0000000000..9f9b46ce06 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json new file mode 100644 index 0000000000..33a6d3a9ce --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/embur_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json new file mode 100644 index 0000000000..07446ffbec --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json new file mode 100644 index 0000000000..c2409f9007 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json new file mode 100644 index 0000000000..dbefa75032 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json new file mode 100644 index 0000000000..2bbcc9c83e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json new file mode 100644 index 0000000000..388d22e26c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_pedu" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json new file mode 100644 index 0000000000..59c131ea52 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json new file mode 100644 index 0000000000..07165667b3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json new file mode 100644 index 0000000000..bc2a1b13a0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json new file mode 100644 index 0000000000..09e2f93e82 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json new file mode 100644 index 0000000000..14643a10e2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json new file mode 100644 index 0000000000..9caeb88b88 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json new file mode 100644 index 0000000000..6492cc42dd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/sythian_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json new file mode 100644 index 0000000000..912d45a1c9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json new file mode 100644 index 0000000000..d03804886f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json new file mode 100644 index 0000000000..84e953cea4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json new file mode 100644 index 0000000000..275f296b35 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json new file mode 100644 index 0000000000..412dd2b325 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_stem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/embur_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/embur_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json index e26ee66e3d..e126ea598e 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/embur_button.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/embur_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/button.json diff --git a/Common/src/main/resources/data/byg/recipes/embur_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/embur_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json index 4ea568c02d..6ad103ea61 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/embur_door.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/embur_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/door.json index c25dca229c..38946c373d 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/embur_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/embur_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/embur_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/embur_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/embur_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/embur_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json index 1bc1ee718f..4175a2b2cf 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:embur_pedus" + "tag": "byg:wood/embur_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/embur_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/embur_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json index 3f12aa711c..747e408297 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/embur_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/embur_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json index 96b350bc13..ca9776171d 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/embur_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/embur_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json index 1cf4f8a65d..30b67c3cf7 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, "result": { - "item": "byg:embur_stairs", + "item": "byg:embur_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/embur_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/embur_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json index e9ae38f698..30dd0f3be3 100644 --- a/Common/src/main/resources/data/byg/recipes/embur_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:embur_planks" } }, diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json new file mode 100644 index 0000000000..3ae0fdaed4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:embur_pedu" + } + }, + "result": { + "item": "byg:embur_hyphae", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json new file mode 100644 index 0000000000..62e15ece01 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:sythian_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/button.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/button.json new file mode 100644 index 0000000000..57955c177c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/button.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "byg:sythian_planks" + } + ], + "result": { + "item": "byg:sythian_button" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json new file mode 100644 index 0000000000..5bb2b10233 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "crafting_table", + "pattern": [ + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_crafting_table" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json new file mode 100644 index 0000000000..7c82bde292 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_door", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_door", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json new file mode 100644 index 0000000000..987defa062 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json new file mode 100644 index 0000000000..d1e1fb446b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_fence_gate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json new file mode 100644 index 0000000000..0e576ad281 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "wooden_planks", + "ingredients": [ + { + "tag": "byg:wood/sythian_logs" + } + ], + "result": { + "item": "byg:sythian_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json new file mode 100644 index 0000000000..403b590379 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "PP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_pressure_plate" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json new file mode 100644 index 0000000000..a263d5e56b --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "PPP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json new file mode 100644 index 0000000000..e382234cf1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "P ", + "PP ", + "PPP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_slab", + "count": 4 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json new file mode 100644 index 0000000000..d3ce47e6f9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "PPP", + "PPP" + ], + "key": { + "P": { + "item": "byg:sythian_planks" + } + }, + "result": { + "item": "byg:sythian_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json new file mode 100644 index 0000000000..e0c5cf4c0c --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wood", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "byg:sythian_stem" + } + }, + "result": { + "item": "byg:sythian_hyphae", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json new file mode 100644 index 0000000000..73f0ef2813 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:embur_hyphae", + "byg:embur_pedu", + "byg:stripped_embur_hyphae", + "byg:stripped_embur_pedu" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json new file mode 100644 index 0000000000..00ce3fdb37 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:stripped_sythian_hyphae", + "byg:stripped_sythian_stem", + "byg:sythian_hyphae", + "byg:sythian_stem" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json new file mode 100644 index 0000000000..ddc29c759a --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:embur_pedu", + "byg:stripped_embur_pedu", + "byg:embur_hyphae", + "byg:stripped_embur_hyphae" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json new file mode 100644 index 0000000000..2ae61d6aa6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:sythian_stem", + "byg:stripped_sythian_stem", + "byg:sythian_hyphae", + "byg:stripped_sythian_hyphae" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 98a6cc26b4..da1f3f162f 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -45,7 +45,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.TALL_ALLIUM.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_ROOTS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.TALL_EMBUR_ROOTS.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.EMBUR_WART.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.EMBUR_GEL_BLOCK.get(), RenderType.translucent()); map.put(BYGBlocks.EMBUR_GEL_VINES.get(), RenderType.translucent()); map.put(BYGBlocks.EMBUR_GEL_VINES_PLANT.get(), RenderType.translucent()); @@ -86,14 +85,12 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WARPED_CORAL.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WARPED_CORAL_WALL_FAN.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.SYTHIAN_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SYTHIAN_ROOTS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SYTHIAN_SPROUT.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SYTHIAN_STALK_BLOCK.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SYTHIAN_NYLIUM.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.HANGING_SYTHIAN_ROOTS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.HANGING_SYTHIAN_ROOTS_PLANT.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.SYTHIAN_FUNGUS.get(), RenderType.cutoutMipped()); //End map.put(BYGBlocks.IVIS_ROOTS.get(), RenderType.cutoutMipped()); @@ -142,8 +139,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.SYTHIAN_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.EMBUR_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_DOOR.get(), RenderType.cutoutMipped()); @@ -151,8 +146,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.SYTHIAN_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.EMBUR_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.NIGHTSHADE_TRAPDOOR.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index cf08d6868e..fd266c98c1 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -163,7 +163,6 @@ public static void compostablesBYG() { compostibleBlocks(0.85f, BYGItems.SOUL_SHROOM_BLOCK.get()); compostibleBlocks(0.85f, BYGItems.DEATH_CAP_MUSHROOM_BLOCK.get()); compostibleBlocks(0.85f, BYGItems.SHULKREN_WART_BLOCK.get()); - compostibleBlocks(0.85f, BYGItems.SYTHIAN_WART_BLOCK.get()); compostibleBlocks(0.85f, BYGItems.PURPLE_SHROOMLIGHT.get()); compostibleBlocks(0.85f, BYGItems.PURPLE_BULBIS_SHELL.get()); compostibleBlocks(0.85f, BYGItems.BULBIS_SHELL.get()); @@ -182,12 +181,9 @@ public static void compostablesBYG() { compostibleBlocks(0.65f, BYGItems.BLUE_BERRY.get()); compostibleBlocks(0.65f, BYGItems.BLUEBERRY_PIE.get()); compostibleBlocks(0.65f, BYGItems.SHULKREN_FUNGUS.get()); - compostibleBlocks(0.65f, BYGItems.SYTHIAN_FUNGUS.get()); - compostibleBlocks(0.65f, BYGItems.EMBUR_WART.get()); compostibleBlocks(0.65f, BYGItems.DEATH_CAP.get()); compostibleBlocks(0.65f, BYGItems.SOUL_SHROOM.get()); compostibleBlocks(0.65f, BYGItems.BAOBAB_FRUIT.get()); - compostibleBlocks(0.65f, BYGWoodTypes.BULBIS.growerItem()); compostibleBlocks(0.65f, BYGItems.PURPLE_BULBIS_ODDITY.get()); //Plants diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 9efe85070a..d402d94c77 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -28,22 +28,18 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); stripables.put(BYGBlocks.SKYRIS_LOG.get(), BYGBlocks.STRIPPED_SKYRIS_LOG.get()); - stripables.put(BYGBlocks.SYTHIAN_STEM.get(), BYGBlocks.STRIPPED_SYTHIAN_STEM.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); - stripables.put(BYGBlocks.EMBUR_PEDU.get(), BYGBlocks.STRIPPED_EMBUR_PEDU.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); stripables.put(BYGBlocks.SKYRIS_WOOD.get(), BYGBlocks.STRIPPED_SKYRIS_WOOD.get()); - stripables.put(BYGBlocks.SYTHIAN_HYPHAE.get(), BYGBlocks.STRIPPED_SYTHIAN_HYPHAE.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); - stripables.put(BYGBlocks.EMBUR_HYPHAE.get(), BYGBlocks.STRIPPED_EMBUR_HYPHAE.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); AxeItemAccess.byg_setStripables(stripables); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 6915ff70c3..9fdd3b83ce 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -65,104 +65,78 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); - public static final BlockRegistryObject SYTHIAN_PLANKS = createPlanks("sythian_planks"); - public static final BlockRegistryObject EMBUR_PLANKS = createPlanks("embur_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); - public static final BlockRegistryObject SYTHIAN_BOOKSHELF = createBookshelf("sythian_bookshelf"); - public static final BlockRegistryObject EMBUR_BOOKSHELF = createBookshelf("embur_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); - public static final BlockRegistryObject SYTHIAN_DOOR = createDoor("sythian_door"); - public static final BlockRegistryObject EMBUR_DOOR = createDoor("embur_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); - public static final BlockRegistryObject SYTHIAN_PRESSURE_PLATE = createWoodPressurePlate("sythian_pressure_plate"); - public static final BlockRegistryObject EMBUR_PRESSURE_PLATE = createWoodPressurePlate("embur_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); - public static final BlockRegistryObject SYTHIAN_BUTTON = createWoodButton("sythian_button"); - public static final BlockRegistryObject EMBUR_BUTTON = createWoodButton("embur_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); - public static final BlockRegistryObject SYTHIAN_TRAPDOOR = createTrapDoor("sythian_trapdoor"); - public static final BlockRegistryObject EMBUR_TRAPDOOR = createTrapDoor("embur_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); - public static final BlockRegistryObject SYTHIAN_CRAFTING_TABLE = createCraftingTable("sythian_crafting_table"); - public static final BlockRegistryObject EMBUR_CRAFTING_TABLE = createCraftingTable("embur_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); - public static final BlockRegistryObject SYTHIAN_FENCE_GATE = createFenceGate("sythian_fence_gate"); - public static final BlockRegistryObject EMBUR_FENCE_GATE = createFenceGate("embur_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); - public static final BlockRegistryObject SYTHIAN_SLAB = createWoodSlab("sythian_slab"); - public static final BlockRegistryObject EMBUR_SLAB = createWoodSlab("embur_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); - public static final BlockRegistryObject SYTHIAN_STAIRS = createWoodStairs("sythian_stairs"); - public static final BlockRegistryObject EMBUR_STAIRS = createWoodStairs("embur_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); - public static final BlockRegistryObject SYTHIAN_FENCE = createFence("sythian_fence"); - public static final BlockRegistryObject EMBUR_FENCE = createFence("embur_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject SYTHIAN_SIGN = createSign("sythian_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); - public static final BlockRegistryObject EMBUR_SIGN = createSign("embur_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); - public static final BlockRegistryObject SYTHIAN_WALL_SIGN = createWallSign("sythian_wall_sign", BYGWoodType.SYTHIAN, SYTHIAN_PLANKS); - public static final BlockRegistryObject EMBUR_WALL_SIGN = createWallSign("embur_wall_sign", BYGWoodType.EMBUR, EMBUR_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); @@ -331,12 +305,10 @@ public class BYGBlocks { public static final BlockRegistryObject WARPED_SOUL_SAND = createBlock(BYGBlockProperties.BYGNyliumSoulSand::new, "warped_soul_sand"); public static final BlockRegistryObject WARPED_SOUL_SOIL = createBlock(BYGBlockProperties.BYGNyliumSoulSoil::new, "warped_soul_soil"); - public static final BlockRegistryObject SYTHIAN_WART_BLOCK = createBlock(BYGBlockProperties.BYGWartBlock::new, "sythian_wart_block"); public static final BlockRegistryObject SYTHIAN_ROOTS = createBlock(BYGBlockProperties.SythianPlant::new, "sythian_roots"); public static final BlockRegistryObject SYTHIAN_SPROUT = createBlock(BYGBlockProperties.SythianPlant::new, "sythian_sprout"); public static final BlockRegistryObject SYTHIAN_STALK_BLOCK = createBlock(BYGBlockProperties.SythianStalk::new, "sythian_stalk_block"); public static final BlockRegistryObject SYTHIAN_SCAFFOLDING = createBlock(BYGBlockProperties.BYGScaffolding::new, "sythian_scaffolding"); - public static final BlockRegistryObject SYTHIAN_SAPLING = createBlock(BYGBlockProperties.SythianSapling::new, "sythian_sapling"); public static final BlockRegistryObject HANGING_SYTHIAN_ROOTS = createBlock(BYGBlockProperties.BYGSythianHangingRoots::new, "hanging_sythian_roots"); public static final BlockRegistryObject HANGING_SYTHIAN_ROOTS_PLANT = createBlock(BYGBlockProperties.BYGSythianHangingRootsPlant::new, "hanging_sythian_roots_plant"); @@ -349,7 +321,6 @@ public class BYGBlocks { public static final BlockRegistryObject EMBUR_SPROUTS = createBlock(() -> new NetherSproutsBlock(BlockBehaviour.Properties.of(Material.REPLACEABLE_FIREPROOF_PLANT, MaterialColor.COLOR_CYAN).noCollission().instabreak().sound(SoundType.NETHER_SPROUTS)), "embur_sprouts"); public static final BlockRegistryObject EMBUR_ROOTS = createBlock(BYGBlockProperties.BYGEmburPlant::new, "embur_roots"); - public static final BlockRegistryObject EMBUR_WART = createFungus(BYGBlockTags.GROUND_EMBUR_WART, "embur_wart"); public static final BlockRegistryObject TALL_EMBUR_ROOTS = createBlock(BYGBlockProperties.BYGDoubleNetherPlant::new, "tall_embur_roots"); public static final BlockRegistryObject BLUE_NETHERRACK = createNetherStone(MaterialColor.TERRACOTTA_BLUE, "blue_netherrack"); @@ -537,8 +508,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); - public static final BlockRegistryObject SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "sythian_stem"); - public static final BlockRegistryObject EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "embur_pedu"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); @@ -550,8 +519,6 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); - public static final BlockRegistryObject SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "sythian_hyphae"); - public static final BlockRegistryObject EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "embur_hyphae"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); @@ -562,7 +529,6 @@ public class BYGBlocks { public static final BlockRegistryObject WOOD_BLEWIT = createMushroom(BYGBlockTags.GROUND_WOOD_BLEWIT, "wood_blewit"); public static final BlockRegistryObject GREEN_MUSHROOM = createMushroom(BYGBlockTags.GROUND_GREEN_MUSHROOM, "green_mushroom"); - public static final BlockRegistryObject SYTHIAN_FUNGUS = createFungus(BYGBlockTags.GROUND_SYTHIAN_FUNGUS, "sythian_fungus"); public static final BlockRegistryObject SOUL_SHROOM = createFungus(BYGBlockTags.GROUND_SOUL_SHROOM, "soul_shroom"); public static final BlockRegistryObject DEATH_CAP = createFungus(BYGBlockTags.GROUND_DEATH_CAP, "death_cap"); @@ -686,8 +652,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); - public static final BlockRegistryObject STRIPPED_SYTHIAN_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_sythian_stem"); - public static final BlockRegistryObject STRIPPED_EMBUR_PEDU = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_embur_pedu"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); @@ -695,8 +659,6 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); - public static final BlockRegistryObject STRIPPED_SYTHIAN_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_sythian_hyphae"); - public static final BlockRegistryObject STRIPPED_EMBUR_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_embur_hyphae"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); public static final BlockRegistryObject STRIPPED_NIGHTSHADE_WOOD = createWood("stripped_nightshade_wood"); @@ -1155,7 +1117,7 @@ static BlockRegistryObject createMushroom(TagKey blockTagKey, Stri return createPottedBlock(() -> new BYGMushroomBlock(BlockBehaviour.Properties.copy(Blocks.RED_MUSHROOM), blockTagKey), id); } - private static BlockRegistryObject createFungus(TagKey blockTagKey, String id) { + static BlockRegistryObject createFungus(TagKey blockTagKey, String id) { return createPottedBlock(() -> new BYGFungusBlock(BlockBehaviour.Properties.copy(Blocks.WARPED_FUNGUS), blockTagKey), id); } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index 5e29e17282..e31f04cb21 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -12,7 +12,6 @@ public class BYGWoodType { public static final WoodType JACARANDA = register("jacaranda"); public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); - public static final WoodType EMBUR = register("embur"); public static final WoodType LAMENT = register("lament"); public static final WoodType NIGHTSHADE = register("nightshade"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 29f3cfdccc..b5552852ac 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -123,6 +123,13 @@ public enum BYGWoodTypes { SYTHIAN("sythian", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_SYTHIAN_FUNGUS) .growerItem(GrowerItemType.FUNGUS) + .nether()), + EMBUR("embur", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_EMBUR_WART) + .growerItem(GrowerItemType.FUNGUS) + .exclude(BlockType.LEAVES) + .registryName(BlockType.LOG, "%s_pedu") + .registryName(BlockType.STRIPPED_LOG, "stripped_%s_pedu") .nether()); public static final Map LOOKUP; @@ -182,8 +189,9 @@ public void init() { this.growerItem = switch (builder.growerItemType) { case SAPLING -> BYGBlocks.createSapling(builder.growerItemGroundTag, name + "_sapling"); case ODDITY -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_oddity"); - case FUNGUS -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_fungus"); + case FUNGUS -> BYGBlocks.createFungus(builder.growerItemGroundTag, name + "_fungus"); case MUSHROOM -> BYGBlocks.createMushroom(builder.growerItemGroundTag, name + "_mushroom"); + case WART -> BYGBlocks.createFungus(builder.growerItemGroundTag, name + "_wart"); }; BYGItems.createGrowerItem(growerItem, builder.growerItemType == GrowerItemType.SAPLING); } @@ -347,7 +355,8 @@ public enum GrowerItemType { SAPLING, ODDITY, FUNGUS, - MUSHROOM + MUSHROOM, + WART } public enum BlockType { diff --git a/Common/src/main/java/potionstudios/byg/common/block/nether/sythian/SythianStalkBlock.java b/Common/src/main/java/potionstudios/byg/common/block/nether/sythian/SythianStalkBlock.java index 56828863d4..e29e00032f 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/nether/sythian/SythianStalkBlock.java +++ b/Common/src/main/java/potionstudios/byg/common/block/nether/sythian/SythianStalkBlock.java @@ -13,6 +13,7 @@ import net.minecraft.world.level.block.state.properties.BambooLeaves; import net.minecraft.world.level.material.FluidState; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import javax.annotation.Nullable; import java.util.Random; @@ -34,13 +35,13 @@ public BlockState getStateForPlacement(BlockPlaceContext ctx) { BlockState blockStateDOWN = ctx.getLevel().getBlockState(ctx.getClickedPos().below()); if (blockStateDOWN.getBlock() == BYGBlocks.SYTHIAN_NYLIUM.get()) { Block blockDOWN = blockStateDOWN.getBlock(); - if (blockDOWN == BYGBlocks.SYTHIAN_SAPLING.get()) { + if (blockDOWN == BYGWoodTypes.SYTHIAN.growerItem().get()) { return this.defaultBlockState().setValue(AGE, 0); } else if (blockDOWN == this) { int getPropertyAge = blockStateDOWN.getValue(AGE) > 0 ? 1 : 0; return this.defaultBlockState().setValue(AGE, getPropertyAge); } else { - return BYGBlocks.SYTHIAN_SAPLING.defaultBlockState(); + return BYGWoodTypes.SYTHIAN.growerItem().defaultBlockState(); } } else { return null; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java index 92f42c6a02..ae3811f94b 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerTrades.java @@ -37,7 +37,7 @@ public class BYGVillagerTrades { new VillagerTrades.ItemsForEmeralds(BYGItems.WHITE_PUFFBALL_SPORES.get(), 4, 5, 4, 2), new VillagerTrades.EmeraldForItems(Items.CRIMSON_FUNGUS, 10, 12, 2), new VillagerTrades.EmeraldForItems(Items.WARPED_FUNGUS, 10, 12, 2), - new VillagerTrades.EmeraldForItems(BYGItems.SYTHIAN_FUNGUS.get(), 10, 12, 2), + new VillagerTrades.EmeraldForItems(BYGWoodTypes.SYTHIAN.growerItem().get(), 10, 12, 2), }, 4, new VillagerTrades.ItemListing[]{ new VillagerTrades.ItemsForEmeralds(BYGItems.WITCH_HAZEL_BRANCH.get(), 4, 9, 4, 2), diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 378098b301..93e37d1d58 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -421,9 +421,14 @@ public class BYGItems { //Witch-Hazel Woodtype public static final RegistryObject WITCH_HAZEL_BLOSSOM; public static final RegistryObject WITCH_HAZEL_BRANCH; - public static final RegistryObject BLOOMING_WITCH_HAZEL_LEAVES; + //Embur Woodtype + public static final RegistryObject EMBUR_GEL_BALL = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), "embur_gel_ball"); + public static final RegistryObject EMBUR_GEL_BLOCK = createItem(BYGBlocks.EMBUR_GEL_BLOCK); + public static final RegistryObject EMBUR_GEL_BRANCH = createItem(BYGBlocks.EMBUR_GEL_BRANCH); + public static final RegistryObject EMBUR_GEL_VINES = createItem(BYGBlocks.EMBUR_GEL_VINES); + static { BYGWoodTypes.ASPEN.init(); @@ -490,31 +495,9 @@ public class BYGItems { BYGWoodTypes.ZELKOVA.init(); BYGWoodTypes.SYTHIAN.init(); + BYGWoodTypes.EMBUR.init(); } - //Embur Woodtype - public static final RegistryObject EMBUR_GEL_BALL = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), "embur_gel_ball"); - public static final RegistryObject EMBUR_GEL_BLOCK = createItem(BYGBlocks.EMBUR_GEL_BLOCK); - public static final RegistryObject EMBUR_GEL_BRANCH = createItem(BYGBlocks.EMBUR_GEL_BRANCH); - public static final RegistryObject EMBUR_GEL_VINES = createItem(BYGBlocks.EMBUR_GEL_VINES); - public static final RegistryObject EMBUR_WART = createGrowerItem(BYGBlocks.EMBUR_WART); - public static final RegistryObject EMBUR_PEDU = createItem(BYGBlocks.EMBUR_PEDU); - public static final RegistryObject EMBUR_HYPHAE = createItem(BYGBlocks.EMBUR_HYPHAE); - public static final RegistryObject STRIPPED_EMBUR_PEDU = createItem(BYGBlocks.STRIPPED_EMBUR_PEDU); - public static final RegistryObject STRIPPED_EMBUR_HYPHAE = createItem(BYGBlocks.STRIPPED_EMBUR_HYPHAE); - public static final RegistryObject EMBUR_PLANKS = createItem(BYGBlocks.EMBUR_PLANKS); - public static final RegistryObject EMBUR_BOOKSHELF = createItem(BYGBlocks.EMBUR_BOOKSHELF); - public static final RegistryObject EMBUR_CRAFTING_TABLE = createItem(BYGBlocks.EMBUR_CRAFTING_TABLE); - public static final RegistryObject EMBUR_STAIRS = createItem(BYGBlocks.EMBUR_STAIRS); - public static final RegistryObject EMBUR_SLAB = createItem(BYGBlocks.EMBUR_SLAB); - public static final RegistryObject EMBUR_FENCE = createItem(BYGBlocks.EMBUR_FENCE); - public static final RegistryObject EMBUR_FENCE_GATE = createItem(BYGBlocks.EMBUR_FENCE_GATE); - public static final RegistryObject EMBUR_DOOR = createItem(BYGBlocks.EMBUR_DOOR); - public static final RegistryObject EMBUR_TRAPDOOR = createItem(BYGBlocks.EMBUR_TRAPDOOR); - public static final RegistryObject EMBUR_PRESSURE_PLATE = createItem(BYGBlocks.EMBUR_PRESSURE_PLATE); - public static final RegistryObject EMBUR_BUTTON = createItem(BYGBlocks.EMBUR_BUTTON); - public static final RegistryObject EMBUR_SIGN = createSign("embur_sign", BYGBlocks.EMBUR_SIGN, BYGBlocks.EMBUR_WALL_SIGN); - //SaplingItems public static final RegistryObject WITHERING_OAK_SAPLING = createItem(BYGBlocks.WITHERING_OAK_SAPLING); public static final RegistryObject WITHERING_OAK_LEAVES = createItem(BYGBlocks.WITHERING_OAK_LEAVES); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherFeatures.java index b7c3929d07..ba411eb0d1 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherFeatures.java @@ -21,6 +21,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.BYGTreeConfig; import potionstudios.byg.common.world.feature.config.HangingColumnWithBaseConfig; @@ -67,7 +68,7 @@ public class BYGNetherFeatures { public static final Holder> FROST_MAGMA_PILLARS = createConfiguredFeature("frost_magma_pillars", BYGFeatures.PILLARS, (new SimpleBlockProviderConfig(BlockStateProvider.simple(BYGBlocks.FROST_MAGMA.defaultBlockState())))); public static final Holder> MAGMA_PILLARS = createConfiguredFeature("magma_pillars", BYGFeatures.PILLARS, (new SimpleBlockProviderConfig(BlockStateProvider.simple(BYGBlocks.MAGMATIC_STONE.defaultBlockState())))); public static final Holder> HANGING_LANTERNS = createConfiguredFeature("hanging_lanterns", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(BYGBlocks.SCORIA_STONE.get()).setBlock(Blocks.CAVE_AIR.defaultBlockState()).setEndBlock(BYGBlocks.WAILING_BELL_BLOSSOM.defaultBlockState()).setMinLength(1).setMaxLength(4).setWhitelist(ImmutableList.of(BYGBlocks.SCORIA_STONE.get())).build()); - public static final Holder> SYTHIAN_FUNGUS_PILLARS = createConfiguredFeature("sythian_fungus_pillars", BYGFeatures.PILLARS, new SimpleBlockProviderConfig(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BYGBlocks.SYTHIAN_HYPHAE.defaultBlockState(), 9).add(BYGBlocks.SYTHIAN_HYPHAE.defaultBlockState(), 1)))); + public static final Holder> SYTHIAN_FUNGUS_PILLARS = createConfiguredFeature("sythian_fungus_pillars", BYGFeatures.PILLARS, new SimpleBlockProviderConfig(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(BYGWoodTypes.SYTHIAN.wood().defaultBlockState(), 9).add(BYGWoodTypes.SYTHIAN.wood().defaultBlockState(), 1)))); public static final Holder> HANGING_CHAINS = createConfiguredFeature("hanging_chains", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(BYGBlocks.SCORIA_STONE.get()).setBlock(Blocks.CHAIN.defaultBlockState()).setEndBlock(Blocks.CHAIN.defaultBlockState()).setMinLength(8).setMaxLength(16).setWhitelist(ImmutableList.of(BYGBlocks.SCORIA_STONE.get())).build()); public static final Holder> SUBZERO_ASHES = createConfiguredFeature("subzero_ashes", () -> Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(SUBZERO_ASH), 0.6F)), diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java index be4dd21440..2877f5c14e 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java @@ -17,6 +17,7 @@ import net.minecraft.world.level.levelgen.placement.BlockPredicateFilter; import potionstudios.byg.BYGConstants; import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.*; import potionstudios.byg.common.world.feature.features.BYGFeaturesUtil; @@ -32,11 +33,11 @@ public class BYGNetherVegetationFeatures { public static final Holder> EMBUR_ROOTS = createPatchConfiguredFeature("embur_roots", BYGBlocks.EMBUR_ROOTS.get(), 15); public static final Holder> TALL_EMBUR_ROOTS = createPatchConfiguredFeature("tall_embur_roots", BYGBlocks.TALL_EMBUR_ROOTS.get(), 15); - public static final Holder> EMBUR_WART = createPatchConfiguredFeature("embur_wart", BYGBlocks.EMBUR_WART.get(), 15); + public static final Holder> EMBUR_WART = createPatchConfiguredFeature("embur_wart", BYGWoodTypes.EMBUR.growerItem().get(), 15); public static final Holder> EMBUR_SPROUT = createPatchConfiguredFeature("embur_sprout", BYGBlocks.EMBUR_SPROUTS.get(), 15); public static final Holder> SYTHIAN_ROOTS = createPatchConfiguredFeature("sythian_roots", BYGBlocks.SYTHIAN_ROOTS.get(), 15); public static final Holder> SYTHIAN_SPROUT = createPatchConfiguredFeature("sythian_sprout", BYGBlocks.SYTHIAN_SPROUT.get(), 15); - public static final Holder> SYTHIAN_FUNGUS = createPatchConfiguredFeature("sythian_fungus", BYGBlocks.SYTHIAN_FUNGUS.get(), 15); + public static final Holder> SYTHIAN_FUNGUS = createPatchConfiguredFeature("sythian_fungus", BYGWoodTypes.SYTHIAN.growerItem().get(), 15); public static final Holder> WARPED_CACTI = createConfiguredFeature("warped_cacti", Feature.RANDOM_PATCH, FeatureUtils.simpleRandomPatchConfiguration(15, createPlacedFeature(BYGFeaturesUtil.createConfiguredFeature(Feature.BLOCK_COLUMN, BlockColumnConfiguration.simple(UniformInt.of(1, 3), BlockStateProvider.simple(BYGBlocks.WARPED_CACTUS.get()))), BlockPredicateFilter.forPredicate(BlockPredicate.allOf(BlockPredicate.ONLY_IN_AIR_PREDICATE, BlockPredicate.wouldSurvive(BYGBlocks.WARPED_CACTUS.defaultBlockState(), BlockPos.ZERO)))))); public static final Holder> WARPED_BUSH = createPatchConfiguredFeature("warped_bush", BYGBlocks.WARPED_BUSH.get(), 15); public static final Holder> WARPED_CORAL = createPatchConfiguredFeature("warped_coral", BYGBlocks.WARPED_CORAL.get(), 15); @@ -59,7 +60,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> CHAINS = createConfiguredFeatureSup("chains", BYGFeatures.CHAIN, new ChainConfig.Builder().setMinLength(6).setMaxLength(10).setXAxisBlock(Blocks.POLISHED_BLACKSTONE_BRICKS).setZAxisBlock(Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS).setWhitelist(ImmutableList.of(BYGBlocks.SCORIA_STONE.get())).build()); public static final Holder> HANGING_SOUL_SHROOM_SPORES = createConfiguredFeatureSup("hanging_soul_shroom_spores", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(BYGBlocks.SOUL_SHROOM_BLOCK.get()).setBlock(BYGBlocks.SOUL_SHROOM_SPORE.get()).setEndBlock(BYGBlocks.SOUL_SHROOM_SPORE_END.defaultBlockState().setValue(GrowingPlantHeadBlock.AGE, 23)).setMinLength(1).setMaxLength(8).setWhitelist(ImmutableList.of(Blocks.SOUL_SOIL, Blocks.SOUL_SAND, BYGBlocks.WARPED_SOUL_SAND.get(), BYGBlocks.WARPED_SOUL_SAND.get())).build()); - public static final Holder> HANGING_SYTHIAN_ROOTS = createConfiguredFeatureSup("hanging_sythian_roots", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(BYGBlocks.SYTHIAN_WART_BLOCK.get()).setBlock(BYGBlocks.HANGING_SYTHIAN_ROOTS_PLANT.defaultBlockState()).setEndBlock(BYGBlocks.HANGING_SYTHIAN_ROOTS.defaultBlockState().setValue(GrowingPlantHeadBlock.AGE, 23)).setMinLength(1).setMaxLength(8).setWhitelist(ImmutableList.of(Blocks.NETHERRACK, BYGBlocks.SYTHIAN_WART_BLOCK.get())).build()); + public static final Holder> HANGING_SYTHIAN_ROOTS = createConfiguredFeatureSup("hanging_sythian_roots", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(BYGWoodTypes.SYTHIAN.leaves().get()).setBlock(BYGBlocks.HANGING_SYTHIAN_ROOTS_PLANT.defaultBlockState()).setEndBlock(BYGBlocks.HANGING_SYTHIAN_ROOTS.defaultBlockState().setValue(GrowingPlantHeadBlock.AGE, 23)).setMinLength(1).setMaxLength(8).setWhitelist(ImmutableList.of(Blocks.NETHERRACK, BYGWoodTypes.SYTHIAN.leaves().get())).build()); public static final Holder> HANGING_BONES = createConfiguredFeatureSup("hanging_bones", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(Blocks.BONE_BLOCK).setBlock(BYGBlocks.HANGING_BONE.get()).setMinLength(1).setMaxLength(8).setWhitelist(ImmutableList.of(BYGBlocks.QUARTZITE_SAND.get(), Blocks.BONE_BLOCK)).build()); public static final Holder> LAMENT_VINE_FEATURE = createConfiguredFeatureSup("lament_vine", BYGFeatures.HANGING_FEATURE, new HangingColumnWithBaseConfig.Builder().setBaseBlock(Blocks.NETHERRACK).setBlock(BYGBlocks.LAMENT_VINE_PLANT.get()).setEndBlock(BYGBlocks.LAMENT_VINE.defaultBlockState().setValue(GrowingPlantHeadBlock.AGE, 23)).setMinLength(1).setMaxLength(8).setWhitelist(ImmutableList.of(Blocks.NETHERRACK)).build()); public static final Holder> SYTHIAN_STALK = createConfiguredFeatureSup("sythian_stalk", BYGFeatures.SYTHIAN_STALK, new ProbabilityFeatureConfiguration(0.9F)); @@ -73,7 +74,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> EMBUR_MUSHROOM = createConfiguredFeatureSup("embur_mushroom1", BYGFeatures.EMBUR_MUSHROOM, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.EMBUR_PEDU.get()) + .setStemBlock(BYGWoodTypes.EMBUR.log().get()) .setMushroomBlock(BYGBlocks.EMBUR_GEL_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -82,7 +83,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> EMBUR_MUSHROOM2 = createConfiguredFeatureSup("embur_mushroom2", BYGFeatures.EMBUR_MUSHROOM2, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.EMBUR_PEDU.get()) + .setStemBlock(BYGWoodTypes.EMBUR.log().get()) .setMushroomBlock(BYGBlocks.EMBUR_GEL_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -91,7 +92,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> EMBUR_MUSHROOM3 = createConfiguredFeatureSup("embur_mushroom3", BYGFeatures.EMBUR_MUSHROOM3, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.EMBUR_PEDU.get()) + .setStemBlock(BYGWoodTypes.EMBUR.log().get()) .setMushroomBlock(BYGBlocks.EMBUR_GEL_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -100,7 +101,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> EMBUR_MUSHROOM4 = createConfiguredFeatureSup("embur_mushroom4", BYGFeatures.EMBUR_MUSHROOM4, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.EMBUR_PEDU.get()) + .setStemBlock(BYGWoodTypes.EMBUR.log().get()) .setMushroomBlock(BYGBlocks.EMBUR_GEL_BLOCK.get()) .setMinHeight(6) .setMaxHeight(12) @@ -148,8 +149,8 @@ public class BYGNetherVegetationFeatures { public static final Holder> SYTHIAN_FUNGUS_TREE1 = createConfiguredFeatureSup("sythian_fungus_tree1", BYGFeatures.SYTHIAN_FUNGUS_TREE1, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.SYTHIAN_STEM.get()) - .setMushroomBlock(BYGBlocks.SYTHIAN_WART_BLOCK.get()) + .setStemBlock(BYGWoodTypes.SYTHIAN.log().get()) + .setMushroomBlock(BYGWoodTypes.SYTHIAN.leaves().get()) .setMinHeight(6) .setMaxHeight(12) .build() @@ -157,8 +158,8 @@ public class BYGNetherVegetationFeatures { public static final Holder> SYTHIAN_FUNGUS_TREE2 = createConfiguredFeatureSup("sythian_fungus_tree2", BYGFeatures.SYTHIAN_FUNGUS_TREE2, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.SYTHIAN_STEM.get()) - .setMushroomBlock(BYGBlocks.SYTHIAN_WART_BLOCK.get()) + .setStemBlock(BYGWoodTypes.SYTHIAN.log().get()) + .setMushroomBlock(BYGWoodTypes.SYTHIAN.leaves().get()) .setMinHeight(6) .setMaxHeight(12) .build() @@ -166,8 +167,8 @@ public class BYGNetherVegetationFeatures { public static final Holder> SYTHIAN_FUNGUS_TREE3 = createConfiguredFeatureSup("sythian_fungus_tree3", BYGFeatures.SYTHIAN_FUNGUS_TREE3, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.SYTHIAN_STEM.get()) - .setMushroomBlock(BYGBlocks.SYTHIAN_WART_BLOCK.get()) + .setStemBlock(BYGWoodTypes.SYTHIAN.log().get()) + .setMushroomBlock(BYGWoodTypes.SYTHIAN.leaves().get()) .setMinHeight(6) .setMaxHeight(12) .build() @@ -175,8 +176,8 @@ public class BYGNetherVegetationFeatures { public static final Holder> SYTHIAN_FUNGUS_TREE4 = createConfiguredFeatureSup("sythian_fungus_tree4", BYGFeatures.SYTHIAN_FUNGUS_TREE4, new BYGMushroomConfig.Builder() - .setStemBlock(BYGBlocks.SYTHIAN_STEM.get()) - .setMushroomBlock(BYGBlocks.SYTHIAN_WART_BLOCK.get()) + .setStemBlock(BYGWoodTypes.SYTHIAN.log().get()) + .setMushroomBlock(BYGWoodTypes.SYTHIAN.leaves().get()) .setMinHeight(6) .setMaxHeight(12) .build() diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/embur_bookshelf.json deleted file mode 100644 index 27425c7f0b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_button.json b/Common/src/main/resources/assets/byg/blockstates/embur_button.json deleted file mode 100644 index ca5be3cf20..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/embur_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/embur_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/embur_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/embur_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/embur_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/embur_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/embur_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/embur_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/embur_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/embur_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/embur_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/embur_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/embur_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/embur_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/embur_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/embur_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/embur_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/embur_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/embur_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/embur_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/embur_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/embur_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/embur_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/embur_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/embur_crafting_table.json deleted file mode 100644 index eff76e2522..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_door.json b/Common/src/main/resources/assets/byg/blockstates/embur_door.json deleted file mode 100644 index 0350df1dc4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/embur_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/embur_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/embur_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/embur_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/embur_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/embur_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/embur_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/embur_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/embur_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/embur_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/embur_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/embur_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/embur_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/embur_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/embur_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/embur_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/embur_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/embur_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/embur_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/embur_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/embur_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/embur_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/embur_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/embur_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/embur_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/embur_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/embur_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/embur_fence_gate.json deleted file mode 100644 index de38fb2670..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/embur_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/embur_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/embur_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/embur_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/embur_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/embur_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/embur_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/embur_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/embur_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/embur_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/embur_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/embur_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/embur_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/embur_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/embur_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/embur_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_planks.json b/Common/src/main/resources/assets/byg/blockstates/embur_planks.json deleted file mode 100644 index 3f2cbb7e92..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/embur_pressure_plate.json deleted file mode 100644 index 65091c81e7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/embur_pressure_plate" - }, - "powered=true": { - "model": "byg:block/embur_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_slab.json b/Common/src/main/resources/assets/byg/blockstates/embur_slab.json deleted file mode 100644 index d0704023eb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/embur_slab" - }, - "type=double": { - "model": "byg:block/embur_planks" - }, - "type=top": { - "model": "byg:block/embur_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_stairs.json b/Common/src/main/resources/assets/byg/blockstates/embur_stairs.json deleted file mode 100644 index 7706a5bd8d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/embur_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/embur_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/embur_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/embur_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/embur_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/embur_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/embur_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/embur_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/embur_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/embur_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/embur_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/embur_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/embur_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/embur_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/embur_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/embur_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/embur_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/embur_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/embur_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/embur_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/embur_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/embur_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/embur_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/embur_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/embur_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/embur_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/embur_trapdoor.json deleted file mode 100644 index 3fb6b42ff9..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/embur_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/embur_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/embur_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/embur_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/embur_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/embur_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/embur_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/embur_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/embur_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/embur_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/embur_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/embur_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/embur_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/embur_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/embur_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/embur_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/embur_bookshelf.json deleted file mode 100644 index b262615b9b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/embur_planks", - "up": "byg:block/embur_planks", - "north": "byg:block/embur_bookshelf", - "east": "byg:block/embur_bookshelf", - "south": "byg:block/embur_bookshelf", - "west": "byg:block/embur_bookshelf", - "particle": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/embur_crafting_table.json deleted file mode 100644 index c3018d05fc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/embur_crafting_table_front", - "down": "byg:block/embur_planks", - "up": "byg:block/embur_crafting_table_top", - "north": "byg:block/embur_crafting_table_front", - "east": "byg:block/embur_crafting_table_side", - "south": "byg:block/embur_crafting_table_side", - "west": "byg:block/embur_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/embur_door_bottom.json deleted file mode 100644 index d694991ac9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/embur_door_bottom", - "top": "byg:block/embur_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/embur_door_bottom_hinge.json deleted file mode 100644 index 904d770dfe..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/embur_door_bottom", - "top": "byg:block/embur_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_door_top.json b/Common/src/main/resources/assets/byg/models/block/embur_door_top.json deleted file mode 100644 index 64d0ed91e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/embur_door_bottom", - "top": "byg:block/embur_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/embur_door_top_hinge.json deleted file mode 100644 index 7c281a40f3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/embur_door_bottom", - "top": "byg:block/embur_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/embur_fence_inventory.json deleted file mode 100644 index 750dbb4b17..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_fence_post.json b/Common/src/main/resources/assets/byg/models/block/embur_fence_post.json deleted file mode 100644 index ae93356ad1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_hyphae.json b/Common/src/main/resources/assets/byg/models/block/embur_hyphae.json deleted file mode 100644 index 5ee3665b5c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/embur_pedu", - "side": "byg:block/embur_pedu" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_pedu.json b/Common/src/main/resources/assets/byg/models/block/embur_pedu.json deleted file mode 100644 index 79a10bf00f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_pedu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/embur_pedu_top", - "side": "byg:block/embur_pedu" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_planks.json b/Common/src/main/resources/assets/byg/models/block/embur_planks.json deleted file mode 100644 index 78a116848d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_slab.json b/Common/src/main/resources/assets/byg/models/block/embur_slab.json deleted file mode 100644 index f4df22c91f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/embur_planks", - "top": "byg:block/embur_planks", - "side": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_slab_top.json b/Common/src/main/resources/assets/byg/models/block/embur_slab_top.json deleted file mode 100644 index 4b7dc0a373..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/embur_planks", - "top": "byg:block/embur_planks", - "side": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_stairs.json b/Common/src/main/resources/assets/byg/models/block/embur_stairs.json deleted file mode 100644 index 8777869e81..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/embur_planks", - "top": "byg:block/embur_planks", - "side": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/embur_stairs_inner.json deleted file mode 100644 index 75e04ab72f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/embur_planks", - "top": "byg:block/embur_planks", - "side": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/embur_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/embur_stairs_outer.json deleted file mode 100644 index 97dd1c4a75..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/embur_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/embur_planks", - "top": "byg:block/embur_planks", - "side": "byg:block/embur_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_embur_hyphae.json b/Common/src/main/resources/assets/byg/models/block/stripped_embur_hyphae.json deleted file mode 100644 index b34e08a4e9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_embur_hyphae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_embur_pedu", - "side": "byg:block/stripped_embur_pedu" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_embur_pedu.json b/Common/src/main/resources/assets/byg/models/block/stripped_embur_pedu.json deleted file mode 100644 index 6108a1f614..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_embur_pedu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_embur_pedu_top", - "side": "byg:block/stripped_embur_pedu" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/embur_bookshelf.json deleted file mode 100644 index 890ab10dcc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/embur_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_button.json b/Common/src/main/resources/assets/byg/models/item/embur_button.json deleted file mode 100644 index 4a0ced0bd3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/embur_crafting_table.json deleted file mode 100644 index c334c63dc1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/embur_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_fence.json b/Common/src/main/resources/assets/byg/models/item/embur_fence.json deleted file mode 100644 index 0960fc72cd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/embur_fence_gate.json deleted file mode 100644 index e32b9f7008..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_hyphae.json b/Common/src/main/resources/assets/byg/models/item/embur_hyphae.json deleted file mode 100644 index 8226904261..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_hyphae.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/embur_hyphae", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_pedu.json b/Common/src/main/resources/assets/byg/models/item/embur_pedu.json deleted file mode 100644 index f8fc946a2b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_pedu.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/embur_pedu", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_planks.json b/Common/src/main/resources/assets/byg/models/item/embur_planks.json deleted file mode 100644 index 26f7ef7e8c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/embur_pressure_plate.json deleted file mode 100644 index 2ff36d2b17..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_slab.json b/Common/src/main/resources/assets/byg/models/item/embur_slab.json deleted file mode 100644 index 840e9438e2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_stairs.json b/Common/src/main/resources/assets/byg/models/item/embur_stairs.json deleted file mode 100644 index 6aff09114b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/embur_trapdoor.json deleted file mode 100644 index f8919a5d68..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/embur_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_embur_hyphae.json b/Common/src/main/resources/assets/byg/models/item/stripped_embur_hyphae.json deleted file mode 100644 index 5bb11ba933..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_embur_hyphae.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_embur_hyphae", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_embur_pedu.json b/Common/src/main/resources/assets/byg/models/item/stripped_embur_pedu.json deleted file mode 100644 index 93224e1038..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_embur_pedu.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_embur_pedu", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/embur/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/embur/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/embur/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/embur/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_door_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/embur/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_wart.png b/Common/src/main/resources/assets/byg/textures/block/embur/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_wart.png rename to Common/src/main/resources/assets/byg/textures/block/embur/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_pedu.png b/Common/src/main/resources/assets/byg/textures/block/embur/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_pedu.png rename to Common/src/main/resources/assets/byg/textures/block/embur/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_pedu.png.mcmeta b/Common/src/main/resources/assets/byg/textures/block/embur/log.png.mcmeta similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_pedu.png.mcmeta rename to Common/src/main/resources/assets/byg/textures/block/embur/log.png.mcmeta diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_pedu_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_pedu_top.png rename to Common/src/main/resources/assets/byg/textures/block/embur/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_planks.png b/Common/src/main/resources/assets/byg/textures/block/embur/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_planks.png rename to Common/src/main/resources/assets/byg/textures/block/embur/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_embur_pedu.png b/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_embur_pedu.png rename to Common/src/main/resources/assets/byg/textures/block/embur/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_embur_pedu_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_embur_pedu_top.png rename to Common/src/main/resources/assets/byg/textures/block/embur/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/embur/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/embur_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/embur/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/embur_door.png b/Common/src/main/resources/assets/byg/textures/item/embur/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/embur_door.png rename to Common/src/main/resources/assets/byg/textures/item/embur/door.png From aaae2cf8d1967ccb5e07350538213d6c695dbb86 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 14:20:16 +0300 Subject: [PATCH 46/90] Yes --- .../java/potionstudios/byg/common/block/BYGBlocks.java | 3 ++- .../potionstudios/byg/common/block/BYGWoodTypes.java | 2 +- .../java/potionstudios/byg/common/item/BYGItems.java | 1 + .../byg/datagen/providers/BYGWoodAssetsProvider.java | 10 ++++++++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 9fdd3b83ce..905cbea3b6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -309,7 +309,8 @@ public class BYGBlocks { public static final BlockRegistryObject SYTHIAN_SPROUT = createBlock(BYGBlockProperties.SythianPlant::new, "sythian_sprout"); public static final BlockRegistryObject SYTHIAN_STALK_BLOCK = createBlock(BYGBlockProperties.SythianStalk::new, "sythian_stalk_block"); public static final BlockRegistryObject SYTHIAN_SCAFFOLDING = createBlock(BYGBlockProperties.BYGScaffolding::new, "sythian_scaffolding"); - + public static final BlockRegistryObject SYTHIAN_SAPLING = createBlock(BYGBlockProperties.SythianSapling::new, "sythian_sapling"); + public static final BlockRegistryObject HANGING_SYTHIAN_ROOTS = createBlock(BYGBlockProperties.BYGSythianHangingRoots::new, "hanging_sythian_roots"); public static final BlockRegistryObject HANGING_SYTHIAN_ROOTS_PLANT = createBlock(BYGBlockProperties.BYGSythianHangingRootsPlant::new, "hanging_sythian_roots_plant"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index b5552852ac..717c149620 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -126,7 +126,7 @@ public enum BYGWoodTypes { .nether()), EMBUR("embur", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_EMBUR_WART) - .growerItem(GrowerItemType.FUNGUS) + .growerItem(GrowerItemType.WART) .exclude(BlockType.LEAVES) .registryName(BlockType.LOG, "%s_pedu") .registryName(BlockType.STRIPPED_LOG, "stripped_%s_pedu") diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 93e37d1d58..7d311902ab 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -494,6 +494,7 @@ public class BYGItems { BYGWoodTypes.WITCH_HAZEL.init(); BYGWoodTypes.ZELKOVA.init(); + createItem(BYGBlocks.SYTHIAN_SAPLING); BYGWoodTypes.SYTHIAN.init(); BYGWoodTypes.EMBUR.init(); } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index cf6d2fc94a..015dcf7ae4 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -1,5 +1,6 @@ package potionstudios.byg.datagen.providers; +import net.minecraft.core.Registry; import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.resources.ResourceLocation; @@ -17,6 +18,7 @@ import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ModelBuilder; import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.dev.ModelProviderAccess; @@ -120,7 +122,7 @@ protected void registerStatesAndModels() { final var fenceGateOpen = models().fenceGateOpen(typeName + "/fence_gate_open", rl(typeLoc + "planks")); final var fenceGateWall = models().fenceGateWall(typeName + "/fence_gate_wall", rl(typeLoc + "planks")); final var fenceGateWallOpen = models().fenceGateWallOpen(typeName + "/fence_gate_wall_open", rl(typeLoc + "planks")); - configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceGate.getLocation())); + configureTransform(item.withExistingParent(type.fenceGate().getId().getPath(), fenceGate.getLocation())); fenceGateBlock((FenceGateBlock) type.fenceGate().get(), fenceGate, fenceGateOpen, fenceGateWall, fenceGateWallOpen); if (type.leaves() != null) { @@ -173,6 +175,10 @@ protected void registerStatesAndModels() { item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) .texture("layer0", textureLoc); simpleBlock(type.growerItem().get(), growerItem); + + final var pottedBlock = ForgeRegistries.BLOCKS.getValue(BYG.createLocation("potted_" + type.growerItem().getId().getPath())); + final var potted = models().withExistingParent(typeLoc + "potted_grower_item", mcLoc("block/flower_pot_cross")); + simpleBlock(pottedBlock, potted); } final var pressurePlate = models().pressurePlate(typeName + "/pressure_plate", rl(typeLoc + "planks")); final var pressurePlateDown = models().pressurePlateDown(typeName + "/pressure_plate_down", rl(typeLoc + "planks")); @@ -195,7 +201,7 @@ protected void registerStatesAndModels() { final var trapdoor = models().trapdoorOrientableBottom(trapdoorName + "_bottom", trapdoorLoc); final var trapdoorTop = models().trapdoorOrientableTop(trapdoorName + "_top", trapdoorLoc); final var trapdoorOpen = models().trapdoorOrientableOpen(trapdoorName + "_open", trapdoorLoc); - configureTransform(item.withExistingParent(trapdoorName, trapdoor.getLocation())); + configureTransform(item.withExistingParent(type.trapdoor().getId().getPath(), trapdoor.getLocation())); trapdoorBlock((TrapDoorBlock) type.trapdoor().get(), trapdoor, trapdoorTop, trapdoorOpen, true); // No wood walls for now From 2a31fa855f3888457f62ef68b864f3649efa3330 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 14:52:17 +0300 Subject: [PATCH 47/90] Hmm, pots --- Common/src/generated/resources/.cache/cache | 170 ++++++++++++------ .../{embur_fungus.json => embur_wart.json} | 0 .../byg/blockstates/potted_aspen_sapling.json | 7 + .../blockstates/potted_baobab_sapling.json | 7 + .../potted_blue_enchanted_sapling.json | 7 + .../byg/blockstates/potted_bulbis_oddity.json | 7 + .../byg/blockstates/potted_cika_sapling.json | 7 + .../blockstates/potted_cypress_sapling.json | 7 + .../byg/blockstates/potted_ebony_sapling.json | 7 + .../byg/blockstates/potted_embur_wart.json | 7 + .../byg/blockstates/potted_ether_sapling.json | 7 + .../byg/blockstates/potted_fir_sapling.json | 7 + .../potted_green_enchanted_sapling.json | 7 + .../byg/blockstates/potted_holly_sapling.json | 7 + .../blockstates/potted_imparius_mushroom.json | 7 + .../blockstates/potted_mahogany_sapling.json | 7 + .../blockstates/potted_mangrove_sapling.json | 7 + .../byg/blockstates/potted_palm_sapling.json | 7 + .../byg/blockstates/potted_pine_sapling.json | 7 + .../potted_rainbow_eucalyptus_sapling.json | 7 + .../blockstates/potted_redwood_sapling.json | 7 + .../blockstates/potted_sythian_fungus.json | 7 + .../blockstates/potted_willow_sapling.json | 7 + .../potted_witch_hazel_sapling.json | 7 + .../blockstates/potted_zelkova_sapling.json | 7 + .../block/aspen/potted_grower_item.json | 6 + .../block/baobab/potted_grower_item.json | 6 + .../blue_enchanted/potted_grower_item.json | 6 + .../block/bulbis/potted_grower_item.json | 6 + .../models/block/cika/potted_grower_item.json | 6 + .../block/cypress/potted_grower_item.json | 6 + .../block/ebony/potted_grower_item.json | 6 + .../block/embur/potted_grower_item.json | 6 + .../block/ether/potted_grower_item.json | 6 + .../models/block/fir/potted_grower_item.json | 6 + .../green_enchanted/potted_grower_item.json | 6 + .../block/holly/potted_grower_item.json | 6 + .../block/imparius/potted_grower_item.json | 6 + .../block/mahogany/potted_grower_item.json | 6 + .../block/mangrove/potted_grower_item.json | 6 + .../models/block/palm/potted_grower_item.json | 6 + .../models/block/pine/potted_grower_item.json | 6 + .../potted_grower_item.json | 6 + .../block/redwood/potted_grower_item.json | 6 + .../block/sythian/potted_grower_item.json | 6 + .../block/willow/potted_grower_item.json | 6 + .../block/witch_hazel/potted_grower_item.json | 6 + .../block/zelkova/potted_grower_item.json | 6 + .../assets/byg/models/item/aspen_fence.json | 2 +- .../byg/models/item/aspen_fence_gate.json | 39 ++++ .../aspen_trapdoor.json} | 0 .../assets/byg/models/item/baobab_fence.json | 2 +- .../byg/models/item/baobab_fence_gate.json | 39 ++++ .../baobab_trapdoor.json} | 0 .../byg/models/item/blue_enchanted_fence.json | 2 +- .../item/blue_enchanted_fence_gate.json | 39 ++++ .../blue_enchanted_trapdoor.json} | 0 .../assets/byg/models/item/bulbis_fence.json | 2 +- .../byg/models/item/bulbis_fence_gate.json | 39 ++++ .../bulbis_trapdoor.json} | 0 .../assets/byg/models/item/cherry_fence.json | 2 +- .../byg/models/item/cherry_fence_gate.json | 39 ++++ .../cherry_trapdoor.json} | 0 .../assets/byg/models/item/cika_fence.json | 2 +- .../byg/models/item/cika_fence_gate.json | 39 ++++ .../trapdoor.json => item/cika_trapdoor.json} | 0 .../assets/byg/models/item/cypress_fence.json | 2 +- .../byg/models/item/cypress_fence_gate.json | 39 ++++ .../cypress_trapdoor.json} | 0 .../assets/byg/models/item/ebony_fence.json | 2 +- .../byg/models/item/ebony_fence_gate.json | 39 ++++ .../ebony_trapdoor.json} | 0 .../assets/byg/models/item/embur_fence.json | 2 +- .../byg/models/item/embur_fence_gate.json | 39 ++++ .../embur_trapdoor.json} | 0 .../{embur_fungus.json => embur_wart.json} | 0 .../assets/byg/models/item/ether_fence.json | 2 +- .../byg/models/item/ether_fence_gate.json | 39 ++++ .../ether_trapdoor.json} | 0 .../assets/byg/models/item/fir_fence.json | 2 +- .../byg/models/item/fir_fence_gate.json | 39 ++++ .../trapdoor.json => item/fir_trapdoor.json} | 0 .../models/item/green_enchanted_fence.json | 2 +- .../item/green_enchanted_fence_gate.json | 39 ++++ .../green_enchanted_trapdoor.json} | 0 .../assets/byg/models/item/holly_fence.json | 2 +- .../byg/models/item/holly_fence_gate.json | 39 ++++ .../holly_trapdoor.json} | 0 .../byg/models/item/imparius_fence.json | 2 +- .../byg/models/item/imparius_fence_gate.json | 39 ++++ .../imparius_trapdoor.json} | 0 .../byg/models/item/mahogany_fence.json | 2 +- .../byg/models/item/mahogany_fence_gate.json | 39 ++++ .../mahogany_trapdoor.json} | 0 .../byg/models/item/mangrove_fence.json | 2 +- .../byg/models/item/mangrove_fence_gate.json | 39 ++++ .../mangrove_trapdoor.json} | 0 .../assets/byg/models/item/palm_fence.json | 2 +- .../byg/models/item/palm_fence_gate.json | 39 ++++ .../trapdoor.json => item/palm_trapdoor.json} | 0 .../assets/byg/models/item/pine_fence.json | 2 +- .../byg/models/item/pine_fence_gate.json | 39 ++++ .../trapdoor.json => item/pine_trapdoor.json} | 0 .../models/item/rainbow_eucalyptus_fence.json | 2 +- .../item/rainbow_eucalyptus_fence_gate.json | 39 ++++ .../rainbow_eucalyptus_trapdoor.json} | 0 .../assets/byg/models/item/redwood_fence.json | 2 +- .../byg/models/item/redwood_fence_gate.json | 39 ++++ .../redwood_trapdoor.json} | 0 .../assets/byg/models/item/sythian_fence.json | 2 +- .../byg/models/item/sythian_fence_gate.json | 39 ++++ .../sythian_trapdoor.json} | 0 .../assets/byg/models/item/willow_fence.json | 2 +- .../byg/models/item/willow_fence_gate.json | 39 ++++ .../willow_trapdoor.json} | 0 .../byg/models/item/witch_hazel_fence.json | 2 +- .../models/item/witch_hazel_fence_gate.json | 39 ++++ .../witch_hazel_trapdoor.json} | 0 .../assets/byg/models/item/zelkova_fence.json | 2 +- .../byg/models/item/zelkova_fence_gate.json | 39 ++++ .../zelkova_trapdoor.json} | 0 .../assets/byg/blockstates/embur_wart.json | 7 - .../byg/blockstates/potted_aspen_sapling.json | 7 - .../blockstates/potted_baobab_sapling.json | 7 - .../potted_blue_enchanted_sapling.json | 7 - .../byg/blockstates/potted_bulbis_oddity.json | 7 - .../byg/blockstates/potted_cika_sapling.json | 7 - .../blockstates/potted_cypress_sapling.json | 7 - .../byg/blockstates/potted_ebony_sapling.json | 7 - .../byg/blockstates/potted_embur_wart.json | 7 - .../byg/blockstates/potted_ether_sapling.json | 7 - .../byg/blockstates/potted_fir_sapling.json | 7 - .../potted_green_enchanted_sapling.json | 7 - .../byg/blockstates/potted_holly_sapling.json | 7 - .../blockstates/potted_imparius_mushroom.json | 7 - .../blockstates/potted_mahogany_sapling.json | 7 - .../blockstates/potted_mangrove_sapling.json | 7 - .../byg/blockstates/potted_palm_sapling.json | 7 - .../byg/blockstates/potted_pine_sapling.json | 7 - .../potted_rainbow_eucalyptus_sapli.json | 7 - .../potted_rainbow_eucalyptus_sapling.json | 7 - .../blockstates/potted_redwood_sapling.json | 7 - .../blockstates/potted_skyris_sapling.json | 7 - .../blockstates/potted_sythian_fungus.json | 7 - .../blockstates/potted_willow_sapling.json | 7 - .../potted_witch_hazel_sapling.json | 7 - .../blockstates/potted_zelkova_sapling.json | 7 - .../assets/byg/models/item/embur_wart.json | 6 - .../providers/BYGWoodAssetsProvider.java | 3 +- 149 files changed, 1381 insertions(+), 263 deletions(-) rename Common/src/generated/resources/assets/byg/blockstates/{embur_fungus.json => embur_wart.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_aspen_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_baobab_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_bulbis_oddity.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_cika_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_cypress_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_ebony_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_embur_wart.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_ether_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_fir_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_holly_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_imparius_mushroom.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_mahogany_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_mangrove_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_palm_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_pine_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_redwood_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_sythian_fungus.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_willow_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_zelkova_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/potted_grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/aspen/trapdoor.json => item/aspen_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/baobab/trapdoor.json => item/baobab_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/blue_enchanted/trapdoor.json => item/blue_enchanted_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/bulbis/trapdoor.json => item/bulbis_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/cherry/trapdoor.json => item/cherry_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/cika/trapdoor.json => item/cika_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/cypress/trapdoor.json => item/cypress_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/ebony/trapdoor.json => item/ebony_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/embur/trapdoor.json => item/embur_trapdoor.json} (100%) rename Common/src/generated/resources/assets/byg/models/item/{embur_fungus.json => embur_wart.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/ether/trapdoor.json => item/ether_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/fir/trapdoor.json => item/fir_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/green_enchanted/trapdoor.json => item/green_enchanted_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/holly/trapdoor.json => item/holly_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/imparius/trapdoor.json => item/imparius_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/mahogany/trapdoor.json => item/mahogany_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/mangrove/trapdoor.json => item/mangrove_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/palm/trapdoor.json => item/palm_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/pine/trapdoor.json => item/pine_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/rainbow_eucalyptus/trapdoor.json => item/rainbow_eucalyptus_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/redwood/trapdoor.json => item/redwood_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/sythian/trapdoor.json => item/sythian_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/willow/trapdoor.json => item/willow_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/witch_hazel/trapdoor.json => item/witch_hazel_trapdoor.json} (100%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json rename Common/src/generated/resources/assets/byg/models/{block/zelkova/trapdoor.json => item/zelkova_trapdoor.json} (100%) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_wart.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_aspen_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_baobab_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_bulbis_oddity.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_cika_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_cypress_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_ebony_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_embur_wart.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_ether_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_fir_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_holly_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_imparius_mushroom.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_mahogany_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_mangrove_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_palm_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_pine_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapli.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_redwood_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_skyris_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_sythian_fungus.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_willow_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_zelkova_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_wart.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index bab3aad67e..77e9adeb95 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -121,7 +121,6 @@ bbec1f7607f6b94ca03945848b01f04561b2c323 assets/byg/blockstates/embur_button.jso e7dd6c47208c5ad4bb856bdd5931a6151a0602c5 assets/byg/blockstates/embur_door.json d6313fcb9d257839feb4117b7f284d7658932720 assets/byg/blockstates/embur_fence.json f8cff1e012779ef2568929c38ea45d880efce0dc assets/byg/blockstates/embur_fence_gate.json -bbfdcfa6e93d2a9e423eb19f06880fa3c644c8c9 assets/byg/blockstates/embur_fungus.json 46e831a1dba9de011c9322957107a5c1d062dd2a assets/byg/blockstates/embur_hyphae.json b6d9488386debda019aece59c0634c2c24258736 assets/byg/blockstates/embur_pedu.json 8b239412b7b13874dd0a12acd09dce1a10cbc851 assets/byg/blockstates/embur_planks.json @@ -129,6 +128,7 @@ b6d9488386debda019aece59c0634c2c24258736 assets/byg/blockstates/embur_pedu.json cacd2f9cf0ff0c18fcda66fce0eb2624d46a80d8 assets/byg/blockstates/embur_slab.json 94999f2516a5f601dd7dd9370b5689d4f0b917f4 assets/byg/blockstates/embur_stairs.json 3c2e6d1f27880ebfd5c437976e3e23c8a0c85998 assets/byg/blockstates/embur_trapdoor.json +bbfdcfa6e93d2a9e423eb19f06880fa3c644c8c9 assets/byg/blockstates/embur_wart.json 75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json 9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json 02861206e3db5520606113efda73aaee0a2d9252 assets/byg/blockstates/ether_crafting_table.json @@ -263,6 +263,29 @@ dea74144da93023c2b52f18f04904bf25bcd9a56 assets/byg/blockstates/pine_slab.json ccf77c708569ce44463425705f001bef06ea6306 assets/byg/blockstates/pine_stairs.json ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.json 5cb8488fa26b7fe8a2bec41747add021dc4153e1 assets/byg/blockstates/pine_wood.json +6d44086ea85724b1f3b307509568cebfba0b2040 assets/byg/blockstates/potted_aspen_sapling.json +0608c01318344276c9d61e98f34cac6069ec0652 assets/byg/blockstates/potted_baobab_sapling.json +8a431bd8c59b23ce712e22aa85b7b0b7f81eec9e assets/byg/blockstates/potted_blue_enchanted_sapling.json +624de194bb14da04c1db2f9afab7303374295042 assets/byg/blockstates/potted_bulbis_oddity.json +78306c6290a1e8830eb32714c2750c6b856014b3 assets/byg/blockstates/potted_cika_sapling.json +898f5654b6ae776d1603f8dcc50a8c2e6a85b852 assets/byg/blockstates/potted_cypress_sapling.json +29c5b769a55839f67050c47fd5cdf4a85124e8bb assets/byg/blockstates/potted_ebony_sapling.json +99d764124d9a7691c7356a55725a0289ed50dd11 assets/byg/blockstates/potted_embur_wart.json +063b11b9f95d673d95f028a2084a7123603e9458 assets/byg/blockstates/potted_ether_sapling.json +23fbbbce531aedf5e522dccec1f4728264ad62e5 assets/byg/blockstates/potted_fir_sapling.json +024d35275a5820185399851d4653414c6995081c assets/byg/blockstates/potted_green_enchanted_sapling.json +23a354082c811e55009ce5048816dbb0c5eee31c assets/byg/blockstates/potted_holly_sapling.json +e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_mushroom.json +4babfb75998f0891db03ae355c52ad54543cdb64 assets/byg/blockstates/potted_mahogany_sapling.json +178fc20190f1d18e808f983c72384c87f6a09275 assets/byg/blockstates/potted_mangrove_sapling.json +7b0d6acfe90488376b38ca79bf1bc812f36316da assets/byg/blockstates/potted_palm_sapling.json +ebe08b1ed3a3712b7564b40d5b62213a05691c31 assets/byg/blockstates/potted_pine_sapling.json +c568537b2f6cd4b868dfc8386a77ca4d95dd2340 assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json +c9b0ab69b12bd90d984e5688e2d677bdbf2571d6 assets/byg/blockstates/potted_redwood_sapling.json +7e278fc482e1a11e1ef41563b8459c8ce7de324e assets/byg/blockstates/potted_sythian_fungus.json +ff9d3784136d0050b9e9b694444ea14d6984bb54 assets/byg/blockstates/potted_willow_sapling.json +bb5b76d1bc73cccb791145f47ccbb90096602a31 assets/byg/blockstates/potted_witch_hazel_sapling.json +3481db922ad4ea1efa53172189522a4d5142a4e5 assets/byg/blockstates/potted_zelkova_sapling.json 03c251ad1ceb61010086c8f3b1fcd412c30237f8 assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json 1ea6045c6c6262c54679b884e2225f66162e0a34 assets/byg/blockstates/rainbow_eucalyptus_button.json 8163991471aa2021036c26ecf77872d84d745c9c assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json @@ -420,6 +443,7 @@ ee08f30cf4c4531f14782e40f3923425e6ca7933 assets/byg/models/block/aspen/leaves.js a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen/leaves_snowy.json 7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen/log.json 09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen/planks.json +dadfe8c4f130588035bf982d0529b720a3666785 assets/byg/models/block/aspen/potted_grower_item.json 5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen/pressure_plate.json 1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen/pressure_plate_down.json c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen/slab.json @@ -429,7 +453,6 @@ be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen/stairs_in 4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen/stairs_outer.json 450a7e1ee4b8b2e5601f39234714683380eea7e6 assets/byg/models/block/aspen/stripped_log.json 03252d342afe557738c4ffd4a8731fafd91243a6 assets/byg/models/block/aspen/stripped_wood.json -0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/block/aspen/trapdoor.json 76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen/trapdoor_bottom.json d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen/trapdoor_open.json f0307f9818774087d2220c7bf39678414ee734ef assets/byg/models/block/aspen/trapdoor_top.json @@ -455,6 +478,7 @@ df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab/fence_po 224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab/leaves_snowy.json 3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab/log.json 1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab/planks.json +25c7e85de91eedf28df42c98b94058db872fe431 assets/byg/models/block/baobab/potted_grower_item.json 548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab/pressure_plate.json f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure_plate_down.json 84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab/slab.json @@ -464,7 +488,6 @@ f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure 36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab/stairs_outer.json 9bfb0a9533f3ee1d4759837d1d40ad4e36799c0c assets/byg/models/block/baobab/stripped_log.json 99a2ed6e9b60894553a2a8a3044d9e2290fb8708 assets/byg/models/block/baobab/stripped_wood.json -1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/block/baobab/trapdoor.json 71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab/trapdoor_bottom.json 67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab/trapdoor_open.json 6d9421e7af02d85635301868cf30b019383f40d4 assets/byg/models/block/baobab/trapdoor_top.json @@ -490,6 +513,7 @@ de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted/ 30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted/leaves_snowy.json fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted/log.json 39bc57ba19dd532abe0120d034cada631a59fd16 assets/byg/models/block/blue_enchanted/planks.json +73ff477c320ba07ae01907fc1e8996b8b9837fd0 assets/byg/models/block/blue_enchanted/potted_grower_item.json f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted/pressure_plate.json ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted/pressure_plate_down.json 35e14c8e67a4d0722c5fec599160118c768fd6a0 assets/byg/models/block/blue_enchanted/slab.json @@ -499,7 +523,6 @@ eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/ 615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted/stairs_outer.json e059c170a4e1a8f1fb0da351888382f545f8109f assets/byg/models/block/blue_enchanted/stripped_log.json 78ba01d70cafa16511a8db427223b30841fe1acf assets/byg/models/block/blue_enchanted/stripped_wood.json -39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/block/blue_enchanted/trapdoor.json dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted/trapdoor_bottom.json 470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted/trapdoor_open.json fd2b82aae72fea322eb7cdc2e60f4ad1d064e9f1 assets/byg/models/block/blue_enchanted/trapdoor_top.json @@ -523,6 +546,7 @@ fc210cd930ed68bdec95a982b1366f4a02ec4860 assets/byg/models/block/bulbis/fence_ga c611670729691d4e63ba20dc76dd4831e76dae28 assets/byg/models/block/bulbis/grower_item.json f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis/log.json d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis/planks.json +095b3bbaa99b23f250277bc8163deaf08e986073 assets/byg/models/block/bulbis/potted_grower_item.json 25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis/pressure_plate.json eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis/pressure_plate_down.json 6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis/slab.json @@ -532,7 +556,6 @@ fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis/stairs.j f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis/stairs_outer.json 04be7aa8be8ecd79357c9a9e8101ff9cda92bb57 assets/byg/models/block/bulbis/stripped_log.json fa273edd6102c871b49afbbcfe9999a1e2d930d2 assets/byg/models/block/bulbis/stripped_wood.json -38bee46bfbb50d6a6a7d336c53ae2e4a6f5f6621 assets/byg/models/block/bulbis/trapdoor.json 56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis/trapdoor_bottom.json c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis/trapdoor_open.json 00e5df9209acfce5ae98613398d022e942a26895 assets/byg/models/block/bulbis/trapdoor_top.json @@ -564,7 +587,6 @@ fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry/stairs.j 1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry/stairs_outer.json 0c7aaf316e7db749f0fc5d59e41912bf93c47424 assets/byg/models/block/cherry/stripped_log.json 9702ca63e2dc8959b8f7cbe37ea36c7bf373298f assets/byg/models/block/cherry/stripped_wood.json -c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/block/cherry/trapdoor.json 91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry/trapdoor_bottom.json 36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry/trapdoor_open.json fb80e8dd89c2212bc3f597edaf0dee479c54b85c assets/byg/models/block/cherry/trapdoor_top.json @@ -590,6 +612,7 @@ d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika/grower_ite 7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika/leaves_snowy.json 96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika/log.json c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika/planks.json +f9969b50b902b83f217c26cc6d598a9be6fa3f1e assets/byg/models/block/cika/potted_grower_item.json f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika/pressure_plate.json 2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika/pressure_plate_down.json ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json @@ -599,7 +622,6 @@ ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika/stairs_outer.json 533f31255a60f15e5cd413d60db612da11862055 assets/byg/models/block/cika/stripped_log.json 641c9d05ec91a0aa7610b7f8cc2d03dbed031c7d assets/byg/models/block/cika/stripped_wood.json -93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/block/cika/trapdoor.json c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika/trapdoor_bottom.json c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika/trapdoor_open.json 0f30e72e84531b3d6d613373ab71dd3a879cebaf assets/byg/models/block/cika/trapdoor_top.json @@ -625,6 +647,7 @@ a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress/grower_ 8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress/leaves_snowy.json dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress/log.json c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress/planks.json +6e3933af5cf41f1f4a952255223870166955611d assets/byg/models/block/cypress/potted_grower_item.json c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress/pressure_plate.json 9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress/pressure_plate_down.json 0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress/slab.json @@ -634,7 +657,6 @@ c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress/stairs_ c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress/stairs_outer.json 79627de757d17143122fc07cbf1f73261a7aa882 assets/byg/models/block/cypress/stripped_log.json c6fa7cc125bc14d128fcb2583d44d1faa2e6cd4a assets/byg/models/block/cypress/stripped_wood.json -beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/block/cypress/trapdoor.json e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress/trapdoor_bottom.json bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress/trapdoor_open.json 4be848d813d65b3d7c66300f924dba25f677dba6 assets/byg/models/block/cypress/trapdoor_top.json @@ -660,6 +682,7 @@ b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony/fence_pos 5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony/leaves_snowy.json 9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony/log.json 2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony/planks.json +771c45b117070ef0ad06fe85cc1d7fff42dafd0d assets/byg/models/block/ebony/potted_grower_item.json 0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony/pressure_plate.json a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_plate_down.json 607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony/slab.json @@ -669,7 +692,6 @@ a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_ 913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony/stairs_outer.json d113d4858c242fd47e9ccf3a1597d757abb55241 assets/byg/models/block/ebony/stripped_log.json 401b8101c268f44203f96477c3c853b0ab0cc506 assets/byg/models/block/ebony/stripped_wood.json -fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/block/ebony/trapdoor.json f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_bottom.json 631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json 5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony/trapdoor_top.json @@ -693,6 +715,7 @@ e7640f1f638b63f534bcadb1b2ee21350fb9255f assets/byg/models/block/embur/fence_inv 5eb77faf112951059af41767d2ab6abda5c034ed assets/byg/models/block/embur/grower_item.json 59c73d96ba72b1c77a7b129eeb5fe805655d45bb assets/byg/models/block/embur/log.json a321195a5cab309c682469d5345cda230e1e52dc assets/byg/models/block/embur/planks.json +027caaea2c48b4f92d84a9bf64e0a61aa24ddde3 assets/byg/models/block/embur/potted_grower_item.json 0ecfebb6a60ddec2417b671dcec162b7f57b2b07 assets/byg/models/block/embur/pressure_plate.json e0c9a248f41c021407657c2be36ff0179e4b4b9a assets/byg/models/block/embur/pressure_plate_down.json 4dd00cdbfe34d61a74070a1f488f6db897e77c2b assets/byg/models/block/embur/slab.json @@ -702,7 +725,6 @@ b195fbc8d6ddec2d778d619a0ba3e1e958cd54cf assets/byg/models/block/embur/stairs_in 7523a6754e538b0b33e465e4f6e97d88bdc57257 assets/byg/models/block/embur/stairs_outer.json a4dd05982a73e8b686d2a9b241f4781d72d87a37 assets/byg/models/block/embur/stripped_log.json ddb00c9808cd83d55a16fc39599c1fd6df5f6f5c assets/byg/models/block/embur/stripped_wood.json -5f1772effcfeb533a5f44759d0bf90a26d8430bb assets/byg/models/block/embur/trapdoor.json 392a9aaa805522c07b7f8654ed39920ae8782c7e assets/byg/models/block/embur/trapdoor_bottom.json 02d1895e71d5b4fb9866bee6b953fc811f60fad0 assets/byg/models/block/embur/trapdoor_open.json eff5a660c4e9edab9d29d31e12952c721dedd756 assets/byg/models/block/embur/trapdoor_top.json @@ -728,6 +750,7 @@ d43d280f877072e7d0de89b4323db0f02f9d8de6 assets/byg/models/block/ether/grower_it 3def3de859e8d73aeb8e38cf17614f1d9b9ed8c8 assets/byg/models/block/ether/leaves_snowy.json 333f0cac0b8fd9f6e1f2157bad1ad1188bb27906 assets/byg/models/block/ether/log.json 236e28fced889460da9920b94396337ee98a61e2 assets/byg/models/block/ether/planks.json +bd3fc47a8311ed0fe1f7ac373f87065a7cb85eda assets/byg/models/block/ether/potted_grower_item.json ebc12a0a9686c90e3739bd23d96c05fe4a906eae assets/byg/models/block/ether/pressure_plate.json b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_plate_down.json 4dea4efd0c474f8d542ff0e97d7e74455e9ed0fe assets/byg/models/block/ether/slab.json @@ -737,7 +760,6 @@ b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_ c07c6397816d8afa502c4a04dca385d1b4baf6d9 assets/byg/models/block/ether/stairs_outer.json e42e71dea28942a62c221712fadd20206cd2acb9 assets/byg/models/block/ether/stripped_log.json a48f8043336366ab70cdeb9c175a3cea079f2527 assets/byg/models/block/ether/stripped_wood.json -989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/block/ether/trapdoor.json c4a2b8bfb456f821304933ac4e019e889fa0f28d assets/byg/models/block/ether/trapdoor_bottom.json b9d4409a33e153601f0d7d07239ab95fbbeef32a assets/byg/models/block/ether/trapdoor_open.json 6742fee7cc5a67fe8944089e6afe561c27e7e3bc assets/byg/models/block/ether/trapdoor_top.json @@ -763,6 +785,7 @@ c4c6d480cfc95341506916c3f4835bfb01ba25f5 assets/byg/models/block/fir/leaves.json 9288d58312649629be6a87adf22d9774d5460cef assets/byg/models/block/fir/leaves_snowy.json 033464821424a67f8ee0621159616df389d343be assets/byg/models/block/fir/log.json 43840c4c9e7dd4430d9a7af358826b7fd01d1748 assets/byg/models/block/fir/planks.json +672b3fbbfd03d4e7005af4658fc10c89037b8979 assets/byg/models/block/fir/potted_grower_item.json 3d19719c8bf30a354941f8913542ea943bb712a3 assets/byg/models/block/fir/pressure_plate.json 047484e298e9f14ba276fae5dbe602d0333c29df assets/byg/models/block/fir/pressure_plate_down.json abed894765b64afc6e9139c64a4f9c938350e8a1 assets/byg/models/block/fir/slab.json @@ -772,7 +795,6 @@ d289d31b8f91829b11464e6807b6e0765b77d28e assets/byg/models/block/fir/stairs_inne d278d64e67bdc2dd38541b9bf5bf24336f2994a9 assets/byg/models/block/fir/stairs_outer.json a21e03ed8eb17a7fda491459702eb65bc38bdfe6 assets/byg/models/block/fir/stripped_log.json 9b6ef761ecfe28eb821ef4a36f6be483c984226d assets/byg/models/block/fir/stripped_wood.json -74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/block/fir/trapdoor.json 9cd3d0bcaf638bf1f8501d7dfe0cb677e7f2a259 assets/byg/models/block/fir/trapdoor_bottom.json 1e2e5714b08875fb2ee503a97b36ef1a402fcc48 assets/byg/models/block/fir/trapdoor_open.json 45a90c6129284331a4805899ff38c8797c97d1db assets/byg/models/block/fir/trapdoor_top.json @@ -798,6 +820,7 @@ ea1a5f701b6700c4b09ea0eb117d15968a8997b6 assets/byg/models/block/green_enchanted eeb54b895bd56056a8560a853c7fd2b8ddedfa97 assets/byg/models/block/green_enchanted/leaves_snowy.json eea2c5a58d034a68c04ab97323f15265dd1a26a0 assets/byg/models/block/green_enchanted/log.json a08a63cf2eb65db51a67bcb4697845789876d9be assets/byg/models/block/green_enchanted/planks.json +10ec4f71065a0497784e7b68a6c280574a4b4334 assets/byg/models/block/green_enchanted/potted_grower_item.json 19e1280be2ea5be08fd4e2eaa1edb094428d0e5b assets/byg/models/block/green_enchanted/pressure_plate.json 1acc016884ce274e82fa55ef2a4ba713648c51f0 assets/byg/models/block/green_enchanted/pressure_plate_down.json 88134b54294516c1f9d108d22da8d63e9776304b assets/byg/models/block/green_enchanted/slab.json @@ -807,7 +830,6 @@ f2343edc3dc92d2d0101eb709c877e190128588e assets/byg/models/block/green_enchanted 5349f05565f57fff8f1d7537c4a87a24898e0b09 assets/byg/models/block/green_enchanted/stairs_outer.json 4fb234851b72d80630b4a7413fc14725121f9baa assets/byg/models/block/green_enchanted/stripped_log.json c1c740572675bd3c558fdd45e1a5c863ce321824 assets/byg/models/block/green_enchanted/stripped_wood.json -cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/block/green_enchanted/trapdoor.json f437f0d36f5821c5b6af79240c6c77a624cbd5c9 assets/byg/models/block/green_enchanted/trapdoor_bottom.json 75c08b16536de2ea25702aa4a3cdfbc20b194300 assets/byg/models/block/green_enchanted/trapdoor_open.json 1fdc5c64c607718910dab2aed97189c7cc3f2baf assets/byg/models/block/green_enchanted/trapdoor_top.json @@ -833,6 +855,7 @@ d8ade96134e0921470b4618d76fea2173d31298e assets/byg/models/block/holly/fence_pos 04c1b89a1a709a4dce455f5a0048a6b6e3cc7473 assets/byg/models/block/holly/leaves_snowy.json 563ef1dc3e7db69a8b854d0dcafe8c5b34518433 assets/byg/models/block/holly/log.json 6d5b9268a25046565765e78d1d9f322954a2b30f assets/byg/models/block/holly/planks.json +106a3a9c35fe2ffe06e2b92238102e3e80f50eba assets/byg/models/block/holly/potted_grower_item.json e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_plate.json 628a888a542382f0145454de9575b9395ad7b366 assets/byg/models/block/holly/pressure_plate_down.json 4980db3734e72d9ece421d5e4d4ce7941a1b9d3f assets/byg/models/block/holly/slab.json @@ -842,7 +865,6 @@ e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_ 9e8e60ee1f78dd15b676d9167c31cc68af4e91f5 assets/byg/models/block/holly/stairs_outer.json 58a36b650d70b32493438b00520e8dee31c57ad8 assets/byg/models/block/holly/stripped_log.json bdf84447c044624065e69bac05e703181123c5e2 assets/byg/models/block/holly/stripped_wood.json -e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/block/holly/trapdoor.json bd80774ceff6624eb26328d1f05d96de380c3f80 assets/byg/models/block/holly/trapdoor_bottom.json ce4c9cd9d585aaf14cde2255d2671494020a4f1b assets/byg/models/block/holly/trapdoor_open.json b035788f20b4673957ae7eae1c48599633bd1e86 assets/byg/models/block/holly/trapdoor_top.json @@ -866,6 +888,7 @@ a695ee39ab9820e6ff3503fac4b51d120b067503 assets/byg/models/block/imparius/fence_ 595a79813160520b9488884d4afc0017abde97af assets/byg/models/block/imparius/grower_item.json 0619139c301ffbdb198989106a9dc6ee627bfc14 assets/byg/models/block/imparius/log.json 40be562f3946b8c589fe888dc49130695bb7df08 assets/byg/models/block/imparius/planks.json +89bb2a44d08c971b1e394909fd6863e63404c4e0 assets/byg/models/block/imparius/potted_grower_item.json dd857606a752b8aa6e41c50db7d4fb586c68df10 assets/byg/models/block/imparius/pressure_plate.json 1d20c1378d4491976471b0461a9decdaca735247 assets/byg/models/block/imparius/pressure_plate_down.json 76f46acdb37fb5adb52b17346fa6924218347f7b assets/byg/models/block/imparius/slab.json @@ -873,7 +896,6 @@ ff9d3bbe597ebc750b74eb91d259907e02fd6bfc assets/byg/models/block/imparius/slab_t 4973077d48e40ccf9bd945c9aa9177d11081ea03 assets/byg/models/block/imparius/stairs.json ad08407b606c575350be942a8eb273537ea35a20 assets/byg/models/block/imparius/stairs_inner.json d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs_outer.json -81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/block/imparius/trapdoor.json 33da6501d63e81c2d203619cbc6051c34eb66374 assets/byg/models/block/imparius/trapdoor_bottom.json ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json @@ -899,6 +921,7 @@ d3e7af8e886b2bbeddba4341cb599090889c901d assets/byg/models/block/mahogany/fence_ a3481313f634ce373eddbe96090cc1ffff96ae37 assets/byg/models/block/mahogany/leaves_snowy.json edfd496ebaa9c5f80edcbc104b1ea54c84cbd411 assets/byg/models/block/mahogany/log.json 47789678c316d2b0d5654ad13f4dfb0be1c1918a assets/byg/models/block/mahogany/planks.json +d37a9edbeeb2ef5cb1c75d395a775e0e26c06370 assets/byg/models/block/mahogany/potted_grower_item.json 13c35c96abdc967ccf24364dc7f89dd13098cf85 assets/byg/models/block/mahogany/pressure_plate.json b5123dd3ab45b2012724f8f126ad6369cc35c7a7 assets/byg/models/block/mahogany/pressure_plate_down.json c31abb434e8e3a56083dbbd5e208c45dba147edc assets/byg/models/block/mahogany/slab.json @@ -908,7 +931,6 @@ f2fd0bdf26816fcd083222230742f05e92d97bed assets/byg/models/block/mahogany/slab_t 89cf846e0a814064fcd02d57648ff8a583ac135a assets/byg/models/block/mahogany/stairs_outer.json d511db509813684205cfc172e8edbeaa748ad364 assets/byg/models/block/mahogany/stripped_log.json bc6f2d0f3901be3e67c986d9cfb46637db1c40ae assets/byg/models/block/mahogany/stripped_wood.json -1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/block/mahogany/trapdoor.json d10f0a6bcae1b16d29c5f292453d92084befbe49 assets/byg/models/block/mahogany/trapdoor_bottom.json 06b76eb6b276363c35a03e7d5d37bba35aa3b154 assets/byg/models/block/mahogany/trapdoor_open.json e7074ff7eb49bd39ef6fea403cb0de1812eb0c2c assets/byg/models/block/mahogany/trapdoor_top.json @@ -934,6 +956,7 @@ d453ef77f88fcad415c72ca906b401048a71c4cd assets/byg/models/block/mangrove/leaves dd02ad772d32144d4c8f8008ffc2e894b76ccbed assets/byg/models/block/mangrove/leaves_snowy.json 1c8d145ddeff92246ae37f399fc4ba216e4bf494 assets/byg/models/block/mangrove/log.json e2a68cef72a8896d8ba3c921f96342a1f49deb54 assets/byg/models/block/mangrove/planks.json +f2356d78e186347fc47366857c8b9d8781ab059c assets/byg/models/block/mangrove/potted_grower_item.json a12a60a9c24dfb85d193955490282a569491683e assets/byg/models/block/mangrove/pressure_plate.json ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressure_plate_down.json 156a4fff72f2395df0d3223292374300d1a8074c assets/byg/models/block/mangrove/slab.json @@ -943,7 +966,6 @@ ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressu ccaaaf1759a8d518c4fd9a1895c9192bfc081c76 assets/byg/models/block/mangrove/stairs_outer.json c213f8be3662160dcb2020ec1bac32b6833332aa assets/byg/models/block/mangrove/stripped_log.json b53c1dbed17db433ca0335e71dd4a1cc38c463ad assets/byg/models/block/mangrove/stripped_wood.json -cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/block/mangrove/trapdoor.json 18602dff240e103ebf20972a974ef14eeb6bf0d2 assets/byg/models/block/mangrove/trapdoor_bottom.json c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json 36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json @@ -969,6 +991,7 @@ fd667e5c8b18477e65519b611e8623778ab857da assets/byg/models/block/palm/leaves.jso 4f4933f9a710e6df9b6b92f3fc6d7de0e27fd6b5 assets/byg/models/block/palm/leaves_snowy.json 1a042fa111eede6c830941db7040a8f0793d0cc5 assets/byg/models/block/palm/log.json 87d02a07f728a1557a8c0bdc92e4cf4078ca653c assets/byg/models/block/palm/planks.json +b9f580b3bbc757a5723c7e686769f21016f0a0bb assets/byg/models/block/palm/potted_grower_item.json 5c0275305fb2d94f5b203d646ff655cdb574da88 assets/byg/models/block/palm/pressure_plate.json 15e19f59603d7611419e5bf01ee7dc08bef58519 assets/byg/models/block/palm/pressure_plate_down.json 0705637c3f7703f7fcc3e25846da8c4a8e76877e assets/byg/models/block/palm/slab.json @@ -978,7 +1001,6 @@ d83d60d140d029181ce03d57993a7eb176862497 assets/byg/models/block/palm/stairs_inn 67bd4f349f4b6bf162f11bc05fa6e8b8245c56a4 assets/byg/models/block/palm/stairs_outer.json 2dab43e6932f6c5aecc149335760b49950fc4b86 assets/byg/models/block/palm/stripped_log.json 00838868eb00e6e93a725d22892525006c34146f assets/byg/models/block/palm/stripped_wood.json -2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/block/palm/trapdoor.json c96021f0305bcae8f8d5b28e3580b898f9b885fe assets/byg/models/block/palm/trapdoor_bottom.json 6779b160647712fb544f5d3279f5ba0a81bbce26 assets/byg/models/block/palm/trapdoor_open.json 85806014cd8d8bc66feabfbfad47ca246e70463d assets/byg/models/block/palm/trapdoor_top.json @@ -1004,6 +1026,7 @@ ff2051addd1684bfdeb17b77ff49b7b72201b932 assets/byg/models/block/pine/leaves.jso a2cc2b1edc2c73dbb187da6cd99837fd395b3b2e assets/byg/models/block/pine/leaves_snowy.json 1056173174feb8e341342e7b784bde308469160c assets/byg/models/block/pine/log.json c99cab0d28edb569e7fcfbb9b56cf7a4ab51064b assets/byg/models/block/pine/planks.json +cc0cdb399f2c802974c48778050a82885f8ca1f5 assets/byg/models/block/pine/potted_grower_item.json f9a1b1e75e4b5df2eb03d5398628a56ba87a4d9d assets/byg/models/block/pine/pressure_plate.json c5639b72db2422b06d8915dfd3b855a304a514e7 assets/byg/models/block/pine/pressure_plate_down.json 85c94add76039124b8d533d863ff79031f2ea525 assets/byg/models/block/pine/slab.json @@ -1013,7 +1036,6 @@ c5639b72db2422b06d8915dfd3b855a304a514e7 assets/byg/models/block/pine/pressure_p d9150073be35eb509213cf92e71e88edb268252b assets/byg/models/block/pine/stairs_outer.json 247315f1bb16240dad01a8fd55da1ef6151b9823 assets/byg/models/block/pine/stripped_log.json 9ca78752ac2794846b6877b2bd1175c5f2abbce7 assets/byg/models/block/pine/stripped_wood.json -fe36b59918baf0e0fd54834ff95ab1babbaf9cbd assets/byg/models/block/pine/trapdoor.json 26612a52df17b7a3b0faa99f7f0b5617838d4c4d assets/byg/models/block/pine/trapdoor_bottom.json 6b20555505980dcbfd39584ef029883c26be7d17 assets/byg/models/block/pine/trapdoor_open.json bf660b7bbf0f0590d50da4fe652b3781b102068d assets/byg/models/block/pine/trapdoor_top.json @@ -1039,6 +1061,7 @@ fdcad5fbaf61b6afb60d96aa24163af95f196a6c assets/byg/models/block/rainbow_eucalyp 6e44d3e23b6fe711c82aaefd8101397305e0d032 assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json 625555feb0a745ac4037afc66929885988008296 assets/byg/models/block/rainbow_eucalyptus/log.json d13948e62ac414d46208e114c84a3b223ddc1048 assets/byg/models/block/rainbow_eucalyptus/planks.json +fae1765c740be6f7d833a0b8d5ba0c7a48d51f8e assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json 790b4249c297b7d8d893ba076f550b6364aaeadd assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json 3eba8300da3b54415678dc051ef495c1057f59e9 assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json 92df78f84617c95fd91993f0689351dea799284c assets/byg/models/block/rainbow_eucalyptus/slab.json @@ -1048,7 +1071,6 @@ dc2d6a466adb3322f3a8e5569eb37a46841413e9 assets/byg/models/block/rainbow_eucalyp b57828f7441725fd3138a192d46e429e90f0d9b2 assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json 7b70e44b06d85c7e328ac7f9ed65a8f1766a993f assets/byg/models/block/rainbow_eucalyptus/stripped_log.json 76a8e3a0242e2d5f010db04ab88d12cafb2e3e56 assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json -bd453cf6d9a973cc05eca497d1e2b9873507ab0f assets/byg/models/block/rainbow_eucalyptus/trapdoor.json d957291f73a03ab141686ec524c9075affc0e159 assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json 0e339b867aa9d1346515dd4563e5f6571fee0289 assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json 9e5bbaf520d42d9ebc00d51ca9857d5f357ff751 assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json @@ -1074,6 +1096,7 @@ e795542472cf9752cf492bc3706572fd203356c0 assets/byg/models/block/redwood/fence_i 7e0a42bfeaaa27446d5a985dfbb224293ded0a10 assets/byg/models/block/redwood/leaves_snowy.json 48a3e474de1fcefb0a1a77234a95f64a502d3c0e assets/byg/models/block/redwood/log.json bb3ebb55ed613c372c05c64cdec881ad0cb74b3d assets/byg/models/block/redwood/planks.json +7adb01da371ce28348d8a49c5f4935a3cae77481 assets/byg/models/block/redwood/potted_grower_item.json 861d9dc4071f590543890ffc44588eb09106b36a assets/byg/models/block/redwood/pressure_plate.json 77da2cac360d8c6175c37a6b785493305f15c793 assets/byg/models/block/redwood/pressure_plate_down.json 15e4ffcc05ad3522c2486b1be63cf328bd3bafb5 assets/byg/models/block/redwood/slab.json @@ -1083,7 +1106,6 @@ e2ac3f180cac701f5754a63cd140b73a5fe152a7 assets/byg/models/block/redwood/slab_to 1c8659d7db7b60c6e01a66ae5e84bbea17b3ca97 assets/byg/models/block/redwood/stairs_outer.json d24b712b8eb17c4834d12ee9cf1516823151cf51 assets/byg/models/block/redwood/stripped_log.json a1b1d64d36cf817b36611e323b42d2750b053bba assets/byg/models/block/redwood/stripped_wood.json -bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/block/redwood/trapdoor.json 9a9cde020b938a575dddb0fc4473fdcb1ad0eb2b assets/byg/models/block/redwood/trapdoor_bottom.json c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json 304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json @@ -1109,6 +1131,7 @@ c52bc83170ce1da40740286d513fde0c86f39654 assets/byg/models/block/sythian/fence_p d7487e5fb582e7d48328d29ab7977219147c4857 assets/byg/models/block/sythian/leaves_snowy.json ff337b115b474c3a8c8b4d6dc2aa8f3568e71d2e assets/byg/models/block/sythian/log.json 560cb6f859f056369ba030379dc5e887c910f832 assets/byg/models/block/sythian/planks.json +0cc3cbc787d1e3f291e648a82f6e4cd33cb8dcea assets/byg/models/block/sythian/potted_grower_item.json a2ca9f484ae49db9f5aef858a248e00adcb9fdc2 assets/byg/models/block/sythian/pressure_plate.json efcb96e91be1632af3f7d673c23ad6bb88fb8764 assets/byg/models/block/sythian/pressure_plate_down.json b32f3bb03f67f61c9b4b90e62ad6d91c7bedb139 assets/byg/models/block/sythian/slab.json @@ -1118,7 +1141,6 @@ fae89cf926080190113b2b388ec15d9f6cbd210b assets/byg/models/block/sythian/stairs_ 6361ceda50b4328315d992e248368cc65da42cae assets/byg/models/block/sythian/stairs_outer.json 379c6cfb5a35f0d79acc384f95b129be8e392c4d assets/byg/models/block/sythian/stripped_log.json 6487e298a7254dad1b8fcdbe91f941844819731e assets/byg/models/block/sythian/stripped_wood.json -6f14d5a024475a25ac31e60609eee006d61de568 assets/byg/models/block/sythian/trapdoor.json 43e7b7b4d79fb9634d34473711092bfdeb1f916c assets/byg/models/block/sythian/trapdoor_bottom.json bdf701686c9f92e84f27c756a65efff5d0144d8f assets/byg/models/block/sythian/trapdoor_open.json 3f31fb04e431956d3f6c05358a262621a2a301e9 assets/byg/models/block/sythian/trapdoor_top.json @@ -1144,6 +1166,7 @@ e084f73a142b28074820921a4efeb33fa8d23abd assets/byg/models/block/willow/leaves.j 1301c5e2999f537a044d5111e5e8a7cd7722173b assets/byg/models/block/willow/leaves_snowy.json feac0b2ff67fbfc5a7e6db13829acf57fec39f5a assets/byg/models/block/willow/log.json 9ec37312d1e64d6921417500edc74171330e4253 assets/byg/models/block/willow/planks.json +683734056c24860ada4f2e9a1a29d31772e42a3e assets/byg/models/block/willow/potted_grower_item.json a792ac13a4ff8673d6da1efbaef9502337887236 assets/byg/models/block/willow/pressure_plate.json f86b9b5f611d5a5833ab40d32752f704e75e8c61 assets/byg/models/block/willow/pressure_plate_down.json c451ec6b5682d7f358994d02b496fb2457a09207 assets/byg/models/block/willow/slab.json @@ -1153,7 +1176,6 @@ a8cd96ef4db07698687493aa5a643b2be51b1ced assets/byg/models/block/willow/slab_top 87b1013ab54b467e3de04f961bf90edec6a88042 assets/byg/models/block/willow/stairs_outer.json ab687571198ebfe95437d9a7ca9bfa92bb52fbe8 assets/byg/models/block/willow/stripped_log.json ecccd0297dae87e55fb0581341059f43e22b59e9 assets/byg/models/block/willow/stripped_wood.json -bce10e0702e13c2c6d95cf6a1bfec374da67b3de assets/byg/models/block/willow/trapdoor.json a9d4c98f65f333f4b644724ef23aee3d39cee3dd assets/byg/models/block/willow/trapdoor_bottom.json bafd010c91e98b5d4abb2bf5e5ad58dddec6da54 assets/byg/models/block/willow/trapdoor_open.json eea8e81a8e46a407ab529f289e23f35f518d6cb1 assets/byg/models/block/willow/trapdoor_top.json @@ -1179,6 +1201,7 @@ c0e1f1335039334bf52f0e97f23e4ac133d5b74e assets/byg/models/block/witch_hazel/fen 63e8e8531d90ab450275f3170dfa414353a42bf4 assets/byg/models/block/witch_hazel/leaves_snowy.json 2d4d8b8a6a14cc280d4e3fe57a43657d3a52cd96 assets/byg/models/block/witch_hazel/log.json 02de0b41a02a93dafa542e2fa4764f2c66b5f8f1 assets/byg/models/block/witch_hazel/planks.json +782fc93a0a7973cf7be650f47e1d779693fb8b62 assets/byg/models/block/witch_hazel/potted_grower_item.json c313a30572d7f13e67b72e54a6ddab2c99c6acbb assets/byg/models/block/witch_hazel/pressure_plate.json 6fe041a932e5200da73db3bcbed5dff8d9ad7c6c assets/byg/models/block/witch_hazel/pressure_plate_down.json 0674f0ad27ac6b8a8a52909fc9bfeff01933c79c assets/byg/models/block/witch_hazel/slab.json @@ -1188,7 +1211,6 @@ c313a30572d7f13e67b72e54a6ddab2c99c6acbb assets/byg/models/block/witch_hazel/pre 249fdd1e2148ee5330b0a950b0e4972b82b47853 assets/byg/models/block/witch_hazel/stairs_outer.json e33216927e9498cad7077b8addf05a62e00370fd assets/byg/models/block/witch_hazel/stripped_log.json de970385fdad67acf439f77049948149e164bc4b assets/byg/models/block/witch_hazel/stripped_wood.json -24f0246e7234ac365aa0593fb4fec098acca5f4b assets/byg/models/block/witch_hazel/trapdoor.json 2c4c660fa225986d8826f7e282eff588d4b1101c assets/byg/models/block/witch_hazel/trapdoor_bottom.json 8d2e5c3f8d523a99dc0a514124d5c57e952a2c16 assets/byg/models/block/witch_hazel/trapdoor_open.json f655421c46282f56f4391129b6a092796c60ef8b assets/byg/models/block/witch_hazel/trapdoor_top.json @@ -1214,6 +1236,7 @@ ad1adc3e30e9b0ff25b5fe9a89b15e0f2be2f6db assets/byg/models/block/zelkova/fence_g ef5f55349ca4c1196d94c67884f0035085323a90 assets/byg/models/block/zelkova/leaves_snowy.json 63de24837aa2f58fbd5de80ee4a4e584bdfeabb5 assets/byg/models/block/zelkova/log.json aeeb64d84bd50fb58c48e64c0b921a7e83d16363 assets/byg/models/block/zelkova/planks.json +28dba0d15b0aa5547ebd0ff4563c61126767a53c assets/byg/models/block/zelkova/potted_grower_item.json a4c7aa319e522820d079bcbaf0faaea764a7f2ec assets/byg/models/block/zelkova/pressure_plate.json db7bee9ad1470f8004d6312b37558e63e1806e98 assets/byg/models/block/zelkova/pressure_plate_down.json 87bc547fc289441746b4a7e4424caee026f6b5d6 assets/byg/models/block/zelkova/slab.json @@ -1223,7 +1246,6 @@ b4fd33232e23ed2bfaed1ebee0b8cc38dd504ad2 assets/byg/models/block/zelkova/slab_to 013a773f702d7cdba882d237c4f36cb32657ef28 assets/byg/models/block/zelkova/stairs_outer.json ff054988ef39777460903aea64b1c3b18a18032f assets/byg/models/block/zelkova/stripped_log.json c3c4a88adef021e550fb5fc37a89a6e5640fe492 assets/byg/models/block/zelkova/stripped_wood.json -c558d204496231acfc2f07b1763894108894a676 assets/byg/models/block/zelkova/trapdoor.json ab1675e50a3e6091219fbe83b79a9e7c5c5f6b1f assets/byg/models/block/zelkova/trapdoor_bottom.json 8f9be3415ad1ddd69d7960b635e06ffaed679d9a assets/byg/models/block/zelkova/trapdoor_open.json 918fff9aa98157ae0666e10d17dc3d22844fe4f2 assets/byg/models/block/zelkova/trapdoor_top.json @@ -1233,7 +1255,8 @@ ab1675e50a3e6091219fbe83b79a9e7c5c5f6b1f assets/byg/models/block/zelkova/trapdoo 65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json a2848cd275262a16626a23992a1a526914d5c364 assets/byg/models/item/aspen_crafting_table.json 6058b86174918e7a984dce6bae27c57f67849c56 assets/byg/models/item/aspen_door.json -2f14a53284b4dc5f45b3f39f983a8ce521278395 assets/byg/models/item/aspen_fence.json +091b7e45d024db5983a83420ff31c340cc5ca3bd assets/byg/models/item/aspen_fence.json +2f14a53284b4dc5f45b3f39f983a8ce521278395 assets/byg/models/item/aspen_fence_gate.json 3ce228e1a16f8cc4b786be2e91f3b1f76d84dc3a assets/byg/models/item/aspen_leaves.json 7a39c1080f30287cf92be5da8bd8fa33081aaa70 assets/byg/models/item/aspen_log.json 8ccbe3930f4887d6a6f89135d2ea345fefd94ac8 assets/byg/models/item/aspen_planks.json @@ -1241,13 +1264,15 @@ a9afd845f4e771fb6809dc439def5ee35663016e assets/byg/models/item/aspen_pressure_p 0b5ed255f00030cb3ff1df30d8c51d7b6ea9afb6 assets/byg/models/item/aspen_sapling.json 9ce82435d1aa01ba081186b5f538a4872174885a assets/byg/models/item/aspen_slab.json 95e8459211f1b407f8d766e50791cdb84d2d3263 assets/byg/models/item/aspen_stairs.json +0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/item/aspen_trapdoor.json dda37f5ea836cf6231cf342862e02d4c4a8d8e8c assets/byg/models/item/aspen_wood.json faa6be8a2020e22b2de29ec835066d1acb0b57b8 assets/byg/models/item/baobab_boat.json bb4f3db5a9e8a066e7aa1a568491a3cfb28c2fd3 assets/byg/models/item/baobab_bookshelf.json 1cd0819f3663876c3742743756bb6647d1ca0b5d assets/byg/models/item/baobab_button.json e07883a7884f530c5951b56b5799b34e4372e6fb assets/byg/models/item/baobab_crafting_table.json 77e287a34be20212e1e8aa1c68551a0435abac2f assets/byg/models/item/baobab_door.json -597fa9d8ef960b994f8a7301f46cd5aa8963c6ab assets/byg/models/item/baobab_fence.json +21ebb14caa2092f03dc7cb774c91cb925187fb9d assets/byg/models/item/baobab_fence.json +597fa9d8ef960b994f8a7301f46cd5aa8963c6ab assets/byg/models/item/baobab_fence_gate.json ca67915d4fd002dc7f62d0f988d8d40e77b579fc assets/byg/models/item/baobab_leaves.json 144b98c07b2e021a36fe7d25d686306373fa4722 assets/byg/models/item/baobab_log.json 8e820316436b1e08bf280070058a83f0c9935542 assets/byg/models/item/baobab_planks.json @@ -1255,13 +1280,15 @@ b4d3db7e509a15c89df124667a7d6c3e5188bdf6 assets/byg/models/item/baobab_pressure_ 50ba87085b69541ad42bb85171ae33cce565c83c assets/byg/models/item/baobab_sapling.json 4e836fbab8a65cf4d797008c44509f3a19d11c05 assets/byg/models/item/baobab_slab.json 86a5a2e864b31515ecca3a0ae6cc91cf21654fca assets/byg/models/item/baobab_stairs.json +1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/item/baobab_trapdoor.json fa0f9ab545363bf6c66eb3431ca6672d4730271a assets/byg/models/item/baobab_wood.json 364ec05acaa6d67f772f0dd7c7d3c6c43981148f assets/byg/models/item/blue_enchanted_boat.json abc61690d812e1274877796418d2a2de0b596a49 assets/byg/models/item/blue_enchanted_bookshelf.json 9cdf652172d4e90aa597d893adbde9f787a79a98 assets/byg/models/item/blue_enchanted_button.json 587c2b678d69480cbb4f8858d635dcb7db49d2ba assets/byg/models/item/blue_enchanted_crafting_table.json 429b921a774a05b4ef0334e7869b685f468ef6e4 assets/byg/models/item/blue_enchanted_door.json -2c769b4c33caf2b05b6e487b47ff5234725aa244 assets/byg/models/item/blue_enchanted_fence.json +97d22c372065556efcae9f7f52e1a519375684e3 assets/byg/models/item/blue_enchanted_fence.json +2c769b4c33caf2b05b6e487b47ff5234725aa244 assets/byg/models/item/blue_enchanted_fence_gate.json 1da7b06ab294aed045338db636164d57c6536a74 assets/byg/models/item/blue_enchanted_leaves.json faa99f2398307b4a01735cd99d327748658a41a4 assets/byg/models/item/blue_enchanted_log.json 43a9b7d1d66e10bec791a24437adb0ac3d5af35a assets/byg/models/item/blue_enchanted_planks.json @@ -1269,37 +1296,43 @@ f61a7bf218e65808e180608e03e5d58a2dd97954 assets/byg/models/item/blue_enchanted_p df6e5276a0b04b4146d38546530cba58bce7fa75 assets/byg/models/item/blue_enchanted_sapling.json 994145c6950682114ec3ef589b7be385b4be8869 assets/byg/models/item/blue_enchanted_slab.json 2feab092f5685c98b591642a82c08b0337b9138a assets/byg/models/item/blue_enchanted_stairs.json +39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/item/blue_enchanted_trapdoor.json a4cb1f144302e32010a17f914cb275eb062ef5bb assets/byg/models/item/blue_enchanted_wood.json a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf.json 6426315883ed77300cec1569a91ed6306d3905e9 assets/byg/models/item/bulbis_button.json 490c0fcfd64530bdd65f2a85319c5c6d756e5f6d assets/byg/models/item/bulbis_crafting_table.json 1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json -8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence.json +0926b8774de634e4672e3302fd2100993e785740 assets/byg/models/item/bulbis_fence.json +8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence_gate.json 661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json 4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json 9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json 55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json 52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json +38bee46bfbb50d6a6a7d336c53ae2e4a6f5f6621 assets/byg/models/item/bulbis_trapdoor.json 1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_wood.json d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json aa216009bf5130342dc1c1043b4c6305d8993657 assets/byg/models/item/cherry_bookshelf.json d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.json 24d37586ac1ef398b0ab6687512ea2c74e9c177a assets/byg/models/item/cherry_crafting_table.json 6701e69fee961fa3cafe3637ab9252d1d691c5fb assets/byg/models/item/cherry_door.json -2ca0508ae3f011ab0875c258d9dd0a004b64cd8b assets/byg/models/item/cherry_fence.json +41f96c0a00f9751b8858b1417c37ec85a0a35814 assets/byg/models/item/cherry_fence.json +2ca0508ae3f011ab0875c258d9dd0a004b64cd8b assets/byg/models/item/cherry_fence_gate.json 5ca5c2026070205afd31d849c4882b94bb44d141 assets/byg/models/item/cherry_log.json ed80d846b315f4eb21aa2a4fc3a5b584ffa4107d assets/byg/models/item/cherry_planks.json 2cae4e8da59f8d5cb192c6c772200b5b61b946ec assets/byg/models/item/cherry_pressure_plate.json 767d86f6a59dd9fc0c6af5a89bda1c752343858b assets/byg/models/item/cherry_slab.json 5c51b95d93aae080bb940eb3ae98743bc259bf75 assets/byg/models/item/cherry_stairs.json +c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/item/cherry_trapdoor.json c8811da3eda623268e3729042d2ef660fca8118d assets/byg/models/item/cherry_wood.json 50009b1b8338fa245894386cd307a1483260902c assets/byg/models/item/cika_boat.json 2f7c754b022ebf678f21c93d676476a75e27c7dc assets/byg/models/item/cika_bookshelf.json 99756216992f19a473bbb8cb29a5a91f63b075b1 assets/byg/models/item/cika_button.json 660fb89002d646500260d1200f121988d4b3d4f8 assets/byg/models/item/cika_crafting_table.json 5ab0f9e30bea28148174a3bbb3c193711dfd1fa9 assets/byg/models/item/cika_door.json -562ce18f1061a4c17db837b81425a2eec253c2c7 assets/byg/models/item/cika_fence.json +765eff152076daddcac2db0bdae864dd18755121 assets/byg/models/item/cika_fence.json +562ce18f1061a4c17db837b81425a2eec253c2c7 assets/byg/models/item/cika_fence_gate.json b9f6e475b63f3a86395d511576c0c8262c41fe10 assets/byg/models/item/cika_leaves.json 491c04a3ab103dadfe75225b655cbd36d7940dfa assets/byg/models/item/cika_log.json f4a01a1c2d74b1d2780e80597f51b506693a7632 assets/byg/models/item/cika_planks.json @@ -1307,13 +1340,15 @@ af6cb0377220ef4d0b316926cd49c90cdf14b4fe assets/byg/models/item/cika_pressure_pl b1fbf364db542513285aa4a7cd55c1f4eafd96d1 assets/byg/models/item/cika_sapling.json a6b01df5440d0b9cf7eca070fc1cb1ba1ed2883c assets/byg/models/item/cika_slab.json f2c767f3f01c2fb97a87f737df7a766d41bf3706 assets/byg/models/item/cika_stairs.json +93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/item/cika_trapdoor.json 0495a6e67a0fc165da574f5535a437fc456ebbbe assets/byg/models/item/cika_wood.json 1115843477e3e39471f26b22717d36f32817cbf4 assets/byg/models/item/cypress_boat.json c64d221e2469fcc040ca492b5b9e6a37395900a5 assets/byg/models/item/cypress_bookshelf.json 3f78ccf79293769312aac83ae3f2fcb3f6afe976 assets/byg/models/item/cypress_button.json 1a31486948002ca09e6b0ed5b92118e7a109206d assets/byg/models/item/cypress_crafting_table.json 47de2d9214f236ac039c4a62783da8493fb36bb3 assets/byg/models/item/cypress_door.json -973cdb059784a2eb34f77dea001b9d2b7f8e7ea9 assets/byg/models/item/cypress_fence.json +800f8f1464f1a3ca07080c6c0c80c7c1155b8dbb assets/byg/models/item/cypress_fence.json +973cdb059784a2eb34f77dea001b9d2b7f8e7ea9 assets/byg/models/item/cypress_fence_gate.json 9cbe70113de8200f2deebbfc5d458be818a4410e assets/byg/models/item/cypress_leaves.json 7a569355989601998d8ad85c4784bfb2d2d71fa3 assets/byg/models/item/cypress_log.json 38acbdb182d2cac8f5a799ea9e1709814b0ffaab assets/byg/models/item/cypress_planks.json @@ -1321,13 +1356,15 @@ c64d221e2469fcc040ca492b5b9e6a37395900a5 assets/byg/models/item/cypress_bookshel 5b9cec5debe640c2da5fd07465f5b4744a7a0695 assets/byg/models/item/cypress_sapling.json fd97e91d95ffde72791e2854c2ed8d57fc1a2a05 assets/byg/models/item/cypress_slab.json 29a69284ab32d4f7358302067d7767c4599ed305 assets/byg/models/item/cypress_stairs.json +beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/item/cypress_trapdoor.json d66247dd97fcae964984c2ab71708db563f3b4f4 assets/byg/models/item/cypress_wood.json 45839da35dac45b1fa019ca536de6cbd2afbce8c assets/byg/models/item/ebony_boat.json 295ee2f6286c2368e71d6690681a82d420559d18 assets/byg/models/item/ebony_bookshelf.json 1e6f24bbdf74b5172d3d25d5f1400ef32a579ea4 assets/byg/models/item/ebony_button.json 3dcf588a9659c90e0839461538c7d5342e28821f assets/byg/models/item/ebony_crafting_table.json c3fdda9816205904c9e67c08632bbf936878d5cf assets/byg/models/item/ebony_door.json -704318f13d3a73e326587bbf8956e9abc23fe87e assets/byg/models/item/ebony_fence.json +77659901cc8ab587d051ba8eed0431ee4c9c495a assets/byg/models/item/ebony_fence.json +704318f13d3a73e326587bbf8956e9abc23fe87e assets/byg/models/item/ebony_fence_gate.json a7552666a20326e57e7e0913ae6dd6659f88a77a assets/byg/models/item/ebony_leaves.json bede82f15ab2d814bfca0c4062a7eb69790d993d assets/byg/models/item/ebony_log.json e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.json @@ -1335,24 +1372,28 @@ e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.jso 077f9c32aabcf49216b03cb5ea184b0535b856f4 assets/byg/models/item/ebony_sapling.json a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json 98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json +fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/item/ebony_trapdoor.json ee030f03a491ef8d7d845da92ffd106d935d4b6c assets/byg/models/item/ebony_wood.json 2841ca8e8bbc38b5058d0c832c7a23a35d3b7839 assets/byg/models/item/embur_bookshelf.json d6450f4fd0ce2fe7a31b659129b929b28ff6ff4b assets/byg/models/item/embur_button.json d191034e27b30671a3e935e988d55d1ec3759da7 assets/byg/models/item/embur_crafting_table.json b31773b495b434b1390c212dc64cfb9bd465c28d assets/byg/models/item/embur_door.json -35315685e38fd251a84f6786845821bcbeb985c3 assets/byg/models/item/embur_fence.json -362ff4592e0b862d7b382f567ac0de57b71cfb85 assets/byg/models/item/embur_fungus.json +a0789a181dc99f7c1c69b1d5df59bb8d71b631c2 assets/byg/models/item/embur_fence.json +35315685e38fd251a84f6786845821bcbeb985c3 assets/byg/models/item/embur_fence_gate.json 6bc1ae48d3839516cc2f66f61c97d6f9d6a0b194 assets/byg/models/item/embur_hyphae.json 1ea72d91c1202c6105450188d3ae00fb5e7d11bd assets/byg/models/item/embur_pedu.json 017edeb29f425654dce2a9d685154cbb78a39c6d assets/byg/models/item/embur_planks.json 99354ff5e260dd8416cc5cb6c1c4abde2bfe1b79 assets/byg/models/item/embur_pressure_plate.json 28a053a792a97989455294e072af93c91dd01799 assets/byg/models/item/embur_slab.json de0fe12925ca27d70084852ac3c6ccb4c7d4ed2e assets/byg/models/item/embur_stairs.json +5f1772effcfeb533a5f44759d0bf90a26d8430bb assets/byg/models/item/embur_trapdoor.json +362ff4592e0b862d7b382f567ac0de57b71cfb85 assets/byg/models/item/embur_wart.json a738b98393a906c3370fc2264d085148d74382a9 assets/byg/models/item/ether_bookshelf.json 0d764181101f212f7cb89c9d1982e08cea89e65a assets/byg/models/item/ether_button.json bf33776a7202fc417bc0cc4a73f9c2529fc83295 assets/byg/models/item/ether_crafting_table.json 1b5fe275fd8f068048a998cf8e59bb8febdc7b72 assets/byg/models/item/ether_door.json -d3b25f93ce5afebe19090c439b042f68a903d1f0 assets/byg/models/item/ether_fence.json +6c96991ded8536261c1b590f77843da3c2c1ffcc assets/byg/models/item/ether_fence.json +d3b25f93ce5afebe19090c439b042f68a903d1f0 assets/byg/models/item/ether_fence_gate.json 817160672eae7be5b3981c8ce7a783a46c841530 assets/byg/models/item/ether_leaves.json 13b70520358170e237438ae742a0d88f4af77db8 assets/byg/models/item/ether_log.json f2694503a9059e64da730806ba63d1fa4f4cfbe1 assets/byg/models/item/ether_planks.json @@ -1360,13 +1401,15 @@ cc9ba8a7a057f3edb876b15530f6b5698a94d628 assets/byg/models/item/ether_pressure_p d565b9cd6d02a2f5d0ada6f498cb3a2ecad8f2d6 assets/byg/models/item/ether_sapling.json dc795894c62ad433cebfcbf9591d9c9545a9925a assets/byg/models/item/ether_slab.json f7a7ea114db3b06c36b122e4c860ac10804945ff assets/byg/models/item/ether_stairs.json +989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/item/ether_trapdoor.json b408c6a95c7acfcc6d351d965d76d4a7c0f7d007 assets/byg/models/item/ether_wood.json ca2cd2bf18242ac31c980bec455d9b6fb12e8523 assets/byg/models/item/fir_boat.json aab8154b012e7bb92e26bf940672be14149d9eb6 assets/byg/models/item/fir_bookshelf.json d8ede5ddc5573fe10b33697e89e7eba8243ebd09 assets/byg/models/item/fir_button.json fc2bd0fdc8b661517bb6046ba6c6c510414fd518 assets/byg/models/item/fir_crafting_table.json 17cb6978461f5e0b18f37a3ba37394a717c816b7 assets/byg/models/item/fir_door.json -dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence.json +e37f579e49f656009ed5d873e03ab0a313d17873 assets/byg/models/item/fir_fence.json +dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence_gate.json 2346803c9b4067515f18ca71965000c4c8a2ad0b assets/byg/models/item/fir_leaves.json 5eb6e30de7798c0ef4c4592b762fa6ac62cdee4f assets/byg/models/item/fir_log.json 062a663882fb45967220ab155328abd01f953c01 assets/byg/models/item/fir_planks.json @@ -1374,13 +1417,15 @@ dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence.json b3ca097c89198092e4d6933879cec153a980f707 assets/byg/models/item/fir_sapling.json 378ff5a2eb5451b027f4e9b8adfa281edf88d045 assets/byg/models/item/fir_slab.json 4fcf3d712a70e48ec98bdcf5fea15d56644fa306 assets/byg/models/item/fir_stairs.json +74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/item/fir_trapdoor.json ced3e6c7f5220906d5d11da641f1194642b0dba5 assets/byg/models/item/fir_wood.json c698fcdde72e29eacae6d36b08793e00f7c6ea35 assets/byg/models/item/green_enchanted_boat.json 2c1af4590b2f20540c2cd8f7a4eb564da05138ba assets/byg/models/item/green_enchanted_bookshelf.json 792e5bf60f873773e6da3a8907231c096b4c70f6 assets/byg/models/item/green_enchanted_button.json 9cc14826a44a094931e93a9d0ec49fee8f34d0f8 assets/byg/models/item/green_enchanted_crafting_table.json ea9952290b491b30fbe263683dcb82e8504256cd assets/byg/models/item/green_enchanted_door.json -cf9a214f8f431447f301d6a3da4ea1c8ded3014a assets/byg/models/item/green_enchanted_fence.json +792f29a8e76beea62607d469e36c5552c169acc5 assets/byg/models/item/green_enchanted_fence.json +cf9a214f8f431447f301d6a3da4ea1c8ded3014a assets/byg/models/item/green_enchanted_fence_gate.json 4fc0e145707e20f1fd52bc2661e245486cc7a794 assets/byg/models/item/green_enchanted_leaves.json d82a38272fd002efdc918a1830f365748cd49888 assets/byg/models/item/green_enchanted_log.json 2d3ab24ccb420052a423e89ea780b97468bb7938 assets/byg/models/item/green_enchanted_planks.json @@ -1388,13 +1433,15 @@ d82a38272fd002efdc918a1830f365748cd49888 assets/byg/models/item/green_enchanted_ ce18a380e57d37ead5cbee1628e5d255313963f5 assets/byg/models/item/green_enchanted_sapling.json e4ba9b69838b94276fb3fcb07c14c685bb374827 assets/byg/models/item/green_enchanted_slab.json ada026c9ece852649aacca39d70428180619426c assets/byg/models/item/green_enchanted_stairs.json +cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/item/green_enchanted_trapdoor.json 35b75f67fed51a6987f7da81d571eeae34f6dda5 assets/byg/models/item/green_enchanted_wood.json 6f09e4719d8ca0c0112d05560df19ff4d10f7011 assets/byg/models/item/holly_boat.json df5a129c735e07c4e878d452392d8e3872c2a33d assets/byg/models/item/holly_bookshelf.json a017d4f7f115c6d10b01ee723250ec2ec0532235 assets/byg/models/item/holly_button.json 8ce0421196b97286ba44c49a54fbb7f2bdf09c6e assets/byg/models/item/holly_crafting_table.json be84506996a338d85a16c7f0e2011a30a9d6b5d3 assets/byg/models/item/holly_door.json -38aad837131642a5537e5811902f0bd8811d4bd1 assets/byg/models/item/holly_fence.json +59d208f6124ca14801e20b6d3d58c5e92932de75 assets/byg/models/item/holly_fence.json +38aad837131642a5537e5811902f0bd8811d4bd1 assets/byg/models/item/holly_fence_gate.json 612ca7ce9ac3e0eed46dfc90f4c33f552a751098 assets/byg/models/item/holly_leaves.json 7f6011fcd44e106a8cb7bc380e2054befe56f354 assets/byg/models/item/holly_log.json e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.json @@ -1402,12 +1449,14 @@ e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.jso 5be333046661c77987e36265af74c7c54bbcf0e2 assets/byg/models/item/holly_sapling.json f26a75321b0865a70718812f9896b96aac1b5a3a assets/byg/models/item/holly_slab.json c59089c2f12b84d35e1bb31670eab2b343402bc3 assets/byg/models/item/holly_stairs.json +e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/item/holly_trapdoor.json aece276ad34ec46ae26292fc9c22ca8f790a9d7b assets/byg/models/item/holly_wood.json 1412cd17546a3734a7502ec2751f09e0552f96d9 assets/byg/models/item/imparius_bookshelf.json cc3e7859a6d025d865a4a5ed2ebcbbb4bc2a9032 assets/byg/models/item/imparius_button.json a57f0f8de631a3fd2d4a4ed84f06c062a8145571 assets/byg/models/item/imparius_crafting_table.json 183528a8e2e3311099df714a1526622849650ae3 assets/byg/models/item/imparius_door.json -df3a47f283aa11f3cbb524c2d0efb7464bf66845 assets/byg/models/item/imparius_fence.json +114a60c595d6d5722703872c177b0c9c536bc18b assets/byg/models/item/imparius_fence.json +df3a47f283aa11f3cbb524c2d0efb7464bf66845 assets/byg/models/item/imparius_fence_gate.json 1f65d8c6ad200e87a90f9c4242ea9590e4f35a16 assets/byg/models/item/imparius_hyphae.json 3c2d52bf279e7bb74f599c9bf79f76500368ef5a assets/byg/models/item/imparius_mushroom.json b154607a7ed1eeac57e787005663d288f4a13d9d assets/byg/models/item/imparius_planks.json @@ -1415,12 +1464,14 @@ d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressur 510283f55fbde7b474a834f9c15980d776122460 assets/byg/models/item/imparius_slab.json 7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json 151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json +81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/item/imparius_trapdoor.json 308fdc52954271202cfea5bc7f66e6beb13dd522 assets/byg/models/item/mahogany_boat.json 4492809fcab159e80ab32cdf5ff1b3908836bcb6 assets/byg/models/item/mahogany_bookshelf.json 3675d5f1aae8ed09bb152beab640fcb5d3a82f38 assets/byg/models/item/mahogany_button.json df0559cf08d0846d1b12afac67fbfbfd5fca75df assets/byg/models/item/mahogany_crafting_table.json 21ccb7bee6299a30f579e3c0c6fafca1114af0e1 assets/byg/models/item/mahogany_door.json -5f51431cc433d64c0b4d0b206cb129163edcfcb8 assets/byg/models/item/mahogany_fence.json +6ef5d3639b6c655adbd810bddee9e9ae5275cd6d assets/byg/models/item/mahogany_fence.json +5f51431cc433d64c0b4d0b206cb129163edcfcb8 assets/byg/models/item/mahogany_fence_gate.json 00e4852d45d15459268105e1fedb6e830d407350 assets/byg/models/item/mahogany_leaves.json 6a1f064204a70d8c7e17ba359e95ce8a29d52efa assets/byg/models/item/mahogany_log.json 1517b68ab0172d3e39d1a86464016fdb611d0850 assets/byg/models/item/mahogany_planks.json @@ -1428,13 +1479,15 @@ af307f8aa6295fb81982c254ce4d15503f579b95 assets/byg/models/item/mahogany_pressur d274bb65e5894078164344c25fc85f2a7ea994a4 assets/byg/models/item/mahogany_sapling.json 2d1f4f1ff605d580bf5b664db434cb382ff0b848 assets/byg/models/item/mahogany_slab.json 5ef059d8995b99cdd60adb5ea46c12e3d9400baa assets/byg/models/item/mahogany_stairs.json +1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/item/mahogany_trapdoor.json 9fe4f0b1c862e4b2120dbbf598d09b6297b1d2e3 assets/byg/models/item/mahogany_wood.json 1faa3c095998b9767b4e1b71ff586d0c566ad90a assets/byg/models/item/mangrove_boat.json 68ca3bb25c7feac21fda46a46b67e83dab6a3a9b assets/byg/models/item/mangrove_bookshelf.json 37f3c3a9e828cb1bec645a0efe95227adcc92595 assets/byg/models/item/mangrove_button.json 724a0cd863cf79d75bb26d05838c3e473a1afd05 assets/byg/models/item/mangrove_crafting_table.json b3e66440598f233fb8c5b856393037fb063de2f4 assets/byg/models/item/mangrove_door.json -c205646f54043aa1f88c8495efba13103984ee0d assets/byg/models/item/mangrove_fence.json +c6c818437a6986b9187668d07b3cf02a6364ee69 assets/byg/models/item/mangrove_fence.json +c205646f54043aa1f88c8495efba13103984ee0d assets/byg/models/item/mangrove_fence_gate.json b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves.json 0cdff58e05cd081158e7d0dbbc0f2d0dd5bbb7b4 assets/byg/models/item/mangrove_log.json 663b1fe6614360a2133136635de85e505363572b assets/byg/models/item/mangrove_planks.json @@ -1442,13 +1495,15 @@ b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves. 2b93482c1bc6c4f91a71e7b7853b2dcd50170cc3 assets/byg/models/item/mangrove_sapling.json 6ae725945788d34d3471f064cf00ffe7b457fb3c assets/byg/models/item/mangrove_slab.json 9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json +cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/item/mangrove_trapdoor.json b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json 18000c946ed522199aa1da394e8a7d0b5ccf8853 assets/byg/models/item/palm_boat.json a4ed7d5608be7b13280da58fb439fcc3326621c4 assets/byg/models/item/palm_bookshelf.json 0a1741fe2250f9d95c6d2429b41418f153311a9d assets/byg/models/item/palm_button.json 767d3574ba62ced07e4293c68d00fb825469637f assets/byg/models/item/palm_crafting_table.json d0073c6fbb4fed6c68ac36135053578c32cd193b assets/byg/models/item/palm_door.json -dd1a1264aa8bf8d4aa600aa3beb9eaaa3ae3dcce assets/byg/models/item/palm_fence.json +f53b8bf63e188cbe734554d3a8ac88d73f91df2b assets/byg/models/item/palm_fence.json +dd1a1264aa8bf8d4aa600aa3beb9eaaa3ae3dcce assets/byg/models/item/palm_fence_gate.json 6674afdb2ea44229f5ba7c0cc432ab03ebe8a0b8 assets/byg/models/item/palm_leaves.json 36747572f9161d3e79f34c02d26d0dc0289b5aa1 assets/byg/models/item/palm_log.json 02b33321f618cec53691f04382a3f84de5538ab5 assets/byg/models/item/palm_planks.json @@ -1456,13 +1511,15 @@ b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_pl 828ed945909c554046fa0e466626f633a9075dc1 assets/byg/models/item/palm_sapling.json 3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json +2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/item/palm_trapdoor.json 641ded0df8c74eff47030fbf79f9bc373d58fb9a assets/byg/models/item/palm_wood.json 1f65f41935457796948289ca9e84d97322821c02 assets/byg/models/item/pine_boat.json 71158e2ccf57dfc90fccc4b3c3218c74cd2ebb71 assets/byg/models/item/pine_bookshelf.json 2fcf1ffa10662a12b5adf2bcd154a8bf4025fa38 assets/byg/models/item/pine_button.json d541974e54d7b6bda195849d4db35549081a041a assets/byg/models/item/pine_crafting_table.json b687c999f9786e4ae51b8e99f79625f607930ccd assets/byg/models/item/pine_door.json -9985e192c1021b4c7f406c1000e7649490ac4fc2 assets/byg/models/item/pine_fence.json +69dccd44f4c0d2932a6ce2d04f35c20c94623ba0 assets/byg/models/item/pine_fence.json +9985e192c1021b4c7f406c1000e7649490ac4fc2 assets/byg/models/item/pine_fence_gate.json 1137af14ade751523450facaa608c9a92134ab6d assets/byg/models/item/pine_leaves.json 7d98dd94a72dd9d51d027fb33a698c5893aa84cc assets/byg/models/item/pine_log.json fba9a9fd473aa9eb770970dda91e63855a5b1ccf assets/byg/models/item/pine_planks.json @@ -1470,13 +1527,15 @@ ead4c243f01620607f91b993be085bcebb214cf2 assets/byg/models/item/pine_pressure_pl 9826776657d6273054a685e72caf5bbf30725957 assets/byg/models/item/pine_sapling.json 94d803b73017692991f46ea0371dc099a2362580 assets/byg/models/item/pine_slab.json db6fe228afbac567186d648a6aec8262d1ee6a14 assets/byg/models/item/pine_stairs.json +fe36b59918baf0e0fd54834ff95ab1babbaf9cbd assets/byg/models/item/pine_trapdoor.json c6353e6e98765496bc28411805a2040ed5b1c4c0 assets/byg/models/item/pine_wood.json f3829eb3a12c1513c6e8f74f09c224988790086d assets/byg/models/item/rainbow_eucalyptus_boat.json 355ac7f53a857d8564a1ec89b66797216dab29d2 assets/byg/models/item/rainbow_eucalyptus_bookshelf.json 18a404c4088832ccb6d1bd55d0fd37f239b7d484 assets/byg/models/item/rainbow_eucalyptus_button.json d10c2a42336f2b423cd096001238e55a7ff02095 assets/byg/models/item/rainbow_eucalyptus_crafting_table.json 39e3cd49c8c8d8c56e9db764703220908a171f54 assets/byg/models/item/rainbow_eucalyptus_door.json -e56ec0e81887b3784d1bed19ab6cba99947f2a58 assets/byg/models/item/rainbow_eucalyptus_fence.json +2e09951b70a1aaf269a62a289c319a1efcf9bcb2 assets/byg/models/item/rainbow_eucalyptus_fence.json +e56ec0e81887b3784d1bed19ab6cba99947f2a58 assets/byg/models/item/rainbow_eucalyptus_fence_gate.json f226d4c0634aa06076e51c4dc5844d9d39f9b1d7 assets/byg/models/item/rainbow_eucalyptus_leaves.json 40a9046036b077d96734acc31634b14f16c50b7d assets/byg/models/item/rainbow_eucalyptus_log.json 9149e920185851a997066860ffa95c6ccf0fab4b assets/byg/models/item/rainbow_eucalyptus_planks.json @@ -1484,13 +1543,15 @@ e845c8591c0f3300544797e09c45a5e787ded391 assets/byg/models/item/rainbow_eucalypt c1320dd256a425c6bf3df619c023f419b450eaeb assets/byg/models/item/rainbow_eucalyptus_sapling.json caaf1f7aa3a6e42e3ac2c392e0d8256cccddc45c assets/byg/models/item/rainbow_eucalyptus_slab.json dfd60e8e00afd42f7d88a1571ca5cfce155f80da assets/byg/models/item/rainbow_eucalyptus_stairs.json +bd453cf6d9a973cc05eca497d1e2b9873507ab0f assets/byg/models/item/rainbow_eucalyptus_trapdoor.json 6a38eafae03cae9d2c59409679a29deac2e79430 assets/byg/models/item/rainbow_eucalyptus_wood.json 7172ad671c1a08c35e27bcee2cef8fcc742ed278 assets/byg/models/item/redwood_boat.json 10a826907d0d0fb0595ddf2ad9c7568df2c59f79 assets/byg/models/item/redwood_bookshelf.json b542b7ea6e8cad348d274157fea0ba80bc97bcac assets/byg/models/item/redwood_button.json 652550c75aef18aaa6b285afd2216e4af43cdca6 assets/byg/models/item/redwood_crafting_table.json d4a311d8c584e1584b298dbfe331158624fa3a90 assets/byg/models/item/redwood_door.json -cca49455c6d9341aa6ff3d426b604b901992f028 assets/byg/models/item/redwood_fence.json +171a7b13f633fcd3d8eaf8d8e27282857c4e7c04 assets/byg/models/item/redwood_fence.json +cca49455c6d9341aa6ff3d426b604b901992f028 assets/byg/models/item/redwood_fence_gate.json ebf4e0f3e7b9a74dd65fe879b3c073be4275f65a assets/byg/models/item/redwood_leaves.json 99778c2901f546c05ef6f5f5fce7d2f4819e1000 assets/byg/models/item/redwood_log.json bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.json @@ -1498,6 +1559,7 @@ bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.j 4b4f90dfc96b44c0fa7551ffe2319002212f47b7 assets/byg/models/item/redwood_sapling.json 6bc04400c70e382e07b2b11fb981cf03727b9fa7 assets/byg/models/item/redwood_slab.json 68d710d727c23617894f7e70dfa8f788966e0911 assets/byg/models/item/redwood_stairs.json +bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/item/redwood_trapdoor.json 30853e542fa6fd325fb9b54db516b5cf6c9ff71a assets/byg/models/item/redwood_wood.json 5eb73c5eff81302b6160bf99e9a395f4a881710a assets/byg/models/item/stripped_aspen_log.json d562898c1fd9a5390654b3360b230abe9f2fa357 assets/byg/models/item/stripped_aspen_wood.json @@ -1549,7 +1611,8 @@ b5ace128271a547e9aec54d9654f961e1eedb37b assets/byg/models/item/stripped_witch_h 65081a6849dda77648fa6ffb72fbcfacd0d61293 assets/byg/models/item/sythian_button.json 4a419e0817c9b2d888c1957c3e5b76f18976fda3 assets/byg/models/item/sythian_crafting_table.json 4717b6a27bc6e6366ea444541ac7514266df7f41 assets/byg/models/item/sythian_door.json -8d100561293c599f2655ea992850b676d74ea26a assets/byg/models/item/sythian_fence.json +81408174910d629cdbf4b8e6426dbeac0b63d6de assets/byg/models/item/sythian_fence.json +8d100561293c599f2655ea992850b676d74ea26a assets/byg/models/item/sythian_fence_gate.json 7c839ca5ebb6803862952edf853e9361a4d41c8e assets/byg/models/item/sythian_fungus.json f624822fa4960cab4ca1aeefaab1b0778b78a149 assets/byg/models/item/sythian_hyphae.json 3785ffb871d4033aa77d7b1ba2beb8d0c022afa5 assets/byg/models/item/sythian_planks.json @@ -1557,13 +1620,15 @@ f59df2cf798a5b7d6d2040046a40cc781e4a41ba assets/byg/models/item/sythian_pressure cc130597a10b0e61ed51c8fb16f9c797605d60ed assets/byg/models/item/sythian_slab.json 3e45f23c56a1e0b3fdb339c8626375bce2d3e931 assets/byg/models/item/sythian_stairs.json 66e8914249bfb56050995582985166330e9ff9de assets/byg/models/item/sythian_stem.json +6f14d5a024475a25ac31e60609eee006d61de568 assets/byg/models/item/sythian_trapdoor.json 0bb134aa65e3884ba001c390d578cf155722df3b assets/byg/models/item/sythian_wart_block.json a52bc875d6707a1b1d65472af872f38341d74862 assets/byg/models/item/willow_boat.json 8d8cfcfd12b3742a693df688c8db073d3bfdbaf0 assets/byg/models/item/willow_bookshelf.json 866026b225ba45574007e994aecb293b5dad7d6d assets/byg/models/item/willow_button.json 7246dbe95b4571df2432246d54cdbe4a24105936 assets/byg/models/item/willow_crafting_table.json 5b445b7a9b68810e95dc20e56ac12ef45ae331cf assets/byg/models/item/willow_door.json -302cfa6da893bc2017fc76deae0cff01467e8076 assets/byg/models/item/willow_fence.json +99f474696fbd4fc29ddef29ac607a724a84938aa assets/byg/models/item/willow_fence.json +302cfa6da893bc2017fc76deae0cff01467e8076 assets/byg/models/item/willow_fence_gate.json b02d9b57bb6db0d6763d8cb1305c747462324142 assets/byg/models/item/willow_leaves.json 8112375ad6a7805e63fe3ce73e0ef74837d15936 assets/byg/models/item/willow_log.json 0ae4dba613603a07fd48c79830781f02a6026a7c assets/byg/models/item/willow_planks.json @@ -1571,13 +1636,15 @@ b02d9b57bb6db0d6763d8cb1305c747462324142 assets/byg/models/item/willow_leaves.js d34a3f4732fd8f597e8359c2a8db3f6fce144919 assets/byg/models/item/willow_sapling.json 27d9f5b070024aaf18da4fc85617bdcc355c465a assets/byg/models/item/willow_slab.json 77d5d392878fe1a28710e6ee6823bfcd3215c8e2 assets/byg/models/item/willow_stairs.json +bce10e0702e13c2c6d95cf6a1bfec374da67b3de assets/byg/models/item/willow_trapdoor.json 7f9b973b3da73098a0e08bd9503e68e62826f421 assets/byg/models/item/willow_wood.json af8dfa8b8ebfa5767941d15d53e89e12cbdb2afc assets/byg/models/item/witch_hazel_boat.json 4f4fa7f12faa772ee1e689d02ed121cbe128236a assets/byg/models/item/witch_hazel_bookshelf.json e3663b382d3fb093f89d56b82299b20997dc8cb4 assets/byg/models/item/witch_hazel_button.json 9827a52d0694bb47dcac5b8c4634dc78b524f3d9 assets/byg/models/item/witch_hazel_crafting_table.json b4f5e02b694a88d383c667d6a701f0aaaac82c98 assets/byg/models/item/witch_hazel_door.json -d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fence.json +939cb92da2d31ff754662bd70a6bff486e5f9d5f assets/byg/models/item/witch_hazel_fence.json +d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fence_gate.json 2fc78d259246515fa7db39b816a74afa69ebc7c0 assets/byg/models/item/witch_hazel_leaves.json 9270f668d4fb0cc7afddc07a9d7d29259df8047a assets/byg/models/item/witch_hazel_log.json 1ac92832148124b4b1277d8994bedf57782e19a5 assets/byg/models/item/witch_hazel_planks.json @@ -1585,13 +1652,15 @@ d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fenc c0d2d67481fe5702a0256109243698d3a117818e assets/byg/models/item/witch_hazel_sapling.json efb86376aef5cfb09e69e9fe444ac115d4db0eb2 assets/byg/models/item/witch_hazel_slab.json a75f89ed619c4602a1a89f52515757744d0bd530 assets/byg/models/item/witch_hazel_stairs.json +24f0246e7234ac365aa0593fb4fec098acca5f4b assets/byg/models/item/witch_hazel_trapdoor.json 8b2170e50f1b5b782b82c649aea4194a4985ff5d assets/byg/models/item/witch_hazel_wood.json c859ebb6fc1693e4e35b6df16641ffc54c91861c assets/byg/models/item/zelkova_boat.json 7f7c5801191562e8d9d8abff53e2b81ee174be5c assets/byg/models/item/zelkova_bookshelf.json 9a0711bbc8efa06dccac1b75b20268ddc27ac679 assets/byg/models/item/zelkova_button.json 61c10955c42198ca23e6796410dfdd34ff338978 assets/byg/models/item/zelkova_crafting_table.json 5364a3067040014f67fd87da38f5398393cbfc7b assets/byg/models/item/zelkova_door.json -4a2c09b90687604332a4c863e3c785dbe5fb3bc6 assets/byg/models/item/zelkova_fence.json +0fc1b6f4fe7e32c7b5be783e445674ed636afbc8 assets/byg/models/item/zelkova_fence.json +4a2c09b90687604332a4c863e3c785dbe5fb3bc6 assets/byg/models/item/zelkova_fence_gate.json 83ef1f99f43336cbb03bae053eaa204b7248a531 assets/byg/models/item/zelkova_leaves.json a6396600e00f4b4d0b53fd1fd7c2938b57f22f93 assets/byg/models/item/zelkova_log.json bc785e1c1efec9f89265a5cb5474b3f88eac5064 assets/byg/models/item/zelkova_planks.json @@ -1599,6 +1668,7 @@ bc785e1c1efec9f89265a5cb5474b3f88eac5064 assets/byg/models/item/zelkova_planks.j 41d236f7a48a2d7493af11495db0579977ab11ff assets/byg/models/item/zelkova_sapling.json d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.json 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json +c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json b/Common/src/generated/resources/assets/byg/blockstates/embur_wart.json similarity index 100% rename from Common/src/generated/resources/assets/byg/blockstates/embur_fungus.json rename to Common/src/generated/resources/assets/byg/blockstates/embur_wart.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_aspen_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_aspen_sapling.json new file mode 100644 index 0000000000..a5ef8a826d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_aspen_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_baobab_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_baobab_sapling.json new file mode 100644 index 0000000000..7100bda183 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_baobab_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json new file mode 100644 index 0000000000..9085e5b4ae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_bulbis_oddity.json b/Common/src/generated/resources/assets/byg/blockstates/potted_bulbis_oddity.json new file mode 100644 index 0000000000..93cab32eb8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_bulbis_oddity.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_cika_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_cika_sapling.json new file mode 100644 index 0000000000..4ece46ed91 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_cika_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_cypress_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_cypress_sapling.json new file mode 100644 index 0000000000..aa89457964 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_cypress_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_ebony_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_ebony_sapling.json new file mode 100644 index 0000000000..b6a5385bff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_ebony_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_embur_wart.json b/Common/src/generated/resources/assets/byg/blockstates/potted_embur_wart.json new file mode 100644 index 0000000000..bae5d8ae17 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_embur_wart.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_ether_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_ether_sapling.json new file mode 100644 index 0000000000..225f8cdd2e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_ether_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_fir_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_fir_sapling.json new file mode 100644 index 0000000000..e9cd1821fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_fir_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json new file mode 100644 index 0000000000..42a1572fda --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_holly_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_holly_sapling.json new file mode 100644 index 0000000000..8f75d4026a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_holly_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_imparius_mushroom.json b/Common/src/generated/resources/assets/byg/blockstates/potted_imparius_mushroom.json new file mode 100644 index 0000000000..2d0f39fe95 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_imparius_mushroom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_mahogany_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_mahogany_sapling.json new file mode 100644 index 0000000000..f1b77d5696 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_mahogany_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_mangrove_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_mangrove_sapling.json new file mode 100644 index 0000000000..e08f41de6d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_mangrove_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_palm_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_palm_sapling.json new file mode 100644 index 0000000000..ad0a096e1c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_palm_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_pine_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_pine_sapling.json new file mode 100644 index 0000000000..981a69f4cc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_pine_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json new file mode 100644 index 0000000000..56d5625d46 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_redwood_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_redwood_sapling.json new file mode 100644 index 0000000000..264ab810e2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_redwood_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_sythian_fungus.json b/Common/src/generated/resources/assets/byg/blockstates/potted_sythian_fungus.json new file mode 100644 index 0000000000..1614f8dcdf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_sythian_fungus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_willow_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_willow_sapling.json new file mode 100644 index 0000000000..78d9c13e81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_willow_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json new file mode 100644 index 0000000000..713cc6590a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_zelkova_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_zelkova_sapling.json new file mode 100644 index 0000000000..70f58f5d83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_zelkova_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/aspen/potted_grower_item.json new file mode 100644 index 0000000000..5925276625 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/aspen/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/baobab/potted_grower_item.json new file mode 100644 index 0000000000..44f773a90c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/baobab/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/potted_grower_item.json new file mode 100644 index 0000000000..6fa37ac0cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/blue_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/potted_grower_item.json new file mode 100644 index 0000000000..439f9800d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/bulbis/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/cika/potted_grower_item.json new file mode 100644 index 0000000000..519f888f42 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/cika/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/cypress/potted_grower_item.json new file mode 100644 index 0000000000..f423f37bf0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/cypress/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/ebony/potted_grower_item.json new file mode 100644 index 0000000000..2ec17caaf5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/ebony/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/embur/potted_grower_item.json new file mode 100644 index 0000000000..fad765065c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/embur/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/ether/potted_grower_item.json new file mode 100644 index 0000000000..52b9dd7b17 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/ether/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/fir/potted_grower_item.json new file mode 100644 index 0000000000..5e557d80aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/fir/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/potted_grower_item.json new file mode 100644 index 0000000000..3ce9403f68 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/green_enchanted/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/holly/potted_grower_item.json new file mode 100644 index 0000000000..5cb6f993b3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/holly/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/imparius/potted_grower_item.json new file mode 100644 index 0000000000..c6c4e9ccf6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/imparius/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/potted_grower_item.json new file mode 100644 index 0000000000..cbbd41621b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/mahogany/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/potted_grower_item.json new file mode 100644 index 0000000000..8b102ac93a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/mangrove/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/palm/potted_grower_item.json new file mode 100644 index 0000000000..7d5f549a75 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/palm/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/pine/potted_grower_item.json new file mode 100644 index 0000000000..f8109812e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/pine/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json new file mode 100644 index 0000000000..65ddd3f16e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/rainbow_eucalyptus/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/redwood/potted_grower_item.json new file mode 100644 index 0000000000..272a54d0c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/redwood/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/sythian/potted_grower_item.json new file mode 100644 index 0000000000..62efa040eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/sythian/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/willow/potted_grower_item.json new file mode 100644 index 0000000000..d9e9f9ee5c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/willow/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/potted_grower_item.json new file mode 100644 index 0000000000..f26ca3fe4f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/witch_hazel/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/potted_grower_item.json new file mode 100644 index 0000000000..54b0ceceb2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/zelkova/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json index 6278f0810e..7a6af279a7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/aspen/fence_gate", + "parent": "byg:block/aspen/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json new file mode 100644 index 0000000000..6278f0810e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/aspen/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/aspen/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json index 6877a23b6a..43528b53cf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/baobab/fence_gate", + "parent": "byg:block/baobab/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json new file mode 100644 index 0000000000..6877a23b6a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/baobab/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/baobab/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json index 2e6060bb8c..7a973e71d1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/blue_enchanted/fence_gate", + "parent": "byg:block/blue_enchanted/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json new file mode 100644 index 0000000000..2e6060bb8c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/blue_enchanted/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json index a8da00cc0d..3eeae02945 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/bulbis/fence_gate", + "parent": "byg:block/bulbis/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json new file mode 100644 index 0000000000..a8da00cc0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/bulbis/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/bulbis/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json index 3701a2cd9b..d186ea9f0f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cherry/fence_gate", + "parent": "byg:block/cherry/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json new file mode 100644 index 0000000000..3701a2cd9b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cherry/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cherry/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json index f71dcb81ab..1fcdae9869 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cika/fence_gate", + "parent": "byg:block/cika/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json new file mode 100644 index 0000000000..f71dcb81ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cika/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cika/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json index 065043ed5f..c385826391 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/cypress/fence_gate", + "parent": "byg:block/cypress/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json new file mode 100644 index 0000000000..065043ed5f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/cypress/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/cypress/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json index 16978f5baa..538c658dc6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ebony/fence_gate", + "parent": "byg:block/ebony/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json new file mode 100644 index 0000000000..16978f5baa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ebony/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ebony/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fence.json b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json index acf3a38d69..b654b7759e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/embur/fence_gate", + "parent": "byg:block/embur/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json new file mode 100644 index 0000000000..acf3a38d69 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/embur/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/embur/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fungus.json b/Common/src/generated/resources/assets/byg/models/item/embur_wart.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/item/embur_fungus.json rename to Common/src/generated/resources/assets/byg/models/item/embur_wart.json diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_fence.json b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json index c443e2cdc5..e66f04cb6c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/ether/fence_gate", + "parent": "byg:block/ether/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json new file mode 100644 index 0000000000..c443e2cdc5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/ether/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/ether/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_fence.json b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json index e05201a2f1..08a2863dcb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/fir/fence_gate", + "parent": "byg:block/fir/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json new file mode 100644 index 0000000000..e05201a2f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/fir/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/fir/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json index 78d2c162bc..115998f6f7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/green_enchanted/fence_gate", + "parent": "byg:block/green_enchanted/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json new file mode 100644 index 0000000000..78d2c162bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/green_enchanted/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/green_enchanted/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_fence.json b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json index 8955f9f3ac..33aadd69e9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/holly/fence_gate", + "parent": "byg:block/holly/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json new file mode 100644 index 0000000000..8955f9f3ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/holly/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/holly/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json index e2ccdc724b..204bc76849 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/imparius/fence_gate", + "parent": "byg:block/imparius/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json new file mode 100644 index 0000000000..e2ccdc724b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/imparius/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/imparius/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json index eea1255704..6dd77f3a22 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/mahogany/fence_gate", + "parent": "byg:block/mahogany/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json new file mode 100644 index 0000000000..eea1255704 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mahogany/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/mahogany/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json index 307f09b06d..161322c4d3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/mangrove/fence_gate", + "parent": "byg:block/mangrove/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json new file mode 100644 index 0000000000..307f09b06d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/mangrove/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/mangrove/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_fence.json b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json index 79af9c2dca..4b2bb055bb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/palm/fence_gate", + "parent": "byg:block/palm/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json new file mode 100644 index 0000000000..79af9c2dca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/palm/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/palm/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_fence.json b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json index c626704972..4a064d92ea 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/pine/fence_gate", + "parent": "byg:block/pine/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json new file mode 100644 index 0000000000..c626704972 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/pine/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/pine/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json index a871d2fe39..a375e27dd6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/rainbow_eucalyptus/fence_gate", + "parent": "byg:block/rainbow_eucalyptus/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json new file mode 100644 index 0000000000..a871d2fe39 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/rainbow_eucalyptus/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json index d0eebf4c81..8d99ae5623 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/redwood/fence_gate", + "parent": "byg:block/redwood/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json new file mode 100644 index 0000000000..d0eebf4c81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/redwood/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/redwood/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json index 91c6c85f64..f7d79648c4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/sythian/fence_gate", + "parent": "byg:block/sythian/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json new file mode 100644 index 0000000000..91c6c85f64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/sythian/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/sythian/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_fence.json b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json index 6a82965db6..86761239a3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/willow/fence_gate", + "parent": "byg:block/willow/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json new file mode 100644 index 0000000000..6a82965db6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/willow/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/willow/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json index 20a8b47df4..ad63f6a019 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/witch_hazel/fence_gate", + "parent": "byg:block/witch_hazel/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json new file mode 100644 index 0000000000..20a8b47df4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/witch_hazel/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/witch_hazel/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json index 4b45755c3f..3411bb571b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/zelkova/fence_gate", + "parent": "byg:block/zelkova/fence_inv", "display": { "thirdperson_lefthand": { "rotation": [ diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json new file mode 100644 index 0000000000..4b45755c3f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/zelkova/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json similarity index 100% rename from Common/src/generated/resources/assets/byg/models/block/zelkova/trapdoor.json rename to Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_wart.json b/Common/src/main/resources/assets/byg/blockstates/embur_wart.json deleted file mode 100644 index 0eb75cd477..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_wart.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_wart" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_aspen_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_aspen_sapling.json deleted file mode 100644 index 1b61112a7c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_aspen_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_aspen_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_baobab_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_baobab_sapling.json deleted file mode 100644 index aecc12a650..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_baobab_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_baobab_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json deleted file mode 100644 index 0fb7d52421..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_blue_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_blue_enchanted_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_bulbis_oddity.json b/Common/src/main/resources/assets/byg/blockstates/potted_bulbis_oddity.json deleted file mode 100644 index 87fd577cb5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_bulbis_oddity.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_bulbis_oddity" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_cika_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_cika_sapling.json deleted file mode 100644 index 23b90a4c5f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_cika_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_cika_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_cypress_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_cypress_sapling.json deleted file mode 100644 index 2aa587ce1f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_cypress_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_cypress_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_ebony_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_ebony_sapling.json deleted file mode 100644 index ae1cb44261..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_ebony_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_ebony_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_embur_wart.json b/Common/src/main/resources/assets/byg/blockstates/potted_embur_wart.json deleted file mode 100644 index dfe05db1f6..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_embur_wart.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_embur_wart" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_ether_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_ether_sapling.json deleted file mode 100644 index 8ec9645d9b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_ether_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_ether_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_fir_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_fir_sapling.json deleted file mode 100644 index 058d4da762..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_fir_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_fir_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json deleted file mode 100644 index c81f36e78c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_green_enchanted_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_green_enchanted_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_holly_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_holly_sapling.json deleted file mode 100644 index fe662e5673..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_holly_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_holly_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_imparius_mushroom.json b/Common/src/main/resources/assets/byg/blockstates/potted_imparius_mushroom.json deleted file mode 100644 index 63f9102733..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_imparius_mushroom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_imparius_mushroom" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_mahogany_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_mahogany_sapling.json deleted file mode 100644 index 0bd9819fc1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_mahogany_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_mahogany_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_mangrove_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_mangrove_sapling.json deleted file mode 100644 index ac89f4d916..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_mangrove_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_mangrove_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_palm_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_palm_sapling.json deleted file mode 100644 index 12c2c03528..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_palm_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_pine_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_pine_sapling.json deleted file mode 100644 index 8d6a22dc19..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_pine_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_pine_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapli.json b/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapli.json deleted file mode 100644 index caff6a0794..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapli.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_rainbow_eucalyptus_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json deleted file mode 100644 index caff6a0794..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_rainbow_eucalyptus_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_redwood_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_redwood_sapling.json deleted file mode 100644 index 3f062b49cd..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_redwood_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_redwood_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_skyris_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_skyris_sapling.json deleted file mode 100644 index b40fcc9d96..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_skyris_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_skyris_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_sythian_fungus.json b/Common/src/main/resources/assets/byg/blockstates/potted_sythian_fungus.json deleted file mode 100644 index edb993cfe3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_sythian_fungus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_sythian_fungus" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_willow_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_willow_sapling.json deleted file mode 100644 index 9838a55944..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_willow_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_willow_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json deleted file mode 100644 index 01b8233b3d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_witch_hazel_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_witch_hazel_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_zelkova_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_zelkova_sapling.json deleted file mode 100644 index 5d1efd3d01..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_zelkova_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_zelkova_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_wart.json b/Common/src/main/resources/assets/byg/models/item/embur_wart.json deleted file mode 100644 index e211114138..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_wart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/embur_wart" - } -} \ No newline at end of file diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 015dcf7ae4..0a6e5bd0c6 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -177,7 +177,8 @@ protected void registerStatesAndModels() { simpleBlock(type.growerItem().get(), growerItem); final var pottedBlock = ForgeRegistries.BLOCKS.getValue(BYG.createLocation("potted_" + type.growerItem().getId().getPath())); - final var potted = models().withExistingParent(typeLoc + "potted_grower_item", mcLoc("block/flower_pot_cross")); + final var potted = models().withExistingParent(typeLoc + "potted_grower_item", mcLoc("block/flower_pot_cross")) + .texture("plant", growerItem.getLocation()); simpleBlock(pottedBlock, potted); } final var pressurePlate = models().pressurePlate(typeName + "/pressure_plate", rl(typeLoc + "planks")); From ccbe1452ec0b9061771faf6079dea187240f459f Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 14:57:17 +0300 Subject: [PATCH 48/90] hmm --- .../main/resources/assets/byg/blockstates/bulbis_anomaly.json | 2 +- .../main/resources/assets/byg/blockstates/ether_grass.json | 2 +- .../assets/byg/blockstates/purple_bulbis_anomaly.json | 2 +- .../resources/assets/byg/models/block/bulbis_anomaly_top.json | 4 ++-- .../main/resources/assets/byg/models/block/ether_grass.json | 4 ++-- .../main/resources/assets/byg/models/item/ether_grass.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json index 0a116f7043..656c5f1b62 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json @@ -4,7 +4,7 @@ "model": "byg:block/bulbis_anomaly_bottom" }, "half=upper": { - "model": "byg:block/bulbis_anomaly_top" + "model": "byg:block/bulbis/anomaly_top" } } } diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_grass.json b/Common/src/main/resources/assets/byg/blockstates/ether_grass.json index 032c9fa8e3..9e2a965411 100644 --- a/Common/src/main/resources/assets/byg/blockstates/ether_grass.json +++ b/Common/src/main/resources/assets/byg/blockstates/ether_grass.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/ether_grass" + "model": "byg:block/ether/grass" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json b/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json index 84ce2df0f4..1503047cf1 100644 --- a/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json @@ -4,7 +4,7 @@ "model": "byg:block/purple_bulbis_anomaly_bottom" }, "half=upper": { - "model": "byg:block/purple_bulbis_anomaly_top" + "model": "byg:block/purple_bulbis/anomaly_top" } } } diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_top.json b/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_top.json index 4b68dec5d8..d54b0848af 100644 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_top.json +++ b/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_top.json @@ -1,7 +1,7 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/bulbis_anomaly_top", - "particle": "byg:block/bulbis_anomaly_top" + "cross": "byg:block/bulbis/anomaly_top", + "particle": "byg:block/bulbis/anomaly_top" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/ether_grass.json b/Common/src/main/resources/assets/byg/models/block/ether_grass.json index b41b4ec9e2..21e2c7c0ea 100644 --- a/Common/src/main/resources/assets/byg/models/block/ether_grass.json +++ b/Common/src/main/resources/assets/byg/models/block/ether_grass.json @@ -1,8 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "textures": { - "ether_grass": "byg:block/ether_grass", - "particle": "byg:block/ether_grass" + "ether_grass": "byg:block/ether/grass", + "particle": "byg:block/ether/grass" }, "elements": [ { diff --git a/Common/src/main/resources/assets/byg/models/item/ether_grass.json b/Common/src/main/resources/assets/byg/models/item/ether_grass.json index 6b4b5aa852..b12582cb3e 100644 --- a/Common/src/main/resources/assets/byg/models/item/ether_grass.json +++ b/Common/src/main/resources/assets/byg/models/item/ether_grass.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:block/ether_grass" + "layer0": "byg:block/ether/grass" } } \ No newline at end of file From e3542ee4226331523c6c4421753d6b739b1d8e23 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 14:59:18 +0300 Subject: [PATCH 49/90] Fix some more assets --- .../main/resources/assets/byg/blockstates/bulbis_anomaly.json | 2 +- .../main/resources/assets/byg/blockstates/bulbis_shell.json | 2 +- .../main/resources/assets/byg/blockstates/bulbis_sprouts.json | 2 +- .../assets/byg/models/block/bulbis_anomaly_bottom.json | 4 ++-- .../main/resources/assets/byg/models/block/bulbis_shell.json | 2 +- .../resources/assets/byg/models/block/bulbis_sprouts.json | 4 ++-- .../main/resources/assets/byg/models/item/bulbis_shell.json | 2 +- .../main/resources/assets/byg/models/item/bulbis_sprouts.json | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json index 656c5f1b62..e9921dc6f6 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json @@ -1,7 +1,7 @@ { "variants": { "half=lower": { - "model": "byg:block/bulbis_anomaly_bottom" + "model": "byg:block/bulbis/anomaly_bottom" }, "half=upper": { "model": "byg:block/bulbis/anomaly_top" diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json index 12e4d5da38..39ffde4e4a 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/bulbis_shell" + "model": "byg:block/bulbis/shell" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json index bf4082bec8..aca29c45cf 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/bulbis_sprouts" + "model": "byg:block/bulbis/sprouts" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_bottom.json b/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_bottom.json index 86007e09a5..c09f1792d0 100644 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_bottom.json +++ b/Common/src/main/resources/assets/byg/models/block/bulbis_anomaly_bottom.json @@ -1,7 +1,7 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/bulbis_anomaly_bottom", - "particle": "byg:block/bulbis_anomaly_bottom" + "cross": "byg:block/bulbis/anomaly_bottom", + "particle": "byg:block/bulbis/anomaly_bottom" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_shell.json b/Common/src/main/resources/assets/byg/models/block/bulbis_shell.json index cae27691c5..d7c76040eb 100644 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_shell.json +++ b/Common/src/main/resources/assets/byg/models/block/bulbis_shell.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "byg:block/bulbis_shell" + "all": "byg:block/bulbis/shell" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/bulbis_sprouts.json b/Common/src/main/resources/assets/byg/models/block/bulbis_sprouts.json index de162fbb43..578bca6466 100644 --- a/Common/src/main/resources/assets/byg/models/block/bulbis_sprouts.json +++ b/Common/src/main/resources/assets/byg/models/block/bulbis_sprouts.json @@ -1,8 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "textures": { - "bulbis_sprouts": "byg:block/bulbis_sprouts", - "particle": "byg:block/bulbis_sprouts" + "bulbis_sprouts": "byg:block/bulbis/sprouts", + "particle": "byg:block/bulbis/sprouts" }, "elements": [ { diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json b/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json index fd51f9638a..9b360f6315 100644 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json +++ b/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json @@ -1,3 +1,3 @@ { - "parent": "byg:block/bulbis_shell" + "parent": "byg:block/bulbis/shell" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_sprouts.json b/Common/src/main/resources/assets/byg/models/item/bulbis_sprouts.json index 60f7086aa9..2a8cfdb815 100644 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_sprouts.json +++ b/Common/src/main/resources/assets/byg/models/item/bulbis_sprouts.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "byg:block/bulbis_sprouts" + "layer0": "byg:block/bulbis/sprouts" } } \ No newline at end of file From d8ff3cb97b89b247217b6b457ffed5eeddebb480 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 15:02:19 +0300 Subject: [PATCH 50/90] Fix --- .../models/block/baobab_fruit_block_stage0.json | 2 +- .../models/block/baobab_fruit_block_stage1.json | 2 +- .../models/block/baobab_fruit_block_stage2.json | 2 +- .../models/block/baobab_fruit_block_stage3.json | 2 +- .../assets/byg/models/block/ether_foliage.json | 4 ++-- .../byg/models/block/holly_berry_leaves.json | 4 ++-- .../byg/models/block/holly_berry_leaves_snowy.json | 14 +++++++------- .../assets/byg/models/item/holly_berry_leaves.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage0.json b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage0.json index 57af491de9..b21ad6dbc3 100644 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage0.json +++ b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage0.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/baobab_fruit_stage0" + "cross": "byg:block/baobab/fruit_stage0" } } diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage1.json b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage1.json index 24a39b86ff..8a6525e14c 100644 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage1.json +++ b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage1.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/baobab_fruit_stage1" + "cross": "byg:block/baobab/fruit_stage1" } } diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage2.json b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage2.json index 8d75dc38e4..55161af9d3 100644 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage2.json +++ b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage2.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/baobab_fruit_stage2" + "cross": "byg:block/baobab/fruit_stage2" } } diff --git a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage3.json b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage3.json index 78f12aad2e..e3c70463ef 100644 --- a/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage3.json +++ b/Common/src/main/resources/assets/byg/models/block/baobab_fruit_block_stage3.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "byg:block/baobab_fruit_stage3" + "cross": "byg:block/baobab/fruit_stage3" } } diff --git a/Common/src/main/resources/assets/byg/models/block/ether_foliage.json b/Common/src/main/resources/assets/byg/models/block/ether_foliage.json index 7c168489b8..34f3b178a0 100644 --- a/Common/src/main/resources/assets/byg/models/block/ether_foliage.json +++ b/Common/src/main/resources/assets/byg/models/block/ether_foliage.json @@ -1,7 +1,7 @@ { "parent": "block/carpet", "textures": { - "particle": "byg:block/ether_leaves", - "wool": "byg:block/ether_leaves" + "particle": "byg:block/ether/leaves", + "wool": "byg:block/ether/leaves" } } diff --git a/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves.json b/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves.json index 4db19935a0..fe187e4970 100644 --- a/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves.json +++ b/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves.json @@ -1,7 +1,7 @@ { "parent": "block/cube_all", "textures": { - "all": "byg:block/holly_berry_leaves", - "particle": "byg:block/holly_berry_leaves" + "all": "byg:block/holly/berry_leaves", + "particle": "byg:block/holly/berry_leaves" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves_snowy.json index c20b5fd350..178a8efb0a 100644 --- a/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves_snowy.json +++ b/Common/src/main/resources/assets/byg/models/block/holly_berry_leaves_snowy.json @@ -1,12 +1,12 @@ { "parent": "block/cube", "textures": { - "down": "byg:block/holly_berry_leaves_snowy", - "up": "byg:block/holly_berry_leaves_snowy", - "north": "byg:block/holly_berry_leaves_snowy_side", - "east": "byg:block/holly_berry_leaves_snowy_side", - "south": "byg:block/holly_berry_leaves_snowy_side", - "west": "byg:block/holly_berry_leaves_snowy_side", - "particle": "byg:block/holly_berry_leaves_snowy_side" + "down": "byg:block/holly/berry_leaves_snowy", + "up": "byg:block/holly/berry_leaves_snowy", + "north": "byg:block/holly/berry_leaves_snowy_side", + "east": "byg:block/holly/berry_leaves_snowy_side", + "south": "byg:block/holly/berry_leaves_snowy_side", + "west": "byg:block/holly/berry_leaves_snowy_side", + "particle": "byg:block/holly/berry_leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json b/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json index 928dfec2d6..774df362dc 100644 --- a/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json +++ b/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/holly_berry_leaves", + "parent": "byg:block/holly/berry_leaves", "display": { "thirdperson": { "rotation": [ From 4f1f8981c7de8e141ee3cf02dcdea8b8b0fc20c9 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 15:09:54 +0300 Subject: [PATCH 51/90] Add missing models --- .../resources/assets/byg/blockstates/sythian_sapling.json | 7 +++++++ .../resources/assets/byg/models/block/sythian_sapling.json | 7 +++++++ .../resources/assets/byg/models/item/sythian_sapling.json | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json create mode 100644 Common/src/main/resources/assets/byg/models/block/sythian_sapling.json create mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_sapling.json diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json b/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json new file mode 100644 index 0000000000..370be701e0 --- /dev/null +++ b/Common/src/main/resources/assets/byg/blockstates/sythian_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian_sapling" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json b/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json new file mode 100644 index 0000000000..61338f0219 --- /dev/null +++ b/Common/src/main/resources/assets/byg/models/block/sythian_sapling.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "byg:block/sythian_stalk_stage0", + "particle": "byg:block/sythian_stalk_stage0" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_sapling.json b/Common/src/main/resources/assets/byg/models/item/sythian_sapling.json new file mode 100644 index 0000000000..8f280e63e1 --- /dev/null +++ b/Common/src/main/resources/assets/byg/models/item/sythian_sapling.json @@ -0,0 +1,3 @@ +{ + "parent": "byg:block/sythian_sapling" +} \ No newline at end of file From 88b5072a4e74e4d3508b14b0fcfeb770c742bc9b Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 25 May 2022 15:43:58 +0300 Subject: [PATCH 52/90] Nightshade --- Common/src/generated/resources/.cache/cache | 96 ++++++++ .../byg/blockstates/nightshade_bookshelf.json | 7 + .../byg/blockstates/nightshade_button.json | 118 ++++++++++ .../nightshade_crafting_table.json | 7 + .../byg/blockstates/nightshade_door.json | 124 +++++++++++ .../byg/blockstates/nightshade_fence.json | 40 ++-- .../blockstates/nightshade_fence_gate.json | 80 +++++++ .../byg/blockstates/nightshade_leaves.json | 7 + .../byg/blockstates/nightshade_log.json | 14 +- .../byg/blockstates/nightshade_planks.json | 7 + .../nightshade_pressure_plate.json | 10 + .../byg/blockstates/nightshade_sapling.json | 7 + .../byg/blockstates/nightshade_slab.json | 13 ++ .../byg/blockstates/nightshade_stairs.json | 209 ++++++++++++++++++ .../byg/blockstates/nightshade_trapdoor.json | 68 ++++++ .../byg/blockstates/nightshade_wood.json | 14 +- .../potted_nightshade_sapling.json | 7 + .../blockstates/stripped_nightshade_log.json | 16 ++ .../blockstates/stripped_nightshade_wood.json | 16 ++ .../models/block/nightshade/bookshelf.json | 12 + .../byg/models/block/nightshade/button.json} | 2 +- .../block/nightshade/button_inventory.json} | 2 +- .../block/nightshade/button_pressed.json} | 2 +- .../block/nightshade/crafting_table.json | 12 + .../models/block/nightshade/door_bottom.json | 7 + .../block/nightshade/door_bottom_hinge.json | 7 + .../byg/models/block/nightshade/door_top.json | 7 + .../block/nightshade/door_top_hinge.json | 7 + .../byg/models/block/nightshade/fence.json | 7 + .../models/block/nightshade/fence_gate.json} | 2 +- .../block/nightshade/fence_gate_open.json} | 2 +- .../block/nightshade/fence_gate_wall.json} | 2 +- .../nightshade/fence_gate_wall_open.json} | 2 +- .../models/block/nightshade/fence_inv.json | 7 + .../models/block/nightshade/fence_post.json | 7 + .../models/block/nightshade/grower_item.json | 6 + .../byg/models/block/nightshade/leaves.json | 12 + .../models/block/nightshade/leaves_snowy.json | 12 + .../byg/models/block/nightshade/log.json | 7 + .../byg/models/block/nightshade/planks.json | 12 + .../block/nightshade/potted_grower_item.json | 6 + .../block/nightshade/pressure_plate.json} | 2 +- .../nightshade/pressure_plate_down.json} | 2 +- .../byg/models/block/nightshade/slab.json | 8 + .../byg/models/block/nightshade/slab_top.json | 8 + .../byg/models/block/nightshade/stairs.json | 8 + .../models/block/nightshade/stairs_inner.json | 8 + .../models/block/nightshade/stairs_outer.json | 8 + .../models/block/nightshade/stripped_log.json | 7 + .../block/nightshade/stripped_wood.json | 7 + .../block/nightshade/trapdoor_bottom.json} | 2 +- .../block/nightshade/trapdoor_open.json} | 2 +- .../block/nightshade/trapdoor_top.json} | 2 +- .../byg/models/block/nightshade/wood.json | 7 + .../byg/models/item/nightshade_bookshelf.json | 39 ++++ .../byg/models/item/nightshade_button.json | 39 ++++ .../item/nightshade_crafting_table.json | 39 ++++ .../byg/models/item/nightshade_door.json | 2 +- .../byg/models/item/nightshade_fence.json | 39 ++++ .../models/item/nightshade_fence_gate.json | 39 ++++ .../byg/models/item/nightshade_leaves.json | 39 ++++ .../byg/models/item/nightshade_log.json | 39 ++++ .../byg/models/item/nightshade_planks.json | 39 ++++ .../item/nightshade_pressure_plate.json | 39 ++++ .../byg/models/item/nightshade_sapling.json | 6 + .../byg/models/item/nightshade_slab.json | 39 ++++ .../byg/models/item/nightshade_stairs.json | 39 ++++ .../byg/models/item/nightshade_trapdoor.json | 39 ++++ .../byg/models/item/nightshade_wood.json | 39 ++++ .../models/item/stripped_nightshade_log.json | 39 ++++ .../models/item/stripped_nightshade_wood.json | 39 ++++ .../byg.byg/wood/nightshade/bookshelf.json | 34 +++ .../byg.byg/wood/nightshade/button.json | 34 +++ .../wood/nightshade/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/nightshade/door.json | 34 +++ .../byg.byg/wood/nightshade/fence.json | 34 +++ .../byg.byg/wood/nightshade/fence_gate.json | 34 +++ .../byg.byg/wood/nightshade/planks.json | 32 +++ .../wood/nightshade/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/nightshade/slab.json | 34 +++ .../byg.byg/wood/nightshade/stairs.json | 34 +++ .../byg.byg/wood/nightshade/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/nightshade/wood.json | 34 +++ .../recipes/wood/nightshade/bookshelf.json} | 11 +- .../byg/recipes/wood/nightshade/button.json} | 0 .../wood/nightshade/crafting_table.json} | 7 +- .../byg/recipes/wood/nightshade/door.json} | 8 +- .../byg/recipes/wood/nightshade/fence.json} | 0 .../recipes/wood/nightshade/fence_gate.json} | 0 .../byg/recipes/wood/nightshade/planks.json} | 4 +- .../wood/nightshade/pressure_plate.json} | 4 +- .../byg/recipes/wood/nightshade/slab.json} | 4 +- .../byg/recipes/wood/nightshade/stairs.json} | 12 +- .../recipes/wood/nightshade/trapdoor.json} | 6 +- .../byg/recipes/wood/nightshade/wood.json} | 7 +- .../byg/tags/blocks/wood/nightshade_logs.json | 9 + .../byg/tags/items/wood/nightshade_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 3 - .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodType.java | 1 - .../byg/common/block/BYGWoodTypes.java | 5 +- .../byg/common/item/BYGItems.java | 29 +-- .../end/BYGEndVegetationFeatures.java | 24 +- .../byg/blockstates/nightshade_bookshelf.json | 7 - .../byg/blockstates/nightshade_button.json | 118 ---------- .../nightshade_crafting_table.json | 7 - .../byg/blockstates/nightshade_door.json | 124 ----------- .../blockstates/nightshade_fence_gate.json | 80 ------- .../byg/blockstates/nightshade_leaves.json | 7 - .../byg/blockstates/nightshade_planks.json | 7 - .../nightshade_pressure_plate.json | 10 - .../byg/blockstates/nightshade_sapling.json | 7 - .../byg/blockstates/nightshade_slab.json | 13 -- .../byg/blockstates/nightshade_stairs.json | 209 ------------------ .../byg/blockstates/nightshade_trapdoor.json | 68 ------ .../blockstates/stripped_nightshade_log.json | 16 -- .../blockstates/stripped_nightshade_wood.json | 16 -- .../models/block/nightshade_bookshelf.json | 12 - .../block/nightshade_crafting_table.json | 12 - .../models/block/nightshade_door_bottom.json | 7 - .../block/nightshade_door_bottom_hinge.json | 7 - .../byg/models/block/nightshade_door_top.json | 7 - .../block/nightshade_door_top_hinge.json | 7 - .../block/nightshade_fence_inventory.json | 6 - .../models/block/nightshade_fence_post.json | 6 - .../byg/models/block/nightshade_leaves.json | 6 - .../byg/models/block/nightshade_log.json | 7 - .../byg/models/block/nightshade_planks.json | 6 - .../byg/models/block/nightshade_sapling.json | 7 - .../byg/models/block/nightshade_slab.json | 8 - .../byg/models/block/nightshade_slab_top.json | 8 - .../byg/models/block/nightshade_stairs.json | 8 - .../models/block/nightshade_stairs_inner.json | 8 - .../models/block/nightshade_stairs_outer.json | 8 - .../byg/models/block/nightshade_wood.json | 7 - .../models/block/stripped_nightshade_log.json | 7 - .../block/stripped_nightshade_wood.json | 7 - .../byg/models/item/nightshade_bookshelf.json | 3 - .../byg/models/item/nightshade_button.json | 3 - .../item/nightshade_crafting_table.json | 3 - .../byg/models/item/nightshade_fence.json | 3 - .../models/item/nightshade_fence_gate.json | 3 - .../byg/models/item/nightshade_leaves.json | 3 - .../byg/models/item/nightshade_log.json | 3 - .../byg/models/item/nightshade_planks.json | 3 - .../item/nightshade_pressure_plate.json | 3 - .../byg/models/item/nightshade_sapling.json | 6 - .../byg/models/item/nightshade_slab.json | 3 - .../byg/models/item/nightshade_stairs.json | 3 - .../byg/models/item/nightshade_trapdoor.json | 3 - .../byg/models/item/nightshade_wood.json | 3 - .../models/item/stripped_nightshade_log.json | 3 - .../models/item/stripped_nightshade_wood.json | 3 - .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../door.png} | Bin .../byg/recipes/stripped_nightshade_wood.json | 16 -- 171 files changed, 2100 insertions(+), 1045 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/nightshade_fence.json (68%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_leaves.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/nightshade_log.json (51%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/nightshade_wood.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_nightshade_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json rename Common/src/{main/resources/assets/byg/models/block/nightshade_button.json => generated/resources/assets/byg/models/block/nightshade/button.json} (57%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_button_inventory.json => generated/resources/assets/byg/models/block/nightshade/button_inventory.json} (61%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_button_pressed.json => generated/resources/assets/byg/models/block/nightshade/button_pressed.json} (60%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json rename Common/src/{main/resources/assets/byg/models/block/nightshade_fence_gate.json => generated/resources/assets/byg/models/block/nightshade/fence_gate.json} (62%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_fence_gate_open.json => generated/resources/assets/byg/models/block/nightshade/fence_gate_open.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_fence_gate_wall.json => generated/resources/assets/byg/models/block/nightshade/fence_gate_wall.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_fence_gate_wall_open.json => generated/resources/assets/byg/models/block/nightshade/fence_gate_wall_open.json} (65%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/potted_grower_item.json rename Common/src/{main/resources/assets/byg/models/block/nightshade_pressure_plate.json => generated/resources/assets/byg/models/block/nightshade/pressure_plate.json} (61%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_pressure_plate_down.json => generated/resources/assets/byg/models/block/nightshade/pressure_plate_down.json} (62%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_wood.json rename Common/src/{main/resources/assets/byg/models/block/nightshade_trapdoor_bottom.json => generated/resources/assets/byg/models/block/nightshade/trapdoor_bottom.json} (65%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_trapdoor_open.json => generated/resources/assets/byg/models/block/nightshade/trapdoor_open.json} (65%) rename Common/src/{main/resources/assets/byg/models/block/nightshade_trapdoor_top.json => generated/resources/assets/byg/models/block/nightshade/trapdoor_top.json} (64%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/models/item/nightshade_door.json (60%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json rename Common/src/{main/resources/data/byg/recipes/nightshade_bookshelf.json => generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json} (73%) rename Common/src/{main/resources/data/byg/recipes/nightshade_button.json => generated/resources/data/byg/recipes/wood/nightshade/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/nightshade_crafting_table.json => generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json} (75%) rename Common/src/{main/resources/data/byg/recipes/nightshade_door.json => generated/resources/data/byg/recipes/wood/nightshade/door.json} (84%) rename Common/src/{main/resources/data/byg/recipes/nightshade_fence.json => generated/resources/data/byg/recipes/wood/nightshade/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/nightshade_fence_gate.json => generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/nightshade_planks.json => generated/resources/data/byg/recipes/wood/nightshade/planks.json} (68%) rename Common/src/{main/resources/data/byg/recipes/nightshade_pressure_plate.json => generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/nightshade_slab.json => generated/resources/data/byg/recipes/wood/nightshade/slab.json} (91%) rename Common/src/{main/resources/data/byg/recipes/nightshade_stairs.json => generated/resources/data/byg/recipes/wood/nightshade/stairs.json} (57%) rename Common/src/{main/resources/data/byg/recipes/nightshade_trapdoor.json => generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/nightshade_wood.json => generated/resources/data/byg/recipes/wood/nightshade/wood.json} (79%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/nightshade_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_nightshade_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_nightshade_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_nightshade_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_nightshade_wood.json rename Common/src/main/resources/assets/byg/textures/block/{nightshade_bookshelf.png => nightshade/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_crafting_table_front.png => nightshade/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_crafting_table_side.png => nightshade/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_crafting_table_top.png => nightshade/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_door_bottom.png => nightshade/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_door_top.png => nightshade/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_sapling.png => nightshade/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_leaves.png => nightshade/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_log.png => nightshade/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_log_top.png => nightshade/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_planks.png => nightshade/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_nightshade_log.png => nightshade/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_nightshade_log_top.png => nightshade/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{nightshade_trapdoor.png => nightshade/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{nightshade_door.png => nightshade/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_nightshade_wood.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 77e9adeb95..98467cb113 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -233,6 +233,21 @@ b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.js 91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json 2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json +e3c8c0da0697aaebb9f76d2618f106fe69dddf5b assets/byg/blockstates/nightshade_bookshelf.json +f980fdf26bf1bacc6e836f8d88c7da0887d25666 assets/byg/blockstates/nightshade_button.json +8ada93135e307c6e47ff8da6c9e0450be6341d67 assets/byg/blockstates/nightshade_crafting_table.json +66b563297ad2545829979c0677473b933a385ec4 assets/byg/blockstates/nightshade_door.json +90eaf53722d00b08a1b7837ed8ea591dc6cd7267 assets/byg/blockstates/nightshade_fence.json +fbf2ee152cf1a40dbfffefb8e676548844926035 assets/byg/blockstates/nightshade_fence_gate.json +7706b3d69ef59793419cb6f9923f5260f7c0d926 assets/byg/blockstates/nightshade_leaves.json +0463fc1acd3e6b00e85d258507fe0f5b5a388449 assets/byg/blockstates/nightshade_log.json +f72d36bbef65070cb6c98c4581ffe71fb6cc594c assets/byg/blockstates/nightshade_planks.json +edee3a910e024b1e32df182a6e9e8a7524fd19bf assets/byg/blockstates/nightshade_pressure_plate.json +8c538dc83d44a1a26e181c80770aa785284b8cc5 assets/byg/blockstates/nightshade_sapling.json +b9fd1936b96d5fbae7648f89780c3a15b5bee37a assets/byg/blockstates/nightshade_slab.json +375d07dc3e9003cbd2d120852273f5a3195d859b assets/byg/blockstates/nightshade_stairs.json +9e49ef504ee4f33a01be932dd3b4018e2351dfbc assets/byg/blockstates/nightshade_trapdoor.json +24a7287b9b433eb0474fc44c2f83c33855c36202 assets/byg/blockstates/nightshade_wood.json f0a003b2821eb17ac9cf27388185f531cefe7653 assets/byg/blockstates/palm_bookshelf.json 3466ff62b97c684f6d8ff7abe5a8a3d96b429a90 assets/byg/blockstates/palm_button.json 61377cd034b199721da044ffd0c875a6b49cc67c assets/byg/blockstates/palm_crafting_table.json @@ -278,6 +293,7 @@ ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.js e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_mushroom.json 4babfb75998f0891db03ae355c52ad54543cdb64 assets/byg/blockstates/potted_mahogany_sapling.json 178fc20190f1d18e808f983c72384c87f6a09275 assets/byg/blockstates/potted_mangrove_sapling.json +2fbacfc6c6283a12959359aed883742ed52de14c assets/byg/blockstates/potted_nightshade_sapling.json 7b0d6acfe90488376b38ca79bf1bc812f36316da assets/byg/blockstates/potted_palm_sapling.json ebe08b1ed3a3712b7564b40d5b62213a05691c31 assets/byg/blockstates/potted_pine_sapling.json c568537b2f6cd4b868dfc8386a77ca4d95dd2340 assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json @@ -346,6 +362,8 @@ f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_e 479abf5122246126d85fbe8affd3afaad3f7c531 assets/byg/blockstates/stripped_mahogany_wood.json 60daa9513ff96eac9272602d4e2afe9635718495 assets/byg/blockstates/stripped_mangrove_log.json 3ad3465364f28027741f566d36acea26900b5956 assets/byg/blockstates/stripped_mangrove_wood.json +7304e8a4ad84325ef2ba3e23c432fec3f9647c23 assets/byg/blockstates/stripped_nightshade_log.json +5bc5331bfc5b7baf83ac9cceee5c8c9fd3d957b5 assets/byg/blockstates/stripped_nightshade_wood.json 5d63ae2eafc9d9a3ded5950201a561ab51ea7402 assets/byg/blockstates/stripped_palm_log.json 3e380a2c54db98407de1c8a852bb8bba7ed32f64 assets/byg/blockstates/stripped_palm_wood.json dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_log.json @@ -970,6 +988,41 @@ b53c1dbed17db433ca0335e71dd4a1cc38c463ad assets/byg/models/block/mangrove/stripp c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json 36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json db85b26584a130734c0c18b1b8e10e3bf071a97f assets/byg/models/block/mangrove/wood.json +af5e5b064247ae2c2fc4e5f57b9b7296288c6778 assets/byg/models/block/nightshade/bookshelf.json +1612a94a1356b4969df48b8ffb67289bf1a28a92 assets/byg/models/block/nightshade/button.json +f95eeef7fcc213d491aab6dabf75d0f660613672 assets/byg/models/block/nightshade/button_inventory.json +bbe33c4f5c089c6885aa7e0d5b53b3bcd24af146 assets/byg/models/block/nightshade/button_pressed.json +a78a865fb87ae658e29580faaef23576433cfc57 assets/byg/models/block/nightshade/crafting_table.json +fda94238ed935aa2ba21739c5e7b91c085598d79 assets/byg/models/block/nightshade/door_bottom.json +333216611eb81a0636c2878cc82a125e8979a044 assets/byg/models/block/nightshade/door_bottom_hinge.json +a242130b23eff1110b6e8018f289190f255649bc assets/byg/models/block/nightshade/door_top.json +65fb30e43f0d85068f1fdece61419c39501837b9 assets/byg/models/block/nightshade/door_top_hinge.json +e1a710a3a74f28eb08c92d047b03d648cb571ee5 assets/byg/models/block/nightshade/fence.json +25e99e8841c9077d186a337ee0648006a30a4fd1 assets/byg/models/block/nightshade/fence_gate.json +ed4e30c4f123aad24b4d065892f8b90440954912 assets/byg/models/block/nightshade/fence_gate_open.json +2573cd9a3685a4c20ae69f42f669da14d632b3af assets/byg/models/block/nightshade/fence_gate_wall.json +fb7263551534e16de22ab10e421af22be40c6d45 assets/byg/models/block/nightshade/fence_gate_wall_open.json +fe62516b76e37cded49a19d8e3ccbea4cd8003ff assets/byg/models/block/nightshade/fence_inv.json +25a4d8a82e4ed8268f3fa4135b268c69e15a05af assets/byg/models/block/nightshade/fence_post.json +76626693f23941197f534bcc96ca048273e108d3 assets/byg/models/block/nightshade/grower_item.json +06cbe08114a80e38b461a10b0979853f51932492 assets/byg/models/block/nightshade/leaves.json +b537b432708e27fc0f1a28c17a050207971c03aa assets/byg/models/block/nightshade/leaves_snowy.json +dde8da2ffda06c74eb3ce764144336dc2b67045a assets/byg/models/block/nightshade/log.json +3af527e52937709d66b4eca1ed13879308328ad3 assets/byg/models/block/nightshade/planks.json +f3ab39eab019351994bcc3eaed1e4fd1b0dde4d9 assets/byg/models/block/nightshade/potted_grower_item.json +7e370681f447552103db002a8a3680e98137b92a assets/byg/models/block/nightshade/pressure_plate.json +a973b21f7c01d20f27567d54e1c58eaecff8047c assets/byg/models/block/nightshade/pressure_plate_down.json +9837c243eeb7a2fe43d9df255d1c14a4ca533701 assets/byg/models/block/nightshade/slab.json +9b236e32f9d4d25c502ad393648fbd3f5322b91e assets/byg/models/block/nightshade/slab_top.json +565efe1282cb2fb6afd384d3426605d516b3496d assets/byg/models/block/nightshade/stairs.json +425155648cad7267f6cf15c92197a88dc43e0016 assets/byg/models/block/nightshade/stairs_inner.json +e463114ea5489452953354d869e4b127dfc1cfce assets/byg/models/block/nightshade/stairs_outer.json +d4a671cd66c0b1d0fb00744a3db52b818b607f41 assets/byg/models/block/nightshade/stripped_log.json +8944e386230c5a2501887f0e4df8fb0971fc3be3 assets/byg/models/block/nightshade/stripped_wood.json +228018989a6c500e524081fbc7938eb36bcaa636 assets/byg/models/block/nightshade/trapdoor_bottom.json +b794c5c74c1e2ef51ddbcbbfb4f2bd0ef0be529a assets/byg/models/block/nightshade/trapdoor_open.json +861d9433ae9a39491794cc35b10a31f50e57da76 assets/byg/models/block/nightshade/trapdoor_top.json +ebe95545fbc92bb6d0cd8e4a60a77ca8100a91ab assets/byg/models/block/nightshade/wood.json 73775020269c46d7eed295cd6898a9c700aea43e assets/byg/models/block/palm/bookshelf.json 8335e3f7ec34c1899bc24bda1d2c9f8a1e8be121 assets/byg/models/block/palm/button.json 46315a53d6effb3be613f52987aa17c55d4a092b assets/byg/models/block/palm/button_inventory.json @@ -1497,6 +1550,21 @@ b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves. 9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/item/mangrove_trapdoor.json b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json +d9852a7fff6598719476cf3d0ab8ca823c4d057f assets/byg/models/item/nightshade_bookshelf.json +b1fb5becac68091065fd9495073dbedba6a48109 assets/byg/models/item/nightshade_button.json +94aa426bb94a09dcdb4c19ccd90c68420e1400b6 assets/byg/models/item/nightshade_crafting_table.json +b63bb59776900e38343e9b03de4853962883412c assets/byg/models/item/nightshade_door.json +9ff73309cd9d5461e1429e8d0c2aa8cdf6c09b16 assets/byg/models/item/nightshade_fence.json +e6f470eb6fabf0f116b6f26243fd281c1bd0c8af assets/byg/models/item/nightshade_fence_gate.json +a637397faf67cda4f303e9d8086d57b15c27468d assets/byg/models/item/nightshade_leaves.json +774fc1f73470ae4689c5994fd6d4626b4f7af0cf assets/byg/models/item/nightshade_log.json +74c9df807cade4612961b11a1da4151972f639fd assets/byg/models/item/nightshade_planks.json +3df61b09678ab516436a0b50a8e31c408e31589c assets/byg/models/item/nightshade_pressure_plate.json +f0bbb5065915d842bfe2bd87462c277218c5bc95 assets/byg/models/item/nightshade_sapling.json +5b5d2e2b41c69472fb8022fa333659ad2bf28a64 assets/byg/models/item/nightshade_slab.json +1c97bc6e1ca4177ffc2efb1a505cb7db8645d30b assets/byg/models/item/nightshade_stairs.json +8794a3b3dfc7dedd2a8a3ecc39359c14023857ee assets/byg/models/item/nightshade_trapdoor.json +a6a93a6825ebf3d50635a93e96f0ab15e4a328f2 assets/byg/models/item/nightshade_wood.json 18000c946ed522199aa1da394e8a7d0b5ccf8853 assets/byg/models/item/palm_boat.json a4ed7d5608be7b13280da58fb439fcc3326621c4 assets/byg/models/item/palm_bookshelf.json 0a1741fe2250f9d95c6d2429b41418f153311a9d assets/byg/models/item/palm_button.json @@ -1591,6 +1659,8 @@ be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_e 3cb6f573ba8293f70be4617d65d0238ec7b57324 assets/byg/models/item/stripped_mahogany_wood.json 15b7617de1da389e5b34feb74834b5558c69631b assets/byg/models/item/stripped_mangrove_log.json 9db799e21b94bb971d782aa6642ba2f2a5d19d7f assets/byg/models/item/stripped_mangrove_wood.json +ecb14641a281653709e15369a027afb36b73bc28 assets/byg/models/item/stripped_nightshade_log.json +89ecc0a3969ef6928bc7f9bcb48c6c86e3a33904 assets/byg/models/item/stripped_nightshade_wood.json 68eb2889df27becb11fe966b959e12d309f72e62 assets/byg/models/item/stripped_palm_log.json e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wood.json 4c39f243be0cd275197a200ed0ace2061d6b413c assets/byg/models/item/stripped_pine_log.json @@ -1874,6 +1944,18 @@ cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/w c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json 80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json 8e68638672aded0392ab42d4d99747032a597867 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json +ca3828e70ccfd562118f860470807c205294bd08 data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json +b0cc3d01f15d0ed8ecbc72784297f5eeee23f2c4 data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json +d7cd6788013f6af1288e4ffea4778200b7661e83 data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json +55bdd94155956e116a9cf2b48cac5db8b767f3ce data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json +c560c853dcebf5028fb974bf928cd08a97effca6 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json +7424866d4cfbc7f66606837bd73fd4c358109cd7 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json +95c181f92a7d0bede76c0927ab1ff9aaeee9edaa data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json +6f77c8749d512ac370c4e3eeda4c2620f8ced14a data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json +6237257ab8d96d71f1482649060d9b48dc04a039 data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json +a7581263bd5c31bd45d691415a2ad25c7117cb64 data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json +3a8450da76c3d276e069cbd7dddb6b7461f98ad0 data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json +7c99e79382b086d57bb1b498a474a602afefdc8c data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json 91ec4bd9aa552d0c8185558e473bd37dea9ed4ba data/byg/advancements/recipes/byg.byg/wood/palm/boat.json ea278f1d625776b8651b4126ca2cbbff65364aaa data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json 742cf53a038d7572b6c0d2c290349c2768e24198 data/byg/advancements/recipes/byg.byg/wood/palm/button.json @@ -2181,6 +2263,18 @@ b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshel 5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json 9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json abd1d968c12a7255a1504388adb8d92700c82692 data/byg/recipes/wood/mangrove/wood.json +40bb384c86428a74cf2149b91ef2a14b02bfb092 data/byg/recipes/wood/nightshade/bookshelf.json +fb731632fc441eef65edd773e72759b185c6d866 data/byg/recipes/wood/nightshade/button.json +e941f260e96d1c82a0fc2cb9622edd227269733d data/byg/recipes/wood/nightshade/crafting_table.json +9828ab1f9bc4bb53b87c106e4c4bee9989df0764 data/byg/recipes/wood/nightshade/door.json +e413ce280efce5047f7ed98ccd5ba9e0f8c3ca48 data/byg/recipes/wood/nightshade/fence.json +f0f012a31d50cace41599b03166f92e7ceb36bd9 data/byg/recipes/wood/nightshade/fence_gate.json +28c71aa583c5cd150bd6962496ec781bac057017 data/byg/recipes/wood/nightshade/planks.json +064a8bbb780dad8b5cf1c4c66cd58e0d2da80eb8 data/byg/recipes/wood/nightshade/pressure_plate.json +c5c6bb0ccbee4eb60bc9dd7cd8b411346a4b024f data/byg/recipes/wood/nightshade/slab.json +afe90f1802908dab650b36cc6d67bfbe15a7117b data/byg/recipes/wood/nightshade/stairs.json +e0614498736d2fb02b1b58793ca93c1abca85933 data/byg/recipes/wood/nightshade/trapdoor.json +a68c2d7e64e273c6ce0a5fce50f197c2946caae4 data/byg/recipes/wood/nightshade/wood.json 247270685d75f0d12b2aafa381070f6631892aca data/byg/recipes/wood/palm/boat.json e01f1b1b87ff1f6511f7cc2d1f04f457b96bfb01 data/byg/recipes/wood/palm/bookshelf.json 64410fa72ab5ce643357c3ba80c2cbc2f2d52310 data/byg/recipes/wood/palm/button.json @@ -2424,6 +2518,7 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant 60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json 095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json 5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json +88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/blocks/wood/nightshade_logs.json 701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json @@ -2448,6 +2543,7 @@ be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchante 265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json 5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json +1f67e3ee3ad89eb98f5135e669b341697aaa8730 data/byg/tags/items/wood/nightshade_logs.json cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json 52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_bookshelf.json new file mode 100644 index 0000000000..d88ecbcd97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json new file mode 100644 index 0000000000..5c9562c0b4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/nightshade/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/nightshade/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_crafting_table.json new file mode 100644 index 0000000000..999f0ec255 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json new file mode 100644 index 0000000000..573b25ec57 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_fence.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json similarity index 68% rename from Common/src/main/resources/assets/byg/blockstates/nightshade_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json index 50218202b4..922faa8c61 100644 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json @@ -2,46 +2,46 @@ "multipart": [ { "apply": { - "model": "byg:block/nightshade_fence_post" + "model": "byg:block/nightshade/fence_post" } }, { - "apply": { - "model": "byg:block/nightshade_fence_side", - "uvlock": true - }, "when": { "north": "true" - } - }, - { + }, "apply": { - "model": "byg:block/nightshade_fence_side", - "y": 90, + "model": "byg:block/nightshade/fence", "uvlock": true - }, - "when": { - "east": "true" } }, { + "when": { + "south": "true" + }, "apply": { - "model": "byg:block/nightshade_fence_side", + "model": "byg:block/nightshade/fence", "y": 180, "uvlock": true - }, - "when": { - "south": "true" } }, { + "when": { + "west": "true" + }, "apply": { - "model": "byg:block/nightshade_fence_side", + "model": "byg:block/nightshade/fence", "y": 270, "uvlock": true - }, + } + }, + { "when": { - "west": "true" + "east": "true" + }, + "apply": { + "model": "byg:block/nightshade/fence", + "y": 90, + "uvlock": true } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json new file mode 100644 index 0000000000..26eacdeb98 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_leaves.json new file mode 100644 index 0000000000..6f7176b9bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_log.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_log.json similarity index 51% rename from Common/src/main/resources/assets/byg/blockstates/nightshade_log.json rename to Common/src/generated/resources/assets/byg/blockstates/nightshade_log.json index 01931eff96..9b8a47a510 100644 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_log.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/nightshade/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/nightshade_log" + "model": "byg:block/nightshade/log" }, "axis=z": { - "model": "byg:block/nightshade_log", + "model": "byg:block/nightshade/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/nightshade_log", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_planks.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_planks.json new file mode 100644 index 0000000000..f4febc845c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_pressure_plate.json new file mode 100644 index 0000000000..df44463923 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/nightshade/pressure_plate" + }, + "powered=true": { + "model": "byg:block/nightshade/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_sapling.json new file mode 100644 index 0000000000..01e12030bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json new file mode 100644 index 0000000000..18270cbe0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/nightshade/slab_top" + }, + "type=bottom": { + "model": "byg:block/nightshade/slab" + }, + "type=double": { + "model": "byg:block/nightshade/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json new file mode 100644 index 0000000000..12f0363459 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json new file mode 100644 index 0000000000..488a049d4d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_wood.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_wood.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/nightshade_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/nightshade_wood.json index d184251f26..ca005caccb 100644 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_wood.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_wood.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/nightshade/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/nightshade_wood" + "model": "byg:block/nightshade/wood" }, "axis=z": { - "model": "byg:block/nightshade_wood", + "model": "byg:block/nightshade/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/nightshade_wood", - "x": 90, - "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_nightshade_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_nightshade_sapling.json new file mode 100644 index 0000000000..4f135bf24c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_nightshade_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_log.json new file mode 100644 index 0000000000..63f19582b3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/nightshade/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/nightshade/stripped_log" + }, + "axis=z": { + "model": "byg:block/nightshade/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_wood.json new file mode 100644 index 0000000000..1785aa09c4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_nightshade_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/nightshade/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/nightshade/stripped_wood" + }, + "axis=z": { + "model": "byg:block/nightshade/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json new file mode 100644 index 0000000000..3df18caf41 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/nightshade/planks", + "up": "byg:block/nightshade/planks", + "north": "byg:block/nightshade/bookshelf", + "south": "byg:block/nightshade/bookshelf", + "east": "byg:block/nightshade/bookshelf", + "west": "byg:block/nightshade/bookshelf", + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_button.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/button.json similarity index 57% rename from Common/src/main/resources/assets/byg/models/block/nightshade_button.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/button.json index f37f8ac022..a4690d0d8c 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_button.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/button_inventory.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/nightshade_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/button_inventory.json index 74b493c229..d57e0d430d 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_button_inventory.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/button_pressed.json similarity index 60% rename from Common/src/main/resources/assets/byg/models/block/nightshade_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/button_pressed.json index 928395cf05..e94a49bd20 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_button_pressed.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json new file mode 100644 index 0000000000..791af924df --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/nightshade/planks", + "up": "byg:block/nightshade/crafting_table_top", + "north": "byg:block/nightshade/crafting_table_front", + "south": "byg:block/nightshade/crafting_table_side", + "east": "byg:block/nightshade/crafting_table_side", + "west": "byg:block/nightshade/crafting_table_front", + "particle": "byg:block/nightshade/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json new file mode 100644 index 0000000000..45ac8cf917 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json new file mode 100644 index 0000000000..1ff784af5b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json new file mode 100644 index 0000000000..9c1eeec89c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json new file mode 100644 index 0000000000..473ced87ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json new file mode 100644 index 0000000000..52401b3dbf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/nightshade/planks", + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate.json index c701f53f1d..01d3445eaa 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_open.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_open.json index dbee6aa645..81bc7e0601 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall.json index b9133cfcb0..23388e655b 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall_open.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall_open.json index 41df0a16e7..e507a88eb7 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_gate_wall_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json new file mode 100644 index 0000000000..d74642e27d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/nightshade/planks", + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json new file mode 100644 index 0000000000..2fd47d89ae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/nightshade/planks", + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/grower_item.json new file mode 100644 index 0000000000..48f6b77bbd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/nightshade/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json new file mode 100644 index 0000000000..535a967a48 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/nightshade/leaves", + "up": "byg:block/nightshade/leaves", + "north": "byg:block/nightshade/leaves", + "south": "byg:block/nightshade/leaves", + "east": "byg:block/nightshade/leaves", + "west": "byg:block/nightshade/leaves", + "particle": "byg:block/nightshade/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json new file mode 100644 index 0000000000..cbdf485452 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/nightshade/leaves_snowy", + "up": "byg:block/nightshade/leaves_snowy", + "north": "byg:block/nightshade/leaves_snowy_side", + "south": "byg:block/nightshade/leaves_snowy_side", + "east": "byg:block/nightshade/leaves_snowy_side", + "west": "byg:block/nightshade/leaves_snowy_side", + "particle": "byg:block/nightshade/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json new file mode 100644 index 0000000000..8971dbe372 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/nightshade/log", + "end": "byg:block/nightshade/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json new file mode 100644 index 0000000000..89dbf24402 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/nightshade/planks", + "up": "byg:block/nightshade/planks", + "north": "byg:block/nightshade/planks", + "south": "byg:block/nightshade/planks", + "east": "byg:block/nightshade/planks", + "west": "byg:block/nightshade/planks", + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/potted_grower_item.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/potted_grower_item.json new file mode 100644 index 0000000000..68e7152c35 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/potted_grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/nightshade/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate.json index 7e3bbebc5a..a50b9fca1a 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate_down.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate_down.json index 8a7450d3ce..39b8ce5a0d 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_pressure_plate_down.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "byg:block/nightshade_planks" + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json new file mode 100644 index 0000000000..fa977928f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/nightshade/planks", + "bottom": "byg:block/nightshade/planks", + "top": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json new file mode 100644 index 0000000000..58630afc0a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/nightshade/planks", + "bottom": "byg:block/nightshade/planks", + "top": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json new file mode 100644 index 0000000000..d2b2792761 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/nightshade/planks", + "bottom": "byg:block/nightshade/planks", + "top": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json new file mode 100644 index 0000000000..33dae9e25c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/nightshade/planks", + "bottom": "byg:block/nightshade/planks", + "top": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json new file mode 100644 index 0000000000..18e0585f96 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/nightshade/planks", + "bottom": "byg:block/nightshade/planks", + "top": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json new file mode 100644 index 0000000000..22e27dba8f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/nightshade/stripped_log", + "end": "byg:block/nightshade/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_wood.json new file mode 100644 index 0000000000..a4c76357a7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/nightshade/stripped_log", + "particle": "byg:block/nightshade/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_bottom.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_bottom.json index c699ca4cee..03ce4cbc57 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "byg:block/nightshade_trapdoor" + "texture": "byg:block/nightshade/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_open.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_open.json index 789d44674b..a6d4a313e3 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "byg:block/nightshade_trapdoor" + "texture": "byg:block/nightshade/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_top.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_top.json index 3a45ace749..103b50b5c1 100644 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_trapdoor_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "byg:block/nightshade_trapdoor" + "texture": "byg:block/nightshade/trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/wood.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/wood.json new file mode 100644 index 0000000000..c947e436d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/nightshade/log", + "particle": "byg:block/nightshade/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json new file mode 100644 index 0000000000..f6a5c76058 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json new file mode 100644 index 0000000000..4f9be5ea03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json new file mode 100644 index 0000000000..d045b98fa1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_door.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_door.json similarity index 60% rename from Common/src/main/resources/assets/byg/models/item/nightshade_door.json rename to Common/src/generated/resources/assets/byg/models/item/nightshade_door.json index e4f7054d20..27a133733a 100644 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_door.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/nightshade_door" + "layer0": "byg:item/nightshade/door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json new file mode 100644 index 0000000000..c473683ad9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/fence_inv", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json new file mode 100644 index 0000000000..a2939ebcd3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json new file mode 100644 index 0000000000..55a4f979ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json new file mode 100644 index 0000000000..61400ed16e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json new file mode 100644 index 0000000000..d581d09f4b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json new file mode 100644 index 0000000000..f95c4bb690 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_sapling.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_sapling.json new file mode 100644 index 0000000000..c2b6525d29 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/nightshade/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json new file mode 100644 index 0000000000..2b97cfdc49 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json new file mode 100644 index 0000000000..be2ee68b81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json new file mode 100644 index 0000000000..f36ebc5cc6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json new file mode 100644 index 0000000000..46c407b9ce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json new file mode 100644 index 0000000000..d78a85d0ec --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json new file mode 100644 index 0000000000..347bfecba4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/nightshade/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json new file mode 100644 index 0000000000..5d98ec2a86 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json new file mode 100644 index 0000000000..74187c1560 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json new file mode 100644 index 0000000000..4c76e666f3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json new file mode 100644 index 0000000000..a49d336114 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json new file mode 100644 index 0000000000..49bd32dabd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json new file mode 100644 index 0000000000..23fc38b851 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json new file mode 100644 index 0000000000..84b900eee8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/nightshade_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json new file mode 100644 index 0000000000..64dd2962df --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json new file mode 100644 index 0000000000..ef0276c3f2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json new file mode 100644 index 0000000000..49272cbfa0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json new file mode 100644 index 0000000000..ee89dbdf6f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json new file mode 100644 index 0000000000..7043849f03 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json similarity index 73% rename from Common/src/main/resources/data/byg/recipes/nightshade_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json index c39d16d88a..93b8e5934a 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_button.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/nightshade_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/button.json diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json similarity index 75% rename from Common/src/main/resources/data/byg/recipes/nightshade_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json index 19f2004043..4444cc8068 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_door.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/nightshade_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json index b887592fe6..e4fa277eef 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/nightshade_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/nightshade_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json similarity index 68% rename from Common/src/main/resources/data/byg/recipes/nightshade_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json index f7f4922bfd..6b74663b44 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:nightshade_logs" + "tag": "byg:wood/nightshade_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/nightshade_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json index cd21b17dad..f8b40ecd45 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/nightshade_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json index 5d9d2e5cea..c1463cb2b1 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json similarity index 57% rename from Common/src/main/resources/data/byg/recipes/nightshade_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json index cf3df6bc60..b1eebe34ed 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", - "group": "byg:nightshade_stairs", + "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, "result": { - "item": "byg:nightshade_stairs", + "item": "byg:nightshade_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/nightshade_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json index 4d8eff433c..e84edcb879 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json similarity index 79% rename from Common/src/main/resources/data/byg/recipes/nightshade_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json index 617aa9c902..c2f23aa08f 100644 --- a/Common/src/main/resources/data/byg/recipes/nightshade_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:nightshade_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json new file mode 100644 index 0000000000..6bff75fa77 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:nightshade_log", + "byg:nightshade_wood", + "byg:stripped_nightshade_log", + "byg:stripped_nightshade_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json new file mode 100644 index 0000000000..d5b90f8e91 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:nightshade_log", + "byg:stripped_nightshade_log", + "byg:nightshade_wood", + "byg:stripped_nightshade_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index da1f3f162f..0120e81be7 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -99,7 +99,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.ETHER_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ETHER_GRASS.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.THEREAL_BELLFLOWER.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.NIGHTSHADE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_ODDITY.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.PURPLE_BULBIS_SHELL.get(), RenderType.translucent()); map.put(BYGBlocks.BULBIS_SHELL.get(), RenderType.translucent()); @@ -140,14 +139,12 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.NIGHTSHADE_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.SKYRIS_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.NIGHTSHADE_TRAPDOOR.get(), RenderType.cutoutMipped()); //Grass map.put(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), RenderType.translucent()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index fd266c98c1..62b447c663 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -50,7 +50,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FIRECRACKER_LEAVES.get()); @@ -80,7 +79,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.NIGHTSHADE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.LAMENT_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index d402d94c77..dfb797777b 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -30,7 +30,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.SKYRIS_LOG.get(), BYGBlocks.STRIPPED_SKYRIS_LOG.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); - stripables.put(BYGBlocks.NIGHTSHADE_LOG.get(), BYGBlocks.STRIPPED_NIGHTSHADE_LOG.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); @@ -39,7 +38,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.SKYRIS_WOOD.get(), BYGBlocks.STRIPPED_SKYRIS_WOOD.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); - stripables.put(BYGBlocks.NIGHTSHADE_WOOD.get(), BYGBlocks.STRIPPED_NIGHTSHADE_WOOD.get()); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); AxeItemAccess.byg_setStripables(stripables); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 905cbea3b6..1e9f6449f4 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -66,79 +66,66 @@ public class BYGBlocks { public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); - public static final BlockRegistryObject NIGHTSHADE_PLANKS = createPlanks("nightshade_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); - public static final BlockRegistryObject NIGHTSHADE_BOOKSHELF = createBookshelf("nightshade_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); - public static final BlockRegistryObject NIGHTSHADE_DOOR = createDoor("nightshade_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); - public static final BlockRegistryObject NIGHTSHADE_PRESSURE_PLATE = createWoodPressurePlate("nightshade_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); - public static final BlockRegistryObject NIGHTSHADE_BUTTON = createWoodButton("nightshade_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); - public static final BlockRegistryObject NIGHTSHADE_TRAPDOOR = createTrapDoor("nightshade_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); - public static final BlockRegistryObject NIGHTSHADE_CRAFTING_TABLE = createCraftingTable("nightshade_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); - public static final BlockRegistryObject NIGHTSHADE_FENCE_GATE = createFenceGate("nightshade_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); - public static final BlockRegistryObject NIGHTSHADE_SLAB = createWoodSlab("nightshade_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); - public static final BlockRegistryObject NIGHTSHADE_STAIRS = createWoodStairs("nightshade_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); - public static final BlockRegistryObject NIGHTSHADE_FENCE = createFence("nightshade_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); - public static final BlockRegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); - public static final BlockRegistryObject NIGHTSHADE_WALL_SIGN = createWallSign("nightshade_wall_sign", BYGWoodType.NIGHTSHADE, NIGHTSHADE_PLANKS); public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -179,7 +166,6 @@ public class BYGBlocks { public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); public static final BlockRegistryObject LAMENT_SAPLING = createSapling(BYGBlockTags.GROUND_LAMENT_SAPLING, "lament_sapling"); public static final BlockRegistryObject WITHERING_OAK_SAPLING = createFungus(BYGBlockTags.GROUND_WITHERING_OAK_SAPLING, "withering_oak_sapling"); - public static final BlockRegistryObject NIGHTSHADE_SAPLING = createSapling(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING, "nightshade_sapling"); public static final BlockRegistryObject JACARANDA_BUSH = createJacarandaBush("jacaranda_bush"); public static final BlockRegistryObject INDIGO_JACARANDA_BUSH = createIndigoJacarandaBush("indigo_jacaranda_bush"); @@ -224,7 +210,6 @@ public class BYGBlocks { public static final BlockRegistryObject LAMENT_LEAVES = createLeaves(MaterialColor.COLOR_MAGENTA, "lament_leaves"); public static final BlockRegistryObject WITHERING_OAK_LEAVES = createLeaves(MaterialColor.COLOR_GRAY, "withering_oak_leaves"); public static final BlockRegistryObject FLOWERING_NIGHTSHADE_LEAVES = createGlowingLeaves(MaterialColor.COLOR_ORANGE, 15, "flowering_nightshade_leaves"); - public static final BlockRegistryObject NIGHTSHADE_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "nightshade_leaves"); public static final BlockRegistryObject FIRECRACKER_LEAVES = createFirecrackerLeavesBlock(MaterialColor.COLOR_GREEN, "firecracker_leaves"); public static final BlockRegistryObject GREEN_MUSHROOM_BLOCK = createBlock(BYGBlockProperties.BlockHugeMushroom::new, "green_mushroom_block"); @@ -511,7 +496,6 @@ public class BYGBlocks { public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); - public static final BlockRegistryObject NIGHTSHADE_LOG = createLog("nightshade_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); @@ -522,7 +506,6 @@ public class BYGBlocks { public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); - public static final BlockRegistryObject NIGHTSHADE_WOOD = createWood("nightshade_wood"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); public static final BlockRegistryObject WHITE_PUFFBALL = createWhitePuffBlock(SoundType.FUNGUS, MaterialColor.TERRACOTTA_WHITE, "white_puffball"); @@ -654,14 +637,12 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); - public static final BlockRegistryObject STRIPPED_NIGHTSHADE_LOG = createStrippedLog("stripped_nightshade_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); - public static final BlockRegistryObject STRIPPED_NIGHTSHADE_WOOD = createWood("stripped_nightshade_wood"); public static final BlockRegistryObject TALL_ALLIUM = createTallFlower("tall_allium", BYGBlockTags.GROUND_TALL_ALLIUM); public static final BlockRegistryObject TALL_PINK_ALLIUM = createTallFlower("tall_pink_allium", BYGBlockTags.GROUND_TALL_PINK_ALLIUM); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index e31f04cb21..a202d88af7 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -13,7 +13,6 @@ public class BYGWoodType { public static final WoodType MAPLE = register("maple"); public static final WoodType SKYRIS = register("skyris"); public static final WoodType LAMENT = register("lament"); - public static final WoodType NIGHTSHADE = register("nightshade"); private static WoodType register(String id) { return BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(id).toString().replace(":", "/"))) : null; diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 717c149620..3931433af6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -130,7 +130,10 @@ public enum BYGWoodTypes { .exclude(BlockType.LEAVES) .registryName(BlockType.LOG, "%s_pedu") .registryName(BlockType.STRIPPED_LOG, "stripped_%s_pedu") - .nether()); + .nether()), + NIGHTSHADE("nightshade", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING) + .materialColor(MaterialColor.COLOR_ORANGE)); public static final Map LOOKUP; static { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 7d311902ab..7cb5844300 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -363,26 +363,8 @@ public class BYGItems { public static final RegistryObject MAPLE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MAPLE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "maple_boat"); //Nightshade Woodtype - public static final RegistryObject NIGHTSHADE_SAPLING = createSaplingItem(BYGBlocks.NIGHTSHADE_SAPLING); - public static final RegistryObject FLOWERING_NIGHTSHADE_LEAVES = createItem(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES); - public static final RegistryObject NIGHTSHADE_LEAVES = createItem(BYGBlocks.NIGHTSHADE_LEAVES); - public static final RegistryObject IMBUED_NIGHTSHADE_LOG = createItem(BYGBlocks.IMBUED_NIGHTSHADE_LOG); - public static final RegistryObject NIGHTSHADE_LOG = createItem(BYGBlocks.NIGHTSHADE_LOG); - public static final RegistryObject NIGHTSHADE_WOOD = createItem(BYGBlocks.NIGHTSHADE_WOOD); - public static final RegistryObject STRIPPED_NIGHTSHADE_LOG = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_LOG); - public static final RegistryObject STRIPPED_NIGHTSHADE_WOOD = createItem(BYGBlocks.STRIPPED_NIGHTSHADE_WOOD); - public static final RegistryObject NIGHTSHADE_PLANKS = createItem(BYGBlocks.NIGHTSHADE_PLANKS); - public static final RegistryObject NIGHTSHADE_BOOKSHELF = createItem(BYGBlocks.NIGHTSHADE_BOOKSHELF); - public static final RegistryObject NIGHTSHADE_CRAFTING_TABLE = createItem(BYGBlocks.NIGHTSHADE_CRAFTING_TABLE); - public static final RegistryObject NIGHTSHADE_STAIRS = createItem(BYGBlocks.NIGHTSHADE_STAIRS); - public static final RegistryObject NIGHTSHADE_SLAB = createItem(BYGBlocks.NIGHTSHADE_SLAB); - public static final RegistryObject NIGHTSHADE_FENCE = createItem(BYGBlocks.NIGHTSHADE_FENCE); - public static final RegistryObject NIGHTSHADE_FENCE_GATE = createItem(BYGBlocks.NIGHTSHADE_FENCE_GATE); - public static final RegistryObject NIGHTSHADE_DOOR = createItem(BYGBlocks.NIGHTSHADE_DOOR); - public static final RegistryObject NIGHTSHADE_TRAPDOOR = createItem(BYGBlocks.NIGHTSHADE_TRAPDOOR); - public static final RegistryObject NIGHTSHADE_PRESSURE_PLATE = createItem(BYGBlocks.NIGHTSHADE_PRESSURE_PLATE); - public static final RegistryObject NIGHTSHADE_BUTTON = createItem(BYGBlocks.NIGHTSHADE_BUTTON); - public static final RegistryObject NIGHTSHADE_SIGN = createSign("nightshade_sign", BYGBlocks.NIGHTSHADE_SIGN, BYGBlocks.NIGHTSHADE_WALL_SIGN); + public static final RegistryObject FLOWERING_NIGHTSHADE_LEAVES; + public static final RegistryObject IMBUED_NIGHTSHADE_LOG; //Palo Verde Woodtype public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); @@ -479,7 +461,12 @@ public class BYGItems { // TODO Lamient, Jacaranda BYGWoodTypes.MAHOGANY.init(); BYGWoodTypes.MANGROVE.init(); - // TODO Maple, Nightshade + // TODO Maple + + FLOWERING_NIGHTSHADE_LEAVES = createItem(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES); + IMBUED_NIGHTSHADE_LOG = createItem(BYGBlocks.IMBUED_NIGHTSHADE_LOG); + BYGWoodTypes.NIGHTSHADE.init(); + BYGWoodTypes.PALM.init(); // TODO palo verde BYGWoodTypes.PINE.init(); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java index 9e2498b70f..4e99b440f6 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/end/BYGEndVegetationFeatures.java @@ -184,12 +184,12 @@ public class BYGEndVegetationFeatures { BYGFeatures.NIGHTSHADE_BUSH1, new BYGTreeConfig.Builder() .setTrunkBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(22) @@ -200,12 +200,12 @@ public class BYGEndVegetationFeatures { BYGFeatures.NIGHTSHADE_BUSH2, new BYGTreeConfig.Builder() .setTrunkBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(22) @@ -217,13 +217,13 @@ public class BYGEndVegetationFeatures { new BYGTreeConfig.Builder() .setTrunkBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(22) @@ -235,13 +235,13 @@ public class BYGEndVegetationFeatures { new BYGTreeConfig.Builder() .setTrunkBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(22) @@ -253,13 +253,13 @@ public class BYGEndVegetationFeatures { new BYGTreeConfig.Builder() .setTrunkBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(33) @@ -271,13 +271,13 @@ public class BYGEndVegetationFeatures { new BYGTreeConfig.Builder() .setTrunkBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(BYGBlocks.NIGHTSHADE_LOG.defaultBlockState(), 9) + .add(BYGWoodTypes.NIGHTSHADE.log().defaultBlockState(), 9) .add(BYGBlocks.IMBUED_NIGHTSHADE_LOG.defaultBlockState(), 1)) ) .setLeavesBlock( new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES.defaultBlockState(), 3) - .add(BYGBlocks.NIGHTSHADE_LEAVES.defaultBlockState(), 8)) + .add(BYGWoodTypes.NIGHTSHADE.leaves().defaultBlockState(), 8)) ) .setMaxHeight(30) .setMinHeight(44) diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_bookshelf.json deleted file mode 100644 index 9143dfe67d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_button.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_button.json deleted file mode 100644 index 2a2d593b44..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/nightshade_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/nightshade_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/nightshade_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/nightshade_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/nightshade_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/nightshade_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/nightshade_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/nightshade_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/nightshade_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/nightshade_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/nightshade_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/nightshade_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/nightshade_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/nightshade_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/nightshade_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/nightshade_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/nightshade_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/nightshade_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/nightshade_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/nightshade_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/nightshade_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/nightshade_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/nightshade_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/nightshade_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_crafting_table.json deleted file mode 100644 index c9e221e456..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_door.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_door.json deleted file mode 100644 index d0b11f696f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/nightshade_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/nightshade_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/nightshade_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/nightshade_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/nightshade_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/nightshade_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/nightshade_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/nightshade_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/nightshade_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/nightshade_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/nightshade_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/nightshade_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/nightshade_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/nightshade_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/nightshade_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/nightshade_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/nightshade_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/nightshade_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/nightshade_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/nightshade_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/nightshade_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/nightshade_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_fence_gate.json deleted file mode 100644 index 7a4b7698cd..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/nightshade_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/nightshade_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/nightshade_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/nightshade_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/nightshade_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/nightshade_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/nightshade_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/nightshade_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/nightshade_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/nightshade_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/nightshade_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/nightshade_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/nightshade_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/nightshade_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/nightshade_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/nightshade_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_leaves.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_leaves.json deleted file mode 100644 index 6ad5071328..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_leaves" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_planks.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_planks.json deleted file mode 100644 index 27b476b003..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_pressure_plate.json deleted file mode 100644 index c55c29813c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/nightshade_pressure_plate" - }, - "powered=true": { - "model": "byg:block/nightshade_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_sapling.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_sapling.json deleted file mode 100644 index 6394c3c283..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_slab.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_slab.json deleted file mode 100644 index 3caf98b95a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/nightshade_slab" - }, - "type=double": { - "model": "byg:block/nightshade_planks" - }, - "type=top": { - "model": "byg:block/nightshade_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_stairs.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_stairs.json deleted file mode 100644 index 56af26c51b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/nightshade_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/nightshade_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/nightshade_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/nightshade_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/nightshade_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/nightshade_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/nightshade_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/nightshade_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/nightshade_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/nightshade_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/nightshade_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/nightshade_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/nightshade_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/nightshade_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/nightshade_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/nightshade_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/nightshade_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/nightshade_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/nightshade_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/nightshade_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/nightshade_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/nightshade_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/nightshade_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/nightshade_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/nightshade_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/nightshade_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_trapdoor.json deleted file mode 100644 index 5190d0a5a5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/nightshade_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/nightshade_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/nightshade_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/nightshade_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/nightshade_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/nightshade_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/nightshade_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/nightshade_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/nightshade_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/nightshade_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/nightshade_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/nightshade_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/nightshade_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/nightshade_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/nightshade_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/nightshade_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_log.json deleted file mode 100644 index ef45f6fc86..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_nightshade_log" - }, - "axis=z": { - "model": "byg:block/stripped_nightshade_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_nightshade_log", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_wood.json deleted file mode 100644 index 349e0b53a0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_nightshade_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_nightshade_wood" - }, - "axis=z": { - "model": "byg:block/stripped_nightshade_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_nightshade_wood", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/nightshade_bookshelf.json deleted file mode 100644 index 03fa2962cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/nightshade_planks", - "up": "byg:block/nightshade_planks", - "north": "byg:block/nightshade_bookshelf", - "east": "byg:block/nightshade_bookshelf", - "south": "byg:block/nightshade_bookshelf", - "west": "byg:block/nightshade_bookshelf", - "particle": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/nightshade_crafting_table.json deleted file mode 100644 index 35d93f3edf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/nightshade_crafting_table_front", - "down": "byg:block/nightshade_planks", - "up": "byg:block/nightshade_crafting_table_top", - "north": "byg:block/nightshade_crafting_table_front", - "east": "byg:block/nightshade_crafting_table_side", - "south": "byg:block/nightshade_crafting_table_side", - "west": "byg:block/nightshade_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom.json deleted file mode 100644 index 472ffbf528..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/nightshade_door_bottom", - "top": "byg:block/nightshade_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom_hinge.json deleted file mode 100644 index a37457b594..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/nightshade_door_bottom", - "top": "byg:block/nightshade_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_door_top.json b/Common/src/main/resources/assets/byg/models/block/nightshade_door_top.json deleted file mode 100644 index 51f4844a37..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/nightshade_door_bottom", - "top": "byg:block/nightshade_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/nightshade_door_top_hinge.json deleted file mode 100644 index c4f7e56c42..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/nightshade_door_bottom", - "top": "byg:block/nightshade_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/nightshade_fence_inventory.json deleted file mode 100644 index 9d3167b3af..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_post.json b/Common/src/main/resources/assets/byg/models/block/nightshade_fence_post.json deleted file mode 100644 index 12a8294136..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_leaves.json b/Common/src/main/resources/assets/byg/models/block/nightshade_leaves.json deleted file mode 100644 index b0941d0096..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/nightshade_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_log.json b/Common/src/main/resources/assets/byg/models/block/nightshade_log.json deleted file mode 100644 index 3b8bfd09e0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/nightshade_log_top", - "side": "byg:block/nightshade_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_planks.json b/Common/src/main/resources/assets/byg/models/block/nightshade_planks.json deleted file mode 100644 index 5c77c865dc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_sapling.json b/Common/src/main/resources/assets/byg/models/block/nightshade_sapling.json deleted file mode 100644 index eface824b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/nightshade_sapling", - "particle": "byg:block/nightshade_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_slab.json b/Common/src/main/resources/assets/byg/models/block/nightshade_slab.json deleted file mode 100644 index 008ac43975..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/nightshade_planks", - "top": "byg:block/nightshade_planks", - "side": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_slab_top.json b/Common/src/main/resources/assets/byg/models/block/nightshade_slab_top.json deleted file mode 100644 index acb34879b8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/nightshade_planks", - "top": "byg:block/nightshade_planks", - "side": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs.json b/Common/src/main/resources/assets/byg/models/block/nightshade_stairs.json deleted file mode 100644 index f92cc20608..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/nightshade_planks", - "top": "byg:block/nightshade_planks", - "side": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_inner.json deleted file mode 100644 index a41eac3a88..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/nightshade_planks", - "top": "byg:block/nightshade_planks", - "side": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_outer.json deleted file mode 100644 index ad86e914c7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/nightshade_planks", - "top": "byg:block/nightshade_planks", - "side": "byg:block/nightshade_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/nightshade_wood.json b/Common/src/main/resources/assets/byg/models/block/nightshade_wood.json deleted file mode 100644 index 73199426b9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/nightshade_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/nightshade_log", - "side": "byg:block/nightshade_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_log.json deleted file mode 100644 index 1b4f1f58f9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_nightshade_log_top", - "side": "byg:block/stripped_nightshade_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_wood.json deleted file mode 100644 index 7e471a10d3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_nightshade_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/stripped_nightshade_log", - "side": "byg:block/stripped_nightshade_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/nightshade_bookshelf.json deleted file mode 100644 index 51df0879f0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_bookshelf.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_bookshelf" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_button.json b/Common/src/main/resources/assets/byg/models/item/nightshade_button.json deleted file mode 100644 index 97264920bc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/nightshade_crafting_table.json deleted file mode 100644 index faf4c127ec..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_crafting_table.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_crafting_table" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_fence.json b/Common/src/main/resources/assets/byg/models/item/nightshade_fence.json deleted file mode 100644 index 4c26f3f9ed..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/nightshade_fence_gate.json deleted file mode 100644 index f18bf927bf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_leaves.json b/Common/src/main/resources/assets/byg/models/item/nightshade_leaves.json deleted file mode 100644 index 6720ee3fed..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_leaves" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_log.json b/Common/src/main/resources/assets/byg/models/item/nightshade_log.json deleted file mode 100644 index 74013790b4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_planks.json b/Common/src/main/resources/assets/byg/models/item/nightshade_planks.json deleted file mode 100644 index 1914457169..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/nightshade_pressure_plate.json deleted file mode 100644 index c7b82f29ba..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_sapling.json b/Common/src/main/resources/assets/byg/models/item/nightshade_sapling.json deleted file mode 100644 index 12175bb07e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/nightshade_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_slab.json b/Common/src/main/resources/assets/byg/models/item/nightshade_slab.json deleted file mode 100644 index b61548d889..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_stairs.json b/Common/src/main/resources/assets/byg/models/item/nightshade_stairs.json deleted file mode 100644 index 34cd97c352..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/nightshade_trapdoor.json deleted file mode 100644 index 346c5cd4dc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_wood.json b/Common/src/main/resources/assets/byg/models/item/nightshade_wood.json deleted file mode 100644 index 445f5bf386..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/nightshade_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_log.json deleted file mode 100644 index 1f7af462b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_nightshade_log" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_wood.json deleted file mode 100644 index c3fc0fff36..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_nightshade_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/stripped_nightshade_wood" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_door_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_sapling.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_leaves.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_log.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_log.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_log_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_planks.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_planks.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_nightshade_log.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_nightshade_log.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_nightshade_log_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_nightshade_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/nightshade_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/nightshade/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/nightshade_door.png b/Common/src/main/resources/assets/byg/textures/item/nightshade/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/nightshade_door.png rename to Common/src/main/resources/assets/byg/textures/item/nightshade/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_nightshade_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_nightshade_wood.json deleted file mode 100644 index b7d643b982..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_nightshade_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_nightshade_log" - } - }, - "result": { - "item": "byg:stripped_nightshade_wood", - "count": 3 - } -} \ No newline at end of file From c3aa6396b1fdc5d74d6cd95d4aea4266aaaff6ef Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Thu, 26 May 2022 21:18:06 +0300 Subject: [PATCH 53/90] Compress pngs --- Common/build.gradle | 7 +++++++ .../potted_nightshade_sapling.json | 7 ------- .../block/potted_nightshade_sapling.json | 6 ------ .../assets/byg/models/item/mini_logo.png | Bin 2459 -> 2371 bytes .../byg/textures/biome_previews/prairie.png | Bin 588161 -> 520192 bytes .../byg/textures/block/allium_flower_bush.png | Bin 290 -> 268 bytes .../assets/byg/textures/block/aloe_vera.png | Bin 257 -> 245 bytes .../byg/textures/block/alpine_bellflower.png | Bin 273 -> 251 bytes .../assets/byg/textures/block/amaranth.png | Bin 302 -> 279 bytes .../byg/textures/block/ametrine_block.png | Bin 669 -> 623 bytes .../byg/textures/block/ametrine_cluster.png | Bin 595 -> 519 bytes .../byg/textures/block/ametrine_ore.png | Bin 447 -> 437 bytes .../assets/byg/textures/block/angelica.png | Bin 285 -> 253 bytes .../byg/textures/block/anthracite_block.png | Bin 280 -> 249 bytes .../byg/textures/block/anthracite_ore.png | Bin 655 -> 264 bytes .../byg/textures/block/araucaria_leaves.png | Bin 270 -> 243 bytes .../byg/textures/block/araucaria_sapling.png | Bin 279 -> 254 bytes .../textures/block/arisian_bloom_branch.png | Bin 411 -> 360 bytes .../byg/textures/block/arisian_planks.png | Bin 563 -> 235 bytes .../byg/textures/block/aspen/bookshelf.png | Bin 675 -> 333 bytes .../block/aspen/crafting_table_front.png | Bin 684 -> 281 bytes .../block/aspen/crafting_table_side.png | Bin 267 -> 261 bytes .../block/aspen/crafting_table_top.png | Bin 463 -> 226 bytes .../byg/textures/block/aspen/door_bottom.png | Bin 379 -> 228 bytes .../byg/textures/block/aspen/door_top.png | Bin 416 -> 249 bytes .../byg/textures/block/aspen/grower_item.png | Bin 267 -> 232 bytes .../byg/textures/block/aspen/leaves.png | Bin 276 -> 258 bytes .../assets/byg/textures/block/aspen/log.png | Bin 399 -> 218 bytes .../byg/textures/block/aspen/log_top.png | Bin 551 -> 271 bytes .../byg/textures/block/aspen/planks.png | Bin 461 -> 215 bytes .../byg/textures/block/aspen/stripped_log.png | Bin 487 -> 227 bytes .../textures/block/aspen/stripped_log_top.png | Bin 426 -> 217 bytes .../byg/textures/block/aspen/trapdoor.png | Bin 333 -> 204 bytes .../byg/textures/block/baobab/bookshelf.png | Bin 692 -> 347 bytes .../block/baobab/crafting_table_front.png | Bin 655 -> 273 bytes .../block/baobab/crafting_table_side.png | Bin 647 -> 268 bytes .../block/baobab/crafting_table_top.png | Bin 444 -> 232 bytes .../byg/textures/block/baobab/door_bottom.png | Bin 505 -> 259 bytes .../byg/textures/block/baobab/door_top.png | Bin 563 -> 266 bytes .../textures/block/baobab/fruit_stage0.png | Bin 207 -> 181 bytes .../textures/block/baobab/fruit_stage1.png | Bin 339 -> 292 bytes .../textures/block/baobab/fruit_stage2.png | Bin 504 -> 429 bytes .../textures/block/baobab/fruit_stage3.png | Bin 317 -> 287 bytes .../byg/textures/block/baobab/grower_item.png | Bin 305 -> 281 bytes .../byg/textures/block/baobab/leaves.png | Bin 273 -> 254 bytes .../assets/byg/textures/block/baobab/log.png | Bin 485 -> 221 bytes .../byg/textures/block/baobab/log_top.png | Bin 588 -> 276 bytes .../byg/textures/block/baobab/planks.png | Bin 534 -> 218 bytes .../textures/block/baobab/stripped_log.png | Bin 527 -> 221 bytes .../block/baobab/stripped_log_top.png | Bin 573 -> 279 bytes .../byg/textures/block/baobab/trapdoor.png | Bin 484 -> 248 bytes .../assets/byg/textures/block/beach_grass.png | Bin 254 -> 230 bytes .../assets/byg/textures/block/begonia.png | Bin 278 -> 254 bytes .../assets/byg/textures/block/bistort.png | Bin 260 -> 240 bytes .../textures/block/black_cut_sandstone.png | Bin 170 -> 166 bytes .../assets/byg/textures/block/black_ice.png | Bin 246 -> 206 bytes .../assets/byg/textures/block/black_sand.png | Bin 163 -> 160 bytes .../textures/block/black_sandstone_bottom.png | Bin 180 -> 176 bytes .../textures/block/black_sandstone_top.png | Bin 158 -> 154 bytes .../byg/textures/block/blanket_weed.png | Bin 273 -> 257 bytes .../assets/byg/textures/block/blazed_ash.png | Bin 229 -> 217 bytes .../block/blooming_aloe_vera_bottom.png | Bin 286 -> 262 bytes .../textures/block/blooming_aloe_vera_top.png | Bin 277 -> 248 bytes .../block/blue_enchanted/bookshelf.png | Bin 652 -> 335 bytes .../blue_enchanted/crafting_table_front.png | Bin 407 -> 336 bytes .../blue_enchanted/crafting_table_side.png | Bin 400 -> 328 bytes .../blue_enchanted/crafting_table_top.png | Bin 367 -> 342 bytes .../block/blue_enchanted/door_bottom.png | Bin 560 -> 240 bytes .../block/blue_enchanted/door_top.png | Bin 656 -> 287 bytes .../textures/block/blue_enchanted/leaves.png | Bin 288 -> 272 bytes .../byg/textures/block/blue_enchanted/log.png | Bin 392 -> 387 bytes .../textures/block/blue_enchanted/log_top.png | Bin 521 -> 279 bytes .../textures/block/blue_enchanted/planks.png | Bin 453 -> 218 bytes .../block/blue_enchanted/planks_top.png | Bin 464 -> 229 bytes .../block/blue_enchanted/stripped_log.png | Bin 403 -> 213 bytes .../block/blue_enchanted/stripped_log_top.png | Bin 399 -> 209 bytes .../block/blue_enchanted/trapdoor.png | Bin 502 -> 254 bytes .../textures/block/blue_glowshroom_block.png | Bin 241 -> 207 bytes .../byg/textures/block/blue_netherrack.png | Bin 209 -> 202 bytes .../assets/byg/textures/block/blue_sand.png | Bin 234 -> 192 bytes .../byg/textures/block/blue_spruce_leaves.png | Bin 453 -> 262 bytes .../textures/block/blue_spruce_sapling.png | Bin 473 -> 290 bytes .../textures/block/boric_campfire_log_lit.png | Bin 1297 -> 581 bytes .../assets/byg/textures/block/boric_fire.png | Bin 1723 -> 696 bytes .../byg/textures/block/boric_fire_0.png | Bin 13822 -> 8916 bytes .../byg/textures/block/boric_fire_1.png | Bin 13286 -> 8571 bytes .../byg/textures/block/boric_lantern.png | Bin 278 -> 252 bytes .../assets/byg/textures/block/brimstone.png | Bin 508 -> 215 bytes .../byg/textures/block/brimstone_bricks.png | Bin 385 -> 215 bytes .../byg/textures/block/brimstone_gold_ore.png | Bin 635 -> 255 bytes .../block/brimstone_nether_gold_ore.png | Bin 627 -> 269 bytes .../block/brimstone_nether_quartz_ore.png | Bin 745 -> 273 bytes .../textures/block/brimstone_quartz_ore.png | Bin 747 -> 270 bytes .../byg/textures/block/brown_birch_leaves.png | Bin 196 -> 185 bytes .../byg/textures/block/brown_oak_sapling.png | Bin 210 -> 206 bytes .../textures/block/brown_zelkova_leaves.png | Bin 449 -> 393 bytes .../textures/block/brown_zelkova_sapling.png | Bin 326 -> 282 bytes .../textures/block/budding_ametrine_ore.png | Bin 536 -> 525 bytes .../textures/block/bulbis/anomaly_bottom.png | Bin 495 -> 441 bytes .../byg/textures/block/bulbis/anomaly_top.png | Bin 480 -> 402 bytes .../byg/textures/block/bulbis/bookshelf.png | Bin 686 -> 368 bytes .../block/bulbis/crafting_table_front.png | Bin 631 -> 282 bytes .../block/bulbis/crafting_table_side.png | Bin 598 -> 272 bytes .../block/bulbis/crafting_table_top .png | Bin 435 -> 232 bytes .../block/bulbis/crafting_table_top.png | Bin 305 -> 302 bytes .../byg/textures/block/bulbis/door_bottom.png | Bin 601 -> 257 bytes .../byg/textures/block/bulbis/door_top.png | Bin 581 -> 269 bytes .../byg/textures/block/bulbis/grower_item.png | Bin 281 -> 247 bytes .../assets/byg/textures/block/bulbis/log.png | Bin 639 -> 637 bytes .../byg/textures/block/bulbis/log_top.png | Bin 684 -> 388 bytes .../byg/textures/block/bulbis/planks.png | Bin 485 -> 219 bytes .../byg/textures/block/bulbis/shell.png | Bin 619 -> 592 bytes .../byg/textures/block/bulbis/sprouts.png | Bin 344 -> 296 bytes .../textures/block/bulbis/stripped_log.png | Bin 436 -> 226 bytes .../block/bulbis/stripped_log_top.png | Bin 583 -> 241 bytes .../byg/textures/block/bulbis/trapdoor.png | Bin 484 -> 259 bytes .../textures/block/bulbis_phycelium_top.png | Bin 243 -> 241 bytes .../textures/block/bush_blueberry_stage1.png | Bin 207 -> 202 bytes .../textures/block/bush_blueberry_stage2.png | Bin 223 -> 217 bytes .../textures/block/bush_blueberry_stage3.png | Bin 231 -> 225 bytes .../byg/textures/block/cactus_flower.png | Bin 244 -> 216 bytes .../block/cactus_flowering_spike_overlay.png | Bin 243 -> 219 bytes .../byg/textures/block/cactus_inside.png | Bin 271 -> 246 bytes .../textures/block/cactus_inside_bottom.png | Bin 268 -> 242 bytes .../byg/textures/block/carved_ether_stone.png | Bin 237 -> 233 bytes .../byg/textures/block/cattail_bottom.png | Bin 254 -> 227 bytes .../byg/textures/block/cattail_sprout.png | Bin 254 -> 226 bytes .../textures/block/cattail_sprout_roots.png | Bin 371 -> 288 bytes .../textures/block/cattail_thatch_side.png | Bin 276 -> 271 bytes .../byg/textures/block/cattail_thatch_top.png | Bin 243 -> 241 bytes .../assets/byg/textures/block/cattail_top.png | Bin 195 -> 181 bytes .../byg/textures/block/cherry/bookshelf.png | Bin 640 -> 352 bytes .../textures/block/cherry/crafting_side.png | Bin 597 -> 281 bytes .../textures/block/cherry/crafting_table.png | Bin 640 -> 283 bytes .../block/cherry/crafting_table_front.png | Bin 624 -> 299 bytes .../block/cherry/crafting_table_side.png | Bin 651 -> 304 bytes .../block/cherry/crafting_table_top.png | Bin 436 -> 232 bytes .../byg/textures/block/cherry/door_bottom.png | Bin 507 -> 255 bytes .../byg/textures/block/cherry/door_top.png | Bin 511 -> 268 bytes .../assets/byg/textures/block/cherry/log.png | Bin 331 -> 223 bytes .../byg/textures/block/cherry/log_top.png | Bin 536 -> 276 bytes .../byg/textures/block/cherry/planks.png | Bin 417 -> 241 bytes .../textures/block/cherry/stripped_log.png | Bin 429 -> 213 bytes .../block/cherry/stripped_log_top.png | Bin 472 -> 249 bytes .../byg/textures/block/cherry/trapdoor.png | Bin 509 -> 255 bytes .../block/chiseled_brimstone_bricks.png | Bin 469 -> 237 bytes .../block/chiseled_fungal_imparius.png | Bin 257 -> 256 bytes .../block/chiseled_polished_scoria_stone.png | Bin 250 -> 247 bytes .../block/chiseled_red_rock_bricks.png | Bin 613 -> 265 bytes .../textures/block/chiseled_travertine.png | Bin 253 -> 250 bytes .../block/chiseled_windswept_sandstone.png | Bin 259 -> 258 bytes .../byg/textures/block/cika/bookshelf.png | Bin 575 -> 370 bytes .../block/cika/crafting_table_front.png | Bin 491 -> 262 bytes .../block/cika/crafting_table_side.png | Bin 459 -> 249 bytes .../block/cika/crafting_table_top.png | Bin 428 -> 232 bytes .../byg/textures/block/cika/door_bottom.png | Bin 480 -> 279 bytes .../byg/textures/block/cika/door_top.png | Bin 523 -> 267 bytes .../assets/byg/textures/block/cika/log.png | Bin 414 -> 207 bytes .../byg/textures/block/cika/log_top.png | Bin 465 -> 261 bytes .../assets/byg/textures/block/cika/planks.png | Bin 415 -> 239 bytes .../byg/textures/block/cika/stripped_log.png | Bin 429 -> 204 bytes .../textures/block/cika/stripped_log_top.png | Bin 399 -> 235 bytes .../byg/textures/block/cika/trapdoor.png | Bin 525 -> 277 bytes .../block/cracked_brimstone_bricks.png | Bin 512 -> 249 bytes .../block/cracked_red_rock_bricks.png | Bin 690 -> 276 bytes .../byg/textures/block/cracked_red_sand.png | Bin 255 -> 254 bytes .../block/cracked_scoria_stone_bricks.png | Bin 258 -> 257 bytes .../block/crimson_berry_bush_stage0.png | Bin 240 -> 208 bytes .../block/crimson_berry_bush_stage1.png | Bin 305 -> 234 bytes .../block/crimson_berry_bush_stage2.png | Bin 444 -> 270 bytes .../block/crimson_berry_bush_stage3.png | Bin 574 -> 309 bytes .../assets/byg/textures/block/crocus.png | Bin 310 -> 277 bytes .../byg/textures/block/cryptic_bramble.png | Bin 622 -> 516 bytes .../block/cryptic_campfire_log_lit.png | Bin 587 -> 581 bytes .../byg/textures/block/cryptic_end_rod.png | Bin 303 -> 262 bytes .../byg/textures/block/cryptic_fire.png | Bin 847 -> 696 bytes .../byg/textures/block/cryptic_fire_0.png | Bin 16941 -> 12601 bytes .../byg/textures/block/cryptic_fire_1.png | Bin 17826 -> 13289 bytes .../byg/textures/block/cryptic_lantern.png | Bin 220 -> 211 bytes .../textures/block/cryptic_magma_block.png | Bin 1084 -> 329 bytes .../textures/block/cryptic_redstone_ore.png | Bin 843 -> 276 bytes .../byg/textures/block/cryptic_stone.png | Bin 643 -> 228 bytes .../byg/textures/block/cryptic_vent_top.png | Bin 764 -> 297 bytes .../textures/block/cryptic_vent_top_tall.png | Bin 789 -> 332 bytes .../block/cut_windswept_sandstone.png | Bin 253 -> 248 bytes .../byg/textures/block/cyan_amaranth.png | Bin 302 -> 279 bytes .../assets/byg/textures/block/cyan_rose.png | Bin 216 -> 214 bytes .../byg/textures/block/cypress/bookshelf.png | Bin 698 -> 345 bytes .../block/cypress/crafting_table_front.png | Bin 698 -> 289 bytes .../block/cypress/crafting_table_side.png | Bin 655 -> 285 bytes .../block/cypress/crafting_table_top.png | Bin 473 -> 232 bytes .../textures/block/cypress/door_bottom.png | Bin 534 -> 257 bytes .../byg/textures/block/cypress/door_top.png | Bin 567 -> 262 bytes .../assets/byg/textures/block/cypress/log.png | Bin 473 -> 214 bytes .../byg/textures/block/cypress/log_top.png | Bin 534 -> 264 bytes .../byg/textures/block/cypress/planks.png | Bin 525 -> 224 bytes .../textures/block/cypress/stripped_log.png | Bin 580 -> 227 bytes .../block/cypress/stripped_log_top.png | Bin 516 -> 246 bytes .../byg/textures/block/cypress/trapdoor.png | Bin 576 -> 263 bytes .../assets/byg/textures/block/dacite.png | Bin 241 -> 238 bytes .../byg/textures/block/dacite_bricks.png | Bin 277 -> 276 bytes .../byg/textures/block/dacite_pillar.png | Bin 243 -> 240 bytes .../byg/textures/block/dacite_pillar_top.png | Bin 266 -> 265 bytes .../assets/byg/textures/block/daffodil.png | Bin 271 -> 239 bytes .../assets/byg/textures/block/death_cap.png | Bin 271 -> 239 bytes .../block/death_cap_mushroom_block.png | Bin 257 -> 215 bytes .../textures/block/delphinium_flower_top.png | Bin 247 -> 242 bytes .../dusted_polished_blackstone_bricks.png | Bin 594 -> 220 bytes .../byg/textures/block/ebony/bookshelf.png | Bin 570 -> 352 bytes .../block/ebony/crafting_table_front.png | Bin 544 -> 280 bytes .../block/ebony/crafting_table_side.png | Bin 580 -> 289 bytes .../block/ebony/crafting_table_top.png | Bin 380 -> 227 bytes .../byg/textures/block/ebony/door_bottom.png | Bin 442 -> 256 bytes .../byg/textures/block/ebony/door_top.png | Bin 455 -> 265 bytes .../byg/textures/block/ebony/leaves.png | Bin 285 -> 265 bytes .../assets/byg/textures/block/ebony/log.png | Bin 422 -> 214 bytes .../byg/textures/block/ebony/log_top.png | Bin 516 -> 276 bytes .../byg/textures/block/ebony/planks.png | Bin 405 -> 241 bytes .../byg/textures/block/ebony/stripped_log.png | Bin 317 -> 190 bytes .../textures/block/ebony/stripped_log_top.png | Bin 406 -> 198 bytes .../byg/textures/block/ebony/trapdoor.png | Bin 414 -> 201 bytes .../byg/textures/block/embur/bookshelf.png | Bin 437 -> 432 bytes .../block/embur/crafting_table_front.png | Bin 347 -> 344 bytes .../block/embur/crafting_table_side.png | Bin 336 -> 333 bytes .../byg/textures/block/embur/door_bottom.png | Bin 672 -> 285 bytes .../byg/textures/block/embur/door_top.png | Bin 695 -> 309 bytes .../byg/textures/block/embur/log_top.png | Bin 296 -> 272 bytes .../byg/textures/block/embur/planks.png | Bin 278 -> 220 bytes .../byg/textures/block/embur/stripped_log.png | Bin 290 -> 261 bytes .../textures/block/embur/stripped_log_top.png | Bin 289 -> 260 bytes .../byg/textures/block/embur/trapdoor.png | Bin 666 -> 339 bytes .../byg/textures/block/embur_gel_vines.png | Bin 500 -> 305 bytes .../textures/block/embur_gel_vines_plant.png | Bin 533 -> 320 bytes .../assets/byg/textures/block/embur_lily.png | Bin 447 -> 272 bytes .../assets/byg/textures/block/embur_roots.png | Bin 234 -> 231 bytes .../byg/textures/block/embur_sprouts.png | Bin 191 -> 178 bytes .../assets/byg/textures/block/end_sand.png | Bin 682 -> 674 bytes .../assets/byg/textures/block/ender_lily.png | Bin 328 -> 298 bytes .../byg/textures/block/ether/bookshelf.png | Bin 706 -> 354 bytes .../block/ether/crafting_table_front.png | Bin 668 -> 346 bytes .../block/ether/crafting_table_side.png | Bin 704 -> 372 bytes .../block/ether/crafting_table_top.png | Bin 454 -> 232 bytes .../byg/textures/block/ether/door_bottom.png | Bin 441 -> 221 bytes .../byg/textures/block/ether/door_top.png | Bin 472 -> 262 bytes .../assets/byg/textures/block/ether/grass.png | Bin 314 -> 268 bytes .../byg/textures/block/ether/grower_item.png | Bin 284 -> 255 bytes .../byg/textures/block/ether/leaves.png | Bin 291 -> 264 bytes .../assets/byg/textures/block/ether/log.png | Bin 477 -> 221 bytes .../byg/textures/block/ether/log_top.png | Bin 486 -> 267 bytes .../byg/textures/block/ether/planks.png | Bin 429 -> 215 bytes .../byg/textures/block/ether/stripped_log.png | Bin 469 -> 241 bytes .../textures/block/ether/stripped_log_top.png | Bin 416 -> 224 bytes .../byg/textures/block/ether/trapdoor.png | Bin 518 -> 252 bytes .../byg/textures/block/ether_bulbs_stage0.png | Bin 234 -> 214 bytes .../byg/textures/block/ether_bulbs_stage1.png | Bin 247 -> 222 bytes .../byg/textures/block/ether_bulbs_stage2.png | Bin 277 -> 245 bytes .../byg/textures/block/ether_bulbs_stage3.png | Bin 296 -> 262 bytes .../assets/byg/textures/block/ether_bush.png | Bin 360 -> 314 bytes .../assets/byg/textures/block/ether_stone.png | Bin 235 -> 233 bytes .../byg/textures/block/ether_stone_top.png | Bin 243 -> 239 bytes .../byg/textures/block/fairy_slipper.png | Bin 278 -> 252 bytes .../byg/textures/block/fir/bookshelf.png | Bin 704 -> 345 bytes .../block/fir/crafting_table_front.png | Bin 674 -> 281 bytes .../block/fir/crafting_table_side.png | Bin 673 -> 278 bytes .../textures/block/fir/crafting_table_top.png | Bin 478 -> 246 bytes .../byg/textures/block/fir/door_bottom.png | Bin 434 -> 237 bytes .../byg/textures/block/fir/door_top.png | Bin 467 -> 245 bytes .../byg/textures/block/fir/grower_item.png | Bin 182 -> 181 bytes .../assets/byg/textures/block/fir/leaves.png | Bin 428 -> 425 bytes .../assets/byg/textures/block/fir/log.png | Bin 480 -> 226 bytes .../assets/byg/textures/block/fir/log_top.png | Bin 560 -> 275 bytes .../assets/byg/textures/block/fir/planks.png | Bin 474 -> 212 bytes .../byg/textures/block/fir/stripped_log.png | Bin 502 -> 226 bytes .../textures/block/fir/stripped_log_top.png | Bin 582 -> 258 bytes .../byg/textures/block/fir/trapdoor.png | Bin 484 -> 243 bytes .../block/firecracker_flower_bush.png | Bin 347 -> 321 bytes .../byg/textures/block/firecracker_leaves.png | Bin 314 -> 286 bytes .../textures/block/firecracker_leaves2.png | Bin 308 -> 284 bytes .../byg/textures/block/florus_bookshelf.png | Bin 725 -> 362 bytes .../block/florus_crafting_table_front.png | Bin 730 -> 310 bytes .../block/florus_crafting_table_side.png | Bin 708 -> 306 bytes .../block/florus_crafting_table_top.png | Bin 468 -> 232 bytes .../byg/textures/block/florus_door_bottom.png | Bin 682 -> 276 bytes .../byg/textures/block/florus_door_top.png | Bin 701 -> 276 bytes .../byg/textures/block/florus_planks.png | Bin 702 -> 264 bytes .../assets/byg/textures/block/florus_stem.png | Bin 443 -> 217 bytes .../byg/textures/block/florus_stem_top.png | Bin 705 -> 276 bytes .../byg/textures/block/florus_trapdoor.png | Bin 658 -> 277 bytes .../byg/textures/block/flower_patch.png | Bin 192 -> 184 bytes .../flowering_indigo_jacaranda_bush_side.png | Bin 277 -> 251 bytes .../flowering_indigo_jacaranda_leaves.png | Bin 298 -> 270 bytes .../block/flowering_jacaranda_bush_side.png | Bin 277 -> 251 bytes .../block/flowering_jacaranda_leaves.png | Bin 304 -> 275 bytes .../block/flowering_nightshade_leaves.png | Bin 747 -> 631 bytes .../block/flowering_orchard_leaves.png | Bin 229 -> 225 bytes .../flowering_orchard_leaves_overlay.png | Bin 246 -> 202 bytes .../textures/block/foragers_table_side.png | Bin 350 -> 340 bytes .../byg/textures/block/foxglove_bottom.png | Bin 303 -> 277 bytes .../byg/textures/block/foxglove_top.png | Bin 304 -> 277 bytes .../byg/textures/block/fungal_imparius.png | Bin 269 -> 237 bytes .../textures/block/fungal_imparius_block.png | Bin 240 -> 236 bytes .../textures/block/fungal_imparius_block2.png | Bin 264 -> 262 bytes .../textures/block/fungal_imparius_block3.png | Bin 270 -> 268 bytes .../block/fungal_imparius_filament.png | Bin 228 -> 203 bytes .../block/fungal_imparius_filament_block.png | Bin 266 -> 260 bytes .../textures/block/fungal_imparius_stem.png | Bin 257 -> 255 bytes .../block/fungal_imparius_stem_top.png | Bin 323 -> 307 bytes .../byg/textures/block/glacial_oak_planks.png | Bin 586 -> 582 bytes .../byg/textures/block/glowcane_purple.png | Bin 205 -> 204 bytes .../byg/textures/block/glowcelium_side.png | Bin 267 -> 266 bytes .../textures/block/golden_spined_cactus.png | Bin 282 -> 254 bytes .../block/green_apple_skyris_leaves.png | Bin 333 -> 305 bytes .../block/green_enchanted/bookshelf.png | Bin 604 -> 325 bytes .../green_enchanted/crafting_table_front.png | Bin 428 -> 296 bytes .../green_enchanted/crafting_table_side.png | Bin 415 -> 288 bytes .../green_enchanted/crafting_table_top.png | Bin 372 -> 336 bytes .../block/green_enchanted/door_bottom.png | Bin 615 -> 265 bytes .../block/green_enchanted/door_top.png | Bin 597 -> 261 bytes .../textures/block/green_enchanted/leaves.png | Bin 288 -> 272 bytes .../textures/block/green_enchanted/log.png | Bin 415 -> 370 bytes .../block/green_enchanted/log_top.png | Bin 491 -> 264 bytes .../textures/block/green_enchanted/planks.png | Bin 474 -> 221 bytes .../block/green_enchanted/planks_top.png | Bin 466 -> 219 bytes .../block/green_enchanted/stripped_log.png | Bin 425 -> 213 bytes .../green_enchanted/stripped_log_top.png | Bin 388 -> 210 bytes .../block/green_enchanted/trapdoor.png | Bin 569 -> 294 bytes .../byg/textures/block/green_mushroom_pot.png | Bin 261 -> 237 bytes .../assets/byg/textures/block/green_tulip.png | Bin 181 -> 180 bytes .../assets/byg/textures/block/guzmania.png | Bin 279 -> 250 bytes .../byg/textures/block/hanging_bone.png | Bin 476 -> 258 bytes .../textures/block/hanging_sythian_roots.png | Bin 318 -> 214 bytes .../block/hanging_sythian_roots_plants.png | Bin 385 -> 240 bytes .../byg/textures/block/holly/bookshelf.png | Bin 666 -> 365 bytes .../block/holly/crafting_table_front.png | Bin 687 -> 288 bytes .../block/holly/crafting_table_side.png | Bin 675 -> 283 bytes .../block/holly/crafting_table_top.png | Bin 453 -> 232 bytes .../byg/textures/block/holly/door_bottom.png | Bin 528 -> 258 bytes .../byg/textures/block/holly/door_top.png | Bin 549 -> 267 bytes .../assets/byg/textures/block/holly/log.png | Bin 496 -> 222 bytes .../byg/textures/block/holly/log_top.png | Bin 552 -> 258 bytes .../byg/textures/block/holly/planks.png | Bin 447 -> 241 bytes .../byg/textures/block/holly/stripped_log.png | Bin 446 -> 211 bytes .../textures/block/holly/stripped_log_top.png | Bin 505 -> 247 bytes .../byg/textures/block/holly/trapdoor.png | Bin 468 -> 273 bytes .../assets/byg/textures/block/horseweed.png | Bin 200 -> 198 bytes .../byg/textures/block/hydrangea_bush.png | Bin 396 -> 363 bytes .../textures/block/hydrangea_hedge_side.png | Bin 366 -> 331 bytes .../textures/block/hydrangea_hedge_top.png | Bin 347 -> 342 bytes .../textures/block/hypogeal_imperium_side.png | Bin 307 -> 282 bytes .../block/hypogeal_imperium_top_lit.png | Bin 434 -> 430 bytes .../textures/block/imbued_nightshade_log.png | Bin 600 -> 245 bytes .../block/imparius/crafting_table_front.png | Bin 332 -> 322 bytes .../block/imparius/crafting_table_side.png | Bin 325 -> 311 bytes .../textures/block/imparius/door_bottom.png | Bin 256 -> 250 bytes .../byg/textures/block/imparius/door_top.png | Bin 255 -> 247 bytes .../textures/block/imparius/grower_item.png | Bin 280 -> 252 bytes .../byg/textures/block/imparius/log.png | Bin 238 -> 234 bytes .../byg/textures/block/imparius/log_top.png | Bin 294 -> 289 bytes .../byg/textures/block/imparius/planks.png | Bin 249 -> 247 bytes .../byg/textures/block/imparius/trapdoor.png | Bin 273 -> 257 bytes .../block/imparius_mushroom_block.png | Bin 259 -> 255 bytes .../block/imparius_mushroom_branch.png | Bin 291 -> 255 bytes .../textures/block/imparius_mushroom_pot.png | Bin 260 -> 228 bytes .../byg/textures/block/imparius_phylium.png | Bin 320 -> 317 bytes .../textures/block/imparius_phylium_top.png | Bin 240 -> 237 bytes .../textures/block/imparius_phylium_top2.png | Bin 261 -> 259 bytes .../byg/textures/block/imparius_stem_top2.png | Bin 245 -> 243 bytes .../byg/textures/block/imparius_vine.png | Bin 241 -> 217 bytes .../textures/block/imparius_vine_plant.png | Bin 281 -> 253 bytes .../textures/block/imparius_vine_plant2.png | Bin 350 -> 311 bytes .../assets/byg/textures/block/incan_lily.png | Bin 266 -> 244 bytes .../textures/block/indigo_jacaranda_bush.png | Bin 301 -> 274 bytes .../block/indigo_jacaranda_bush_side.png | Bin 258 -> 231 bytes .../block/indigo_jacaranda_bush_top.png | Bin 230 -> 222 bytes .../block/indigo_jacaranda_leaves.png | Bin 276 -> 258 bytes .../block/indigo_jacaranda_sapling.png | Bin 280 -> 247 bytes .../assets/byg/textures/block/iris.png | Bin 253 -> 225 bytes .../byg/textures/block/iron_deposit_ore.png | Bin 293 -> 291 bytes .../byg/textures/block/ironwood_bookshelf.png | Bin 471 -> 426 bytes .../textures/block/ironwood_door_bottom.png | Bin 457 -> 298 bytes .../byg/textures/block/ironwood_leaves.png | Bin 426 -> 343 bytes .../byg/textures/block/ironwood_log.png | Bin 376 -> 305 bytes .../byg/textures/block/ironwood_log_top.png | Bin 403 -> 341 bytes .../byg/textures/block/ironwood_planks.png | Bin 339 -> 265 bytes .../byg/textures/block/ivis_phylium_side.png | Bin 309 -> 297 bytes .../byg/textures/block/ivis_phylium_top.png | Bin 266 -> 264 bytes .../assets/byg/textures/block/ivis_roots.png | Bin 208 -> 204 bytes .../assets/byg/textures/block/ivis_sprout.png | Bin 189 -> 187 bytes .../textures/block/jacaranda_bookshelf.png | Bin 663 -> 372 bytes .../byg/textures/block/jacaranda_bush.png | Bin 301 -> 274 bytes .../textures/block/jacaranda_bush_side.png | Bin 258 -> 231 bytes .../byg/textures/block/jacaranda_bush_top.png | Bin 230 -> 222 bytes .../block/jacaranda_crafting_table_front.png | Bin 604 -> 293 bytes .../block/jacaranda_crafting_table_side.png | Bin 691 -> 302 bytes .../block/jacaranda_crafting_table_top.png | Bin 461 -> 232 bytes .../textures/block/jacaranda_door_bottom.png | Bin 569 -> 256 bytes .../byg/textures/block/jacaranda_door_top.png | Bin 639 -> 263 bytes .../byg/textures/block/jacaranda_leaves.png | Bin 276 -> 258 bytes .../byg/textures/block/jacaranda_log.png | Bin 435 -> 216 bytes .../byg/textures/block/jacaranda_log_top.png | Bin 610 -> 276 bytes .../byg/textures/block/jacaranda_planks.png | Bin 441 -> 241 bytes .../byg/textures/block/jacaranda_sapling.png | Bin 280 -> 247 bytes .../byg/textures/block/jacaranda_trapdoor.png | Bin 481 -> 248 bytes .../textures/block/jack_o_melon_carved.png | Bin 193 -> 191 bytes .../byg/textures/block/jack_o_melon_side2.png | Bin 201 -> 164 bytes .../byg/textures/block/japanese_orchid.png | Bin 248 -> 247 bytes .../textures/block/japanese_orchid_bottom.png | Bin 279 -> 259 bytes .../textures/block/japanese_orchid_top.png | Bin 330 -> 262 bytes .../byg/textures/block/joshua_sapling.png | Bin 200 -> 199 bytes .../byg/textures/block/kovan_flower.png | Bin 274 -> 242 bytes .../byg/textures/block/lament_bookshelf.png | Bin 669 -> 341 bytes .../textures/block/lament_crafting_front.png | Bin 574 -> 270 bytes .../textures/block/lament_crafting_side.png | Bin 600 -> 274 bytes .../block/lament_crafting_table_top.png | Bin 463 -> 232 bytes .../byg/textures/block/lament_door_bottom.png | Bin 461 -> 245 bytes .../byg/textures/block/lament_door_top.png | Bin 571 -> 275 bytes .../byg/textures/block/lament_leaves.png | Bin 719 -> 608 bytes .../assets/byg/textures/block/lament_log.png | Bin 455 -> 228 bytes .../byg/textures/block/lament_log_top.png | Bin 515 -> 264 bytes .../byg/textures/block/lament_planks.png | Bin 415 -> 215 bytes .../byg/textures/block/lament_sapling.png | Bin 288 -> 256 bytes .../byg/textures/block/lament_sprouts.png | Bin 248 -> 221 bytes .../byg/textures/block/lament_trapdoor.png | Bin 528 -> 275 bytes .../assets/byg/textures/block/lament_vine.png | Bin 243 -> 216 bytes .../byg/textures/block/lament_vine_plant.png | Bin 261 -> 233 bytes .../block/large_subzero_crystal_bud.png | Bin 246 -> 229 bytes .../byg/textures/block/lazarus_bellflower.png | Bin 276 -> 244 bytes .../assets/byg/textures/block/leaf_pile.png | Bin 246 -> 231 bytes .../byg/textures/block/lignite_block.png | Bin 214 -> 200 bytes .../assets/byg/textures/block/lignite_ore.png | Bin 452 -> 443 bytes .../byg/textures/block/lollipop_flower.png | Bin 300 -> 272 bytes .../assets/byg/textures/block/lush_dirt.png | Bin 250 -> 248 bytes .../textures/block/lush_grass_path_side.png | Bin 480 -> 417 bytes .../byg/textures/block/lush_grass_side.png | Bin 338 -> 330 bytes .../block/lush_grass_side_overlay.png | Bin 292 -> 261 bytes .../byg/textures/block/magenta_amaranth.png | Bin 302 -> 279 bytes .../byg/textures/block/magmatic_stone.png | Bin 1298 -> 607 bytes .../byg/textures/block/mahagony_door_top.png | Bin 520 -> 266 bytes .../byg/textures/block/mahogany/bookshelf.png | Bin 383 -> 382 bytes .../block/mahogany/crafting_table_front.png | Bin 314 -> 312 bytes .../block/mahogany/crafting_table_side.png | Bin 325 -> 322 bytes .../block/mahogany/crafting_table_top.png | Bin 289 -> 288 bytes .../textures/block/mahogany/door_bottom.png | Bin 268 -> 267 bytes .../byg/textures/block/mahogany/door_top.png | Bin 311 -> 285 bytes .../textures/block/mahogany/grower_item.png | Bin 278 -> 256 bytes .../byg/textures/block/mahogany/leaves.png | Bin 307 -> 277 bytes .../byg/textures/block/mahogany/log.png | Bin 292 -> 283 bytes .../byg/textures/block/mahogany/log_top.png | Bin 262 -> 255 bytes .../byg/textures/block/mahogany/planks.png | Bin 255 -> 249 bytes .../textures/block/mahogany/stripped_log.png | Bin 270 -> 266 bytes .../byg/textures/block/mahogany/trapdoor.png | Bin 318 -> 298 bytes .../block/mahogany_leaves_overlay.png | Bin 307 -> 277 bytes .../byg/textures/block/mangrove/bookshelf.png | Bin 663 -> 331 bytes .../block/mangrove/crafting_table_front.png | Bin 654 -> 299 bytes .../block/mangrove/crafting_table_side.png | Bin 629 -> 290 bytes .../block/mangrove/crafting_table_top.png | Bin 486 -> 243 bytes .../textures/block/mangrove/door_bottom.png | Bin 435 -> 237 bytes .../byg/textures/block/mangrove/door_top.png | Bin 482 -> 250 bytes .../textures/block/mangrove/grower_item.png | Bin 291 -> 290 bytes .../byg/textures/block/mangrove/leaves.png | Bin 282 -> 257 bytes .../byg/textures/block/mangrove/log.png | Bin 371 -> 197 bytes .../byg/textures/block/mangrove/log_top.png | Bin 491 -> 257 bytes .../byg/textures/block/mangrove/planks.png | Bin 415 -> 220 bytes .../textures/block/mangrove/stripped_log.png | Bin 416 -> 253 bytes .../block/mangrove/stripped_log_top.png | Bin 484 -> 270 bytes .../byg/textures/block/mangrove/trapdoor.png | Bin 447 -> 247 bytes .../byg/textures/block/maple_bookshelf.png | Bin 712 -> 350 bytes .../block/maple_crafting_table_front.png | Bin 655 -> 270 bytes .../block/maple_crafting_table_side.png | Bin 653 -> 267 bytes .../block/maple_crafting_table_top.png | Bin 459 -> 232 bytes .../byg/textures/block/maple_door_bottom.png | Bin 473 -> 257 bytes .../byg/textures/block/maple_door_top.png | Bin 514 -> 255 bytes .../byg/textures/block/maple_leaves_red.png | Bin 258 -> 231 bytes .../textures/block/maple_leaves_silver.png | Bin 350 -> 326 bytes .../assets/byg/textures/block/maple_log.png | Bin 458 -> 226 bytes .../byg/textures/block/maple_log_top.png | Bin 542 -> 275 bytes .../byg/textures/block/maple_planks.png | Bin 502 -> 214 bytes .../byg/textures/block/maple_trapdoor.png | Bin 516 -> 262 bytes .../block/medium_subzero_crystal_bud.png | Bin 216 -> 203 bytes .../assets/byg/textures/block/mini_cactus.png | Bin 222 -> 204 bytes .../textures/block/mossy_red_rock_bricks.png | Bin 736 -> 285 bytes .../assets/byg/textures/block/mud_bricks.png | Bin 412 -> 405 bytes .../block/mycelium_netherrack_side.png | Bin 733 -> 481 bytes .../textures/block/nether_brick_pillar.png | Bin 374 -> 370 bytes .../textures/block/nightshade/bookshelf.png | Bin 694 -> 347 bytes .../block/nightshade/crafting_table_front.png | Bin 668 -> 277 bytes .../block/nightshade/crafting_table_side.png | Bin 614 -> 275 bytes .../block/nightshade/crafting_table_top.png | Bin 464 -> 232 bytes .../textures/block/nightshade/door_bottom.png | Bin 502 -> 249 bytes .../textures/block/nightshade/door_top.png | Bin 526 -> 259 bytes .../textures/block/nightshade/grower_item.png | Bin 266 -> 231 bytes .../byg/textures/block/nightshade/leaves.png | Bin 723 -> 611 bytes .../byg/textures/block/nightshade/log.png | Bin 350 -> 185 bytes .../byg/textures/block/nightshade/log_top.png | Bin 477 -> 244 bytes .../byg/textures/block/nightshade/planks.png | Bin 446 -> 215 bytes .../block/nightshade/stripped_log.png | Bin 342 -> 185 bytes .../block/nightshade/stripped_log_top.png | Bin 491 -> 243 bytes .../textures/block/nightshade/trapdoor.png | Bin 507 -> 241 bytes .../block/nightshade_berry_bush_stage0.png | Bin 306 -> 270 bytes .../block/nightshade_berry_bush_stage1.png | Bin 321 -> 287 bytes .../block/nightshade_berry_bush_stage2.png | Bin 360 -> 321 bytes .../block/nightshade_berry_bush_stage3.png | Bin 368 -> 326 bytes .../byg/textures/block/nightshade_phylium.png | Bin 319 -> 316 bytes .../textures/block/nightshade_phylium_top.png | Bin 240 -> 237 bytes .../block/nightshade_roots_bottom.png | Bin 283 -> 251 bytes .../textures/block/nightshade_roots_top.png | Bin 234 -> 226 bytes .../byg/textures/block/nightshade_sprouts.png | Bin 235 -> 210 bytes .../textures/block/oak_leaves_dry_brown.png | Bin 247 -> 204 bytes .../byg/textures/block/oak_leaves_orange.png | Bin 245 -> 202 bytes .../byg/textures/block/oak_leaves_red.png | Bin 245 -> 202 bytes .../assets/byg/textures/block/oddity_bush.png | Bin 328 -> 284 bytes .../textures/block/oddity_cactus_bottom.png | Bin 249 -> 231 bytes .../byg/textures/block/oddity_cactus_side.png | Bin 337 -> 313 bytes .../byg/textures/block/oddity_cactus_top.png | Bin 326 -> 307 bytes .../byg/textures/block/oddity_flower.png | Bin 292 -> 266 bytes .../byg/textures/block/oddity_flower_base.png | Bin 273 -> 245 bytes .../byg/textures/block/orange_amaranth.png | Bin 302 -> 279 bytes .../textures/block/orange_birch_leaves.png | Bin 196 -> 185 bytes .../byg/textures/block/orange_daisy.png | Bin 259 -> 230 bytes .../byg/textures/block/orange_oak_sapling.png | Bin 210 -> 206 bytes .../textures/block/orange_spruce_sapling.png | Bin 257 -> 256 bytes .../byg/textures/block/orchard_leaves.png | Bin 247 -> 204 bytes .../textures/block/orchard_leaves_overlay.png | Bin 247 -> 204 bytes .../assets/byg/textures/block/osiria_rose.png | Bin 226 -> 223 bytes .../overgrown_crimson_blackstone_side.png | Bin 686 -> 357 bytes .../block/overgrown_dacite_bottom.png | Bin 232 -> 227 bytes .../textures/block/overgrown_dacite_side.png | Bin 322 -> 313 bytes .../textures/block/overgrown_stone_side.png | Bin 323 -> 316 bytes .../block/overgrown_stone_side_overlay.png | Bin 292 -> 262 bytes .../block/overgrown_stone_snow_side.png | Bin 287 -> 284 bytes .../byg/textures/block/packed_black_ice.png | Bin 173 -> 166 bytes .../byg/textures/block/palm/bookshelf.png | Bin 707 -> 342 bytes .../block/palm/crafting_table_front.png | Bin 669 -> 278 bytes .../block/palm/crafting_table_side.png | Bin 637 -> 274 bytes .../block/palm/crafting_table_top.png | Bin 467 -> 232 bytes .../byg/textures/block/palm/door_bottom.png | Bin 439 -> 230 bytes .../byg/textures/block/palm/door_top.png | Bin 457 -> 240 bytes .../byg/textures/block/palm/grower_item.png | Bin 557 -> 333 bytes .../assets/byg/textures/block/palm/leaves.png | Bin 283 -> 268 bytes .../assets/byg/textures/block/palm/log.png | Bin 431 -> 216 bytes .../byg/textures/block/palm/log_top.png | Bin 488 -> 262 bytes .../assets/byg/textures/block/palm/planks.png | Bin 460 -> 214 bytes .../byg/textures/block/palm/stripped_log.png | Bin 590 -> 227 bytes .../textures/block/palm/stripped_log_top.png | Bin 521 -> 244 bytes .../byg/textures/block/palm/trapdoor.png | Bin 459 -> 233 bytes .../block/palo_verde_leaves_flowering.png | Bin 228 -> 221 bytes .../byg/textures/block/palo_verde_log.png | Bin 289 -> 285 bytes .../byg/textures/block/palo_verde_log_top.png | Bin 685 -> 681 bytes .../assets/byg/textures/block/peat.png | Bin 318 -> 317 bytes .../byg/textures/block/pendorite_block.png | Bin 1181 -> 966 bytes .../byg/textures/block/pendorite_ore.png | Bin 1375 -> 1008 bytes .../byg/textures/block/pine/bookshelf.png | Bin 697 -> 338 bytes .../block/pine/crafting_table_front.png | Bin 637 -> 285 bytes .../block/pine/crafting_table_side.png | Bin 665 -> 285 bytes .../block/pine/crafting_table_top.png | Bin 470 -> 232 bytes .../byg/textures/block/pine/door_bottom.png | Bin 466 -> 236 bytes .../byg/textures/block/pine/door_top.png | Bin 497 -> 242 bytes .../assets/byg/textures/block/pine/leaves.png | Bin 279 -> 260 bytes .../assets/byg/textures/block/pine/log.png | Bin 507 -> 505 bytes .../byg/textures/block/pine/log_top.png | Bin 518 -> 270 bytes .../assets/byg/textures/block/pine/planks.png | Bin 458 -> 220 bytes .../byg/textures/block/pine/stripped_log.png | Bin 523 -> 229 bytes .../textures/block/pine/stripped_log_top.png | Bin 207 -> 193 bytes .../byg/textures/block/pine/trapdoor.png | Bin 502 -> 245 bytes .../block/pink_allium_flower_bush.png | Bin 290 -> 268 bytes .../byg/textures/block/pink_cherry_leaves.png | Bin 296 -> 268 bytes .../byg/textures/block/pink_daffodil.png | Bin 271 -> 239 bytes .../assets/byg/textures/block/pink_sand.png | Bin 234 -> 192 bytes .../assets/byg/textures/block/plant_stem.png | Bin 520 -> 493 bytes .../byg/textures/block/podzol_dacite.png | Bin 495 -> 485 bytes .../assets/byg/textures/block/poison_ivy.png | Bin 302 -> 278 bytes .../textures/block/polished_scoria_stone.png | Bin 245 -> 239 bytes .../textures/block/polished_travertine.png | Bin 264 -> 260 bytes .../byg/textures/block/pollen_block.png | Bin 230 -> 222 bytes .../textures/block/prickly_pear_cactus.png | Bin 279 -> 261 bytes .../byg/textures/block/protea_flower.png | Bin 275 -> 238 bytes .../byg/textures/block/purple_amaranth.png | Bin 301 -> 279 bytes .../block/purple_bulbis_anomaly_bottom.png | Bin 495 -> 441 bytes .../block/purple_bulbis_anomaly_top.png | Bin 480 -> 402 bytes .../textures/block/purple_bulbis_oddity.png | Bin 281 -> 247 bytes .../textures/block/purple_bulbis_shell.png | Bin 878 -> 642 bytes .../assets/byg/textures/block/purple_sand.png | Bin 234 -> 192 bytes .../byg/textures/block/purple_shroomlight.png | Bin 896 -> 892 bytes .../byg/textures/block/purpur_stone.png | Bin 246 -> 243 bytes .../byg/textures/block/purpur_stone2.png | Bin 813 -> 803 bytes .../byg/textures/block/quartz_crystal.png | Bin 295 -> 270 bytes .../textures/block/quartz_crystal_stage0.png | Bin 236 -> 218 bytes .../textures/block/quartz_crystal_stage1.png | Bin 258 -> 232 bytes .../textures/block/quartz_crystal_stage2.png | Bin 268 -> 246 bytes .../byg/textures/block/quartzite_sand.png | Bin 575 -> 572 bytes .../block/rainbow_eucalyptus/bookshelf.png | Bin 538 -> 537 bytes .../crafting_table_front.png | Bin 464 -> 460 bytes .../crafting_table_side.png | Bin 453 -> 452 bytes .../block/rainbow_eucalyptus/door_bottom.png | Bin 360 -> 337 bytes .../block/rainbow_eucalyptus/door_top.png | Bin 378 -> 354 bytes .../block/rainbow_eucalyptus/leaves.png | Bin 284 -> 268 bytes .../textures/block/rainbow_eucalyptus/log.png | Bin 373 -> 369 bytes .../block/rainbow_eucalyptus/log_top.png | Bin 451 -> 448 bytes .../block/rainbow_eucalyptus/stripped_log.png | Bin 331 -> 322 bytes .../block/rainbow_eucalyptus/trapdoor.png | Bin 389 -> 355 bytes .../textures/block/raw_pendorite_block.png | Bin 1207 -> 988 bytes .../byg/textures/block/raw_quartz_block.png | Bin 802 -> 356 bytes .../byg/textures/block/red_birch_leaves.png | Bin 196 -> 185 bytes .../byg/textures/block/red_oak_sapling.png | Bin 210 -> 205 bytes .../assets/byg/textures/block/red_rock.png | Bin 575 -> 232 bytes .../byg/textures/block/red_rock_bricks.png | Bin 549 -> 261 bytes .../byg/textures/block/redwood/bookshelf.png | Bin 573 -> 352 bytes .../block/redwood/crafting_table_front.png | Bin 473 -> 263 bytes .../block/redwood/crafting_table_side.png | Bin 459 -> 248 bytes .../block/redwood/crafting_table_top.png | Bin 427 -> 232 bytes .../textures/block/redwood/door_bottom.png | Bin 410 -> 234 bytes .../byg/textures/block/redwood/door_top.png | Bin 532 -> 293 bytes .../assets/byg/textures/block/redwood/log.png | Bin 396 -> 207 bytes .../byg/textures/block/redwood/log_top.png | Bin 468 -> 260 bytes .../byg/textures/block/redwood/planks.png | Bin 402 -> 239 bytes .../textures/block/redwood/stripped_log.png | Bin 415 -> 204 bytes .../block/redwood/stripped_log_top.png | Bin 429 -> 230 bytes .../byg/textures/block/redwood/trapdoor.png | Bin 519 -> 285 bytes .../byg/textures/block/redwood_log_to.png | Bin 469 -> 261 bytes .../byg/textures/block/reeds_bottom.png | Bin 600 -> 475 bytes .../assets/byg/textures/block/reeds_top.png | Bin 413 -> 286 bytes .../assets/byg/textures/block/richea.png | Bin 278 -> 254 bytes .../byg/textures/block/ripe_joshua_leaves.png | Bin 396 -> 383 bytes .../textures/block/ripe_orchard_leaves.png | Bin 240 -> 238 bytes .../block/ripe_orchard_leaves_overlay.png | Bin 200 -> 197 bytes .../assets/byg/textures/block/rocky_stone.png | Bin 298 -> 296 bytes .../assets/byg/textures/block/rose.png | Bin 213 -> 210 bytes .../byg/textures/block/scorched_bush.png | Bin 383 -> 299 bytes .../byg/textures/block/scorched_grass.png | Bin 298 -> 244 bytes .../byg/textures/block/scoria_pillar_side.png | Bin 206 -> 200 bytes .../byg/textures/block/scoria_pillar_top.png | Bin 240 -> 234 bytes .../byg/textures/block/scoria_stone.png | Bin 246 -> 243 bytes .../textures/block/scoria_stone_bricks.png | Bin 250 -> 246 bytes .../byg/textures/block/scoria_stone_top.png | Bin 243 -> 239 bytes .../assets/byg/textures/block/shrub.png | Bin 301 -> 275 bytes .../byg/textures/block/shulkren_fungus.png | Bin 333 -> 294 bytes .../textures/block/shulkren_moss_blanket.png | Bin 277 -> 244 bytes .../byg/textures/block/shulkren_phylium.png | Bin 1899 -> 1584 bytes .../textures/block/shulkren_phylium_top.png | Bin 1767 -> 1549 bytes .../byg/textures/block/shulkren_vine.png | Bin 254 -> 226 bytes .../textures/block/shulkren_vine_plant.png | Bin 594 -> 495 bytes .../textures/block/shulkren_wart_block.png | Bin 764 -> 325 bytes .../byg/textures/block/silver_vase_flower.png | Bin 250 -> 227 bytes .../byg/textures/block/skyris_bookshelf.png | Bin 380 -> 369 bytes .../block/skyris_crafting_table_front.png | Bin 324 -> 318 bytes .../byg/textures/block/skyris_door_bottom.png | Bin 503 -> 323 bytes .../byg/textures/block/skyris_door_top.png | Bin 618 -> 335 bytes .../byg/textures/block/skyris_leaves.png | Bin 281 -> 263 bytes .../assets/byg/textures/block/skyris_log.png | Bin 256 -> 254 bytes .../byg/textures/block/skyris_log_top.png | Bin 271 -> 261 bytes .../byg/textures/block/skyris_planks.png | Bin 253 -> 246 bytes .../byg/textures/block/skyris_sapling.png | Bin 276 -> 250 bytes .../byg/textures/block/skyris_trapdoor.png | Bin 528 -> 328 bytes .../textures/block/skyris_vine_flowering.png | Bin 275 -> 245 bytes .../block/small_subzero_crystal_bud.png | Bin 203 -> 185 bytes .../byg/textures/block/smooth_brimstone.png | Bin 420 -> 223 bytes .../assets/byg/textures/block/snowdrops.png | Bin 263 -> 241 bytes .../assets/byg/textures/block/soapstone.png | Bin 435 -> 204 bytes .../byg/textures/block/soapstone_bricks.png | Bin 406 -> 238 bytes .../textures/block/soapstone_pillar_side.png | Bin 350 -> 204 bytes .../textures/block/soapstone_pillar_top.png | Bin 453 -> 229 bytes .../byg/textures/block/soapstone_polished.png | Bin 462 -> 245 bytes .../byg/textures/block/soapstone_tile.png | Bin 380 -> 193 bytes .../assets/byg/textures/block/soul_shroom.png | Bin 282 -> 254 bytes .../block/soul_shroom_block_inside.png | Bin 301 -> 300 bytes .../textures/block/soul_shroom_bookshelf.png | Bin 703 -> 353 bytes .../soul_shroom_crafting_table_front.png | Bin 695 -> 284 bytes .../block/soul_shroom_crafting_table_side.png | Bin 631 -> 279 bytes .../block/soul_shroom_crafting_table_top.png | Bin 443 -> 229 bytes .../block/soul_shroom_door_bottom.png | Bin 526 -> 261 bytes .../textures/block/soul_shroom_door_top.png | Bin 611 -> 270 bytes .../byg/textures/block/soul_shroom_planks.png | Bin 457 -> 215 bytes .../byg/textures/block/soul_shroom_spore.png | Bin 323 -> 226 bytes .../textures/block/soul_shroom_spore_end.png | Bin 336 -> 296 bytes .../byg/textures/block/soul_shroom_stem.png | Bin 441 -> 208 bytes .../textures/block/soul_shroom_stem_top.png | Bin 624 -> 270 bytes .../textures/block/soul_shroom_trapdoor.png | Bin 599 -> 232 bytes .../textures/block/stripped_florus_stem.png | Bin 610 -> 267 bytes .../block/stripped_florus_stem_top.png | Bin 673 -> 252 bytes .../textures/block/stripped_ironwood_log.png | Bin 478 -> 278 bytes .../block/stripped_ironwood_log_top.png | Bin 402 -> 229 bytes .../textures/block/stripped_jacaranda_log.png | Bin 385 -> 209 bytes .../block/stripped_jacaranda_log_top.png | Bin 512 -> 248 bytes .../textures/block/stripped_lament_log.png | Bin 452 -> 222 bytes .../block/stripped_lament_log_top.png | Bin 488 -> 218 bytes .../byg/textures/block/stripped_maple_log.png | Bin 481 -> 229 bytes .../textures/block/stripped_maple_log_top.png | Bin 513 -> 247 bytes .../block/stripped_palo_verde_log.png | Bin 396 -> 387 bytes .../textures/block/stripped_ping_log_top.png | Bin 511 -> 238 bytes .../textures/block/stripped_skyris_log.png | Bin 235 -> 231 bytes .../block/stripped_soul_shroom_stem.png | Bin 468 -> 224 bytes .../block/stripped_soul_shroom_stem_top.png | Bin 532 -> 226 bytes .../assets/byg/textures/block/subzero_ash.png | Bin 227 -> 215 bytes .../textures/block/subzero_crystal_block.png | Bin 262 -> 261 bytes .../block/subzero_crystal_cluster.png | Bin 283 -> 264 bytes .../byg/textures/block/sythian/bookshelf.png | Bin 563 -> 302 bytes .../block/sythian/crafting_table_front.png | Bin 582 -> 282 bytes .../block/sythian/crafting_table_side.png | Bin 635 -> 286 bytes .../block/sythian/crafting_table_top.png | Bin 470 -> 237 bytes .../textures/block/sythian/door_bottom.png | Bin 424 -> 237 bytes .../byg/textures/block/sythian/door_top.png | Bin 460 -> 260 bytes .../textures/block/sythian/grower_item.png | Bin 422 -> 271 bytes .../byg/textures/block/sythian/leaves.png | Bin 270 -> 232 bytes .../assets/byg/textures/block/sythian/log.png | Bin 458 -> 238 bytes .../byg/textures/block/sythian/log_top.png | Bin 489 -> 266 bytes .../byg/textures/block/sythian/planks.png | Bin 429 -> 215 bytes .../textures/block/sythian/stripped_log.png | Bin 450 -> 233 bytes .../block/sythian/stripped_log_top.png | Bin 406 -> 216 bytes .../byg/textures/block/sythian/trapdoor.png | Bin 359 -> 225 bytes .../textures/block/sythian_nylium_side.png | Bin 243 -> 240 bytes .../block/sythian_scaffolding_side.png | Bin 196 -> 195 bytes .../block/sythian_scaffolding_top.png | Bin 258 -> 255 bytes .../block/sythian_stalk_large_leaves.png | Bin 229 -> 227 bytes .../block/sythian_stalk_small_leaves.png | Bin 202 -> 198 bytes .../textures/block/tainted_acacia_leaves.png | Bin 397 -> 346 bytes .../textures/block/tainted_acacia_log_top.png | Bin 366 -> 355 bytes .../byg/textures/block/tall_allium_bottom.png | Bin 303 -> 280 bytes .../byg/textures/block/tall_allium_top.png | Bin 290 -> 268 bytes .../block/tall_beach_grass_bottom.png | Bin 273 -> 243 bytes .../textures/block/tall_beach_grass_top.png | Bin 251 -> 230 bytes .../block/tall_crimson_roots_bottom.png | Bin 453 -> 262 bytes .../textures/block/tall_crimson_roots_top.png | Bin 440 -> 269 bytes .../block/tall_embur_roots_bottom.png | Bin 228 -> 213 bytes .../textures/block/tall_embur_roots_top.png | Bin 205 -> 204 bytes .../block/tall_ether_grass_bottom.png | Bin 320 -> 279 bytes .../textures/block/tall_ether_grass_top.png | Bin 314 -> 269 bytes .../block/tall_pink_allium_bottom.png | Bin 302 -> 280 bytes .../textures/block/tall_pink_allium_top.png | Bin 291 -> 268 bytes .../byg/textures/block/tall_wrath_grass.png | Bin 205 -> 166 bytes .../block/tall_wrath_grass_bottom.png | Bin 276 -> 192 bytes .../byg/textures/block/thereal_bellflower.png | Bin 293 -> 263 bytes .../byg/textures/block/therium_block.png | Bin 262 -> 261 bytes .../textures/block/therium_crystal_stage0.png | Bin 219 -> 201 bytes .../textures/block/therium_crystal_stage1.png | Bin 230 -> 209 bytes .../textures/block/therium_crystal_stage2.png | Bin 269 -> 244 bytes .../textures/block/therium_crystal_stage3.png | Bin 279 -> 252 bytes .../byg/textures/block/therium_glass.png | Bin 329 -> 257 bytes .../byg/textures/block/therium_lamp.png | Bin 238 -> 229 bytes .../byg/textures/block/therium_lantern.png | Bin 368 -> 332 bytes .../block/tiny_lily_pads_flower_overlay.png | Bin 203 -> 193 bytes .../byg/textures/block/torch_ginger.png | Bin 275 -> 248 bytes .../assets/byg/textures/block/travertine.png | Bin 238 -> 236 bytes .../byg/textures/block/vera_rosa_bottom.png | Bin 696 -> 579 bytes .../byg/textures/block/vera_rosa_top.png | Bin 329 -> 288 bytes .../textures/block/vermilion_sculk_growth.png | Bin 373 -> 339 bytes .../block/vermilion_sculk_tendrils.png | Bin 582 -> 456 bytes .../textures/block/vermilion_sculk_top.png | Bin 601 -> 600 bytes .../block/wailing_bulb_blossom_petal.png | Bin 439 -> 276 bytes .../block/wailing_bulb_blossom_side.png | Bin 573 -> 324 bytes .../block/wailing_bulb_blossom_side2.png | Bin 432 -> 258 bytes .../block/wailing_bulb_blossom_top.png | Bin 416 -> 251 bytes .../byg/textures/block/wailing_grass.png | Bin 234 -> 218 bytes .../byg/textures/block/wailing_nylium.png | Bin 266 -> 265 bytes .../textures/block/wailing_nylium_side.png | Bin 294 -> 293 bytes .../byg/textures/block/wailing_vine.png | Bin 274 -> 248 bytes .../textures/block/warped_cactus_bottom.png | Bin 199 -> 193 bytes .../byg/textures/block/warped_coral.png | Bin 268 -> 265 bytes .../byg/textures/block/warped_coral_fan.png | Bin 273 -> 271 bytes .../assets/byg/textures/block/water_silk.png | Bin 293 -> 266 bytes .../byg/textures/block/weeping_roots.png | Bin 292 -> 222 bytes .../textures/block/white_cherry_leaves.png | Bin 296 -> 268 bytes .../textures/block/white_cut_sandstone.png | Bin 170 -> 166 bytes .../assets/byg/textures/block/white_sand.png | Bin 164 -> 160 bytes .../textures/block/white_sandstone_bottom.png | Bin 180 -> 176 bytes .../textures/block/white_sandstone_top.png | Bin 158 -> 155 bytes .../byg/textures/block/willow/bookshelf.png | Bin 696 -> 352 bytes .../block/willow/crafting_table_front.png | Bin 629 -> 282 bytes .../block/willow/crafting_table_side.png | Bin 583 -> 274 bytes .../block/willow/crafting_table_top.png | Bin 459 -> 232 bytes .../byg/textures/block/willow/door_bottom.png | Bin 459 -> 240 bytes .../byg/textures/block/willow/door_top.png | Bin 516 -> 273 bytes .../byg/textures/block/willow/grower_item.png | Bin 414 -> 411 bytes .../byg/textures/block/willow/leaves.png | Bin 508 -> 243 bytes .../assets/byg/textures/block/willow/log.png | Bin 418 -> 219 bytes .../byg/textures/block/willow/log_top.png | Bin 508 -> 269 bytes .../byg/textures/block/willow/planks.png | Bin 413 -> 216 bytes .../textures/block/willow/stripped_log.png | Bin 476 -> 261 bytes .../block/willow/stripped_log_top.png | Bin 508 -> 262 bytes .../byg/textures/block/willow/trapdoor.png | Bin 596 -> 270 bytes .../byg/textures/block/windswept_sand.png | Bin 239 -> 235 bytes .../block/windswept_sandstone_bottom.png | Bin 258 -> 256 bytes .../block/windswept_sandstone_pillar.png | Bin 246 -> 241 bytes .../block/windswept_sandstone_pillar_top.png | Bin 268 -> 266 bytes .../block/windswept_sandstone_top.png | Bin 237 -> 231 bytes .../byg/textures/block/winter_cyclamen.png | Bin 268 -> 251 bytes .../byg/textures/block/winter_scilla.png | Bin 264 -> 236 bytes .../textures/block/witch_hazel/bookshelf.png | Bin 586 -> 585 bytes .../block/witch_hazel/crafting_table.png | Bin 415 -> 213 bytes .../witch_hazel/crafting_table_front.png | Bin 624 -> 279 bytes .../block/witch_hazel/crafting_table_side.png | Bin 630 -> 279 bytes .../block/witch_hazel/door_bottom.png | Bin 440 -> 233 bytes .../textures/block/witch_hazel/door_top.png | Bin 453 -> 242 bytes .../block/witch_hazel/grower_item.png | Bin 292 -> 271 bytes .../byg/textures/block/witch_hazel/leaves.png | Bin 266 -> 250 bytes .../byg/textures/block/witch_hazel/log.png | Bin 469 -> 220 bytes .../textures/block/witch_hazel/log_top.png | Bin 649 -> 285 bytes .../byg/textures/block/witch_hazel/planks.png | Bin 456 -> 215 bytes .../block/witch_hazel/stripped_log.png | Bin 654 -> 276 bytes .../block/witch_hazel/stripped_log_top.png | Bin 623 -> 256 bytes .../textures/block/witch_hazel/trapdoor.png | Bin 454 -> 227 bytes .../textures/block/witch_hazel_blossom.png | Bin 326 -> 299 bytes .../block/witch_hazel_blossom_base.png | Bin 266 -> 245 bytes .../byg/textures/block/witch_hazel_branch.png | Bin 285 -> 253 bytes .../block/witch_hazel_leaves_blooming.png | Bin 394 -> 341 bytes .../block/wither_rose_bush_bottom.png | Bin 586 -> 314 bytes .../textures/block/wither_rose_bush_top.png | Bin 583 -> 319 bytes .../textures/block/withering_oak_leaves.png | Bin 274 -> 252 bytes .../textures/block/withering_oak_log_top.png | Bin 393 -> 385 bytes .../textures/block/withering_oak_sapling.png | Bin 266 -> 236 bytes .../textures/block/yellow_birch_leaves.png | Bin 196 -> 185 bytes .../byg/textures/block/yellow_daffodil.png | Bin 271 -> 239 bytes .../textures/block/yellow_nether_bricks.png | Bin 274 -> 246 bytes .../byg/textures/block/zelkova/bookshelf.png | Bin 696 -> 350 bytes .../block/zelkova/crafting_table_front.png | Bin 664 -> 285 bytes .../block/zelkova/crafting_table_side.png | Bin 603 -> 277 bytes .../block/zelkova/crafting_table_top.png | Bin 468 -> 232 bytes .../textures/block/zelkova/door_bottom.png | Bin 512 -> 259 bytes .../byg/textures/block/zelkova/door_top.png | Bin 422 -> 220 bytes .../assets/byg/textures/block/zelkova/log.png | Bin 434 -> 193 bytes .../byg/textures/block/zelkova/log_top.png | Bin 497 -> 264 bytes .../byg/textures/block/zelkova/planks.png | Bin 444 -> 214 bytes .../textures/block/zelkova/stripped_log.png | Bin 490 -> 229 bytes .../block/zelkova/stripped_log_top.png | Bin 457 -> 228 bytes .../byg/textures/block/zelkova/trapdoor.png | Bin 438 -> 244 bytes .../assets/byg/textures/entity/boat/palm.png | Bin 1403 -> 1161 bytes .../byg/textures/entity/boat/redwood.png | Bin 1400 -> 1161 bytes .../horse/armor/horse_armor_ametrine.png | Bin 4181 -> 3129 bytes .../horse/armor/horse_armor_pendorite.png | Bin 2766 -> 1606 bytes .../byg/textures/entity/manowar/blue.png | Bin 1413 -> 685 bytes .../byg/textures/entity/manowar/magenta.png | Bin 1423 -> 685 bytes .../byg/textures/entity/manowar/purple.png | Bin 1435 -> 685 bytes .../byg/textures/entity/manowar/rainbow.png | Bin 1697 -> 1123 bytes .../entity/villager/profession/forager.png | Bin 1092 -> 928 bytes .../textures/entity/villager/type/skyris.png | Bin 877 -> 779 bytes .../zombie_villager/profession/forager.png | Bin 1092 -> 928 bytes .../assets/byg/textures/gui/biomepedia.png | Bin 6452 -> 5181 bytes .../byg/textures/gui/biomepedia_book_gui.png | Bin 84907 -> 77969 bytes .../gui/container/hypogeal_imperium.png | Bin 2075 -> 1555 bytes .../assets/byg/textures/item/aloe_vera.png | Bin 241 -> 221 bytes .../byg/textures/item/aloe_vera_juice.png | Bin 424 -> 301 bytes .../byg/textures/item/ametrine_chestplate.png | Bin 593 -> 587 bytes .../byg/textures/item/ametrine_gems.png | Bin 639 -> 605 bytes .../assets/byg/textures/item/anthracite.png | Bin 371 -> 254 bytes .../textures/item/arisian_bloom_branch.png | Bin 279 -> 248 bytes .../assets/byg/textures/item/aspen/boat.png | Bin 511 -> 274 bytes .../assets/byg/textures/item/aspen/door.png | Bin 200 -> 152 bytes .../assets/byg/textures/item/baobab/boat.png | Bin 507 -> 277 bytes .../assets/byg/textures/item/baobab/door.png | Bin 258 -> 182 bytes .../assets/byg/textures/item/baobab/fruit.png | Bin 311 -> 287 bytes .../assets/byg/textures/item/biomepedia.png | Bin 405 -> 272 bytes .../byg/textures/item/biomepedia_book.png | Bin 276 -> 252 bytes .../byg/textures/item/blue_enchanted/boat.png | Bin 519 -> 267 bytes .../byg/textures/item/blue_enchanted/door.png | Bin 222 -> 168 bytes .../byg/textures/item/blueberry_pie.png | Bin 291 -> 268 bytes .../byg/textures/item/boric_campfire.png | Bin 446 -> 299 bytes .../byg/textures/item/boric_lantern.png | Bin 238 -> 217 bytes .../assets/byg/textures/item/brim_powder.png | Bin 340 -> 231 bytes .../byg/textures/item/bulbis/anomaly.png | Bin 361 -> 316 bytes .../assets/byg/textures/item/bulbis/door.png | Bin 225 -> 177 bytes .../assets/byg/textures/item/cattails.png | Bin 289 -> 257 bytes .../assets/byg/textures/item/cherry/boat.png | Bin 479 -> 279 bytes .../assets/byg/textures/item/cherry/door.png | Bin 301 -> 205 bytes .../assets/byg/textures/item/cika/boat.png | Bin 516 -> 270 bytes .../assets/byg/textures/item/cika/door.png | Bin 330 -> 201 bytes .../item/cooked_white_puffball_cap.png | Bin 266 -> 250 bytes .../byg/textures/item/crimson_berries.png | Bin 306 -> 279 bytes .../byg/textures/item/crimson_berry_pie.png | Bin 291 -> 268 bytes .../textures/item/cryptic_bramble_branch.png | Bin 252 -> 224 bytes .../byg/textures/item/cryptic_campfire.png | Bin 315 -> 292 bytes .../assets/byg/textures/item/cryptic_vent.png | Bin 226 -> 201 bytes .../assets/byg/textures/item/cypress/boat.png | Bin 522 -> 274 bytes .../assets/byg/textures/item/ebony/boat.png | Bin 489 -> 274 bytes .../assets/byg/textures/item/ebony/door.png | Bin 185 -> 170 bytes .../assets/byg/textures/item/embur/door.png | Bin 410 -> 271 bytes .../byg/textures/item/embur_gel_ball.png | Bin 268 -> 248 bytes .../byg/textures/item/embur_sprouts.png | Bin 193 -> 180 bytes .../byg/textures/item/emeraldite_shards.png | Bin 248 -> 228 bytes .../assets/byg/textures/item/ether/bulbs.png | Bin 271 -> 229 bytes .../assets/byg/textures/item/ether/door.png | Bin 169 -> 150 bytes .../assets/byg/textures/item/fir/boat.png | Bin 500 -> 274 bytes .../assets/byg/textures/item/fir/door.png | Bin 210 -> 165 bytes .../assets/byg/textures/item/florus_boat.png | Bin 487 -> 277 bytes .../assets/byg/textures/item/florus_door.png | Bin 419 -> 219 bytes .../byg/textures/item/golden_baobab_fruit.png | Bin 270 -> 254 bytes .../assets/byg/textures/item/green_apple.png | Bin 280 -> 256 bytes .../byg/textures/item/green_apple_pie.png | Bin 274 -> 252 bytes .../textures/item/green_enchanted/boat.png | Bin 514 -> 267 bytes .../textures/item/green_enchanted/door.png | Bin 218 -> 168 bytes .../byg/textures/item/holly/berries.png | Bin 298 -> 267 bytes .../assets/byg/textures/item/holly/boat.png | Bin 553 -> 276 bytes .../assets/byg/textures/item/holly/door.png | Bin 330 -> 205 bytes .../byg/textures/item/imparius/door.png | Bin 221 -> 202 bytes .../assets/byg/textures/item/iron_scrap.png | Bin 267 -> 242 bytes .../byg/textures/item/ironwood_door.png | Bin 230 -> 204 bytes .../byg/textures/item/jacaranda_boat.png | Bin 537 -> 275 bytes .../byg/textures/item/jacaranda_door.png | Bin 333 -> 197 bytes .../assets/byg/textures/item/lament_door.png | Bin 176 -> 144 bytes .../assets/byg/textures/item/lignite.png | Bin 279 -> 258 bytes .../byg/textures/item/mahogany/boat.png | Bin 519 -> 277 bytes .../byg/textures/item/mahogany/door.png | Bin 168 -> 148 bytes .../byg/textures/item/mangrove/boat.png | Bin 504 -> 269 bytes .../byg/textures/item/mangrove/door.png | Bin 179 -> 146 bytes .../assets/byg/textures/item/maple_boat.png | Bin 509 -> 274 bytes .../byg/textures/item/nightshade/door.png | Bin 177 -> 154 bytes .../byg/textures/item/nightshade_berries.png | Bin 310 -> 275 bytes .../textures/item/nightshade_berry_pie.png | Bin 291 -> 268 bytes .../byg/textures/item/otaheite_apple.png | Bin 268 -> 247 bytes .../assets/byg/textures/item/palm/boat.png | Bin 488 -> 265 bytes .../assets/byg/textures/item/palm/door.png | Bin 244 -> 176 bytes .../byg/textures/item/pendorite_axe.png | Bin 1051 -> 936 bytes .../byg/textures/item/pendorite_battleaxe.png | Bin 894 -> 866 bytes .../byg/textures/item/pendorite_hoe.png | Bin 1024 -> 914 bytes .../textures/item/pendorite_horse_armor.png | Bin 1035 -> 916 bytes .../byg/textures/item/pendorite_ingot.png | Bin 1083 -> 936 bytes .../byg/textures/item/pendorite_pickaxe.png | Bin 1090 -> 945 bytes .../byg/textures/item/pendorite_scraps.png | Bin 1129 -> 957 bytes .../byg/textures/item/pendorite_shovel.png | Bin 1018 -> 928 bytes .../byg/textures/item/pendorite_sword.png | Bin 1105 -> 970 bytes .../assets/byg/textures/item/pine/boat.png | Bin 517 -> 268 bytes .../assets/byg/textures/item/pine/door.png | Bin 202 -> 162 bytes .../textures/item/pollenated_bone_meal.png | Bin 266 -> 242 bytes .../textures/item/purple_bulbis_anomaly.png | Bin 361 -> 316 bytes .../textures/item/rainbow_eucalyptus/boat.png | Bin 368 -> 339 bytes .../textures/item/rainbow_eucalyptus/door.png | Bin 270 -> 249 bytes .../byg/textures/item/raw_pendorite.png | Bin 1148 -> 971 bytes .../assets/byg/textures/item/redwood/boat.png | Bin 517 -> 270 bytes .../assets/byg/textures/item/redwood/door.png | Bin 291 -> 204 bytes .../assets/byg/textures/item/skyris_boat.png | Bin 283 -> 265 bytes .../assets/byg/textures/item/skyris_door.png | Bin 373 -> 266 bytes .../assets/byg/textures/item/skyris_vine.png | Bin 245 -> 221 bytes .../byg/textures/item/soul_shroom_door.png | Bin 374 -> 214 bytes .../byg/textures/item/soul_shroom_spore.png | Bin 255 -> 220 bytes .../assets/byg/textures/item/stone_stick.png | Bin 133 -> 127 bytes .../textures/item/subzero_crystal_shard.png | Bin 257 -> 234 bytes .../assets/byg/textures/item/sythian/door.png | Bin 148 -> 139 bytes .../byg/textures/item/sythian_stalk.png | Bin 220 -> 218 bytes .../byg/textures/item/tall_cryptic_vent.png | Bin 249 -> 216 bytes .../byg/textures/item/therium_crystal.png | Bin 289 -> 264 bytes .../byg/textures/item/therium_lantern.png | Bin 243 -> 217 bytes .../byg/textures/item/therium_shard.png | Bin 269 -> 239 bytes .../item/vermilion_sculk_tendrils.png | Bin 245 -> 223 bytes .../byg/textures/item/white_puffball_cap.png | Bin 266 -> 250 bytes .../textures/item/white_puffball_spores.png | Bin 221 -> 198 bytes .../byg/textures/item/white_puffball_stew.png | Bin 252 -> 232 bytes .../assets/byg/textures/item/willow/boat.png | Bin 494 -> 275 bytes .../assets/byg/textures/item/willow/door.png | Bin 282 -> 180 bytes .../byg/textures/item/witch_hazel/boat.png | Bin 506 -> 274 bytes .../byg/textures/item/witch_hazel/door.png | Bin 190 -> 161 bytes .../byg/textures/item/yellow_nether_brick.png | Bin 347 -> 256 bytes .../assets/byg/textures/item/zelkova/boat.png | Bin 499 -> 274 bytes .../assets/byg/textures/item/zelkova/door.png | Bin 165 -> 141 bytes .../byg/textures/particle/boric_flame.png | Bin 191 -> 182 bytes .../particle/cherry_blossom_fall_pink.png | Bin 218 -> 197 bytes .../particle/cherry_blossom_fall_white.png | Bin 221 -> 196 bytes .../byg/textures/particle/cryptic_flame.png | Bin 191 -> 182 bytes .../textures/particle/skyris_leaf_fall.png | Bin 218 -> 197 bytes .../textures/particle/witch_hazel_leaf.png | Bin 271 -> 242 bytes .../models/armor/ametrine_layer_1.png | Bin 919 -> 827 bytes .../models/armor/ametrine_layer_2.png | Bin 471 -> 421 bytes Common/src/main/resources/logo_byg1.png | Bin 6832 -> 2704 bytes Common/src/main/resources/logo_text.png | Bin 90461 -> 76854 bytes Common/src/main/resources/mini_logo.png | Bin 2459 -> 2371 bytes 962 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_nightshade_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/potted_nightshade_sapling.json diff --git a/Common/build.gradle b/Common/build.gradle index 24cbbae21a..aaa1329c02 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -1,10 +1,17 @@ plugins { id('java') id('org.spongepowered.gradle.vanilla') version '0.2.1-SNAPSHOT' + // id('com.matyrobbrt.pngoptimiser') version '0.1.0' } archivesBaseName = "${mod_name}-common-${minecraft_version}" +/* +tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) { + file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png'])) +} +*/ + minecraft { accessWideners(project.file("src/main/resources/byg.aw")) version(minecraft_version) diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_nightshade_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_nightshade_sapling.json deleted file mode 100644 index 6c0fdbc351..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_nightshade_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_nightshade_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_nightshade_sapling.json b/Common/src/main/resources/assets/byg/models/block/potted_nightshade_sapling.json deleted file mode 100644 index 137bb29552..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/potted_nightshade_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "byg:block/nightshade_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mini_logo.png b/Common/src/main/resources/assets/byg/models/item/mini_logo.png index 890365c452d7c2bd028801e6dfce520c3ebf80b2..9649619208b96fb78bd6a572463bda00ef9f6116 100644 GIT binary patch delta 2316 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 XvvP?SUxbDd00000NkvXXu0mjf9k-Bc diff --git a/Common/src/main/resources/assets/byg/textures/biome_previews/prairie.png b/Common/src/main/resources/assets/byg/textures/biome_previews/prairie.png index 8b37b71deaf9eee8089974e83da4fa90a769dd97..a9e6116864dc47c7a257fb49fba424ca47f98e6b 100644 GIT binary patch literal 520192 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 xrcdYJA#2k72Wyk}UAsAIo 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

=T5;`v2Hc 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%0APIXWrI6!_?|C5TXxl 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℘b+CJFLsoNtdY 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 z z^Cg_CBu(An@#4UwFB~`rAbJ-x*A4H7(mVkiE0hqzD76c>YXJ!;!boxbtfoj_4^w_>%Q_d3hOIo#CCQXPOG_cQ)gRic(17{- zN>AmM?h9;*_fMaU5b3up-_tobf7m%Uf8;hPdK5BQ-b7-8hb&(0M)}um*$kpRn z6zk5BQH!8e3APTH)ZF}TOl&zlcN-6tDEM?dRNWjtsOl@O&NqMkzU;IRLQOlmd9jJS zc^bj#1KZ;ss^hQo>-+i+E|9>FP{bwL%Cw>LmcO?+uwuw+v7_)lCkus{xU;W&N zNAasNGgUH0bv0`_d&_;+KW>>v=t?11Zz{ZX?^y)gg*WD~=N81Eja@nhV|QYTyi4bAKdMw=W6(p8y7ku zcLC)HkE0Kcyr``yNN^z4GUphr9_zS)$bB*Pr>>@Y#$*P`Y3$lXh>3x)L@efZr9 z8#ZEqY`)vGNw=T!NM|_Wnz!ubQ^wW1Cz!65ythOvQXs||71+FQkXWY z1jlx0Yp_Do<7K9XqTr^=<*CMP%YjJkhYItkw0pH-f!xN~~(cw`Udqy)l6&~p0;REO z5yEQN#B_xEY0&Ah=C&YF<-T_h&ul*z(L~+FyqmzCCnOFj)W@)j-=C z_h4B`C^497ouN2y19VI=`bVqMQVM{0AHMvQMtt)f5%HK{$F}--M3sp;JWReS;oxac(e}X|@DWvk z*5hcFNBH&kEvCfx{%kKIn^M~`U}F7CNNPOkedKl6i6K*$yeJRVYrCN7rH?`7Tjr0H zDKaBqRzHsBHSVX*uPH_z1ZQeRFyxUm`POtzTJm>37(%4i!p7`{5R0M%1VJOKe(L)j`}3Uwc>%1Hs6}RY%uB4Dyl2b!Cx`rUYI6l*;W52yZi z9sViqTJ29h5VeR3y8=;sLwR`gwe*Ke>%@ZshjfKTK5!i_L`j6Y57TT1pVi1tuS$2~#c^M$kS@gFJN zmqdR48PKfaJ{Hz>zN4N!k8*E_K=^9iz3%w~*0*{^8_sbjNKszzCxtXVFS0`T4p==; z@`B{%J+p-$X*a=kX6db80#X+!DyiS`#@zUQlbgGrrsiTLciYd}ZqeCLACOYARNFK$leQ@rJw03NAl)nPVz>XtwF^xYqIV{3M-ktcq){ zA>W17CB)7Uhqtsk&gpC5D)u%fx7n{xUXHT&uJt=-Qq!<&;|>J`XtVAQ*jUR7PtW|l z7Jj$8OK-YX>vtGeq$PYax4&l^HI>1d_bkI$y*Pz}R`fz9$wfH(Lx2_<`0R=w*3XqZ zF^A_-+6cGIPpk(b*rA)g9^<;V5H-zZ9qjr8^0t%uO|Xbdy1bm#k~Ev*1XuXl+7Ha9 zp$9>iN~Rg=#;WPWgkI;9=2v+3WK#L7=qdi?E?%MT*~_EXM4hjZMo*8g#Rkj?>%Sia z;psddiMka@{(zQNYSK-1zS5{Jnw>l`R22-egp-}jCA{e6l!@*H6xVPFKqpU?q_YX( z*#rD3xt5R@_k#GbbSH3@c;}hRtaSw=pB8Uogxd`Q2d!>Z_MLEJ4-V;!Ph9YMhtv+&0q<0&s!My^#G5#QEVi)>p^k>-`kqHcES8)>;DiP)NWg22& zd1~lta$hp9x;2YTAAFdCDc z79<57!mD4AYp0)LC2CZXU-n{a^7=<9snX!v?$3pa_+anp5%CrX;XiCZ0Mxi7o&tc zmO_TGI9q{%{+30m@UK^TVW$jbu}f(#15FGlulv()YuOf+&Qu0U3pbHR{T=cE(4D^U%ZOUFZqkJZ z>Qc|>psm%lobFU*ax7TGfgz&my z5-dX7xH)5$2p=Vl-H zS#PBre_?ftuIb>GnMu_ps7JSgplL4^Wo6*Q=<(a1)Z14Qh8+5gqQj~i2P(fe@a=!mG!f-PQ*mGw9-l zH(NGwzLLd4%sGcqKa$vfx4#ob6W>QVci zUD(M?^H{zo!!ya5N7|DNQ6QfpUZA}La8Jk}fLE$|J|yG{S$Or8sy8=46}aL9oT^(9 zN7mcaf|*?)@qlHl2VhvPyON}LfA<#+j0J5%C{AO7RaILNe^9~%^@h^w>kltKYPM8} z`c@0xcDLoE8xh7cluRgY)n0#bpVzwtA~Ch2H|LJ)ZFH5BiP>f|s_CeUc`AVhpw+$^ z{!O+b=Bb;-yHmy0IdsdBJtbR*dF-e`%MkD%Tb=QNEdbDYSXZFR>I&N{*rEj4Sj-|5 zz|)Maa-_g(E@*kSA3P#gE6OdWv5a2!gCkPW9ZV$-cOR#JgLiUuHl*bHl#lJn%t6f9 z&W$y$jRe2-#iLh! z4|SJ9Th55=^yJ|XEVnK>@lyL*DM<{-G}}AgJjO*XIllc$o0E&?mUa{s)L{tXFnlf zCr8rK7ToXH>!SOAr)fl&9d&1JoGd~0bAlyUde8{7;%t0KsWfjlGTR`_K6`J!+^)v2 zb5Euct9x0;@dT~zN|=9TynPp`bb`2Aa;7Bou^8@8%Lx-%uRcS=rMiMR&h9VY?z&(i zh(n|dC{J2puvZl%GKu^5!q2x(p?f)jlTDCrYh!Di0l6wQonfy2=LS_$105JL_Uh=& zfm`bz^TAHf(|x43uz$qTro$>ObLUb^TJ@r?2lXTDHT#BZ!GEaHK4inVKf{XvXYW4& z)T?291^EKNhIMCuJ=nElW$M}g;7YTTO2j%j6gspz*2}!DuDdR)N9ilX&NK zuje+C!@f~1z8)cuF$&W+fdB6m@7XV9zn1uyef`zk@TpOx<2p>R@dpRqvig)uF*(u5 z`pJ3UM*ZXd<~UC%rh;>|OJemW{k6;rFE3(hTj3CZDU@`0=Mm z$z*LmEeq|(NH((4r_Fx6O1V`)Zb*m&;&XbiL!@QPF5AXWaeOK|F>JuLfIKhPLi?t| zM|{o+IBqDi3UI4diI5Cu{MC-!v-|cEI~9+TZ}vZGcPW_mELUEeo z-h0JGTT24xv7O4W0`&I+L%K^{(fx&*Nj0%t6oDPfca0^2?rt4n8=u84>HdzrbJlCz z?I>l)F~Qeu`AsB7N%PqB;%iH^yZ@OtU+$1k^?xI*dT*Fvjs{L=CT~y|Z4R5?HEcI7 zLO-WiXH;$Br2d>0dC&%NEFtszMh$CP0Wur5+3oFYQ2bNeg=j&G_3xPgeLg{gNv2)| zoOcBTR-muZ|63H|Bt!9tPaERCcc@jdUb`MDOyu=H{dRW%LNi$0EI-#6KD(bImC%*OT&Pls5XE{4G zQ^l0iV*2uX#+20*hOm>NpKD4qUn2BhU$e^>`BM&%^(nj7Fu%g`snVnr_nbW(MI@eS z1sI|J?Chx{)Cr@hamW5_##{wW zXPg5M<677avoMKIMdMciIa*S9W|dQjtsd~4zR@n7m>y>);$=g^zKTjCfW!hr`yGgA zq~(R>NBSDnuL#05xE|H^;H{>FB^=nM(AjFhO{3<78izf3Ck{ z>)*ooZsG87Ula(4eNhWj-QaecY-MoRb(_#p=-ZVBD$Q@t6p?h>dKFq?tMq(^l>jcE zQ>iG1@w~zC{$yZ1s|mZ6b1@$+(TO@OAE7)N@;T#7rhhee4n(4nojOMSQ!mxJey&}~ z`QvsC%HZX}M-GcT2?mz9!_;!4W@L*2soAg~r)YaHZ&_KDIz&0VD0o#Em2)$5 zTk3CsGs-`I(||U-mW1-FNi+kb!4n@qGj`_EN<`azm)%ynlBfdWLO}H+=N1mU5 zPcjwhM__|BsodCKEnPjqE!Q8Z-je+mnz+^eXgf#uF~S{$dVOM5p8Aoa`!qpeSbAUn zh;C)M^|0s!axzFE-}sG1wpc(KO(7~5YOy25>LV~%(RRyWtq^2{#;d3pni8@Eg^=dt zr*ukfd#zze>R!(iU`u8Dx21}QHNvA;j?quFn++yS`YzcM1oBRvQMrq;c2=sy&C4-e zj@>hSB7A2R+y5#l#_I-imuhKGGCO3ZXis(mp0qwBY=Sp}QUc^Vm9l z9j>GYhtM2xU3z*EQ9E}Ja{lYzyO_ai_A^55Ks!H;Zmp_<9?fmo48i!tv1;G(KS^-8 zcq%6W?1IrTN|#9-W+aZ1mpOVhZBvh(^U&RJHqIq_4?UVqvekUg-miE1*1aNTnGV1Q z;dn|9@IGl6U8W<62Qga}|BhTIa9m?jy@juC+wrEvpg_}ck6cay_4hVH5FkOjF*n>G zQI=1M->23#44QWHr~Z+oS`R6}8auUbM@kRksG|G_Q))?i7tBF=SDBU3vD#1dWULp+ zJKD!By>1&4C0OvXniLUH*v<>lI<<91VCuDSb=zr8)=Mz9j)!y&JMqjk7J?U6q=E0E zFj3C|ofiSHL#eH1nz@GLV`lr1pl~!;yUARAYp`xrfyO_%cGsh5Yr$=8|1hr_6uP02 zH1hEr{-LEn(JUXOfDtJ|tjm^VT;>OK#}=&eCJE(pEImLKpAle(I{Ll$T?S^N;YHO; zXS07%_MZeS4+nUXouU=lpt}cxQv_fT-O>0vX=5-eQY+Y`#yZBz7Kf`Mf zQ;I)XSpViJS^TPGz31Kel$UEqs~;d18JSu7^)6;7bJMV<>2GT?1HYe089%)(efymR zOX*447RlCqy{UF#Otm+--`)&5FfCy`+QcwQs`y;BziZG|vsM^!w*{3k)&D#v-*d#x zLV_{1BPiNyNph)TTV+&c%5K&9(jRP~6===0rw8-uMWgxM2ir%T3o^ZS({J`@v4Qzv z^FA(bj;e>qCFT3+US(vR+PH{61?FSFubtPhYgx6cH>W=|LW7ZGAqTL-dxLcr_H74F zoJ9I8=}wmQraQgrJ~qGN4^+doj$l zC~q$g*$K(uhKzfT6qPilJ#u42LhR>w<4KcgXg1w1OMFiU@rqdU)4TU49Azp!(fIF! zlO~*(^}I(zgCYtfz03dl<21^Ue%p5hA4Qs=V!_*f#v3yz62#xREp3O%S<<+UpgoM{zCxBeI&t$(h+* z*hG)ZR5Gp_RHQtR;mKkUTvp{Ik1XM=;5@UPkq>x5CAo4zAM0pq^Vbq+Z?lrV^fvKG zdX&`sx#YB7RKz^u2G1fd1!Ls)5yQhvR@=EBPO^eNdsjS#fg$qbaS;~pImo68OEgKK zC`7wSM>%DK%RK+Lw@A#gjTd1owOckob!cu4bZ7wk(lytSn))=enZAp~X1)z0$gM^Gg z(0HTq_t3DyRVDy+XgRIhv|COvZ!-_v3baMzlO+|9!PE|-dPX>0DkEi1ExJ5g$6{LO_pvkib{3=o8?{1J`i*?yhTH zbYY@|=V1ky$JCtH9*6|gAzQ>_*fw^=GHp#p*jwX5BehM0Ua;vPyvAmmiAs_TymsHi zhcM2Xt{;U4_SHkf^%&=-wNb8;L7-7Ud@W-)Jyd~|f!2u}*T&Yh_Vfm|Y`gW_HR&J_ zBi`jvkj z+~tsjU{5FIlOT!Z!JeWNaH*v3-K=|YFu5S*wd;*C} zxn4g=8tqPVWoN3ZhKYYu5I{9Tgqs&H+5)DaFwg}bk$2&j4VsznDNl$}G|!ASb>gXlZ3|A|B!m5#8`X^w#I;@f`(M3k_g70o#r zdprwkosqK>OLb$yJbGw|;Fs07)`^ag1FmpYWJ&_zxVUG25+}ccta$u&j1rkN-a;`L z-72j3a9VYcI-I%Nuy+#%o9XJoYfSQ`_U`Q{?}}{zwb+lU(UgHAsp3zo9{=qA*x|bV8#MW-yQF2`v*+^fWi%WvR7$K+>*(c_ihzHk1(KaZ*{K@ zCm`iy2W_ole{*;xM;U&5ZGB)nfTLnIz;oJsvW-XUpTQs+dpd z*I(mmEu}8hf_=q(i`|zT3Utrr&bHEukP4Z&D2auouT0wx{yqws8$zHkQj3<(oW1)SX?~pGsRO&uMwqOMz%9r}B*{KUC2&XQbM~6Z^4jmeFc1_$ zG)7?oJ-}JCV}0W`+k*=1eiyOg0uVGS!DPBkO2eIq+{Id(ADq5AhjYczS?RessHR56 zJy;}&i#qh5@zVW_^uKU%Q>F`k*>N_3XmXpbJq(~E>55&aF64r4aFGq)46&_$+F~s^ zTAV5q0Sj0v#2^Kdz1ZBh9CWL=JEMspk-@I-KlPr!nNHPg|BCq~T2_wQ&AmZi?Ch(L zku^U=NFr{DT4g1XQpXjdz+J z9++uibu&V-qn0@h!PGStd-eNtrD+_{WZ*e0-+CaGu<`LF6))KQgVYE-W|;b~wF=&9 zId<2v6DE9F|4(DTFkr(bwAykSM^LmWg^!&T8vY(Fa*B#+HN5wW#(OvUb;Rsp57M-4 zW6e9By|Lj{!WX06V}|+`#Qi@B{vZpWuJHFeEWNS}EI|K|U$8hcAr}WCEW{1Z1C_^!<3wO=km>SA0_M z;Uqm1QJ;hYSl=6%jAG;(!HBO%ks`96-x#@IKmgj`tD@8AB2&OPT_8~m{}8(aK+*s;QwVgTW9?P4?ztj^OwY>HZ6Xx*$FKWKVoNLo1S z0vFpu>?xFk2pfagDiQ;a)zRvU8r1De`6VikIVaS?u(fR>5NtbL*pM^Wg3Apk+0rTD zy_pr?Wfjlg)kGLMn{7BtIZm?vy1o;ELUN1o4@*3d#eS0+3--1V+Xs1W=%HQcizG}u z*XL1`=kF?0r}ckT?tPoqTjZ;o8W$`;S-w}NY&^neNptalYG6CKOc>}_27UW_#60nN z;Yge@@?HyF8Wlv{#Vfh5BZ571@8nCA6mv6h)vTlr@}V#JpRkb8qD6*_cW*Ei#A~2M zYoLtd7p$v2G2YZpsNYe|;K*b&MB?)Zbu<#=Pc;}WK6D#)iV?A{j?1=OrFH)MzWFf} zm+%rd2Q5l(Fh@m>)TnEE!5IqtdhUivN&_;QLW$RGtKjjG4XSWDn;2}Fdo|2qd*ZQ+ zEBG9Fif=|#uHAd1)CL3{LDVjs#o5`ZXp|JZR;a8XuhNE}+jU7@3|9Z7U@ir_r>y4~ zsC!rz+Gpf=U`(KU?HJ*nFMb^Kebbh=FnDd!tZMhs0YJ6_9z}7z*)sq@ShAA77q`3l z{~wWdC+oi=Eub<;x(Y+Kv7X8{0e~{kZJ-B`+l?#bTlRAqE9Hb;d8lruf{yHNiA5mq zw2(>J%)7C$+bz6nX6FNixBXdt!UQadE_iZ>YM<5G;zuKQ0W=<7hnWIWD1t7#mRB{Z zN=ydYTx*TM8@Plj-t~12s%5WgsiX1vS&kbL1@5saE+TJzy8+1w!-09_k}9<&gw$21 zeiP};3c6;O^`gxi(e(85qnzp@k{iv(C+k|=)`qrm`0*h$R153VlYbr=@QMuGMRvsZ zUUGLV*)}sPg;ur_OA2JW1}sr7!l%dB-;%@2{BNQzag{=S)zDTw*)$v$Q{d#rA8~hd$|A zn19cj>g2q9_uKO~26WG99p4O8meOj_vTbKdQb3_<_T@4T9|nqc)RB(5qg25@hhUHWqXc7o z=6J#M`1;~sjk3z zn`5SNSsaG707qP)F;ni{|>O!(fKf5lvFVO&7M zGv`djG|fCP>`A~N+1t0?E#FLkbwUE@|F&U--T^sRbiXj8>NN#iEX^MgJ2IZ+ z>I8qjh#u#FuBAgV0tt1zj%e-UYiKZJj8e0D|CIl<_nQ3Ku<`OHVno8U=H$z20O`H< zeDYMcPaDTw<2+d3+Ax9LAq-9q!m_efhxZqcL!$GJEHusVDJ(Q$Pmep?;(T90*VHPn z=5uqFdEF*-8q2p-mtjnhqro16c+7sX zl5liSYI-bgTTH-sPE$y$gdqRw1f;?3#`Rr?)7oLO`p-^|z2`%Mk^x+^qpREjg)qqW z^iP(E;_$E4$>$2_34>oX&UHw7Ev=EI!?#XMD?JatL=*{}v#+7)wMlP&3x#z`T&Ybw z`aZV9yDL9XH>ZU|^e^arHHb(JTw3eaXl)BgID7c&&}7u~E5DGp*T&;zdLVo!^5r?F z%bf8^?U7bX%(l`VXlOU^A6*cz#r{7t7?{d{QI;AW@dLm*r_Uv?$*~!4ahOGML^i4E zwvW~)!s|fZj<*_K@vJeF5yK;;J9y}ah;9?(uTQDe$~S?ZH*nAKx=#4l%KVf$Nm&iC zNu-G-Q4yoc>#3381Aeg%Noh@)lLU{JI#*XUSe}&o-&0hpQmo3WVk>kv_^|8ICs3s} zCz(SXJV8bPUW%~)l3f(or9b?xjM=u<0>Y;e9l#uC?==Sj@ut7HKj?2czK0Hbmo*qI z+iVUw9Sw`0E0YBXSWKvNKLJcmrix0c#E3Md7J+)x@>SybDa^Aa&Tn9ucEDt$3@Hm1F8VThftb|S>7R1cKdp3K1K zCOR;+cx|*nLKpV(`&gXMjyL7gx;a&qO_qIF7MojyQG-rPd}j5gVO6C1 z`RS9tCjYpDx@|y`9>0oD{P!fFv7qWUy1}T8-*Q?Y31y5t1Bf4!E-sRKlX=O#^0F%9 zv3IO|9UDDwAM+Arj3B*rKR%a9Teb#=gB~${(gx3u|4NV9Z7SSngqhgO$@~_ZPkbry z;R=vRxJki^(3ED>gP@u09f+OC7W>kz)pH=gK64%$1eyfI|A(!24`({?-~USrsho1k zF$y_`oKHD-a7c>eYz{fhNX|xy%wZ@AIVF|keA*ml4l(6?$Z>3#;~33(W_(}0-`~&o z`dq*3_wW94&Gy{$bwBU>aa&;E-^#tss;gw%efq<%r93uHe2vmX+^iQfJ*OD2q?Yu3 z@uLdby|?eY9pU?$vaZ=Ou)OxrzX)Ca=zTCbB?sCN!;J+B6wMqI$WYI{Ys?#|fB=I{ z-O74(9{~72u5Z9?Us^|X@eWwiyc{=QAw-%hs3M=i-Qp*Q3I6MKhj2#3-<5VvSqi{8 zlkiCKc$@-csO~qFm5!T;DP>*z3Y~00fYTkYp8}6A_bP?1RXx}GhOL{*Q!Qw5UGM97 zTPYPX1NLl(e0C(6pulaBoVRwf2HOhz?&7YxVwOkU&;Ty+XZ$Aiini)xld|A5BqE*=|XM0Bi^C<%6S7OF) z7rF6!JCW65_bchZl75=rvFzdXYaD-a@xcMo+ja<@fcYWr)X1e5=o-rUl@r}aiqc`p zt+4d6V>_r#g9whOPwU6(NbC7f-#*Tu2(a6Yk9$P_@b);GNr9GY|6T&rxyz*~CFXGI z%;kUJ0nO%Y6T^R$!iB8=yCDB(IQIj?8DMRV{;%Pzd_;Eri^h_TG65qOUZV9dx1n6V zWLaHFo5Y)PIy{BTw-fcRY&AZ3?w;;<)9Kz2jj0yVZPgvSjTPk}?<^HLmGw&I8$uz0^CheBT*2UqtkNvTUQDMmM@Y`3c!N2LnAp^3gP(Ak#HQ4uM9G3l-1z1Ffc ze)xKVIZ8}~Br%5ZV2oF~cHB4+a2R~V%4TP0~Gn}vA8uM%UeP*n`%W}he zm~%yFfcG>qD&X4>Z6u=PaFB~Av-l4~G&~smbDu5e z@EA^Oc8k@9G^w{`jCcKYneI|!uZ+PTrfvZ?iu}T@!S-jl+rY()iyXxER&C_|NeQ^* zPWEVfiZ+U|o_NFU65^}RuRw0&u|V(jc&9{@TVd>$yU$vHJQqEmvF5#TB{yjeGZb`n zvC)bFsC9hKVQTuq3Wyq<+I^{djJXAR_o-CbyhX4R`xURF!RcpFV1 zgKh*7e7o=$nh;rdioXCf9mF0n8e6WoA>cTg-V|Q2XVg2~IwLED6@Mv}dPCyZ@ub<8 z>kka;IR_I$q+m$OMqSJ8oB3^Mo5!AZGzWM928Q%HVt;uHeWmAYkB|AM!2__*hJ16x z<^;tpw)-`hK%iob2eb?E{b(NGKRN1Ap)PZ%nLdtYD(aR9kx-S=!GI}NVwCwp#yfm# z^pqnj9qq3qGH`=i%0D^OOPRzxZ?7OvO$d_5j?p#CK5Tfq(Ai+0^yd>9lo;<^UNd~dRR~lIFibASFyNxOX9l$>}_`8a(9WAMT zm&zxu3^LI6mONI?BfS%cGUinzieA*kHKxk#rjAa@Opg^Q^k~fK=1s4Ecf6L$(hj!5 z>$R}cFM6={*3C%Z?uqX~bEp(>_%cV(T57SylO=E@a#|So1F}1=T%|2Kb#C?R zz^VqDg-3hYE&FgPi4Br_Qq-b}C+VRU8P@l;+W*lF%{P@TErKvbML!=s(el*J{=%$^W!_~+yZkJm0wME!?E&HUNXmW8K!$&Gs~YYCP(9qk@57tzj3Q=QuxTK< zeQLZAkY`hDeD4k{vGb$JZK`NSXvqXpp?^-HLLc*t2T$-=2c!eeU*Rt9&iMl{s$UYk%ZsRa6umiY~B+izrl>O0^D z$e_5sny2;lzpD~co4zy;Xw)*CNQ45IzOgfEDi6opuFEDTAjxVS(4G8kw@o%j;rZn| z9mn2JmWM^n_xi%mj0T6vqA{g<^waPy+nu)ekDC^!*GsiK>-Col1`hJxv`bi)fLI2*p^#Ev9qhQ$416j3h*+*Q1P><*(%=M0Byeu6_rC z-DdjL6{<%+YehMX3uu-MJ@S&*go$yygYy zrM9##fwp>_FsfY*w{za*oI#Xy1(|fe5^ld<0oztrzpohQ`+`w~i!q5Y3AnhMRSf%? zj7PB*UG)S$2DZ6=k;Wb(l%*Gp9VsN%<%Kwi9G$GJR)D`-C_h-RJ_cO5OR_+S;eu&Xzj=>3RQp_;HoKzvod@2jSiRc$4?7 zE`#sQs05^-?R5L(Juz#3ik&y@$qM&}E}i=o6&1|s`B!vAp2GRf!njHq;eYvbp8=&h z%+}EFg{oggiFbuV`5E3V+noV!`$edzlNVRhcrs&L^)$>b=%+AuDp+js%*5F~SeVG> z>HUWlYoiC;pQ@QvPM0xzqYxdmAz7K@h+Mv9@hrV-rx_t7 zH?Dm)JMDHY?LF3`yL3S8d%NuQW}rpun>>emMOV}<=MNh*?V0+1qP|s7Uom-Ep6m&4 zEIr}iUH%wbUOLsMgGyyAWj8sk%s&n+{r8m|0m{)%=J`_bHtz9%jx(8WbTY>wjY;!fnA?QlmMc!I z;2LxMqtWdOeezgHZZ`5GK!5d8X+vO0@GB#%*x0$zL? zc9&G&FNA!1DsPptxSV}QCGbse7rT_3A`G$BY1T9uPg*ekTk@_;G*sXQU+hA7R-CNL zebQVu7+mfXK2|OGA(Sn6vBGAJf8DLab|UDSRZagQA!36$})dm2_kPnaQCH_vi)Q0GDS|5(s(CL&51*r%WFaj2tGu0H)YB zaZR|z#DUu-V(Rx3xMMWxE`tqkCXF|Pr-iXCJ7?YO*IsR!)n;P? zrOIY12r^^ojTj&O)d*b6grPuM`iF%tnFE!-dM{1g&xj}%{th1k?`z9%oVg+jec6b4!#rM;mvWtgDPr zGNszP+7mR%5!GVAUU6g^#nLY`1HY#@o)B+^_J|6W2{R@E3FOc~+^75=srORR=7;+n zIIyi5LG{&@-^agVZmV^XL?g>SanwKM^$)Qhm@R* zlvJ7GuSDNsJWWq~ra^@!Neuq-K`_>{*p8d}YQ{U8q*{0eL8Kq-@T=H@F5L&^(R zej7B244-#fP;MO)n?U%xI-Y#@eZE6?IJ=DNm2N~8{sN@|5$PZM;J)TLU@IPQU)Oa`M`PVeWn8>>?uIRs~>i(JJ z-`gMfFr@o5bt!yZkZ(%m-dO#qac%#B30KYS7PU9>vU?9xGY9YbDfCOX4K31U>C$x$ zC%5jMCA^l88)Tw3dOm2>`Vh50+_o7Nu{&!mgq}vMs^~=2k@ToHI)^wJ;!;v;hX2${ zRbWJyg=2WJ2gWiI+SRCsoyt5lB3C3UG+DdDl$IN>JPGUm!r!kl7U!SY{CB1hnraQW|};B}iLkv6-)wA;##51Q1zox!__!Vod|FG4M5 zT5Bv?1Jbtl>vzk?VD!XxwWj{Hqv9y#SRrC&>5qFa^IEdNgX6Up5ss^DZWIe`ox{g{ zia+FTY*R~EWS!r0gM-0!x${JKIChkl(JtHfZDoYx) zn&R9IIv(#A&M<>=&aLz2%S75?XXYRL>Xe+lq_>ft4h{3uJRNLc8`zxuNShL%O_3$W z!)N+!SBo~qK77Q3HxrLGfb^Qq@rHNdloI*69{4D!WAfk~?K{DX0}b2uIk`xc$R@Za zL7#Q_GvB8HMp8fry855x_`mYRqxa1mVlE{3L}IR^xVy{7uSX`$reW8YU8&&hMU})M zr+$DHt{bDt5uDO>E#JZmG@jNP$E|O1CY0r`ykv>|6}Xd-ZSBvR_BQqxv#f4>qSwoU z9*pg5{bIzXnMJcluV9ZgR4wUF$6e~b>VJtNq>F2Xr{6;;U;Z1b)3ejaZR8gYTUYCQe-?I{Ni>f{ImQ#9E%6?S<3Vr8~GdJ~CHf zNTUZ(JVVV#p|_saFjaDhOufN!LZYlgD#QUUB7nT{-z}^D(PixzGVf#ur9K?BvBCq} zu0PO_8nll^$2=)9rB2yZ6wD6!H>;1EaxOB8rksr-#MjeB@QreRX|~@?H^YTKhZE}G zY2N}iPv4O!cGOgwcWZqW0H@4il=&spmia(yLs2jrYI^F!?d*ZGY3#Z#lQnU21y~zpn7k7 zNZ|#3=rUS~yf+EXhaqR=0GwAA8UvjF80$j{&;$P|f0#K-y$x@wXm;3@f4B&U;;R(| z(KLXs!}JYcE5K5{6+};!l_$Z8iMjW6#)Nh<1QQcYUN&xWW1M)>OrsSMVdB2H#B303 zZ+L^#Y>g=Tb zKD2PWyFULn?ErhcVP(bT$r!d0N6^MU>hD-kbe~^O%DNd|(%av%>`whM%f;7;u6kV+ zj&8y^_mXe0`oxwx<&b|LV3yRrk-+do3==5k6OZlhAf`82av^q=wTzE^_+OcZ`3yE$ z=aXI}E&JvWtZDPKjBYb6=-!s#QT#pIB*~*E}oke4ygzjE4=U zZz*GWrd94#n=2&)mWL;|t-os zB>~C^sy}Thu2XK%xXy5@&0ov7^i~G+gPIFsQfJ$p5}Z_BvpSWSD`;p#Gp5*a6M~@N zqcX_XegFxV7Y`JClr04XWDrI-O>X~38|M9AQ}{M8g**Q{g@65j(bAf##l1g{`@5Ex^-bJUEPF0~SyzSoq0?#Z4QqA%R* z4BlPSIxm5|C9Js@DoN6moSewZ%n6%dMh^FSIn<_D0TsomEkDtBMX%**kwf*UyoN3@ zQ#W?I@?x@J8VUKH%U>b<>}*I+N1xEBNc;*{chqc8M|nFcqSs@BezZUqd1!}~x}zxN zr$V-Bid8y+j7{gztaXkI(cb;yEd)vzTFcj%SV4R9ATV3qmw06|5-Ddvn&WrQ_;%7+ z(NQ%Yr)umH`O4f~gZ<4Upb7T*anv(uzadk&8wy zzL^Qd;;r$FD91=G-ixd7Oo6D1N#;zC`Hcb?GiG!XmLc|;NrX|dL!SA9SMtnBoT^{a z+1F?lo(mU@3JI!d(}nyA`SPvu?uDZHhrnsG8mD@@ING9x~hR7hg;xAah#d zLlyuDi0WVeaLGvEvW^(;4N^{kEfl5^m+}x@&s5LmzpV|Rq_CvidZ294Z?VA;1$RoY zxO35}@Qpq>Xzn8|&iE!_#ya2A7wD=1X6-+ZDt40=L2G!7Y7Vm}b490h*xEhq!~(n< zozuw9siOXh5^o_--EnmDyC8cgHhJ~l;kCB0zcov=Oem@wwG=T2rKXcK~#<3lujb$m}WiJ=Y08EazgT*(^A z+bC{`=YA*GX+@rL~4}|4h|5UL_DXs$VgUS0p z1&0BBhkusXAohiEDl*b8BnOlL9-h6Xo}!36Kdyv^HLQjEjb|%u2~NZ633b{D$io`6 z_t~V@1Ax3s|D3yjpC>(x2QbVRSZOVU!$PDgDa(c_i%NNV_Pmzij~|*oPwF|0V`4u& zwrO`Cc!bJ!!Xt8HBiR9JPUIIMp2S^^&;hkDItPvp2l%52+4>nh-$me@x}Rd|t8Ld| z+n&G_R&%~Rx*eCX-U5)m=Pi=jB)CW?iNa^n)@Uc91K*pvrRW*?MNhq5E7~u9e()#d z?5_Mbe+;jq2gaME>Q1)~-X1s3T3mJav%Je(8`ylM#)Uzju2AO9hi1hwRynw*mQfiY zdlPf^ggKelcxGbm2`Kht!aU{vn+AF;C|e$m|GmLFj%zyfNfE^rAHPOAO5lAOu5J?c z9f|1;EysTsU$d-jFXLMt25rU)QYVJEAW}jR4$2uJ)Pk1OlI=`-gh9D+o%S;ajv6e8><*-qgm;m-&wzwW;=Kv&|Sa zbu6n0Rhd(l(^cGN9Va|4Y>+7v-zFsY@(08=XQ{3ZLn>2`LR&wmwqzGZNN)2;EOoIt zi%xq5yKzWc6)nlc_!Antl&V1_fa|nAwPJg>rRQnj^{C{>DgZ}usA|<(doE(DI5$U# z{@h|fuf+7yNh!+EAi@BZ?g8%7t}5_V7!;2f@0zd+%A-N@KlLw0+!4T{&t|SQ9S)=E z+KPk6Uxsad0z}pUj}p_fWTxukw259uzP){&6QCb%?&HJ#skb4_+69q)UH&6y$R9p= zJ7{tMP=;a&4Z;Y3Y$(mUmEV`e^gTGSSXE<-0uURXm`BU`_L>+p^O+bvJtFT+Bvu69 z!`w#r+o=Ke=y{SVgQ9lV*zAK;Tl$upn1UpbqH;I}cga&MC_?n@p6Uk$nRc+xldWfV zeUT@nuvDUkMrNo9;J0y^O%K#GW=5WEay{nO;M7(83{F|>lvrT5v#mG$>TTN}kP}iO zeRAX|bZaTqr(I$?K?5=SWZO{tB6jwGH#F?$1@Nbf1P1$*()L~29csB7##zWl)rX~& zA}1s^PrBo4#1XeB^@&z-wW6zPbor&4l7<#SG^}&ylJNpw4{%)75sTq@W9TE=ar7CiCoap3~$QgMGD9?yOfe&dEM*>BQyU?c7s`52LT$P?cAZJQmWImM!$Todc%17(ZsUD*lqk$vn@H7xQ()|1l<}WMxL!WV01B0N`Szg5>OA-eC@$F z^>`h$<5)NG2|)mSF6#4HzMF^D zLIJ@}mqsxY7X82`PgCx9UB7vbQIjd58r~sx!l(GPZHaC9i}Sj0C7Un4?8N7U*0LR< z<3IQM%1Ei$&Qm6WitY!xU*dFRT*t-HF`h5_RQOpw2SE~^0E_u$|0*I zVskrlV2C1v{hCCFXX6ybg$)1)K#^?!=^xXEtoBR#>zNUM`#_cl+x=H{=sWu&N26pU zt&hVa$~T8MoV*t^RHZiae*Ao6*t*+7wz2ucz*xsiShPm>$)GqKp{fXL1#75bCGFE; zLf9+_v-!?iJ6-cfN=_m40NOt89~c=0eA{lyf?2pdl*heM(iKk&X=L@K3f**zz=eD<5$Z_BB?*}85N`)E8aX^bDYhPn?rhw zfLTw>poTCKdT(BTMyygMP-v@zD@F5zPChueZth-(ZRp9$ICoDv|8B)yCeNBhkKN5WY(Zb}@xR^el*Xdc!L+bvU(_;^)eE z)}ps(%I|3WJWxqMW;IpiXV*7QsUTp__$J!=L6cJJv9^_gS|=q{njoe3HdES@o_cEs zI!0ux!*v%{sosXCH%r4bL?kZ#15RAW)H`X5nXk*>+cZ<cGPm4B1O;HHg^@k2&XoGlDg2N;lI( z0W4sBH3rV^_YklHjso#{@C5y|-rrIi!)Y4G3Rs(0@kt>-Q8q0RP$u4>{3V0zv)57tGIM!QR1hLi1f3%UHb$$P^i%g9kAy~+Gn;5f~05kE(- zAmuNrdfo536N0ItFofFM9&%AV10)(#P?17Z!FpU}Ve?88Ph(8+=2~yed#Q2WN|bO6 zsKhc~%73kml)Tggv`pMUw|d#e<=z}#IWEBx8-HN@+uebTTnq*g;&{9}f{ zW5Ri@zBqezg#=`Ih1)xnrj?vQE8HnO=HnND`VjE()~}kQD{^o(88nv+jw^!+IT4Sn zKbj`+HIxUS(9PU_+Y)ZH$M_zqAIsV4B4oA_ihB4}Bye;SRi+&)s8eF^APTTAHhxLq zzFic>weLCD+u}{Tzh-H-04w|7J-BS3fUC<0!FP20?W}&Camr9#b4AuY6%s_+jiI^5 z2+E-j6`PR0?W6}W2~-I*Z}mbcyB9%$B{>p-SUst#5kvaC-if@m1L*bF>kUw(Q=O7K zQ@D9>L4FF|MR%8Bcxpzes-+5(AOJ(|7oopnTiIT;))u9$n6(e>?E?4@lKVeJzk7_c zd~07LDX@7!Vi%MU()I4~hL~#rt+*Py(b!L2fW7EYpkAps@>sksq%z)^o{G7r_fh^= zCJ)tjx-wVhW-@Dj(g<#xB>#&If^Dfdf%DOunODFV`(`rZ~dxq}6ad(fW=xlH%opvcoh4seUbGzcO8xgMIH9=?om zN4yqrQk;-Eu5+rdbs^-c%*(XQYpE*=-yDdU@#8Pk)q%_syPbB05&7C~EY z%?}oTSgmZOFn&}q~fD<5=k~Zugi|d9lFznk+ok6G;Jn}*NN?Rv3@=0wiI__ zW4DZ@@P#^yirUoO-myGks;>S&Lp{@wq|$4*AsuI5Iy8#P9N}8~TinkXd1}_o2e(YGF7A+T+TGB2=zZ9nJ8H%?nX*xaxn^ z;1ozs5h1|#XN=tQL>-fu{n$s#Gbs?$&G_0!&*yH<)JNHD`M^$j0U=v32;)YO%#KU8 z|M-&=%$@G2#fhQ7@5Mc6Sa7Zbo(Ta(<4ciX*9&f;f?*jEoLHWd_5{L-2Jc{LGk%Cb zzuM;^BbL3T*b)P9$$^)yl#W4iTTu*r&KqhL5+!gO>G-7w!4gs3Y4Kvj+jWz7i>`?N#i4V z8{AFkDslf8w68W;>0cup=`G1pEYelW*T1RAay6C%b>o(=_JR(Y^xZ$N=icND05TuB zz)8<|-C$zmWhI|``wFc;KE6`rw`u-nPlaqYd75`c^(@dSJ-wfhH5fXzB2_~wy8Dl( zNX?Eq2!ZqvM|m_clEJ6p=R`!Vx5;5ni;eg@MAH-+a1v*@;@JHk@|3Kn5t7-H6+0?g-xq0DJPgp`Xjm5_O3Fn_md0`*0 z06Z7tlg`;?{|dHw);N(%)*ANym$Tiz`ZHhNI-C$W#m)oJo(D@wTpq$;ZU(x$EwO)p zB$lRjHdSb24d@#+8Ib^Uwp!CGy_EoU6*6j-!R)&xr#u00k~Rqri+t#CsItXwT!r9K zr#UdFcnf(FO)GQ#0RI|r<_RQN0qu`@V?>)06A@fkufG*uo4No>RNbrH|0A1n330gB z-e3p=V$jCiWJL0B(7T}&D~EW$wR*$)=0WHckj}R4AzQDLEuEF~Wk>;OK2`MdN}fNR z(y)q(-S>FIMGX-t45*7_HR8Uz8RF2Awz*(ROYTahdSuK0tjZ=h&~Uq}ikE7jA`5O? zlC8~l`uADu#pC71RTTl;Tre(K&sSpvsNPk6WjxVU2sLHR892CHrRK5#XuyG{?Z|rYIetg2AYa$jv>Nxgfp?y7TqjGx` zeVA-)N9x4F8pRsvE?UiC1ObCS;O_={fGWH1&G>Y6wKRt;?3+Al!GVSfuY5oD2 z4Ywo$82HbR$K5^3OaZ(Ujq*(nH#r?4aq*1d8b@874wbuiQ+GYje&&n8K!t_xec8=2 z{=+VDmL7h_%A~&Ev3Q3+Us!S|1H8-kR71dAk&I1g&`sKYcp}R^Q=#j2&nR{ ztsXgJ70p?B_@VEUCL@3-?FQPv=vR1He6`i1J>n%PaciTKMj@f*!3e$UA1Loih%Pv)W7D{E@7-)^5*O0@vphp7Zrz=5|? zdNIB8fHb1nPCk4|&RZ!)!;ZGH4~MvGtF|!}TN0j&PLNSv4TivPN5i9tV&et!$a-M( zAW$jab&Xm(b)NXS=P|29#1Bg>n^3|7+3#`_eOBT4YPEOTCAhGYkKuJRIoo{71MJ@D zw;}S#N1x{N?MoWX5 zyZj$k3s1XO6UX7sCfmO;JW*RS2SC0sGaUX&#qZiBO~#U<&iXK`NbaE*WVMMHS?~2b zLyM2fT`r$Sa^|~@i_o(}CRb(Xy;#yStxjAK*Z5~1|C>^xi z#)Yi6VGSraR&+Fz-ucM0ZW+fMW`saoNgY4Xc9x>v<2sc1sV&>PJfuu)gjPm4u1N&u zXMW#nP5X{2ifD6*dk=A4XAq4TEITRnVg5E2kaF$BR?P~tcWwUMvGx2F+lazF+E^3~ zK%bdVsJ0%GgE-0m?!+A5^n4FSNb;QSkc`JKn)!M=2B`wkSpz^FQN{!_$~ZELGP(?t zmvis$=(~BJT7q#nI#O?4?F&wG=1dsj`D`#vTAA5l4_X@lO!B zt?OX)4!v_ITXz^i=uR^}YxjAnggNnV4NME@Yhe?a5978mm`1S#@8$I_ukCM}=L6kI z8gk0U2GhKFtwZgn{NfYI_%86=QvlNcVmJRm9Xc@u=dOxY|@ICDA!53qTLuZ2UB4Mr2Bzqje#z#lZe;eeVE%++Lr?4FeV80bE<8_@~f@9ti_ z-bXCKsjaZ3m+u<(YT0?_Kdz5nB!JTP=Vf-TgLkGRaYV~iMirpblMAK=hl ze}=D)Hiuskw|>JzyrX}}h5S+0_(IwRoTbMqp5o6Js(y#-t`aydL%Lq*l{-uQqA7>= zM-fHw1NA2jLRQTf25RJ|)2NB-R7Tp$>XN>l3CK>lMnZi2_ zM7pYS$!{s~kyw1aI4j0_|89s^TiJ0+0K zfm{>psCi&mQQ92wH-mKFURL9UC&%-shbP-r>p$fPQ4OyoHap#lU@eJJp`P3ReGC() z2#x+zkT#WVo=`$|rAkELY3DXb+tbr?$M$Zo)z|q%y&YE#BND;Mj(JYP@B2cT#(Z3` zN!8*@Qd)68G`EBf?ds%&+V&>6wKI>Z1E+3B!keSBqKDTrUw(QKG48N*&1RLTnvVmo zkvn}dl^^bz6*@6M@5!N`Mt?lI2=Kq5qCp>Iyql~j$ud@NjEN{ju?nJpc`F7mESgr@ zW0BD5g1p@>`c-2x0`kpv-*awnd6~NOYACMyVR}eO#Nqp}M-aeVt41F&sw1S!hp4dF z&7r(&Of+W*9BBuGAymiRA&SJ8^dRouFBDUfq)GrJ2<7lC${ z@@XPK>cjqzVqBhg4N#2ZzX!kmAH~>a^S!C9%MZYD6`)}^;PKVT;u42OcLC6=vo=}f#TFMAxqm>wEm5N=N6ss2C!d~$wDpUyE(amKyeyBemE1Ep>J?urA)c~1U`P<0%MsrO?*M8UpkU2!k zJSDd%kl!j4x#B-ogMI7SNpphB$wRTK1Psyi$UGc?{L=f8WdV*3TFuExsAE|RM3L|!>I-+ z?>qkS)2R>4&Vc?zKQlct7I$4(Rd}D|yYU@+;g9gV7%Y0oPyerT_V>*RzRj{}Lx3~H z&5sMMdoSmTcUM}-+IjsFYbHK+Yw8zwLz-8FHJHD!Z>V_3<-3-$nj3s&?QQpOz_jw@ zHEVa)CPDd?N*mnJ3A#1A`?%w}lhH&kRl)Wz0On0JWb?b~cTVIV)~D3YYFP^%U*8k% z%6*!pL~ob!E|NG8YCilh*aWNYA=4Z8+5+IJ7&7B zUug&BYo;iBp>#nq!aAF)q72AA%Tj!M@7Z4e#McJUk3q~&QJs>5$zNKQf}^{un0d|5 zdX8pP*+JPMZ-drrn5WTpmTB7mihG<;+TZ5a zNH<~S!Fu%AwRptMr5CL=5vDEiFFG{vaQVqgdeSf?o!^n3uDRY&w#-Wzy)W`)(or{96EbI zG3GCFb{0maMNdz|kVKAkD7xv@-MpHuG0MdIodPl&@Jnl8`y|l2{Kt9+_TT|gUn6Y4 zneUSb?x|;I@|Jk*tLM-3-Q4p9xWn@r*p56lqj1*P3xa|!hiSLKMUKxLC1J)1_CH!=F4^qG$e0V%*u=d5vP;%d1L*A znw6z``1smpGr+|%j9$xjc7(IOZsS2yW{kt1^D{Vpnl!+9UF8T!3pIFRaN#XeAb(y~ zmFJl;x-AhAAvS;O!UUdrSc5-*`wAn@hJ37O1|Ez_Eu_KZS(u5G??tr9TUBJTxk}Tv&PkjsS10 zeG>3c{AzDl68DCzV`q-Keob5lxNmK?bS4hu0NrKDDQ03gcGvvyVXqMw(!7?@2z9-h z9SBQ@lV^V?rtF~&CLN#}Fl5Z6J{fTsPC7%~JCS0;Iz%kFFgFp-&t!#o$NK(~w0}a$ zHnwB_wQ8(A^MLhjpgA2h8~|kdlI_0A2ob8XUXXxdj%ikrK?Juw_@^{n>#lL0U4BD( z*Us$W@4C(;^)k%=ZF0vEORkv}&S^zGK+lwDUwk`$&8{UOoBOz{JoABTa8bB*55 zCt^a{aE@{j))xQ#69%q57Q@5QujD{}UjeM`$`pPtR6e%`Ghszk~p6QMR1dtZL;EqaP< zRnn_vJg)aC2&lG>J06$p9ixoC-Ck9?7hEF8nzRdSnc8i*n!w}4=CtI9s*y-3 zjk&S?()!)}oxThl&512wH+!F`;gUVWdi(DJ%Zj7Vnyr%g=s6z=9sQGW?t|0o=xmg7v#E1KW?(xaNGrR&Q5B^;8{7M@fY(R{E4Pi|FjrS3vJ|)i7LVWcQr{ zi*hPDJ@ekYc(aY>pg1VsiMBOUa?$(T_h`j#A*A7nG-J<{1G_K1~xZ zR?hV6Y^)vR4ODnuT_mYOBDzIHWb>Ua2mE9&dNR)vulr(Z%hsplM`Chr%7xINjWwWp z0hp^EN3=5FcLtK)0+`KuaZHx-+@r4`aaqFQE++rEx`jn@0C*%R6+4UYr~iU-uYkCr z++@o>LTLF(W==Tw=-L`chTs|?@toTt=lzi1qP(EkC;nu^j@`^U<0+V7Z=b-Fyzd3} zWoZ$ypIo4*n8&>Wa7~wWl%gcv9hmO^44Tb}Ud~7~d1$t?xa}v4fVLT@OsmyXbU5ms zCB;bWFRW_jCu>ou+9kF}p!K&e?_LNYK27br84rhB2aZ*(s35OGaa_ej=X1a`hr>_d+IH% zf0AHzrpR3mtfVP4&Tnn1>hqJSElt7vc2?NKAruL;@6tqdLqmM3x9ysDTp1F8&Y+TFzOLvH zDN-J5`Emp$op@$c+{a_v>JgpoB zU0y$n&E^EN4W&nUO0)gx6@A-gMUB#2O1pAqi_uPdBf3`6X#-r--R1zRj9WJ&SN;uqh!%0rS_l>KH*w!l`yfuJ+5d005Nf!@ zkIbSIMw=a2+c(EU$+H#2CUf+U(YoOP(f`BLn@2|a=l*H z^Ljk~_62@Bq;2xOvp;9olk+R;R{R?*=H^6^TlAYsX4dG(rw5+WZxQOp%Eur3*6t}! zAR`iucjh4lG~VrJf-FdDTgBuz$=0`hI)sp_G|q1?psemR0`vzT7!Jq9&^PmF1iu_8 zJE*3K{8=ejj;M@EaGK7*SZ=RGBS-CALWSpD7}0$;t5?0VkF(2Y>yFJCkiQ^s4NFnQ zx{I~}zNMddsrjt7T@|+@W=W+NZzLeudK40up%#(ruq}l803`bhDJkr&RbUx;T1Kf| z+^f3k&R;8FE2dpj5__L`b>4PbkOv5;>Yq9%R=RGpk}It~S)F-u9osnN_w({OU)yoX zUj%$@Jh6(N>#VyIt<%l5wgYxEAQ+*BYWI}sTxh+SdC{o+Um5;4Q2X)J0~n|&7n=Rs z&Y=F6JIi@p**J)u&B^^3HscLfmQEFO7Og6zGVeOFv`L)K6Hr>Kx$e6GD4w31xcPSU zu)auLD$;3sh>IYslF#OErFNx2ZdJTFozj`U$MD6sPU@H!LE)`Sq`8;HHJlzA)$}At zITd{>_-HsZ^~B{8%rCrZRM#bxS?)4%sMG=0yd;2-^Pai)4Mg|8_~Ju@DXE@O4hb7e;1{Ja~gfla5{7pf)u zZ4*Hq%*s2y!~<-XGFj8Y+mjtcf`^(_G(SpNK^L<2*DekVq52Zg%5?z4LmY5GW1YP87Ehm>YwU)?KwRo)vN{T zMhVFA$~7tN36SWj++$Aa$0)O_#7A=K1DVc7^G=L%jXa;aPC0jVxv-v{IgJ5NblIW% zI48RDXFY}Yf9j5#qd47?1MaC>D^PLSD&OgIXN{qjeNDx5%y3CCil~`p&b4Qd5%0?NE;jn&^adasmw+qTY~N%Kwrdu9Jn>C%=l1cI74GV{e-oMo z_Q}_cRy4FtNn{>o2+VA%=f5%F3fqlt4SutXl%EVMhd= z-*?UQwd~okT6bZCTuu1`==%7oE?>udRiE+@^FgZXskC*!%`la3%ke)KHl0F9`I1hXL_y1nnoIu zTC>YLo}P8?hz7u&BfBar+jMYN?C7{g*Vvb>%Y7CC9F%Bv8-E)0t1hMzW6hch!1s3(#%kA4Nvv}jXZ<^j6V+tW;)JJ^JqFw z7b@DmA7=xL6{dIb7%<$FM5DP7Eu}d4`@vTBVU!v1)TH&O$fCt^kY$55D8k|NUN7;m z=wlVa$^kbFsdx&T`aty~%)#t{m&h~*dYSNVSG_*oHo*48K^Q`pL1_lW%GI?VcpSe-2$B2?X1E02Fh7c{C$Yxz&6sE+XYkMask1eUmsg25^e+%#AGpMRlfbdk<4R^`7aP>{@30vm)2hKVjS!wrOw;aj3NY?PS zbo?)pp}p@uu4K~ni`eptQWL&8;zPqunotm-|M(tKtJT{i8s<} zn!U@v+4IfZ4e)D7Cc!uj9^Kcc)wuWpoBnO4r+xc4HB#WV)k)*ymUx9{>NYHTt_oso<8UEb|MuRxNyazYoD~QMsp=UjrUFLE9<-Aw)a}^gNMd^FZ zAYUkBm&%ax0S`rh!v3a;(QEjF8llhE_J;&AHb-IvSt0cw?fQCS6n3Chf{MAbM5!E> z%aGc+P{-yc4Cas1{<{XtxOZ!7l7MyCQTnU7D`uu0hM^4iktF2A0;#O}{lc!Bg#yU@=;9{~#-B6!$|2{P$ZjsP18*!h z0G`^b1GvU4Af^}z+#U!=ePqO85t#H032(qBaZ zx!%(Px+_aUldTA$*jc->DlGn1{H6&QU=;(euifIUst%DzOM+3y5b$z@Tpke(;H>Xe;aE8v=csVsP|ODEeX11a1T1oeX^cLwM(Dvub4sN_^Mk4sU7P?hnQ7@WGYDo{-42#%sL97_J zD}uq1)LYpBEU7?$T4oawA&M!)Uw=LUhrG(rU!(OI1DqkK4hkFlZHYkm5?sK>b*wtw%yI zioBb(Yvr0HcE|*tD>*(^8*DKoA_m;RwyhUyNAc0Si%Q^#K-Pt7P{?{`xNl|W#Wvhw zJu(UpY_lo0h3u_rhBTl58CXJC&^>+q`b_=_C6qE z5a%z@Wrj<;2Syj&<`DkuNrwt>|uFQy1N*vOIVn22STy@G*Q%#HU&C8UZ5j+^d z6W;EhNk>ofF0e~2aoA`{7)KsYF4N@Z!Eu$DTVetjlYbn^Iu!*0AYbsm*8=qzaYt@b zoP2PGLi+KuX0+h;Q@=I~((y_zUHznM=%f_TQVP!QyW@&t7+KJ43yN`$eIhX0=PMC6 zcl$z?p3A&wHEs1vnA6!BUWkSjFs29ye%^X7z*}QFO70B}>iUX)#i?=i@54gHg;y1F z$Y!(S_}!TI!`B@UDGN1{i4os~gPQ5SKHP|%+7K-t^YY$>9!7+VxVghl-BX5_xWRe9 z%H>fq^nVA6;efc~o*TRA+^!n(Mq!nDN!wort|QGNC-~x7^idCFR+%j)!!gu6Dd{Lk zKcat;^Tem9v-*y==qe?%vJZ(t?Qd?q1J$C2oLpiT& z%DQywHPUj+fs$#Dnw7m_v3u`-YGqAuH?Wjs)O6BE*R7-M8E>cS#R?tF^>nqB^_7}; zu}|cB(8i&qwEDt0fb}j`nJoZ4pC!PR^7f{>$%_X}E`bg;ZA#98zEoGW!4wy6XYhXL}rouLCj>{@mo<^yc4&q7Zs$AO5KLnP7)%iKe0UR&Ao8`AKy*s{#8GRNuw%+Nf~LE&Sm+>E){ivNe0ReZS~>_MFxy&Q{dddxv!b_yy7=m;>egE^ zZw>b@2p9Wp8#xTuvVI>X+;XkC#DOi`X3p81pLpS_KwjIuXUY0(+G(-w^cO)I@k`Gs zI`BOLw0>&bbd*4=^i0*nc4*ia@dz2{SCY%LC~zIK8Y!YeQC`lPGs&OD?4zO$aXy5 zb?R}TGnhubVSR>i%g{+=_G|EIKeznBqtIdXryplY%a0G#76 z$Vkbvk=lF5X%)T~zG`OA^7}kkbqQ3=TVa?6UYO7U{`2Y!2~_ii+QWGA2@tBi{r45V zb+H{!@r`pxC}a9$N~`7p*Dm+FspowbUmXbUTov{ykVSRx>%@tJDGFP&4d_^rE>wwI z+-kh1_q){c>*%;BfA)#*X-+o@qFfb`yqo2Trxe?QJjWI-8xrTKzSRPZoSTtL`YNx5 z;&!a7Tz*M7nvhTo$8t_6J=*>0J~r3ro{1#eRFL{`PBf{)=WO4h^Lo<7F*{Hcn;doK z{*9BKifLXq3vNxW`Xr51bGy@Bc!ibXMEQC5ic-Os8dbkZY&8)u_`GXt3adK@%+tiV z`*qF6LvbgDRp3&;{?B*O}28EKu8 zHyTs!XCU)TOfUG;vR-PpRiN#T0r!qQuspEQW`^>i@DMu#_HNDcdyW!jg|uG)WH3FT{t=p1%$5qYTH98d;20nz z4E&eC-NLhPZh*BVDY8R0<^G1g+~=|?+=xtRrTTcT*ZTVf7*{^t*v=Z1R}i9B)z9;A z)*G$)Jd`aK(2%oj^j)MhGuz3%F7IE=>hmGaJLdTC!O=qVoD_iK3-0-Y#OxQ35M!mB zOxt|yr!*Q^BJaBc(Ju0|1s=QpCmDNY)`2c`Gj*88=60_Fg` zK^+ZIqMX(6buR!qGnUg*DQhpc^NbrFl7}Uo5J>5Ot5VE$UXk6h4WUAmdl@ly@5y9b z3#_JnR%13}@)l!w$5)7!`|$&(>F~5sy{S60)_W>QZKN0>lcB!g{FzJXu=6h(G_Wma zJVYF)c6)H>8u_{@Js4P!mt#d98zq*x=J1e>-7GZ~p7#~XtqN~=e&QdE7-O?e>vas9lxbJZyXYG0n9O*d+)FCy(&vrRGuUoWEQw^`U%~U~@oi zeRB}berb^&9O~sAz4>3+jAaM0O%J_O!=qV+&*wj~(mbg`TQQQ_9NVXr`VpGZfH{Md z8Bd(;CwU}O4{olSYm1&3pcb|Mb3|N98Z{_SCa*B_Odws@@#t0Uynm)K_AD2Ire%~V^ed-R#l!ia0;AlOc}0~|1LvUOr%oE; z|2T_JO!L0n=K^VlmTGSn?Dyb*C5(+e`#(^bA5Xp8>`5!V|K3?L`q&mZ)p{Y65kBh( z40UEw$q3fu`NZG8YzR7mMWq=KdoNC|(wnA*SuGxFcapd56x~QbzYbW5Jm55sTu%m|ef zTH@lV0u==z;E1LgsrDO+v9&#eKZ4h5->B%BuVREM2{gX5IGFePb?+mar70-*kFM)k zETc-6c&gm|TQUnPgDaM2J!;VX+d=9@NUw8lgrkS%^P_+tjU+7jpo`);kYVy0)|u<* zxK}E;UHOEg%bp_;U#8~%uRf~b|6#lGu{x#Q8*;PvVowGYcBsRZQu)EhHl(irJOr@(>aawv>d@XnEdtF^1=cQpNDd493Lq| z)LAJGbr|EC`@_j{~a0@YCsKo_d=|F5n#9`K?{#o!huH#mQ{(xTaNd zOXy3yQEN|+fqAq83f-r)r3C(BD9M1D1x#Sh5nHuR=KV*>i%7?)8oK#B&9tIU6i1+b1)DlQfC!BGHvi+Xn3_FuTZ?eiCX z?3||VP0CfES5!cUzZRNV8Cr8BMFH0gWp&ecB^+qT{i2B zp(ZV-g()_@zUW@4eb``27&~HeNgY?&C#vT()Uso=CG;HeskkXn!6@;||EZnMmVDvQ z`wF1%ZQ9=aN}Ey0eHI*r*CoCq zlVq?PH;_6up!_~z@{XPrm+Ol;On1+z$>!5*k2q$q?xYO9 z)79X5nJzxti`@EZB=mCCIpGlPdd6zKVuk29d(~%w3;`>S@3xP8@o4E_^^Od_T-odj z0b5}NPZQLi`DS#Uxr}m5jUA`Frjp~S-tius)t!Ey4lupSi@$xfxYDs~u697L`uiyQ zLa4$`&wmsWLFpkhX|XTNS1b#Yo05twT1h%%LSsMsG(cD0(S4OjiX3Y^ZSWd1wgZvz zWmxV{L3jQk!2$dEgxUgZvksn@FZ$2dpw3h3vbnvlr1V_0q>x>Y%J#ehSgQJtxf&gQ z@JnZWbg3vQI7V+%Neo2R{1dshbklk$A# z$<#(@VkNKD(9YmIxvKFDG{NjB-hLw)p2D0o7R(0@MJw!h4S5$1nacLMk0oyn)KRt} z1#&ZA_r(FAxP)o7g}mDvL((7A7H%;I>s}WO9$>};_q12K05eVqMuPP4=Ivi3HDK>- zqitz$G&WuV9o5_I@c!a|cUBwbgHhmEJXDi{z%W*g^TA%&Ujg!k^rG=UYKvq;?oQMi z{I*|qdp}5UtNq~A@3E%4N_Pw?wt2-SSAOk~;1W!chL>Jr&xJKw39`^yH?ih%UiLg= zOXi=sA~-493Oel6#WW{Zawpz^f-(hS)6+{Df~j<=Ok7%pRPXborVinLWWrm?(3jjm zZznUa`^%t(>4W-T&c2i;Dgau7Laz{I_?S$wKXg#r!OaYx84*8Uzh;)O)=RtkS&w?Q zgYa`)D3$!is0V$d(E^;V*@2aOkErS!knnr1lU=p7Ss`9G{9%nUlK-Om5*KS|`oJN# zqe?v{Ru}L~jT1l3q0@CBt_1yk0GHYQqCwWDZ-a%j+&A)iK`x;nCVKxc+G=>ck89o- zlt9hWRwa9UcaPZG2hQ5585y}DEn<;hPPm5Db`(mdD==1FLk-Vxf4T;7r{dxOnP%4%oGlV|*tnu>ka(a_5aTwFAVw`8B!n7fQXW!$S_snQU zO3t6z1yn*KLz|yVtoaOipbc7kvKHxU!V49rdGtRTuhSw;jO(E>Azl<#Jm+gV&ebZ} zQ@*?|X6{n+>H#Fqz|DX&-S@0`OLHEBCZA$oW{5cb>J@xe(!KoiVYbQ!l6#kFh~xjugPnjl5hO+IYtWAP&& z*3kf%mu>JZ8^egc2RbPKj`Jl<7X+v2B8`bBjuRX2HpoZ4w$5D7#fJm!b~!8Kk)Pd$ zF)nR!k*20>DhzZ3oK&DUi#m3NAWl&W^)$o<3abdt;}6H(6YuUnd`UXv;1B~>S%2?i zBgE$4Mor$1&V2nGAusQfU*}61ET9tNy_)?F<4k+@>S`3U4hFvl-UZ$tJyKKLr%#iP77JXC%9-T z@G*oU8+j0HnrmcJ@Qh~Q>JB+3!l|>l&M{a+Imn?GPpGmM-`E;KzHpssbA)Zd542lY z`1psuMiyTy_MlHjg3=PHt2j<%uy4Mf9dWYzsHA25mx$qTVXZCU}7*&vfzWd+4@LEupVtmME&b9KQ176qZ ztpKU26~!-p*va`(?&3eCnCcTHxq6Ky`MAMuQYVxuD%biIO(Bocv;F3S(9zx7)zH&v zF}w~)8r0F<{83j5bIYHlKB>XPtNb(~F1upxYQ%NZ)e6Cxga62jWHz<0`ZU%3aa-K2 zvY&T493Iov5uaRb7IJo4`6zE!r@%R6|0Q8~u@m6XH0(g1T&;*UA~{F<^FO_a?v68S z{r#4E@@ZCwy)bTFIZBKoTUb}Q%1@WEo5Dbrt}m0?j#G`{d_EV`Ygc!z(6UJa# zzb$*irV>L2o(>rqrgjb>SN41ASZUjzv-rhJZrQdzOs;(lPH7BP>0522w(2i<-Lp0; zx)CI+!j7?w z$;yKjhO%?lk0&RIrVqGrGo3R2yLUBbsL(%8dXLsnYEck2l%g|R$%L6tbocSEi>N70 z(f?%6zCE!UML$WY1(09zN>h3|Vx?%2(&ubqgFI!6@ikggBArV3FE(D^w*^l7f(Ujj zF;o6g8N#lIQn+H2B#Y}p+2LCOM3__hV4R)F9hLNDPV!>1LTL4N^ex%H$1?41Y`!Qf zX7GL<%{gi7fM&a`sYqk37|M5>-K}1lk!1nBXSVwa(!G=MKH#0Hpr>T9iP0x`TiFhZ zGU8UmB}8iiIws8A1lfa85Q=*qlpH1xX5JKP#j$Q-d6b;$rWxDqiK$_%jf)i?e8+H^ zk1{`^ed*tXyusGrMCR9?WgP#;i3a`{ejGGF)7l#wc>8kX&4HzyBsUNrO7lIBLM`k6J-6|v3hr5QR8fa@SWlfVf{}Bu7PU>-HE}LrJWb9E4?T)tI;1(&T2132?>)_d>6cL}aR8#y`nWrrb!l z816R(U3dIdj*g)zsUhC1HniWfIG!`KuBp6V|3>v@V|6mpU+qg}+)o*rTc@|0d~}oV z?Kl4nG|yd(E*PZj`*i`Z&YleaN(8H0YS4y-Ss@}Z}PnnRM@%u~%Q zcImQO5o7w(Yx&_C`Roi?Coa~g%*!yRPQs&;YePl%jp!0~YS#A}gS!=L7fVKmGR~&g zx!#?z`*qPpy;CFs?gvSE>7@8u@8}}LnjfeL-$k|eZ5uIs=)Kgf^<_qyG>ogHmQA}{ z=5W!Bsn&_ZjfyFio&4n$!R<@Smm=zt2kQgb{c^Q;rPf^j2+v<(kFk8+sKx$ZA=t4u z%u9FUxi0kHt{AL+e*Z%&U;eK}gUDhzlu#Xn1L z3YH?b>G4QdSEon+G4G5U{&?@{;C0>g7bQEH_eOSX3F1-Vg!HT^N5+mF=Pyu{l%j=11AyZ>C3)z;TrR+QA?N)s-b3< zx+DAyNV8@b>a(iO2nB^IHPzCT(zcM3T8;6%GIzWWP}$w=g8eFBjZXi9xc?P(A+i6#kA^zQ8>o9u+@>>sOG z2W0}Tg`TDFVBff0r^4bXx@d2->^pnmy_GuP{jX~f9I&4lcMp!?*}p(?~~UJ-xdBS{Okz8$5Bm*Z!r%UT=-wvkWXgD4&RcGIUac?7IL(c4MfcG>9MO^toia_ZjmnTLG1mVE z3ROB^?%Td0>qy@Jyw%}K<*l*#9o~(26vJZrhoKf5i9IhJ?v7es^sH9Snpa1KxkhT)4N`fkt|_7bWhvyQjwu%OcEfh-}8DMKzVG~ zmi&o;YTTpS>VsbTEY;_H)2H`HH@u?yMw6p%OC94!jns>x$f{4*L;k!DY;u?$ItrRD z&*sagY|NuJVgpW{1+ETvClhfT9+53(!f`1D+uTh21Xht2C)<8Q4R*50{PkP7xC&wJCsNS7+KfnVTuIMU5v9mDdsBo%(hzZ6bKZ z$2$%2*oNwca(65hZC!I^D^K4dXGAdfrD^xrZ1ZZoW}jS4hv?8ipQ;YQS)njG0+JTL zR7doWP}%et+x`$C#YDr2yF8FN+*Vz8tX-ON7S5-qV><0g$=s{xwvQ|>tEFrKdhfJmG6&Xx>Y2a# znMFr|#m|b_mZ zYHvdfjA^<_kXZ?i%Jev#nHB+NM}E0cO(Q+%dz;dDP_cjZL!jI2eivdG%4+lew@{D( zIa|e`^}pYeY4TUA>Aa0wj}H5ls_m7V2GzVpvh3eE^^8>{x6syj54OBG0?k@;Xk~3* zH?Mx}#lc9|9Ch-IYHo`08yjS?l@s=Y{iOtcqF78kZ>>0BlCCB+T&(Ap8QL~A@d5gp zwy%Q{pLsW6Q?R-lmYu*i*uw%3JChA~ej&5i4QR^Eb!Ne|O z-t&Fe?$9zXGKSvH(M~9;+E4_u;Y?NaV_w@XeBKOM>_=}0PVVlEjMeOxN&f|iz_Nhy zS|DAd7JRHiZG> ztV3m|b_grB6dr z2-qye_Qp6;?7Y5wh*+m%v6B9x#Ym)c$ABFSk00*Pkf~9dy48bnuE?~eZxPl^ZrdPt zV0&&S*hGjhK9|44glFd#YizoB@6FfY14aa(K1_+D6?EfVID9&o+>3O*PahJbH97l< z-m%NT14y`yGr|NDJI;0xr6#1|sH35-BK5Z5J$Fa-$N4=^N$e1Gsw}EV=_yAWyU3Qp zPq}d(z8mcyRMm!h*-98dR)xK3b#I3cj7OvCi;xEBY4o?+s^sisAt|Clm)QYTpP*a)P=^K zn|U2vi)6|o^3=R_G>+-$aa5jgvG02_mg1HVNpr<^Lw=lfHY`r{M_!*{DTim2wu6#+ zwjlP>@0v(OiYPL^;2<_;P}N&ct=!&&sI0h}xQ~$OGh%mt|6|xe(m($nq44aA`2{f%45+7ak|gS18aD^ykq?3=GOiHAgNBf z_#5oLT8wlelE-cuqLUnKi~r?xwU-Ju$}C+hkz}KSyaSHkFupX(d1x!6@J%zNj;VcO zjq@TR0K=okIhk}Y)cys4%VksZ4L}Jc(YxH0xTG~lrK~|2T=eRDaC<{$l69w?pr0Ks z_Lr(au=nH-$<_ZN9lDOH>L&u1h(dLit@aPaF;$DvcBUdjI|DG$4U%=Y^m`ZIQdv9n zlbik1;;E<5$FCbV_0y_YtjIaEhhBc|3G&9)!t4ZXUX0<}#4Dma= z4~GfiX`agfrSJW+a6#3foxAZpRQ(Kf-8@m6#=B;I#W{x4-29!>qdw29Ru0z_A77=? zxymUxFR%xFi#m~Qr@KW+6AB~Pkx$gk*xG>ailR> zpEnW~0&_~~q?c5%k}kZFeHk^|OPzv>vXUlK;Bu+$_io#J6vws1ptH@ABoinp(O*y2 zFvuGH{jV8~f&PBa5Ru`#m5qUanR<_GI9hjGeLr<#YrDs)d2fZyIkDkoCYlc7C{W_kU9fSIkkmMygALPMe>3 zefttRfz!yn8@K)SOGel3*9+VnI3r|mZCVoZoFW(szXBZ&+wdY0Yfb-CPw9Ya#FSo7 zb#jifpyoKwk7f2o3kT?(G9woC@} z*|ZDI7zTkd8Obq~D|VV8un}ALQu0=r?P}ed&K{2E_^h%To1w^9)1hv*?d5b=0`VN1 z|MWA*)6K%YbMt~t_mr={^16>R_f%;z=T&J?&j4prVOXf-h`C~AMDOAn4!CcK~8F96dNB|4tn z1-jB?@yi;VQ;3kkO_6zg+a^wvJg!F5@iv6`7%?tpib+0-Z{$)}){jWJ|48tfn!y}F zSh~~!2@rtZtH5$uAjLx;o_xTXxt}vBP6;{J6c7#|Q8yxs938wbVv~*a_ZK!Jjfl{h zw8+1{hZZ%H5ob9BZZRRBRq>+1@?AvXxdD(85sYRA^ivxNYe!09^7XsfA>Hj)v^cDL zqi=b#5W?=4h?xlXYNH+!dZRsVu9|K(UZ|G3s1$8w$UoUl-BgUcBF%VID-+=VUe%28 z&7G7;HDvJx!C0j^OGR%h!&Pu;fI}CJQ&K7NRjY!`{K82QBI~#Mx}}P4^*og1?}*Yp zdgn(}LipMZ&g#v}n>)PQjtILMvQ#-E>BslJ_Ea6uldP63QeI7bnOtMX*SeWSBQA-l zg;cdYYP|qj(Z?Fn22h|CjWR$4TK#K9%XvA(1h=Eql_;f@l|rd3NC(O}RJH`ZwCwyw z2Wmx5F6nM*%BYdk`;ogH+X@1!UAEXYS&N-H?xUy~pYp@k4KM9=E^3qMlNC6x#YcBB z-mbo7)P8T{HeW91=0;E#b_p4ah+HmWJubQr9<&PX4UANu@WFzs*v~I1%)9sbEDJ3X zZmhi+!$Pk>@5400L+yH}7^8Bh(sl{HjuIkf(vNS38Oh7PNSxrS2rPi`B-%9|G_@EmL=XbP@Y(BEsOqx;O%A4P=i1GM*^(#wp%xS9`byMyOuHv!} zM#{c4*VrL9A7%ESPe6kG9tFlUH$MlT1F$-gKS5$2deAR4D$xQ0J!5ZU;@`)h%_!UB zi!;i(3ZDDbI?$D064Q%`iGL}E?qZ;zHH8wt$j)mZSs><}HEc{&DxQgN4RQCoe|t&g zx^i#bXDH`a3q(=EzTOH9-*BVrR=Lmb(T`Sp`!Ui#=2Il6hbv*((#0ahb|0>&)(}*2RCCFjZup6%zWx1S&{(NaNMQuKCvZ}uVtninsrfJ-6u8tJ*l(RP zcbA=s(<%4Kf0rwK5gNl^rL|pw776z7r7HIDVuF0K&vU;8jdY`!#8p4z4I9=+xH(%t=QZ(+?f4}mBvus*3_qam7haN|+M{L&YGrf9fH}vVjlJShZiNkcD2sIZ} zjOTkSJ$YX^;)8%zA1D_|C?G05rEwVVy8DwLPGtuI*4o{KM6-xA1w~yZ(#)i6j%;6+x{{0}ed9?& zHicLBurzD_R1xm&#9=bg!I^iJF<_kS2Ps<01OmYR(aPAA$>x1F?Y$ zcE8dDrkb);a_`=9OAEsnsGc^>ip|P=cMpqZU9cq5X6gRCGHW`PakfWi$A=O;EK4y? z_VQqaHEx}hNsnc@Y=R;>{+;oqO>|~1LVR^*?yOorUY3Ew+#h|ET37KVniF;RYN5^B zcbYorEO<2zBxxIjJcO3+l!<2)GbTm1j=EC2V%2a_&Y}>#^LGa@Ux^C_tb9ZDBcESo zyrj#J(S?q4Fi5k2O^# zZN$~E&m9m-M0e9K#M=Wd(MHy{(J`Jj)!EQO!Hk|6BVVqOO+6$0lLiXle69_2pMtl- zcruk+BxK%~(>ohQc|#lJUnG@Z!(~0y4Y9o94z-h{Ym_KY7;}FkIaBrdsy_15)k1^U zPTyEmia5UV6K>NEOlQq&nP_keFPSt_|2UDtTrtXaTO)*1Nk8qDeB}4;GAvjz->S@} zk9&ez6?bmhov(9`&Z}Q=hYIH-sMfi@-tOnE{9SHM?tOd-4ILvU^e6F3U4Vs3xJ~Fg zw1@ELcL&#DT$`A#`{1(_Z*G;o!*B>Qe7Fa6Pb6R-nIt)HI|alh@7K5q^Y5jBj~S~` z?Xj)|yNlz&#yHV=ZC1a$f3>kL877+&qt?zkiIbAOHBKr0%*=y@j+Gsv5c+=S_LlAK zdp7@qLuSu@Q*M7J%NO^zn6!#`dg8OhJ(=BdgR+?G=<&z3I(&3Z)g7YvgCo$HrO%;g zu|IlEJK+J9J$=4$)0U9kV#lM_>$T-x2u^9S^a-H=0htpIFS>sF&V=Rk@33(7MYAT_ zk+;-n3nztZM8CP-<>%x6z|AV;K$RV0lN882-ZUJV9E+U~#{i=#j5a$&3ogj6h$=q##&GQ5JHa;Q%u{8SM(CHn9&zgwVJN-H)-arlcFAiA^v#bgIX24 zK3DRpCm-wOEQJYoP4oWsq^wXgoqF=F)sV6Ce)L+RjxsXGv?emRxmoEb=CQW|a2uw` zg2{&)LWdp|f|Hj&P!>1@`TjXEv`FF?~LoC0SNk_c*@) zJ|#C6@W7EFx_G4RYQp$aK`hKb~vqBW9NU=c=74{I(Zr=RqTOX>-Ju}&|Aps zPP(*91KGRKMOj%<6Qjk>Z;|D0QRJmvf5x@NAC$w%3)bfz@RHdx+{JW=av9}*p%1!2 z!HQtejL$h)dlb%@L@wxb)vS+=yp%H5xR?_avoV@1wq`ZoIL(fq*w!zwF-aYU-j?wh zjAF)14n108ATZ9Tct$dvS(_{&OkssvjGEnN1YM%o04n-5Yxl`~k??G9^r4rqNpJg9 zmg&i&{%8MGu7xC(-LyAM-ZmWMk*G$~Y>pyrp4%0JbSA$Pi>8P=Jk^V?utUwM6M?_D z%_+vCiT+{}H6{0_?jo+mQ7El?R-&KXOO=fW(MdqZ$6%dJuF^gyXWPHE@K-qQf(-PP zEzBSoS2J9ZAuIJRHHdRNbK37)*zQW5*|P16`khH&VS-O_2v_OKf&#m6VJdz#nA~KB zG-us`2L9i>%m33b{_lK8|KEH^N@KMy?T+b7Zb`cOJsEh?o#DnC7CU~_7NC9Q5C^K6 zz*OXots=dz`2_vkB5bUIp7J|`4%$20uD1fYK-n~Y%jWp;#E!B3oq)Rg;vJmZl=X}x z7}&I$9#*U_93#p1P4v&heF-L=W1+=(F^> zDbf6OW5sO~{Zbb9;AK6IK=SXP_uX6E30pkz)B7SZtF>KWmKsg$}`#Vs2{<)^JnMAjZ_|HtHaH1?9iD2Ab-dGsPf>bt^I{+cD{HxFQf%^8>db6(B#AA;<8&(oqlhh#^%JaE@jkmCd{VX z&burTywB_?`A6Bh-@4x?)*?PVI9cUA^Md~F>^0l{4!TNOt?5(NChMAqF>X8ww$Lk4 zrTmo4bR)-^MUAEdiEjsAR&yV$R<}xqoU9Z@Cx&?O@~F2)T2M+yh~g*41grFLpyqH3 zNvc`Jg8kbV%5LV-Q$d$*JqR|xJ$yjDBY09MsIDe25!|mWgY#hz(@VccRw6mlHNFzh z&Bj#cA>-|MXI3gb^b*?tjd{@OXULQ|pF=4@A+o@Zpvhc2RD9;!1;qM!m4o(uFMfGJ zMgMEC9$92Zb3O{;i3+S&aY5k62Hz(gW$jES0FhK_y8n--uZ(K?0o#^NfeitXZX^Yj z?ruatK)OK~-QA4tP*PAzI!8zj=>|bIYJey`kgoUlf8OVPKkV%6)6UM$?%mgY6;bnE zMbx|cVm0xt?Y*D&EBbqLs(tjw(gjb!9;^<^=4Zr4kzCt}q-&-zKpA2z zeoGni^)*v*xxQ}p3nWJi9jlm3G?MLIkGz}2Yn>SypttLE42>wRg8LqARla<-MCF#` zX8NkHt$^sNNksUPFZ~-7!z)a5NQ)<B<+MYuiGXET}vRw>L`j_=rfpUrwnW({26S!sI%bug=>xWmg*ts z`9)TC@x)H`pw09((ga2Txrz(?ay#v3Qlq_HJx_}X<(uk%cDPZ;c4!SQ+ z3LCt55l`9hllee=qnv(?CFBFq3PMSM%R6(HK}V}S&5Zsrr7?o z*k^t}A(y}X^cK&#G|HR*B}6>}vG^wDqoCikrC8nNKbeP%;5TNsZ8zENDU|_u8DTeV z6QNk{nt`1Anea*1n@VOpaQzUk<8N^L_hrYBf!n!oP z`bi=H?PCx!Uwg`s-B{O>GI>97Pq4rEGM{LO@5E`tN%N~cM00k*fi&owH74pw=(Eu{ zSJpQ9m4B)QSlfkIX5z)NuO*K@J#QJH*b<_rZc*E@TeJ)<$`LikxL@-pjcnarVk^yU zYD+_(HMID3CX?&~Io$vGmk?G6M?b>Y_foC zJCP#F3s2HRW%x1AdcYG}RU$Ch=#?qQ?^z>uCQ=RaeVcw2lGJt6(Y(=pix0$%UHKea zoH_MjfempuU4cz;k00Y{u+Ff`bgePEM_&dgl|VjGesoO7x|c^5q$^|C)~iIh!2^13 zc6kY4p{qE^skQIk$Nu1WI3ehQN;}VwNc+?=37Y-3mjY4~16xU_m*Chxfj4U zSLzwM2chx8q=i!LY*GS8$n?}PF;ds^DH+tk3$|0S&%OnIL}L#e=vJZuJ0u@N8pag4X(NM`^vod1l{+5*cm^Ep+o#$eDE$ z{yeQ%=|bM%ioHOZBbB|>E^GFBh+xj0YF)NA+$C%ysBElmt&Thx zp)z^yNh)0ji(sF31qBX!K73S*m4hnB{<^cTdzCi$S%-ZL*A6fb!lQs6*3VKSksK|D zfu+BV4tXh4#CWuGaYntQ(>n7Zn|`bV(sr3n&g#Elg)q`%Yp;?&e`cxQ?T9Wb&`ngl zT+AIb{&kE|C1^X-3E_4QhQhxswToLG(M!6J;(L9%@5T|zVJ*7DxKBH=QoowSN^H#0QO+s4t0%oNOek8i-W_|u zcW69A7qC7(YQ5XvJB^=d*pWCMmM?*i($WZ!uT6L;g@BtfUTt44dEDDqh3@`vC-d-} z)mNSGjaxX~K@1z+5A>{)Uls+JB!u9f$$MoV(~ec(-T3aWOW~ZAnC#C5zg~XJ;);2$ zn#YJlIT_lae-5>n=a41^V{PMbJafdlYU+J(4;ua3&73$gn79YfPu|MN1#VZAgqs#8 z)gsMVsRW$-U+3{J+LW_)5_HBqd3X+f)wjw?!&3z;q%>r7NG5Zykwbzp6T8-HEJvCe*#4 zTvIwWKL4I%C>@jlJ!oV!4zC+`_>tJnzl}53u)p|uw#>(BdQ{1Q=w^2}H1dIsz1N_M zpCQ=pb_-t$(ZrnHVNo*sl#W}(?BzlST#ntTP&AY%M7egeQDc=40K58byq8_zNHX#7 z|ICMeP%Oy$Y%9#KPT zF`*LeKRt|@e7$f}RqU87w`(3993&#F!V&FL5Jq%JyLsthe>GP(CEWet#fPk9-bp;l zo1{s15$F7KFmQ-2&}7DZnuSn$=N(I(40g+vVP+Sq$ zP65E$ja=`S7og8TwyVRjvZqc?%KWfq^Lh%)`T>_*=Zz|7v=38zOR zfi|s_wUA(=uB2=Ke>KWK-ggD>+lW^9414_R#tL=g_b{BbwN%AreMS#Ka3|PRbCqMrAz}@%YgTy( zzKz^sKNuCCP+2$XVtdYw&Q`FcvIn_N6@)0F=ncCj9)N1+2;hV#uw{}_A96GKx`4ru zW7R{8Os~DQU1=5OqrkmBJ2Fi4x?EC3S1zWMcXx!6a`h zsB>qJ4IwQS5YlL{=yasANz}FWvV8gGOodZdyOu*N?oyn9tbuot-1{qUJ}U>Pddufl zo8uWxE!>@gHf*^|#i8?F~zovR~=LWVR?-wj0^w@7d9L;up)2@BDuO z6G-j3l9aXH_G-?qh_Mc|vGYw9guLGU{{Gng@=rZOkaD$r1-v`8Vn7JA*|@K@BwnVj z1RpTl#mF>_nQHf_`Sn(bv+;-n!;0$uNs+3?17{Eeil?FfJJf0G0+j(P83g4ppTk%I zH7QwMyo~y-yuU=ji8w~7cN{fY6YFYB&2L#cf)vn>r*o9*=qBFl=WQ8b_?4HM`z;EC zF2)TrOBPYa&LZCBlhx(1?p6rb&|saRlA`0(OOfkW&^9;`CB7q(-58lWkIb9z@`Aj@ z$#B9;2;8`}VOp*8G_P?J;a3bGY=&spH2$Qc#Qd-0%}L5LZ?#9=1$OJG6;NHxA^J|b zaO30=fhE!s_O+{`gXdInQ%y5M=Y5Cfu+Seul!DtSM>=cg$F&G5S}ec7yW|7Khbc71 zPVY^AYXT5xMsh8sK$~!xbpAQy^0iW5dajN1!RK;H&kD$9=+)`*cIcIGFqh5GO|he* zd{6#Ubf2ozm1B!8caEa*dS|rJrpS*uc9zNCxzVxZf7IVfr>>Fk)V_ypXTT!53kHpM zH5pFFq?yxsmoSe3tq%*Sue z)7|cG`#Soo?&~amgqrzMbanWa@5=Ak7_|I}Bi)S|QH#2iAY*pDjFWk-A>XkOPo78U z-P7~PFgv}!n&JWu<~J`sc);u7yq8K>TgTt$!lU!P#zv$y; zWs3@Ke-`)u7;U2aw_0ZZ!u;U@b@Qk}JKAHhPkljY0b|_oGFSxUExeQJ7x?7C&R5OS zha}zd8}S-aPbna76y_?st?|3eBf#^m=zi9dJ{dq5p-xeq`A?>ju;lj_LTvSz;zqE3 zD9@9p<-MJRlPPi||Jo=SAHDBoo3X@L90?<)3oQH~4259}vVNigeL+erD9*C4i@j(k zpHA~F|D?tL3e=XA$lNfefCT0OYhdCz#n4BwpBpl#uHv%AbJ~~~e*E%3;zHc)S7C`P ztlG;rvfA7qGq7+l$-&n11KOTwNur5ZY$UzO)?Jul`CMJMhnpHt@&cI7{SX{_J~*%* zu3!SE$2LiTfn6VC@?oaK5kP9!e`X1Owsj%U;@tC{i;eg27C)l3;Gnu0MUwjrY3AeML|cuVo#8geR&^TSL9$}Y3u#JFqaT`vyN>|T_K zg6<*^CU2%pSKy#qJl7AUOfS|j*FY`AIY|9CC954DhJvZjN|GsEpYL$4HYO{xxH7MH zQ#0Or-bu70=p!tGA>=y_)H-* zEEv<>P1O=QF>9)6=01-(#n>&zO)0Hi_u0h2e%KK^DZrz-wMY_gmniNh#%le@3jGNF zWz(74N3Tn1iWfc>zrrySFO7O`n-V{`czK=aN7McHWFcFj94o1AJ)C$sj8$yT+%u>Q z{Y4{@M@hl0WNE~?7AM)#lFAve5(DK|M?o$%vbfi!Q}A(#gfkf)68YII*SGlzDd(yl zv<#=xpI#B`W(6};SvxB*bx&&Qn{C?A`C#OQ6~p%*!vmH?%SH!%L>!gDDQOH05`(R; zL4;|9<|6|ftQh{BQQjc22KRk(#IRU$T!THne^8DEHRDgz(6TerjxAB#-($-Fd;(+Y zJsrNdW;)3Vuy=3l37zayP?leTPA#i=L(`HK!dVHM#o?{iP#@1w3X31gn#|;H;ChY- zJ0xOdTfFrNgB(M6fTgb^l~SaIx}*BOL~vGJh`Ve9rqC};_HAqwrdhb`9c>;9J^3b9 z$Oy!BO*wCag_Api0nteRz+~~3;b<*_3-O}LaBZOO(l9gH$478+d(74*v>E3vMG*`; zd+yQhK$WU}1R)G!*qa76ak94Hma}G4?I))Ui%S%ZqTk;^~ z%t$w~wNZrhZ;B<`wRJsz{zkrgzL_M1DDr{fvW%#S35C70=I{@j-KM449ZfvH=PS#yB|YM zhWDPK@-=amAu=ozSAP;w*{eswU+|%GF9fcP}KiudR2v5Te?f1-)@#is-;98l?5DO;T8# znjFJ$;!5FL=PP@Ch@px%^y$Lhqc=mDCC#rPckh89KqY<8j}DAQy@>J04e>l(gehE$ z`4*5dY>k88ucmz5vru`OI__qLjjxpm24jp6B*2uI6(2~^&yQF<>Cxx&++eppIYTpL z2!-wK0TpSq0&~=P}&KG0LWDsFU)z9OD>D?0MWGNa6v$4cK@&5255d131CDYtng}D}P zuhfWZzs&XEV? zx4n-;FzU}PF>dg#(&{^xoOdJK_F^;X2Swd6b0KID>w>6x&Zddet}6HtJ+e=j*eHi| zpli(@|9#(|ZAArp_p9gDDf2net4n(AyhN4F?WJS2u5C-MDN1xnT-(>)?21;=&o1BW zKUR@+zC8$~%j&(h-Vl@~79ZMw1bw??1vdnTFY)|p2*YM7{a`dHwj`0RwA5T~o=-$` zUA0dr6rI+(gnIt@=^ptMGptb>Y;&pA>%t;3>f%e2EV&s@8DdS^;6IV_YJ;+f+mipj zd>oo^sZqvY7uZ@FM4RyO@hVZE3Uz&4X4*_WvrQ6Ed=Jg0O z_hKEjA_8z!NmTS!xB`i~Z9}}Xa)7RI^x|8k!a}t0%f^T6yxT|@SS8x zlqKu8L%xCAq4#aitP}^=#H)1^J6dZrL;pUz8{L-Q=GPBwPf0^q^%cdew=XuzrQZ8$ z=`3#L1+(-Y@5|c`pR-d>kM>TgZewRxbCie#GGg#zhDe0$4wqX5h2cy)dSM+oX zLjA1~Hac1`L|Tem+DLdx#_bO|zV+kAusz4@&ypJ}VCIYpg!l$4wu+np#K+LiVa1%d#lQ5m6pj!}}Sh!m<>ef*t< zm#7`=e&aQo*ckoSv>j_-JmF1D@S{@Smy{kuLSgc#16E|W6v0oUE=8UuKq(m68=0Fk zXuO&cKOIjt+<@TB7P_WPn}js*pbCp7d5`JEJTJ}$rCw5w^s;z@a$J4geLtQbA^}kF zgif}(Y3YycCn14d8A%H;ZmIJ(_|LBV;C_+oY}-;lZl;$%BfCh`gLve-6iu4^)Jt+Y z&;*)Ykdi$k0Ld~+lZSh+T}YvLOH(bL1qZ5heGTT@{Uqzx=C}9PyWLI+ko&r>I9Syn z29LPdsU^z�gf}W>`8|?vFnr<#2nvsco2p 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�X@9Sx?^<;OP+gr;kq z7lXVbgUQri^$CsA?hvKr+7v4Q9Py66m9s@CffnUks`I_>RPv?|lm?D0p;Yeql|0`iy+bzJg2jWWLYit8(VTbW@`7%1~q|ZU}daxg5C* zv9d(`B0-evtW7fYMpw+WiS& zy8s5xx@7YKUG0Hntx@j+{u1AHpQ}`0eOeeo=@s9x*Ju~%e}SpEzGXlhidq=-W&*E` zZ9QVuk{iR93H4hCHm&d_raVAt7*cZ364{nfOys)K?&0uj^JXzyVMX~<)zv8LbZceq zTCM~0@t!(M2yZHLD$^>nozbwuzefBRGCvxOoDP%DCFP6$M!zvAQi6+$4DalYz1cAU z6v33x0cmz*NqOpmxrZ`sH+uRtpI+ZF+>1_%67dej%jv*h|Kg9+fbDVjX~#YP11U0v zm7bs#|wj=#P7fnd=``V?@Jor!A$i1$)kf%%&I^-G@>(_`mTxzVHRimuSnNP@XhpAL z6Z`$zgF5gT#v)~bkl4E=-&*NO{vkWj?kJ};r#S-8$#URJ%so*LzP3LOogZ5>#rwG} zhCZ=R>$y)kJJ~D)uPId>+#BvMYw3U2%8ga4sHvD78=m8TijE&%UOS+;;BC#yohPNX zLR{H=VT+^Lk5)p(^mqnoRR1|z`k?)I94kU%c%WM~486`2$F1;2vVq}74)%X&I`43* z|M>l9g%r*qlD$VpRQAr^LfJDbj=i@Kr^B(=$BeSd3g_7K*b-3=hl7J;ugqio-hIEn z?;l-Voxhx}u4k|3^S+MwAd^ZjGixJ5pq5?&z-tCyi z-XJ7Tu&Ba_;}r7Yh#(YaN&cO<=#Cf(JLspB`jA$el#F$9QQox3ea5LMOtWK`!pp`$cXBs7!Qp1Z`JsHf5Vq7QAsg9Pe z>iTe#_UGZK;Hr-Y*AJY-h1f&@fulG!-WwCdm^B-z_xGeplS4hF$TW5>sD8l6Y>D?v{4~6$^PRey<45VWP{Wep6 zgwn8I88Sc!XSeg)X=>2M?d&kp^H6)<;4r+8Naoi-&B$yNM&V|&I%YAVrMtw0d#Q7_ zUkZi<6pumOZh*(S|1I7SOXaE0A-qj*p{V<^sdA18G z3p{^b0u>Z^LFc^NrCw(6eW)Uy@@-x$=Iq-AL9Yjvl!Knl$!u&4SG^ei=s?`ocy(}+ zWq>f7cwX4U@#!1Gx7){P{XFb_poaH8!8hCve$r#FCuYW^FqMBf@Vb#$6V)P^R@3YM z6k9}Gu19D0Brx~w>2X}pqg0VOt~~_`L}t*IZT3b6$TWDw5IR7XF9h5}*U|$3$>KYI z^oUFe@I@<(__4P$45vs3rD2oh)#FXT27888`^TL{D>XTw0X3lTS88Zz`(h7b7BERr z-*W7sGbob4nXiP5280uavQ9*_!?FYa`h??Kzn#9M@w8ar#-7BJQbXk4XQi%Mc6pH6 zW(YXCP(i&E8ZO^sCCKy$-C`kNPoZCgMjV*iTUPJ9t^O<*Dw6NJaJsk7J@blB2oVj* zj1LP!lP=TEdw@OrSSvYyVxaim0)^z7Pdb~Xs-&>3u>z^<^-F2cVhxm0fR+4pEHgZr z`Sg4QC$ugPQ_K$yA2>&Te=*zlz5ep`>W*@lg?f|K?__Ri&*vt!G$*BC=b1y1Oenc{OA*BDyl4kM(2LGee>Lm3DY3t{kZ6h zb_-;sQYIjGBhyu3P=pSXA-NS1n^WM!!8aw5(*5ulaplnqLAw#7eRUhty%;+aR>1lO zyz;ZR+s0#LFUz*+qV8eN7P=enburA2^4Z(kY{#6GeECB9g%ljKB6-F(vSt<|$>MUg zYs2@5t@B0XUf&*<(+$TQOnfEB$#oUt3Ao{yoXsVK;$f$Nv^srg9C7 z_qBOqtGWVJmSg{B+-IrXjik@>e_k55%&KJ06r|_FgnfT98mx`Ida<@fV^SDtAs}Q= zFVOM2Q~4)zaLY*z)h)J+mB) zMv2qO3r&FW2`p5)ejl3TP>2K@rj;PSolV0=xonl~oQtdNnIM~zJt~0?lLIS(_~Blm z_P>kQSIbGr540Z191lB7z%GGn$sB-X*{{466kz9JM=ual56V;$s7Rc%)R>R!z4cvb zjp^45sl0m?OmpL0&gN1WK-q}nu2OV(Ud852S+(RYTvhz_;~nD}1CqYbbiz~Jl!=Sc zcPi0J2HeAMiHU+$l9fsiOBoy)>T& zF{^PIz(M4rG^2#T*=^L{2es!j@)p!XTBIK%t3~)VD9^ihNPlgr1*kq!jtAYQkxMX? zlHnqy)6Z`@^?yT*?Z;X(>)!l|W2P|qAAKWvF~sWa4jJLDWZYr(7O=I_dC8eP)+q%t zU~d0-nI!WHO6@y@9(0~vnE(dVOX#o0c8h~(1vDo?E5SQSe2xaxZ}fQmiqPIeZAzFE z$FYlb!wElrR?}~q{3U!)MQ$;C|04Frd4Y#kgxIn!2+(#^sxhvAg?0|S2bHr?HNu2i zC_o;TF#|;6iCYK1bnM+4z0wK@^F+ai~I|-q($TLdXqN9+$F90Gs>b^5AxcFQTL8K%eoSw$CoF1 z%sLATC*WC!g@6Jcpt~frh&VF{<349U_gXTvm3#PmQMC9~E%qnf*i7YkA1hsP2? zO=@1woq5PoK%K^CQb|Hxx5BJYE8c>u{kw=?Z-pLzq6II7|xx7Q1Sir4Z5(zvAX!l6yMIdM{=){o%UjbyKy=PkLFsBWAO<;PAZi zKD9AmLmy`hSmdBy(mq?2U!KzZBW~VIKAv#}bRMoNjm2sK{!&D^b;YJ{uSdq)ZNp2L z-K}A~);u+8A01Q#m4yfG z!#77GD(Q!1FF6<<^d?j z-!%JZ<)XRpqIOWGT9^K9&CJi6`i>FWAen5@J>NO;&W16Fex62q;t^5iL@U)NMYpsE zZ9=jiZ$%&lPv34WosGpQ`{8ac)gJLp1ANIU=OZ?JK4p?^S z0gd)@G+2tO-9u{x_Jw2J5+1W|Qe1rq0bX=>)=Ne_fxXp27npid!{@7Fi|yPd*KHq1 zYN?E+@Q{k9agfTVKnh~#WAP6s@v<%DOs7VQ%y--Z3vTx^%bWmR_>xbQEh0V0mw%lc zboycW!v;T=Y;pTqI`~#tt?C?IcH>{q%1F>b>aa16cN!CBnw^TUu3& z>=hpQR+5y45=IPpoRxRYlpLwoS93vuk4T#cGKuD4tBH@C<>*a{MGZ;#0gIjn@b2>m z-hCgrO`_V~2_#@)EKA8sk#w)r30`qHf(_-sbkWlonU?DvPvJY#0($b=-MXBQTXe=tw$t)5VSv>9tQxIfVd&R z(W7WKYX=&X#mSp>KHW{oi8vKJ3-2KFVIe0cd&y?k#JVM4!iig{end*;Py`OZ2coQW zpB1PqoQxYKqdG);G*tKbY?>F;Z*vB*M|fMJ9*>OsK#@IDgAy_nN)#Y%&ikeFwszXb z5!0LZ9yZ;nSDc3I?e32*rg}WA?W3Wnxg=S zKr3Z43-0m@jc3cXqy$(DC=&2o+?nZ8*Fd^8(s{PfV>f`xt34B(5OmR~_WE+^Z)JrM zTMtz)o$bt5i0vCSwY7)P=Il8Q&*WV{=Z%5P00moTcjuOYX+2<2(tfS=pZQ5Be@qf< zF;c|JGSM`%Lp2rkBrSh(q_eDc;P7+yxXP919g#r%nM7&mpKU3#s_(Z%m(25Ris5Ky z_bzqtvt@C2`M;zA`$S}g9#bNn9c;@}5a_Ktoe{IV%(5;xh>V){(mN5Tul8VCc>VnF zygD*BtwXLoTI7e{xHK{z03{6OOTgp@BC-DixGF?))Z`gZ933DpfUh5N`#4N#5;&zl!rQ2vawdebc zH_!#YD?ZliBKb+SxA(UW zcMMrZfSH$XmzwG@#G~GE|MQ^yY**}%>3Aoa3M0KdP;on=p~K;&8f1+^L{$wR+=*mWviTHZo zYQ6GlF{JWu1yrlgTN_Xn!ZLk0niehSMZ6G{M<|^&SyO1PX99#>TvBXBq%zRN@#H zQ{X|415BU3)Q6l<@DKIf{o$`rB!+BRv-=*k*HssZ<OSNyo+U_&+;QxYP%?;FEM|dywgI}f-udD1Vzz%Bee)?;#?>YQ9)X{0O}UWg;l#X=1JZP3Zmg_pake<=igiyfUg}y0j$Gr zc9}t+Pq_z!m0}eDA;l9XG}u_&`4W(F2XNIGCXJyd7sHy~$+ohR# zQ7|uxh>4!&a2DUOZp~M`Etwywo(e^Di(z>+1``3jVDwB36bzb2aoekJ!V&~tJy7z za%%*8{$tp!%MahM*O^|b4%y8fiD?Ds38Z>3|CBFutdh>JllsKh23IbwX1nINUJGq_ z4m)-6#n!x|;uu)PUZuo8!m;%4Qg^Y>hkTU3hApu`ycpdhl1hPCyOsaz@3by`x1Jq|}fW{TDs3RvgA8k*sEr2s+;P zvGl<7u$I|Xx8;Su?Y{4Cnrhh(TIv7JaHrI z-VBM;_VQW25u!BWc%@nXN1&1iqaMw6qaAcCTkpnBQmCHi5 z;B-x2eT-q^egDEa_6e62#hc?BK-HxLnDPIun|x&UW%Bjmm|*!WNirue(|q3n?pr*P zI^O?64>@watC^WDTLsPIqn$fnWfAyvl|4sEnYD-K?=%4VGK>bQz6$ZX!EGeU-J+X-C<-w3G zMI(c!`innfv)RYAIcm#lipv{M`XzRl6Ci&XaS+A=H-cc*NrITOu`SJy&QnI`V1SGO>oDwBr?=VTw@V1qQ->mXD3JTdcMj;N zfp!QzoD02|fhhj{T;+j_G&`MNYn?^OX7ym|>O}`!RW67*C0IfFie_P1OGD zve`JHzbYKV&%sEpH*zKX$-hvA-jNP5KuP9f@@Z#`jBm%hX0T%2U|AzVs#cF={T`5e z^DNy4+BW=#cdkaJB`A;)E>VWRZ zJjC?N=?IRx5UCxCie&}q5%Qk~Y*S$RT`W)Hgp?Ch$548a*E_+{x5ngW;Wq?5AerHS zjN}y@JxCa;DY@^sA38owhJ z?L+Z)uxKf%_1KJblkFmDgBe~X-jR`rxi8X?X%R=?AMi;kqY_~R$z_JRM?1YgPoa~= zNR&;zkh+R0S<}t_)8WG;P^d$;nO<;#<*H;pC-I9p+9I9vXC+xz1EPE}n~eUe3i7jA zXMMdwqk@}Xsm4X$3OYJj&6OPArz=f0D_ZgW^6~~D)Jb`kd{uGJfi@iw7%>1h6XIIz8Z?}JiMNZfkx%eVwf9_pGKOaGFQc+dWn(#1F}^_+^vgtuB-=$x7+WAibDvGk=JWF8d4*3IUt^N+1RDwf=N`n&iJoTsY$&GV`#51Xo6ew06H}7 zw(TBNnrJ%vczByDMsU@9tY1^+aXtFh)X++|KK99u8;d4s4TabE-M9DO8nJ`}Wfp)r zxppNGsPzR;HwG>vDxqCLfo4osvJuJudMrVnm^LqvH^cDz{on+NwjheQD9k^b3Sd~) z!9mvZsP^<+reE`BA789-VXK5Ccmayx6dt*UdRh$)Smd6ws60_I?>;88N z6zXN;6iXrz1kzkP%f1aRG4Ir_2Ra*yw>GkRj0D$Rvp{o#?H%J!TbWUoUQyb`z@%D2 z(!ja+ctgHs+^FVjBar`2iZjjWuq9h*(gmX>IVdul=YS4qv=SP&0_SJM=$|B~+|kBC z=)Hun*2?XfiY*;MuqEI%ACeg~+Oibpdeb8fkct($OR7_?Hcy@bn4huea3bCe1}T-2 z!thp_Rd@>AzYUtCHua4(0Ug4}HBJwN9;_GpU3_9K)PBEk0wRq5qfMwQ)G<(E2=uP+ zCLnj@dMu|JKdWGxd76d&AoK2nwhUhKQl|oL=s-4hJ?3+d`e@JsS3@qGg>}hrnT)aq z37&~Qb$B|Z9A(=5tgn9GpXqt&fJ3g@!r-%k3%yG*!X$^IsMu|f#$_2h)}@7tF7*YU z@U*+%dqITE%-Ygb#XxhT!Z>q5i{S6cdX?7%B7GtU{E>_^QQ0@s!#m9sKjo8SHqi#v zd6ft$yW44GZTHZ(QKl+p3XMb4D3mvv$o;W6DMs1nj?6c??_U+5lG&lG7J7oCff$QU z8ob?N0u*!`%FV#7-G1>H4lBrtggG*0L+bEMjBP#j{1gb{8+ECAQZxlze|DBPpnp)+ z3!#4+BZx>EAm`p@@&+m%6H)VLB(o)T!Fureu{}~!ygTniR#_hGs$S%}>-10Kws^pQ zll{|~#0>sDSyP46sbVyvG>k@cVGpRrCKNstR%w6Hwt7k^^-C!%jJgvwH9Jfi+cl_8 zlPx1P#0wdYk)<<%K6iOOE^=Iwp8=Jw6Tab$Fk<1RCAvNuyR%&sP+HR{7k)2`=vY;8 zAo)O3t{Z|o8H?HNMq~oXh#> zZ(@!vvO)WHRmzBH=Wrno`B!WHnkgKTd1Y|+wc7d!|c2vwN zUFq_n@u-gDtP7`a_+7#{S%E;o&*jO_xGHan_V&_2ic*6?2&cQ@2(h!FO(dwTSKf(^@uH`KS~GN1NZv!o_W^e5Ql%yAAuQVv=i zUe_!}-h~;q=uQJgI_laFDO!tHi_~U?30F09?vV-SW=ZjqR?^%^MN{b6a!j+2FJvgr z*|Ku6W=3uINc4zqrPCf8L6N0bcL$Yh|6cXoxIYJHo&E-@O#v>FI4~P`l16ni;&g## z>BPWhJ$a2Fq(_`}Q*lky zOvGZgxOZAD{1A03`TFCcqdU(v6dl}l6zV>Z-Q()tcq)dI4BVv-aCCEE#wux)Q})D) zPX!Rn+&^BQ*J_5lEc1g{w60Qx>QgRp zRh8p}IjTYgsNynS2!~bqgOl%K2#Dj)08t;jnmbj=WLpU{#^lVf# z5ua*8j)(hP+WtsPST{;>nkXb(H0v~SZ+Qs<6(A3ahMwzeGZrZ->kLvUT&kT3jr=hs zX3r$`GfiIXPQ2^!=p?DjJNycJ^m69ans#|S;7LY%pCl)h>wJ?(BAn$$ltK%-(Dq0sYCvN6i(hv|&D^%$Wlzy9wYuO<^#F+6y2OpI)ghZOm7wTh z3;Cbg&5I8Uxh*)Ak5<1^G${Z=awc!@=C zYk!*6G5+s6U>b4dOmi~XFmFpaeug8*J#g^;bpYi*ZndTLxIY6Lef{Dxo&9=*`i9zp zc}|{<1=1@7Fb92R?}@%~`k`IQ>YQIY;>DCCK-b5Pr+aAS_)WJZ3c{p%F|3(eR&Q(R8E*XDa2UuYdzThz+T~V8BO@ zn2q&6Vc&f@9!gXdW#|0jmJx{*Fu)wOjR_Wjb#%4USZNPfNiW!|iWO3V@_+yq@^OGb zP5_u7JCIZwNQ_+{$&i`_f_;g269!Zat(}~U*a_@KH+uS}>}l0VhIc77!vI)tni5x& z*Y71ZLUwvVz^B$Cx#(7lBp&73jF_4rOYoXV>9iX9M zV!F}p5{k!Z-NOu%By6Z09-Tb^@j>Tx)Hn=)27m=rzTtm<6K{xuu{nv~_j>lWmg2ct zJIP%C*+TPTgx{+oiUULkC%qcM=@!+VTKMufPVQ@u*1^kB^9Aavql6W~xrmeTJlxb0 zGm52oMok0(s$IwU{n$VI=1N=wBz}kHT_{qD^Hl4xEa&q;@czICsFUon8U%Qu(?EA* zaavU7N3lhQg3)uY9|mtRQ7ZEho~y+(__p93p1sTa5>fjC`5p}lk{ryB zM5Ll;NEFH-g8_wdSMOsnudE^eI*UEBfuE$E8*~q#Ekz5BJshWkI#M(-Bw5}GQY6L? z1lwKBGnAxHvjB&Cq2p=)yqf#57TCToZjWk4wc4#Lzh@Iud3ot;Q0tvtEHOFcIZ~}W z^x++u$*vWOjoO%dzh+j~)Ybiaif(rz*aF%@9YD{wXr-1g*aY($O(bZnbPx37X~_-( z9(ejAjN(fRq_tZ#qNh6*rTrEs`m_A%!lmkDoZUXwf=pA!gKda|YXqb}ozsZO-ER$JhzjwW|ObKgMy!(D(?b?aaowS7g zl#`Ifo(b{aO}%PF=Iv8qMB#D$DH^;RnB}{t5H@db;w~c(3wmG!{B(^&WDvo@m!ZGu zeys&%kXjr9vEVZLBmuJgjIZA~;r%?`Ix$w>?Hi5>mFP$ALW@F@_N?dQF(PQLJsQ^K zNm}?%ZY_1@gk)Dnura+b0#trEIAnVHbO$BB@0?s39=uO&@y&B?^dv?4Mc`i1gX}Ag zG)}Fr^6T5rF7F>F9eOjVi5v0G?2Q172vyCG%SJ9#Nqz}mjnp=W&X<(5eyv9$8H={# z!yDu-o2BW2 zLW#Em<t|1Op`8L2dIj%JB_Fmw$h0{bYfU}Be|6$eTq2Aq=J*$etBN~&4$l@RO z#LL|1Gi&OFGEX=JzB!R(@-&KS##BA60(1ef$>XOuE*vuJ^UeYJ)y#ckX={@D88GO( zq{1@V`QhV<73q|yxs}G}crrSi(18z)$5DdCIuqMW+ym4QIDknd*DMoy*|&}M4? z^X`Etrrp?|?@2r{26BdX6o?LZr5C$UTIq3;RGFw%BBtgGAVdrpCgds-&r^-{N{W4+ z0$*?UHvd^A;YX6PiC}!UA$;BsJmSSX|+S>vFI2{;5`B)Ga5~||zobVm$e(w<1 zf5cqBsr`g-;HOLb!S)fZ#vV%>ne6)Y+po!&n#u17%7gY(mV71%03sGpVyLR26m~~; zhkvy)ORoQz59?GPKGk^=tVya9huLP`hDeyN34mjFT z7)rp5S$gh}MVXmCqic;yZ7H;#EfH4spi!(9LU|Blh5w6=d#Y&qgw9Xha0VcL^2Nj~ zhjpD_j75LmHQ{A!^HQ@HQeG$G2$DLkIUZ`UmcW*oyL<6! z?Hxfix>g%_AFyW|UmKuZTt>=_v*SefR@OS&w@?=3c^%B4Cm>JPz?xU%puMn9f&fa` zx7;Sv%Z-u56D!LNFgXz}N$~YZBP~<_w2AquM2{=T@{Xc>9 z2}Wi6MeD|9J`T@3n#n~vDzHf1M!%}5mB7s#IYFBnbg8b6$4=8mMV2`b-3pAXi!qHGzJ&2#yrKd1v#Q74_@#dt@U4 zA|?Fmb>DvO*%P?7g^~WRzVais>`gihCUD8 z_EIUVe11;&SLqlNz07y%Z6MCy*Xi;o5*JCm;L3PD74_Adx$^2Q6Fw@=2`^eC)A>kq zbCJORcXKX(F4_)NeZl6P6wVwjd8t5!{E<8rQ#pyOM4z4TcjxKMGAL4NB;*@h{`S1oONnMZlB{35}lY?&8p#=sJ}T=QXsYOg<~4;v>iC~vs7 zL0WZrGvIgi;Ri3`!w)?kfdxmB%+3aoruIYsGONl)k*D>8dj%lR=O{lT`DZi--?^}5 z%^!cPy-a(ma1z6!ahc&ge<#z60v-$&+@bG<2w}m2hPy9Lw^!%06N0?nH*mb; zDSP^UZQwWt5XRObH*T)?r~-?{KMCv)sKne<;5__6?%nJ_GV498t(820eKB$ETPt_w z2XxK|8@GUiIQ{q1ZVRajsUYkA1p(99Tv}O^o}Zn@JxeP0RXh~$HvR$cUMm* zf3Gd^XY>%VYjULtrJv2J*TD&ER4s|$3ofNaMdw>Sp3T+lzMHR7L`Ley#An+5EeM~e zW+^Kf?sawXnbhVAr_8xo93I>EFZ5JIGJhA}f3Dr$RH1!HbRfQYf>lrQHm;%ZRoqvS z%gJJp6dulZdPDscJhqR3fa3KQF5?$_;Z3Tn`5Cn2^>?>9fQ`m(o&qySp3Yfu(3 zLHM5*IHXOd|NeEK_(RcujA#&`3y8(}6snzXIQ%sodW5R!ODAH4~?7WHZS+C4<-h-2Y{+LJEIP>NRZ}5%B>FG+V?pY^w zoX93k>TvIak~ES%L9F?o+ae9!xBnpk6vs>2)lDDnsxP&!nSV27<8&R;c;E#-ET}*( zM&|8VRF`udaYU_ka!yuFDny^IgiCwhBVOfli;fC1I`{>QW{`>U8{2s%v_1P>kL!e`FA>BTDdB+V)yUGo4!p zCDbQks%1I<$2Iz?+Rke`DY;{15YnI0-#HvwY-pA;8!1g z-$i!1!#a&NefHqq4`&wr=-_}*%5cgr@#F`oQNGTgHYMKY_~$h zBJSW(fk}7ZKDLYxtSB;IsU2u3Ob%#-M9*hd{fKoCSv|OJAPkgRJg8-5OYLu+W{4cQ zXb&J(h)OCK)ZrCsqs2&*_j{YNPNtvO%E=d`a4^IJqXlPvDRMl3u&04$S7vXAN8R9* zSi%_VAB*Qk^o35!H;Uk26F<6!o%9F3Hq31O0pF&$Q8$A&R6aU(U>woQ<)_*iiQIm^ zE`V@gKIyrT)rnEy01ejjJ;8s9DA$wl&hfVaEOl6Kn8-4dZ(+g?zrrH#a#Lh$XLm&T z5&HY`-^f!1ctPU#YP+tJf(-9DoA_{!Uq8xMq*s+*g;9pnJF!#|oAbrZ+_QC}9xsZB z{J$p{FvmU$k)TV@mR*2eSW39te=9Fytp-zU%v3WQa$^L#o|2jfyE{}}T9l7qzNwCj zWStK(S00uCC?(q&gS9|syCGFzqkL3U;j=?zLK*4MT39ENdCe}c@R}r39vEsgBj%Ix z#t&as`uis=Cj!qYvbvPf&yN%QyTd&z{3NylLJ~sw1K6`%MJG{=;btZM4S$!R-^@GN zSf`|*qPsvBc37;QX3cv^@5J(MbElu42O8$~M(cvb$FmkJ5=P`mnuAE}fHy|_COIlWDi(fhZM5w2+u?fga>yFi)4dzRRxPy>elk}B_-mx#sw6E?-IgS;h3tW9jiNlhM0 z8IpWpG$8538<70Ll&ntB-ve{B(1_}m%91tPF4GVM(#mX91R2+0D>H@)Sd$Bl-f~8B zHrT3g^rvJDrD%+3QrG2V)N_6x+)p6(BD}{d;>?<2Y1HvzfsbgAi{bfxiu#%pJN;pW z<>qs60_r}L3oH+2!x>S^j^y-X?vj@oc9WqL*B{g7 zX-U_f-qaD5yx2`xR&Y9;@;w)TnJD-HHY28+2%_*#k2hVu{&^qv!?^(L@pue!+ z0=!6;v-fwa8z(fw_V!Pluh6jeA-d#azXf@-+_1uXq=y7Xm;!Nq?^5Idfe8>fHO@z? zAmw_60zf^CK+Ii@)1x7LZGK9VgJBUX5~hdGMXmptXOF^?)mfn*|Edofz4`%k(f+W) zCxw5t8F~AyTsEJ+$g`kS-LUYQH6Uke1Y_paFB~J|(^w>9c19r`m3~HzFV^>!sxb+R zTJ(o$j2$$;6Ff0ch#X`wPp}IQd#LHneO)T}_`TLPrdJUEDKR5P%$L=LhXPe%t+2}q z-}st%RYy~3HQ;+ATd#dSc(JG4w5WR!-oiisDxnljN^Is1XVtQkcE|!z(Co1b*tDH8(Z+ZugrgJbwOc@Eb$r2Zg-!JqG^;qXQra=s;}=Dy zWn3m_CMrh6#&C5@U5h&AlN1NL&n}FJ?4-n-@i@=YcK7(bRFP64hs8v~Pt}>UiT+YN z*GVf)8(%PF)?xQ?;t<_LfSWQS;H9_EedY&;rD&a-=Qa9{_8D4x*d6aaANOy-?el~u)GRZ7+h{;ECZ#6OzOXS2suuJdyhlwDz2Y>~V(ZyO8>!m9 zDyy`ctz*Q>+g?~7v~`GRZmV64bK37a;rM0q2+N|%zpX5ADV|ZXQ-&Ir0|g*C7cWc1 zsDZgwl>{_fD>|yI+y1+oU4$A)6*U>_RRg$Sybs5&a0Ovoc;(v(s6f<0lz=TZUZAda zKmCf%`zTW9lPr02wEA+IpX(Ig454tr0~k`Vw}0`OJ@mCQF%bhrafm{(X(HPLW}%er zVajx_?_}fi=wN*%)Ey>j5Wuxr#ssx#b${E7%dE&Hw!}ue63mq9ehXv;QUSX6<`<*! zK%Odjd@DqKgAmr3(m&kJ6n&(}n>+**{HX!<3P<8ElV63GoD3ym9yi&tuL3$In=A*` zy!*Iu2=efi+A@cwaM_k>w<_P?^3;llvhDuIOUn>q>?4|%`K8I^;Mc-IuZ17`OheW{ ztz;DuI5A)>E~nvt^l}<_Zu(!#a@vb27)=1ro`~9NBG102aqkv=YERX!8_lmFtiTG5 zWOZp)e9YV{d8LkR1$=XMg!h5b8SuTR1o`i(RU}%Dn=b`o^pIulx_A=6^N02K-0=gCHv+7v7CTP2J&pbjw+Vr zPWoOX)jSOx2EGt*5UrETXqrhXkTr6>ndR*jVtzVX>$1goRnXF%-~itN_0hdvh-TOP zK2;r-X3O(oM=x1M2L`uk=)1UEMjV_miK){c=`If^_0l=D`g==XKldS^J4IWBGRhX z9LP*j%w|r?UOhyqS$Q89p>oMV9w)TI^80%5CC7-E&&yJ)J{GUw28DLZbhEC_3y?wCK#%UFP7e+V^*nYXzrFMJKjT1?5rxlg>=>())Qw>Oim! zr`;RKe@=hQwp@nhnTxxTjBkwVf}xSi3SMDvYkxd<2S5(Ll6KIwtbPu&KFSTp!G{?U z8HVyD&qG^u4}{KWRD5d8#wiA0$>9{{QUQ5?Om07d-m|5QMIDo+ye-{nlUTfbc6rh? zzPAyY0X@BM6rd73&fnPtwx99V_!!rPDS8pMkfHFU3~ai-B&jm@f9t5}>6%KhoFoEB zQ{_(&7zfwsWh&&wBUpDT=k zD|N{a5dd+{#hCi^Kdr&pEJJ+`J%VFH8q^(Bz-M5%K}2DRPH7tr!^VIqr7onKbsJjKPa@}o#`O36u4{CmlniWPk8|Mp3U-d|F!bSf%z!~;)}jn zSx)Ure%$C>*6B{Gi`#OR4>BM1)l2)j&vDMQUG6=%l7x|8qxc6}hy=UdwKud)!Ng7? zJt@B8?ik!y&4UxL;2JP2O9eThtSXprifcNjYr(XEpB3GlLndC4!~sG<9gWFS8-Yn( z2mSN-TV%I1J|>PP(|KV+y*`hR0*+6aY7k)x2`%?1=i|q8ib6Swl+rRA!``);Fod*)TZ5=K2K zih;c2wO*U1kM(8KJxzdcs% z9pRjFX_b8ri(oH@@MNq?SeXYMr1HoRCxnw&?^E7Eky4E3hp3(*F%)gTeU%1#0Y31X zkY&{WsD#929MKji_ z95Ie-w<`rPu%O^4>V)ofqvrWM{xHNpKXXFKB(FXp3RC zX9c^KS|&K4x!tJ``2C698Oa4u7T4v8sEI(9Mikv!R$E_?{|>C)HNy%aj(fRX6=wne zc9Riz(pytcHS(PoGUD^=gK&35{)3N@y2?i8&P>x>-{*4F^=9upKLX9H#F)ATw8dQ9 z44>ECF1V6rbKSY;JI|hh6`Np}_p1+%)iX{q2BuTvVh7?a1#p`4YB8XJKW5{;nsTsMN~!Yz;uENE2PQu{CPk9=b^ld$?cBKnGEX=SIB+Ei#;re##@*NS;L zQ~u(KZO?{e1WN0m4eVp%mwF-ztgx!Ut_sAex?4rQrz^_**7{vCHoL8v`D!jlAp2*f zkFD>%4z$7K8sPqV_<6o#+MPFUS%(S)${DPoBzV@=Pe1$sXM$jD3A^cbE9g@h#xhA^KgJ=LlA;|fUA#|ZL#1(wn8(j4|bfJ!*L z_RW<76Vv7CO+>C%{zCkV>9~@qCh|`%ZT#Lnmwdg#wDdQI|FZS85?=o4-&MusOT-Lh zUN8&;FFfxOF|4mQ6QSqYKK!H4N1{wlY_>vcvjvHPx&g@>nbfxf0u}Sw0=MW)CfW&1 ziaY5igC}UT84U-S$9RLPGDmN;-Tt5yTb?06+TMX5Y3zrPvGMXLF3O@n}1;F}2@9|FdN($-E%; z1rOlc*EqW{iLE)(y`{3<(IXY1yYmEEZ^)xIFaJJ74+h!US zh?lwTt@K;Mwk|%YW%Qgz?a9IWuK@c60vh5Y_hjyevfJ;uBp!1Hl0)LP`fp96>r^!z zx4q#dLUM0N$-D+nlcM4@Qg_pN@~w^2(pOLI5cHmM5HTIj-DFzNwkQlRcx$;5A&eSj z?+2aBq|Ms7i=C%wCtU6QGRt)lQCslIjaS)=6!{-^Bwum$MsrnRbWTLw8JS@XmIB=SFvGiI`Txo0gqqp$?h&u0Jxc@iWM<)b}DA9X~E_(E`x@ZZ}Taf6YMDJEs zi5@|SPJCG+R5qT*%eLPMQ%)N1Okf2Ts*QIdnM-Vz$@cMbaUmzy8@M?4R-!Gwf|Ep#f^GE8 zTdaBY^P;WvdWW6G!y*-_q2nlb-w$(1j<9-auf)|$N z>_#FcLjUv@YvLWPw7;q#DV0Ghi|SxhqVe#aD`oQ-1m2M169bJx1iILtCis|(F8lld zmlo$-k4Q9gKC{#4-c*YeavvbwJZIW)ByxGYs*G#h)fnB(InUcnqZPRMd1@Adm1|gUH1fGO)9xRy>;)#2naP#HX({MSD@!yv><@XQx0bzi!CR)4AtC!n z37k6%D#&iTKf$mSv{LvjUi)63q8j3{Hx1C%rV@4OUh)J^CiG!$EmBfP8Y8wMD?`2; zs61&iD-6XXpPru|KX%yWR+DKMx~QRoZaAQtqO#W(E2#Gj4~jZ}Ea&E_QtLm)nMIOp zR+iXgzQ}&7KL4^9yf_`bnQ&my8B(4Gbf!(3V0O<^3NIts5kLQgB5qY2+_s~PJc_-w zd75w=@zjpVPQKUz3b#9(CFAa(a{wadj`Eu{AM3Q|q7D#UER2 zrpT3#gM;hY=GZnK+7_muvP9&=_^hb^O}HRn!eNUoU#(}0kO32}O}>0<_G2VY&hlw& z?SsU4g9;?1GBfRROx$`tV5N|((P=im#rg%>!?*Q`cN(o)BZFT~^=FfIk^-85JZAEk z49Ai0PdW>ah?=Pb&~#?LBP~$mCyElli-}OQsXb}^nr!_uprjen$q=OTkpEDw7kd6) z)@Um}bu7QlP(i#1GyJlfO+Fr;<*y8ZdnBlaM@ znPfe^6ZGc`XI&b?&TXAvgb2=?m$d{LhX{(StC9V)vQ;c*joUO<1@;r=$&@Cn(}sOi zudBS>51`TihVYP-SUu{bu{wBYMzRD9z;l!)p)*hLhAo+@(w0i01bCkQw-eddTEGti zbRG70nDQ7&Qt&3cF|2`R^s=`EXlf@85z`6qcBHLlS-Va-b*D{}tzNrrVb{kr1O+tC z9vfb%GbTJ)b9FBc%*kq$rbp8OUIy)VF^lDwTZmyX)q-AIV{OWkqDhsQ1!YCRG-IeuQdkdCQ;SddQ3|H*W<0 z=wQc3ZC%DC2Gt~`bMP<~$fwfiDAiuPQ9MgDG0q6{8gIQd7UALcgn=fd&y^*FS$VKI z?(O6XOYk_(AG88fL_pJegY68_6ETo(i0jpt(iT&7Z-hyBly~8?dWygO+$*js*v|P6 zMo4XJ-%94VD#TV;epB$Ypd>wHh|v`fYdZJQjlr1mCxdZ3*)H(IJ4o$p^LL%+&p-Vk z4{hzhQN1sJit%a4%zJB z#GkE^a(vBafpcEy1i?vf3Zssq!f-FXKAyNh$eYn1YvqRHQQ_rRxk119dJ>(je?Y~&R9d5Q>EmD1A(i91 z?D~0Hb{csF=pyb=C3&mmGg_;gusc@K;k@Av-Qz`mT6y0kWMcsn$dK;KsEQxzZTv4} z&fDf<{Mx^ZhBvsSk3_w2=`oWTRO|YVzC=(SK9;ghu@>5~$V+x#V{|lnNFd@dQsE2q zj6v>-^<#$qs{?g0@A6`9bM@Xj6}xPka`_JV*GT+3;HS2zYfOdzL;%`!tLtq4h?VA7 zp$n}4vN8!J#e}`ec4pm*)5%1|PJe2sXczVDNOG5&+Yw=s+EYFV7hidX*)`K9$uvYJ zd6*%Swh32~B4;3Lr07Kcfe>5Lp{%;JuXdvUd?tVZL-kkJ(uB)QF+(v-;NSXtp?;SZ zJAuad-t`0uBvyeb$p9B1X|Pi7qOqD%F(cVweH2WaL74K}Er%HW^*T9+<|StH?Vyy> zgYq%xHfm@&EjRa+xGc?j4sW>Erle|bHnZrw5_MydXLsZ03-2J)V*O_B@lT# zO?i*la`>fdMwfYay4z7m8+m5t&ge4ca+1!(5LfKrLA2$cATF|5`xI~bx@r| zLljq>~6Wtj}&M4<>oT~Uvz_$PgPqH&^*r#rw+D&tNOzHf= zHuzO;?wR6_J4{d8_CTGk_xr>t_nDuGLUer)EW^I7u&9|@0s#C;Lq7A8SD=U93$Szv zWJyNSjB$H&q{@14r6B*pOc4c0>T2^Z1qZQ|E1>vh8zf0}#jvzg?LH21B{?7tZUPj2+e#Q6Ii5cPCuh)+kIBx)d1M49Pk9^2` z(`v(KU+7Z*bKa@rEd@Ho3kT+(FA=wuN?WL@+R!+b?NkWL+32bW(GUJNM}hm^e86%} z7W2cQm=!m5>SP8DzFHOBP35e*qwu|0u+em!cZGc?h&nbzi@d5BThL+_Dj2trkM|N> zq&MRjSkZS~e7E`4b7S3uJAcJww8d}y`}M$Q4aFXg;KT6T;T1*I&GH8C??mLYNjq5x ziLK&5OpO|@epoy&%=R{{=pf}M@aF67J^*MTG{e*HStpc-5)$v`i?&xz$?NKlI(PjahXR|Z3YJ3DLlIi&9 z4>54Zdu=d+Bz=$vw2IS5Lq7g+V~|hWC%MEQ<$;FW4pMg#QDqcL?{g{aK~7 zs|*8-Fx9CLj{{VO{J`NIu4NuVdOw)yoFG`eSel}KX^RMVFA3$f0-_h9rY>F?6Ov=i z5Ae>Qw4j!A0delj{q6jXEHP-e=gIh7=O5vTialYsz_Gn)@)sWpiyFoh_WCRfcK^j+ zr6eR+N-Y~EiAtTgGGq? zKzT&^mKh$70s%}STkX7g6%K}Xsi-V9hI=2H0wd6EPy2S*$Jj8=`Z9aVxEoSSb|{FA zZ&JZ^#Ld5jk)ycV`Z7a?vSo&}_(9mlEtA52f~>?!KuP^mtmviYJM#M@i5P`T$~Vgp zF7C6dc+q?}2DZwm%*lJ$D_QnYy8og)WuR6Hkp=Eg=K`i&tV0c z1^!!tLs<_`fu3uIhYXAXeUTC~#1m@QR{#V!`UX&S|D{rW4xlw>`NZg&Oc0O}00dou z{}p6${eB8_&lTSvOEO;0plsR?o*@7N9Z z+G(vTP-zKOVjM{iZ_Da2-uQVMx1(>{Leu7o6A-Z__r;ZQaE$Fl{3H+?b43x;RS7`b ziXd=#@zN)lw`c#wA%=h^te>Q2b3O>$H~y6N-N9g&lCYwcSCmMay%*V)FPBBpE;;Q@ z&78n8yi~M&^t0r4|%QvH9A8fpG2f;I>EJ? zW~3aiHD@bT>?9%?H_N-v^|1V(gkZ%X&Mdg8m&49MhcQU&#iAA|7fW8l3bE#I-lp*x zQPS&Fn*2O9u3lW#oSZj-X}*2WJ!xY6qT7t6j7z-8u$P11KL_2JouL3M(}i_?P4ts@ zCTJhm5e2`rBRY2&|MrR(WPn?Ha)HRKm!REBYk%(=)TkgBxpfto4s%>Abk(EHJT|iN z3~f}&7<;AJy?G*63NF@SSy)!(;GR3YZCy+yv)t@SfDRtMOtz09Rx|9OS#wav@C<(%+$rO_Ec&U9PU4%mP8+&K7b0UA zzblTkzH9l#m%3%`ZeGB0*0`d#_GT=ASYIpvz?`b}>V7~53}A5TExlt9eKPP@)sg_O z{nJb#zTSc`M}~iu!XK?50vj57<wtUX;csZFkj);~{{#oR_x{1&&3Qo%Q zBSFC!P~;LFrx1R1hA5`b?IL%ZyLrZ-W5U9TM z(=lzv7xMJL=qm!R0d_$I3IL?z4=x9AG>x1f7Hv((3V-u17|YwqeDF zJ#K`sH+=;y@V_aayB{Q|`g#-Lbd`Ave3kg-^|c0bqT|&9{{nlWeRZMEhC91%I}fY{ zYme1LpM^6Eo+gzzx$&GPt-HRsTSJ0q<@>Uy;;k=%c~EUtO@(B|J{a-X@TI>Ft5KXG zm;V6WCvU^<6gk@G#!g(4Ly^2#u6XVf=M}`embf(wQR{5CayHSLNTgCEfo3I&tWUdP zJb;fu*XF=5Hzn)y?6i#LgF|sl&Uxwe5Aj_3X3KKtSoMjvbMI4V>0rjpmt2;Wg#R|} z57XMK*gaoNeuyH%xhGT1@yA0iFWH zH7GrBQo*#CY1wR~ql0nBe^OX*o_$K7l@rymKlJKyn@MbPP0fXjW0mKZ#+%_MrcpVu zM~eEdr{3d-Jf7->w6G{-^jXM_f4%ti(89No-GwST$aqEo4F&*Q)iJMme1r!%hW~XQ z&P9cB5HA`y0l9+AW(liFH{SXyqnhy@tk$G_-bF3o({p`McjR}!_9#3;W`i9-q~~#z zk9Pom#>0Ef#Zul_xaDqe5H=vCJ0XwUP%`rZFM$j*>0Fz6m$ zDP*%eO)0Fn{=D%-_ zMAiU(^j7{+1^bAQO*i0IzJBWu9~qlze!Z@^QmkX~7tFbGxJ2j>0q&j;Y6L-9T=+r3 ze7}^ma}`J2%L_`|7Xt)oV>VZkPyXHp9Z>^CaWRgUTM#%HbQhhZ#j`7}ow5UF3jLU| zN(zW30*Le=?4USbLNiSsaF&pa{8*c|0h|`?@13#N6;J3|PJXmd>{bN+Udtk|g?|%} zqdsF$`{#fHVW<;BqWbN4tmU0lYKkV6{|Z0n9LR1jn#goWm6Bkt z(XW8XrB86aLI{XfWR73^CWYZn$l!vaPkHire%(f(dZ~IN@s9z969LbkJVOsbfK!)m zN-U<^@;rC<1tkHKRQ5F7NFxHLOCPXya(}m^o$h{@Q|i=M?^Bk=QM)|Z)Q;IDO;KJK zu?=Z+OSGG|n9JVX^iH1{9><>%{vc}=9U0u@3=hEa_vhqAKEt5f_PhNGK)u&dUDwQ0 zx<}$Lp>AlHA?wrbo|nBn5;T06=oxK5rg?sex&!1bmS{KYfl27Pr=z5a>@?`E;>azU zu5FMAI9w0Pxx;5uJdE;I2H@+S31CL!lCQ}8b(o)SW{J}Ek(-+BRzoTok|F(hdy#8>iL z@PUI3mb*8i7C+ZUFirS^@C&6In_QN9{IBxog6a(tPRpGgso*2!ec84Ac4&$-lB};;j17w1`@$;rWk@xr zj0ZHVmCWcXOxY}r(@6{>%*2NYCBL1)o25_|L{}?uF+OEj9{?d-u_~uVgFK1Ge9qeC zw{fF-x4i!wembtd(Ci0E#+IJI7Oqk5XMyab`ZfPV z>ZH5f{I$bYT;KfM7uVO@Kq6nv@z$k6z+Kw|l?oiV^6qXw4rc(6=x3+W6tclB%W=!X zj-gi(`l(oExnz=IKG~hld;OumcvxAg>&!mPk3i7ABN=v`%i6BHVO!oiTXak|%ZVTB z=$C)wK$+7jPm{K7k1zvgn8q{2=r4Iqyf`c|6R?vw4_j4(egDN=Og2g5AGug64b)>3 zj;wc2dz7=~ruvBH^DO^(?*Nb`RLwOb8n%#x?e9ge>ir0MzN&XX=!Gcfi8k8fA`-(f zeqN>{Ub#9J3ZeM=v;8mO#X*g5gR&$8x22R0l7GT*@D=R+zpsEaKSzD{h_0n#zDZuu zLP5vyf(RU-%-wjCSULDgBp0s%lF6i&WycTT8Q83xb2MbN7sgbN4k@IR0Bp>x(?M5x zq%g5O-MHj9$5u~hX}p#a_|YH1)%KabPwjPN#Y6M#biPC!+PrNQeTtywK_N6?MC&lz zk`O~4(U!DU$G}CA_qJGX9Wus1S2&ve-*Ml(6y34WQ0R3{NR4h_)1vio7cG89U=?t? znd+}A9gX|iW1j`oj1=h2I{U<$aLy~i|G4+0+2rv8)kT;hj&%hZWl(U6uo_!hFe~>H zY4cP#TPe%nd2Sd0qpE#z<1BB`9AaDU8e)g>{Yk+PFzq+NJrH8iK1P@KsOx@JKjqjc zR?GcsTe);awyZ(6g<2HH}yj ziM7|d%eSvhGy9P%nzKG5xmHP#B#mxWMYrP3{eZdDg#NJ*N?^~_f95uFZ?){xI!B2B z1)s8Rs$c?n?5g^Kvmg!iTt5Xvwj`gP08bfg^#0(2iRSY`cS(zd^W~UNe*UyM2^4hh z3ZZN&Z`!$ISHoEL@2}TwI5GIkywcvh!T8Yo_W@d3N~W(-B&{3JBH`q)|Ie$qC!y9M z|E~)7L%NIigToN1s+Pndc^WAELZ!orAe4`?Q`O$kgRrWwovh9#vGmc;{*;bA zF)s#ZM6~F2i(>B|o*K~mHQ7B>rpSNw_rDsGwlLgf-tlGQSt_abNbll zf{EuIa}+Seby6TxlI&7D0nguhsAu6P@@^ zVU%ewsYVHQNhLj`IbG+=TOj)1QwtpC%W^KlN^${g-mqb#1oo<-nq8&6{qaAY&)@ILrTSOL3S{jEpHn-exX&7<;(qgGjn;^PYi0CbMp6w@ z_v-nCG+oQR>}Qv^*KWD@rD~I&wyh&`6jrR%yl^O4Th91_JvN;P#wS}u?i z3-{|?aBi#Emzy9q7Ykhv$)y%oJKdTUoBFK0 z>gEEA`MbGD=&?3?9Z~Pwu=sX88mpwtFDZ^tW=I&hqcg$T)$rq(ad4V(3823e$q{h) zmpeqZ1WxEIb-rpOj*;1tGM}kZg&i;y_;m(Tl928cO zojE<{(kDTe(v9>P-%ct+$US2gQ(PZWPpb8@;Q2N zD2xw3V2(!rzc=OoH0W2;#ETx!!q-Jif7Auu$4RGtdbF9?Ryl48=qyCG8hKApQ0^^x zCadTpTC4ZR;3<-?k6tWdYYhnw+-?2%&m3nd;fl!r`5};M~=0guYqTc6)pPk5$k~BpN ziuovj+y$$7NZ&(RlxwglSJq??cPQIUcI9QdL|qT_!*Z_8fq2AeB>)86zx zbN3Bks$X^IxAK4Rh{OhWpqbhwJldp0&}ANME?{1xOXzzLLd-u^ZEHv^19N)8El)od8y06Cga*^jHt=JsSuH>vqpcPBY=FNYAE9{Y&-WI^>0{R7s7iH1tw3?}Jy_!#&4dR!oc^~)%uwyoOv zzzuRPm?TqN_t9|lt4b+$d2I7;jn99|ckdm>R4kY&`Fm4_zdP^I87!r~!_E{+cim`@ z&DpKk(cWTUzJ9s=vlJdh_VT4qlL}#a)bpNOtRo?<9clwUZpyX7xr4n=5yPZFQEXyI z5~o_K(URi(0@lgAzAlcJ{=%*fe&XXdBNQ=~^~W!ZE#1TNFQmrRIEHvx^!DD|a%DL! zJ)g!1oSnpsbvl29*+=qBfu3+1ID0h98yRD9oJC2<^Aid2=X^pI?5?iOd7?vmT!;X> z4AZMoRU}h9?S8hxZWUo*O^29S^70f zTs>K+s;Fiz zVL(dkKN>!@kZT)C$%0kd*KvMI;X=Et3)76agb=A0lTLyv;umO6*6g^`emJyBMbi>6 z1r(edWgtpjgdpKnu+=OO*g<@m4+-C%0f+p)y+3FJw9b@9eZL3_cal4}Sr8vO8S5bR zVG7G_Ckv2g1tUX!+X9r@fIHFlaqRM9JA3OCBIvVd~?(cP(s7fD%JH<4q`k&jn zuzjC3)3D?3D?IgBdmQ}`BjmKPtBsIPYvb?b+uvg25n?2d@kZmp%HxYOeBPQ(^bIA_ zg-E_RNB(6xN^=3Aj8>axMD&YP0=MelP|5~=(Eb13N!ut+L6$_bl`>e*KAf5et+3J7 z(8i>4WGZ?%q2~}?gYML#=wGgi?~6%Kh#6l5H5MR?(4rUQZ50py!y+noxi1QChSfOO z-WueVK+UJVT@9V)y6m=TgZIIALsM8i=&4iNijK}EEC;d0Yz6(4c^XTv$HU0-K9nY4 z!?ZVxfjOB5%*iF~O&BmIt*$~p9?{=pAwAtJFS*E2mX!R@4MUZ_ZC5Qi$$i>;xiX1docgvyMI?i-~W9k1d1+r z`0-+iUs=iet}$zTtKl17{Hqz5T@eB}gI|JtWAQ%MvYf_zMc}_^oi;Egb?kIEAMcOZ zL*VHG+aUy@b&Zto%20`4lfoh*-aQ3eto%rx!4M#E?90C#UMWUlOc?`#i*`k=m$yeY zUw;p+cKg*;eJ8^-`V(h%gOBBNx}fziI^_fb7l$8uKLviv5!}^aa?VkbS{y!Ezix%} z*-)K^Lc8A6z0#ofk-htg1g%ht@x?io+K+C|oVpNm+w6Z$-&gWA-M$Bfzajai9IAht zlQe5?^O?x+3WROutdGwEuzdS@6P_lSQZzcF6t>uk5b_r44iWzWicDaOU-mXqdZ z{_;7k0jx`$28IqEydj{l-yRkc9F<$#ik-};?%p^jz^&!%qNlAQ{)TYb?2|dcl6)nC zj|MZsbH&*QLU$0!>vo^2X2nNa2bz`G~byh#1rDVtGP}$c0;PL9&AKvznY_8 zr)~LA*RNl_wRDd+p8IcZAteAGy9|xo+*YD@MSDJ zvaS#`=i~6#uz^T2T@sglTG|U5Tg}0Y-M8E9sKiGjzcsU^keV3-L@{icfwadUGM5}A zT$k@lCzc4OLr8|=;Z}5t(Dq0aJv}@KfI^$Ur7`H%y5|y7@GKJGz7c65CB4~3DteIs zJ9rmhxPwvJ7$U4Z?hAOD(OZi}n9K*VQpO=#^WVj{&Pa3J>=HVMiiUHc8{S`);&gPb ztS+w>6R+Q-xv?(((3hAbiH5Yq(3ZCH`y}-N!icl!95_vfnO|UVF3`jmY&SR*^6;x} zw{~~jzWZM>DUhce^gP$JU!EADHe0aXcVrO33{m1mV?HT(h&9jY&SO6MF24?esOmB5 zsa(tW=&%!%nmm+Mw-rEsZ;srmxsPB%LZ-6Jx}wthTY zj#qjejn9POCg$me@}Sff(2Vu!w#VW(Afp)sIC+GWw_b;p)7b+CN9XxNpuaIInDf{B zU+oMoPY#;^Y=X_%hkqXoj+s20V!HKgBdUOW>kSALQ0^5uCM(|qTC3=QJAjwlBb?*& zc=M!29*sl!xM0(VahoRo&C!n!FXb#RuFWZ}2Wl0kM!poRX;DR|o)f7(i~G4+0U3b= z9i03UI(*!rs@H3dxZDFn57t(18ir>;SB<#$ESDeWa*^^k^O{xM)RI6{E3#+Umi=Re zLgNTy`VdCU{ZS-FiOhmpMx$7Y;)6HDLX&~=V?A%cf!%G>!P*!E#B{nU5HJxbxTYg>+xMfyfT|0|7hnT##$%0GY0Q>n@jSz>bAXMCV z9f$sAJAK~zN{T)@NyKv@PUOu~{kxTSEC-ewyCpHc+fJ73Z;bul5Z;q|-9?1iDx;T z&$nvKF5l{4#XLU%!#i7x)AbqL{b=7EHPz8{1}NUUHD^GXnJLIG1=Riq9LAIEepHKA zyEtz=7a!#ftU23S?omqrng^M{`-v$4RKLZRIS!lA6HmKQ3$f$Ul}soM5LCWjEu%!2 zx0m3o5curH(Xd>3&PsPv-oC>Zpx5y9uGZZYy|gIIz7t8y{K z1!2ZoWefd;I+-?(3gGPzZvH1@5FfEp8WW*0^~aS}iJs1;v^eV_nJxb8w{GOPdN|=QG zs-0Xiv&1bV*)N-QQCJlkf4)&o!wGU6^-T1<4%3YsjzPm8K8Ro9a?rLM+EWQf)0rb# z+jt2^9<-zTyrI`-SjK?6ZH4al7Ffs=O>$oSQHwI>DffBjYW>WAmHD1KiyYLN zD#C<^7B|`pK`F?!G21$SxZRap;uM8q$I{O5sa&o`W&*$?Q7yj2*>RRk zIipldl=m?r#LUD+C&REo&qnW_;^XRu-02?pzV=}@RHT?_dwg-NL!#C zhxSpz{oHgVr!J6+O=fstMp)_2XIA6xs!2q9ZeF6$j+84&Jo`RFbul*KY#1=oD_kV6 zxUA$Rg>>;Ap1#vvp^KoE`TXRbs6$Y!UbN#?^|0^w9X2_f@-8{9sQ~2}M z#nte&u&a^q;ulUTksT!Z+Y>v~o}qJO}?(_^8zE;wD(Z{H|Qq+ z(zxS6@~1!=XDbO8w>~BKLDhTc)oOb&XY@xrtT; z`+LW88kx^z&uyL!hA1TXPVocGC8Y4(hOdvH3ib z#peuScxXH6;`P#=4u(J9!z`qd!R3GR_CxR!2fnxvpjOTB@I)y5{fF{#dq5j1$?eD! zt2`A+a5h(#*%${1&VSg;$L|2zkn*0<_n5~Q(~7l6?S_`GR`1jXPJ({~p{=MR zS?ke}g%ge%RV>Vxv*kFdi~AblO~c9O)RByC#zUwyj94^F-@a-nX&+=ID8noV$*lP9P550#^Uo{2O;)Q3VvBT+x1{1-sWD_2>0@S|F98h&nP8RFyH~7%G4B)> zI|xC+0YInG{TIF&Dd2Zug}<9e$u}oAryv;Q7R0sKtUXD;-5B$q>wqq+7$w_2?R49Q zUU7t!YeZ2uHBOLvll$ELu#Ez)j)fNj3qHQRjPBW188B`Ge!%%1C6(z*MmUYp*P$qj z+ihL6q}wA5uMFduZdY`P<(aL#9*-mb$G%{4SpAQ%l)W~-`LpGKL-}py(9Ku0p&zLS z=PIcUe#XVsq#0~WmJh6af)vfe%P9HY>b+6cd&?FaI%gqCJ4x&RdSN=DIGEUn&*I!9 zKH==4iH0SyE-{$YV>dRQI9Ug+bHKz$z(k&5M@^`hr#w2KLmeoJ$aV^hRd>mZvO!pJ z(c%)>zP^xO1M{J>YM+6Lpf(pN>$&EYWf1!%2asC!=6Bn4@F5pf9|}6xE5pJE6yUF zuV&q{#mfJ~<4}AGgF1O0=7+8TKOG6o@@&Kc zBVB?XhzRWYDOnkJ`?w5=9OmO}&R)K}g=XnLz4F6fs=G5QXL1e5D&2k=7-;{=lQL~1 z(1oe%4|U--6Rv_@xBTbSz$mZpMWyQ?eGQ{;a}d%nR7k(2#nih3EGFNDs{U4~^>O_~ z&O=f2elYP(>7&4o|JLy`y$;PE$=mrt@A&+#yAO&G>Z9BBlNt2sSibUuorISwZDZW& z{OtE)Lx55{xQclF&9EuUrNK?40}F}1#ecYR^UpL~@13_gn40tWirZ;u)jCoxGK{%R zG!uCil8s%X_M$N5_#=EUS84wxdV+5cawoM5sdmVE_8^`QM+SvM3Qd>O*T3{4znm!@ z3J2W7xjefy9$T`mfMoKf4oUJVY|hEeL~x=oP}(+Rz8Q>f1}V=Y-o}2gg`?O7O6-esV^&y3W}N@~b%#Z$HBpR~iYL(`WaaDafdJZ9AO;qFBX6i$ppj{j zQgV&S*9MKNexO#WnOZ8D^W{*JxyKcgoze;ijIR#7B%2f{TJyF4Vk@jT!n@=8+r{yJ zcbf6!9T`A25S#fYyN)uNqE9b=u34=&d&gu;XnVZbi?VG!=Xh0>^pUBH)Z%P(s{7UB zhXCB#P1N6bEg{m!;>l#(@Z$`fhJnsjR=k;9qRZUYyO~#M`{&x@L&0BeYUS|(CIFqk zAqR~ep?H+qX$C&ABHUizZ%u-4*_lT-`fT^d%w~ogV|?uB?fM!j6nIyy866b`pXUH2 zglAGHy7@)tr0aoP0~utjPE?$N)G+c5B9(~H0iXX?Pcim&P3 z`gs*LhIx1!jXaCRLhgB4CMy%)RFN8ZvWQ2!j7q2t&{SSF-Y0Ih>6ckHPVc8PZt>(5 z7Leh0+&Q92CXYQ1X-jiuW3{fLBFMUa_pXnTCHS*M7l+X~68&bl`VzV@&l>qv`@90Z zPdXwpSw-tXYYO2oUG=kF2_?8uoWHNOS{3P%DL4?deS3IND{2f_PTc~p*_%3USRxPU zK)f4)bP2Jp4PR>~%*ayn*f|Ij+3*m^-9Q@^mtfI}e?&lZfLFz^C1Br1sMx?x5)KjO zDUi2|KClg91tteCF_H`_p@(aj(rg!-o0jN(&}+3U_{?do#e zg6yFJN`>EB+9`qO?S1Dd6Yb@)K=qPw=Uu~);_|>oTXV&8-a5imle>x7iDE*(yHo#F z-Dai-T7mCNB(|fJ<@o%lfD|S>cXSL-R+QBIOwlXA#-m|8yjX?70HhzZ^BApL~i z+-m!UFLzlpZ4?`1VLBTv2y$j)Tl2Rq|ER)l>JqO$OhBv87SEB|7Z(pV3E5Np%|kn5 zu^XpjH(Czhb^HeQlWv(t6_G5Cgf^K z8~#pCvDf3Ujh`RnzrJV#RGOE!P)`){_}g^%l)2jV%qBYVD@8a>$O1J%2nFIC(c{oP zf<4ac?}p7&$y}??YKy>|_Z;b=FNP`t3JSKU^GMLC?V&bcm!1Fa8{B@~WZTl63h&0X z0fi^Cr=WV?@H5|kru8hAEcv}CC5q1d{b3dTL7BzQ;CqbhM2q=m<}GHrsPJV}S z&^BEccT*8l?dyU?fsEAJr>SthZy-jPVk-;Hpnq>31GOkKuU;|KloAfK6HPkr{9aw8 zCM=QLUYq2ja5~+MYKh^}M=Ldotz{mpp0<)h&$0U^mCDoaV~%?@7r(nSDw}@QUETFr z*){c4LvWZ{>DK^-qQhoojf|D{HCJlxus1$Zg7}zX%j*<+lQ51$S^Lzs{uo3s-zZz( zT8eds9^`-mUCI|}O@jkpY4c=kBAvWxLLiCkJIZtMUCx=z9ht_ie|N}CZR0bLX;J#c zL(z!SG^A4{*J;8z6&{nK3F+CB%9b84V{Sx6B5YMxphsNEhn#JYlfSDb>K(8G(F!9( zDUyNfaEK@)_u@%kS0yoz`$?CPKJlR>U&zg8pfM!x$Ky!p?bvX@-9LTKs4Y%xc$yM3 zK>DM4Yx3m>7%maIwHT;duH>A&GVsJq70xO5CThwgm$T?=fVGM8QOW7Z{uJqK!4Vfy zSd|7p81Ud;E6QK1i_Ve0@1Shv8gdt?gVze|9waz7{_3`3;GIZQ@i4i4w8Gbmh!PG# znzXr~n(S#DnRWnvf<`wULoi<* zv%inOFUu>VA8$fji$Y4|2ktr!cZ_8ISZ)}(_@(;6aX@OJ?@}=C6y-{M2Hq%jjcBBS z)<(Y_pBFqdX7sCLooBfQo$i};a1>4i>Q0)=ZTl;3uSQ!z`!K4n@$GvGaz5VzYB}A_ zV}!TYR81NEN))yhonz3MxuzAXt``P}r+}SZb4L}3FrqA8H-XJIZW&DqV<(PzCLdpv z^)Lro1wGoFp*Gvxc>HJ+7gD{&_AwHu7V4Nu71`<}u!;^9G|%W5*YY#SW0E-jeIF)4 zy4gIa_F#oG(e#Zcb2RxuOoi$jF!CstM)k`oltF^~DP~CdyzT5K-qD+~gY(X7_+{vo zm;$(6`&=7y52*H{%U}vzvHF`*)xu@41kr)mL)H(H%5mWJ_WLrg;pgjBa=&-gFLbef z=~0q5$c?}sH%_27LQWqIt52?XxSq-p1Q8rgJ%BzIgbpT4)2pd7`VPEu@{hj1pV>|7 zB35d_svQA@fDEWi;$d+1dCnwT0L#$!Ga*EUbc2n9&QJaWgU8t>ClhcjWy>vZ1oWml zx=dSo_8%R?OXkR=7`R%MQx~PPI{r70pF&(z9oxiXOB2yrw&h;8k^3TBKqqLKKcCg3 zA9eACQEx4P3P8nfieJ4eT2C9usbf2|Y^ z4`fsUQm8V_ zn-#xViMNDV{=cY|^yvbr(m8ssw;96DDP*gP1?Fj`$uB5e)k>b zRA8TGfp#zktj(9Ict>73d9{kWf#&zW>vY>I_Z-=K&fGWbzmoynSgrO)RSdd&*h-xU z;OV`^=`R>Y&%eB=d+B(HR202tZ z`H;zCk{l{VEDwID?LASdK=%<}861sB$yV`c-zsf}7;b5?zix*wc}-hpM=9x_0y!Y$ zJ@}mw?e3}yZAIoa?Ut+Ax&qlFJ-m)bGBxei9EP++1|<+061&gn{|TnA2(xYT*)tk{ z_T@%Fa5aOIon_$^*2fp<%;0yYL_NFZu6N4P`r_A$khmief)Z@^HN}pr%ths-x-F!Z zSJFUYe!Aq@_CO2^_L^^*8qdyT#krPPDrb~pCl=$->>0s;)PSZV&53RE$L3N>c%^i( zh(J0)q)K#9lg!|)h>yFx0)sbP{oJ}OMiuT0rkRw@ANhW&rs4|QGq1Vnve3NLT45X4 zo@u13&YGBqbNn6PLRbRw5ms1^)~sOt4VBhg#FJGb+6O9{Zv&5dZRdu>k5%p3hM8b7 z+b*^DM+mSW_aJO)X@yE{!cC@Ywq#)T*9zmqv)LrR%|aQ8`{Gqp$bn;zu2Cjf&o1xE zLWZjYyiaZ;vws^KkY*u_q)aS>{P22aaSKpJ)5lKT=+RD6Du9|9Z zJ*T_qpcKX|HEp|=12D$79tO}Kg7Cs|%)xp7tj#oS?-g`YTknfy=>{Tua}+q$03;Ha z&$gtp%ICnim1u>3oa`Ko32+HEr8iQB?*tse=%%XeC`~TcRxT<_Xie)R=EZpWuH|t~ zj&_uGPwXsWA-Fz#*J(J*B)2?1Ya#eLY))Z^+ffl2nQ>_i^? z$K_^;Nf17$_xzg{aVup2(MWX~y1=OUcU?wm4f1_h(n(}b0H-hq#Qofg{}0iP#|ru9 zToq`O9V#*~5{S63vQ6tEg3t-r1h3&t+sY^q;M{au$}^8tc|DuLS$BEeb)@8hEK$vGgOkYwvZeKsSeB>vgh zk8?X!%>nkiFTwR8&hP4i?z&j9KzKmTrP+QoUXrU@cdylV5B-w!!zP&4ShE-YClf{gwr`UrTgl1Bz7PTB{sQaCA=$mHBdevgjpo$3)#$L#GVMAASviHsd1dVcbp)W51(dZnX@g0}|W+#-0Y->|nG5i`VIQLksf zr;|#$OrP(Nu?(r--kv@Sg4gqhPeZKuv!IhKI9IY{d{YXLRS zWxPG?z3;+pKv*sI?BiG4WqnGcl1TMm|6S`AyZxom6u=$s!G{LAhey+YiG8Wmo}xdk zyS6>fKdTMs>kNBN`_YN#M}YcY%PStO&tS_h=X$A|Ndxqot9O8a298IyM+chk&$zz_Z_Z{_l47YG>!WYoENX55=jn zPvR2B*+tn}Q5q}8yS$vv+7pGo?&A~@R_*nUS&$E<(XjCGBnX5DI7TEV z;a`y-_@1>dg6N|zT84O2_y^1n2; zwa%jr=mRp9S6nA6j@O3))bl>u^G-=uQh5%uWQkZ3R^Js2hDvkC)2F|?+`es6=048o zn&TYs%~7I!s)J5u*oSw~jGpW<5`jVtg%GJX4Zu=?zL!ry)@+A*n;ZiI2n?K;k5BW_ z|DIN~lrzeFcHSoFM9Pi;D(?T5Bo&_Y+iuhU?gy+C1g2eo3QSF`ga9nFBB94vA{hk?pTK+tvmNy<)OTHBTH~KPV zT>;jOaF}p9R6f_fqmlmiC+7NA)f8bk_Su-_l?8&_UX#WCSI8eA*bebx%Tx?9y&iT- z`W`^{sYY^qAB6CXcWX_W-=Qxj@Gcga*EFqKYI|J$;5rOcoOxsszy_pw;Uee|gy)l2 zrLN@8uPtQSw42;U72>Ws87hy3b}Q+In`?gEK`eTw#{JUi?4l#yP<*}bfLnjlSebZG zS`WX^xz0O&&412il@Syj^kvI4q_t&*(KF{hvdJ@4QFC_tpkW;dzRicWP%r$OngGeX zCe(0+9VEv?T%HuhqFs1e9i&2kT<*W^e@YH1_Ix826ZWJQ5t^G!0DFktYQ1SQmxAZe z)W$c6I8w0*TRK=hoF^=QMPG{-?*Q0JEQV{~=g5~e@+vLd0*O5gfO%fBWu8;ab9!Hk zW_$$K{EdNT5(_^l=24Q1u$it=*-0Uva_93VQRn`7hyOS}(TTdUH4=f~_z3bVCvm3Z zYsHJj#hKl^TjEVlxj?N>1*#y53-ByZsKE0?gthaG=5ptqlap1$aLU3^+xy0=XpauVpTbpN6h9bwq>)jgk;n47K=DVr)`&s0%&uCi6B)x!m0&X1VQ5vSP zcqDx>6G)i~Au=f0D8b$8j|#FsuRWBqQf4q8OQhwXxV(HR@2v&CaS_JHfg*v>RvZf) zDV$eQ~`Ojd;G8$h)s22h{v~k zY>ij@O8F${RAw&3QtiU8C%rObt;g>6z;eT|DB_L2zwHJknG_ea1?XXiV$~Xh^UkrK z9^q=C-|)6Wc@c%4BJFO1)}DL>zz00cml;}7YYLREFXBD;Sp>X(&h%Q+MC>!08~zus8RB?#^$ zsodqYGnxRYld=jf^$nhY=r6h^Ug6J^n^Cs`**FJ$XZrues1{M0?T`Rrl?w4V;DS1(TKE zt->qAWZmIu&OhC@AGx~Y%8iB-*yoGq3FlwC_QU3rzhj5H2{F8hB;#ZQyuNBoPHGNJ zUJvHtZGtw564=g@W-C+br){OVPk;`mV%|0_9hn|>-!pO_Q{yrCj>hV>h?)B*Bbr`q zjtZ2J=;vt$j*woFBX!DCWxCXP6e|>hSs4=K%N`wq>h2FkurO=DX}`sClLPaGW|C6g z&i;G_f?0{zi{3X#M{@4+-jj{9U0b2Lj#7ayj8DVLrD!H6{02k^cn7$-k~1q)Zl!+s zm;Y3abP7VYu`#~6y?3wSwUe+TGA*bdICPiZ81k&>5XZYAbJ~{hayJ8mzw#DPw-SV< zlVZKuY*aJ?$2da;+duiPhPk6me*ctKy7i_XOTDPbTJ4O5jCcw=$9Q`lk2VgdARNXL#6ALx@^-@d z`$_nOM0a_Y5*nD-x1+DSS5KFMh}7;!c!b?i2tWEXAu_fUt__(DnT6ZY7$Sts!^@;e zX;$xyYtSz5fn`wb3hVB1hWm6VRcIHWWcP@t`ez>b{dUz0;c#;*qX@&staoK$8q9O= zGmB>YMItq#Xj7bw^hYl1ODpb7%hqe&mGNKOwr|th((d;ONw}8Hx#K{~a-FA%2NY4s zwWLZaH92?Ev@qwr|GIVF4#zlw9`gKT*PZr+`ZAY!-SKTuvRe!ue0liuPw%tCA6d$3 zhM8W1!PT9K(_I+H6n|ZfFcFe8EwsLpJqT_nEI&V+lG#i;GYs*^5$6TnKvwd4Epg;c zr%J0K!J?M(YAfz|P7_uV+dMvH{px!^p!)5JMCq@yqSB@2sm~gS|Kc%Yu?60#kaA{r z`6LgD$nWwxvD%Zn1+omCkT2Q|9Van-AWpH@Z5`9ROpq~uz8{DQVB-A2%r~xqVC?=$ zIPlA6_n1eI!k@O=B7eTnEP6e0WMU*z<5;v9!xBaZP@Z-N)4^wC>;MGw}eTYz>rW{9WkD*+6t}Uuh=t3l^FWM1x z*MR>#%#p_iCBJ&wf7-SDKn_2$_J494gySl<1I>=VML>{gv@Hs#pr16No-A5*!AC3o zYrHQ-J^F7{g*@&4ST8y|qkjn>6`p&`8(H zn`lKBccp4tOWw}>jgAxAg3H+VN=HN{aH-Zx$PJB9Q(GRVdk^|6A?nhYvH8@W395Z4 zp(j~dM12Rw9bM(e*^%)-3>RrvN=QCQe7Jktap3gi6!+VdUxpmjd11TWmPt@8LFtVBdOxO41tqEOL(ZNK`6P{by6q=1xYk!2Q`Al(WE`9Tg6e05nuDttzhCy{mSWedvoc!JcR=j# z^-gsx^r+?xr%``K0RR&63Nc2cj>S8v3;f{sKMg8K$Ilx`FcaYzzG9J_OA&#ouxKG> z4c67~wf1y_?E~LqOPX4m;(o`_j6`LnQx(0o`%JA7{IgjiuuvmyqT^p&Vyv+iaD3zu z*nR`M7>32^jcG8im12Wg8llw{xaUg%AH1BoJ z$2t{3eZq4Jva3`HksO~2L#%9ZhxbDJ;7h8^2+&lo|Fiy*WD%83{u{u~Pf1TmH}C-? zNi%1x?e>_nGDG;L5Wy*Gf6U0N+;h2;|L0;kq`$NOVMqj?oVhhV!g2bKYF^p{WJ)t9q9zl^dU(nrjl|=%#)rxuIC9^=;eGrAzD7W$`j2n?NjD-$_mib!)}r`FxgGV>@jKT2V35GzEZrm`wpNp{-h5y# zEej^!?m4cvdn{GLdBPsrEmbMk!QK7FcIdZqN_P9E1r-;CI8~p-q)VD8iwI5zY-ahD zNdHE3^{>46YJg}1hNXdZ$`?EU;TPQZ`lFGsca*7)$gKRu8T-1} z<5%Em>$`cmRy{Hmhou53Au`%|%*DXW3lM`7u4)$Rza-4BSnV>h4YCBD1Gt>!1YsPl z!S_9IH)5n1mS}cMO$6N}NYsNXtA%V51e+|=M6(x~R#HopmVn2p%OrB_mX6eSFE^?U z0(w0@R$)2;BA+ywm{v8VQrSOTYxTGu=zYF>?5OAtM$rzFSQk+Wc=t{si`gy=A(IoJ z&eP)_oQq7|*HB2jrSSxaFslj@fTfjyDA0jtODKJx_kuKOoL{XRQ{W{N)3PRGcT6U z$ejAEul}{Vue>elyG?0(R)`#F-hN1PY;DO)K*1KVgze(9KAfbY@M((q?al<9Hw<1n zAzBYwp#D3f^^4cKka=C6+ajr}j}5RhlJ7Fa8KM<)alcY&D!)eYC|fkzSB;#Es@Z;W z!=d;b*jp}LThG8s;HjO!aT?~4oYRv15PpZ#ALmQm5j_0I=i5w=#-`C@SWDm&;^;HY z=Vy@e1&bC?p7QB;MDDhlc-s7UNx!WQdPD&C>Utm2xIS@f++h?0zx z~sigbL6->mF4hUwpTcN`fHGs2MPznUZoX{fn@{9ve@R%O{VDJ6p>YRux== zF3X<1-IM>5k@`IS<)^AUEK^cz{u8BHb#YIUv8YE}(o{W|`xle;R=g&`CeKxy(6!$I zri6n}>7oZ^QfgdF-S|mfqhm>}^Vq@su+SNF%dbN}@w4AwxcU`OFL@ zg!&l)w17-tDU&=ZybI%Yr_0vj$}?%X)98+8i6r5}!&})Uf{1Ky4^8U9NuS-4XqfS? zn>~C=-Fe9VpQ{9Prk&@IqW1G$E}_-KN`hl;?HFh%*R3fdk$El*&lWL*1JrbW{hc%O zz^*Fg0D=wV^}vIoS_Kk!p-x3rUz}Q`p(sf%_i7U}dScK>lLOcO%4bcS<3fZmLZ`XB ziBy7*Y;VBHCS*4m@hR?ocb(4C9Orbc@|Y_}^gh!*CL8Q5f+lk>hi8{rIj)^$_&xn% zHte!|LB;iAO6giGmhm*wQsP+s~ zws+kIqnb?21;*ho=O#eBph5JITy0Ixl=jG>rfCHV^{z+fWT8hAE}Iv+ml<-Cdk|N4 zQsa>P{&NJK%FdJxYKXjz?c#dFQjza;Omh;%Ter)L$z)$eWEwgSw|mcDwEqk(IBuSw zARISXz49-eaN|7*v)WvvAmdzko4EfP3*HjjAp4cP2&Qi z(|I^gsniw8Hol6-e?|tB_A?=L#H*pk0^s6j#d{M8Os8<)6;RPhPd2EVH=Y^P@ zA%K5&MxS-LstWN%8x9s({37RH%abLJv&(x+9TNBs*e-jmUFF@4sNfqvJfrpf-f*s^ zSLmb6v!1D)k$A2rp|O+q#pf`?zD5PT(4?*y+a%xjiyg`tbe_3z8ZKUa`hCxCYV18{ zSS-TYb}V!1J0U~v+*m2~_@HT7{~@I53M%d^K4N_;>_TamdQjhZ?_m(|#B)Wey)TH! zd@B4%zR4x}jQFtLUmE?d@;G-IY}v9D zaKOuTV9@%ra+U;{Rk}oi55+h)2?y+b=jVtcygY{Z^VYjVV5uM*I1W1`lQN8Yhqi9r zQ5&w=kY%%e!my_H26XrXn^IrLJvS!ULu>OH0)JLTQocQy*7;r&ikALBusuwUF&%4@ z|A+zeP9I*0GL{5xd^_i}(g2NNdw5%~ol;2u!m!QRZ2oMLJgQ`!xq0puBmH$V0!l=5!X{4#e{WrE7kG$gXo7 z#r*JeD1ATj<6RE$8;{T|@EA;0!Exccj2Zp`_SNy+oO^1D3>PiP z>~#PgNv1t)&%`_NmG+qUW?y5kNYjETKf)Q@P1ODMH+%-p@f7%~N*G;nSEJjJ27;3V za@79yDv*>;)LwOAUG)AIs4fBtcEhVOdI~+na_LM#k+UAh4gQ))$aYAEtfxgZc*CI*I$xRDgMijH8GsMq&9wI zjeIq){nb;Q(RTU!x~7zB{$(K$kYdp>rYTGGVhqM>bAHMek?1&o?(r)r??d9O&Kzc~ zI(joZGl@Z14)svIQTV+hsimGxhW1Q z6*JER`FZgM$(e=xb0-5?ii^G78ehN0DUseU=rSk{byjQslL_A@nv!o!0Kp(^G^U*C zacc{>`xE{)c;nwJnquSe$uq3Fw?ZU)d(ir_)h+vlpW_B&B^pky#_b-j^dDS~)j-|^ zd~mmlgt&~rafu9}EgQSM#U5*LUN&t33p9WB$tOY+b?mVowD>0@d`=lLA7x5tAF*LP z#7nk)t`-yVM6pheuFH!m02E;E#l&V3MzRi7rvWrGJq&2|TPe6Sjpc$e^$Yx+X*vYy z?TLxI3_oP6 zNtf5lIrSXo&OiT(RjVY)^iSvEJ^WK&aLB9-W{LeCD&czd9E)eCWM-IImr<;1Ov#=f zkIR?i%9;Fcje_Y#i4U6*+X&VbAkVEgkmhHw9_I_6=tJMx^;!y_Lux2C&{Ld${|<9! z*SFQ87|2R9pC3NpsB8_%QGn1vZ+*l^tq%=WzF(NCP47)*TD-Qs8Q`{@wKmL$1rnr9 z9MMMwWXu$H@6mofsx)i!vQ9%8a1b@A{C6C2=f@a*SFj&XJplP`nW8fghB zeuvAU$??m(?4Bv5UjyQfwjeFqo39bCYGW+0-w2L3oyDzrN1Is9 za_Dnp?_}i0Ukf%XWpy@%rK1Z-nNC5qEiFzGux7W|E!x5HK$N)p%2}R^29aE~T+X=v z31C1!=_l7xBCwQU*PL0JU}!bXuEZ^`vuFt0l&kv_jOkbytD=^TRb;6{6kPLQA2j%O zuX=r;QW^Ea9vn=M z>m5d@#EGlzrzznyjGz7F$i>3uE~IkG)w6Q>w?Gy_cIs?eSr78`G0T*ibcNZp>TBHi+e#+ zah$^K?XgmDSRHzqKgnGJ+uWi}$#cY~sc#~t0Z?iwfpYvE+fNdUQ?O6PHal#^WUuNb z{vBx|vugvizQJb0KpOH=<yZ}8Ip_w2z-9aO?lsS%2FD-^Y-ATcI7{QX98D>DW+ z+DFoi-zh+T9G8?2Lt-r$&D!C*BSg!SoWfpQXZJg*#0Z1GYq1k(NpybxrD1BdJb22T z-LSV-6BSMilSS&d|5tD2*Dw@>*??i~-q15R5}9Y`6!k+$2Ncd@l>3e{#jruv&sbz^ zV-o8ry;^~MM1p->V0^Xomx`qakC?tJCxH&xikYIetPxqPDo()++?S6iE`pl%U2Yf6 zuV+PZl0a}YE>q?rB?Faej6^q}vlG+Ra?b2Vo%Q$A4^)9!hT?)?70wf5 zuB0&rQ81w>J!0)5BIu{&sc4ZEUFwXaJqjVQSLEjH@j;tDl`g7l0&e%*F0m^E5;TA{ zIsxBFOBDoyX$<=P$TUsMUR;vH@#HyPweEBe#gcv0!ZL%l@TlZoT)}wQgk2rZNELu- zelM^uM5tRmeQFaBj{780`_^P=KOLu%uodsAAi|T-pUQTT)ikn9+kQ-orj;Ni_Rxof zjQzF6BQmzyM~4h*x7k<7<~#y_Y1iaHb2iEq$(5o7{Ve}U>OQrr;isbnhxF<%qcv4& z)?f3JNM!uXm~^36nO4c8Ufxis1Zjn-7%5)gex=P3Mm{fRt;YMEXzywA!POMY!c_Ih ze>#T2%HCA$+{}mH`+4RvFK1ZT*Qh1jQH#D7cj%scMvJ1Y&e}V=|Hj9bKoS)eW<+%i zCjnA_H$}MOOUqLk6l{@T+)IPT9lFswdU5Dk`}2RN-x9St6JaiFl^c&vqh%gf@{XD;1wQ31p_r*RHtgyyL%7nwUi za9m8VA-Ou8(~drCsVtm>ze!)_p?;0Ylxp_*z_0BUB+oeE(u>|Xq*Vvka%NEEJw;mP zm8lAX1@Yzte=Nn#Zgp1qUfS`7qren9Q4g;g2T$MI1JX@*fGYzXZe)(Q9mJ-hC( zT!+C3zS)tGQ7*`NK$2I5-LK;exj=FbW71rOBHmM>?Jgau!REL#(i`!EZ@i^M`xln` zUo5CBkIi?w{qM!&m%tq}DqS6gu1{8vNFW$s+~%(;3MtGLr?UI$ITABrG`01_k1P<2 zaN)klT(90^`P3{YDgQ8T(8jY{ef6-%GDn0qmpBYL<}~nZv&V6O3=US`L(`qq(d^z_ z8fq>QrI7}TRVH=4>O(64LU|h4d1)F!X0aOg!ob7;#tQ9)I;;c3`J-Z)yoHPT8|C>9 zeC4c#t3!tlUAtqo`K5cqJ(rDdbK(%eLCn3=_Y;kvkjeX>AT}`9m8YJB&f$(YUxt z#hgUW-A_Qu5&2e;xmrp(>A&IY`w89+NaHg5ENu(ga-^|*-rGtnVXin-lYpS4X`ypK zP4&}7PlT_z>Y*=%bz3COm!O@em%u2rg>TccWATAa*!jaC_tu-<{lvtjS)<~%muTyL zq#Uys%NBFg)K)Gf6<4!LfZ(v95RBPS=*?|x2^z)Pv|E1VP1Qi6_-^rar7c6Yo#Uh# zE~fnESLT5DUUeb~Q}zZ~pKMRGlxaDS<|I&gZ9KjrQZ(*-kGJ^=pE6Sm7l5Nf|J8?i z76UDZY7voA$@1_&|8BeaSuUTO-i8crNM@f20GDSse*){5|4(Ct;kgSr+MzzTk`$rY z{V!$g8&byBO1(+sJA2gUo6ZZ@U-^w|ZhJ{$Ewr9KCq3}ax~!JM)V6H%HevAK{W@f7 zN_V8}10S9{O)C0RIZlF7An~mga%pK#uFA_=h-yy zYQJmuaAF{oi;1@L5fSi4+xOF&f?z?tem}-XD@7N?-TU|qK>yE2Z%+{Jo%;p?tP|6q zqX`oAgdTd8YY%g=duRc{@xS~hvmk^%)OM(IGc2w?0oL~Y=*w8Q{xG9RAoH|}n23jI zx5(kV!Dg4~-1T3?l;lT0Gl1K#l%1F@HVki5i4Grlr+E|55MS^9iUAb$V6v6jZX_>u z#rlJH69P}lRk>W6V{EW=`qO7Y8-C;l` z3$+?XA9ab$W=JzS1YAZ{726LG_+5ct!9-R<<}Aj^rdH9dhFwNWnl6AVSnNW+ULh*Z z<%@T(`?WpJ<^GFbq9yZWta(YC#1|pfbQVegcZ8EU;4EN|_X@wBc8`;@#7!1sD`22G z7r#IAE@_F@Luyl@Y;h-GAdk9CidpgDXPW@|Pa_8PM*%nT=cD|-^=~b$_l}UX$WO

I*u+Of0?mVRR01CBFD5g3QKoRWO$Xh1^NmY8%?XQ=f z#BF84tQzNP@Y=Q;(ES3R9&exGe1_aDN%*S$K| z;LTpY?k-NOXH}qg{W*T!n8(g>a>}Q(N+qSoyN{d%%Oxisn*{LGa|;+cZw4}HAz)IlYDkG{!`)i zJ-=r0>*{x9{zM~9U!K|CjrYAj=9-Jn zS*&8!q|lmyoXetubD_xdSY6inwHiN$W)C7zVU4bZ?vS-Qz*vRMLRq>lQQAo`7x78; zq9~*^B-QH3i0-|QJkcZ;a>lP|h}S~~@zsb#dNFhCM`DF0{s9j5A-0JplXWSh%eXB{ z**o>JF-%C+rU2v?2FibTI@vdS9B3VdSRnu;49ifmk)HzSh>oiY6U!$VE|1D(bC?pn zJ?5wn#UZlZna0SXzh8h9CX4dM_C%A&kWNU@*}Po5Q(_vvN?A>o9SVMdH5wsM|nID<_`*2>udED^NUD1Bp9jCG~=d7+OmA1LcI^)KW=6}j)_K>qK z;uF})*@kYEcH3YSD@LftD4eGU8qZS!Y+!aZw)V)vOD0Ug{ekwCY}p8_zuFZOp{gmq zeDQU~G9Gr+{cnI6tL-&&%Jj-tD-4`00D(SpCB}<>*xo}>h!9^xS#yV`7R4qy!>!rWFV#{muJ{56R}*ASDQX z$Se5NeL5#WC(n@7-3xDi!os6m2YBm0dWQc00SSZ9#VNbnnqL^QvX7w8TI`Hhr(tvR zXF8zMBO8)=tTY7NAety%bJCTkHYNQR@!0s^RoxC!r}-|EOc%Xtv#4U1vS*fPJ;%YY z4-P57UvYL4E$L7kOX&1r4qsz9w{-T$2ezAb;c%96j4 zZbg0zl~?r9UwZsGU^SpMztG`Fc>xm*aAhc>@a41TDPm=#7S6_~|Li8tg;!1of&J`Y zdR=V1Qg9W_)y0-K@Nwz*mHzr2xGK2gE4t%_?MYJqQ&$5S;+uZ_h$@_%Fo{Edqiy4{ zrn4&a`w(J}#8+T&%rUJsVkkJ3@ti|2%`df~v}W+*wG-y?T^f_3!HEijj;6&_<@#5? zl{hjrO!1us_y)gVl_H^aS4LjPjt+*8;Ht$Of2A-xCi6l!?qVEU5%*j%JC3IHXRCjY zrhb&v7ekGZ=C#!*v^pB|gfq-+e|A4SH5o>(oAdN)4t$YwRh{Pe&KwPrZjyC)ST8c& zOkH6Y7fjpTBM+=;nHNfPi?=HTQ{#{Sm}q=YZVGo^UWf>qQLzYuzOo2gaan~lCoJ!Q zqK}=Y%9M|Q?Cm`bwi1Kk8hcr?WqCXr3$8$E2V-DfCD&Y;eae9a;fx~~D$?>C>b`F) zv6X9!*p+8TIG6RJb4li_&STF06+sIkGx@hsvY#|Sj#sV|0*NG7e)9+%C+8-R`O*h# zjc4whCa!EXll6Xbc%?A!#PKQVKNyeA7a~e-^beBFF@-U)|00T>L$+AnIN9ftnnj7g z%CBkI0NO=)NlW#Qb^A==Q3$+u{IT~<#qx5;4L?8I4;M-Oop&{m1s&d!+7(`owZ5xr z;lsdqx>Qq?d%q(w_QOC!7F2okys4lthAb|1`kftudv~LCCO462R&Q>Ownd_4-R4sn zW6}^0{c>afmDnKlh3x7|QA2`9!QrEGs^_?iL>WzsYgOvd#fwCc5IiAo$!xCk__StA zEFO?{<#qml^Kk+_AHC4?k^5h53QZ%Ort_h_5l8!T8_whJ1J6;hiG%hjwD4&m^lo>N zAB1T_2;;3TZe!*zcs$-;aMit2aUGQ@r+LSjrzfyxa7VCyRoeE#QgQdk8%lTiY#B=4 zEw*Lj_FA)x?BXcC_{&DX?&d+6Og?F(yvdr9*SMiTw8-ViZ8w_&g%vVySL1#qPkfGn zYwVUnh|^9kaU2Vf{Xwm=&S#BET4cya!ZRY?VEdV0h@9i!6r8p|?Kd8+>`{iBs;iFM z$`_P^Eu!G#7UloFlnGeJwOQ?9&}?3XbBQL5km8+k11_(gmSV)=Mw zg3)9|cgfFTX9qNI=(RT`rh94kvaL61>GkcUDzx?okA4(nK08#EF!mu?(Xvx7M-L~T z>G&Q(i^uyZO$=R$zi?8xlD~;5i+AGkrU1YZJR6J;t-%{`NfN`i68;PRu<({7< zRvwUr3seQX%fIo~!?&E)3)78Rb-0oMF!=KN@?FKe9dOtyI@zM|j1T-2sD4FXhE(tk zv`DZ#Bw?idWrRrb9>Gv9+?4bsJ!3`wUWH_|&;N zaOga>8K-%vNYq0_u_`!mu0R|6uu>2d4%|ao(%5}AIwlQz2C91`JUD~RJ!&WH>moJH z;~v6=QY;=t6LxpalXiL8Tp?uP!3{|v5to0|?*7`cCr*vOk&9h8g?m&})wQkPl78_k z{P(vYl{CTl5PQtnntw0NY5c!mB{6>!@VSd1Q41IrvuATY!l3wly7U;rNV$+8>0{FbkwpDkZz%&Rdy4wQC#39R`!+SDsPdN~rU z+BB^pxJCdB5nYI&fJ;{dNZDM$5a2%n{f7=CO$Qa;<4qjyal<&GFI~(?+$PjQn20|N zzS2q@myO~tn$iyAd&Eop!I6nhEdh1ZNZmdssU#@p$Um~xlRk6qC?&-@4ijn(s%F4K z6ff8DKjYnrGRwqK*#WJL5YESc6c7l<}Xf#gD5yHq$b3fKF8p55x$O@nWlHe4|6Z7~={|l-B>DX!yM?+52wwPxRp9)nj?cRT4eM6{a$cK#ybV{`pD#NUl7+&QnR+mYzUa z=JFF;#nkvEznb?q?_`%C`x;@lPp}7~uAsekKPiJ4>>YXWFI*btr+?_`=W2o!_lo*! zPbFeTCQ60pMmJZ5!CDPR9V>s#jVFu~=)3f}&eoOpWgX8XuJg_KFvzvlUJdNa8`%co zl=R-euSxobDkHI%9^Spe%+iU~ou`=x2kVuyaa#F#G7d0X^CX=;zWvUo29{pb5?Sh?wfJU)~3&`Felm(j-JT-Ei{%;#yBOG8?1XVNXl_o3ho&P~fTnim04~?fr{rz@~h|aOppa zb%r$}%b}e>(ra4ETL>p3h-1<+()i`e=i3O0r4 zsT*IwM+uKswCfbDLdbQ;T`66;E+||51C{`he8;bm6vG}CDKd*|X{VfPE)s3oXcCeO)oNga zqBRP;{^HG=g^8Zk50Q&>g~v9#FQ7?H zRk}7G21H&T(^>QdC8hkX}1pL#X~v1&B1&GW3Qv__d&Dt0y)r|{zaAc$U*i2 zs$eeVKbI!PuL?HyTBrqHG}A05k9AoeaFT3D{Oxe>osA{u5kfER7)pJ?HM@Ak&^s{D z)JVSB{MSSX+TuPPX;$YrZ$I*5;Q`lw8Q>ms!8YArj%Kd7dONZjyO0P6cSswS>wmU)?{&sUq_x&-re%;X3STznBeBuvGjG{$J) zwu#WA)R)U_<(Q4QTW;Nch7?mIz|3QuiUaWjKD&Z8d+@^2I zdd4{K7>UDWsTl4!iB!X@#p-sPiqrsUwp14m;t~-8i{$7MO%-J_S-ulQ)>EtAH~Fim zdvG_Z29ViAP-zId78?_~Pb{9!z@yO#NRfsA1&qXey-Z1F;4kB$Er}69>urpQBhg}a zo7gw`n!OW=#a>+5EmrSql@H~Gz#M^nju3#S-8OImh|aBRbC026r{pMH8Z-%FCO9Tu zjiM|$=|;U>k;!gJXh3T>URZMtuHD*o|E`$)rG0dYbYEfW2S2F5@=~Eq@eS3LRZl!m zq9NLoAcgUdMB%^9+JT<o|wd6RlTX23kwX?|fqaXvZLV4g{8B0}{*AAtZ48ufrD zK#QKCQ!3eHJr#t;KOJRf#~n#=XwD;P5>wPbaR8<4iX(8?@JQBH8g;UdXK<1+5xgZx z=2nYwb+zG`Oc(kcnnk{q5>nfF&Hac#eu+LfoPMc)0*{RNTMP%)YA6ug@nWib3IpEAe^u@h%futH zoMhg#|B-h(#CCtD+d9A}GX@*_FyJ#&onckw_u<%M-ER(c&>@#IB3u+~=F@my=vHX9 zYvRF#j=PwZN|Aps+YpJBY`r1#YvU&i@}+0i2D&fs%kJ+mwEgaH`&$FcI69~g@AYM$ zVrE(e{VO9P1?41JjY$tm4@hIKrfnyS6aaU#n&vvsoNl*oWIr}tlJ}G4w354}I3SE4 z!87n3)Siru^e}t3I|^m;SYDENz76*`gMaJZH4PifHp=_^fz5I2mCy|k z(GBd}CV(WW86FX@`6=u(pVYivd;5lBN{`iH?-RXR;T&IjZZ z3!1&i1pE$5`}yByTzJkFPlY-a0H$d7n zldc(u8)LZ|`S!;SsoUCyr>PJ)qdb6VvTqVO)Or=f2XJZ5z1JOS;_$mNwldkGa1!sY7E4(h33EeVH;1`RNF~k?z#!Pvt-wzqm_9BqijKenrI-G%~^#ar6LB225ty9g>N`j$48ra4|ZO1`KYO==$md^Jv8;-blf+#fv~(O_DJzwNrw7X zhI{1*npN2w5)jm6C2{rh6xaUhfl+-nuPCP2-WQ z@nBb*daI#fn&!Q1v zdv=hWXeUT?`8x}Qt6V+-n&43sdDt^PRZimN|1@>wuBe-QZlO&5y7;aC-P3K<)A-{_ zXPA-lxEH;(*rE9%`3I{-a{n27W_znpy%-$_ow}>5wb45a!YiE`@5Y_zr3n1uY!@!z)SNEl;oq}DQ~S)(o}BR zJQH+}JiiatzxcL+SM1gy26j~mtfvGlSd)lZoe=WxENdBM`#v@*{xgVx(w>Dzxi5TX|7WEyUjeE)b1TJ8Y5OR=-G z!i@N8^De+oD?@t`a&L1lKzozzGS&f(2tv+5e$$G282=PP(&yaA{&Ym?C6$myq}?k= zin)mn_X_No%DgPz(FeT1;<)`4x@XQ(u$}jW{lqfhk>CxpGjU;TDAKS+&BlBq-6WO$ zQQ)~D3sD`b>n_cB!ej%h#cX1Zt zbejD_MA)kQEZ!5?=t~2e&wbc&1s3~SeF?p2XbQQ+G%g6mf@=LBGsqe7iMJaOO3&8_ zLQl3M9>wV|z#6BQKn9+LiCy-&{awx(JV9bl1CzwL(WYtK(aYuNA6a|~XN<>WZm|gF z6wGJna<}e%tmBu;+yVC*Zo1bqy0L-uvwY1@F_)HN=a#~DlKr2eTlg{jrx40X{&gy zKAK^2!e}hHUl=-Z8adYY#@;)MfB}kT0(V+m9dXUIr2Oldi~&*hye0<{j9BGkD=k>~ zgbNYS{a4s_kt-CRZ$WpdA%-Cn!l4oUq!mmf9suee@NVWyO10{4U_kL@mfT! z(*3uFF$*!=z*vDqVruoYRVo64dZw>ljUAj;_apuR;qPK!)7(G}&seisnCp(f{B^b*QQmE) z;a6$)1cLd{%+Ufi=%oEL+inVr3#dA@GCxRtJiAl;cD>bIPM)zY7Qk1OW;7ks389R0 z!1b=Lb|SloOWsR8k&Nxz9>!N(Fc0c4V-fJ*sor7HajgLBg53yuFh%m6(7Z5_QKwBC zd7^n^06Rx!%2#VW(2U?hITCa@#gVpq`5+ANCo9E#)5(`HqrPi?*=t5zV)uJBo~7l# zo)5SY<4WP-z<$*$_E|4e0;5C8avx^^gs*qW2WZkCX3I|9*5{_05$HV9t4MXFjJ_c8 zTwTAfei2OdO@X?6Ia#ayjHj%L!?ehAd@n3opCgxUZuy8sx#FJppP7J$^uW(uuM4e7 zhwh9lPZ[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

  • b{F@ALw)LznPLm|jdFM~eam+@jTu!k;5B|5PO<^tiwi#Rc zNW5b{*6Mlh+od^WiJtn2`m;_*=+AhIpNnhSYFe2wqxd~dDrpU(LXEXpJXoWJ+z65URAP^W*4LmY$z1|3XJf4{C~|^}$Z2R~en(**@krIJsL% zZ%AH_MqRmawJ7C1Ptu;?%PO9Z^nFmgz}C)v9)ce{up%O{t4>%wJ)0~my2oz%O`p6a zU7REj<&b$1Fh>JUX>oOLu4pRGtV(?679Zf^;5HSVLLea0)tAes%sd%lorNt}mX2J& z8?!8eV#Whp;7o6<&}}WS!+UQL+aMud`1h@86T7>fm2fLlK9#RA^~3TD$`HP(%)Oo5 z3z{mPPQfakL#ef$F&vJuXf5t;QvJtGP-g(ApQ+KzMFZ!D9i`Y%E>YknXb+~J!PzRX zuG2UYLKgKtb2++Bekq7AlP*klrp)a}L+u48!W9w>=dEfaQSS^}?KUeg#rJzZ9|+*| zpYGrkk+B8l=G8-2T9P!zc>RIlFg=Jk& z*^pL@g|>wX^E)OHcksx~hgxkWv+|vAmhM=#(D$D;d&&)ASP#c*DGRsdC>g!WL4JKG&~qrj`ie#Z z2KctLTQiupwkc@_TyM|TZ0OU!HNpQ_!!-@G(>!%qs2q?TefCE^h*Vq|T#Wej<4eoH zs$$cZ=KbNV8foAmLJvNmo3Hz_?Pnacb2`Urd!l)G!~r}*j^Fa5jYG0Q^`TCK7nAzS z(7N3T+vAYK4cnmkVN$Q{g&FW%X`561^F*y}CU`5Ot!jyM_vvx8B;v=W|HfX^TybRx z3D+xdUXk=Y_&_=YwH`7Z{3rBc$3hqQX#tyzNb;4DT#ZSt>Bl*VV~%Nl=R$yQ0ka~x zts0+ikd0@OLXqRjia(9W8V}Ol_&eP(87QMdTYE_?2hU^PBdO;`nmKH*O=JY}ST5i7 zSkZl6g`E}xXx+toGpJ52hX!>T726pF<9U`_W^B1V>*FvRP4>_#XRg zbGc42o5@!OYwZ>X20bXAw*sz(j_*x0E$kb+XKff;Al>&X&Nd+}yFP7NVP#AD8Zc5~!>Z`i3k`ui zMhIA4yet#u09p29-_WcORMt=S_nyNsgTQkEYC#>7%KB0GCfz2>pv(p5n|s`GKlKB3 zxcev#;@&XtFxN0!%T=eL>1&b^f~kVooqmi}!bb-s1lCG#iu|JDCB}DW-`=AV;skL4 zg~(h5wWHb~mz>)ydp!s;hFXRi*j`p#GiUAT+@qkMBc{vN>@Yj2-F!dMq|CAWjV~ye z8YFt|zuG1EIUKs%kISRmdu8&T)-I%x`8<$Wt+Xom*5=q1)x< z#j2~yZVkO0y>WMqtUHfobdQm|r$SG?B(RUE3?nO5PY1pZ=FxR{Rc5G%i*-s)QB$T( zN36$;4*ao)somw9Ivp3o5+Ap!xydf004*peJz(&zYWYDf^v6;9mBAxno0E}%`jzhg zq^A=0kCmrgRl_~GY%VV=uG#ZCbgB~ixFVIwCI(zGsaL&H5P>|%UJhk+`dDpAtnt8= zF7^mBxRRFOYVy&b0(cLX&K0fX(0?|Fo85NzCZP%5CGm2CJl-mk_5iu?T-MrUziUL%DBq$&wfNPad6!Y6P)z^jHPCX zR6jDMs8?>NrRFRRbPeC3+TXHp4$w6fGrbv)A}W2Wzga**Jnw6-uS4@hWIn$PFh=G= zryM}Uv(COOqhU(`zTV?HRwEJp!HZsIaX-D=hajERnx3FH_hQ2yi-pB^N$^qe+t8Uk zg>0(+_|UH{_g@sBgsCgAzuP(A#ty+0y~Wz%lD4Sh*9l=c^XzXEj^62lpUDD8k-A4K zloCb+*oHw+e_&kfnhII@b5nXo1_*-dO*3QM=&I9N7qZ!SH)B-a6C}z94!KE&AKbv{ zzH`vyI!}YTH<)<@{*9mi#dk{416Wbi4}ak|_F!}G)Gx}nWThc-2TeGvN&WnK!O{3U z8dzr{fOUo|>eOG2 z_ApjDq}MKPWt+6U?Qa~K;hYuvv-kxm?tepN(pARtb!!KbH%YP>UH^YPeRWuq{~I+S zp|mI+0s^9RODkbeA}Z1`QW#^v=n*2_(yfvz-7&hmlpG^QkB$)|-pB9necwOe;(8eT zv3;KNocrAOId?_$wA%hY$>|AVJgtD8uO&sjT zHI76xR*j{s!kywAn4|OLfH4ROC&ok$LaAmdskB;l#NPAMHk^11X(O*kX=;iUU~y0W7SCt;AgzuxFs1P>%kAUTEXE@` z(yxC#InI*CWTR9EjbBC?pZ%3i4FjeeIx|&1ZMQ3~=Bhb%3po?I--SqmfL15BSl?vP z3}q)SL8nI4jwYv2*LM9(rSR*6FW*AzdPtwEsoae@2zvxo>iaO;wJyefDk1b~%BWDiq2)k?28`gXM_G5r!_UO@uVcf*JQ(tk~7+oe{L}-z|GYlAFm`jR){W2K0$o5g#cr zeHK`UaSR@+c#iq%T9bYtedVtd78+C-Ec~J|N=fZ0*W++jwCU;D3h|3#P z+93l+oV{8qS3XCADl`@p&(lSEclM!egQxxaiq``=u5La*Q3(7?C^)c&9EvMZdn;isUm^5I417jthVhb=VAptsnz_El&lvC7k|yl0T>~6t zf{>jxtEVOVIL869OHG!fM~OP&I~i$sMz-9`hkB{z!MaH-fqa}aq!FHmhv*xsh|_5j zu_PF>vD0-W=BUqO)$e%*NoN2{@=s2YTf5$;SplBusilnnpTMkJfxCxae5x8&o)8-D zy_iZ5at(MVHf8HKf&}ow)1n z;^!1qU((qh*}x4RG%2m`K`aDK>H5D|tb;%3R_{VumB=3lVG z^Kl!X5jS@4%lh4zY>#H#nXZtV-(l{-pY=vs zVi7Rn;T(?@E@s^u04CJv*z)%v+E6ny(i68~k3DDNf-=qzc)PWLF#Y$2B6nGvOix4R zlYP%}s>XpSD}c5n#}$Ff+AK3O0DRf5&@vt9U}plp7P4ToP(Xg6Tr1AkbvwcinoBvgQ5Z`(K^UYU zPsUt>ECx}wtfBMre*3MOiDZOFbRc&|VBB&y#WOx-#Uu5=l z1x{MypPdZU2=)#RR|7=lS=3nCUQ+l$N)maY?M?}O5?7CCvl~WAZXbM6`iRcRohLGw zW0Rw-5a0A5wHM7fUy+9yy-@4;st9~Z9tQTRq3RX;A59(#8jr8{RB4YtPx}}RrOF6& z{(kA|n7`JzmiF7n@XM>t*BXY0gYrFY{)Ou~A4*D}7i7{y6TGzsjLd4SR?=5j(lO{M zV9^$?oOMmWQ;Av+@xrG^1~7*&yvXsi-~9BV&lzlqKz+I*lY+1V`OdCDSdJf z{a-IeFxbKRm*7B+FsRs6mI`d@QRy+jSf0uQ9AJW~U~q=QQzl!d8|4~=O@-$`;hYEM zPO1CSbMa4NUWCJ;Tpo7JcE7c7F=UB9zk!Iq+hQ#-eS~dSP=9dsV^Nm|KSBY`!@y9}Rkaf} z$6UZr`@WHr&iRvrN-A~Zqj|OtYS1+As@pE78b|5;vfL^n!?Zk6ZRs<6$00L?(MSQS zA6*wh0IDwz2`fdm7E?djyoPRH1gh~^Jyo!7*m$zn5R;@d6V`z=CD~pzI zJ%?+796zA;Q-Kxc@}A$fr=xL%%Bj9Rz)tbZ`~(lxhK%AIne|SjA-ZaMy{+N($0O07Zr2dgpCe*frmtx5C$1r63Tt zv|0jXHzcCTZV+)Fx*!d9R{T8ofHcxt;6d6J?%fd`PfG30y5FAH4=B#>dNS$#grqW; z6TZ&d0pnQtk7`fMH@f#+?@=SHu+JeYTFX+(qO|UJ=d3@inGTOw|EIP5zrtwQ8jyC= zB=ls8&+DueDk^TNWIyVzUwqfalxmV{{=24!LeE}XgocL1Q>ZXP1dBszuEKxI36z4l z1Py{f6_IBH6o&TRBBCO;B3d*H!tWS~UT1s`hP-RJ(wG%isr7O%7=b( z=*XUS;92NNg47h@Bb#VGoqLuWyA@TKc<`04lx4R?)mKLqe52a-ZW6@RNzepS(0(G#!kd-m}0k7EO+0Z8`_w9gROT*7^q_R#Kqi7#S*X zi(BQiAmGRla*$3{tFRuT6Yi@^^knwy(Wy(RjdSZ?nWpPH@+`948RIt)ORhYZ37r%nQaC)9E##m!a!gbw8WwIu@%Lyd;80pNKj>Wu}5e#C9GpuLo-ew-^i;J1EE2oIhGlBr;d3F%g#bR7BodS#o3=mw{}K#3v}X&5_AJ# zoyO1YHp)|U_Ns@}mfJTxaw_&-pudjbSuqU+Ig|8%c79-zbNL9g+ata8feYeUNGX== z9iI|z|2(66Fl4MQsP<}xY{Wg=YpI@+_Egaqo4U)D?OlVLST}V&!qSfTG~;@0L`+RL z6fUOM;VV15S)O?~G_T3#^<~#o)Kr7E{LQD+_3RKmfP{R)u=%xll;8?k*C&LUM&XAu z>*N}91&uNC*O4*%R<3)z*;d9Pp^Qtog94K+g>&Q+w_N~pS}q&1(FZ-vSFW;H7MZ&1V~=qt=iGPVd^^JolV)llXJ7l#C;*KnrPf^FQMP$27! ztrxqmw3zmq(SQ6Ey{3Zj>9vovYCk8LxAzx%q5vLIxZAxe^wdTjDUtO&ye2Gz1 zL1VRmu4C3_wxX2DNvcE7kxU~-T9`&RvH&w0BQ*+bEoSd7z5v!2 zeE!%x0ac>5lFz;gfy?~M{QvpHS4_)#Max2&9Q8lF1>h;K9AsTi*W>#%kP>8vl{6`O z7e|WY|EsY%^0?X~0UaxqTAR=pM`(3VY?ZzsOU(gY#|HW6Ti0yF+xbk>T*FI0xGa?B zwE_(jJVC;)8d1hRK#gCoM|~+RiQA$L_*w<(|0*=xr=YRNOPCBIT+bmF4&vk8WqeSa zK`256y7!XS%%YO&O+M*Q{ujcQ3H(+A&gA;zw7@n3{li7EBZl0lOS@x|fw~c^Kh90u zPA(dQ(;`Qc(F3AtYu3aL14)b(E$JH8MS>k_Y2`m>WXLdL!#{RFj&yTvp+gs!%v$+| zz>`fgY_EZ6>nwe5+U`KzvslF_#GDyO$y{d4Zl0X|yls^FO!hX!hF7U^T3PlfQFWfE zeUQd1&att)k)Hp4{x9e+Ti`z-EjLBL$%}NhYq@&8Y%nVI&a|(s&K6BCW$)52 z|LLXHeDf^hIpR4YN1B${$^v@3yzd=<4M#K0*kX{#ktFp*Mw2%~w11+VM&qE(H=`zm zeJbIUWA1KuuU>NY7zq>A_ za{wUhDI6Rh&D)sxj(M~J{9+oUJp;|!RXD6KXw+_MEkx4KKU|Xo7{`(0-J4ApApoeZ z6L;fB5VHWf=)n{ACbX~KpKe#0?q$Jundb{kFTz%8reBvT!`BwN)Em%Fi?+`Hgi6~fxIy3ib8 zEgw;8ZO|CNh?=3MDi%a@f}Q$r7z(r;hYW8G5D9M{z50SB`W|#aqC@_S?49EIAHRZCBE1FtiTRU2swv-Q(s-tuL zkBm}lud~GMmGwhNyGd^ktCG6_K{S4$>RbXJ*NAuf0#SmMMr*spHZd0vl;(h2Gu7OD z*#i2W1`1dEr2I^P92~J7N(Z4ueoVbs z$l}wTDsLkDwz9M+!6x?Lk9me@u`p05?F(yhchW?ZQFU{3atzS4PHV5R_vj!$*X6mf zb+E(@pz(20&t4g|9;EiCxSt$Gi;x?Qx4wfhG~{Mm@e14SNC8DiE=bkKz7d@LC(Wz6N`)(pK56mk+{`PV}w`@kRNa!y2Sa54nM9+>{k-pIJ8D|5vedf zd1PnhS%CypT9Z{SO=-cozDO(Y8m^mM#+(dHyE|C@d?PD}Fr)-KRuTF+r6klpv{G*L zMME9C@q;Su{w(dz=ZDdup(z8Rb= z>m-0g*KEt0aNC+1jKP|Otr$o$Fok@#aVM7}XR?kvrCKT`y&CE&Kpj$*{|H?A4ZQoG zigG6Duty%FTqH(6i5<2UELOi@DLlaCCW^T3Of1d=?P zGqrh2mL-9F|&hB)Z}&B#63F?EO{0rtzH!@ zNJV!+I`gqR@fAHU4QL3a3V=1>HT_!RuE|wKoT1Ba9>N?4HL&=&s$I7+;ivX~oDt z>>0k-Upm)Z3ImFs#9i$ypT0An({-U{BpiERW14j6V?Ae3*@Kk;~*?WVof>j=A9>N~RV8+SYfG^38_{pRFvru?Sh zJ1y59MQ;uN(_$bx6_oQVh`p>zc@174Og$*DVDGv%L=Pd}kxt6DARrAndg3q}b z(2GK%REOsLP8aj=iw~amwHp8ZXF&m$q4(wB8ki|itKGI=ZAaB~KMWY6;30X9Kfq!r z+Cjr;!$VWG6H2wE=MdB#a-?Wx1uE$G=~9+Fbo8l>obzewZqxnL+I=mIlI>%wZ0q{8 z+DpOU9fu>jdm1)t0uP);+kZ zwShDV2)Ah9VX@W+EqP7WuYbjuB>dylWM8MN$OoDAZjf#X%zlW<&x6Z5=Z1=rijs;U z*5h?T6`aR?K`2h7Sslk`Pe7VWRYQ#ji&2P{8ZBOZ^!lcr<0xXUKXR{+p>VsW@U4m} z`K!oR%QUkvwLogWyEfDU;qt-P##L3jh5T}oE+1Lq}UO-c$rxVhKqy99r( zjTQRwU1*?@bp*=y11OKaI^#7#CJUCusLwt|r-bwW|A=#GAvG&}L1kp_GUywu^t5LhisnH!Vi=~M=n@>cm%X}QZ4jst| zv5Kr)ZHSZVlu!Mh+oVD7&;kT^opr-{Y_0uvZ$}&7YI4r3m!jVKqDEcGwiLHB6RoZ0 ze1DrS4iGEA$&pFJJ%(5{N%o9*RaVA)1x}UBkWO{57u00#h7Y|?GE-jdz0OcADJ*ArHBvSd|?of7;9V3r%SDgB=|6U z-psu9$cQ!l2#80?FBDwc>Fs1?JjRb0d*r^XSHe9N?Hzz{cCdcFq}b~^L|;taANgns zcVfeOz+O3h=J13KN98&9g3Y@E*C{qq*LD&2A{%=;eqAskLU8)j?^J+z7m#P$JjR;E z-qvVjU-D`*X*bQnx6XmOrwI>$h711u-H4j&u3cK~mc<;POLVc`_`=k0OaZ8u&XJXl zcl|CIWwEsT2=KshU$*-ZRy*qgA>iFNjH}4*SSZD@DD=AV-=nrvQ3%!Hm1~I$hCg-Z4WdTx``w?YRO?r}^E~(!|p(-xEL6 ze`#UB!`xZ|P%==BB9I6>Z*^{_+MDa|5%V3e&U_Ej-FpQWGz7dcyNqIxoCB|?Lx#4% z`WEDKz*}5dV`Xwgr&Ebo-*Ixc-P2-+KT{Ax1KEPIL#;zK95-pa}`kRWKpw^l6ej^-d6yfc;(1&qtW+BFTKILo8Sh3uXRpn5*` zpkWU%q?oha$|}=(`$bDv1giect4E$L<1 zX~nr9T8|uX#V%0xMIv7zQpr(&rh|Y|iLss$Fw6{F13GSZBr*x`$pl&rrN>Xo&1vng zi0yqFnKUl9BwkNX;_1xYBWiE6MT<01rlh@2&Sb3_$(o&1v{kqj zwrjBoeJPT?m2!ph+j|;A6bedFJKt6BnZLJo#zJ+Jq|=nKFtpeZ2@azObs3)F1u}KN z88O_~K=^wOY_o{k^+^SDnvL%U%LC4?JsRalM1!xtJWm2yRFc!ux!gZG7S6G8*C&Ts zmPP~`5dyY?M$VE%m%0Zwb9*Q|3^<#R4rhMN>C}f<&1_4V%Z;C=2~0wOywq9NWT1kB zx`QuDgm}0&6M92>yQ|v=SCI{hbPRlE?U3NMfP!Fdf8W3KNshv+xJSQlqVz?{B13?lB73bRNn4`p!`BTW&2`> zBLAvxMtwZH`jl&p5l5wHT4y+lCr^ZGMomOL+_WzRPO+zL4vW3ZTkB$~!ujyt2a#va zZ56lYG(on5!^*;HcJ5MP9$5-aNiEG97ODF6!}iT3;pvst8BZZMbBj^~Ven8>VMh^C zyNNmX!J0>%4Yz)er>)n0vLb}<&)S-@}Z46_*Rf!`$3YSw$nJW zihGT-q{-~yCNvHj5qw$`qky$M9qY+D)G5DNn$Tv{0AFgH0?@LfaABJ&lNwhJKuM4G zJ(m+u3~0Q08z35Tw-F?#tN&1Bg~vezWV$VWkrdaI?R$Q{D+UB8z%Ns6fJWp@HCo}s zr+_a_5$oYuyW7KdgV;F@Pj8ECw)(WD-Ly}HjsWyrT-PpI8$L#XRP;OeU6XmxKGndR zg|j|g0p|1-jt))Tv*CFuwZLdDGcec!uk_vq26bcLOS1E5)60^WX85xD0svH-rPoeQ zmH$2q0R0CZpp$eGQ(PR8SpvOPSEf%0(UK`OX>1G=AAps;=C+eH4nXsnsV*X=R(Jpr zWQ!85P+1e;(xq0t?T}(E{G%$~uSQ^wO6S~?xRkj~>YgPq=Ax&|N7hmUyI4V!yqMq- zyQ?RBSC81SFMV(>F!8%58St;XZUlq{INNuOv6-!-fgLWgES-&RudQIukF`YAz|`-a zi^If#>A6KUU^K7UYh55fg7up%ihxxjD|bbu+Nhv0fyVJI(+M)H8BHEHn-Q_6>M67@p#vNOAYH7khi_4l0ZwbZ|1uCeEu1*s(O zg%zm9rlT)NCpg(`hSIaIThjh=;WNGyl$n8lexr(8c}_JkI0Nqhw2&&hP*MJgz&8p6 zW4>I2!f;VymUeP3MxbBlGK%78H|zf-E&vvz!q7~WMTfLl=8HNfeGGwh(xv=z$Qi3= z_}xj>$v0@-9_ZgmA}8IA?POvJ0h#@|%SEGY_wX^7??5Q>%F+4L({6!-`wR15zQD(F zn`VQ=mA1!2-=bcqYpg9#Q*>?Qv(T)BN>Jwt8;L*|o7DBoi+fmJV7<=E*@>U54xCF1 zu5qt(CYhUR7%7e{iH>6z6`puUj0l4nbs~R8@kRYqe;Nmg<|`k0@j&lLB>K1&k9+t{ z!^dEn0r|EQ%#fivFR|cf7U;d~NQ+gIxWW+Omou;S3746Y#K5AsH~D{_nUo|c4np$C zIO1{K;XjHB_=QIppK-R)E(tsKz%?#ji7k8wy2Ce_5(*$zPZgzyF>-^;T!R8&CYW;8 zd8ZF|cP_H-l(D!A3xrteeX0Z4V@&u^$kiK$S=N|LXj;@skNo|j>*?ZqJi9Vi)p%U0vrH7E#Au!iW|*`roQ5CT>o-802qjPGdO2~{2XamH*@Bv=xl#_ zdBccjyuYkO+iiD>e;*ay5*ti?|z9twd`S?p=G zr-sdYjVEgKYyV=*hvse+y>D2pdtj^U?LO8I<4AAebJ9Ewam0%v9(}s*bdfQ!?mGOG zYh49z@SaQlqwu>fABGcDh+ZE?ss%9lVLcp7ah38%^OzC$jBadXpwE=?UP-04UUrG2 zIDyO6f%oIR*Ntw)29V-v=-XxLCiC5Do~A4u65Z-He|M(LIUwggnd{8qZOn{)2r>?# zKd0BpAshWZfz%27*s994Z98R+A>>z3?XGLT$~{AAc}fWD%p+vGvHfzxJC6w61kAG) zFegHlKCm{dqHI#0O4!2cy8wGQ@$zm4DV%mmfLQp=6y z`+ooX7}N= zzez51_cu&$PXc?af;uVl?gbtZKzGUPZdQN z_e0ASC%f{Ux63d?&?8zV_$q-$m~WFWw)&Ibkf>7Pf&P@tCd|_vT}9CO_3exaGsZS2 zTc6XaUNZC~szWE_a zjY!$DBi&)SrWhWJ_c2s9jPQAxo;)m?fOnOBp9v4_i#Gf)9LBG&P(_N90bIjg@OJ z-P%s_jq^3HbJe>d$c$EB0MX_bQ12C;s+;u4>1s+l4h!(0raqX= z!I57CIy^xOW^+!)p4n){^2H`OdjZ*pR`9?LC<&v#?SC?LiEHW@`^Z*40KQBeubT&(_;5?r7< zaP1Ru8lcKD(yKJuBUEfQC$WgZcRUzaDkWT-t!Vlt@Z-|{B03`>EAW?cLGH~4BO_iB zTZ{hsQ#|*5X}fr#-qA3_+#BJzid?PczpaKZTK~#Yw6e-*{n=ryI9;2w+N+<_PysJ| zPk(O%LwPbPsH*HS8pl+O^pC#66M-+FIN>29>4&dI#S_&tBtD`+&0hE4wTkk( zP*m1!Gn8uWVzjqf5)kb!WvWy%wm%bP3#q-}Xf=&eGLCd)Zo>RDjT#_Z(JG*#Sh*sh zPv)JjzF4h8DDA#$;B3Vm^&Nh$4{PA8!}<1;ot=3t5Xn`d{cq3m&&Hpmmn0_4Yu$O{ zd%4(=7GwTRKq;65Xl0Nz2GtIdG%%k1wpv%tDUw)p!K_}iSds3E688aJEhyu6wql2 zaq@+VTQQ?uBUE6Z3A^c6Wqy;&+f?fuN0GGe2UMkn!kW9zKUs~RY$}|c`>&FRea&Opl3J8}HTQ-L zG9v{0E3H?3IiKpH*<^J+OQFT23S5h=@=H@!D^ebI`MAe^a$qpeK!)xps03Lx*+V6!fXDraS*60s=??`U?#a=S2W zO;3-wg0zEJGwoSTS9C>BZ~bCvWlhydjy{yNbQ9@qbisctx7KRN3Gt>9xwVYqZz37# zTNJ?)9K}kqwrF0&AoDROLFFFs#ft1u6>Xw-`ql^IZpmB|h0>06Sd+`+i$C%?t67uq zj5r#g{kvsHvPj8NuSy(EU=5ktsdBiOd_UuiUk9>*-Gq$%v@ko{emdhV_6-{u#>poA ztAl~Xtz+)l#qM7hhNtkx67B4!gkp5Ack{XAj2}LJh){0;8NJ30;&{UQEE+02SWXz( zGn}Dkyzk=y;Lhs66z_}OLc_(KU);GrBJ2)My7_|fY6Fk}7hNY#MB}-N8ddL45+FNQ z8DG&ZZFemSz*id*>yXb4pGYAzZ`CCJ=W1vh2yTk_+h4>@*oSoM3dfv&Cu@~ZqJQzNUu}sq{=-xJMH%X; zS7Fiut*YgZkYRQS^e>-nZAo`#-bSo4Ep}EN#nK~G{i(@cPw>t_cp_Txi=BSS{EW-I z9=QwS+ovnw-lyOAEJoXrY!_)BtWvVbzzwS$%hnXqE=(`{AL`^uFRJ>=h%Ih#)mvP8H=ZXlm43Ljt0>?qUU(6lN0W- zzPAW1&+3S(?!w8$A0&!mm`J+s@-{?6%?R<@{X=0|?;e&#okvzuu8wNGCEnpg`{Y(e zy4GvNm&{M|(V*NvJaX*`M2}7d1oeZ5DXB&GCgcf9|8e>c^~VtoWjb z!yO{3o`{Y|@ub~WGL{O_Tn@L)IO8gF`K&|1?YOj1JqKnyfl-`!U{P*dP4k>F)N|S^6bJBf?V&P`qWM@xje%O9jl554yowp!}%p@AOnS z_mM`puRr+SUg$ci~Xv! zv1zG0@3)gLdZEI(T5l=iBqr^`J|=@|X&#wWV6;BhK3;q>F=)d&D>G|=ZvBgCgNlM@ zP32L!2~dxSIy%EYC4+(p)P}QJ5xr8A!68S{KPL0DLfBr$6TFVe;o81U`03;-DymC< zbzK_ou^Y*<{4frsGQTx?)zR!3($k!I*UC4`B`mwENM0l{ay||ZQe1{((G0GeX8zz9 zYJc@=I`k5;Mu$x--@AMN_Z-y2{=V$OZE8J<8#Uk0E*HhHK%*zynwP=T(cK@S`gUU~ z1nN|$!vWVQ*<2K?zI)oN26NlT{A@C%M~ZKtp6&w{QCyZ-$|x<#DIXGIwK7=vNrf|W ze%$*ka;u1(Mb-w-abd}2yy+(6m_=HsDJ0{#?GpdhHX=AC?2p$6EAXCOyL(1_Bcw!dZZ)_mMg$ALrq;HhIwBnCk(VM zxik#vGs+GqX#KfI-)b@Z_J-%+t;Cdr-qz$E+${}=PH2|4QP>lq5u1$z%!yQe*Dv^pJ*O?vy2_;vA1 z0#jah5r1LDE?;{o7I!Xgd8jifWTdI=Esq-g#27*~2kRl|+2|K5KMpWu@1h!J)ExaI z_z|j-?`UQ=bhn zy)~S_2)X`Jc!{`*cnBc6Zilx;j5#g|469^()6mY7Mpj=`Zm!;j(VqNhDon2@}m}WST>%e zzqluWAq1sbGlK6Zli8nBcOUq3`8$WIiH+(hew%S~&!5QVQ~u$|ND_|s-j+9@fmyOE zT6s#UOmE$rwXu}yjX_IO)_tKd6kb>1i%4CmLNV!Ve~(E|A_UR%x2B=ZR?J)X?FKzc zxn({A=}Lk%dDo)3g64!45u<+zof6GCBjI>*UC%tasNM*Iz01(gZCV5BRn>mu7sKRnLMhX{<6N_W)h<_OFpu7ZkH zFDxzFcqK`-_=o3Y7RoBi+B_&d_dvh#wV=yOqv-jOYIJJPW{6ny`d<}+!c6N4i6b%A zMLHZsik#``2vh_dGm@{~Y`1ixwIVQO8WVMhmyJ!Sqhxuq(}whnR{n}cd(=(+AsP5oxE>EaQE5 z>5(iw(m%}sJiDNFPj9y?RJw&GR!<?JyDshehwm`@9}-;`E+@+>E(2 zP-5_XGJ8=0pjJa(0{3lxzHG?-3+%l6wdDPu-yxD?jUbzVDyiS0D)~l>`;3_iLOC`< z8|4|gG^yTgN{eG+wdsd!@T(WjdzFf@xGdavx&7t2!^H^2q!5#fFuCJH?bRhc-+ZqZ zY@R3U7p6R;5%QJOw?{(<>fRI#K}Cq!zldPAa`YT<9nr(J@2;8SBC; zVn%VERz!d?3WDAaj+zF|U=|b)0WzX(EM2Zp$g4kcRE{h*>uQb+oEm_eJc#O990=;UQ4gL?cn zHyJdJs0q+v97iK)hNyGsJ7(JrTLru87=PhYAgox{^YB|**plf7GqsWlJmY{cKa3t4 zD429Ne?3DfG6KI)HQD*AA;ITNf93oGVOElCP2gce;I3%v`RswIo~cSb6T@%zdTDmN zDkTDi&;Xmcx7N(Pujkan1$PKBM^N?0R*ec^GWPCP`uy`(MC-((pIr+tp;7S!(rwbX zVA zZbLpy_oLJ^gwf+S?3QqdSde>WP|b%w$}DfylYC|!Y<_4%)iy;J?O8^Dy$nF;N{HOA z;Hu?%qQg=Ei`EZ)0aqnEp2o{-)%c-(J~K3{t)%I|o?o6`mgnE==%IcrgfU;oa{|A% zdHZPYPv5kr)Zmzn$__a;KtN4Az}WiRgK^NR*CC5DD`Sa~b6~ktY*_T)b$ai>Q^gT> zrF#thN4L+a#+nB#@Y24gP98nDpeG%=d~YDw(-GsRWJs1dqxdFiJqa8pw=`WBQWVqF zRxNIKxF&5EVn}54l51chK{84 zG#5p!xLMBPp3-tVN-6C8q0rSfdR_EFT63qI(5hasm-W6ne2qasDG%J~b_?aaP_re` z2EARE*W751arJ6>R>Z5)^wx7)^Pfrpuyq`_12bxGnltoN1WR{xX42l><=AD?RwstWaj1*vTW|74rt}F4=zMsGVKRSFmz$XX zB=`2SiXT8IWKhG|R+(RU=0U2tsfDSmah9~As>K56#R03iZ|lSrM@7y4Ro^KAHuvN& z6p{haE=a%A09q=ruy^NqObJQ9Aj$n%YN|zCb9l;JBm= z|5!ABm>cEmT+kaPoLa7@t;TE*_7x6wH7$tckTCuJoN+a@5j_848y8R`@?X)V>L?wF9N32HzqbNAC+s|ep1bZ#(kwQ#2{hdE zhzL+IcqZf#!Qz2AhN~sq4*v7w+$EA9!A-Gf>EYc(2$_=Er>kEQ=tq^y2o_{8XWBEj zQ0n19-p4N$6FLE+5dq4;9}`@g>)d81n}}?k6et|j9RKi#V!BC|*;Mhr5^PN??>D|j z)9mko_ZAOJd6B9u8IOcg(hF17_6$4&7);sWGuVKbci;F@@txF0qlMZ1U&|P@@(BmQ zY!%PASV(St!*6Zx5sY(~gqAB0~3PX zz^&1)=(ZXHw+fawWQeXTGZtKMp;3)F+=18OiGRUP;AB9p);oS+#EWynNI9DD1q(G2 zPpeu)8sb3aK$(R8GFJslDkpRzs9>X1BZQn>EJ~wU9l*ScefykkKfN&1Bo z(v#A9!);17^2C+w@+7l_yM(y!EIhXj?5_{_Y;IpK4xg4~V~##Ugi-(h&}EXxf$jkBI!S=%mXshn4*3^Cn@ugSBA1b3`4+0h@Y8w#uyvrGPx6D3faa{x}Yq$J? zo&5C5v%m4LqC5qD__+|!83mV7m=*$a1^(g?s5L!(ntK$Ir$6wCea;>aiYX%umOYJn zy^aD_(i9%EFzHZWnn`jot=|BG29kMNxax)x`OYSgqiqoE+9D#2{IxzRy4`C20|I_0 z^u}XFJg%wsW$CN($k00qTpb0DA2Q$5@Uakf$YigoU@HXS1eF4tS@>-Qdww5w;llyN zrwW+XNfOhG@;m-GTF=Fx?0#jT77*TUN9pBrfFaRqiSOFu8JTTs!!m1Euh)HZk7klc zOvaPsX{FoeG2^nfQ8%$pI6R(6G2#}x3Dqu#f?HJM0 z!+Z2KgKH^UGwD#>c)J>l0>kR@1aG2bhbhceejFqSe+uPH*4eTOZB)I(V2^A7AkuNe z9{7H6F6bY@K{+a+R@$${#nM79k`J{8`J+iCoTiEwjEu70OsTiHtq{2sOoZG&^s3g? zQ{F8^J=qF8O{QHXuGj6uL#Zc{lpUNbC4$+{QmWrX#rWVojt$w+&!EoF?!L#%nG~u& zduP(dkkIIz%G{VQ|HNt$iBmOZUuQ^sZW+(aF9EFZ4YWgt5oPzc|5hAbnQ?ykYDi9Y z0b}F?ZyjG>_zh$!zR+?G*B#;U2L$~$5;`V3tYFTQ5NzD_PsvZlT;8`}-Ivs>lg?W< z?TD0@wcXmJ>G3DVKYO0(`%9vtl#IxHp&kdmw~#uesoiw#B^(BLX5sRka^HB|ILyTK z!NCHbfNUr8k`2} zLD`{wHDZl1y*D@L1O8yteD~ETE|PFUO$YBi)GIpBNt{x($=~ironnuXV*zq{e7?-4`28Xh8m4OmfcJQc18${R)Hen$IL0S3X{APaQVBN8y`+yVtW1i z1Aey};z8k37=S|{Ma8XuKx9vMBy^gLNxF0QLbo;w!UTKD?d8 ze?n0vKI&Z03*d!2%dt$_Ef-p|qJZX2bOpwk@;^aZIs!R>NE*3?GQfwN7A6U~y^Y6% zfLm%!_UX{w6cCXbpadWLKTN%MJk|00|9=i4S)uHeY#mDW7TG%^n+v2#|#Q7rImfs{J;bS0jtHtFMwm*J;>8 zO!mx=!CiuhjOj{rPwp$*E>g$M$GR>i=D81C=pt8SbTT zy>OR+cjJ*5Jo5nfpI!oS92QWy&$&IX9c6fLk6ds=$azrQ`&HiiI8S@}MM?3AEYhKC zJR^6|vD$pswf3KBy_JsZV>B9u8!tg|8YlT0s_%j*uQv)a-D*6Jgq~|$t-bkl%)_g* zFWfs&nXS``e!TqB&8Jx4#M(LCkUotoOIy@U*;Z=||U-B)# zuR(Qc=MTnKtiKX-5{={J#&i6|Js_HM=cLc$ZpUVpn9{FxSChj2IQR!CTRFkQl=W|2 z4MBd{3u<#wS-Aae2F@>IKWwjway3mj3d@po8s7h9OF+VoOusp?m_ zoS`g6FV*yb?b)t`@guO(;opk)&c}6jXy~6I8{tmMZDg#v5*KQta!SBc=;H{+>(|0G zQJ|6lR@aCw#%KNL&i6H*`}9fG@WKfXA9Z}K=ybi2AATJ%eqZ29_%PqxA#l%+4^k5X zbCp{qC+DR1Zt%VL>4nLM6!0&Y<~iX?7Z_iOvDU3s@Q#$HHcIRXJS!4O5&HIhh1pq7dzU^J~uh8(|JRaR7&avnd zPdzBLG1%ot#2|?en1@Rm$}xdml%>I?54#kxKAfp07zS7pQ>R2qAcn-vwm=Q9Ge`FS z)*1Cj{Kui~eB;98R(FGN^uRdxk%Q;Fksx!>N9AfPtO2J}Q)S$imF zo^k=HpfO8bV?q_(0#+^P2#TtStNG1^{}V*_yE5IaV05@K&=PIG8he>!6eddVYObB@ z+*zzS8O9ETpJwl`MtA33KEH@l(-rK+O zC99qik1mW5SGj4H;qR5he$x`WaqVM)oPE9!J^=oT2QI1BWb*^M44SgWl(6=%5!E)A z^&dTcXt^nr{>)O1T#_xzv5-qI?}0R5r&yr!DEN;Pv^` z-S1EI`YNkby&H}@pF>jZVu@PGlWG!7LSlw*7SWcb0>R1r2#!hf7H6lvn#vEWn<=#24qbiHq+Opdh~K|(ldIoti&)#tfUi91|iz}0RzHjzh)racl-^LN%+12 z)gmCoVeGOM#CvpCEO^i0R`x5*2@~4II!4Y-dea0&75R!d8glx|74$v2lctrC$}q}E zRcECSq3B(G*o5Fyjv`T)J?3YJ566g};$_V=lar%sFsA?#u9-UX?0@u(yya^u6JZm@ zjs$7AO0K%mI3H_ha0RhaQGS}|Xb-@pU$>Eh!U-A|rC)h9M08-ub)Qqh)gIJETrtv& z)#DRu<3B-94J({`F@mJylrL^|cBG%ON)d#?MA>eXn)cSD8A(J>dazZMP`BP+J+77x4TUPMj^tlWiSVWW84#jQGH* zIkY`LIpO`gh?q&j`D%|*4A!vMc^R@xHSc{=Re!MPT>tkEqx*Jq`$pH+dzOpOUC>|z z$PBrU);z@$$p{@@tQlr^d3Il4|4qr0QRmk}V%VXz64?RUn12JQy(ARzOxyk|Bxs5R zVAC;jXsKsLu8uadh&GBK|2h~Yqgfgbv>#lJ$ug@ysp2DC&e%2~004}?^_Ni-%gy9N zgW0A-uVp8K)eHfc7$&C2gryAEH5fs)`g8jfr^Ur5bM64EzKYGTA^PdwV^XrNgRpDG z1C+BW37EiEC}1aJ*AR@(SwHg|QE>I(1DO&*TR)j*Ue1mR%=SO0quz2=rzzgwjIg9` zjln1=m85*+q zG&tk;DoFMyjB~^*4{RAlcIS2oZ~OSsHzk7iF~@QV70gsf$ZFNcH&3?YKW^>|Kh>E$ z@5h9&n8&l}xFG>p`6dAFq>#anB-KuhGu{OhGxbceg*ic%=(f94#qeimx|nC6m^O7r zM0tF9cQpE}Y<48s_l~{9+H|VV;1ZK>v*EMWSCjs`hMEg+8RU!99utM^K-K$xH)m_+ zqNXHv>B!@!%yy~HV*F?bnxh!Ps19CT9TzMg@8h{n^q*w4j`+`Z@q;_?L41$04;ie< zEW0gv$zMj@1ZM*ugat)z2dE{=l5_5KaE`*>;nguE{dkL0ltySLQhd%(_7y9BExiE* zZ&e&QGxz4oiG|2LqN9maz(YD>!owZ4Kp5`*U=|PLY~@%$(N1erxXB1=0fy31VQh#N45)gqb(#mGRJf`pRpEK&)_~I=*adDQ8XMGOS-`{0e2Q^}bbA zG>1<$D;3psYwr3#o*3&Fmy7TW)04AjtenR3>ZMfhK=@gLOX$ovi>~jglnFUClQlUS zF~TN9$GBii3WKpKldENoF|oU%tFVEfweQlat~I3o8j;pht=(GU=j0m1WBO+oDvb?> z;rmqwwBbrC6!YjY30B6_s>;pgxEPuiG~89;DlT>a`HW>hh`ZF9A4gJR9PtleA59H% z-1{B$3Lk{HUX|VvYqUTubIO;Jq7KU+i%asD`ID(!+&-T0SS=&YmE?Y0syR63HchyS zrKOed*F3jqVZl{`rhc{F(x=`)eni^<+WXtTmlB(MxT8a@VYz8Uaa~*p$@9d;^9^2i z3}wv_HrHRn<^3*6>-q_F$ZRy=Wob97x8#|A>ot)@T6^y0C-qOQ&!?IB__PKxx&D8H zDRObOSvN&P22tJR0wHc1n*!IMNQ#~;H+V5DyBG1*5MKnPvwWx5%Y4T z+V!i+5Y95ri{QTSE-wg@J%uHKD|zsCk*=Fm&1PETL}SG%d}n73J7K?uy%QuM4_sq> zwZb_=Pr=Iq*>_#H`d1<30;UA~N~@mVYGZldNovK@HBjAhL^>~G{Ho-q2oGlz^8!4? zZ}xv4hXP{?+9|i+cWMRhY}6|HxltHSCdvBn@;=z<=m=EyhG83Yit_?o`@6-8z9H77 z$Is<6N{P;-l0azW&QM)^ zD(q6*R_vN!w|>-2{4FC3U;i#lGgraLM|`a`s5hZcj39(9thFxQrkl$rq4i` zN|sRI$bih(CR2bJ(yHL+eUWpiCa!mdZ>)`vs%+XVYE`30&TxwCa6ap`jyi`}sMrL$ zdjy*Zel5|f%OzYjuz{urGJFuzK#^F-`? z5)zXB_DM@$SYm?2YyeqpP49_tWUvuY9i>gRmHMpUxl(bR3@g@JryN75hOtvHR&pq2 zHRgVpz{5>wpjrlbi{wc_1eer4n4MC#=PJ9WqA#ydL0_QD1fH8wD`V%$pDCO2nxXYU zi)wSGBmf1$hH6G-s=NNd4PgByJrM&H8^(#F5;{UeLp1zjaYasjk2q6`omS`6negYE zP~%kD#aK$wym2~zqB#tO!?aUY6m-Eqq+N*2wIp87ssAfMj0z- zON#O^`m1Dj82XVNOuJ>z{u9ZXt)`W`iE|iI*IogOji0vo#f8HqaxKuFaewmWlr~5` zx3fxK9$?xvF3$^Qr@$>{*AZP(d7I4fw}oLg+r2up;=bzmu}qUY>*8?TPg*&N36r*- z%l5QV@P_CdF-~jS(Mp$un=Po&;W-lGJ@D1!AlZXVhI5M46W!YzG_}P+4J7)+Un*f>rh~BgZ@WL zV+z<&dhxf7toxX9T5B`G@I6Od*R6-|AB`HW<@8;$NfhO=-yr?ICOh+QKBOU)tTdS5#g)6w=XzGo||;T;9BoV;&K0L+AQEcllh) z;k-{tnt6ZyL>?TI+d1`)%5D7&ogx=4IkM2&}H zrFP>}3?(SiDwmENk|;L!9VMSh!3!4W$)aBkyf8_jUohTE#X|(iWXTfy{sr3@#n~f& zewlyIR-|cd#$YKL=_684iaGAO?mL}fDmPqX$8{Pv zQ$E<91jN~zvuJC;o>t6%tH`@$R$@iX?X_ddT_@|~My2Y+4yQ6yV*kn7|IVYg1Hlzn zONA>uREq*}Q0fwuLDbXbi;BR)+F?kIvS|(cXi45z@#@Ei)Ee!~bJo?Fp&%vdmY4g- zF*Qoqxy&iP<_wSs<%7RE_rWgHw=t-FEgNK2PAR>%|2OpKpQ|&F&gwa&`FP78V&bws z=8&5KZ|;8U>lz_p=?Uuy3xdiySgny^w5cnd)fWAZud&&rxGsP8HNCp0le|S$DEfo0 z+NrZ`jNX*Knvrt~xaQ@wzAjVwGaiz{JUxXTaZf$+n6d&2hsvZ#<*HEQ$8~p28KFe< zAO^d;%4S;1yMFSzE0t&^9=#M@x-Wv)c*{5uY9GMdL_4>S<+5XGXiS%sePJ9@9(R4v z^K1##@1%Yi5DE&bXjnIpW)|1g$fNcJ$LkVeH6uK6T>XpksXwDRe|#u1G&m#M{Uf&& z_&NhWy9-KxtvKw7IjkMig7(kFH^z;xVDmh&oEZoUe9bX$m(nSicX?YeEPUJiY8#tG z1!=DvV$|y7^A5NrX+7EDN10iG77J>II!EEJ&LFJ^mr&G_#qZR`v(tZ?Soaoak$O3i z!2D0}ZrJf5uS}|v`E|s|b)DqzpIRH^v&#wn=6^p*-u~j>Z14V?OPxU7(P?^P<>!lI z&hOg;*pK8b0Ay_zq5NEFs)~L&_5&&+Xj*Xza0{(cJuF)!tpXG1>n#C zna=u}-TRMmDE#(^ayoSwf`*433$B(>=ovnWpA)BjyJ z#c;!t?62sH`CgTlXDYlnE(FUw*QR0~Es}0#J{{f?TT8cspQzhqs-mMmgs!u+rNU31 z969x3y7xyJay1)rX2mWujLorsJ&$>;L*9(08q)tPMuF>-PBCu2HZq@8Mf=LqrW|ph z)MD{eoc}2Ig}rw~3;VZJzwhpt-ukB$c_=@HF!7to#C@NH1tLw0=C_<*V_(cYnqx-l zNRXi)zHZlWPJe5b>!-E*)`_{f>5z(^$p0RTBTMxH?Hngn^P9h4CT=F<_Enp*f4*5@ zPfgm5J!y(<7=KQtd~*2AoUDcu@_p& z!r%U@enSTV|F7Awt0XbF`D*EfXX(xD*G~!oA1n=7OTf_qMDu)*=u>)BFyd;76bX|v zb&R8ZO-pIRuK3e99FzJn+r=s^gPBTy-=kJ$6YbWXL+%9~{(hDSF5q$eyI_w9D&u-4 zPOYI#f~7D^aLpo03m5{K{E3@u-FLKl`_*~)z@6K224|kFsR~gMBUSxU^TPF+vts4= zi}|<3!oP)rfk(H*9oZ-Hdt&41`e7Aio($p2dE6}16_IU0;FjXGpa*&eYC0OSkvKw% z>|f(a<#kQv6Q`WcMGc= z4&+f;`%)2(ui^Jg_EnYUtZJSZtI!Xav3aK^MtT=hRE>DK>!;UAiX;(6D3=xM@A^v= z<=3duUAF^1DYb&^GLzElA{#qd2lS31LhGAzktve^vboy-by|!nW-Ppsm^Aa&v;90y zc@}Io^Rm|k5vXvQsW*HIC!(o#KA5sX2$BJIq`4q)C!>E@5zI$9tdJuTaWN2R&%9KL zI#(GD#+~pu%sXY2{vytbs}whctXnTRKqoveJuUp0JZNk4_oIh^dq(nL#kzRlaR_mC z3rm1hpRjP?c5}+ZOZq8fDD@R;!Z-ksyBQQG;^U>dK!4FjBVG zd;K$^%ROr6Q!E15k-8pVNMD<^UbG$z-aPa1|4Ss3Okm;XkJAC)-pn1eR#@peiXtRi z+#I0)ZR`tPL`^f7q;YO&B#SI&t4g1qZK9~Zf#2n`M)siJa*`ae`OxDciqvvI&{u}Q zGk!!d+tl7AfCK0&L^TuUunS*_haEq( z%nFSi-?B6g{X-2Asda6l9cEZUXao|bw8EFi46Iq%$}}U4K197jEQU3?!H5%n94Nn% zxuzO#&6zC=f7q_g;O1c`g>Q)YX?qlka$B=_MI1OIGl}h{E2}Gvg-G2zVY0Ao}9wwal5^V8`Iih zzRUWC6%&l1pNhQsgj$r8@7KJYC#%~fVer-mz=P#PxqLB)i!|AzOiF!?4aYh>w_-Nx zC)Z@ndO>f{cNIVF?3D3_$hwZCHl;SZwiHw&no!Gr9~Im>XFf+`AiKO7RU?9tXr2l1 z(3E`6z`rHi`w>P(n%!df0t=_G!zNaI7ba}>R(7`So@zW-&MSVkOK?@}ydt+F5ooM9 zy0Uho*{$Haz@EkvCl184{)aQcn)`-r@=XyfxGb{gv z_1cv%mvGFd4wtdaGAw;6-BID==Efrt<0=m)$3lgtn2-kiVOCsQN)SZ%dcm`QE#Gn1 zf48Vw;?2|?b%LE%70(mwb$AAea!ZwQ2t=O(TOn{L++CphlFda{zi?eh*8teGs**z; zioXR-hfg&s6j$UM^!Mmed`URwlBIeo!2~y%r53!8s9)AGg4|QKf~BNB)E3)GS9|e@ za><0rZPgWKolS~ql$3S(5Ne#sJ~7XlP;DT!Y(Uu5q|(x9R>MZ@4~USIY-~mDK-w zr~Jh9+_17y-doDm&H-zi?k}J~N(_6M{Mnq9V~M`s zTelT3e4nY7aYUe5BD|!oX<(?ns5k^^^PU$7&?@GM>TnUA-iiUgKK0N9bUOybM}Vul zLm^0^!_=KQxX5^mpE?8eh#nAlYa0J{cZ(N(Wi0EwhK)JN3JgsDmC^Fp71HtYfUpDJ z{m`S#Pt2j_^?_dxS}lch`(<~gxl25%p9VyD7Dx|ToWJ3-yv^1r>(P0gE{A>IT3;Ik2AI`E161%Fbn}2{G;do_-!=tFU?1t zO{=}WSCSl06oZUv1TWlfynw6kf$K00!8iqHLD1F9n?_Cg)T2V2(U8l0xiEzq98aTn zR$N~9gyTQ9jKo=L%CrFh?aS5k4bb3EP;zk)a9{4UyWfYAL2_jL=ypEM(U&+=-+-gkqmq z<;1m0Fbo`ZGiJkH@uu9KH{nyTyMFpc%9d)NO%9JmuGKlcMxCb&V{zQ(zAjH^yeLalW*thM1kahfqPn#UCs>#Fy{_A|nKf7r0+va~a z+bKl?LMA25;xc{b;yi-iLagKEI_ScElLVgdZ!a6(BD%P z1vx!jiP~8=1G=F0IdF#gKiEVRed#}1~U8M^^S_*e?T(G%?NW)Zc?w+V@T3k!xUTeKC<_TpnYNah; zgB)&`PwhHajo@x(dKv>0cJb2X1CMg0#c@lsU9#Y4&-t%?qB4)SPBg9UO?xb2cg04S zC*R3Fk#hC27gC!N=VfvMtQkf{F-vt;bw=-Yk8+NZ*ZwHWz7@ylhPl04odfyJ*Y9cF zoAQvz70+($xl{=uvz7i*e!xKezN&$5GHErhhSvT?yA;qF?0@t9vNN#qHT#pew5+FIV-P#beHGk%i?Bwb9%nWonUKkwaHa0`)xEoth10}mnObITlp9l%v~9! z>eiz9aNO65uoc^BZJE(`?1{!PVW5J0GeL^1^b3-AsO*`yTE<11B?CA z8>3L+NUvDo`(Zp-a`a*B1rPeatJK+18t%L7aAQ^{=j19d;>s-Kx0h|sN5nbjD<>je zCsG8cHDK1KST~1swLrngan+$9RrA3u&c*MCD&3>+*lL_9H=DADaP%JJGNZr4_Yaz? z?YE)YA6hke3gz@;^k!$38>94w zc_mk<78O)$4?V`yH85f66S~x;;L&@y^M_)Pn>&8OHR6HZ!%Ed6(bpWCvgkHdZjux= z{p^Y^^$PkS&)kO;`&@=8DmG>bQ;n%*k=CxFO2<6z#d+cuL*G8O)x3aozaA>=(E7>ZwzDbEH6?no=&aj60DdHI#b)rPWCTq9|cw6C)9r%y%YD-m7n zj19qv!fVeKiv`7VwTobRp3)Wc?c;t=AN8xaoH4TWBmtkFz{2$C>iiu5zei5t5?<$2 z* zYR`=*)(kvH*PRZoz^*#sI}pbAYWweVrUqpafq_*Am?eLw)41aztR#;i?N389=gi$avE zkos}NX(qtBBYNxZQ~RI;sew=GDt*_$}r?tx3Y9m>q=mpN)SE z;+9_gOcr0yZ9~#AP1d5I?D&-?FG$86tSgId%xa}9nWqv}PoEhaZlV1i3$DfEYM7lN z;pUJf<-bdjL@j%%jly9Oxqo#R6;h=zcP1C>4JR6#+rH|d6IS47)~|i@|6myiSzAvL_|1Y zq(}OV6cWOkNc9=zbvKi!j>PMsjXEAQ0q@&h+@n#B(TV0SBopsXHFqT3O9fAvJUo zAGW`bo-A>-XeI54ib!6|agVb%p*gPZTf5i06(~R!jtbZSN|*lEPi=wJr`LBZaDvfg zh8(ca>!U=7g$Xc+F%-ZjEs!RYrAg|`&%CoYy6t@sqGu~)?EB~e3{7eLEbs`=PDTa? ztBYey1-(3l1Cd&bM$E>ipxD_m9E$zB%Jwa$`W*Q)s%GZ-th&v5tl2iYXq^&FvT94G zg6aofU5eqfKarA!yBv8g5y?twY=}nLt%v228b+Gwn;gf@CFQ!n^e8TAda>(Q0bn29 zNL*3|zOv!To8;}IhpN8LImt@L#ezlmsA*hHCUq;&DJpU=^EXl`u_g|y&SizhFR;`2 zq`0m-j%g?N5Cmr(FT{!aN5l%&b;=JM<1Ib(LLjgTzX&hk-8w-vxK>n!KHW9CsJvUA zjzGK^PV9;<+!cC?sOvUNJKJ#sPBDw_DR10Rm10SU0%-gBK@yO-0iKWoEzacMOb7>P z_min?E%ykx{%Ij*lHr!;)Eqnk!xXu#b5Vhmfz%JBf!Mcu(D^*OV$qs-zSL5#|Z^|f!rjhVy5`Js0? zpRL&t{s^ljA9D!RuLV1$pr?}ok~l4MGUQ){>k~H3k&ksEKz)?;zpv&7i5ed%b53TxAKK=q8xGC18OkF)Mu?v+rOGcg+9x?1Z)O?hKmZ&jekC-tj++z3CA&)1TWm4J`5KG5PgMc=8lzba(2J=I)teZp-p5 zdcB$I2?~XE{8%^C&10)Gm@85_gq~oK##eL1XbHF{*0*7CbkiuWP?*JY)h`?RI5ns+pZfA%abvS=7~Z?rdaqboZ7vo2M^sG{+UWqO5aMW%9!DNpcs_i}r_G)vwdUHu4!_93=0y)Qh8%7%4J7Qqh; zHY<+Vrbt^LDV8Sb5A+|Zs>Cp<)xJhlj(L<%xmOfbbmM2q9PqCJf&r!KsdQLbr?(Wl$u+2XlV z!%`D-vy~@12VSxn1j-GPY(M0CCZvTc=$_x~2%k-o?bkNO5UcdlaHkU#dE`30?+!-d za^g2WDIFevE`nM;YM6Mx0n~;_arSVIpvI1f0P~{6#v#^wXiZ{2)g;$P?yO+(s%Y{6 za(I4TYMz9azQ~B}=0iwbe$oW+kT*FT=z8C%<`*qb${s);40Mi)k0UN{p%#CFN#Apk zb)I@jUY&oXR>}SI+?UwL{~>Uw>1u>_8Is+8GUioZit;?d4W2mzojuXQsWQGWj%=)c zsG@1#9C6F{Wk%fWRT*rte6}xNx9a3ibe??Giats4)$n0Y@GIyC=RVy^m`FFP(mfuJ z;wPpon+dG?b<&2#KS_K$H}Kr~_1}Ls&dCFSQP8X!>GoMyTvq_x6wftUDT71n(-*2m zpw3T8by7rGWx=oT&2;q-)SC<%n40)61)og7V$+d(NX7nbzC3k)6Nv7giVz|DBEmr} z?FhcKC6iS8Fcy1omB)lQandZ1Ksyz4WL0*_vYx4XI%#Cfu*}LIgu0?yZM#PPP&Rj| zW}XdQmjy039@~D^X`Vq9Bb&UAgk@_06J0Eax4A|fdZjQGVppiQp0La^bVr6;GgO!# zrh1r{tec-L%<3nC$oW1XsIpOq>dkO>9m?7 z0a0wMcUH+HjJ|m=*seayPUXlnu-u(xpy`)9a~Zfpb_zoOa3sFX`Tc7aamH=1f|c3K z8YeCTizs1PsqE97he6?&a&nmG5JbO>NT(>7^sCZpL^S>gT4Wa|{Va521@Q{} zl3!I4Q?h^ZWQ?Oh8kVTnEBa&LZU~9>8l;(sydG!^WIeSddfVq^l>w_I^0|0Ea^D|$ ztM?0O*3V~|wfP4WhJ9%?XEw~~o_15aNCKVR7L><@PC^r_(s^zCNBmSE%86el+z0vi zU!^D;_~sW;Z>bu*>;i_Fs-jy$g|>So%-5)RLr<@4sHj4SwMhy)Ath$Aap!N^S$5ev0mr-s6R=^{aP-oM$S>i+# z_Mys#0*n7sK*MICGmBHwWMpsN~P&ncLYF3knh5@=;K0ZDEM6arsqCMHuZ>YObyabW^zwOlFxQtDToB*k>kA;^ay^rMG2I}?U{H{0hbE92l- zE@s}Pg6A-dU+2U#VauyUEYNFG)g#}w9PYW#oV5J-dLy+zH_ar+M-K2fvQxr|ke!Ef zDDm5hU7=P?y2xfVe}K_`;IGQ#d49OY8Eos?LVRm)wu0%sD=$ z`2JD~uK0vgW&I~S9wJsOrpv(d6fSQ2a8t$0Em&GYQ~XeXQfI&DfK)I|wJR`mg3ME2 zK3{L-L z*IaL*X8VoYd@}cBbwsqyYJf}aK^VgSNe3f=xA5-Fj@pGPXumfQ+L?S8iVYB{g`r4n z6X-`=Oq-sTyj0w`;UXWaeyuJzuxP&qAyou;R98$7`ZF#Ci+!Pkn|h)!t3z77{>j^!XW3+ zK59N z4vKpRHUD+IQ`<%FNisL1;*%jyRjS+YeUO>K+gi-A)mb{Vz8l|D>bI|h}SNi z#XNrjH*foCY*c4}n!14+&RgmJ5|~eD*H5fZRdzqu$hm)%#5H=3^%*PYE>z-O&!Cf)6}?ykK=HSB9jObpWJtl!rwpk zAUO~Dv0dkU^Tzt(&|GW$a!vuMClGJhUQ0|LIy=r&{hJY4Idb7snI`maUDE(JYSo0(XzKDnrCs^2XcgFs&z;`zO;J|PBX2!hZGqG}0 z#vN_SO_2VcMh*P>%5^(qLc4mZaidb%EsM8LC|#FfIQjVMNyO;}-DYwb*sNZuULQ|? zr-ImwUo8@+BEyNBWUI^*ec$E*ovX>~Y|hIRUkW?E1Pa`;NMhuV8ZN=|q=qOWk`4%I zii%a9I?paoaebF=h_k*pTZZA5A+?IHbAp~iq^AYm#8Yj)m=87+f_G?m6Nm6ET@rRK zsFV$~3CAF*x`h;k-g+ukJEhck>Kl;qB-A&3AjDG03a?KRZ*6<_Bn4)*1XT#B0**p6 z^BT-70Lpc~IctbJr79~$DTt#z+kVK-*m;)%QI?%X(suu%u6Dy+|0}&43j2d3J5KJD zoxd|XT4`4DHMo`%=cH;|U61UyA5FW*#a^h*-b(LC&+-1aF`Jk}SFNAsORy{vyw*Zt z_h%nXYKs2?`q4OTnFB_EI@-hSDE!ss^CEzTpO1EOAY{%yEgoHpYyz+w@Ns|as#v#3 z8x3>=R<32+?#KTh{(cGqf+s68M+n$*+-81SV8KiBKsb zhfT+yI?REb$n&(>o0Cn<`V;S|D!e>WQ!_sMiZfmpLF3XkZhUA&8)UgbGg1%es}=pN z7TOfiM&T3Hu?kVWgRm3#iQ*$zF6gzPT25@EAz%f0&lmXOFYhnZ4~vpRo}K~tn?glD zMt%<8 zQ=f{xM^GK1`1bQgQIrt3RTAtbhIFIPSN#Db_RSDZ5V$=&8Sk9#X~_wfqwN9%t_O+w znDg&R>i*|>)USz5Et!)?1<(Y1lM3jCEjF{Z+1eEAWx$Q{Y-3Il>d=2uU#%o)gnLc}~)h{j|!r$Qr z%;|ks@P4)B!&HVymS5VW&Ch9Ij-3yxVJ8&?SFi*sTEhJ`B?*$h3KK8sxC{T36obV& zjhz`(w`->2Sk72*o=^v>3S+xe3|x#06Zo0 zoe#RZ%$>uBDm&B5-{HLBe|fINu%J0vUA@jpzq|N^^WF;#+gV~;n_b<>2{E>6XUhP+ zNdN0^-41WsfJtcQSO2VhaI1K)Inw;AW&?_3PG17oB*=;F2|;f?@ip$M!z)gxzRA7o zaG)__F7;hNYm#{SqseG%=$sShX>e3bFk}OXwnxoEpOX741Tmjzki~xKnWk^SJ?*R$aSBsDnTz*i78Ad`^^l_6>Qwq^KF$Po za1MnyQ=EY78f_YRXA*{P1Z5A0o97hO7w60xykx@Fh3^!e@Ol6 zr#$cTPt8TxRnC3y7;RDqJ;fGdD}wT8kFNilC#QgCfF-o z~-~$_%2iIbzdjt4<$#oIXxT`2B`Q{S@m#gK_0GaWkz`Q47hHDDgIsVU9MaLx27K)FAJOzccj5s)a9yYEepl2_xf zO`+XSpA;G6MWS3JKP^_au6f5rekES;oMhLX)rFwgx7K1oN#FWrLUO85eu5w93s5*~ zjyX-=bS?~9e6%C}w4jH4XF-NTD(rj^NV6oJ#DSm|@g}(eM!#g3ZTq^o2ADCj)vVU zXw>w@$_WzJ|xc`rSi=?l94{t9)I|WLIFnpyez}?T6I0F& zolKQ6q0v3jceHeNrEqq!F4t38Ll$TQ|iYm>qQ zt7C%i@1{Ov35AvS{K*1o7n?sPsRc!YTRQ+EgSOhnL!Nn25GkgDAE*BO%-#Z_SPw=94S1 zd*^-iZzcm&hK!$ZUt*+!e{#y1JAY2=a(=}&%A#MN=CsuDxtb%q>Hc}*Ly30_)(cvJ z0+tzVic3ZN=*A1h1^nl^|K{CW=^Kexadkpj19S8-Bsd*?(ml&xzc&aI3KO5)ubp1d zo&(96u2wb?)P78@sOlBGImGog()4@lWMtcd1S8sFKO%sJid9Gtgcijn=2*2iu*BAW z&s$m1sIBNB)&HaFJ)`0L->6?DNYsc#qD7*2iRe9g38F`rAnF)xFuF8JL}x@7-RNzG zQA0wM=w_H<5ZxI3)ad8V|2*ee>%6hNu)Msl?{)3HKU-g`4ql|1Ccg30s=oDsL48I2 zGwKyPs8xOGBU9?#LrF8;{C2|v;O$W##1ld6xY)je)m+R(rqo<+M5fi8_sy?eVIo{ve=BW}kZpwhu-axGAlquPC!_Pk}CEK;xG-<;#{fba>mO`w4Jf*UBetHr- zHH!KJg-{dYbntkO1$v^?H5#TqpD#~)XJhY`U~KAF$p(Rj+UK9icqw13z|!@sK<~ZP zJHKiCfo~4-Oj?M&PwTQer4p4SL3VULW2MwLxaQ>hU}URMvS{!bXQ5$aVNrGQ)!4uX zzZ(#zkxj3Xp1P{VKI>#19VGnc^c z_LIVNN=kJdz-~rN84hnB??3`HsE}evnUPN2EX47Je6LR4v(6UP*~kAshx^115fBQ1 z58ci`nSkj3e`JDl#Z&m$|FO3JABiA*FK8Jsw(~Qz?ZW8i#~(5_7a3gEDehs70;~`J z7(q@saxPmGPq8r!3tI9*hnea6cHm-3S~I;*=+;|RY*TUXtm zC-P@#o|u>|o&Q?6b4RhMjbwXe09cUY+rEj{KgSRv02S1C+!^qL%mG5ecOq&<#_%I5 zhZfvd=p8gfg6EP669sVLnrvbm|Hz)fKYX91C(A>Dzg6AR2yP9d4vw8*q$*&#qn7%S z94vPPY+0{3vg4S6tThcuEnuq$PaMupq*!iBnfQJQ31jEK_}xNUtt3VRZcthf?OW0K zE5@GCkwbm?yT62XGb*m6DL?x3d*Z2fd!aJfY*{Qj`EIvX ze#UhfJMV%8GY#IoC-jG$`7a5wj0-YVKIlS`f@zWKPHc{1hb)Z5*U{96sh}w5gF^k~ zzejfdJh}sO6~j#;jq0SFqg+g9G3d#Fqv)OD+!~D;GPGv&H1!t zNk7%SUY(875yBY)*ySo)JTGm%kN;fCn9R2ncehS!s>U8DX(jFI1tgR%8 zpD#YnU2FRpSfEd})tDNm|E0Z~0c1F^#AfhLG?3Iz(~;b<$C3PT{O_o^H*->V+Fb0m zKBS!sl&p{>Wb}4)p&diFl3YAtg8=JAX4NY>=aksi>XYD{y4;_8PNpmTD_x1ACD|gC zw{p`0RqB0MZ7Ec?Ks=f z;65V2`BA_1=LpZ%;QboX&N`yI@Dk45#ufLpm80i}|NnhT?j4SeNfj?Dk}g=ttm;Ed zbKl|id1sTvSBy=#T)%$AC1Ys?X^YCoA#;*~)Q|EG2CPg9glI{;{foIWO9%Y|vWYbR zoEtGkDZihTJLx{u7qS|ExCVSHHMKOb$?`3=sAm|#lmbB2)D5*2{B}ewSdAu4O@s8d@`>6rR?uw`u(i@0tJmYrUqTCOa zEKWCg{hDpzZ1ARMUDc+6%}Ri+qbbA-pxIQUJNj#=i5^tgh>ulkmG8L2PVvkf2tB9B zEJ^x+GI@go5bi}n0LPY0d5VqpDL|4?4mc~W1FHhI$Kst|_8UrVmOzTy)I0nS#Z)XG zWbb_+N%Q|q_k76kZ7GgOJMYjvx*WdKqY6LFgu}$*|CA0u-%vURF+oFj8UQtq>%3WCnGC8A$1u+zJS&P;h>1!q3OqGlr9zs7=Wuk@ z?J72fMnmt3(?)f|3_W>dkSiEg+0D~GM)cQ1=m-8s-(T}=%JpS>(Mrksr3r*BUexZh zj=6nK@yg2AwaR=h?E$ruKXd_rMGSD8006F180O*t*xGq$RQkTb$-T$!FTVkGA;TK| zo0iLO6?*%2kX}{J=1V^|kl3HyZ8~rw0Vl=zHH{{l^$tUqA z-{8*vB766fe2&7|6Nw-gQ=O(2^Md^D5pZI3+9v}@$OR$`Alila9-H>g$36hI61=}Q|`0VpYkZz0Ta`bIezDEh_QuN>!Ex@yZBw^F8q-eH>U@6f=q%U*UX;I~(@v2)#zzw85LI=<}W z9VC6JJ<|VB7*=_{>=Q*{*CLGP?~*TB$hz~&@fqEdc>fQHb8IhthyO6j{j@<7X!vl8 zzNTS!_pW#%{130z@2QG7A*YFtWj1K=$6`~;R}TtC?j>WhVI&N+&H>$$z|vdAJJ;0T%{m>=tO>s3KuAAdxeZ2%%_m}QYOtVMXZqaQ~e?X&a zcLP^Gq}9JB2r)rhl@xRXol6I*+q`Bn(u7<6%%O7i!Yb-%Vshp!$quGM6yKwq(_s36 z(2P`>DV^E|-A$^{BG8pRbU*z{7ytKXWFjW=Qf3c3a+%Y%HxVf;e)ab%_3r$oCzP0T zWn&*1b0U9!awY0;GSQg^K40w|M9yFI{2)}0R6%7n4-v-o&z|tW^N!w2M;(4_Ub~=H zEe?NCHONx03`ziTvmhO%e6bf3H;BwjjRvWMM|_#q^C^uSjq08ON(&Vn$T1{4L*LJ% zC?{OJsLf)O!|5E5@@g5G`DepZ7Q!~W=B|ZRWT8i3S<*wWVgh^BbisTBoY&Kp1vIT> zB)v6uY=@=G#r-=0V6-(cW>VvvuDPUYEiNQ8TlZ3br|KBxY8Zp7zpnp4Jrlg)S|(9k zE3Ym=eXR5PW#+QEvz~H!iusfQMY2N%_xosD!PuLR0i)}bE-v+`y1qk04Mc*yH8BDLxz^ohhDY5fzgV1rj8v(xy})00l&~P{l5_mhwjc2+>@< zq;obtypR%q#4*E9ECkT22%`}C`-ymUDhU4N6eBED_70SAqH%UMRvfYL~W zo$^_6&A;sC2OzsC6L3EXIS&i%_{#y^E#9ffjsSCpoM`*a`>Uj$=HRZldW?z*>+qwWq*ysSpEY(5d}Z0eAHO^}z9FY+#R zSJF?1e~_$dD7SVE^04#c0uOQvqC_+aQY3*{=nK($;n0Rp9djuuJgw%Te#rjeArK}0 z^_`M`Wm5Al1HXRhCl8(T2+|PRb_2`HrX==|Iw)_4d%!bSqA9!5xnF!<5LzZ_-lU(` z6JV!eikz>~OL;ROA_yNCJ3L^im~<5>8c{9M85BmJT9zEvzEWdd2Z$6%OD^$`3jWYJ zQwK{M+4k8z>po2ALmHK(g+SKe*e4)>QkHoe0(?iSv#*1V0XRpGr6hM$>&w@>2qDiD zGnWM6Cs3|hi0Aw29g8$X#uSj`iY}p9of5NeMwEa#Ik?NhWXxF zD&ot$d9Mj3&~3&q4+Dt?=%rFvYrG?+6JT?d6omOc=guBU)tr22=#o8~l~Vm=N!1zg zjXitBzAsX9kL+I~_u-!SdW{AUQJzg`N{pKNZOtE|En-Btlk zy$xCtoL6H~eRA{qukHj|jZKLTmou*s&x^WrjQ`n-iNB0v+_y3`+m?ygSK<3^Ga(vfFLRnt z(YtrP_k|l9dt(=pLhb~;8q*fVjaScb=0t6_5vI|~$AOtd5%v;A8)^4ctC+lefr&;I ztaJ;`MtGo(v9mF#%NeVS6&xs>E41S#r&?(qnfTv#`TAU=H!SIW`JnWWv~`P1{MepB zL!1Tgh?F&)z?EM$6*pLu_FlO9iF%_BNW8?7R}NP>3wPO&Mfqkl7;?28%1i%K=}{uk z@TE2e6kkn&-rj&Pt?X}6Vc^{rMsDRl=*L@{+9CIZr$Y93k&zgEvA(aYIy{r4Eki!X zWdRhS`9a9E{__i&36j~*A!cr7_LgN@L7!6Jks>v%`7R=v;p>)WYwrgGA~ImQk%i_a zQ!mQZO$5jn^@{W1I_tuiBExFY)YA?L;9Q&1`&|N%@%3EPzmcL2LT#)ZyiWV8+$G3PSDx;#tq=pz5+JLhup4){~U>GxhF>s0~7P-eS4D_Af$1U z7PRt7CXyRyX9e!G6`iRu_7U3mga70Ao8MQNghcW%beDOrl)v+EJ2E35YnUIBhW=#o?P}={D_6&U6a7l&WWQ9^dw5v;8lV&HF{v3p zK-c&?CTO4-lA@ zOd1gV@duz}SbD*T`sYt2O&clt>VhUFOR1*MGm1urnfnE%g;-8>QF!ToQ5O}jl!6fl z_;UKrIJC96R>I)(p{%~=L2yNVk!)h&gq(>EM%igm?Cfc(>L%&8=K4{xkJ<;$i#|(cGOMxtMg7nvk6p?mXlpQ%3~HVD_dKj)g{_%-c@~eM)Lm07_@TG^v)z9Mtlbrh**5!V@TXw%J zYzB6=2AS!OBllOh2EdQB*j187ulW z4#1-;mXbI}{CbIPb2WRme?9{#+ZkGGsoi-Pf2ftS3Z2PD83*1arViD6^`pU71zyL? zcl1MEe!BhMqe#SBJQ_w{PQ0JEhCjU;5LUV9Jdod%g7n~mF12zm@K+BV&WBZ=^xTd3 zYq@vMaM@&aRm^#H6_67t?r<>`8Aoo4rQZ5M|FslD{mm`jtMO;_H^z4GlgMcd4zfmV>*Pt3j5FFf#_IG!=FURNr_y&55($M% zwOs;+4fVQw^sW9Hztb}jIBC7Sas7Ac2V!SqkP2$R3sEVSh{8)u?0_0ef2h6!{O;`< zNa5tqs8@4F(WF7_M&G>kPgi`XR?Kxlu3ZAt%!%+19uvnP-7@Qh*4{F;5xLp>V|xW~ z`MGLCokH6J&YQ(rq~+d~Nvfu*9+~iB7aox+rY7$`j`assRK0XLU+sCGnLYW{}`dS@7NlRq-*Dp$McHz%$dwj6i>{JOOFFD zd%z?w|A6QO;5eg{!P-S@3tz?lQG`Q_{dbfB{>ux9#s@==wCeVlqR`IxJlTgm{6+)6 z%1!ZUm)u+_(z1UJtn`0W5*rXGxrvPi1ouSL#6j4_O%W{b3~%VOcfndOGb65-=xZ^m zusXYQ^qaZ3K{HI4ji+9J^%G*1C@K*(B?QCKtvM$4`pY1Ab$Y>ZL=1h<`l&)uy>HBN zD!;C`X8qRij0eefd}9@GCdzFi)(dN=r*BKTI5UIN589mjMRbzCoL5<|nV11mvk7k& z)V)O)?raCnQl@Hc>>#2qh{hYfYsBO)WI6P&^*)g{&m`Mq7B4|ftW(5S7S+nfLmbR4 z;e9qjX=8r6TMU2q4ubG|*8n=Wa})uR5N_AeadxI6d%7Rn&$h?6Ignp-{5T@n`Manw z(%T0R`k1?cuXc1GeH%wiXp}NJ*iwEM!R5bn&EO3Z^dgUF1jFJJ|3R zWMDfIOpy_OmChS5IuvAd<20gxw|q75l$Snbj#<QnZsk-NW{)4 z?laBQhtgQT&dy|BFaahDYn0~#k!(#ql*Bfu#gY!+JDjqP1DvXhjX)yTmHp4=?%Ov= z=9`N}*G?A`uMPiMcV>+#p=g#>|77ww(XDVv_2++^=G**sveCZu{&Qau@%Ggm!!G%^ z+*4XEZ9T{N$gjOX=;SeO(j0!0mk1r^WXY#l@BT#l%SDMW^x7>4_ph||q*7nV72Px( z%9TCa_bCOdL?mo(I_9KQfAwXf^NiU(%#QFvX1HOu6Pcb4Hc)I08Q2S#6Vi1p54Bim zy-2Pt)m0o+j)+sGYoD0;oP2|^I93g5Zujh zeG<}j3zzv(2E=xfMDbCrMUg4WsUXCP;g^JKhX=lNxi_m?>M$hs{)kC9vyP_sw@0`a z)4v<)eCo*ko?Y8HvRXay!OC6rr7%?Jbe_!~UloTf;vxm}&aiod=^bYy%NgJ+)0|5h z=yp})V|p;B&jRs%-+XEx{%;&@-eo0w+r>-r*U_<2z3NC6vCt8f2QfQg&%_ju?#S&g zRPa$BPrK%!T@w21LUSkgI(U&0+ZBEz{`32a_er=xHT@C!BQy_!77L7i_LWaeLN*^k za)MMYreAfEysUd%t4@?xq|x~CD*fim*o(JxZwN;QK<%QIm*D?sCTn3dB zw(`7L?#ayDImjXXaqTl#!MvPde4bN44=xUe=wD3*_Tp8GG(B&Z;-Zyw!f~kTUImxQ zE$`&dr_%2C*pt>GcWa(`EX%fC{ESQm4naEx9?RkYFS|4GZp1El`2=~HrdV;jU5t!I zUOgpVi+JG|B{CwPpR$&Qh;ot~%?L_IaDValY8%{Q;3YH}EV4sCh<89YtrqZg9#^jI*yg3a7uCE3#AfgJA%ToE9b>Aj&axiyf!cl}Y?WPcZqjDvYI zP!)g6&YtV!&QFu)b{=Nze$k7WzK_`5_y%DAaf#MEhiApob%E{)q_yp_3(_xd{I^2z z;}4g(iR7~8GN&uD6H5WaQF5Oijwmd(U5$x3umR=QX`m)ITngC@u zZ;hZ~EpYdNlmWN+h#z>N7mJ#nr?@5kY2g!4MpykWn{te~7rD=#uEVQWYyEj7R# zD|YeVS^AvZhPCBK)bG@KHw3=It6vCPg)7<&*TcvowFkOe-*l#r6)_;ia8KGzbW&d zhHX4Cza^0TJQlrg!3E|&qEc*c>mp8#&O-+&0@}ChYJ?|(BCk4M14L?3qiN3-Iw19~ z?w}3CM)lLTJ|GFO`FjZ{3No@auSp`%?e#Vc$dcO8;_Dq`!VFUR+aRR23spAW|5}{U z^1W66;!1@9ZIe4CE$h~G z9{?DM8YNhQ(w(lA4y&la|6WAJrie5C3%Pr?1z&m<^3uG{I%B13w$2qzPo2^Doj(X< zoNWOgUNBh~MK7r@P;%dU@7HTqS24_w3PXMm8xd9jx{BE=e^1lA}zD+0af_TvC%0=z_s)2zc^FJOc!^N)E+{YucHF3icR=su8 zz`83($&O}^3H=2;1y=~;&J%Z@c%KzF_1qv(q&S0rM8glwg@^XA+0KIV?Ye%+7@f@z zE6FLLZ*Q-NB?BXgR+Xf8byEU&Rb`Mhq_lkbp#hO0U;`tCY8TK?f&lLyRe|Aw=!p23 zv*Ow_Q!vRL%7V&Hw8qyli&5zZ=)z%A)ojii%Af~~yQ#-6ShPz?=o=;ZAs~x_57)RS z@%ynUp9=T$(obmKkn9UGxLYi#@#@Uz#d8^}Nc{nJrtiKzx56Vu&KpI#t;){q%SNal zd{ovIr6pURE|cpLA0*M%*zudKbb_6!h=#cx{z3K#!&xE8?m!zwlc? zXhX8Z2RF_fl9-Mag|&B1+t`~Ajph6>DSl^bPP<1ZJ4W)%rwSCwSogJ3N`8=%ibVL@ z+!bhxaqAJ*BSQ5>IY=guYNByzT7Q~p`f=M%MncZh@ILykBS)5{X$fXLYnI-i4O2s2 zuyk#V7uGT2&*M=Og51cT0lEt3L%y`(LOg#rj*U6YLvc^qrIm+>e`vKLmuzFscQQpP zNRQEVQEye;&xsTgKi_qzxQrtOTCXmb=QB^f;7(Mr;^D`63XT^xkq`5(dR3B3J5Lg5 ze>Lqxm4CMy;JCRgp?&{d{+a7h_~f)QquIzy>z<(V-^gLzE=>A&2e*4@@S5mYQ2zT) zi&@TrMGmdd9>w0J36uj36cnm)))kWKj-$u-Ol$W)&blr@zrG^RjnHoV)M(lmyB+es zX=Euhek&`&*@+RsClvS|kw$`vYsmS9(ad{%6ZXrtt17A5^;?y$Yb7=r@^xqRUH`6H)*j8w7~=y%S*YX_cf*!E9%jx(scFqJe!TM{yyqrhJ9M zRh+NJui7kuV<^J}*lxH?SU>CKx7h3TG{I{}F`l)eudcNZBMPgMnHlj zeX{=~tr#v*UP)dH(`|tlbUYgr#{io3^E8KC{sR|loN?vKsA~=RM}5+t5c*~p&XYS7 zCeOdE5R}ObRsaY0%LS18M`eg`04LBhs|H)2&V(fn)4P8vZ(Bcts@ZOLjf@5a@Cwn3~DZ(9KTCRSNaNlA}EV%@*SoJbM z05<}FFsYsF`7>V(jwofbR|eUs5Ox0OC{)GLIhL?bgab(8JC zR-QeB6{U*SyC@hp<9MX>G5uJ+(E1eKimw6vI9@4GgYiq3dbGjm_c@V+@GOTqgX1Rk zKo_3!WQg^#9bK0}lB80?o6kxp1C)?D!4aW+w`JVSOq9s`6p$?@Tq{R`>m|$BT6LW* z;Vy|xospxsPiWIJ1=y9Z=4^|wcQ`kHHNx_XW_{Q!au>$G_0K5&>9qOj{N7NUNp9WK z0kh%_HohnuN&3a!mpMd&G?1z5*TPxq!3F@o-gjM|wVx#3fOo>lEOs{iJ~IE?gX{>OGRCIwHCNi z)T~DC1P@9TGT2uCezquDd&iaMA~WRB>9hJ+33DR}V{MF&J=yBbLDE`T4PV=Ox?zg~ z{b!Azsf(aLil$FC_H-cmBlpWPp* zZ2V5uhsLx;OS<5rWTUMq`KU!$Zx=uN(8o|Wj^Ww6gw)rZTd|?T?ThzK`JWY~h%G7C zaiW`Q=X{G4hJCi#Am3#VAffE&%8{@rHAt{16)1Az+5r=Exe%?UCCI)Twpl=l4NRpm{k+N2hZacRryCu5DPCu1l_ZXc@z z_uM(Lob)=EG_z8$^pZ&Fl}$d_=}?F~oUn(;DzoA8Iqrjzf_00%V3w8AW60Ua&4-8Y z&xRw)ETgCkBBF1f^N{SySpT7QXLynB{}OxTpf4#(=b7249Zk851scE0F&Wx?4tYo^J8J2nobUYI<=MiTUll4BL4LbO+Adq?;SvF- z^cxC+hA8@+#9RP5eD#B3Lpi|u)F=m5M}r((Y`s4o-Y&KA!tE|d&tA0*lvj?7WsbBa zq;@bJDjAh9c2!UyCSCEw=?Bv=kv0Cut9A6on;(6*7|)hi14&gHswUTf3ZmcsWg{8U zb*L}$26nG!utiO)Eo2h=L)Auj$6N!%;>_|~cY}=UFlWXw_01qc_3as0hiSc#A8!rH z_OseU!5T1nXWRSaPta9H+iqcGA!g@Fyry%1$KZD3`#Soe3mHBsi9}c#PCSetzOn&6 zcYG^tNW|YG(@3B z<`r9`kb8WRL0a3(gov67kuE95_Ve3R`Q~+^`CsdS24Dvgu^A)U<~c=e3#OUYrI5AY zgJ!RRRkrlLafOPu;r{fRV}tuq-tsLkb1;4mmVDyZL*@2_&h%C~j_pw;WhEA$J=f=( z?9KV7=!^wx==5uO3*c!!+Er#UlyuFa31<459Pn{SMKK(|k%ee3F)J138MPJrcI3yu zX>NW?=+Q2sgd*Qs0J;Lz(inkFjmK0~Gl{_dIDUfJ@x6~W5d=E7bR@xPx|+5{`|wQ& z>f5umw9QLBz?>?y7+Bx|I4v7qaM^9us8Uz#6_v>wsd0oTRuy~vP1iNPlk{mTCc;OU zXWF`a#oP^=X2MvWioz#O9)IA)a-jF=%RGuCsE4Y|H3Ra5+WCIg5pH{dCd0{{vLJJm zf;2LEE_MxY&5>`KNO#L7-P#sSjC-1!Wrf+4RM{p3N2!F@a%Xpw_(!=fduK!78J~GD zHq7U~1y1T!cFjU zWSFp$xs~WP@@sP`&D`1;PR`!5OE$094_qr67#;%rS%E>r-W--LTS-F&w1t&_0{VsY zQqBhgs)9CvuR&`oPmN#t?WwKt)2~7Y>Na`@pm6xMe<|9=vj_-srtVAPpLS zPzC4FHPl393(Ouk&!nV?Y_u3|E@$8RU;}A3kFntq4T^QX!^a}qChSzP)z2k=*D*_| zg;&A6+~dq-z(_la^n^VAYO_h!OoIKf;!P?$=a;{I+C2NOWX~5$ku$stk-z=KV3em^{$w3;7h!z&4bM-;oLzf zKl*WG<@t~?e@b4|Dgl%cn9wjJ>xh(1dO}O=U{t;4rY5h(UXK2r6TH>&!&bQOAyHM1 z{W~owg{}UQvvj=c+I@cxUvDPel@0{SqwF!So{NQCuBCH}Bx~4N^aRVj-iyXvfTyD* zmFUpdk`BPoLcH`33fp%yC{3#|En&6+&5tRq2*`d$z~fWj!{;ZhdxVxJNq4E#)~IR_ zvFi0mF~j{aM({)0-&)hFcZn>~`Xg%|_lRPpEsDXgC~U1X7OiGq;9dyD6jN zg!JvLL`RF{)FSUkQGsWf#Z0HDVqgM_PpA%|W;sl95LV-+7Qi}piV`(^xEB~3-LA2O zjQ~TB3~p!R{Z(m*pUWMr=gT6`y&MaVNghl}IWpI)bdDaGM3U&9?`oV4jwm)>2%dWT z75G@*%U1wja%R=bS(s`!wZB%`nuw~u7gev0w&{5JZOB0$*JZ>02{T`IXgANqE<pJ-nrx&0jJl3TiJup`jYL<%H|2A7pv9j z10M{_2{Xc=!cv#r<($3ZoeO{Hf5gsYOvKR+Z5u~I?S(${vMN&4DExwRV6Ee{TJgV? z`CkB zl*|EdwCz4nhq%5r(3Ec{v9hl0UK3T{<%PX@)ECldxoW=&De4T)jjX;f-{UFN4Fymo#sAsM&J;B2~Mw%)4>yG^zU zMpOOuKyu?Igm3`0VeXd^%p~olFh2o6mz90Lr8RD(d&s${QLjebFO|ciJp^eKHc~t@ zJ$a`8Xv|aEsG$<9%{9n0<`J5_&*qWD!w|Xx6#d1dG_dnYVDml9q;x%dqP82R1ZL4< z-&ZZ%*FDoeTm}O4r!-Zkx5J*J1a#3p8_=4mV=G#tIp|%Lj!v?0XYroe(8}>n)(MT3 zWC&bGag0yT3yP}GjVq3FgMcJkN02ItfmT=DC=c%N^PntXn z1uY@-eg~H~p%p!=UhS9+YkrAhxSXjPM~2DmXXl;rhqUF=LW_WQtr2$#XFh0+V8TV9+ zTFt;U?=e3a-SJ_AdMTF%>W^8K`-uMPN+Pi9wQfB#N=|L8lAq-&XR&d%TzxHAsfTu@ zOlJqtgIGffw?ZfUgx-evV-! zLt9f+fJB>}PzBJ?A^@=Ks>mOyI63m>-{J=d1@vYVKFQX>LQz1CCrP^GJLZMt%<21V z^v|gl#2y*jGA{r;DHA_hqKy zx-cZ0_?XPIca0>r;pX#b({ZcqXXHL!&Z6-;OzzBYgJl(T3jy?0yg_y{Wk-n|q2<`M zk2Fjp3{bfuWyO4p$czN~=%BvuZvFSiP-a8_&sdFYr0;d|`j7aB-DxMx*1mDR$_@1K z?(BWCuolZN4fLva)}BmM_8iSpZ7ak(JKj5v4HvWDJYX4U@7oxX-tr78F?DTrm2J;p zXe+cgj@i2S@$&bjtT&Y`dBECw$ia*PhL$MjN6XpdX2MkbR}DG*6>Qpf9b6@zR&L=R2t!Gw%pMPJyrhmHS%z1s112EZXFE3v>q&6^g zh^=v6e9oS7QN@2ZMe6U=Wfku)_--hNsmUMDSI!^u7w`OaXHkeOWp6oSY`DrivMBd( zPt*aIO2&QpMUBPsP_c7u@`D74Pe`VmWnQ%YI(Uk}Ppu{Kmg0}nFVUv^a2 zjL43NJiw|wOEonvng1hY!VE(1Yy!mH_L(l+H`AcL1)@WivZq7j8rYT*aix)axvByy z?Koms=?Ap5G+>(jBjcX5khU}m{_3{gqGgh*7(qm%&dnG@FQJ$Rp&<9z>G(rvo^KUM zqg~LyqT!1`2>OXi@_LKOhxfH4UfAdpnoC)WjwgBR)&q|)uad+tp8bc7qhFU^(j$J@J$922-RlB}J`)|ZMV^;!o%KvjhuL$Hy$WgjS7e`IbU?TNim(zZvn8p9y z_?rOQPv1oL+ya^E#$`+L=L*dL1s1`rUKd{6Y*n7$h{kiS?u|>gcrfXw@_4H8FN5!=-;Mo301KW5&i( zOYuT%K*^3;XXAH-M>&B`C)}Y+<2PAMtY<)uTitDnbp@IEgHSf&L(M1UnKQX%cs28+ z`%K|P<_xDl)7>0tCO9jXDE}hieE8UY1>-$gybsX)& z<-TXUCcZn?q}X7XGFQn;To%VOo*^#*3$)pl!G=qRE<)yekXE_{o4)> zj#4bIE*-&z38GyKfa2Cexf@6e9gt008(=8RRkQCpY9H0eCqPuf?UcfIjw4mbp`>&A zNq0wc%Ej)UhdiCjSO;d?wGKClg+l;>KJOdcYOgnrR`B^vHwP1aRPLJ;hms-zzkQDs z{?fp*n9mo&RBEk@MK$Z0@9?&1{$pHpLEZv3yoUdEOIP15%F(MdIslo_Cf*AFUvDCx z?=!zS_FqJejD<2=za?98AX*5FKmKkT7`eGYClWPB?=S8xVZHeQY2CrLP#>93N^&z2Q-0oxm33dc(_;tPIP z_#Vj%re<`!IH+RlBEvmvWO?vtMz=L~iE*J{ms>!@<5-qGe+py%fs z)??3+ePHE{X;|9oQ|i#~o4Jc4G5q*>@t)6XvaM-;dV>;D3E3Aw2Yrs#r?o@fTbLNn zo~HRS3|XoC@f)b@CsNnh*0hSg!Y?-mMMc&!>+c&nvyWp&{7qc^#G_wSzBQGTn$u+& zJTx-&9q;`!)Hh?0G08+Idi}ACy!XGFGe-`R9J|+C;KS*!BacluEvhqkJvTT#Q@BHO zx9+x#T=WQ#183FAUJW$a6DkjxIBl#JN!4(e!nLsYDR7+jtOU;{tjxBA<<<(;bV*}_ z%r~@$jaH+Hu~pSh!|LNDm;krH_KhO&W1O*yP*a$yH;}Tl%3HTt#ktvTvUI(Z?>(C2{Gf=Nb*0f5 zYVhjnhwvRfI!<3&SmTe#{dPfiIe{njaMwO@{}7?D;h!s=bxf`@ReOK;UA^F2=sA1T zbj%$8*(3LO2>VB;JWecID8tEOOwe^l&&yZ*13oR)`X}pr;nJ^1E}Y2UB6k8$Yizqh z^i{ZH(;b9msxF%}ugVptKOVpor@2h-dOJ2(VP zVUFdmMwS84X#XWm!mp&(++@?^cE{5?3jB7v50bruU@Ujobr-0|ihMmToX~^A6&+7o zk%JW&vJ>OmU5g>h%>kV9yzjrM^;ZoieO`T4?oFeUUu8J3+2bp#)9OZ0Tz~~;Nv8)r zT$*-h+bLhNaVk%N?wIb7wu;!4?}VWGeR9*;exKd9xq*AT7UN2F_PKsKS90(R06bSM ztoF=hx#M&9f&S)etQR(Dp^9ToF0&AlcTBf)Jy!unDkE3gwy7sbuU*uLFzC*CJ1!ZZ zgQCw(S)4fj^$nMocsKF@v)4Ov^|tM3c>Wh)q>21``QRitS+U~Zfq$4VmB&%cXFZqKx}_wI|C3*C(Gn>gq>6vL6c91JFt;kQc0SZB zR%oEM?T&{`-}f4nGo}Yo9e+Ig-VuB`qq0($+h7E04ahv^+l5_su8y720&!zy(EOSb zIO{HbD-yqLrQ>dBdW05Y!`H{#)&VP6bNau2%yjOQkQYQRa$gyRq}l^dn&x7{^{5R9 zw%0*M8`p5J5n}RiL|Ot@;gu@-{EjGK`u<>)>DlO<(~wKitg&#b-;-i1r^cm$f$hCM z&!b(~#q*!U7Jx9B13bxmdKP6)vgEjxVv z3L1c?z*D;6wbz8$ib|3txZ$rHcjua(LEYBC+4fj!GMc$F29fS zhF&<3K|GdAl)}zAPEOB@7+y6Qpzeobq{}nSMFE52Lx@t23C5tvD_xQ<`I0J1e;#RY zYeO||TpGyf$FSnaIer0M_q~5GZ_diY9Sdt z?~Ra|v?gn$u}gKDQVYS^D1LYl|6qe6i>KmUz4YduL2@qAyq-G69LJLq4l4mh8^x;_*9DhVny3BA&Cq82kXXaq{V_v}5`XE#HMfX7|V%z2nHOwLe|pUvJ7=c-O`Pj*~cXHmYWe6&Au0 z{5kZgO$AUQrNDwGGtMEb%CgVx2KK*csRJ>~?@Gh=5_C*8RB8Yu)MwzMy$#&tNYeK> zMp@q?brQa7Efhco*@I(srrb%lxyZpBQCaOy=Ijgc>CmPBho!TQYWjiNxPYJ_At4P4 zNJ@iriKKML=*BTdcPicGXpruPjV|d?0y4S>!UUwH-~HbA-5)#Sobeam!@c*p&;2}M z&sR!boNuH3@Qlsdx0I1ElNXajZJVGJ#)DS8s@)>14ew! zM1_5&e$v~*k5Eg;G7B{v3Z?6?Lz|$nZ5q0<9jbq{lMggKT%6^2B#C5Hkd{jQo_19d zpUyjN1z+ZEb(YfC^H@AtUbYpfs9^n*xNR*>YduCE7}P@l20*d6rrh#p4giQiv|NA3 zZf%i)>_f*c_+KvCJh3-G;s_AqSbxgCl)>T4|b z!{Bdyq*qGIYgjWP5{$`f^tfKl${*@APccQc7qtuVlx%gnD$<*OHb?u%cxBlq`;7>? zB-umAR&Wj~yZUZ(UK5uelaHOcQ<*AT*#G?+N~(vFU|kTaj-~4pL|Mal6CI&_y8}WN z>%GQ>fm{-$TpNofO}<4K8ML!YHNY*I)J@&L5a?TJO=jj6Ei5pw1Kt1si$Yg*9wz&v z_lWdvpmHLml5G z(Xc#S`}e_??h@V+d&P=;Q;TcMHz_4bza-dE!k6Bp5H)Q4U;2!4=U?2S+iR@%;*c#<6+76U zyLMVYg(P()2w#(!&P%>;Bz60$J1tZ2WW!(SW611D=LXTxvG8Bm8&eNWI%gA(T2*jaJ`n0Woj&EEHwu9>i>es z;>mR9e+x0N<3^z2Ed%kCN+!he7urVaZ+^wAkvKTbyHR^etBF0GhJF@3tR##M>nM?2 zDm(ZFxd|fOr*?AG$3SNW(Q$p0c9A_KAgR{W6Z)j0mMu8vg;s!7;NUq=kJoBx%bcOR z`lc|`{zE#yyhH7x+vkFwpUO)BQ$33Ppe{eP8;=E^mP4#cGzfxGi|CUnB4qCB zdyrnf;Q8gJuF8TsMdOGIrs|T9zbXz=9PAVSqlX2y*FcunYHYoKcNUJ1N!Mi{ptkNmbPb>B#mJ+s!Q83?WWrF%%}RV7TLcM zh?mscW!J(?(Q+z;Za*7Mt%;olgNF3=Qr;e;EAiah#Z=hGnN#nP+Gj-nmRk_N-?nsgT{ zY1wPXzKyZ{g=&sP1)+VMd#$o#Uy#~b0QSD2kg%+;B+j^1pIaX0N6|%CLm-KwK9FYz z!&fi*Y87D<__+G$MSPzNlfXFkIQ`O=&Vk-O>Y#_(%!993J@Oq0%2!8j=u%A3x$2=q zyF$Gx7%XcJ3sKs3(QhkqR>NCs*?s~OELFj1HS3+PQ3*xU#;&x{TnF|}?4YeA?;p#^ z*xf;G^;uZVh@m3u{7Swa$Q7%c+#42J7cQbwHDKtWO-5} zCPdHVMc6Eb68wIvop;jHE@v)5eQ5|7PfDf8n_!tUyh8MyGr_tyH6Fj87$lSCy5ugM zQ?8UVnKl|gd%Hq9*65PwXJsLACBU-%8{uh4SiNnSF(tW^S+eF*9b(jrZR;*YOLLWf zX5)~%K8JBou$qW2xo>QkK%r$`IlpzjI~k2K;-;YofH;HnwYT3&R3;?mOM(p}WQ-z) zv%ClP3Uq43@iTU^4iVR!($vdDZXva)LDx##UZgeRWOIo}rH6LQ+2Y#UsQ6#b@3+13 z=$0-BKVQ>EhK}gbjEf3Vlzu8&8o&4~PEk^wZb}1Dd1HFG$W^7f-nwF52yTMb3eAp4 z!6dHc=#JibhKt!eNmS3y|9sx9y@yXW<2plvrTj!@&S1XCY}y$k-$BRMewsY%b&&(S zMM_h#RjPM)ETzP)o?+2xs#}zB_jQ!me$L`v=XE~6R?`a#@i*xYxu6}c!~OP&kX6)p z2bNEV)vBjkm$Lx4uS~TIS;oK^4Ewy?<1pCLXi-6byJXZTgSe=C{o0lw5}M&)tiy9b z&3|rOS7nuo?-)q+^O&~|`I_9w;`VCe`|Wuc!Gv8+U)6lV$; zkxC_Lt7c#uYW%Zl+|ks@zbM0a^B?Ko3&vfmmpgA84l}6LmwcM^EF>6^3LhGQgOf= z)+zc%O}Ae|7mZ$LEJiTTSmLP)-=GU0jMi%S8NBT!D9e;OC8zQGP8ve#{X^anu_Kif z8kxv5@_X@CO|A(G{J0WwKHNhaTOW9lUK#vGqw~5J&3=_Z>>op}iMsC+Rvyv$)oXjo z?)UEKk$3$YPvCL>n2PknyEDRVN+qpvR|~MqpU!*-pwC_gs;2RfXanMI5x8eh_-yPn z$eQZRQP`nrJka=0h-q28+kBbHS+}l#_=T^%>+1#;PRd;or*rOOnae4DcheT9%L%uk z!){UaT`X6F>TdmI#+Kk_+L;+=Qu>4aDIkzP?KuUy^sfF&qX@~4?tD{|zH)o|r9Pd>JJYNY zF^OtL&$zdl>SiupV!nrGZb(lF1CF|TpZzSC??2C`L2Jw9mFkrT z=QZ*p^E1udZ27-k=00Du()Z+%H6bh);IcUL%2LVRVv*Y$V11jx zV7*3Rt_jnVt9rq6LY2U)BtpHwuQLnM-wzO|nW}@IC-jbVhwq1h7|x~?KN|xpgI4Wi z5H!;a%S0+?8&T>yN9EkFXZHhVg#2Wd6p7Hjo*y%9$59@K(kxw(8cOTQsWV-VVIHqV znC}%QM|vBY_&v6A@be{jips#r4Nb7oHFp@i4{$t_n7i)Z9VN~EnU)O_fpMe9J$;+O zHQ0yGj$84?QHZJ@+8E_wz?@!`&1bi;G!DYyZ4ehO4BkiUQQyk#n4Smn>M|s~zXG)kT`O zO)g(|AfUAB!i#qLpHQGj$NQA5HU)IvMYX3G_$#6CZz&-MQ771_+}Y9CQsGkN>}U!E zb)MP5Y9Cp=SMvKDeePg9=DjjpA=F?K=2jl^(PXrBlZqa|EIvlq^wxkI`C5}G+=HqeXF zwAQ=NeSmW`QsZeSbIPm8LUio1a3^y~LpV$>YrMxy`eD}$$Y|+mK@$CmV{?C#%VIth zomsl|xA}>;EFLmr_DuW95#9^1Uau;8bamzlQR%9`7(hp+{ss&rVxX->IcHx)PoA6P zK;>Rz(K++}^*TYDDLy6Qa&@`ZwsAM}37PU~K3@=K2;}>jh0`8arZ~js$fW*+R<05Q zY$Q!DT7@!>>TmVb#M;h@8WXhxu=d-mG>mp124&irS1Ud(4VNiSvJrpsB5-E&?rHy9 zXl_0kh5?3CFMBNo0wI!Oine-+Z)h*5Zgqr(B6(#~wit0r zxkpc;1yADVbTX}2Mvt)F@pGk8#3v(x#hkP#S{gVT*0UDuIu>KqeEW^M&_=N-vAzoP z75gFf)Ik2J`S(>sAD?pnCEXCET&!Mt%e48HD#3|wRxt}YIFvhL9O0E0J@gBdD>$m$ z$bD0Ik+2)!ZtZqd$DFQ4!pBn+SODoy}b*=im2DU{Kc63v5!x4nL+ zW%Ftvtk=2?gImr)0R6^kIaHyGT?*P28(pRZ{h=E8jJ(V_X}9X>8`8VWlZ`=@z+3%qWah8J8uk!j&j5fS@_* ztWX19sn*mIzZfMJLUe`)u;l?Sc_|O;xhh zy}tVfC^roofIerAR~SFb(Mv`XRM%|h9_d5@o571wfxNgAPX(_Ev88*ELp5R5?xt*#6mlhWx#1PN|W2hg{Em z4mj#Vn;2!$R0{k5s1y+Yy!!%)b3EQFjht(qdrtHTrtdw)?!S5spB|UPl@Q2P)~hM0 zW4T(^y&r9-+;X%{k{VF!5s8~3q^Y&jE3SNC?~Msoh}d7qtz28L=MlwrH8@D*XJae) zPwIVxB+^pn=Vim|CAVDxb@AbbS^5UaLrC-~_RfJg1f`m7TLgBjn+N(UJ+3TY{$BwV zNDr?jUz;)Ds)zywH=l!IRkN(Vg~Rk?4JP;-lOWv=$>HrUAg2P^SdO6$Xs9I>TfnwR zM$3K@*kn@n0Q zB^zC*#B+iSzjDdU8%KMHRivW)i%34B({Nc%g{I>w33|B_Uxrt`rtAA$;f%S|XjT)p z#HhWh`40Kh*z~Aaolx*sMNYRhnn_3uO3K=`t8jFjzW^{VELAQ;_r*YjPe6xhN(Kh_ zyHLEqQ3Wx;g%1EfqvUZhdC8ed?;>2RnYPfcs8Y0;4*fm3Z118b`DRbyd=nS}qGN z0JUjg_?{}c=&WuP1WJcM3H3L`2nMa0k~i!GQUffNXj~VY#%;aHyAAYlG&N&!L!cG8D zmIsCF%2yS)OMUkgE56XkheM(WQ9I9i?h|!T-sz0szu9cya`BeVgNV9{i~IF^L{;^p zm#<&q#__>>M2zr4ZggkJkt!0~)1L9!rCKolSyXr=Ab>9S)Q)Us3-T)GM4J zk9M$8dZ2b^l|)#_9xdpiexqpMWV;BVfXXzD@B(vjkvJFb zzGx8~bc-t`rpXwJ#-LH(VL66wsZ#lJD*mv zCFatZQ{^tXJD|fhyH^(uGwc8P{B56>a=Q&}TnL{9O@d-hH2P*l?kGwgvoRsMS=Bv+ z_RML?2J4Bd6xdZ8b8CD+IqvI>vbD(CF>`O?b?LFBB+d&=446}_JH$a_Ig;D9As68r zply>gT^04zjj{EKrkvE~^W7lVz%~Vwk54Ekt-e!Uy)5hS?4+?MJ>(^H9J3aE6OWu@ zI-vHGX3cBDn~ObJktOYl9a9V788x#0gYFLPbr0FRmZW%RFp0$LV1kBQ!9ju<_=a~44A zlXE3cjuG(FswLB#s#n@Yj5lo`6`0mVKYaeWTkVlWz=o4oG)9IX) z_=g>t+%s7?TodSrD=!dKT&-&u!yo&&_)AgAS=34$0kgCM$2MnPZEXU2lfMI7r@Q>M zbFbOp3bU8G%$dM}X`rNq1VThJD0S~N@rxPS$g}e+{|?}LM)Aleb&OVZ%unOj?})B< z!H@ODUT z4$`=)sTo)JcK59Ipjy!=mTAonQo`8v)-^O^ z;I z$C@gE*u&{9Qrlt2J>S*0rzZJ?BL6yo=WkcPD+cz*`PdW6d{3l*Bm@@FebzPU{d|^8 zSD2}%o!EBbuza6d4*r+Z&(6!r21V?t*mZy4?>c`&pZvJ1Da9jRI3N@MLJ61Bb1he`-0tfuQ;S9fNTgKm`7PM8FoliVV zT-N0Cwb-gjjE6{=8mZIAJ|p3GvdpYwOfyxJtCowc$urf4Z@yv+Pe0O>(k@>x z9kt$p-oYcpSFILi7VBFo2)sLT@c^PYfHf6Maac(`(v`z$Z(|5z$0wz?E*TMVb@2wS38EJUAl;rLraPEI%x#IOz4XTpptSDWO|8=b<@JBX1qtW$nAH zA6ZBp(`NDrA#Wv+E!tV+XufuMhDa#+YpfXBl1dKa_W>W1(ZUx>AEXM*DbZK%mp?x= z6JDuEvTu1Qn~MFEIf0gaoGhTrB{h{TlMZfYs{QQw)XG%R>pNhwPI1e-sLmQQFgNx0 zah}52#uHuo1c0Xl1%g|2& zc|I?>0};;Qh-u09VbEj@!Hb56uj;L|$Fwx0Lq8=&8G3LLRk@IJfyU$KtzEM;)50I& z%WA*VrTsqAz;0^5iZHRQ!;wQ9LxGO55k%H_E`FkXie z>MJknDM?q!q8v(05O`_xdqu4*8nxC9=LpO>?>!aiQTc5dDe9ZEVxC=w9*I|NC8KVK z0wu>K%K4wZb!W#N)C%f)mwvBheTAHeo{`?xT%t`JOL*$(p97!{?LSaT6Ot<^&SP|b z>IVO)Wk|t&!k7es5mI5Jk^tmvCts2bh}rfrlML7`WwlJ-Fm6GZI4rTZX7w4^-3dqp z5MvLT{Y%D^{y9Hk4k^l?xF3{8@f7^jdHLPG zChNV7>uh`}di+ups_m%V?k1GDtJ3mT=KR$ zqLs!Rn#lFPZCP?rEeWp@Vc%RBXfG5)YYq;?CJVoo2o-N-<;cE&IdYUkdd#9$HEd^ zslyj)otj@Y!pnP_g-WWP#1C=OAamy{8Daog{DVUak~%b3K%I1 zSCN6^Q8slxaA->mENkkT!-AV-qaA^E8AD}F-Kk%g)P=xX%-G8tkJ3#&5`GNsIdoSu z4f>i{ztS);sXoGs4*}lb+(w)Kp*ST$Fy#M}!uuNos}_d~?a{sUmBaBH08|tiVO?oo zAEu!nBn*`(Sk6ZAMU*-@OK#PC64`dEhASjByP0-Vs>aqgC-pnoPakQ%al^lEDj12r zu5M{3Y>iqbJ96x-qN1T{#0jY>c8zJ=s+l~;%*JMw$Qq41WLW8t(HRxj4==(VWtYNq z(r&TL&Y=eUt+)I?7Un%7RX1Z15r-qt(tl&oR_e6wDH$LY%N!7pCB?JQ_y%KJYhWvI z_%;NShV?2_IzO?L-hjSK?}x9NNah3zjv797Xc>%l-mSZrKd=r9YAUI(hQQb-ho7t< zqTNGptEF#QuvKe{(x$9eykWyrvC-`g`I-mSj_^R^MeX7pNdIRqx9`RXw_qLr>UPmx zYN$yp1oVL+RF)_4N-xZTKFeP6%&pqncVeM*<@9bMPza%(EF#MV9;S9Ugg08h&(Vjm zbarqWLS28?#A$~@01=siO*QO*{X~Rew?6iC+{hDCnsoA3Pbw{kIzmm@)P<22+us^b z_&S-=8B$U^nL2^cJg5KPOTka=m2=O7CGbi`f1;*2w*R=5lDb)A>DeF~K3z{-G4ai} z1n4)JH}EtPEF3QoWWQb?INQ7? zLWHR-Gh5ZOjP=kZKWe3_X&J7Q*90a`;k6_|ZkL@v*AIl{=V9{W1s$n?0~OuJA2QO$!;#1yRM=f4ovfOH@F@^ab15bA;0RCG zQ|Nnjn^yj>0QDJpH#^_XZiD@x^eO3AnBgl+oak`OgN|%j&h`5tZ2sXG+GWiQB%kai z#JN+n_InH0_AH~ppb1r?OHPx*<%CbfmpUdAG1S)C{iOd$6pW0Tl)ot{jpsUyC@@VGrY^%@+K)qN53B1Mwq&6mbo^>`Hx3x#QkXhY=nsd=9zM) zUpLimo~~Ha$rjiAnpH^ae8iNBd?V_OxA%c$oog+t`x;%)fr++-cckh>uPi@K>A?-H zk?s6DwDL7TWUKLd?LS)XxfTcMZFhIhDfRsKwGETMT7cM1wKc?nJeRmN3Lz!DohH-# z?9@7GT?^=%{?vqN_rSH!5W~;%0eU88>eL_INB(GlTQ_3=19Ie1kNeroX@6y*wyckQ zJ)*{h2MRZB#6wLLceWq@X3y@YI8!jMoe#Y=bz*HQ z9b)7Mp+!v6&&kZj>=1K#aly8A--G!Eh@P6{AB=(O9lIfKd zLdA7v?4IwlfmIb;)flOt%`lsCG{#yb>Cncf=u;BUH5|{5MeAH9KXG;4;f>8J?6KDqE)1#PsUTnVu4jUU5+?KPmD;v_2O4n&Q#L>z_qX;|?jg6+ryoTn^_^9--Gs`a;+W5nPr5 z!Ls0YQhE{t6ADcyT~#?5x_ZQ_^Z!@A#Z|*b`a{1m398xY8MZuEefEuv;zLT^S8E0r z7ONVAoQo~b_&=|}Y7%uWDl7Z*&&~Sgxu#QQUxB+YYeB03rnQ;Vi{`=QZ&$j8dZC+mSdX%B?otH%xKi|7I!nf#W1IAvGzdcjqZPmxjnmMe1lH z@-2rv71LZJzWNiL74#3RqVcViOjjIdWp8>t!me;xCA#)bv!8|=L4~n(%%r6Z;xZ;L zZNy!_WTYZG?T&Drj+)ebLC;w;eI=(Pk6|8-ne(z_D!z~Pi6>G!?s12c5>XYyuOgiX z-Xmy-TZR)qzqSbUF?IX^f9PMoaY~hfx5yfShpg!+C&ilbc{S$KFE-?aZVOzIdC2uK))?$|5HnCi5@4S za3UU;1oM5Z(GM?wgU(&+r=~|u1R{=8UKY!LshcF@nZed=b@;31HMh;}T$4SzS1<6= z3z~QM$;QC7O#oe&iU`+yOES>J{DAfCDXs5u<6S#`j62`b{GDk&yY-=iuhby+Z4J2X z5|q~&8;1lz<3d$ZZSdcnWGF~)`~~@H+`?v9eeaD}Ze`U2LSkS6SDKy3NUVVQhV`FI zkSX<`fc``~pPXZY2veVvvJ0vKp+XClpUHbN$+?)~br{(DTO^KEDM&WRV;*eJ~oanQU##z>>pBvl-@X#|Z zvURw=u?QAja}@k8ECIOHK-d|I*zmo8Pnfu2hK z$D6@rVnKog_~R_Y_2XiE<)yQ(_c{D=+*!A|rJ%Fq=l_yA_#zkNiONa6_L zp=^W61Km6LpxbQouRE#4>wJ3|*Scevyt|^%l)^~st8PZ#KkqkRMPHHE28L}N0#c5+ z0`nX0|HWB#?c?^E(C|1Z&VMUpLrsZgThm(qHDRl4T)P7e=sEjJw!T*ZJKT=GXE>-d zI4D7t=o=oLdMv8;4iCr*if~FoKZ~OKs6A^ z35-_)a(*V*%XyS0Yck{Ja@;3D-|Bk!-}&~)bISwpTFBzs9%_tNNZ3*CdjZCLUm5`m z?muo8CJ#Lta9MExcjnBUvNZ&N_7aP1cNF;r`H$>*f@Oq17r_zK+nk6;=;uT%S1yHj z7o>kaXaKTTQQv~FT9|}Ka2=xOZ~um0w?!7f*+JfmW~6)R!X${@$u|cNd=Cn|QT?Z@ zY)TgcJovVhK<=`-Fa{xSF|0|ECY)?gnOD{wf_wQOmhKqEUsfkT(to!_Kc zNX4h$chi}YN}YHG#De{{YjXP`w2fU$BAT@kveNR44O#wA!hEk(2Ou_kb?m$fF9;W_(qZZUG0ntZxCk zZ#6`PpjzQJ^N|+^c`Gs9nTNl#zqPB}`?Gi#+JC0FvG* zuyEM^uqe$oe5ukd`8yXPsH2^(yvu&^Iy<@Xw_WB@2K#fO0&g$5hd9l8I{gy}aNR2| zp#bEA|CNS)4UfjoHds;ts@=T$eG7Cvr%*A>!fxG^)`Cqc?qwA)%&q!oC4SV@pSKB| zANJGs)GQ9X&U5>Wx9#kW5N#(34H4a7-!gqaDfqr5aQfn%3|#XS_3b-Ngi*|HpIdW0 zq{uUjJ1w>ZOg@so5-|7k2FgV7YGSecaO{J%IXCr9qtm1JE)VFcKjiEO^95{m)d~DSTvd+FwV^EA*Yh=tPKax#JDvuJHRK7AhKX-$F zNkR+kmvpG*{sWooE^<*@AW{SMNshH9Nm{WgpjtuphFXrbE;-P66X%VXE7xyzQ5MJC zKhMU5o)f!%h>9apP-UzEekIN)i5qCPkdsrnYke~Cwp#B*NI?4K=sv~>J0UUKQSC=3 z#u}F&J3b=(ZvDx5q@n#Wh75%4R9Z?CaUVVyF}lT)BpKv{&1C7OAxfB-gt0T*9N9Rh zB1_TT8of^3ITM4?}ne!woZ!hdp%?mo{dnA5SWX zT&05@PLvAbuNZE522EZ880iY)QX_IScLrFGsqowtd7=CAd zH|XqXy$@tEdtpYZ?r|p8?y8~hE}I20IoNfj!d{*Fly3z6PW#FO*`^d*#7>p1e$`ec9Zt98KsDpXo*O=>uyso>Q5hBy10d8rU zQAhW8YBtX?e{bMcui!}KbG6JE0#|$X(^PJ2>XU@dwYE4^c=uH?VX$NFeieyJ%n4y zIC^CVdCG0vWYNRn&NYPW`4IjGw)3puB=ZdUcX>i$#e>OUTyL0`5>hep; zOV9BU5x};OEtc&d9zxv{uR`{*xW16Zp{4i63?Y z2Rvx^{@%ko$0@&DJJ6z4cUP&jB1)A>QpPP(;!LHjmw7M0W(Xd!zTse}*J3|W;u@FL z_vOO_0=3p=xF3;iy06k>m%=yI6nUGjSe!ZzFjmfYyj`}p*ZVIL1AnwY57X!RFULB} z`!>bR2l|%t2lcLkKX8G-KB`+%W3A?hb&s-uRckQN-_@zlp6e=|1bjWodrSyrznb8C zu**g*$Sq|ZPF%eirr{_b%LqG`*{;m0C!oq_X0v!h(kUD5t$Cp8q_=%}IC zd0}*q7x3(_M62zpkJ-=-Lhfn?PTZ6z)ry^cu|P` z1wxZu{?X}BNeG^iyO3ZioLaJw5SXKB*qoc)=N07a1adxw;;Ngic%E3nmo4D%h?+^X zF3`C!)5hm{83P@FtnXWN&D)e+1g5`c(9`O^|I#P&+ z5raNvhfQ#-@$=xdO6riQz*M?d?AHK08q?%ziYG9&(*oq@;e~3v3c4aP9puzYdDCm_ zIRPYTlA;hEnF0)Nd0JZW#H)knF_&YF(0L)YfZ#UF_r%L*_CuVLXk79{r0rvp6Y^^J z9dCR1pY;1c5-?GO5H5|k@``E7y4U&W>z0Q_)08QCWf;+qY~~{fR^vAh0Fjl|u%+se z#Fyp#Td6#sJ$s+K!=C;k@I5xY@7dJJbov7sQTNGk>tl=bKv&&^)KSp2V(VG>`g|)) z@=VIv_h7m8BJ;`xHM^d?zW%Eotrk4-?)n$Faxqg^i`uEJFg~CB^=Z9I#@d{U0}!jV zsvp%j6ws`ZR_Iww$;Bk!XdZWY!l>)L^SzZDtK?#zt^AYxtfmn4O_Sz&Hp6YE19cjD z&K!A{_%TSHvoW?vYdJM+=}2zQi}`z{BwEX3?BU1ElrI<|;eYW}Ymq*D463Bt98pxw zj=#tpsx)C5+uYgGX!><7=NB80P}WiB{CX*Tyj{7B1^$5=Qj>?sxMaK z?s$vsA{m%?Orl;gCYw^mcg`5@d>a@Il5mS9O*ZG)GfRo+uFI4}c6Q|Bcg))c*legeWGg(f?r7T(={@VBM ziH@Pm_AB>j;RJ)1LRK}Qu7#$Q#0VFT6DXsAQy!Z=Q-h>1g z{@0Jhz~DSHxQfR5TCK%0p9cW7R4OMB%_nYhM#FkN}3do8nL%(nvM>y z6MSfVGR=E`Njx1YdgJtT#W(pE>)Opz6YD?~TGwC1F6?XQwnDb~|9cLFPIQi=NpX%lRe7HC_cp#hVI@96WE}-a+f0lpWesnDEg9Sb6##x4$ zhtkQ)9vJ)P)y$u0MV&9V?x^hCm=q#XJU5F4S(|>a3;!4wfCR<`##*&>5KOX=0UY}rp=73d)fa8sNNQLZqot=`m~j?Mc(sCWj6|v} zEhP&m{WV3{K$0FCce@<6x$&BI+OG?c`1UVGMA+1OMc|qV$_uLY@JHDQAikxWR-+!P z?JB_F!`zsH^>gIHhNjplTH~twTSYR*ICOWgK!^#iWOOr#IDR_bRsQo+H(UGz3WS@r zRw{i7V-s$bdTi2Pk;50A>%X@2mx7D#h|5a&SUB~zeh_Ph2Y=~{ z;q4;-p=U{17b|O!Njh&r9YR2t5WY{?X4WiMQ)e8_*p^ofTg&e^Ew0#IObT6zXw@>ltrrHe_Hb}d41ix7X69X^fU+iI> zF4G;UPX(qv+xDG3$v_bBPmSg(u;iOVUhZLZ-~SujpPZzc|02I*D#*M-H1U zo?!Up|1IK60Q^(8rA-KYKFl&6dz;{ov=tNDSQw0gNlfx#!FQj92ha=94fD{lx~%m2 zB;$_CrkHoeE5&`V(U$1nvXN#`zuZnr$qyf&VI-TI8w);A*KHvv0(mgq>|RzY=<71~Eo07UDI zmjfTcn>WKf2gi|jBPz=pYs9;LKAW!H+y973gQ~_7V#M2;9+NSzEvY6`+WbmTraBqe|^D|cxY~!I>BIM2r+dRWHN|Av(1N?UiW&jIb6hjl6(E9 zR;P(QvY4u>w{%9t=f2^tN+GmN!2U^ji{?A;;&M2D*k3Z=*U!^G(GNU_4v`>OKD%@o z*SYxPVjH}!k}cu>GRh>P{P5y==m`ZInLX&5q)CcRq!B{0L#@4!Ir=TBge5(`2#|mn}+^s_b|fN|Ey`Vrj7zYjqXTrbnLyC+Z&MHVhfYY5jE;6Nc*ZH3Yca$ znE_!~9*MVUdcVFsO=&P^1lKXzhtNObWM~ygJsqH1vree zY~Y3rhA$2vJENmrOl_ zbltlzPYbKSO|EAJ4x;)^1fcd==58}fkgY>}F@@c?YYOL+PAOd2miZTlPfba{!@W0j zlqMRXzle<@g^%?ZAdJAraWh=^rzVQkl3_o&BKe?)^-e^VZWQ4Lc=ZNKw8p5TpArf% z5zN}%F3YmsfGZ0Rl$7$j>+7)1lfwib@$UP2yvD@t3!Q*#f9WPGy0nL^8PPSKz(&;@ zqs$l>*GHrSHJd!ho|yV3Hk?tAh@z;O;hAmx;tY@b4rPsVljdr2^ueU6uBYAiZXQzK zSJ5NvDl)!0BxBjBnoAiWjVuMsAGY3(z214c1CeL!5X6*k(fS++F#Hi%ASJsc&nV%A z_HQ8G$Uflf1Q5g;vGyPs-g0O@mvwoIy&w}N|BO+LPwC+eE_6|2~Q~%*&Kg$|-d_$oz+nV3@Vz{}mbAcCM z9IuUtQKu=}bDDj}69x~{|{06y&vaNpWYbH(VNx9AoyjHW5 z`F9KL4bd<&6ri0&zhI7a!^|yIK+DdAl?DS51#1>TD=@vT4Nib7$UKb01CI>Lp{q*2 z6Z5Q?7hSL0MkVmc!t~_qB)QMk=5ZBzOE$)F^=p^mXD%;VO`cu3v8Pj>KwRi-+MmAv zzl{Z}Yiht&%`PYmu>)QmhWI z4h-a@DBMMf9s4Kl*2C;=PE0=yh(0%Y0S5EC4tzwYNs5fu&=nzq^71c z+iZrRcN6TG8K)wP$}gyzq`s@WeDd2p$>v@o!OJ6aS=@C3Kt-<>y@tl3`Z-y@E=KxD zIyAg`d;2H&Gcz|L4iS4eDdqD>3f|~rU7x;d3x?+sZ6w^%55J-jb9MNb9Vb1n{D_-m zzig{C*{V9klRkEKNYZ8pf14P4Ki^39*NFR;^R{rU2feyUJ^9dhEJY-hI05GQL-7YT z;DrWha)R1Qm^s2{4s%Zy77qUC2<{j|SIXqMU?vD50mobc%VSi!T^9hnVoEX(p#QQs z&*u3}_2io^$RR-oHtaEIqU}<#i%5DEf4bx1*;Y*sUF17h^KQ%|@6~GWcJkbFu=k3me{p=T1t*g1BnH^$)E1!D!G$!N zly4R46wFLsTD=Wa|D1#eZEi)jw~$3R%4c(J+t$6Z1DNH+K*^x&va=wMytriFJjoXH z)~b0Zo(K^7935hlzDJec@#ozx6QQEu-5n-uG+^kI+LMg=yNFRxq-j|F_p=7>jWg;= zds&b3Ylm?Hxrp=8`Y3nZ&iHuI*Tlqo4DUCsc1p}5vc^4sa}a(2SW+G|eoameB2FRU z(LI6o+FNF&znj|YjMdb2<7;&1(G3-V!%Dm{E?qAHL9`!GE8Q`gabsTAWhU#BhM;9r z(~|=`Uz2|JTD0#h(3Z?E@F=6IXqv~>C!k#WhF;z@|AoDo`&GB{51*sI*!xJBFi~(j z2WxQ5^tW&6g^doP#_te0X+tK%vx|N|;()fxl9%up^UgrT_4>&MDmd<$`R$4FiJ9MH z&))&@;8?|;({z!C-gMXVBZSLuC`H3@X_?EPwg2JiJmcAJAESj4J(QT`=Q*J0*b*D_!ww}=6*$${K$id z&7(Cj6|K;s{Scr3Mg2y!PN5VM>;p{0^-(YRMv68Yvt-A`V?;*`^}Ol=xoNWEc<8{~ z)J{|-l)SOrj|{Ho#-s!VWtkG?w-TN`(*ze>Qh=s3Blj6y2}?0f!F`D|6cKcD%9jmo zLk#WSX{x7u4dLrv@RL;-6#G@IR$P}1g=Y_Cm{WR+Uu<02zE~avtPO8FMD~?+Nhk+Q z)*?6VG9*Up3ntQ!ZNzfvW*pp0gBHon0ly47^9{<;fk~f0G1dPjj z^XClP+v~%aOH@zgDc19wl`Y+55SP=J8n;WF$-mldj_2H0*_e`)f6G}X24lthDm`IL zcQ{v}{hhgJvF&#i(rca)GEUg?ly7X^Q&^A7XfW zBsZEqx9+^C-!}<9dEjrl(w?YfC;CZS=-=VuMqgzc^<>+^Y6lDcHDPtmTtx_u zEFGuGT~2{jqBuOB8IGw38LF%0(Ra{7JfO8_Cox_)l@7*^ zBdK{TO^z4d%MKA3=rle@J`Tfe4O`o@bOZp+#=*S8T}I!shM8DGtlLGV1^u z5d4+aj*a2wiPDgK*^#;bH#ZqITq$ZVUiGQlh-;v&StY}cm zCrh^a6-pIGd>g+dnV$pe{~knVA=qIOvRjG*U4*jM^Nz z(SorK4xYSWT#kzKeH>@mCB?qbqID9CXKsH|D1hC|Y@1YQcd{ms-F@+=7#*rTWBjj5 z44e6Kykg0XO7G?M6#bCGt7~cCdTwg{NSr%MZKi5#wm_}eV-H)EBrm_|pZ2kf4L}dGNmEX8pE9YdD5cN^)7cle%AF)Ib4PH%(N`w8R=u^h*y_q_n+$dy}NvERU6~& zuJ?{IMSMYX@J@~5`f1xso=Sg~gmv^wXWG$&-@mHU(zL=6m!bN0^~mo0IIk*EuXoSs zU-cIR3Xms1wS6H{jx~SC>D~Umk3Mm$?U4Lwm>MPA2dD?2b~3deRgRXfzSondkJFPM z*(tYJrytP`=i!nPW4Am5K7QlqYI*}9QbuOEsfTZEXmd6{*erIG_x=!?xmIc-YjIoTZ=VK~UL0m(5AAel04Xw6G^;gRtF8fO+^~YK*-o+qTO?4^GtGGDSGS zRR)K($Lz!(OjQn$ZjoMt*2V5L0@NTuj1@5&$DxA=e2Sc9_^jUiq(d(@<5w8Q9;rQbbVk!Eq2Uq@KbKCgj{UwI}? z3ay_!^mBjFKI2i<5asNQUk=yZqnE6<_WLGo-ZlmeCLxtCoerzC#{+1!E$$wDy*n30 zMt*}>z7icOFno&6njZD=Moqb2_{9L15loYWcW%OQJ&t^Z@+48?yM(n8E&G9<^q#U^ z7W%C^L(lVDjpQgrd8x+)kI?+Qpc1kUxA}%h2|?eMaqbNk6&LL|;efshu6qN4CLL|@TO4f#I0$mO zF4(#R$U2&Sxlfi6H>HG2IlXABpGeS@P<5`<=Dms|NDXOpNL-M|rR39(B!#yA)KC?8 z7e&?Kns1MAQC&gq%H&T?Cp`+KsA|wO)qI7>Vy(6InROC-Vmu=hKzpYq1SPn3jA;>n zw0XCT$BCEuaBfSbG*qc{rtX)!Sn7-1(MZ!(zuwhtnf$;iU2vC93E0m@pw;kbVJMvn zUKL_(%e84inU+b^xsjQMgp>cOeZg2?(|bQVZhYF3?ZZ}ZkbF*aKo+7*N{4u5dQm&D z8_gN`L$3G;`dcS|FK27aqTT@~dyxo@{tj>Z=wicO;R{A{7Y3xjOjT7ZfMGLN6f`&w z_3O|P3U(ANdw5y9p>8>Z3T8bx$q>8hB!yA*T#q2(hKM8CkiYePg9jIVDZ=~LL=Q0M zL=Es=Cf4qKX>iXrJ6OR_@f_*zjh;B{3ugANz~k6NBT=#)FYRTW=+kbcgy=G0y~O$+ z@87mUcMVxbRSq36kMJrP9LN|A>i{ZXPV9>xVgUE>FFY2i3p-_XlAw^XbCAQYrO-v# zQMn(Nynp+9o%Sg&Z%y*LHXWpbs)RAEDb|P%versXRhW}hz0NaO$;Va8b(cJH4R8>G z=v*M-CwJkv8j4HouCxsdnE<1Rv>dVwtlDWERxU%rA=qJl3?1u1&IL@FaLeaEQ~|fO zk4-28HOIG~!fZ(PjI#0%_5LfeO}rsts=GBPvotF*LK)rH9EtH?S9< zVt&8ZFu#Pu1X?$cp8Z|sX+PFQRdj(D)5Z5)brr}law!_!)xihgdA=)hT5mDLx)l87 zf*UJr#Ku2pcN4l=RjOu$J|nI760_yKp^*}6Nm8WwideoL$38E777+H?u=3(vo2VBe|sr$EG;OWW^F6v(xSLM zGI3Wy>}|IXCW4+!cK*DWrO;?|*tUb*y1T2niW97B4QH?}`Cs@ED=pT6@cy3!7~}v?N6ZDzbrHy3c5B+5C4GKX-^O z_+4d~(Lq?kP(SA9L<2qq!gW84J14jLYGqOJi9{|Q%Uo;cwhQ>vicM-AEJ&a%p?vNtE0+Tc(0$aawsx%NZMK?A zwD)a;Z5taBAUuRr7D8-y!CJ$`#kHvBsC>7$^37Uk6w|9i6k7=b9|^1(O;3p8maa1G z=3C6?xkpY&!c7O+FzX4hfx?qlUOx@?lwQ@?wslqg3D=I|FuOGeiM+VBk9G$~^F`5l zu+?bVn#+53kNr?G61}RupL)gX&LpI!@5Z?u9*ZI3$kqC+ZyJ?R#mis z*i3gl1R8WTjlHRb3bKBkcOc}A(|F69WFGL6Lj}B3H0+4$eJY4Y&O53_iMB$&`YEa3 z(*pbbQ%;TK;*?^9dZ^t?vk?CGp_1r52MOS(|4Kajsy#tQqn?q&k>sA#lX&Z!z(NJK(oApyt7x6yr>lgJ;U!ZXbDYl{qbEKKUKS|HBI;b6{Yuk2cy9_2R z;_J#O*Wbs!#$$$`uGD2H`b^W(R-xt4 zeX1l@5JUyPZlw2%gS&fJoH#6_q!+58yPcEIzfC4LU$Vi@zUz1P=Zh1_FNS z0LzfLDs1`%$HNUWm75M})&;5)y!=m6L&h)7bd^Zqu1nS%wOKha)`%(rR17NU zjw0>#r)5+I@}t^hwAK;W4j&2MnfKOKX-&}wUDLc`{K6iV{UnA-oNcel5;hrpc~kmH z`Ncx*O`evy6e4x`B_d<|zqqwW)d}OZz*C#c&LI64w3W#(~}N5Ma9>4tob`xC~ZYmI#EwbwPZKj8SUc~TAfQyd8PK%(ny z?ZPK*-LLKCenFNn37Z+;G&u^C&|6_crsc_#(1n}AJCKXRSFY+B5p(j?2`%( zGQ$9$0l06_bXFio-gBezmDo;gAk_{r($uzJ1iE;`ZaF7EWqbZDchEgE+0nSI@n73As=I!b zvGp1z--O<~)~l;+kf!{McW6^lNBMu`B$eKx`j$*S_%=IS!bJ0F+9f?Ykhg(}?-4L5CX&(X6Y6ES#kt zXOd`sC_0Fu+HV43dr@phEai0Y&I-Yk$C$*DV3dDqlAD|!d z7f*So&t=q>c;ZJ!9*U??J3v%EWF;1=S&j^9@)tPM}Hc%U^b3=AP zj%2TC34PZiA?x*}*kAiMeOZgDT&{L)IJwv5)kmD~fFeyW=_;hRQ4fBkQmIk5mLD_4 z#Quq&viA++@TK6tQp!hxSow0{T>h1ixKMF6{A0ZR@G3M7s@JQesg^TxoQGyX^Zym; z|9dGXWOn`BcYHaeRcFQ*PY2nW!6d*sn&yGs8wX6Bz{BhI#SjlZt|kLx*HJ0qf=C>zx8WcqO3rvSPLUlcq6QJoVUw zPunM_w4w9ckHOGUp@w#r)jEjRpbaV925&Zm{Z%?E4e|C!tY=H8fAF?~TVgELpNSs_ zvm0)UCED{YJbK@)98Oh0P-yyjag8GtNPfo7nGd`OttNNdV z04^^ex4yOmpP`y?eT*G`;Q5Aq$N7eK29z|+K@s>B1+h3#I>np+B@qtz3Lo%U5h<$u zSOhJ(2~3@@B|?Y-Ioag7Z()lHzeWYLba38PD3t4L^80+oYwJ z2Wm62t8M;!#7ue4+bcf*DIksT?2^5VWw&C8Tl=zFv9mkT0-zRPknCv{<-UB zlx8a?1vk=SMz4*+n7)b)S~~4k}{fk_jYFZ#f!F&<#mZfK3qapnd>1f zz=OOoO(V)Q1?*%bA~xM$Ah4dT^(~5atgzx|pkI)OK+Cu~RcZ5sWDcj9~(1vtsaf=m8q>P!fbBKN-Jv5^-O#t z({NQ|H1Y3$SHkf6`=z$?x&j{K$}s%!lfVPp1&!a|1U2nExDItPBakqUZzqW`m-YpL znlUwxKvB;sZ!c7m@eAXGf*g}G+Xvn57f=Tp$0_!X-jn1nd?KaHh1wU;BMJ_-+Ig=5 z(etq8xru-WyFgFQ(0n z3$P??8bcJL!DYWdtI$GsFN=qmJBp5*E)2yL)%Uh(cs-1<9le17HktiRGB*T&&sY<| z+jd&<4X8>GZJRV?$uot8VRttT=^^>0<_Mg8=OD@g7Q*610}<0Ke?Q^>V%)kkq&BM) zuqB!>-_tjT{a4RM{uP@$a#oCZ0k9acZSGY9Iuh|lk1DD)Ypo1Iwom*4`+<(jE)^`Rw(0boO4V=Ma|0TW)J~)Xc!M)E8Q zR-20)Y%2PqG&VZt=rp=NdW~%P=EmT27F|hq_;Rx1ULz$~(SYkHtT|E;W5V;Y6nB@x z^>9&dWjWxeST0~-LN08!7`~l$7m7W(YbxT#u_FCpNciIJkn#zY-CZBkAK4KhS0TG0 zOQDKCSsC!wKCg0T4&ye;!@j|3oLEp_-%nHQfVl2!pv)<$iXl zNF2C2oEZ-&J+Mdzc^^a(+5<+=Ce3$3n>nk6vd+a*FE^S~Dg)g|6E$pI+gfG3`4XW> zL{*$$`29QE#nL{Z*sG2V1p){fv#NNJM*cR5EIM`=0Nv zc~p}cXVR4M(O0s$4(Y33AqpQ*mMT&$jyc?_P>^J~x%=`DSbs07_TQg8c=FeK%4Y8;h)hXsYQl(&w(lq zIeK{E;+hd7N8Ma9_Wp%PsVc1#qZ^VT-UH=H^TUEBp6|7T)1j)f)nss_uE>K2Rn-;- zrx}BA*5}jNKG}+ESM+^rfxUms_|b6HkHW5fD4fn&UsiO+a-d{7Q(1^g+H5-9Madej zxD$YFS`Gz4CUSCyIEDfb1MjjAl83W@$&R-_ieI|<77X3hhbY?INTW}_08Ga9{zZBz z{CZptx{FF80shXw9izBXY)$awV?^X%yxjFGZj2q_w>flNYT5YU4pLVrvmr~JundM}v7+Rf-x>ro)x1FlN~banp}*ORLSCU@&{>*&dHRm@o?6Ef@2Myb zn9^0RA>xY9C*%^}asxu2^+VRK=c4McyULB1DtpmaBWWQQL#ji!8*fP1FUIUwOnYY| zcMZm0kd^^pN#|F$JIlQH*Sg=(*G4?ZlZ$XYU>k(TPElNcG$-|8ir-7v%8zk~FfV8k zK!2{PTW?%rN*pJAj0(_X7(FbUQh82Kuw>tlREf6`OX|JPEwpkz42nG~2wXa2uViuY zx4V>^fa}WmdZR-YsPPs!8Wjf;bQYmw?T*x~T}*I%=aIar-C!|BQP3y(2D(ZoPfzCW zRJg;B3DJeh%yyxs#x-&y?`+!sRsBgVE3R3>5M#NCEKL8Jlg?t*%uF>G$=2h$v`A+Y zZGJByn~?dXZSWqvBVf?10aWsOGXxl3IIvz~UPbnl>@9S3Da$dIfju9n2#P__g|h3| zq~7(cL)eh?d_xb6RTdNFH4t9f)l3rTgTRGC=O*6nvXZ1P93EjOrrrXiN1^-1P!0^x z7BXO$kOfSMvv=uG$n{&~Y(J6$3|^m6{`9(@4Kcs?Wf)|wYe=EXB(sO14IZ9f3=#z6 zN*;80?ctsuD|1)xGif+2GkPj&8PCb{rI69MZx^aNiRGKk4TIjy_P^gTEQ<^vWvj?? zf8TbzG*G?IY(mxU;%l*T{cezj@_brmF}-2*R^n{j`J}FRu2%XI}ZVkrOIvmZ8&V8Idzx`T8dVCb`A|`YF0m&gyCU z)o`@DL@FlVlFqmD1Z2w}tY4=!wSMRCln*uQEm-hd(f2Timje&(Lojjq%Ce-g_vW0! z2!Z|Wc?-fj@|>(AKO1U!cZ9z0agT`irtW2>d(8jcTgyWQ6Zu~>W;@M|ohX3e*gIf_ z2$}~=Cn66pT)H`(aEYdr`zAd!cmZ%LHQ9zMDXsqZJnTNtxK{`2J0H zau)I8bBF7vm!BOcE4)6__xQKZh>aQlGK(2Qa&6JX33z?ix_ByRrIj=-X~J_sjmb#P zJlCV0bNSGw!bWUbjz2-O{c@|$jPyf z?@30UnuIJM8bEab|KP153|de#T~axIu%DkY=F2pb+zz(XXd?RA2K;8vE#lrewGsIPwp86*MmT z{aUFxu}ziYdbPrVE`km1wL)EJ;e}kZxnFp%D969|jp2u?KQGaIG>suFK%wJsg)Wg{ zlR*p+80d5^3^g}8^XyO7khLR?H~A-82(barXZ(7g&p{9!bw7Y>6#e`pY-aHEGh^UE zC;)*BmK~2eVnK2CxR|MnqenTfH4(V=&2p^wPv-xT!BW(axaWy5A3SQ73X(|WyE%lq z3F4f3L^jH_S>s!n7gRzTOuHda>8GBhUPNWxDP8`s?82JRdiaatx{;KH*4BgW`-ux1 z34ej$iX9@Q;XYgL+wbY>Y?i_V@$vOutKL&S1NrbFVbeQL6r(b zS2(J!kD{fp%Y;`~Sw8Q`GTF$UbQy0b3Q2(DR2T-+FEaRfh}XEzDSIfN&F zJzqFCXxg>d%-+{R)K5OpRGYC1$R>7b;$qF0oSe*rDlPGwZ`PXyk8TO#-xW1!mO^-m zslH8+nlaQOR72{4Vq75zr@^ zN9n~gAHS#jWD}10&usY$4}Y^SuUX}l%?vnB%SW*1@e{=D;1K2fDde8B5+Z$xiWkATD z^-anrkI{?CW$Z!YB^}obfu0u^vO~{F>v#5P!3!e`eVq}vm#>7H#(JD-AfXgSu{euY zX9sqx-Pvm_8%}lZ`Lf0bX8m$1jtXfm~)OUiSVG-N+tzwsk&5!Nv_vTnrBF&~_CY4rjm9MEE@pNcT=$&mMX z*Y~EdBw!G@dp49JxaV&-*&yof@@ZD+f!PU1^hIM4p|jC@i3l|ELdmdKN+8zHOT53< z3QZa@2W17WNMKhBiMHnxPYK=X-u5G*(X)(5D_r}Y#gXtsJs0{PHvK4NUx|J5YAQI7 zv{S@zSm3^!?G|(X)IHMHh>w5ZX%L?J<_8;B{h;N<2$<12dDf=VT3yBs#~nh*E{)39 zv%8T&P$KlMzH>{-iWrlK z_ickq*BuDNZt$oM({p~?4|T~oH_<8v{Pnr*nQ291+cJ-E>O=6SGQRp&enR86)(aiy z)Q$hBgF~sU!yL!o%pZz_GbE1fm}&tf`+ySpBqw?#A6j8jfgPzAug|8w>d+%;B5peF|11+)09xGzK z@qm?tQg|eqQWp6>rTk4ws`mT`@rP%B%Yt3+Ej_>eyM+DSWj9aV^WTp*pUQUeb^VZD zNIY*aYwxY!b$@bUA-kv<_Csb-xDRI$EX&-5BWU-DKg4Nc-ZCu$`(A=)JqX&D&YO>t9)=lL@{R!1XSJlpK@h_bdd(twg?T}hbENU>_dT!XgB9}m zfZv)6nAj&UmE-}Ka{K^Hl_CiSXbUFurHiDUEOY4P_1rqeca|~rgOl$P(Ogm4(Bx@d zV`N_P%vLF630~wZ#Z|fYXKO?(4vmFFJlWB$QFrWFio6SvC{liM%`k-w3wPz0t zGh50^!sFPdceoTd?=_FACFqj8xFsiFXx6QkU|<6zEYkdpTfpGMIJt(V%6Q^aKUX=E z7Or=ujHzu!0Kzs%=x&r9*nq>qd0Dy2#I#s4ET%!g3Pfa37M zTW9U(C&JQR0i}vA0~NM|pk2QPZvHyB`)feKU>*O}woUc*`U5ohyI{3#`e-Z&|J}bO z5vWzVD25DKbFcKCyt#3ULpsHlQ}Uf8EL-MCW+?=(&(Ze>#^K%BE^*1 z;#N(*SUY~sDol}*YXoV%$QzBjPE9OQChN(*ttyOzCw#b9@~aJWL0(~%7aFkzS zKkBj#^yO%nS9vqgE$g`7eBryYeb@K*;2SyL-S+t?UzpX*Vb@WYiNH@hO?1Pa;#~0@ zI`N75e9^ydOiIIEk$an}Z;mFRgN|4C9;eMR=MkyY=P~9U2%NU2Fpd@y)T6Kpo1vh{ zFF}*Bj#bScdHGUuD$t*F9g?bOWu?(>w&QC`n!-j_^Cl5&p99gHQbqKzwq6|6$z{B2 zu2So>*UJVeU19wOXfYH1V}>*C4OU6G~kQ@QsXVY^IK)yHH& z=xWRKuD5wpaF{KG3Ch+g7vN{r=yVX6$g1CA7@uzz5mTR z%33AuA?u{BM9x}DZVwu6vs!D9uGbskBFcRK5RY<(k!uHLJ1u;VB(0+L2%V&boUuAt z!)! z2r~grbuBgg_N!Xdv4rbkj5>Hv_++!&d(USlug9=Ixk;lR_BZ!s>Nk`^SL}vPocLJ-4+TSPtT@oIt{KzS)OfH}8B2edT1p5Z0DZQ;5yR*v!^;3xS zZo6}3^f5NwcZ94jwcGw$xlcQsFn;sAKbj#}>E_A8%{0*gaFo0fQ@Z}uH!QV$s)aZ$ zj-DgrcYDjHttiG^C1YjrKC#B^YmvY2eMn2tJ;;iw*&DyW`GrpX4!e-lTn*ohAych4 zgQ3kK4~gamaUV6?tl5Aq$_ zhH+4=4j}GQFvX?;8*8%6B_Z~^~c0{ijKw_ESN)?k3K3d+FdfhV* zc>{~`K_7raJDaOi3*q<{3pVsT-$o(`@QCO!MSRuiLU6M}AIp>u8I^04Ev@Vt#TV83bYJxLz5`=_4=H?q=-x`+o(;{|iyP zgjqUNR)!WSz!r!0_pSRZNUc#Nq}H9E`jOFK0OxRH3@ir9k%ZK;nrNH6$4}DN6gtaB zsC-$Jkud$pHs8R1(PZzo9U58;DzKwYHo)u`A$$;EGFZrlR; z1z+7Ft!FWB3(|r}KDB#`Eoz?gEZfy2KMVzC9K1t}eCr^E=f8DAEyh@$FTVA7jfV$) zjPsovyx+y|7AH@#hO~sh+&sC%_++;hVUexY(~6+);3qfe2S3hpi1z;aXd$YOK|}L3 zwj(aO4Q5`b8e3Y(mgE^DUl3~++`RUcBJ75_PWAEXNf=lm;I@p>7iGZ2z?_Q!Mh5GH zrE{e;jQ+t1Z)wPdWE$pJC~fJAxG3aHb8kCIOCK11!x+g3R^N%Q>folx2Fbg#2tOUy zRw1pOF?vxfgrfZ!T3CDC}c|F4Ba$|T6D8a5fdUhkHgf8SPkE;k!WitzmMRG^-ZJ!ja2ZI-g91$A3xBh z{rQxOQ=0MsI5L@2y)9~?9OP@%2r&5vD-}ao%AWEr;h%rw?>^*GVRUHznqY8`DkkF{ zd(3(r<(WVI!@6uqB&VQLaqFJ9>xZO%`6>r$SxS%2w2;E*%vD4_o2uTuj~UCordX_I-d@{)fkhPEZawDeg2ZhCVHVcx!n$Ybp&=0hOiet zyht7p{c(+GB5D5=Z;s#vN|DD2{hz2I-b4-Nh~uuv6Gw*NO?gX%^oW5WqDs2K`js-x zK~6||H~-+&|CkLoUBodNyte3>wt=Hx3>4?W@Df+WP@OmSOa~S+KB~)YWfy?i^etNn zD&86Nw}DDRvij^1%FEms>b_Uu)0udT2_mpDoP`TOGq9hiAfqFKm`wNF<9aGcClH+k zG@mXKZW`ln45!0W32ObF-*oT&vAoa@A1bbhDUx>;v6r9LPNwGm4&}-uu*Jz6r1%|X z(SH!@B}|2E^+Zn}{!%cS@mDX+Dl5p@ieZ&~Q^e{5@0zL#!Pn9d@{tx%Gl7!)vP|i# zns6L*4O-!0w3IB*bmm_i5xvYD=>?Hl8}{#^#!-n9)t{;vZ0%z=@GAl_m&45nFB)$SI$<-$A}=raMeLeA*CM%C2wLiv>eJo|I zo=*P~hYe$ME=HTZ0$5nj<=00;e9Hw*mUt*$#5y5Fb%tcSlw_=vU{$=i4^@Mil5}%w z{%8h|ueGOr0i!o_PO#$`NAb=U16JPKQTW~v%{h>=KxX(svot76^gSasp?{*{i!{V;E zuM*WsRh6_K*jDuKy3Bm4m6|IT<)=&yRqH~68q=E{rRZA_cIX1Pd&C?)Iets-8Cn@} zeID|;G;GyZ@0(Qp$Nyd?#8&$X6UgJr-=`e?wR5j|_SoA}#B;o&xkic}kE&?Wo%C+v z1HZP$z1|k+%dTrKz+Ho_GuhYtGtZ7qV?VdolDOsjFig6RhlSVsU3pk%(OXRTm6q>n zmI}KLSFNaU&wY(G7I&Sm6HaN!7sPBli+&UdYr&fAb|-flZZvNsNzeZ%jPt%N5BHm+ z4SKNQw69$zxe!fMh+1oIRW#1W>kQch3%T-uyQJ?FDq#N(B&YgObZb~)X7A5Yh^?z| zBT8W>E-ycRV#IgPHr0#KT+G2pz4Lay4S^wvl1tIMG0zSopC8M~&BZ?H_eh3)S^=yz zGO?&l)j!zan&ZQxRl*y;xoq3#1n)EgGtRzhiTX3q7oOiG1+a9f(Rl;wb_5r9{;mE#3puWbh4>o`&RXGqZFGM9L2Za7(LSwj(and zt7^n)T0)El^ruDa6fx%0ut7Jntaf*?tR&PK{^|p z{MTSQ!WnoKk~4CeGT^6QEWkrEyebug2U?8{rNW`Ur48@SP)uI(979{(rkLo`1Xv%_ zJl}lcMPB%_jJyHk$Q4SFYWD$5Ux5W3O1TfsDwQqD^OuCDcOE?orL<-|*f=)!%>_1} z$!6jBz2QO_3&aM}i&-1Ync7~NDy5zJxuka;o*q7KMfKEtxRgL(5wn{P66Bm-3c3S1 z^D&Dn!LKO=x`A~K!5)dA2J2H_|E{e>ka9E5AusDdl&L0FaVt+YdiLZK3Nwhr?BP!x znzA8H{{Ms5tO5%Ncptz}% zY0I`$qi=zAkWK@iqc3^lNgGiOp^9%C5`h3ClghTD!>LH!t8aa-!mO>U#9MW)efQ}; zIQ>U`+x@@~9v^N`yeZBUTjEvp$@+EJ5&zfSuGra8dyGkQgpn!ZQc#7Wq6YFW=#7&* zTcyUIf4lfUO)KLpmQVDiMz6yhZg&mKemesOwti~@#tHLs%3dPqcPT3E^)Uc%!fyD! z?{?p64c}5Zv(no`Xm+$!D~n#3J4IYb=z&#*th@A8l7L#~V2{p{(A2K#Yx28|L&Hzz zYF_Eijj~W+67=JN4gpM64Ds+s;Gyoe!rAtP9Wav;r52)pVn1?lw>Lqo?vsC=wJHiwu1xX?5!3^KsEtU-~?Wn!xutgB@PAb)olyUD_tR^u5$ z;2BHY-%DSTbV@k+6FUt!D}`E+M*=CF7P4k?o2rnj@(#(@1igoxfDfUeXL65v=68!c zEiHuGk%*Fw<6$6qCgRPzqRt2MRVoKEc8A)enebIV5hA8e9_lz#sJfDgWJN{+T{01} zCl-(4tEl5-!;$BI`=+a5rlyeexz*Sv3vcgr8ql1Ka7)q;xH@yfm%82lUyp*pC7NoU zc(L_1zhDlvXCf8!eutb4=X|PS&sPwVx^X332!U-dM>jdpL@ogh%$E26gv$(B)4B8R z00DsAEkZ>SY!KioW=Ay}(t+&=pd?{>kfXk#Gcpqkuo!`ows*pSgI=c3K~8xl)a~1| zsi8q@q|+}K1|ipaxeYhq74(qe%h>kuzvqlOKo31#A2FeOpAyNb>QUU+`ykh=_>Fnz zr1fHA&WM6Bo(5uR=;Mvu#V_Bej(O1w7#My3a8Cy|*+ztob<8vT^MRO@{|O1mS-z}> zo)2I2?0I{^eV~QZ)b_bj*agrqz=XY$;7`B)_kHryqb(lI{f`iajPbt3vd`}(bwt?x zXqTEb`nlG;{`aUYiZ-}2@?=+az<>W5WOs^G#r~SLC7hVEl6C<9J{+D<-MMdK5%|)B zOIXU#uKj8a?1nnM_e?9~^q6C-{pC&BF=(Ij#5;=TtIFWD=4#Yhnk9J29~89H&93-h zf22V;NO4NPQ|5^`X!75H53RkRMuOFXtms3*>aBH{jr|FgL8jCL)i9%E`&Iwa8&Kzl z$~e!Klvr>fXv?O1kv(vadH`JbKTFodEV|88iSpkH)el&-LiRsH91=h3W&IFDkT zWK=yHblWG#>x)7Rvn`Jn=+xGno%?BRJIHo=CQ>xcr3<-)%zw2=y+E+skYuZOmA!{{ z%WHnM-Z@hxwlqY68~NIQYoKI!D?pMFm2%3r6d+)JJvcO&|wtf zu#9U>;>c~=94V6!W)94kP>~%I{^=qKa$WMt_5kTR(RA(1+pA{+E8 zjzkp{ye0PO>H$W%{pvItyaOSe$nl$Q{iRTysXwBfdlGpb>s^!3>IRY*V^xtlTP=uy z?5HnBrY-6hZJ~F5Y){9|IxeAaD%*LV9o|!S(wDn)XH01%a~cDS`ug+?nPIiVSU+;o ztGB~6M&-xAdLs@DZ1$~H?O%VI!X8VqG5G2Yw0j9+{32csTC=aU=EZ=B&3XqI5@6I* zR1m=q1uSU!_?$I2LQd3CC7|qkGs%dgjaP}sX(3e3XEnT-KvPO!eeSEf|4^jyb1%&? z=!y&jN=KYMS2`V19k^<|BH4>PPWL6~_N6P@pW32Nb||3ZvmDjgyGvrznI{Ba;I4|> zwy=|SRWpebjQPz!6p>p~f8JF_ucY4K7(DhPv*|mcH|*z5R%LJQ|Br(?DZEKxsOmxE z#E6%lT>jS1*nCv_YaGXp^Ut61z%;Tt*{slbPvwG$E!BlBr5>#I=x5~a0~=-%QLlog zB{w4nog#9LV}At~txrXsc$31d(pWbc6GLa>TBvdahc%xnBKv9cI;SpPb6C4y@v;-n zqHyt^u^ev)zgh5Gl}L2-9+ULh&GU69hMUZ@ZIt}8Cs1PlX0{kPc>Gazbx#QlUkgvq zSL#_^Kh?`Y47jjj2O__(Ye@{!`y5KoFK!QD>BJ4R9!nid!tr3=+||^5{Wawcx&$;- zRWCxU_Q})`FkNAw5d7xiQhz@Go;>E9Y4YiNd784J91M!@4iI|K%p`zBn-iVy$+-e8%9feV;yUg7Zn@x;+0M-$9we+9;fTytoZ|(v$3x?oQOH%9W zx3j66!)6RD9e4n5^+SCBRj&d63_Tg6ZV@*(Zfy0!h_T8GM;*pvrTq|Sg z=lu=lmP(5HCz0+y676hYwWf!%&rxj*+1Ipb#vPkcOs(0Nr^tD)+ z!xVn}Ky4);B5A{`R7_wSUxDi`G*)w7ANzrsQ+wKIgOHfOL6mXZgS2N00aZJ2gOA7F zbAxr_@feRJ7~W->%2#m&C|Ee9(8Ezb6kFLMr4)fRH9%?C7mIg%`kg-z~X0YQ_2mMd}mtp zb|>=%r-rs>sIJ18bzII1U`g}gClPk0xaMyH32I?cZI!87&zumf$yrJOSO2eMa{t$3 z$aDWU83i=4e`8*fkZDGo1N+wXPxSmAVrOICy<_6)D-QI3=BUY-DXE^3$Ii8-{?798 z+_$gVqaU?dcu> zYxH%I2&P2m%P}AtSVoFJ6=xBnfi6V%pKe+=At3a42{>*TYS@2tM^8@op3@*`GV^nt z?+cfyHI)rI$kGU6WJz5V2sj2oJIn_`6Mm#R4ClmV1_IPp6^yw|{pe0jW zl%K;C(Gy|^_)zu0z*W()+md6o{TJI8h@Kx@7zLt+BpA_=A`8}g<+BTaGAyRM_dBpk z0c>T4it%AuKmZLsY6T?6A+m9@@VriCn=mZQvPg|MBi#v(%!(%M8HYOAcnbC7x~&ciK}SmMYGvV(*yKo zEIxVvs_;)^$SUe4=~LgKTgXPO>W~!VhN&cy0QrNKyehW9)I0rcK&J8h84tw;4 z*q?dxs3iX7%O^@#NRG8Kx8<(`Q;5{NC1;;!%`5kPXG+V7hWwhkz|=J#WklN_EwTX z=(NlgJ@Pr?tPGM^l6l{TPR&}3Gml%nIjgrWm9sVulONL&J8t}{gGYX*9x2bU9^O3f zXftE0P0ehhWpH}Oh#&!12f=O8C@)1q zeQO1QeuceIe}B>8$1b$zJP>6F$tLrcZEBbb>2bcnRjRJr-Yj*nKZ}N6(yQrtjKscG zK0Pe0sy-{exvh#=GC3y90K+QZd=bYX{(m#Cp=6y4s@>%$dsBJmxG}zaNPhhhK z!A}TEegc~?CCWXY;|_xF%7Dh=Bg#+ig+YAl;px9PW3@S|)7|2Y1}wbm06uHa1$)_! zjv?~U{x#{fh*MKdHLQTM#&u)z=f@IviHqJNarPrWS`njBq6&*! zz|O}VfFJR`QN3kt1^kk^&$ne)L2wudQnZMk-RFcK@F8Am?j3oX;V<5YUji>V&i!&{ zQg2#FC|~OlYX9Pt*`jjxe9(#_rT{^_4S%#uO4NdTvbXPD?etdk$dj}bUlhg&Gy?eU zn&GIo?4{|l^2m>KPTGOLxZo^e){ey*eZ0W6(!$Du1%;0*KjpC| z1UBq&5OHtHnxF!psuHxX?CDT6b+R1Djpgj`oIR zbt6QXbX;5ytxdnX>WnMjfS#kh6%B)SV8n*NkxQ+`#=WD=?pxIzlq1@(j63!3 zvR8y0#B9-(ISfQo`P#V(NMb&Nba+~nWp&FM1~x5C50B4pHCfJ_OjbpE-+(FvRIjY{ z@b)%T1GorYw10J7G&5w@WpXs2dVDMr6vBp-VCtN3VCpnV{ePA{M3HAeaN<2RgjL!l zc=6SLQOq^Kf^{O?U2Mi*b(`vo{o5;B+~;q(RvLc*%blnm3&D9G?ZYpDjcklVAbzNm zY6M`bLMAc&Kp46N>(V$)3$z`5L6*``H(%Gt|JiXye)>ydGHQ4ao=3xB+YBc_{=F-g znq?Y3tRT41uRm>28GZS<$Q_ptY=5?Hen5o*&)404jP3H7a-&C5Kz_>9kTs8G{!*w> zC!5aMpk^@iI~Q}$UMiXO^l0W=ksmm`%k`_pY`muh_wLi_-Q?dXU+R%8_SywE9sNyT4C|=9 zfys|jO1^3XLHkq<134+2C7ul6&>m`SE2j;H9IPI~98wk={AD`H?wEb)ru1uW$pzYv z9SySX#KugREGMhJ@cVY>YlpL=!9$I^9feu1>$>7~DWBDz{X*zaJ$v=^j=o3d$7Bvf z+1D2U+v+>Pt|Blqi#5FK?_-AXa7t?rMHacj+EMCfaRs_sG)9`U=otR{cTZM+@t4H_ zNeL`E+lq*+muBUu6W}k^RWY)rkf7B62>FEQUuD0qJH2O@_S+%hzapV&GQyG^GN%Zc zB*P`JWwMZBdw2)ovT)_atxIKr1fVPkY)m@gU)*}ShaH$=_>VRf4f$g6heb|u&*$(H zV6%8&h^BTor}|#sc=lAlHv%A1Mr$#Oj2M5Ec-^fkIB)sjW%A-f-d|_IHtYNLYqlpm zw~M*)cWE=2!egURtR6byuJg=LGGZf2C+Bun98dH$GINz2U^H?Fn&tBxQqaLWWs{-& zG*NwkYDspFzzpR%v)elY3$r}&*@@!-Y_L@tG_s&bW7B!elrj z*w%2s`?a>>#cFuH+#4i=Qo~SUV1IZ?gj;#smVW42YF$&nLz-1lQtfAb!c5LHC2$Y4 zH|7c4<<8qe4dWlR8ndHMeqm3VtEF^iuX^T+#5By_`*|o~!AjUkHEH!`#CqW;HH@HNH@4xjpYyGdUn{3Qd8v4$Se!?fHwug}hiixSL)ZzUR;B)jj~4 zUGpfnvei=;PY}u8_>%!#{P}5&)k^QlnDiZbaV+>EKUN^tKE5TZf)~JlW7Tagxq#D#AC5w<|acInPcl4Wws`EO-oFK$FGy*X_0R5CVqu(8r3!>~q;R3GW!IMVjq=5=8ELv|F*`UcsPB0-WU zFOX_>nM!DYBG1x$J|OK!qbT>YXlRddA5evI(ck*hE=8u)-@1J0uu~~ZW=;6~$BEH6 zzRd~g1sO^Zet@;u4*Gq6BrwL-O$gE=G`SO>sGz@Qg7nNSqr5tIR2bIH&Y)o@ zuCz6=2onU~x_-veRplhgWgw6Cf}J47i2>gTVAD%r0-AZ(u#>*Zuk!241!8Rl5fLo8 zMA~M-t{XMx4(wfPq64c6?;u14djbAl{hz_dn&5W&owIVYL1j{WNQdOkMOX!q)Dd_Y zxz=)CiC`hkUcLf$;?FNV_N!`BxO7c5t(EyDMWP!<_5fd<*)TAOuOk$#`*OWJGPc~=ae9$ZC&F*Z^+VumQfYp&7$DELb zKp*$4uIfaASbKU0xpyPZmpu0uhLxOM6LgR3Fw(R;Otz_XOtVStv4!9y#ToanGaMsq zSPnPd30?1*E^&Ii+mpfUi3uHt&_Mm!$foiSkZ0W6jdzF*EIK?db2O5@Fy1Jdy&k2M z`QD?0NKgdv%+>X^J9g}~GmVFSCX2AY9}e@nv=XGWhs-SBqQXl*np~tC6K&q=63Zdz z+xzdWTDzlaqMa3VW$=Nx*d}uT3^g2&0yR(m8(&zN`R@miVwmoVEq4P@5&$sDvC}B> zzZ&4&UfgA6vdY3!6zN%GJpf3zxF)MotUD+80Eq{(xWk9DxFdB$Kj^!+`yK6O^C%w^ zmZxjSSDdCBU(QZMN9O3%#(N2Ew=(; z<3OU4pXy6VC5@7#%6c}(GveQO%d-)Y+d8*)p8fxFlzsV(bz81)xooGDG+fn+lZPJF zP8YT*-t)fuY;Dr#ug=yTWWIw3TR;)&&uQIx4dkb|#=!L9dgj!(P(dtuD>Fkip;0d< z)o+Yt=0(v@=|`cd@9+N|iNBRkm*#wQTcf@P=|&zgy8*Ml20HhmRpRy6%JU5{BkKe@ z5Xjm;76})JY~pA~$w(RK6JpnM>!d2v{n^NNYK5x3dF{!dS95Fu6}o zz2?zQ7c$@Xmapwd9nqRtM_ei=Uhc1jY9|6r#t_8tKadyxzHB$p+K{KG{$caG5Xfcf2Y0PNV&4bF+RU8d&2u@2RCUWxqm$MX*Q-3kw zX)emQR`5V7feD@AA$+~hG=nY&gz=0}yw9~k7SYQu{PYHjjI39%U(H8d`A5t_qG@v2 z<|zAe^2$9qh3h49rgVI2i_3kmXoxw#w-7Q1J31Nu+lmkFvl=vlC=bb@cCp!e>as`> z<(7VO#2jXfu3KPqc70IAd?}Aojw8!^&lDb`_RfN$DP18!2JZeXd8Ok+y;sz8CVFW6 zy8&;v*({Ag!(TGNoW3(+x@T2aZh680g0&)d*GQ1O+7~Gx@)({}*af5x^}QZuxtMFA zd4LFX72v%P2MPkw^Tn;tCv~uqSLktdUAYmUh%g&I?t%zlMe#jB=tU6j!=dHBh$&|1 z6cfS7vf!EsVMN-0iF66qi2F9s7eb*GK9QJZx7@|eCm3*?uev(}SxAx?{@t!EdlgaB0B!jc&+E!tN$6B&N8KIw$3z1vun) z=WDFGm2_Jo0&@b`P;-|Lw*%Jw&3y-&>yL^Q>a41048m0fRd3Hj>2ZRy4F+ zTj-K95wE?@uX-i8sDx-r-Yxz9)5!GeV&I+JLJwEJS=n}N=dDlr8=XANP9Y0X;;ap8 zOGTN`al&(n1CiZaHOC>POzq&Ey*8Et^VVZ{^N>T;EwxzWlLFn#hax4#Y`2fYs1>}8&D?=yk-~P9E!O#`;RrdZr zDJ8YY_~*7pWfZ0M>ec{6;UC?zLm}kRqUDt}jcS=IX;3D=IxmZQWsqY#H>V;H~qvsMNApL%yoU`K}|OK)C|@>`xw5NXI*NUxh!?(2}eUPUuqYsLN@9sllW`!597BaCa^m_~@|3(Zz;6}(<7{ssR0qiwfOx>WoCRvioOaE<-Au5d zac@GTa7pZj-GtxsX+Ric zCA^n)`z0Rf;t!@rJoy`TUrwhwWk=vhDN?VN=WP9hrS@b?Q01@A5Ae7ySs=X}egYd% ztRMNokM~gQJd2+vD09*-)$0{~8w~D{ax353yVZI$$vZbof8h2WqjW;hUh2t)mnimr zx|YRPp>5~M<*WOniBOYn^5!3jA11QZbvT>)gX#rWHYh0z#+LmY(twNgTWZ7&;e5Jg z;dtqXF5J+ZF5YcgC@=@`_<(Xl{=ee^qf`)Qb&9GBkYM2Kn$V>}2BmhS_TYw*^1#Wg z8-}71#Y;3#P7lR{bi=l$n}9oi_XOX}ZQ$OfAzwar>3fHH8&cWq)o9>{XI_=CEOD>8<=yzpk2rOU4idzV)08 zrk3n=mYw8U*SDKcHE#%zLH<^+NjdwxQD>X*@sU^4jHva@Z2%DQvekW#-&^{xmRu@I z$sqHm4ELbhGvY&4b8Da5d_@xHe}}cyj|(Vjt`qvwyEs1jaSPtA*&aIo!NKwIT+eIt zsjrLq{+rJNCrUgx);$dVBOhaz#dUS#jBrsTZaWF?n~^ZGgB@_)6YP_e~z`1-t5@i*j?y?1X>+DT1T|V5K;FrvdYlvRiW!K#1?M=4m-R0U}+>fR|%u0L+ zr2kJ*LgC?6De@)iv`Jz^D;3_B0(a?RiUFAn>?WVcMn~c<3)u{#GC%OZ(SPKi+*P0D zW!;iE0Dz-i@GU-FW_swY{@_hdCEeqCrS-u8+xeiYx#+u@ilahKyBW$kn zsmO`kzvTB{9>8jG-v8nw2W|n<_~PKPMEzhA$j{OA)#6 zdxPl4CTxE6IjsD_6}`#cF~R$EJ&-tM=dr9XZBz_neJ(C@|HM2#2@-VGgF^JN`k`tg zzRdOs0WyM|HBCx=Kttl}2Ahqr3Yi_z9x)$X_Z%!hnF4zVJq{r@>9i3y-bR?IQfguz z_|_^LkqRh^4-sunVr~&b;*BkZ5qT7a)Ub7-V$JEd-g+(_>z`A%6Nh#}kMA*Ne88!C zsA{nM$mgg|zyxS?iuEtW56V!G!P@`8fyKmaKW!6KSMg)}#U|pd*=_yWB1+4~@j}Xt zg+K1DD7lk4RbymrdV#ZfW0%x+lK-$*uHs@e!KV&wSOJ<9F!;Fz@(qW^paKJumgRf$ zixpXHJ#x+s&5N-xSIs@6&Of2FoN$qj0&tPqV4#oK1EyRq;F7P{qujVU8e0``qS_k| ziQa$Ze_8m?JyEz6U6ROSt-+H|#_y1(>iR5BWBI>Nk-~E37CZ+ggYy2C{hrZVTRsX| zoZK6qR9>b(*eNw%^Q&VY`Q%e{a{#FuZCeh{hGB`w_Ju23|2Fy=-<9tdr%U9|xO$z_Z z9P?XsRGN_yk-3r@BlUqg$suxvJRpIzZA|fFnAG{6D@+zcmsKS-92ok5C1mV0m8dYM z!mF$*KkU1UFA{sR?P}96!BjtB3}+%&Kv{bZO@`V&vEIK(K%0;x^EB5=5bT@m0;y}2 zioVR&5$NK2LsYXqjpcP>!^^HhXY=6JzQBwL6uVWGm1mIc(Nyj+@Q<5fxJEB)mahMu z8YF@-f@fFaV1q1CMyRv&cpL7qmu1a^GTV9tv*>|f1g-4t*Zx$t_`xV5-PmEgo7pa0 zjsv*@eb0r}BYf*ia9N`;KJ65WnI>3*gPkq=Wi*Y{84QB~KSF}U?{JKD!L zt2o~dZV=IJ- zZ_*M)N_*N4jKu$U^l$V4E>b_7tutg-eR3aZtw1iiy*8o$f634zZQWIe*V*`#aIP;h z8|TQmQWQ|kIZSv$BMWxqSuQQ|0;mJ9TdyW7=1Pu#rz~yUlZ@Asy$|UuXY)LFuj&VT zhFc9B5d1s{tBPQnO`*e@a;b@t_FrCwfgUCn9Hrx%aiavLD_1W6sy}=3%AM;^QxmMS zND0ML{Yt7ZVNa31$F`#TFpsdD`reum zn$UallbV6={)>b&b)MQ5?w8HaQEq34J^~Euj>`4TIjf3tdu$z@?{hjK2tv%?+Av5LKwQ9p!n*(re>e_JB2FOfR%?o9(GaI+1OeA`MCkWd3=;+Sn(xs%o;QwW^w#*cOLc3hn8QA%jeGeULM z+LT;@b%AHt?y6fzOSEGuKres>p!@;_0iQ!vBmg%!C7YoEHW_Ok;BO4Y<^fKpbY^Jb zU|rf^EWjJDI`T;KYjUwfO98MX7_g_tin(c&RsT>k8WoPa*BG7?YPc>QJbmS2-{$SNmcV+duvYDz`w2U{fm(AJbWN! z*3>Lm4nA$O(#e!{*EC!$H~%Xu-+f2J?qG`gtgeE$1AW>$mIS-i?%WCKg)WH!`}3KJ zCIlh+@#Gs8ymt=i6Y;jF$&XAde`7mQ~7#Mn){gRgy(B+3^8S>36cssf^{*lG z7vmlU25QHRRXh`;RTD^ zlR4O*7~d*+E!9De*}ciJEfa!%*;h^5#-_r|C07o_yY8j2PvEgJYKeodY!)^4ISd7U zTA=qlqN|-^p6EJvjvFSGtH)#_z;Z>y?W!f443VG)IR7kB!Uffp?^lOX+h_AJ7s?cy zh_+9kyQrs1t7m9*Fr$A$Z0w2H_H(U`$@b#WCYVQR%XEGHmbeux7egs(pou&EVfa>% z=4aLK@GFe7$HE_|Ajf#?xdL1W3b$PL&6{7FYJBZ_u4==cP$FxHT)#x<@>IjLe`K$u z3fL(1vMI>uS4@iYtWm);r`&~u2+Yk~afY|YS$QN|ilSBdMpf0;rUiswh%727wc2&I zBH<+SBz?}c?$+Dy2m@ym-{ZI1;Y*)P_OnvYPH3fx{&9Qt-c4Gomp)5^Q}qU`a=YgK zBflcVyM+RH=MOS-=<6-(u)yHNf#w@-^P~!v5Ni*t$iA|y5BD#u62I%3mwRXG3}>b)?!^OX>10iPIAVjp z9yH<^*Y+<(Td}7&f*+)E@}8j^qCAi-)h+tdR|Iplw%*>fr{)^wCHvB@>Bw>IwKw%! zN-JPBoVazKA1T3ab+*;G6k^79sn~_9={sSDn}J!H-a!_A41jCqkL{UrOTX5`@(0(* zyUmIg{34eWBMr(569Y5M13NC-_Gn4KlhLB(Ysa@*#V2_So9VZ<)$!f`q|zkeGoutZ zO*Pz2wVuI>eWRMjrV&kK;=c97^m6L7j!dk+t4gX97xbK3vyL8yNK)3d zfEm8adS!NmVMaudOT3oL4Ry2}PBPqLQox_9*Gq01A5j(X%M9BKZJ++O`$u>l2|DSwP>4x3 zJxNkC+rM^RWvhc#6Xb|!@82uY+T7Oc`F7^dLsA<}9@3`mf9?3i!+bi)C5fP^b(Z}p zbq0N3P5jV#nA+@J$sC71`BNFwg5rnISWBslDpF4qn?3M$X47FVJ1J40Uc22j&~;N5KQ!cepsU50;dWEFiKc@VF|Rv{{(j#(-P@U10w| zH=*af&EW3zDZgv)(puB1iyh&*O&p(TQ?16bVBUB(!A6@7j{XXeaR^0MGc4f6RWBNbs%yc|F zY?9pmVb$%%)d6+|00HilNCF&>|GsXbxR*a8^-I z_foB)H%H)ye16;6t#{y|%=mL>#bS}*%iE$s2RnN+*pSGzxpRo(VIjDUTQrzFp?P1K zGk62%w|_X-!(DlCC!ys?!S5{oGCI)e#A4=r{-BE2W$)`)M=}|=@4L)DTp!YHi6zfH5#;p0Am~p3t@wkT#RcY8Kp7cKjslZ7 zW{w6?Fx=Q&hi&EgOKfNGdN=TQW97CmQMB);l3zSZgnBxAv@9wwSt+Aa84$HIQ);#T=#7g+?Wgbd`P83e!GTfcwTS6M$YQ5aUN}Ua> zS&mg>FP=n_FLYH4Jyg6#!VE}d8P$Rsa9YjaDtR!h_GBvJ&uGe?fbhPF9+1X(ww)@j zP;T9DA&}s@6NeR3)ABCct+)3xDX2;1QPn-7wvE@+OEIch^>s7*c`X)Vwyd{qc86&( zT<(NNcKc%?Rbz0rtG77?bSJL!^fv3<0JJf3i~p9sb?QWCkG+ePYH#SAmxHF>WEt`M z5_C>^U;)-B$Ga*!Hs&otW>f=3GC%}^4p_#t`a`a+st^ZOWg}juPMK8eEPX4iTpsXK z)X}Re=VxiQm$*o?-J~=xK5TpWy$2_7DY*{EE>~KA8a}hUBLbVcO&`DaMF=m@=KxVd zn@#NFr9@IU^fM;v1omfaA)dh+F_X1D<-O+dp~;LdVksZ%p>3(zL`FopXZBBe*O+o~ ztHB@nM!L(sJ!asGEFp7xzAWF>ZT{|ey=EevufV58Q6mC2Ci&*8Vzqo_NeXQ_*jo^! z_*#(Zk2r#D_TgJ+jr@;EtZ}skSM0iOe36g><{eWe3#(n^U-@|$A^>v2g(7il|58%) z{)?Pn?HYO#7WW2%e{R$(<9W_K7UWT*4iq11Gv;smP7gOcKg+c~+MvVL_xLm!7p+v4 zaHAB9I==k1MmQXQq{Lo#P&nXbhVwt6HC}2o7n4aQ|AMqx39TX%Nl~Etol+~axg5OK zcwpN6WYJ*8JL+KR{q=oziS0VnxYo&zMWZbqC$kffxjQ2ez)CRd;n|D|B2N#-w|0GK zQ0$R^`Oq^Kjb6)O20OX0VLaZFspn;49<_uY+}&k?Ep~JB%H4!0B>kSwf@z(Wd!d9k zw{?y8d{zW8*V3?|i=b|KV3~*JAAbA~z|=87QxC){^-{RL>Y)wuj5^r&CQL7lI{ESa z3ZG#0!q>VXEovLqVO(x|=fh_}n4jfCM+GZe15i8cG>lh|=r4lu?%7Z>Tkb}q0N%(2 z{t|Wz>A=m?ln%E3XvPUr@$~gpyXAJrXnAH1`81<%ZX@@QG;%3o%kjEbF>KG#Yp%OFt>x6{8Q!%Q+6#H-g%d~j z@Y2Cx!A}1-B=}z~Fkg?OXC^b_&JiALT2latA*oG+VcVBH(O z&6T-*`kczIR@NrpN*o>boHQ6Ak}{X=pCJ$qvT=n1XV-l@y}o+b3@-es_F9Q)v9nJ& z^OxHEbeaf}SrH&^3mCHa;8ufHa%OobEM8fGGsC#|)x58Es`pF5%_E$9I4VAgdAz-+It4m>P~?Vk6?nOgH!Nf4)atq_5LKn~{1y0tKRXt3TQ9de2BmMdAUHk*=#7|LswzzTWj6{!=>6=3blg}bOUj0Nbx7>R!+^W7V zN=fvrF^5Dc4%vQ{9@X`>$ozfzw>%mwT$4ZBzx=ZJhkw8o&!u1>2ARqFQd;M)^-hts zJ!$ic&1gcMo%I)Gl?=j1=TVWh2QHhSS49f@Rn7&^re>@jI=Wo@qnO41a4X`8#P03U zgxfdlergxpwGlJtC~?_#Z^84a9qqhCaN$>MiJ^+50^N_>qc7vsIqeEWrZaZ+OS4(} zM4wDe>R_YQ(;YJ$G=0BIV6zkAm6QW0t32yX7PvZLj^sZqr`xLPWXLlg;&~mTvOO-k zL~1Vt_i7}U0v*VkCP_60F{ov&ZeUr^E&4KD6U}n~u$(167?&OH4+sN&2lL$5B)u+( zN8=($j(g7tV5%_i0GbDNtyVuF7VDHPNzsepSk&`n?tMnFpl4wd z0nCluU#GhvYHi~_2ygeU=!ivEUpFPT_HspYyx-ETb*53JX;L(TP`FT zz6jRhEFd=TD=F?qaLrrZ3RxeY!-Q3y>CPO^$97QG6RWYc)N*~B_03+w?gH~3<<_ll z+1}3ZC>S+(h4~RB=eo~zfubVk{4Qs}MP~i^M&-QDRO?a+YPT&G+;v^_>LyK2}{5TVWHfZ)H(=J&OdK-k(`4u5& z^R0E+IROU=yMx9TTGRWLyIIMBTh~Vx@qG9;r37@Gk}+53f-|)3Bb!_Iudu*zjiYpz zoq!9rdLY*M9%zB2wH)j?u}VXjBUL1x;~tXO>2Di8?`7e+>UlS(Vu8JrJqKKl5|1de8wQ7q*qE;glrFfM#!z+?*j4(`KK3O-q)?jcopf)HI+93)8+G zI$63TZf80OshUv)o02hq^JCx$L|kT+q}F%{3$C(z50!VkHV}5wFg{MmsG{i0B>lZ& zE9@!IUr%(5*KAKst&M}0c_!HyIkR9J3s>x)+g)*zT(#g&6BmAP#qrivvl|C&A%%X<-H$yY_3!GOlbhwpK9-;awnP7n!jn zoOCFd8uSPemjKu)mTdf!;u>xUu9(=yi6}^#&;maBOEQuQ)HJz~V4pq7Sw=thdCsE3 zy=Q2km4!#2bCz(IxzW&G=rI;^zOwLza<;wy?W?qk(L)!3*P|&S-Jr%JL+obX+5?^g zMId=_4-^D?dR^pDiEC|^x73f|k(s4EfGZGN?)t~k6fk3c_hX|ERDRGgGG?11Ky&rmR0gMTAt~9p~0&#bZyS(zW7E-l-V>bMc zjC&gbyC9ZnpPd??tTrOA!j1a|qg;2g0z(_M-qc4I`}a%zN%QgP`Jr>6)miJ6ua!2` z)9m5%R~{7WZ?|IpZ96sI&v~L@r6y^yd@twm)wDHxbIAkrx_l;fnq$>FchD9umPu*9 zy>>hk%w{}5<=bTBgY?i{aTtKDS$dksW!CFhS^K^EazJ}+$KICFdE5ISlj!>GMM~@)lyM4<_w%q-MYW{QM=iFrNH|fQi%idsv_1jsPAt)zqhBm72#u{rE zp=-%tC^|j$lJ$)L{f;n@J*PQ-atp;E=@_pb>(N3kn>wE!YRlA;d(yHr`Op-<6_ij@ zDVZhGFm>sR~8-#)j1johf%SJsiek;kvOkYY=RQ2Co) z$$56qjR%;R4o}xJxNUf3?8!gUcM7jA22ZK;S!<_IY3hr5je*2j zzSHRWsAnDi?ZWceqTEP!J2nsEd_88vv)uxqocO9j-kG$|iYRTLe-jM#3y3AAdrXvk zk`fg>##F`D+-tu7NFsQ!!}3eai^Ea%xb6w*ZDdvZ$xh+)y4H06#2dWy{cYp{G8fc> zI;X;W%49jRxi}#@e|=?J1S@hH{7W#+}GKeb$1T zq`*a38>X&i3SN=XufIKQ5tAvscG}>df1RMikKf*+Cf4K$Oy*hsS+=EVT|Hc=AU$XG z`nZ%;yAPYYpa8}hp&mgGv{^sBXO)xAh_v0$oVmA>L~xKe9GP03cxkUQoZ^y-rdGfe zWJhqAMftfDI`c0yX0WdyT~#R}W)+Z(r{dX$79uo-{84sQYPXO0_(_4bDfzY=%6=jl zvdS6JVJdXG^UVEaOH%Z=`n?VM`cqU&C{$-S*o7&ccO6c=x93=oHK+i}C3^iEa=z^8!HnV*>qmC zO0cH}G&C6faTPn{EvmRdlrj?rkKK+G;u)+mvGk7LnmEXC$g3jh$)fFhN5-3aQcA=CF~_ zVCBF0H#d^(LZDeH2~;=L3PUJ217$241{T&uW?(~CyMeUAc{3VJXHI2wQRhCryZ^`L)=Iz;lF<4_km+RC?M++xHY^AW-3psY& zWQ=X58Ekgg4IIe($9=p=dgaujxxd+WHkxpI@D?E@vvQ`)yutYf*5baku}d3B4Ml-l zR&=!?RMLSJB!w5Z8rw#)=`#5@ncUL4_{1i=%qnrVqR-!n`E{E@;pW#zsmB21LPa1U zGPHoL5>WVka*Mn2FNqPq1W2!Fo!5X5UXhZ_6y@j4J4wCm7jE77rmQOYe{l^Dx_$lj z43|fXTN>H!kAQIGlMFB)r(A|(7o_9Xz~h)yx}DK~`Hu`>T}^aKP#PWdI?!ejRT1pQ zeH#~?&(S~|UNzo7TmwWV>YUvWYk-WmC4ZvTg=^vppd~8rQ)~yX`zszVv-#~oF5dy` zQ$W0N*lJ-<1|H5A4m2#TD;@xw3qZ^os(5~+>%KU7-#qY8Z^r%b{!Gxhl;8SP<-)>R z>wW*`FV1C_o||G73UCH2SJO3_xga*ThC`j1fCEtdDc;z9TuF3ca#nO6Ny^1Wk7$ZA zi;%dchtb1XZEu<;;OCPOFZvkzfv*=3Q+I&7;)fmOP_I8StLe%->^U*pe-D3CY*`9+w+vbzCv0L7XUV zjUZW`TFh{-!REL{OAL3f>jtyZfJugmryWgx%MsA^@C6GZI3kcM=mrsd^rIqy^ivX= zUm$<0+c3IUM5D_UH5aC^U9Yz9_XKe%Y92U#f5vZ-AF+jdr?S7T^uv})4Mnr?Cfe6) zM7RR45S0mSzHZDpgDAbdGkP4z`yJNprF0wmwi_RPmp%P^d;9f3m^=0n;>FqMG(+<5 zhXl1x#(yyczun!N7;ARiaFpj+&tAV_evA8@U-VOs&dStXZixyU4s?h&`x0yfg8El# za4k2ln#@(C1}3>VUH?6uQlanov7ZP6{gI9CJKwTsv1O+mP*yeT*qu)t;g;OFwwz-5 zZN$QCe6(CBVay|bq_e)u^CQF~k29amTum$55Y^S`jc9v1AiF&#C0;HoQ1sVW&IoD! zai5*~qi^V6MqAi`?=3P$`0u6Lwo0Z@Z*8Hqr`Q%n@0&Tb%v?#3~Om<(TWh zZ8rC7927Fr7s7Q>R5}~obJK#}r#T$v$QYSfo@B*-D){s;1ao?17i_$X0+(@5%@x)9 z*eOsO_l4XmuQ3=tU43hjpIY%&8-F&^6}$?5xaU9EwI*IOVtY0O@2Jj@G3smIg`3Dc+|m(J*@2oF|Jmt}Xq_b$nHO(Xk$K;`eV#=Te`XTR^`^=^DH39~ z`8imL1}pc=RRZ@~<04;TPJOB|ArKYryf>;ON(>w*n0uvA@ouWcJPqI&9@@6x37A{w zA3wW?_@9Z+gVZ{M?9&y~!AqI4=o{N}ydgMDzJDb3>*LiAQ@x55izG3Fd$8Q574fM?3os$LW3J`k(ZaTmw0(x> zG>$`bq=X@&0)3MAgT&rPdos77?2u|bTBGwO*N@<`?|}+~Z4EkH$-U)5>8XR}8mb9h z;A@INj1k9QsW3dS$*PMyY5zsW9AsAhUI4#u@tlT^J<6TE6Gk>Wc91>j?bt8^yRG{B zo+fH3`oedTswa;YSlB;_-_7`z(DBy!rjMo>&Tbnh zWdc2BIeZ#7w1Xg=b|rmB-Mk~rnVUXX2XR;@2L|+1m`SH1k<`x@pjGnXx8Pn<1BAL%xm6Mr)g^wbZo4k z9~dDmm>#)H9|>fAtOX6xU&Onmiz&?yhsa`yN7^*Gby*ZAC7z+}r~f!q)k(=^A0byz z3`h?u$s6|56);rW8=NToC}4JvlnHd&JF#gx9ekTi$d|?=ZFdlmp*}D4?hz z+BoY1U6|LMsS}YXkSmsuZzDu}HMuXx0W8aS2T7P(I`!2%Jye|<&;BA(a{CCwZ?IoH zHqYc5pQt(W;G4Rd+jJrUQ)a7R$o75HErGbi|DC95LDel>{sY|c(6LfLRc;NzbQBP#}4(u)=_64A3~OO_l&I7 z$jMe^H@CgS4(HRHmirg}i8vJZ_DJ*GdKD?5-=K4|ODnkQM|Oz0lKtkVvp(ui;0Cye zvGtkjKKbO34%}|Ovr7hT&nS0!E$J*tcRAs*TF+nhc#`kXdkJ}w>xk@ z7v&gsf=ra&702CKbZA<(p5zIhaPK@dUkS*&NCuRbw#3sX;6Q1rn=|q*nSTyF{cztr z>`31VJj3TW!c=dos7}h6^ScwON)(uZtuBOC8p&E7&`-@TM_L;|;%G3SsaNIZYVCmc zMl3O$I}ml+u<^Ya&a}$97Uj=c^yk4t-Kg{HeQ;?cPd`_Q>`F`?)yg{nCP%}j;F;WM zu&?$)p!4YcQx`6;$%T$A@DdAR^K(0XgK0AxHo0ay@`~OkPU>d7EV6KHBpWr0;BIn& zt!&FZK?d3hvCk-%oBO&aB@B5~P^uCVBDG(iuXKpwbKbvmrVrJnb4=^tn{QNoZA0%e zn^ofHOz%FsxK;AcOoAr5?p8g(RA69R`?od$U=Fi;H#>nA?bW}pfIYia{eSrnjoanA zXdZ+g!6e^(QLh{Fp8hk#*VTx@*x!N?^jX%<*>&@>A4@P6i{*f~HS}jyx}Wo($JW1Z zqQdD*!#m2kpITMW7XWLV=9rK4|JuC1+sBz<%>OV$XDgDI)42kt-)-Lk{~6M{b3HLy26kxxU21n|MMULzcHwZ_{&c>0 zVqDL{X+05q$jD&y5a5c^p4i{2-&<{h9e{}Q6AGN4e9o+7eU9(xus6{eZ<;4`21?uR z6wz+Z$$lVIHr*gcYA^jnm~P5eu}R|is=Tq!U2sj*ndCy%!39hTn9M5sZ*;iGQg^${ zH|#S~5r>(Pdap9d?1v{*`_niDTT+g1ot@^<;vjY!$z^=rYrqZ$=RuR^n{9ep+DJanzOnbc}g()gd4b{lYIZKfV>bCNBHV=~f z-k(+qSwe(9l#3c*4$nA+DXK8H5af*Z&+)3L(I1r+u~LJ55RkQfYw4Tp9$&bpBfF>Y z(;Q=fWYlCHGBU1aqsy#X{fg0D+v>|92y0Mie;=c#HR4=4(X>6cy(Dqued)842}(Qs zrQBiL5};=Sgd)moHcmoU8pqbNn%u_cQ`Z7dOS;EBP!xZbqnln>N2S@I0 z8bj6B&t5}5$~C0&R;&sMqu~hL+qHCqoE}&TrdGZJc<=sCiH9xGwxc6hz5O(JyK?v6 z3lFWkeX)nHm31x-PJU*~655C{~_zW-`Rfr=_znR#oj4ViZA%QM6_f#0WyHN|1zaKKJ*& zuKS1kPsr;^a-G*X=lM7-wb6Na-?@d|f-c1N*(x0vu&VfAGAjFG;;bQcseIyniqz`n z{Sxk5Upp$G?>fgSf{jm^pw=kgol&)w=J(gSbA#a+nc?dcSh)1&J?2{gwd@tHlu3K- zG;>MRXtopWkSbbcl~}SLlv)azRQTu}z8Y4i2#~QD;^r-pmZ9wHP9+ET^Bv;tD0t0_ z0X2M5|EsFBWGTDA3d$IppO@r{*|&}Pe~#S3(>HV0?s}`quC;DhwkMmytx|p6SSQnb z5FrsC>HlAS!a5=2>76zZ6k>o|zrBzA#N|algnOagetMBIWN+M%T;_N(0AWl)RN9-m zeoagOZ817aTq}UyQ9v6ToQ`q1F%4DDx`A&my_0|Ii6#e#PjMRWj}H_~nz3Q^rN2N{ zilc*uedFZBe5A$9q&Xtq#UGdQ&WTCRJ*~iU&1$7?%nz>gWEZ9d&80z>HlHpHH@wvN zbav)70k4vE<3y)owKly~0ZSoElS{8{5gS}x7=Q;=RJ#m^2Q&JA?b5nFD`tQdi63a-EQCv?<-j8-PD;O-?CGBNk2OYbz&Ej4bFwdKR_&xOV;FG@>A2H%w5 zW*YrDz|&TMD-a!Tn|SBk%|Jbp9dr?y8G0fj2@Q2*7p}`c-@~O+py2uv1*njo&R0_XBd6tcOG&<3N_fGCeyUKy-3vLT%o%t1#F!0h=;8i9Dk;0d;GARiF zpJ6bTTw=NKCx6A&!xeEA|8J0}_A~T!MHzv(wc*;R4uR{a^@gZC;g6jeNm5b)8j|-u zVi(@coj*uEnen=Z6bCwC$K>0%T`+n4+nhA=3V)>jxi1#y2RMHz#$_}&G`3Uo5RI}- zWMd0%WL}(GKLIwK)E87DbSrA*sWTYqm{OR`Wz~(p{%Eds=!GODvh3nICA=J8q7%{SW4f8j-JH-xVx z%h$|5p0^VTnmY0Ht3=CCZj;&FIVr?R{woxYYv*BNyULZh>wQCa=A}^g#wphzRW~Uq z&8`6}p!TZwZX72dVf=hn7IppuKqXf|VLY${uHC4lY-dG_9B;yeV`k6(ui)Qrusit#VH}H$fcz>H53VEf+>_!QXk+!X|`zIE{bku%<2>vfNLe z3}Yl{5d#qyKk4rW9Q;?O8FpQqX}>Q)N@Zg+MQ z5=&mgmwD>cQhDmMlc53;SK5&ga?h+g>}o9mots>^@Et42#j4!e1W14)Ydi-MqO5$$ zjpX-#LD=p|H!Z+#h=FLYxDTeRe(eI&6WJ((Rp@kQ8peCU4#_+(tcwy!P4CvTqVKfd zryj|B@k=U2??DJ}8}qsY1%F&80|hp5Sanix#;R1HSieSp2sL#0ZUf*4HKi~qDlI_S zWoiuXx~(DpU0!%U=R~h{UhT~{IGc~nVlA?IenDy@E7q8Mb$&YQ2ZzTkX{`UlMw210 zvKGf0=99QNXE}!DKey{WMrYr}-e0|E>u_IOf_W5@8=e&&65;3BgEoz2=b=r1S8$=M zGq=i}lk(u2%O}JJm|;r+}itQcHv50`DZKh-di_ zofGPA?x^;$OV}~AD&T?(`xmM8WyyV8yhTh&;BTXjr+3Ds(=?~s6}YlbUZvGEkmE_j zPUr%u5=*Ji^3g|V;3~%znw2r7=vujC0cY5gx1B2Atc`KdnQy@!)AV;yqkzr9i(e|a z=^jJpCMwUP?cT`F7u2E1%+a`Q@Iz*PW!>+N8Jf$DQPtFXX$6aRyb3b>FZ{N2PFB(a5H_^;6 zwRln<5wIeY<{SdIdZV8SUM5v~IHTAiIDfOhFlz541oa1}ZstOZid6D?v-!@!4%*<^ z8JixuNBm&5+U>S2ghkzwkei zi9W+IxctfQ_Qo~Fb?tBr)0$7MIp4r_I)~KfaEz=B;LMkM`O>;Ba+R0)H;8ul1>)%K zn6Kb~8g7*A7p&hEz76fQKg2)vEgHD0dFb{4GLdTjYTlwx#5 zT(+2QpZ9=1v$jAW`=TuaX-n&ou;4Qn3mk0|K38f+MV-jMaVUEo>>W# zYggPPY*S43roKs8#>ns~Tr3x8e0}jUG~shzpwQjBau34SoQ)!IgY$?MoJdy&)XI{I z{4~=JH|(`{c9}u2GYJ*3>J)1m5AJN2uz^ws+-c>|-FdV_o&KMhVC$@Spu9U77pWtMRb-Ua%D*p$zYIDtKt53x*J{i8;Lk=^IBn|h--O)s7 zX=);Jh}iy;ZmzxO5if?xN$P03KaJiWA1KxJ@MyH>KpJy&8|OlPR>q|6yxf@9?OBw5 zp}|4C7M#{DE>(0gd45Qx>#L43l{{fZ=?wRrkTaU7BeLmuBjqxRq|7>i5@5giXV@P%!}-TxZmDTh8n*uuIo z62AKysSpCcfpxxq0-VYhhU76&l37E|l^9t=h^&}NxP1u5V9vn5$QO*ugzA8dt|9C* z-F~jeAkz0P{-x(-I|(J3vEI(1ZANZHelT{-{jY3{L0#RxM@DP?Joxd?H!)V&8;=k* zdJ95xaYtFSYvMM*@YlaiK6Ryo6nAZY#s|4Ki05{tvo-zAsT*q(iIHxrim|@a)1P%= z4RjX#aKKPkd$NAld0OJ0<*0eqUZmzVVFs}R^USHrKj|@Tx18&g?OQc0-r^V_I&Z&g z<{|rZ0PyZv4&FfWG(?%pgn5a4WlZG5PM7fLS<|hJY5Sfg(MiK7|0cCpQ{gT#F+na| zhE%W6*OQfKvcG*KW{8dov)={wS4(MDD&RwY+Vv~v8)xW+^(u91 zUCt5{^;BrTKOCL5qdzkhMfD?2b${WfAN`_GC&|iJfDZ4KgiuUzgw(d|xLh|nb>mkt za4~k7D~CZXd{+oi--GQslOUw>l>kfbfa2WrrMdKK!4=eE;dFP9Yv_06j|P>+t=9%u zRfh8s4eMH5tefjrks*@U&c$WtfWSFZAYePFTGu06o6XW@=> z__uQnoPD+MPekONG6VaGXdT`&rbfeJV`p*>GP8GrD-$Om3{3YsCbdIx+Qd^mQQHq> zJA`U4(Ul!=^$Nx=8XVYrUh`r3VjNrsLlQ7f?ejb4p*w$V);Y+#8jto9a3CIomo2T~ z-evPW?NjphI*mcSSh3C9LE0LTa_e`V<{ElDB6OS#THUw$lr4x!Vb&8484@M2XyChuIT<`~Q9TnjA&fsLaA;(lrQPmSY2${M^W6NoJfzQPAE_ zXfNjrR+}5QUi6b12{%>YOIY7&0Yx~WkWhaq7Qnt2RKu7P+5J}*2t4}=>QY|OjtGN?|6BP^ zM4#yqrs7PI$3zQ+L7KN)VVWqOB&@ZIygIzj2iu?24ny}`kQ50c;sQ`p9rB;>lfSCC z47*DL4h{gX^_*|)2cE40z?W&b8B7`yBM`o#OK%j<#K#LK1#4-=pjK?)%9?A7vBwI?LTYHfQd;sM(@%{~D?)#OCvqrR-1- z4|Ji`j`nso$OxvbDH-V2y~O3^XC-{%{dgyz(KBY%a!%{{PV5F4XqSNHxwRCMe*PL^ z#Mc**C}r~)HyV&pqgEt498-4>%czR{jLF_0SppiZKC64TVxnut!fbX=x6U#s?!L0> zQocZ8j{Lu{{U`0y=9}OBKR#eA2OgEGMseGJ#<0@gHsuZQ$}+GqIPq1LJ=yzn#(-qb zeia_-kp{hpy)|t6jaLz#wrm`3me%Uh`Sr8K%j@gBRJN5?&B%ml3+uYfz<8*zt68Aj zGkkB=#dn~fy#RLyoUs@SViYe43N8ZM@&kz;3b z^DL}$VyLmg|E*S!!?C#&??EoZCGc0k^10n=Z*=#^i`JBtRdjx$EAYy#a@Q5BMKK8=Tp<9cz2Y zMri&gB!a`BxI5WNwAWyu$QK;84NTd7b@o#54Ys7PHbKo76qtxNDC%w95`=hJ8&7{}Dk@v3 z6IuC{P_B7{rdT@Y7R^=94eaQGKLFYmL_ObbZLZglKYU~#YsG!T-Y#5=V;up2Kl^)BDE1chFxSKf&uy9n*Hf`)=s*cL95Q&ex3a|uhR(a;tA$Mao;~ zh{1|9(?TCtSVExoi%3}`>tJo){z6lPmiANtu@rX3CyMKl=($h4^Yts*7M9QgViljp zJw`xNZxVXe;z9c_(9?>k5KR^XM7Qsw8AV(Xxf&J&74W_2V#o$Zv`h)7WKxSg6+%5L zRO6Vo@Yj6TqpbFBC(P)VrD?=3(jXu1S$14lry2LXne2)mgrb+5OZOgzO>s>1=ekY! zF6lYf9lz9%Pl#&>R(O?MX`hLQEr>WDJ=Bknx#pkz&*BJClo#q;QKK2n)I8!J@1^El z0hK7sqYa7xHT?0SyDLT)$zpLwzmG141~F^jcyIYrP41hx5+AQ0V(-d&jrx94dUQt5 zYhOBde}8KCi+wh6a(kY8l%TUHAl~$NkkN8i)iZ>+Sj%}YV^tOT(`MVKvi+Wy-`c#Lh5Gh z^J3Z9ng(f{smSG+43P8JERGBhoUhSCr&n6t#nu2~x>Pt~9QeSmeF^SM9lT-uTQ{Y+}> zn^q;u?C*sDRq0&f_A?p_YNE@Og1X`GT;6}`Pwg)pv$3D{^8xQckUxy0%4JaPkw8^m zprYUY{MplMU{~n9TUf(VDrdZ7Dv!4sKWb_27D9F5bA``xSbMa%4|5Ul_luHR(%!k; z%`j|nAu1@X;Hrwg5&KfT1!31@cP=Ry_Wurt~GV-vet4 ziRnmhWArw`zpn`uC!wGl}h2~Wp%=ycv|!@4r^KhwF^H< zIH)F)1ujv8NmUfhL0%@+99e)bm#*ApOvXzJhp8}9}m&8jId@d34ZZD1h& zE41_edYyC%gvWyow>kP{3DU9Awr}kVtozZClE49U*GG)CK;g|u+!T@rcUV+|8zF;m z)8qmi>coq1fLAtQLwju-A%ffE4+CB+3dcX2VlL7470|w%w+RWDM26xi+#)<8{2=La z1!trca(P^j97xjvn)Z;RK>cGYRi=R<7|I7R#m&e?Z1AJHw~I9)*kVK8H_y&ydM}u9 za63{f6zDah)fqUV)#*QgJljp{7eEYX%puo^K&865lFRAZ<(?g}xjDqx=H~*-l0cwr zJ%n~{PVcbIa%bK=rMm8$^s9)dymol_tGmCv8B`$~pTycfg#S$`dM&*@yURg~MWCN| z7vS!1yFiVRXx&-_c&tb|2WXwW@$B`x&W>U~)n(wQ7e0}3)?%wJB@;6J{bi1MrnvX9 z4bUbL%c{Y@GgcJa5IcNgoPOTRqd6RHMKG9 z?&4K?UU8V53~1xFqZnvfb~N0-(7ZI7`@MVJkMqCwG+tk&*ZE0M%{Si^y`?%^`=z)J1g$I%?yS}2ybbkZBF63U)iJJjEIB>4ygV)e z#flVN1#?Gd|8U%>xYCH-Xs;Lgi{z@1`Lt07@3HgwtJY&(qbv8M!gUm-!jNhFE`I>Kti^vJ0{FvSQKhJh) z;CZ?w@yuVlW{#y9avE2*}PlNKjaV98U2mZWC zdM~+LV_PxAwx5-URVcqZJA?yg^Vz>#0h25FGcbs%Cj`8o3L!{XK zGW(S64@H z%YQEC|7$C{s`8)ro0#ZG6;MJu^-yZ$_h z?U#p_a0+Je+#01kDzr1ezN1y`A;I%D>x17Pn3bpG=zn~=rrdV|?+jzM6}SKS9$&lV zW}q|nm?h4(@df0WmH{t56b1Gt`CMAVVveb{Ju?4km=tj_+z`l7a{b9omB(dIJ@(Z_ znFYV?dXQH{8z^p1JgxcA;6*Knm{sb*Xo&J2uA2z!wkUygvHVYW z`EDQSC4eUGqmN$k_AC>-Cm~^+1_)59FfQC60krQ6t9ZccdnQP6qqq#Li-TExBX$iC z(9`yxrd0wdCB}h3*Z0UG>X};c3P1YnWy?KDhP?Y}tXw{>m16HokKg@r0dF%=wHg^8 z76|o#li$T)*Io%hI?`9pa|_u*znf>;IfK883_F2{7dncQCFf(Al}1>*|=j?Oi~POd7sK;+sJ=G z!TF2O<8Af8rwa+p#;OT@vc8d1iqeOfwJBq)3P*AI_inMhOQ0HSp?%tNOF|~=$*QMa zk~uK&LyU5eiWN72X+_83XG8RrB)(}wmd!=?%v&AqbW~4&u4_Mf2D4(*3~%(eL~pLq zH;V-X&G9WiHVxllQhox>Wht9z2&O&#h<(P3o0v5Yy#^0|U=V&J8*4a2ZLz+lvh~PJ zy$P1qnf}d=xx5b$5O4x@I1^(8@uQHRl^9Z1H=hoIHy^737(xjB$b>I5F`%+JoC&VS z#V5@cyU2$(!$Q@YKX?o|0$Y3fPHJoKfCdO|yr!-J z*9G82o=q8onK*qiNQ$dnl?J{g%`WiM0gbh|7q5hRq<5Rb01lw%H{P=leun479wRGC z!?e;Gpoom^*P)6h+7Ow5R#CcPo1Jao!`TDi56yD2b!;r4A$dCVDt_mLfQ=cy_z*}V zA@arluf2{gMC�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 diff --git a/Common/src/main/resources/assets/byg/textures/block/boric_lantern.png b/Common/src/main/resources/assets/byg/textures/block/boric_lantern.png index 2fa41e69d9f249483c4343563e8f6df2744577c5..ea67ceb00cabb3057c802f9b14d4aaf155be30fc 100644 GIT binary patch delta 185 zcmbQn^oMbR1SbnK0|UdW!sjUy>m(+sDAfab*Z*H>{#ujtB3gTms>~D-&wx}XuQ)rG zU{xJkrHy(|fhrhFg8YIR9G=}s19GA~T^vIyZY4kP$WCBj-qyz=aPYu|Y10lKIB@Xf zfeWvM7!#LB>^3wgC^Irp;hyOzqOLv5aYL$3e; delta 209 zcmeyvIE`t71SbbG0|SG8BUkD~GgS*amtfC;R8<{YnJFULYgCh7L|^}ZrTJ@(lUE#2 zRrI61l|YKCB*-uLKMXKzI-_%bqM}57wx^3@h=u>#37$d+6gXJgJGlSzk&7LQG00xLX*yqO?VCZHQKw-g)fKDus7*lb{04N!jg`82f>! zZS{-G7l|s#Eh{(GQ`*9@ywBqQ1snNu^);6N0|j?7DnAxld{+FRAkZ}op00i_>zoo8 Fn*f6%RU7~S diff --git a/Common/src/main/resources/assets/byg/textures/block/brimstone.png b/Common/src/main/resources/assets/byg/textures/block/brimstone.png index 8463cefbc7ef02b28e956a9551eb247b552eb659..8af287cc4d2db67361c7817f818da3bc66b6c526 100644 GIT binary patch delta 199 zcmV;&0672r1J?nN7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sTTUfVMIl8z z95yc&FeVZt9S`%6SHu7S0CP!1K~#9!1;Nn)!ypI+z?TiwbOFKsH;4mNWPzgluhKgR zEkC9km3Q~!0nsR5yUc-p2hOG7HITiNiiA3(_~U_*Dk-WwWhbi06O z*6xvU&s3IZ0{tpkeLdhHo~and5sgX%)?;nq@dsIh8H@HYq-y{G002ovPDHLkV1k)= BPh$W8 delta 494 zcmV|v3%@u6 z=m}y6t*IFi9^SKM>u50SLDFxvZhFMhGZLCXPEe=-8ak%+tQ)|aHrK$v#Cm-v!baV?% z{S&q{@w+(d1a>?3sYTsIViK|S+d9hJY`@7*RFvQGC#hZ=XgPzYtDnm{r-UW|ksC*r delta 370 zcmV-&0ge9G0f7UM7=H)`0000V^Z#K00004VQb$4nuFf3k0003yNkl;?Jl{qUXS!q`pBchcs%sOpKuJ;50OXf;j}r|*QPd=dHh=FuPXJI-Bm^mZnv4NR zbx;_k>8~HMgW+*x8k8ScgLtO@Br9skA#88%vEH%VzWK+vGNUBaQX2* zJ`)BWN;J1#l-RNDiQuv%R-#2b5RCxIA-~hz#fzfGSuVV$Prvns;u)7SU^yf7Zv`Z8VeZE3c3 z_u-kYP`jV>!DYD3KRmWGPPFl1Wb2VV)0NRIUUd5}IcFXDO`pcD2Y+#X0ilOOZRE^T QGXMYp07*qoM6N<$g6kEoOVj7da6RCwA2!7&noFc1aMKUVe@ z($nA#tR2t51rS1MMM7r-Nw#C0(RDiJM5`4TGDuO_#UD+Sj z2>u=$r;WqdpDjI2kJ?B`kBl)o(Y!h(FvTU5q@a1vwiOST3JS6`xV?vJ^Opg3?e1CE pzTlFb^V%>-JuN>=;EkmKeXR<1YlmwDaA&kjR&pWwwKYu)Z{%w0J)C;;_h9)b>Ex*`Qd=aQ+?XsN zxwBXUklKQ!S6(g*`=nCqQd_iJH(guCu?N7IjEntW+vU~9^!!0?ohBt~q3-b%Q%TINJs~Rh|65!B2aYE+7X6N{!T1dRfa7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000aP)t-s|Npi8?o0Tu zE5~FVvqKhLQ72PKB1JnKK{*>fHW@cC7Bnmq<;AYc0001&Nkl27I}as5%Ui4fOm%&F-??PAp2 zy|8~~Z&z;^+=^q;XC*?LSE&{y#-O>=k`e7Kcqa1)Mh-o$gx0Ap00000NkvXXu0mjf Da!_aX delta 614 zcmV-s0-61d0`mlr7=H)?0001xk!Usm0004VQb$4nuFf3k0006lNkl-nt!uyoMcDGzW`890F)A` zCd#Sm%QT}@697l>R1*ULKuJ4jmQ6kv_>Rp@-s>j-f@V2rmdzLoBYk`l#Yy(FpRU)i z(cp(ieXk;vw3QOw`^`AkO4>@==g(GyW|?`e==GCupkKXMy7qdvy;`sOQb~KpcQ|LI zmHCI4)xp;v0Ds~n17NjVK^SQz?Y*_>(#rhR>z}=f01yszJ}TlQ^ITyN1M=XMOH>Sp z*^>{n@ag1zI_?ILc?YO-$MSO9Q*5{+3# znsVA`@U5XR_c08Ozg1r{BR|b(@A+bLHcxUY*D1c zfu5AYNN+T_QOE$?ozkf$CG9(pb0uv6o6C-wG2QDmv{&n%E5d=c+N}UUno)g5DruXo zo$iithF@};3w*OBPO`(JJ`1CgC?l%DT3s zj&fu&Z&*WJQ72PKB1JnKK{*>fHW@cC7Bnmq1`4(}0001+NklQb!w}* zt9h!L0CiTYXRE1ZssN{Gwqp{uRaO9dcwiAYre$UTdWHcyYI&@epnG?> z0DGFIXA-tjTL7z;WpgWYC2Ih>t9Exgc4l_~x0;u$s&{93hBh}bCgbnA00000NkvXX Hu0mjfbHZGc delta 733 zcmV<30wVp90_g>i7=H)?0001xk!Usm0004VQb$4nuFf3k0007`NklZE-@_CXLtMf6Ev zT2dsX2(D$BA-Zd=qoq5$v$HerzPlX;y!{Wq=i&MI35WJtW`8nP_E;`o0>G;rKr|}* z0q0e2BvhYqKi~i&GW7#a004-pl4WXPPFabFM8oX30RYR?EK>{1=$1x>u^J)5zk*+> zu#}Ym(AL_RP7mzq*fl)*eruB!RV7KHjfSc!qNvB@wSu?N``WD`dua~9;LX0tugg@V z0LmVVs#4iw0DnXPRHW5feN!S5(t|hqK91)sQ!9IHW6qFviUGBnW1QD36}G$6R3JaR zd;8PWoMmb$t0A2pnE&}9PMV#{dPoDH=9Z`)lNqnqYqgcdmE8J#r`3L?|501pp2gYe zpVQf~?-^Z_bNN#D?q)(jJ6jDsF6)}?6oX%X{&ek1_J8yoy?5vA`1^@3nGugWjMW@B zc>3&<0{O|SA<<060OV~K!1*(M-3NLvpFf(Ju>l)^9+&mFeBt7C07LKYx9u=UxRB2{ zfbIjm_R`$SUv~pt$Q7JokleO&eB>!F8D)G1Apk;-u^B7!*K)4)Py64TUP#g5s7wnBzegg`<@8}p(1_$a_soAeQO2JNT>k9 zK&_@&vE&m<=Cg&|s%@E?uE|6o1O0brCPrVs9Zp#Zqd_@!@^pTACi~kFLt8>&LaFk$ z+tra=oSi;*`I3=PQ&z*l{U;tgz7hV8Hg8s_NLD$oudRDTAcP2h!0lDnb$>173aTPi zd^S1tnN@2}F;EqWZcRoT;tB-R>VN=VtvhZ|_JUl#LgC?l%DT3s zj(2AQ_U0=;6HhZ*;zvPYctJL3lk2sWZb}N-}OqEKMm+U^Kx$=@&Et;07*qoM6N<$ Eg3GgPz5oCK delta 735 zcmV<50wDd40_z2k7=H)`0000V^Z#K00004VQb$4nuFf3k0007|NkltPD8Nx@AS_p@R`3f*~v+f_m@|D1xHs(xD;>3iH%YDCiV~MYsnE0zpme zvWS#In+0x3vP3Sf!E8(oyW_h%&bA$DUVJa_3p3w`&+~o0Pk*Sp)2u}!D#0mO+wxr! zRrwBU^{AQxfG2!PqDok+r!E>%(X|EuoT4X1s-|EVjfAy&Skm_ zF;l1GU^A!A-Xpi3VeG+ONn>aVp762l3Q9DhN^yWS^LiO8p9SE|xs!OpN7WP#w?%P< zk1KX?fG`j`+JA1;cK7>k`6E_7%f$FKzJB}79=WJ+_uEYq#gFSe{r^PIwYYpg{f-8KI z$w>ef7AIJG{{uz+Ka!HD(%%=SD=~tV&q|WOFn}$~#cVx9IyFVvF=#Ohg!+%iYXN#P zIZ19k!+-qDEK6&vvPhz*mHE^LB~fLlw~M8C}|WLCn;- zJ$jQZ%f%HwbwP}SI~q~hV>U^na_bo$J$Z<(HCWJbu$l9xFETwhPGEkhyVI=Mc10$v zzb{U9!;z>1i8fNpc}Wl$>J&X}yYer}f!o0-4Wm&mRxFw002ovPDHLkV1f(IT*3eV diff --git a/Common/src/main/resources/assets/byg/textures/block/brown_birch_leaves.png b/Common/src/main/resources/assets/byg/textures/block/brown_birch_leaves.png index deecaed6b2b197378d3c6c70f29e899b9154d1c1..a48530b7d467de06f09e4b4e133a47cc1b56f685 100644 GIT binary patch delta 152 zcmV;J0B8Ti0l5K?DSrR}0C8P8UQIAlL@GfxAuEkm8vp1LCXA>JWw{Z*D zNZuifSh-n_nj5Qz?BPzr3R$V+CUwF+@-BPa!Eqb1vJd(A0TIYEm^1zW0000?O)zm?If1a}!2kdN0(4SNQ~vA>Zz;qD$?o;>HU6)D z6FdP62Rc$wj>>OpkjIuoV)`VddN`lDnaRQ0{k4NHGIbv}{v27G%5?CT_yM@<0cOUL ROVI!T002ovPDHLkV1ggbL$m+@ diff --git a/Common/src/main/resources/assets/byg/textures/block/brown_oak_sapling.png b/Common/src/main/resources/assets/byg/textures/block/brown_oak_sapling.png index 1a09324c70a513a82d9be17e03435196e31813f3..fc37eee6508eb0c197ceb624e9bb89a99f8a4f8c 100644 GIT binary patch delta 170 zcmV;b09F6e0nP!CEPr=mMrc$zQ$Q(QH~?2R07Ww%OD+IBBLHq|EXx1@00DGTPE!Ct z=GbNc003c0L_t(|0R_Q<0l+W_10WWy`v1iP000260MOh4c(!?89w51W?@JZv?TeSx zHPD-{BzhYlnV=hRFTLIYDs{bmsR4VJ$~URG#qO$3rp7Ly_am~61#C}x0YGIM08|a| Y1M|ZH{kQcJqW}N^07*qoM6N<$f|YAO@c;k- delta 174 zcmV;f08#(W0n!1GEPqQb09`l$JR<;CHUM{GMrc$zQ$Q(2Gahw#okjov00DGTPE!Ct z=GbNc003o4L_t(|+I`N&fdx$aCwfTHpGc+{hsOpqK< z7R5E>f*g{tnGNdnI%#7yWFtBt&TRnEFLZze0C#r7C(s;#Eg_6T61)HM{FW*C2lZ+U UfiUmM6#xJL07*qoM6N<$f>%d)lmGw# delta 376 zcmeBVKFB;lWum2QeOiD|h${mFgQbS7n~9pAwN9L;MUbtYy{=-2y}pIIOn|kHmzhSG zqhX+puCt*^jJsL5laaTDmbGLfG0=+euOWg!N~t8sFZe$c$iWyGGz0I2!-W$SCF-|%x;Tbt1dI9w zmK|2$F}~K&CYG+bVTt!H-|zdM^z75Ijhr;Wk+VTQF!+LsWvjG!iq2EN+7LtEi7qjg zA9r>>x_M&VIWM-&H&(=SKi{Ai?;$Y3{7vSsY-_8%tn1%pwQZ_fy|X~XcBcEwH`B^L z3SVE{dous(J3kraH&Wp}3X!_g#de|?L4*1ErXwHUBf7SSmPi(bg}uKrb_Ry85}Sb4q9e0Dc~! AL;wH) diff --git a/Common/src/main/resources/assets/byg/textures/block/brown_zelkova_sapling.png b/Common/src/main/resources/assets/byg/textures/block/brown_zelkova_sapling.png index d2fa7a1b6544dfcfbe282f631060a9e0402f2ab2..9176342b23517754556862f13730205be2947f12 100644 GIT binary patch delta 226 zcmX@cG>d71iV$akM`SSr1K(i~W;~w1B4whYLcLRfPlzi614Ce7V6>ZAxRX(sqhY9n zL5RJ6kgZ;TwT{2Fj-8#Iua&lsrIxpama(z1k&%(1p`os>u9lXTrlzKfii)zba%G6Q z8PF8Qk|4ie28U-i(tw;0PZ!6K3dYcb(PB*wJT3>los|pOYTnnct}8H^sa1ExBkf6o z>z7R{!YUVY{BckzE)Tf5Nn=Zi^1n0Hd_G*Q(wWb!PA-{y&DmdKI;Vst0OmqTfB*mh delta 265 zcmbQmbc|_&%0x@qde;D-5LX5UhG;jlPzM8lYaLBZ%@BM20BapxU0p*%!!SofA4@G2 z6_s!&BVQ|RJ3G6;z(8*ctsq-HEiEl$V`C#DBV}b}pb5f1H**6i@sc3F;Qv?w!!w6x zaX=-U1s;*b3=DjS85kz&bJe7Kx;Tbt1c#oB{T}onKX= zb62GAVq|M&P-$%td&Obp{Qjh(U~`)60YkSCMjvIS*+zSWr{4c_zq0Y9ke4r?@$}I8 u(i;&)|5r}Yd>`w}B$xh8py2M;3H+M`h5V1+om&oc0fVQjpUXO@geCyn>0{Rb diff --git a/Common/src/main/resources/assets/byg/textures/block/budding_ametrine_ore.png b/Common/src/main/resources/assets/byg/textures/block/budding_ametrine_ore.png index 0746ceb834058a6e2502925c2fd4a1be16be0e54..6e81019c1e82513aeb8e13a783fd40ba1275aa8f 100644 GIT binary patch delta 466 zcmV;@0WJQR1dRlcBoYa5NLh0L01m+b01m+cxRGn^ks&32|Ni{{{`>#^{r~*^|NH#^ z)KCA&TK~me|FN+DzGVNbwEx2}|FLlYuW|pL!T+pu|D%2Xk|8Ru=WvGRinACJk)N50CgoV^Yc+^09V0n3*Y9wKFbDUr;{}-H`UM|!xikw_A zpjSCoaB!f1Qa!^#GoVOEoJK`dWMiB|NSr@RR9|3JUSC9EVVp8peoYpfFI!4gS4mV> zy%tPFQBXlpQJ@feJ4Z%4LP9u0M0+DMb{si-6hbpPIxaUhC^0f9EG-`zLykcx@_$nxoInq3c*+NQ{V4DZG}?IkjrrK z>Ei6;kt&nR3df4~j@68M%bVv6%$_g z*t+XAO7X+)?cuhh5Lsf4%Hcs0auA8x6B(HRW;eoYoLIy(QOeVkk|I7389R8}7*CZI@1C@d{OP*MMnmH%~@)I)eXM@FDmIsdV+ z|NQ-S967xfOnVeUpi({mthAgmSky0y{}-H~5PMW#VE_I7|FLlYU9WNfaD>!Ad;gn+ zoL(;f#a*0WEkt2qN>x`VF*5&=&HrVndm}SDLP9P#Hk>b8|DM7B`}~|kNW(!hRAghE zKTQ8~ft*G~)N51!m|y>_bkuZA|HxXLY9tu6xNeal7=Ou0L_t(2QzehtR>MFHLoIor zA#GDa$pB$3`wn4;vbVth{}Gz>WyU%_lCR7RB=i|(gR>nycv?x(=H@%nv}_^ox*O5! z7p-luSawN+#L{pXKv7kC%@{1MtgcyI=AKgFw!X2swY?)9qatB(w7a)|aCk(-;}co3 zQ#(6H-CwD+ySSwJ)iszm<<0Om(FCI|)lK8^?*4&6cuqV%)rik8D*ylh07*qoM6N<$f}Q)| AIRF3v diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_bottom.png index c85bef2e34b9624229edbe63050a232d17829458..374209f9275794de15a042014cbb6f4c75bd0ae5 100644 GIT binary patch delta 386 zcmV-|0e$}O1Gxi`BoYa5NLh0L01m?d01m?e$8V@)ks%;|T~JI^MF0Q*+Wr6S?d`(s z|Geb?z2W=S)z!wv#)rG_u%)(vv+1p+v3IlMrKP2NuH2}Qwwalkp@y%Qg_T;7$Cr7W zSdzGyZ=*zpuZ?4yFL|gRai=J4m=s)z4_1N+PI>zR@8|&NU6MyLVmwjN%yj)u1uDA9 zYkdXCkTVuwPuu+Y?XaEreE<5+p?h3;{I$RGNc-Vs(RrkOgyfO-i$@!pzD6EyNs3I^ zuYYLSuQsf9zj&1PpLpEP$H3$Eehl~JbQXSod(XauLh!HxOedx{q^39LmzJ1HUz~IuhUcYjMeBtsvPyXNf z`@enndrrT~W5dn#y>iaN zw)Hde7xyO5*2tZ~AJzmkt+)M53y@MM3Gxg6j{?L{cpwf#OpNr~iHZ{SZ#-QbLoEE? zPT}NhG7xZGZPsy%QSi?6o&R?=X(ivn2RF<#-m`BDnNVjE&@Y*Lh-YP6+tDD#*A2>x{DYMW{DTrDMHdKY zrSx&nXsoh4-_+}ta`1e;ZgAtd`hA5Di}v136M5JF{B&8?{fa5ydfRV@_a8d^_VAL= z1;1JOdo4c;c%M7`)?1_h;y%p>6X(}GTlg{DX4-e=z)unXz!1r8gtA4u8A1hBB0JlOYHddc^eqd`SCEk7juW9saj=-I<~AR8D=44$rjF6)?` G5}E+3ZQPy! diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/anomaly_top.png index 0409f3187213fb684fe582f37206292ee2714f42..4a4a7414741d633fd9126b7e4ab53fd5bf8c387f 100644 GIT binary patch delta 347 zcmV-h0i^!m1Cj%fBoYa5NLh0L01m?d01m?e$8V@)ks%;|a!^cEMF0Q*+Wr6S?d`(s z|Geb?z2W=S)zz=u_N>?Q#>U2@&g-4b=$gpvkiOoGz2Sqr;DNL0ceCSruH0#$(PW>{ zWSz-clf_w)#Zi>SSdzF;jkH9DuQz_GI(Dcpd8jCLryp^rC~cS&T!{}>f(=uD2~K%x zV$Zn%0004hbW%=J06^y0W&i*HoJmAMRCwC$lvxhKFbqVeE)>EJWh;g>6ny_HqSUdJ z6CjG3zpM0Jljr~d002ovPDHLkV1kc|tbG6g delta 407 zcmbQl{D66a%0x@q`qBWO5LX5U2A8(==5?zyN|(zQE{~YBW5T|BbI-hJ-t!=E%2AP+ zPXFF5i_g8j_4oh!JKs{~U*HX{fBW`r&)$b?u793&;!V`#qnv(~DRWO|F1Q#u@u*eV zimO+z>Q}BfcI=o&?hO90ro9h;AA0k@eDmWyPySc0yVJP&CD6v81n-9oMhpzz{~byoBE hq>%8JCDNsaflK{N)0{a1|9~OE;OXk;vd$@?2>|e8+#&z~ diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/bookshelf.png index 42a1e702c469b4dd12085e7997ce6161e70c8019..6c3264d2388f3c7ecbeaa46d0660a8fa990b2cf0 100644 GIT binary patch delta 352 zcmV-m0iXV^1@Hop8Gi!+001a04^sdD00DDSM?wIu&K&6g003!FOjJda+sd`IwTX#| zUz(9lmwlaH#dVGmluExqeP$7kYhH2YTaIxymJDl9Nl8g6 zPI|l+7F0KFOF&eG5t4T>2R}bQMJ!p75fNi31%D7PWDRaQC4Wn84JjxZGf_}@lu3z;^60HBlt ziWnkPYhnN;f=SiXfU*{NQkitBH8o#u^ICjdG?`RisroXnbMcSGk!dfq8n37E5ezYp z!8x;x9Q4h&;8`{%b9LCev=A^Tr>20(zE4;MuyllHpX`2MvY(C?_G3TZXP@lPuOXLe ycypYtOUWdx(xQk52#(7XAY${S&pLx7{}Y0000`z(5I-t(UGyw5r3Ij3a!vVS96WXGQ?9Iqf{_>{o#sPt+G|pLZFX(~f=c9U1pWD)rS!#bCF?MSo(6{=|~% zQ}OL~xKs&B4Hd@6eIK46)tRV%{(yF&Bb3SDK2TApAaqKiCR@%{c$-MsC2kLOAk~>T zG@nIdZ5^QY;(ry^EKwD6Sfs_{nKu%@= z2-J##FBS+QLfh!7$_qZN!3=#pwUJ@eB_cy0iBsQm=mz_C$rM?=?=kP0r(|+a@MK$B2 zH5!6z&@0kJ_EJn3bhKH$DvVxhL=%n6c&6Sm?Qk(V>)>JH7R%{HASdRx3l@YBu&|RO zoqvSQ`F{zw!$o{#@y{M)6ot_nolLfmBZNRV(T)&;uGs*Qy%Y($3#1L+5MnEd-gFho zzp|m4eaF`xnx@bGCE$9;LczZI^F2eWF65msQZ%{AoT32G7xe!wAF7%ssXaGMWG|=u zvB@TaYiSZ9jpAG9xIZUu$+h!$vibR1DjWVe>l$Jopo;$jpQADzaCQiP00000NkvXX Hu0mjfQpG$v diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/crafting_table_front.png index a806cc8756592d79be2c237ce4f8cb7d41cf81b3..97aebaa66cc2a62d7d68c265425f5cb9c2b1b1ff 100644 GIT binary patch delta 267 zcmey)GK*<~L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Nhq)5Z8H!_LQz%5I<|;+_~DXAtTWccd{A5i0LPZ!6Kid&2m81nx! zJT|tioPOEFkKt)Z+s(NtVR;PCLS198g{I{(yjZ=f?{)p2GwXngOgtys+4(U%>uHO< z68A2S;YnOa?$sovIEGjIR`k7S5bR@kZ0BM**+3AeUr;RfMjMdvLXpMyMk-?-!|SeH zeXqJUg3NJ^oNR31$M7U9qxY&?2T)CFS})KtpgB8MuY0v?^}3nwoHl%KkJJaclfl!~ L&xK{3Q$iB}D{O5$ delta 618 zcmV-w0+s!m0`~-v7=H)`0000V^Z#K00004VQb$4nuFf3k0006pNklnu;EkV%D%0cR&4;8UcV(u>yb+iLq5%C6mgrso&>xJPyF7u9HdS zXqyL^%^KEzRa`azh=JLxaUpgUIhY`O;t85zpcw|4R1P_qIJ69O6-WiNy*#$l03bYg z6gjNWa2x=>)PFYs82p>}7l$T&z~%9oKC0(2(%uFjb7l#E<@G5RvuiA`PjP#Ej+OFz z7ohF#P?8GN%ooIzo1{7_axj5r7yz8>diNlnU7;YYsL0I(uj{XfDXt~PEAv&{Pt%aV1MT9ypT6NItRdza>UO-WYiV{ zQXQ3V9zfgOA+Qi)dh#(kI)5Iuz(i!w{QkyWx}y?U2=xU%0Iuh%WdWcLCrK+RX+`aO z(F;}`PWH_M0Oh@(j68?0w#g@_ai|BDZ9>@X%7@to=O5faYvp~w?8K5FwtGHVB|AG8BT}g$I}- z2n(wdUMxyDLE_{B&=DkI!c&{UL}dV}GbQzUt*%Bz?LS1LKvLa*vQPj3002ovPDHLk FV1mb#Ta*9* delta 584 zcmV-O0=NB;0@ehO8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Iz6L_t(Ijct-YXcJ)= z#($?V7fI4!at5>n;y)x1L_`ONkS-1er63O79CQ)7x(Jz65IQ;tB0|BzL5d%F{QU~YZIe`&D6K8SBd{|GK|tFRlQwte1mT<|~kc`HWkN0f0GWkTvUQu@u|FkY^r`5WtqbAw9PG zdt}Brc|md3b0U(4J^_%S_$W-v5$w8~oKBvl)%7{-4F3`zh0(iJoMv14_Riy@F#iCT W78}s@Q8a)60000rQ0$x)&vJn_w;PG zw+}JTP0-Vm66KW?;o;+Ei~TioB2Z<8r;B4q#jWHQb0$7|^e8Oypn>Tb4^K}^(@BY0 zlRzL!#d&rUL-PWKU^eGXO@fmb2~C!4p4>EPLz7_OWUl7POv=p+$}<)oS+bzzP=H8E zi-)EZr(~1MB+;H0k=_|+Bub|xRe;?Vl>4`hc`WAK3|dBa~=kTHc9OZld4Yx P9l_w~>gTe~DWM4fcj--L delta 421 zcmV;W0b2g(0kZ>;7=H)`0000V^Z#K00004VQb$4nuFf3k0004PNklYmVX{QbEvCp*cVY7C;!xozmF*a*KK>-fIhHac##GhtQb!NEt zob|b9Dir@ATM=LT0|tBkc2>-RVFnYg}Q|G!53dx__`1IC+sfz;J^K?O76gMKa=Me$h zB&P55ur{NR<#?jW`5cpw8o~8hZAV6lB765dQIrIG++ltpkK_;bcQoLO^^L?yt z&UTEq#X?7D^M5w(1e9&t^PciHO#X=*2X#>(fEQ~RdRmss{RHW4DOhrQ}kCM6& z8{oYp33D@4b9Xl|g$h#`;DAllKzExSO-xPKCU*TJF!%dW;tGfQZ(`Z{GMcu*<UKQ+S`x444ySy7LNY3L{P~J6Dai}4MF&>Y00000NkvXXu0mjfmB zz?NFLRX8L|D;ShtwU%GDgHxb{RilAYoqtiBQ}Gh3ks%m=dr3q=R47wzPe~2~F$gn+ z7P^qG|9@)@qiE((%SvQRU<`;rM?+1F`gB&0hU?`jkehC@pmzZ@a%ScvGL+gQ$%q+z zT`}s9x$MzK%`}&B;D4j`llura&hSp5vBgqVP{kS#>&ptE26-G$e+umN-phTytjo@; cK1A>X7Apr4;>qR25dZ)H07*qoM6N<$g7yPpuK)l5 diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/door_bottom.png index b6b57a439bf0a63c61ba579af65e13a80ef7ee28..d74b0a20ed948e590751c81231b396ff90ea384c 100644 GIT binary patch delta 241 zcmVE~ep&zk0Fg;VK~#9!1;N1zf-nFE;2(O1UO;Jd z44b)~L&{^Mwp}+Gp38(?#iU)$VSC%Y4|bvxkBb03r8B28gKB!_?J1WW$}Xm}KY@oY zlbF^uv^SlzwLm+l%{4nqc-`;T8E5cHUsiHUF!X+(-Uxx#ud0%aK+TI?Y{8)KWkM@? rz%aVdxFGO8M*JJ40;Vx;G@tMX8&NMLGP_G500000NkvXXu0mjfu6$(I delta 588 zcmV-S0<-;r0@(zR7=H)`0000V^Z#K00004VQb$4nuFf3k0006LNklBjE z6vuxKLb4^zS?2~KRl45Cb2Srz@ecRo=cmLme?_YUx^n4Q~O8{OxdVkHGOp&3_$J@8+JRA@H zd&^_Xu>|McKE(*uQvfDEZq;30oWGrS`&dSUEr6QPv5baF0MoPS<>}!w z07l=xv2XS0Jm>-N;ny3S>MmFQCHq#7I9;(7B};}Okp3qJ0^am<4ISk z3cE#|uIPwfHiP02YeJ{#x4Dxko^*-7>Kq+Eq#`0b>3OKL*L{8?AIT8@6@UjlG5 zzsB3RbVLs>fQv{GE%~5iVUv;@n|2#*5zdf?pJCbAZsXspEMp9NI|m9m zPFJeflSM9z=$;^0PkG!r%Ty2lx^Flha5KN=yxT9ivN)g0*~!aI(OLO~a|fDwy)^ZI aY5o8|GBxs0BL-;z00004?jaC2v00DGTPE!Ct=GbNc0059lL_t(|+6BQe z4uUWk2GCEJmQ8M;E*`-H7}9b9i#rC`ND3`%Bv7Q=KZwxV`gR_=@Ugzz19bANe(#5b zw%%JG?wE9vC%F`Gld_!?3TxXl+KUqNTyx@O0khVOn5xiD{&3#X42@pm>yiqLV}Cqt zseu00(ZHoZ;|5M#NjO7{q9Vg=0;6!bAv7<$tmXCxnNKn%r)^e!00000NkvXXu0mjf D58i4V delta 568 zcmV-80>}N00>uQ77=H)`0000V^Z#K00004VQb$4nuFf3k00061NklnlB2Vnnr7l64li;%)>wT`URD9a)vHDUW;J$nG) zWB4}5C_Ep4MzzTy?F>K8Sn0t1>rV+nNg>jTk(vN->%y{C5{>(uKX(xz%hS_*`(WMH z6zqjR52;~DD}UJo2M)uwRRs_XGYf%`)~;)sVZc_hM{m$&Yk$oF=ncAjXl*(=iTONu z!%x+=eTuZg6`pSs)4VU8U1yqk8p|mX64#7OCow^(&U8$V)8s*^Zt>oriwh8x>IlzA zR%%3AF+a1I0xWE-aOwFHfW>5`MsLuyHLd{zAt}oukbf=HTIXwOm>+JwN`>d=ESVZN z(u%Sy=6vZSW_9M8)B5(E*{hd%dG~>%llUJ?K)wfNwx(e}p1osd>4n7%iCHorvoKN< zgy-9RFfqOJCe$#rN+PW?3kHnF{anG{l64Z>QQJj=)1SwL>G=P!lP5(MHdZ)#^ou}9 z9COg9HZi$TyNw!#ygzzPquR7G4g1Zr_lU-QS|^|EFa8^4I4B)?yZ$r)0000%a!7GZ7UH-cJ}h3coRxA7d40o_g?$j?2V}Od+Pi zKGL71HJbSsbv8DNFX~ikY&JTlEKr}&t;ucLK6TN CW>h5r delta 216 zcmey)IFo6D1SbbG0|SGGE`RVuGlfut0G|+7AU|@#Cil)wn$;Vhe)zAFGjs8U|4ONS za}IrL+w$euv13=SUVZ!atz2~d_U+q&ifayWrvfQ~k|4j}|EPfBfpVW!|G$4JC_DX28b9|<=S>ev>yOUbRB*`UR#%evEDaY2JHLl_ z0~y!3Zk}G0{jHGkeE)-Wy+wMva$6K`b1-g`d9=CcEW3nl74MpB?>aSr)-!mz`njxg HN@xNAC3IuS diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/log.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/log.png index de548dad4b1e18940535fcaf1b3af3d723220972..29519b68df491fe93aa7523beca179e1102402fe 100644 GIT binary patch delta 579 zcmey*@|R_TiV$akM`SSr1K%MKW)#)%YM7{~TL1q2`&S_F5)58|!SjcY9zJ;Z;QoXA z_wV1k2SoSo-UT8MxO3<3o$J@HT?3)3SFc^YdiBZ`5W0N%3J_hoeEHHPAi8w%;>8OW zE?ziy{@kfk$4{O-cH-pGW5*63J$B?MkUVb?c@rTQ_dr0z?}&Z3d$C8#k`ouyO6W^+2>{?K&V@wPxMQwQEswsO@{-svZ9GB7ZF^>lFzskp^@uuD7JbuA=s1o6niPS2KOC z&ZcraX6r54=6gT-a#^=rE0nzI`MWIp=b}{)R?cOTa;uNg>`(UFz`1C?RNc0v&(l=n zUtSgHn1Aur)P%eGjQ{`TIvg(ATig4|nN+o{fPzIY7Ofa@7-dR`d9IkLsJ*$kry=) zK7B_P^Hm63y|=!DOYLaZku;!qnB&-{9ZZ*Ve7Bs=K?m#m2+Z)6(7E z-OkU>va_(iz`eSFMaVxVF~U)w;X4#l^zFz`fPh)wsF0-QC=*tf{%WxZdC1 zt*xra$;HLS#NgrJva_$cySdZU)3LFxtF5T$=;y7jth&3n>gwsNf32y;#>1FMdp%E##F=)l3hv$V0?-Q2ytyR@~j!o$Jp>gubks;R1`-rn8N z(a_Y@)790~wYIarz`W7X(8R>Szren@xwfpXsl2_p)6>$qy0^*6#;K~M!o$D3y}Prt zu(`Rm!^FYT($TfH7qZjT(y+0uz`?%3!M?7qtliz+kn#cfSQ_KJvsAZ zcNDk$VG2m+OrOnvWp6r{ba8nF3q8`VLyUv)W~pSxK}A|>N4*YH#bZ zcvl}ju+PB$`bI1Ti5j^H=s%3RzX_vK{4rrU|9bl){sWv2fdBvi002ovPDHLkV1i8k BSsVZW diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/log_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/log_top.png index 8aa8abad4a50cfb00ef3f92ee676bbd00c90ddbc..0ad417a4b4a2fe0f42994cbdb135c80feaeccb5a 100644 GIT binary patch delta 372 zcmV-)0gL{u1%v~T8Gi!+001a04^sdD00DDSM?wIu&K&6g004?mOjJeb>FDU_=;-L@ z-{9Zg-`?Kd-QC{Z-QC^S*Vfk8*3{M1($mt=(a_G%&dSQi#m2+K#KOVBzQ4e}zrek} zz`VV_yuH4=yuG`-ySTc#x4F8wxVg8uxV5*qwzjsjwYIahwSTg+w6U_Yu(7eOuCJ`E zuBxf3rJY{IluEyVKCE#zmQ*)wMJ!o5B}=Fj_Wb|=0H{esK~#7F1;Gg-!~hTkz=;s7 z`(}w1K_Aok|MyhY)A{G^Zan*ay}6jKz8~J|0{}%qBEWqWyd|CP?ig#0+yHSc;x&ROC&zVudGlsixy@x7nC$P{VP@F~Y~XSHqF5Hlv{q3gm2Q zORcdcH6`1Y7|r#<1|<;yqormzog_(O990pNC_y5))b6h41bG|b(+J}$td+GEYPHM*(34fERsU$)OJlEy0QYK*} zhzWsVm&-Fc>Nj>;n}~1%0J9^p9EI7D4AB9rt|-Kc6mkoAZVSEby12?` zr?tuRC$AWVtABiy-2@m>hmF!Y4^$oi{qW#B%JzrKgC@&sa07NgWD1G0o2;boqAxA2 zP>WYEI}%s<9IFZd<@Oe)2<%&qqCgQdG98dR3c~Q$wwZ7}cepvQyVKfaHMvHnmnYN9 zvzlC^+};{Zn{st@&QnGlYH(edb{n6 zDVULI3KaQt`3|RZg$O4wHA$wIABH#x*Y#ZVTyCDP>|qKyWFL?a>)Yw|9reSrE`wXB zRx9YW+J8@EJO!O#K1nK28EF{JW*`D^eceUxcDqDnjEu^&QCi0oaySkEmq2|ypF*ri zCYxsY(Jb1<#qZwRXBDC{bmQp`>P$A>|4{!Oxyt9>iz~G9LAlpd4RX18N_!>d=5p-s zmzbQKWM%m=w&Sq7yGq8Mo!{{Y(`AUG^%SR?=d002ovPDHLk FV1g<=Hst^S diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png index 70070ee5d71a3239ced69ca99bec99bf80dc58d9..ce7530d547afeb7c5e05e4eb38440f133d52eead 100644 GIT binary patch delta 203 zcmV;+05t#Q1KRDgDkjUCTWw$~r)w@)|e{=Yn;}6?U7Z|2zHu(Sm002ovPDHLk FV1gvYRD1vc delta 471 zcmV;|0Vw|40p$ab7=H)`0000V^Z#K00004VQb$4nuFf3k0004>Nkla1gL7KNSXKo?ZU!>!~_c?6CZ*P!Gy#|Xr&IFTNLpPEO|nzhy<#2 zrr5F*I}$R3xsx5E+~j-j-rfKId(YzX;CHd1)~T+!UI4HhUw_X3yuU);X&*Nk0-(AB z{)9i+DMq;MAtYr%lm!5MQ6qE`+I^bGe5fAKNyxXsQCa*JH#xUGtQDIj_QxlM>nNgB zljbo1POFFOsPd8(ao17Ea$WZJjY}p)GEpFm0MQY>O~$moaOa zFKU`CYMCx*mn~+JE@q1Wri(di7;b-EmvcPD`Sf*W_l`QfGT2x zDqx5zVtgxLe<@yxDPMahUwtKCdnaFXC17+VUwJ57d?Z|RBwBVPT5=v(hay{RAz5xA zS!y3yY9Ci|A6IA~RcaegXdD(p1(E+$e*ou6L_t(|+6BRjLV_?90MOgaLcGF+ruYEM zr9B1+%8(p2y{-TMrOpA)kpV+$bwl;{&;x(KcEabgiz8>Yvj^~bO7=@~8TQn#;wKmd z&T8sT66JKcM-TYlk99V;HK2N#t1*mz&6$j=V~lT|i9&efbz|~Mq3AlB>l6TGep!d< zWPa_**jI#LaKBD)0!&o4OmPfxhyf%jUIv%};|tJl*`27&ZMzGYr|1lYI|;F(*4AQ} z-E;wt8igXd^ivjJ`^Ew3JYj6DHpj!~hb01CNI?}~qe^mc` WCL@7_icq5f0000|CcaiTG9qcLouGHsnOZJIG_nlEaaEozxAXqPZ; zmn~+JD`Sx?WR5Fii!Eb`En|i&WriwZgDPZzD`0;rVtgrIdnaFgC0~0bUwI{9bSGbQ zBwTYOT5=>>b|_nXD`t8yV}CJZf-Yu@Dqx5yUWp!9hbd;0Emv-!GjymmcBm_Rt|@!5 zDt@#oezq!px+{UcErY-;g~Bd^#4UfsDSp2#fwwP%u`7ACGK9rFa*;P|iy>KVB3o-A zS!y3yY9Cin?3xC8AB%7^Ktmm8n}P1?*9S9sY)qia*bR70000C z)5^fbxvg1{vPX%sidnKLd$EE?vLtMoB4v(tDY0ZEnO!1|ni+y`00001bW%=J06^y0 zW&i*HWl2OqRCoae!HEHa01yMP;B(fB3c~)gng9U6`}+d`zPAH-tsihxoF}keH=w-M z58J-O1lzu&z(ASsK2S_paGqF32Qw6887_AnfslASNnnJDWEK#@qzq_80x4)TkSb`3 arqmzq^#icS)Fjye0000P41h@G&lZu`aeZwX5@rT?wy-7t2f3f^*#OY zUnOVe(Vc6RQv2S#czoyT**|}N|M>p(-K%FWpFX&J>HtvtyQH2lASG53dbHl5bN_hPhvyTzJE4VTL|NHkq$1-@j`njxg HN@xNACNhT~ diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log.png index abef5227b6457e5c3c292ac21d74d2ece9d6fc40..9b923bda0621c71ca1a3d5b05b80b8e412f63bb6 100644 GIT binary patch delta 210 zcmV;@04@Kt1L6UY7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-srESWcUd576 zzm!V9hC#G|KCE#zmX3Ki1ONa4dr3q=RCwA2!OIQ8Fc1a6cSr$V8}9pa&e1yd8IUM| zM5F+s^xpzAa4nR{4Dl!=$p*H?vT*GUPT<-wSiNaO?w>lqAde16!yQ0edT7!O2Tz?}br}-?r7Ynb|0jatg zfW=$|LQMW^?Kye6LYm=(SZI4g{caF@BVq!t2B6F|lBcVnplc0nZrHWs7S-hKLF-3;XE$|(@*5{=;-@b&sz#X7~W)xqtz>wU0bnsL&A zClxytexTScL~~GPdP0hSqHC0yW>@YnA?E3dd6@)4wjWS8BkUVk7JAag4`CU^Zn)F% Qr2qf`07*qoM6N<$f?5B`+W-In diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/stripped_log_top.png index 10154e115ace673d0e8b65b2a7944f1412b7fc5f..9d3dbb0a640178fe51e343b49823b828676be743 100644 GIT binary patch delta 225 zcmV<703QFx1n~io7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-sonFO~PrsB( zzlK4yfIh5oHkMR3ZAC0uIwebrkVR1<gpiUv7g>^@TzlUkP;e1Vt_%nr1LnU!1P1Tx>|gLFY=z79&+=~>Bb)F zUaX5FL2Y5)_ojeb!yIEtP;0PmZw=ICzmNMAa2tEit-!PrYqW$aoGGO!AakZ}fPq4d bDyz&NA8;KGOj;Ae00000NkvXXu0mjfU=v`n delta 570 zcmV-A0>%CD0mlT87=H)`0000V^Z#K00004VQb$4nuFf3k00063NklR*90__cW z?G1bi$IazZ*XTS!5uo#ga5g2)64DIRFhJ~pOI`Cv^Q3=^98VayF&^q-xQiT3mlm#G;}Ry8)%YF?lQaO z(!V0yMugjlOaF@1+ue~WH4I3z1kWX;P^e*msbWNTgsEblTUHH~J!iYKuvYX{2cu)! zk1r1m>fzhFFoix^`>KN}G^MVQy$RmwG$PHC4~4Qffqx3Zf!)iNRZ!}B4_?K43ywkd zCd^szEB!&SenoUg$d)49Mokl?uolqZJ-$3x2B8{s2f|>7zTGL>HP57bGS4MhTYqkZ z4+{=^<4D}%pp3z}mUl)7eqe!-cJ>@0LGvzv=> zHs$%>%QKOhQrDO&-Vc&{B7Yp?Wd9JHYq?M}ofup@)AZ;Z-K3X3yYOQS&`AuQu6{1-oD!M<+OA;I delta 470 zcmV;{0V)220^|db7=H)`0000V^Z#K00004VQb$4nuFf3k0004=Nklf=Cg9lTZ+fQwQnlpo1U5Z{pyG5ZxREClLg}$wdh`6htg2$cqqZ ztnE^Vc-Kp!Z@YKz|L*;Nk8^gK2V<;AGa(EVX(j-Kf#R?G*ME;E09=6W#x4K@86i^% zYPOEw@JtRs`qlhN_b_iTkP*^PNWb6nSH9mtsD#dk(+eyuFG3gGG!v-jmp$jPFsdE4 zt%w#%>JtmnPv|+1q?vFTpE_E!(>xfLbDOK3amjLzi-zp5+(cU;Yx;J9&U0c!`1F_6NH!F+Hw7=kMnrIoE zZOIM|RD*ZZOz;~Xk+g`vZcG!+!4~Og&Uf&Y2QN$@hELNAM6@PVGnL1&YvC7S7$^oZ zVrh91CH2XtQJxX#zhdVHGUD~)DWBjvIU{|szV8roHaUPHkQCYc0P~mci(-=K=Kufz M07*qoM6N<$f_>T5=Kufz diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png b/Common/src/main/resources/assets/byg/textures/block/bulbis_phycelium_top.png index 568c3bc9cdd920a73d599163b0eae7f06aa822e8..49c6247c9487103214cc238c18476221358f6fbc 100644 GIT binary patch delta 180 zcmV;l089V#0r3HlBoYa5NLh0L01m?d01m?e$8V@)ks&32?&{^};@jig)YQtr#ki~e zWE61#003)AL_t(|+6BP@0fR6M1imQ%+Cqo;8yma&){Hm+>tg= z#9|lHw2aG20@GOPKx@r-U&Ie@+S-G&5}pTCwGCGyO5d16*q@IjX03EGl7Dp34Rzv% SwG#jU002ovPDHK)LSTYiZB3y7 diff --git a/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage1.png b/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage1.png index 9253e8566d053a6ab33b9f0d239505c9d3d42148..27a815f5cb5d632e65b3f60a372d71935b6a90c6 100644 GIT binary patch delta 166 zcmV;X09pUf0m=c8EPqIUPdsiyC}KbKqf>MU0-YfGIDUBcL4pU-uRfF!ov8+!yXo$M$RdZ9?s Z&lkq}0gl!POi=&;002ovPDHLkV1nT+M4SKs diff --git a/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage2.png b/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage2.png index 5556764d93447594ae5347a79f7345e27c650d23..6ec189142dede9ecb48841a9c87b5dfcb5d6dbfa 100644 GIT binary patch delta 181 zcmV;m080Pg0oehNEPqOx(@1|$JZ?fLVn8BMasXMGDN-;gOE?`kB7YfrbpQYW0d!JM zQvg8b*k%9#0BK1?K~#7F1;K#<0x%2%AZ+Sl|9@BjgatrlYzh#ODqy#hY$voZ`+1k0 zkpcQ%(@keUX0pBQrVB}@JKfp^z2s(cTgaq0+1p(p?(-%)S1y2kuXpYJeqgKHe(w&5 jOE@A?a;Mx#)Bpeg0d!JM zQvg8b*k%9#0B=b|K~#9!Mb6g&0#FP>QQ+c3_g~nq=Px~avlRUyS25q%vW&iQLhVpX zpoivi=CpG4!a10jz7uX87Gk0Yo01ZgyhmoQ^}>6?tj>~r-!$0e)alSi&S8UHukRQU pxNZB+*dvJP&5kmmKNKl?xC7*u0oD~xsv7_R002ovPDHLkV1mk4QvUz| diff --git a/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage3.png b/Common/src/main/resources/assets/byg/textures/block/bush_blueberry_stage3.png index f146e4cbbfa785b3189d59266ee03e380f5bf260..d570abf04b982185d0c0e6d809de951f816f9282 100644 GIT binary patch delta 189 zcmV;u07C!g0pS6VEPqOx(@1|$JZ?fUS8^y~Kq66c09lzSQZOk?I2|}5LISW|00001 zbW%=J06^y0W&i*HZb?KzRCoae!GQq+APfVrNG;6$f3OK46aXVfGXN1818CZ+55q r`+<&0=k6{LCp#UpfTX$x0HYNCif{uaJ6huj00000NkvXXu0mjf{X9p= delta 195 zcmV;!06hQU0p|gbEPp(1LMUQDDN-;pJff&+cIZkV@UPIy@|m($RVMXO8IY7w4EAa?ZBjn^EJC@+KLV@D~hbJpciW0u3YnFRA7~VV Mr>mdKI;Vst00bU7H2?qr delta 174 zcmcb?_=RzT1SbbG0|SGGE`RVuGgY1c%bxt7a_4{P$>(WXKkdx;f3_VcIrsg#NkEFd zB*-uLKNv7bc{96BRFudH^>lFz(FiW>W8^!az{AA4<$wLB3$MgXmCaha*G{we!hYw& zt~bW|4h=8W1Xh-?smeS#?4uX3wNv8Y)5@(`7sRC>NE^O1Uz3}8{p*{r8#iX{jAier ZU|46y%Drv7a|F;*22WQ%mvv4FO#s}aOMCzT diff --git a/Common/src/main/resources/assets/byg/textures/block/cactus_flowering_spike_overlay.png b/Common/src/main/resources/assets/byg/textures/block/cactus_flowering_spike_overlay.png index 4cc9f6d0d7beaab20de4c2cdcc51f7f67e23b565..94ac4cfd75dbb5c4223c8d8474902e0117e509f4 100644 GIT binary patch delta 170 zcmey&c$;y8gd7Vq0|Ud`yN`l^6lZ})WHAE+-$4*&+%Ylx?LFCI1c^V@qc3WO{?C=%>hgiM;LfHOdF>z z(VZTY5EsU^B6{jPUSFYtZt0c%*~@>FDxcBa*%SXLZ_oK|*TuC{!jDAvZTkM~n2D0v Y8Xs0|-*}xrKsy;cUHx3vIVCg!0Mgt^RR910 diff --git a/Common/src/main/resources/assets/byg/textures/block/cactus_inside.png b/Common/src/main/resources/assets/byg/textures/block/cactus_inside.png index d58f2704a8cc52b64e314912e2084588fc03774e..11bde5fb084c9e4ae95d9d580a9dc8d3f8062700 100644 GIT binary patch delta 197 zcmeBY`o=gxLXL%*fq~)e-A6${inG8YvY3H^?=T269?xHqGEq^r9w>3~a@DCb1$+0$ zZ`c&DWU15inWkBMsTY9~j3q&S!3+-1ZlnP@v7RoDAr-e+4?1!&If^(RobL13%Yb*? z*N8`7_Z~>mJ+b}O4x4x9-~av`wYgvZd4ghKL`m$;RWpmX2w&#qY2)ZxIGJ(sY@=14 w>}QmO23?gYNX?0V(#9 zAiv=MV89^d&FnT&QKG)U)5S4FBiOg!QRsjI2Xmv_|Nl?&9G2VOxL7(l>CK5#?x82$ zWWEP=h3@2GWaQv{+jNE{Ng$GUm6&YC3N|zT87JQSwUkX>aQX6q*dwW1y>~AC!YuR0 zT`7)NL%!kaL^ipFuqd7@{CuzyhM&@z%75eK z)XtRV$~w>6`9iWNu8-@$j;2?JmNUNYOMh^KCv6t@o6U^ZGk$BGS-6Bje0^KZnKjDHaM9Cxy}w@o00752p4b2Y00(qZPE-H? z|NsC002)gJMv);He{D%bK~yMHT~7fH#4rewqW=HM2ih&!kwz;Dw$Xox4geA7CKD7g zH>zwTff4``LzH`-0X-4Q4>6Ksf;Ay+dRWZLl-CmB>YnxRmC)EFyk$M5owc*Y?|KQX r*oR4J5BIDw#x&0H*EWmzp!)~e=mUm`ydVPr0000%7 diff --git a/Common/src/main/resources/assets/byg/textures/block/carved_ether_stone.png b/Common/src/main/resources/assets/byg/textures/block/carved_ether_stone.png index dbb4162d572f219b4cfeffe4f9e2cc5bafec09ea..43df16ebcd86c7755fc789596e19b775fb2a65b5 100644 GIT binary patch delta 172 zcmV;d08{_%0qFsdBoYa5NLh0L01m+b01m+cxRGn^ks&32m8YwPn3#Bkg<*7aR9;`C zsv2AX003i2L_t(|+6BP@0mLu}1Hjb5h=M`hzyJjW|C;^|o7$~tu;x8VB6J_h4604F z2RfzNDO?Y2nNr^bQ!eHQZ`uq#z**vcKMkWK+?__4ObMp|^T a^aqr!6A^X~xB?ge0000?5@=v z@D5u^f-0sWj?EDyFXH!fOcSN%H1GLwNPXE+?kz>0);#lRj8xN#{%Ga#I$i@#) zI=J-V09vmr6cxneOp5`eH?RM|h13TS!;fq->cClCQY)-)odwPO2l=twS;_!A2XBJNM z@NPCbb!uVH7c*y$#fxGjPGz)rmG}Vhxq>Exv~wYe2@DJ$kMYhFTmdK II;Vst0682u$N&HU delta 184 zcmaFF_>Xad1SbbG0|SGGE`RVuGgXTsKbur%Lmy4KU?cSvCB8daqV3frr{#DpEeisw zVm`R;9+2WH3Gxg64+9LF&gh(&VBT$iciYbjttw3e%>}S#MiC zjT?SU-S6Zw`C7mSot6s=B&ychn9Di4i@7?giZ3-MA+A87-P1dFw#KZjO`VqGH6h#q$OWQZ z(>gY_6#~U~v_u1?R@P<%Wv6C)PL6S%6y*d|RvBt#xxP;ysGq$g$S;_I5d{84T6_i> z8RhBX7*fI5d(e@u$w7c&1J@&sHQnd_{9o_ZIJ^0elzFdtVK?`*72%yIMlZ%VNZ{^(6MD?(&)yJBO|9%h?yp#rI?}Ykz!| RYY4Q4!PC{xWt~$(697#ETGapm delta 310 zcmV-60m=TL0`mfp83+ad001BJ|6!3fAdw^#e*p+dL_t(IPh%LoU{hP+e<%|UCdat` zUs;=tAr1#?Yg17qL426l?&+QXK^QE755P23hFblfmg9w?0c6OeC@1U&!ED&s8Uxon zA>08jhSvokn_-GU0OSG~jm$j2ZpHo~GA1~5#3 zMitY)cb6I5tCxTk1EY}f`lToT3RWJ#An$)t0ah>2889#a02gtRE1=cX^Z)<=07*qo IM6N<$f>s-VO#lD@ diff --git a/Common/src/main/resources/assets/byg/textures/block/cattail_thatch_side.png b/Common/src/main/resources/assets/byg/textures/block/cattail_thatch_side.png index fd99dab6bde9cd88df31636e3903849a7b67202b..abd7f7b84b8bcfb4b144e84aa3b6b99882cc4bad 100644 GIT binary patch delta 210 zcmV;@04@KN0*?ZaBoYa5NLh0L01m?d01m?e$8V@)ks&32V~i|vPCPefCS^l0D^49# zGAB$a9zP}-895f5ciQ&=004bSL_t(|+6BSE4goO`2H;=xK}zg8JL>!ne1PU9X zb0VC^OuQ>KYfSPymTzCMMNT;)!XLA{y2EBQySqV6x~MgnG-*`pADIa%Ul6LW_y7O^ M07*qoM6N<$f}kQ&KmY&$ delta 197 zcmV;$06PDV0+a%fB#}8HA3r7;WkWGcDIRi8JX10!D^49_j4U^2CK)*vL0C6Cks%m= zf=NU{R2b70&M^+cFbqcFKdyy11|}A84a)>(R7koalwN?+&Ir+SL#MZWdI-{pm^ehD zs2GDRC@~+A$9}qv{fI%i`zo(6+y1j2v?4ufw6eRvax0#y!|T)ioE@jOxV_RHogA*| z9cD~@$z^e910p2?Lz%aMr)ifM~O+`v(|Y4vqhp?~rtK#y zX(@KpT=O|lh_NKdFPOpM*^M+HN6FL0F{I*Fa>4=;gAE5H&b;7ZQGJeCmRAl_&w cA>zowz%hd%=m*cnETC!zPgg&ebxsLQ0IH!Qm;e9( delta 125 zcmdnWc$jg51SbbG0|SGGE`RVuGgTEyOEGOfS@U$Y?FX8~;OXk;vd$@?2>`ISBoqJu diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/cherry/bookshelf.png index 6de8f402aaa4c828eca710a5fec8f11aee87ea07..16472dd5516302c61bf6e9adf91a4d00f54cb85e 100644 GIT binary patch delta 336 zcmV-W0k8gm1>gdZ8Gi!+001a04^sdD00DDSM?wIu&K&6g003i9OjJd+wY8|53WYTaI!@4Ge2gNl8g6PI{IdFO3^4KR-W( z87X}iCXfjUYZD-05+ZX42UiaoOb{AR3>7~O6-5aXHwzLb2!9O@)QkH70065=L_t(| z0R_R^N&`_4MA2P!dM-+g_>vdJ|Nk%{F^WM@!(`5MyOy2+L?KGF9z0SAHfQ^c{Vi0< znM3l{p0_BQ)3PLqD^GBAkO0OqKpJR_ZlXpyYv4AT?}b)OeU@Iy#0E0K#7}`rg(z8D z)DFzM4{TWUc1id3_i*l4PpOaVJ!P%y1prv{cyTZo*aZe|eIElO^o9+Lvn{htEWb?} iJR7~FO(xiBGXDV&&`SFSN`~nL|;gf`_608N;)p2znFo$3et_2p;t4)SDnw zhDwLC>qcpDbKR1(Z{D{a@?&gs4+Ik4Cr_U5^L&$dFmkxhHh;KE0$^$Sj_2rp)$dUn zurL7bw&nrI>q!7sq=>~zNfS>=OigE5cw{D~>2})q@9uLXWn;KXlGl@%;nyb4`hdZ! zHwJbnc=OH%3w6cJ?KC~J2%R>0J&7j;8o*?w&$z$NxW7);(g5O@J5pfpdkL9oCM%oM z{++!G2`N z4CnTwz>#W)-RL~x02rtDmg2r4=sfCsw>|K}D`yN~Sbv(%i`At~<&ZpjUEn%CUmpiC zm6B$B9%VCTm_Y{DE-2Pq#q-w*dKd4}ZOt(>{E+4%95n5?mGYE_>-g|=vkk*llJdDH zG^26bum#2q6thPXGV_ zkx4{BRCwA2!9jL}00>0E-!!Pp-2a|=aU6kE>F2MP^EQ2bIDa^Ub{_8qSEs&T5*nsY z9^@U8lOZi?!ZgY427*CmE78=%Bu%$P5H6LV+ukLqc|UoI?1>4In?8RX41g+02B~<} zUPxBQ79iX}a`g~4&kzC0J&O>7TU&`t6Ul>QNEVp|ys?m5n4V+hHtavXK1rElZ4)g3 P00005g3v delta 583 zcmV-N0=WH|0@VbN8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Iw5L_t(Ijb)RuZ__{+ z#ea8p(%`rav`J|YU=-QOf2TozsyIq+ z0r2bU5`d3xhzrnh1cA1oGqg#0ka_e`?0FJ^{#4Noea2*T9Kk`Y0RVOhP=WviY|)g0 zZs^mu7XUnqc0d@El?2-22}4sl00qD>nFG*r>i`TF3zRm*ZU(?4jcK`c!n`;K@Ei$^ zB|y*LCCE}bwSO(vtG*Wk(3`aYP&zN90-i7oNRZ{ADIGpH&j_-#>N91SDZ_Y?FAD>=(Fch>qff7V_vOO_h7NqIEC$?LE0xp(d{NkUHJgwr_T$K?gXWR5l| z=ZlC)XH3#~#h~Z!0`Th7JB}Ye=lI(f-adU%dGJuS_WPINrC_X002ovPDHLkV1k{T4PF2M diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table.png index 9cc9cda6ce56d6fcc088210c3cb08faf9b078c31..b63bc49a6c0f7a85ddc0581221da32bcbe6abec2 100644 GIT binary patch delta 267 zcmV+m0rdWW1)Bnp8Gi!+001a04^sdD00DDSM?wIu&K&6g001*kOjJex|Nq$7*tNB_ zua8x8IUs--Cw3JhODh;_6Chy{B0(b#UJx5NAr?;z6(}AHMF|rr2nb{JE~Wqg0G3Ha zK~#9!HIG3K12G5#!?qB6fx!P?TM?;O%Z!KBG}ZX-{S8(3UVm+*BlZr`%qB3SF#;el zL8g0Fcl!Ij*{c<*s(Y)R&%r%;K}3+}9QJDPkc=>Uo@W~A=Q1jn$YtmuFJp$ z0yL31!6OS7%5@v{_i*>ifT@}d1G;n=^8;p<#_Iuc#Eby0M^>eGXJu9O5BQbZ8+P!WrG)D$WN z3#lx@rZLkbo7wd+*-h&lXWo2o=6mm1Eziqu$xAeB3u!w5ynkKz!{(~w$H@qQYfB!x zM~b_r7XbJ<`U}9`sD}g4uq_gugHF-en2l7ji=r+C0J}$uRzILaO2f8Tt#|-1!T<^g zK!S@eEL#15@0d&*Clag-l?xJ`BdrWy*uV_XK0N`T=2QV_PbMgx(N{wN4xOBuQ{`8E zP~>Cjw+ny(h<}5SHP@%<1vI^YI0)ISU8K3bOmlsiI0$Ka0o_#d_|YA@sb3Ij=ERD1U&$hN`x7!qVN89?O%HJgQ^WW!9CeNX^R+>{6P_3|}N z;h+debdK3OZ@rj-VRrtk>;sd@fTS(ZPL+Pw%t+hGQ947~qKqllKf7`Nzp&d@u>b%7 M07*qoM6N<$f}tfTX#fBK diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_front.png index 6cf5ba0e246e177dde6e9ef221f9a735044a3f7f..c993839f2da4ac75e7ab4a834f096afd2e600f5e 100644 GIT binary patch delta 283 zcmV+$0p$Mh1gip&8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJex|Nqw3*2l-k zbT%cH9WRX=EQJ{b(m?I+dIS&?QeogLx@o|;;(`b_DCMi4CmtMLCEF}up z&WJT)zaI*j&1eFVy3knWBzNHTW{n(MZD^ulbVIK15pyBh6%XBwC!;r@4Z;Ln(g+a& h&Q?-^xK&d54-^|wLV18lZ!!P?002ovPDHLkV1lf$XcPbd delta 610 zcmV-o0-gP<0`LTo8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00JsWL_t(IjeU|&YZE~n zhM&xAnoU|+8(V9s9(s}@cn~aj(}PqzsKtX6gnknbewpIQbM@k}CksUg3Kb8A7#ivh z>F&<#&dhq)WSb~BFbwm~zxRFS*SLEG6mXs#MELa1=~yAYP_<7u?}M$Np4AU%aiUpp%m<{+?RfaZ$0F=#n zuyJiJ_wZM>Hh;)7o;TJw6la$X?&lH4J6b}bou?%v$`mM5FiZ@}6tsi{;N0e%+nhUQ zxpH8v<6Ac7Lpq|@>#+wYrTDV{5^a6$;3WBt?s!HvpFk}zID)9vWOuR3wY9ZHuh*+H zhEmk@_oG`3e4p*5F4{Y^cMOEB82r!|yt#23ppG(yXn%bPK-|dDrRRHo0l=b=ARy4r zbLL8LmQ~rPbN&tS?a5c39vuPj{@LrAS75B;XQt>#K`NVdK4F?@>j{I)N{yljr4+{( zapkt{Xl$=9m#@SIZ6V3L1E4J=AKPar#%&Q^JNc)+KfJpeNAc<1{SgJGW05|VS9 zla_)`!&}q0mt_nv@EHe>Uet5r9R!m?O1vZSjzuBq3W@O!?fl#?n6h%0ct=`JVg(Q= wQ!sKl+7+ae%^fK)3-iBlY~qU3%pOI-AJ_X!a|*8t+yDRo07*qoM6N<$f)>mnh5!Hn diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/cherry/crafting_table_side.png index 4013f63c50e1e3435d627351783bb76864bf4eab..1adbc6e1ab130b2ec2f7f34a4bc3e87ede9bfa10 100644 GIT binary patch delta 288 zcmV+*0pI?M1+W5;8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJex|Nq$7*tNB_ zbT%cH9WRX=EQJ{U}0G~-jK~#7F1;GJw!axiJ!C6W6K~g~R|5p<1Tz^cEM7Qq0yn)~i0bkKD zfMftk2ly%)5dBI_KFE?J6~kqWVoo#n=S~fRKF(`xKs3im#{cUv+kNpV{0Fm9-2;Q$ ze9VhQZoqzNv4wOfSmGcI;WCO)@F(8@8Py6~^7@RnB9NoVz191Q)uhpP5bdX0fC5Bd mR7x#`8HAUdG#SJ>o%9bc_(?W6#UqUX0000fx}|42_hP_uuibE(oXT8uv4tW%1RWGC?bNLwSv8kwps9E&|Kmr zA?$Luw>!Hta~8WQAG_lT&a|Cub-L>WdFa2#QQWWmrZGSBBV)+u0HN@8BGISkQiR?p|7uAKN zEMzuDr42h#Kurqn%r5fy+gEl}h)|ga6((z5qg(R{D*L7KI zF7SnetaczLS)FMCP!%#Gw1$tio8_RFWHUa}3HRqNP@A%Jb;S7cZT5)#e6OqlCl69+ z4WTvEg`_1U${J#0C#IlAnf}lkhNJueI^YB<<C#`Fe*1QD9=bdlatVM$Ur2e z#Y57H+q%gmh-XeK@7$SpB~I~3NJ>b|xSSZ4VI<jDE4T4yrp`f5k!DTo^&X6jn;WG3oC}=EMvA`}CjKOvav>O{7q`d0wYUb^m zof#t(Zk?Sk0Qhc?PaamkZpDP?&^Jbi9 znb_Q+S;pI|uYXHu@+KYxlx#OeZh(*f8}VsZzSc6x1Lkb%nh@NZuz4)^XGdQkJ{0 ziBneA^tKD5;ccQ;)|5@0K3KiCt&#yoLvh;$YvAY=9UmL!({+wzPILW#0Kq!0bWoBQ Q-2eap07*qoM6N<$f}icYRR910 diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/cherry/door_bottom.png index 92f84c489e8ad6b163c8cbdf2d9b542d245e7bd2..fd1299c05e97f345cac36d0846a5b4c831370757 100644 GIT binary patch delta 238 zcmV!0VC$j~q|9>hcP$$^=YFM{*cPqX7O&pI@a1ucE5N0Osv#*a2c#iES`}g@72b40b@rRaJOZ^?vOnjvWS#tpwhgIJVEZ z_ns4HUtV7io4%tBo?mvy=kH(XJBKQAa;*Vy#-y`v?{8>==YOg1xHWskr}lve;{)yP z06^b4>}Jd1;SYW10BCmyDj@+_sRAtp$~i}yc>uH&oLydEH(Tl#OH^4r7i&B0X3N>- z1x@g&VI_0KJ9!SkF?cGOqsju`v@H zPPI}+$}GD%e>>c@M=F`qc!%*}R!mDlCG#|L6lyvCg=H(f z4-b|@y3YUr0DDP9K~#7F1;H_L!$1%NFmQEB=l_2+MLe;V26S>u5osmoxQL1o?!zUz z^~7WkiPtP)% zL4-Mx6{Xc{=2a-6;$RR0&RYTU+Q}vEcZ%`p&KIibI%Ol&X_Ei|002ovPDHLkV1j?a BVRZli delta 496 zcmVtikgrOH=v4>uwlcRBXEhKxBxd`%ZBr?OND`glrv-`+lpisv1BKMHnQaY zzkl~{%|5?;-2>R*Stwz;Z14ay!BZ$n|84Lz!L#iw8NiRu0)J2g?Eun4a6E5^-SjFY z*x0`(0)XAII}0d7N2MeYX(hD5QvnabV|qm?Y9uhd!uaMS**lEnY`nwxKq)6u;{#e3 z+$fz?WUpf3i+@vz1{N;L;vR6v@4Wo@wQe4y8r+t~0(0Di6XlZ)&sEJc2q|oWCm9RT@qmBCF z4P1h!YT|o{6MI&|bPg_oQPrbFZ^9MGX%ct;4LK*g?f;OMInFs6H5+ZLlwf>F-d{Em mz!}4b{+jOxgY|PZ*76Ts={ zDJCW+At50g92^%H7nd0*y8r+Hcu7P-RCwA2!7&noKoA7LnE^7(TkZh@kMRXQ+r$^h z6~=l?VwC~6cJucB-mgbz8XrkGqY8_`a#V3^)`(R*jN#KqzDP92jwCQpopYDR<2CfZ zLB)J72^7F!atP+8w3;F|V~eZ+jm4o$Fjy01l}}LUb-<_7z&~JfFpfVr;3WV6002ov JPDHLkV1j$VO@#me delta 316 zcmV-C0mJ^^0m}lA7=H)`0000V^Z#K00004VQb$4nuFf3k00036NklFR@nUi{{@OekYV>w6vl44bMj+G8follUDw}I3MAqCe#dj)v27cE9uG*u zbKg;GMJWX&AqlnCbDbnX625LX0DvTr1OObZ!66At&gY&aNPpryak3=D@LtlH<6;0v z5#0%v8oL>Nz-~wy)ex7Gs5s`dJxMGZEFTwaF@By1Tx;!3^vL`pBm2=>XIk_}68-?=#J6)h4@43nF! zoK2cNgcygTe~DWM4f D$;wF` delta 523 zcmV+m0`&cq0+r*N*6q!&5&&1e)pj2TQ z{84eY8AuM}w||{d17&^{|6NufBBTKI!Eb#aaNV9Vzv9m1+?hNAZL(*f;VjTpWKbzG zp**B+vtj&Y@GOJJCVPrZ{<8p(PRuc!8Q(T|M^v526sty)TL1S>PPtV35 z*Ew1kE6SfL0M!03i*Aq2(z9Er#NaxKqLHA;gw?pJ$$v!zjO#p|vh5U`73@M72r4l= zcSnWslmW^^He-#ejuv*|=;>+mN|6a|r|}lvs!9y1icwWS_*`5L-h;*q5n& z^FbvK4-dVF;GE;b?JcUxpO+VAvl$a(*o6?E@8xvLE(DsU0YF6f2Y;#doGfTLTL1t6 N07*qoLLQ6Chy{B3BO@PYe}B2@@2nCKLbw0D(zFK~#9!70uBN!XOj{&`YX*KWaLI z13**#ro;{a;sC-5umNQQ-nNDX&H*4uklZj?Z?sbZi#0aI{aQfJC6~?&$oT<+gwrlu zjk1VF9e3>$xEAJ`PY{R%%^NPtSf~9Px1UXBbx*WfxaY=@f?klrS>tz7!*Mz+`zN8c bKCb!)9TOv(;>a7c00000NkvXXu0mjfN6l11 delta 403 zcmV;E0c`&90igqs7=H)`0000V^Z#K00004VQb$4nuFf3k00047NklRD%fm48DP$1aHNc^O-ygUV0D@g(6~UB~7+THu2EixY@K0gv`#&&d&GE zO!RznTN6lD832YtcFs;;mpOBtpa7P6#;!7KtrK7@Bz>E}`G0)ds>}gUS!Gz2Ib-W^ zK|5~R4?o6<8A z4mQ{CV{@SGH-Fa&YA7ThI%)OX=fkzEFC?FV4cHITm#M*-Z#`Y(uO)FclRYEux+ zCUNb0e2jzteCqD(vW3s-%RJ-d=bLa&LSEFnPMVTj>7%G>UWWayI9c0&XAax|O+5k! xvPZZp+sd@|BbrU(dLVl(Y=?Rt?t+W?1w14aHFG^nLJR-^002ovPDHLkV1n5HwhaIP diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log.png index 9c7f0c4f9bbf561822f8d127fd6b248260178bb2..23b771876ba27f51bfcdcf8ab0e2247a6197a15c 100644 GIT binary patch delta 197 zcmV;$06PDz1JwbL7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sjTbv|&Rpyo4t8;KuWkf`xS z^f5F3c#c`O3M|g|wVeVZyJzObIzO6eC?DH50xq&G68m%yzdj2}ckd=-mK)R1N_k_|NfD^kN)ZIL(*pJf^dmZ5x~aww00000NkvXXu0mjfR2E54 delta 415 zcmV;Q0bu^s0j&d&7=H)`0000V^Z#K00004VQb$4nuFf3k0004JNklDwpNl{v(`~rZY5QTxqYl8&HEHbdj036Jr0OGb04djimqp002ov JPDHLkV1m=+$r1nn diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cherry/stripped_log_top.png index 41a5d066377a60ff4d861e66aa3e488ee2a66f38..32e50bc51174f734de1af7eb8814dd15287fd173 100644 GIT binary patch delta 233 zcmV($7$I-_+ufA#4FZCB;nCKRSlo1(82rbU1DK7C+vCNqU7F}j#V5G5M#LkNLm jWHPxGjDv{mb0+!&ky0NuK;OGA00000NkvXXu0mjf+o@Uz delta 458 zcmV;*0X6>l0oVhO7=H)`0000V^Z#K00004VQb$4nuFf3k0004!Nkl8qv z5QIPeDU_Up4}yWffPi$V(x*$ECT*TIk6{?DT%vpXLLb!H#lx3}F;JQMvdYk|Q*YE#{xNut!PAHdtIVq{WCDP_u5fb^TFRYe zo_>nKvJ3Ju$08{W&dstYKiQdDNXXu76##nw%pp!RN*24&8I6l3i)I3=45wt(yQ`d# z?A%s4#F1uoK_}M7_@a=Eo=|x{``bhhC?Bac^BS7XEb+%Up5iolYPJR z9z0H2I-~QzKG)5g2PM8=cf~m;ymr#HQ2(9xKlmrqDO)wX^#A|>07*qoM6N<$f@Dk7 AtN;K2 diff --git a/Common/src/main/resources/assets/byg/textures/block/cherry/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/cherry/trapdoor.png index 7f2192c7b14b31a5b630de7b4e8b616bd359c746..513a64174c2c89df610a945d659465d325f8fc42 100644 GIT binary patch delta 238 zcmVt@~cVvS~BP~-S1mOS~%rg(o^)n++RX_`a o42osI9eg9URv~jV!Hv5F{<^0#l0TPa9{>OV07*qoM6N<$g7TwQU;qFB delta 494 zcmV1{f~VaNSDQuB9XsM*)uXGr z>aVKR=hts0fFTMA_9WLz(9_kqAIl)c|aDi2({``1Ji7qw@^io@Xy#05G~^ zb;&k5&zE-}_~i%gB%Bji35?DYjLCsXPDr-q)CNFNE1gLjx;+45-9k?eCK!WQM}Kp3O;N4$&;7$L`-c;Wn{|b1l*UEj(L0K2P1&~Sx>^JWV-~iANAFNW z6e^`@wc-+q!2h9LMKUlcHV4d_40b%1I0HFj zzIn6z-e~sn{ow@A+9Rz!Q0b2QyPQR;kO(%-K8}t1ejrODRBI0&(Ay&bmF{Tl8JMM!ZwA9Fy~r)7HmF#L;OYV@k*yrgNM8P%889`*)=`0pcw)i#pgVWNs~Ib$ff{+o~Y! xQ7!<;l>hxmp(AoO`+A$7ru#k(IS<8__zQ*4M|f*aea8R*002ovPDHLkV1kP$+Gqd( diff --git a/Common/src/main/resources/assets/byg/textures/block/chiseled_fungal_imparius.png b/Common/src/main/resources/assets/byg/textures/block/chiseled_fungal_imparius.png index 9e1cb71d3970e4c4040ba6d5d2c6b1fe5296b461..927aca3fbd61d94a545c5194b0d04ba62e37bfa5 100644 GIT binary patch delta 179 zcmV;k08IaZ0)PULB#~bgkt8C2B%G=vkDDWcjU#n_BWQ3VTVlO+NwEL`0C!15K~#9! z1;H^A0wD|q(9baRkl726XulHdbqPIcxc^mr58YlR%40*u#GvY+HeEw@lsZk$WC+Cu zRWq#AN639(nzofxVO`iaE4onq88MVgzBE)cI@2W~gUj9DoFi&D>@0~UkXP(actG;6 h-1bM}zr z@4}3kDM+D!$nY}*VA5f00Hm#dxNRD>9FPv*Ts~CF7H@lwlF;R1S93#|iSDNfvi3_&jd delta 165 zcmV;W09ya|0r~-uB#}8N5IPVCNEZz#2?H(+1z2Q);E^F1e{o4fK~xyi9gV>a#2^d= zm!SJ&`SJ%N3Lq98Pyk0l|E-+KzAVjn7jUr90nemb^$Wk|6d4VE7zy!&8$?vo35wO6 z*x+tMJPf6U&%K=tN4&o>tsf_IqKeelA?r58Q%YHO=w1z>A?se%3o@VHpHlu$-4Qr5 TruwD;0000<2SrXqu0mjfb!mr~m)}mPtfGRCwA2!LbU0KpY3)U-SkA z4UR{JIz|rO7A~F-5O#AzH90z7QQ&Qz3Z6Grh~WPz`#zMNo^mSd2nzG%dAFB%>#{3* z%AgbutBr`!6qTEFnq&AV%;F%&*cR4tE->7U^1PFe#uyWZsgK8Kh;G3Zb^TqeB@gj? zlGT)PjO{UDk-VU#sd7XDuY_$GizIro+G?Ud(2O;{yD?ar00000NkvXXu0mjfpf6^H delta 600 zcmV-e0;m0n0_6md7=H)`0000V^Z#K00004VQb$4nuFf3k0006XNkl=w>xzzdRS&@(f6`5nfdm8=lQ-HuO8q2qq~|wX@4s2C}!aNTjj@SG@UlP?yqa~5MGf=*A9T=Z!teKx){umYt4c=z%1 zaEjdq6?YT>{rxBAo^fAWoJ|v$hyX92JH*Uw7l7Jcou&B--@*RiYYsiYV{yX^5*^45cL-iZsA9YPA}b0*cRJLlLN>X3wTm6 zU28XJwR)0;P$=GjyD!ow)o? z*cOA}El&!@Mg)GOsO{CW13yx%Z|r3Itb~e0001SNkl^q-P0Ysq!y8ui~|E)xLPnvm8yMTj*Uhqt+RX6xKM$Wy#cOxP0aGl;%(+-NY zX^jo;2f4T#N;2oMoZ@EZ^;KviPUb}Ymijnk-G+E%k!gpn)estru2uaYkNZ4tkw2rO W5J0(h_uoKS$e zSAZD$FTr>gFc|OFcU+b_Uw~Sz1w3VSB@2^K5NJ*1En?WOa=QiN~bA17!vl?+Zg>VH700000NkvXX Hu0mjfU-m#j delta 154 zcmV;L0A>Gz0)qmOB#}8jkt7v=cS%G+R2b78jL{7OArM5z*not@f7x&aFt81rP=E>r zh}r&2kh}Ss%*z`97r2{q5ayj^MyE2Yl{>DIgpw7WWtN#6BqW`}1~2?7*Af_} zrd1BR53|#C?yV7=Y35zocneDS{VJaPR+Qilf6ZU0Kp(@f-;NM#E@^;~b!a zKo>ekH_mYYfSnxh=MG<_8S*y6q^sPnZ#~uuOsDgvFfO0v2hS5cy@;nC!AO|S1d!LE zRD1wR1xLmP)?2J$G{dX61JDtmgM2$Qj`KYVf!~<0cRxvfyfnSn(!IE@{cnYFfdsZ) zG|0mTKuXsM2sS4IK~xDMYP&6)i088BrZ=a`KN&|ws7M`fQ2+n{07*qoM6N<$f(M0t Af&c&j delta 561 zcmV-10?z&N0>1>18Gi-<001BJ|6u?C00DDSM?wIu&K&6g00H?)L_t(IjfIjyZxT@y zg+G`X7=}_2W7Vc$Q=6DJvLK<25u>qj(Ul217ycRljK9LTFfnyuG{iJ6#6YDfAWnzE z4D`(~;9_`FrfuR~y?5?;H}BkYVsBsW%(zsx=L4{$DOc|DJb!dO091f?wR-qCsVd=F zO#BEg?~?Om{T`~ExR<$sDO?(H|Jq>yIYS4)NmUW<0Qidf`M4J$J}Vjk9G{-k?Ootb zs!H==9Istxbr4|9zC--++HJ(d$IKTP=L>xNKBA$Q81{7xO~cT%$S=mWMX8)%_5P6c zY?`=i+-m(Mc7N0)zf)df!|`;Kj5StY(CH*RBV51W9GOX>4X-s&6(RIYq2jm0BUh1d!-@${$CC< z2@Q2gQzAKl3;Pyxu!zgvi_NtlNC3-v0)XD`YwUKNSAU&DOyTlJ5B4l2m9-S6aH%m4 zB)o5Q05B_QL|32@SY_r5jD?HQ?*d?G8nxUubPfYqj|`ffc@C1QLS=c6-Mdf2FG^cw zNk;(Ar&E%5k`!06sMbgzCO)4AA2|DQMrQL(M7Ml+k}os1tw_%r3F3pf|Dr1Z@Y=yb z7jwZ})+z(*SBOh~Y=3KGChd`ny3TW%mCKxeE+hoX>B%K900000NkvXXu0mjfS``BD diff --git a/Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/cika/crafting_table_front.png index e34ebdb7ee65fa90a1d0a050814cf4836306034a..3ecd88b6030d0080a0e35192b09f3e3fc34aafb5 100644 GIT binary patch delta 246 zcmVS7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000mP)t-s|NsBi*4D?z z$EH?7nNU87NI8K-HFZBSXgMuZE+t1RBuFVDIU^l19~vnc6(SW8%=5F0B^BEkf@N4_hfwaP3fBy zNGeH%APJ4{4MD7|eUK>kZS^FMf#dCWxOAtpf>1NpI=7!ko2k?b$uJAnEq8mJCKZDo wX8jg2)nZbv0z^|s5-FRy0;~$fJ-d7P1L~wL=77~{od5s;07*qoM6N<$f^QaL_y7O^ delta 477 zcmV<30V4i}0_y{i7=H)`0000V^Z#K00004VQb$4nuFf3k0004{Nkl1gh z6otR+&hFTX2iwx7h-6|1AzLo|0#M`yXj~$Yh3F73z}rN5fmFNzMI<+ff?`UL5Q0cZ zWaCY|KeGzOdIqoUhDoG{Jd$Y`i(V zabC`SyyWEmX+Gw@_>LKL#<_m~@?2A0vd3da1%gRB1g01%SkRfu(k1JvAp}Tc6v>e3 i#;5^EY`z*)fc^t0k1|*>{zEVT0000e~P>Q4-qH9!A1N7PHv(O4vLBtYny7Cmlt%X z_mQ;Kv*hL6^X@tC=4EVYdg?p$Jp$!2SqTtydZ}HH;!~58=zk0)h1BGwO~MT}EAl|U zL83F{DQUz(Fp2|EsWA*9P%a-|$q<+5j6uCxXw(6?etx4q9$JC$0C&xnT^D%(wYNNH zMYFZYiiMB0;h@c+L zxE!enC)S3ZF;qR5ZkGQk6xYaCCC-sTMX8|;0F5vh$%~;Q9VLYz@)gq)75ko=+}0o3 zU2EtR;}yk!A=ZY-_vroJ7f0e0k?4$A8(uzpB~E702sHz1=m0iOF~xrg#J%ddjLlEg mzXPR)?s)Lqbkx66)cgQ;b=2+5(FKeE00005^D00 zwA8k4bP3{_JGFOC>s^UcJgqFOtgV+5!wQT<9CT9CGv@OZxjpA$NH3RNzk2o)A)q4| NJYD@<);T3K0RRgVP4EB! delta 414 zcmV;P0b%~=0jvX%7=H)`0000V^Z#K00004VQb$4nuFf3k0004INkl@@aem9>6Md(WP8 ze+CcZ_$+k|fbu*dJtR5yop*yjg! zSZbBJ<-WUc%~X2T9rfuKxLv0BVJlH)`U&UeA-|tpET307*qo IM6N<$f^zb|t^fc4 diff --git a/Common/src/main/resources/assets/byg/textures/block/cika/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/cika/door_bottom.png index 67ead90a3d556722d926f57cb08f389fed667607..03127b1f62e6f4495a60197c2bf370c7a9783a7c 100644 GIT binary patch delta 264 zcmV+j0r&pk1D67j7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000gP)t-srdC45#l@?v zt8#g6rdC2|XlR*GK7m9vbw4s_IW1x{CsZyaNGT#cBOTfX_(lK#00DGTPE!Ct=GbNc z0053jL_t(|+7-(&3c^4T1<*gUTUZ2kM-VLkA|lx65rka8>wkzx$_YF}5WGN0L@lh6 zh=omz`1*&Ul<6WXD%al2_2>Pp)Flimj*3p$34@0L7@L_AvH5~j2?R!g=9>$k`R?E6 zuVHdlM^JI2!t9al5j?J^KDEcjBOahD(i3hg%Tm0AlzIrHuxMj#_5){0C@7#7G1&kB O002ovPDHLkU;%>G;%Zy~ delta 466 zcmV;@0WJQQ0^kFX7=H)`0000V^Z#K00004VQb$4nuFf3k0004+NklAm|-&b#-V7wfpZk@WO8p&l~pOmncgY^~Jl34eg+djQ-$+)`;Zt&_$} zQYtv~^f#TT4}iVDwgf;B54d{v5nNoJ1F%!x&1$pGG$#MF(Pj$Z@iXA58xravCMvC_ z1@P640kU)91F3+h3q0S;J}NDivU(J2f_O0MK;tUsS0L0wqFD1ET;)(yHUNw6Oxl4c z3dF#|oXTqET7UTd$iykRU0M?JCPBtDy|V9LJD4$6T1|`cZZb)r6ZH{(C+g!WXL5|D zad~VnFHlr=7NZSmEcpl}h5Wjx>@j|pLJ(_0J!GX;PdwkFFsHbgUr#*Wqgt(UGrvAI zmUw2J9quKMp8){Z?RQ+|jF~0Ty2=6IXloVW-@SdLBTJah9&N4unOmYeZM6TyXy@O7 zcw$0g&R-VAI_z>%07*qo IM6N<$g4d+nb^rhX diff --git a/Common/src/main/resources/assets/byg/textures/block/cika/door_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/door_top.png index fe92ff8fb075504b915bc1deb448fad3901df612..ead00e5ff64e63c8d563c6386715c8b998160bef 100644 GIT binary patch delta 250 zcmeBX>1LWBS!ydi3b(HLHs%^MLG( zjEtE9c8xBkrS?V{mbyvC>eklQA$qDFno73HvYMKj^78Ui-+r3}GOHxWFPOpM*^M+H zr_$5KF{FZ#^`K+W5eFU?gRRCJKKx%_v|!qi-r_0e=N9W9+gZNvT->_vuCqSd6<(Ox zb-_Y8F6h!lxgVZ6>%^^QYxL`MI*QE8nI$ONBV^2C5G*Mwo4B>wOzOd}eg1rJE5&}z yex5wRe#+e~#zF=DGkTVE?c{NrGV$l?6ZY@ptb#Uk#&-f;!QkoY=d#Wzp$Py#NMHZ} delta 508 zcmV=6N3P!^^=emI1k{`G5Lz!n4PHVi{mpu4(}1 zK36q6-!BPb8E~HE03?;h-UAf6Ard}?ZaBZLc>W~d+vJ*DX#kv2k?_e?OBKUi(0|Q>(vR&;&j8jhjy-_GqXU-jNkHb%oog5n@vCLE||np z&=0$9kPNj@3Rd53&F*4wq61D&f79#r$g+&8Qa2(-!gVJSKBG}Npm(+9j* zQfxe2Vr|*~*M&iL=GkYqBmJ<8vE2;p*hws{xY{)w4iT^4&TNs>a!R3_Hi;$}Cc3wC yu=ja)A*$^f@c$eDjtkY5VvwDA=HB2-rTGihGV%OdXuDtl0000ZIV(;x zCPFJ9Gb0^pk3o_E003@DL_t(|+6BRZ5yT(}1i(YT07fkUM+yi^0SVZDO}~qrg{<6- zu`BK7f|3JElTlK+hYNbB4ATc|_jgG9pihfFOTdLptpzV^WySbc+fI&GIf*)Fx_Yd-S5*wNF#b*Ej002ovPDHLkV1jq_M~46a delta 400 zcmV;B0dM}#0iFYp7=H)`0000V^Z#K00004VQb$4nuFf3k00044Nkl{vnAxAZab8E3}%3czQaDSvC6ucT?ojQ~w>vb-J}#V&d%9rhW6C&_rX?#h!Tliu z=wr&N!l=gxsM%^)(FL3Bs+!=i-cY-W({WE96KPt0M(AS#pgs7Fli@sV$kVi7{W|qH zU)kN-x86`w(SL=XK*#y|D=_Cg%2V2esNmKnHu*@s%*5zL>Sd^9kW$x3a%{vdz^%Fj z%H!34>kYgA)OFr#$ZIC0BXb){X;I{539CFzAJb-m%8^QvGQ=)ehV!)Ufl2_~%J$$h uxh!iefcIf!r3KsUjj03TLBh=VgYA-xGPgKx1@nt=OR{bnZv$3Qc5nhOW~0+6slnj9n@` v3}+FfLhD=zA9R00000NkvXXu0mjfpm1h_ delta 451 zcmV;!0X+VN0?`AI7=H)`0000V^Z#K00004VQb$4nuFf3k0004tNklgr| z6otP<2p9vqn+dV=I}=YD&$x8uJ};4X^&6ygl{DERUdPTBc#$T6EbM}nqQy>50}|-o z?;J_9vriu$7MY;P67obM(ui%-F)veWH*mAn9L;k-e^vhhz<;foeK|jUILQxiQpVEs zhBA>9QUGwRTL8*L66$(ph(#I!aPi|80Qv5xLJE|zz6iiZw( z^vE9xi?NDkvI~td$~CZST7|pU%!kw`_Kn9L=5uAPRkkiBE%c&+t7@ zB=KEqVg77xRCz`H9!hE-eu8`6MlfDSMn;BF&wAH4yfNRe5gS-gujVP?<5VOYnROD_FtfSH~k7(^G- z-CM@t?f!5gXti8d%_j&%il!Ae>p41kLkIr&C2s$w=hk2py-cIut5ML23slzkyTNIyk!f#rzbVoP`dK6)cFfRcQmsVVX;*L%icIt^>iU63cGjdgvmC7VZ0)L;__W+E|)-7ZKfXK>< zg)B${-wDiBZJe~eU0|L{I-_BK2bj#dVq2D_A_{!uUlPrW`>S(jPJqp}aeDsv=JxW; z*!50qfARGG<+QD5wcE9Q?5?s>A&ROt%GmcDr+F&L%8G6jIzcvdM#KJ2&u4F4wj84a z9RP^&ptm=hzJK?BIM{3zTU9kUNCLrhl{(e!eKdhh_1BgTXn>>xH0k>nRn6&1Xp*-R z=Bhq!2ZwA12jfA{nNRbxb;jgv$;0)<-X3gOOjjGz(n1y#RZS>7QyH3H(X_O#;NU<5 vs2hdG82cXWUpa^ay$~Dc$NWO?|8f8T0BA`>K~#9!1;Mcq0x=K+KuJUHGYx-z0SFB!*YjkYE&cKbq&p8+WAcCu&59>`Hp-rQ6{Xrd;p?lq9rP~yAKKr_Z!X%Ty5 qqcuwvvxNI9dzQixb5hu8Ea4A^COBK-!)%8D0000M+2)E6EPMUmkrOc$;Fq;z4s&&4n>0T+7p_Zd;O7`C93Qz*e z@W`!^0&)#$Nx9RCM@3|$Sdz3#V3Y!lPZ=&{3_kGB%Uq}38(rBRd|=l+h4alZ*cZz} zfzjQdmdOp@17fD7A#kZoTS#C>yHNH{gl4lir|HhFt{84@_YcWB+M{ftqwN3y002ov JPDHLkV1fvwxRd|@ diff --git a/Common/src/main/resources/assets/byg/textures/block/cika/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cika/stripped_log_top.png index cc2c10a82f5ce65ff77605ae8aad7fdd55a7e9dd..37574d409597120fb6bc23ebfa2ec66ea933fca7 100644 GIT binary patch delta 219 zcmV<103`p91M2~h7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-sfkZWRKQd@J zEm<)qR4ye_EhI=OB0VD=vPz8N0001iNklN{1BygIi!m;WUE V8B#H$%oqRw002ovPDHLkV1l2yStyXvhKI|UV^394tz?~lF^Wv!*uM!wUGs zrpDDD9L?w}H9A`d*R e@vf{-@`4}Tj>p}zlr9kf0000 z_vncFLCv7$-Psfvtt78si`W!&`jW*xE^%E?{dTtBaB_p$nbI*B=Nc-@Si)9$RE$Wb z4^W&`zSO`|n9}C!fxyU_&dFCt5`>bi>~d@whG=K?cdV00000 LNkvXXu0mjf#J^_* delta 511 zcmV8P` z6vuyVuCJmxM!*u;qC$WI6P+qCwTsIGAa%sgfOvpTJONWy29^$GDq@F$DPo{VsAL) zKN!;W+FWzj_*4D`V4Tky=v}W3U}nboY;hnfE1o{QgD(YdzW(BQ{}st7;p5-~0L4@h z?M8$_$l=ieKY!o8U{CK(Vgh5C#RcxIdJ3EsTM=x)k9XnZBHRc;G z*|g(02B?!!(vXs0^q}LmNY$LItc*^8!=nQuA&z5;sWMA?zQMr$?#U>jm@0NAC(g1} zuiua`SusiN9Qaajy1WPw1|e}AlZ=v@D=P5XeEEI8IC!9gVS8Xph;}0*L3?mXLaIu- zUYpy`UeuQ*L^Z(soA+x^es4%{_BMNlrX3R7P>q(WlHT=ohUbNOCjb)+TaNZ-#c*zV zkL-V8oX;A;(1`k9SS-2Lp;Zn5ob7uXS33Pa^$*<%^up!$vn2ok002ovPDHLkV1m;@ B>JtC} diff --git a/Common/src/main/resources/assets/byg/textures/block/cracked_brimstone_bricks.png b/Common/src/main/resources/assets/byg/textures/block/cracked_brimstone_bricks.png index 5233219ebf4ba0e76f6b0a9982c77c049665432f..444bc65eee4d27bf7287f37aaba038baf22bf17e 100644 GIT binary patch delta 233 zcmV;Ys?AguE8m|`Uj$Wf0)MT5XKFmpxc z8aFv|5Lv9RJY<++zI`zT%-%BxMrv+dirXXN&dFuOe0|a^^bs}u5d)OkGo=WntlYoz jg#PZt@+lgAivrglOeZa-g^eTj00000NkvXXu0mjf95Y&O delta 498 zcmV01<#w5*|bL(WxW2(Xp06yG)QEHQhE&s9Tv+7*J%^)a^hW1t&9MsxZmNKf)gRWv@2{KF~z^^=bIdQJd5+@Jr} zR`R-)T#dSezy(i o`FkG)i)Ez$!oTKyj8iqg0I!Nh{3`Wg_5c6?07*qoM6N<$f&g#!$p8QV diff --git a/Common/src/main/resources/assets/byg/textures/block/cracked_red_rock_bricks.png b/Common/src/main/resources/assets/byg/textures/block/cracked_red_rock_bricks.png index bcb7dd6518eb5ce5dad3a7fdc565bcb7761d0214..6a5a3387764436a10336a02fb3adb50cf1a8ddf0 100644 GIT binary patch delta 260 zcmdnQI)!P1L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Q6R75Z67GK|2cF*Th)P4>g(K zZP@OmGuc74(OD@y640vp&FrGdsfYfexq)L}AXP@mkOJT*qdnPG~_Ml<&r6V(|~ z+!m@AX-iIF2r}6&8R{+K%Ao9WyvQVr*@)rHt{tmZcdS0MT~{OFj%{}l&>#j+S3j3^ HP6o-9`SE>FRbzkLr&Q&2}oMf5n}1way8uLmO61e_n_w@So}p;!3eI4R;|&3r)56-?g9kuv!NAlNF7G<1 z`#Y;NZXe{^Y)eRyrW-X~PZk0gT8y^iha$Qy2QzJAXfev|9so=6PzOVcVIx@a1sByW zxdlUNQ11kzT(iAyIgeuPhHGf9;xfnn_I><}Ps)+OD`#Fan zw*WXjFR{Coliq**amC?>cQd(AZ%X%=x`Ls_I4M_1#zPIdwFVo@2B+sGwl_1ltw)L4 ztu^TRL)?~wYFpyjwl4XVB$sy`*}dn7;{EzvpGo3vCv?M1n?z5_Eld$3zmmimjA=VQ zBd;$Ja(@d3|NPLxx3dz@Cz%LUDAw7_ zrdf&$<|8r5P8D%XUBT29vMD3X0YJvkrS~aQBOmZa5^=IOos$XBf89_)1I9z`o&W#< M07*qoM6N<$g78*1<^TWy diff --git a/Common/src/main/resources/assets/byg/textures/block/cracked_red_sand.png b/Common/src/main/resources/assets/byg/textures/block/cracked_red_sand.png index eea4a9e492763463275f0aec1d006216cbae4885..4187faf5745f4850b79df3171b0c37a7908eb507 100644 GIT binary patch delta 177 zcmV;i08an^0saAyB#~bgkt8C2*?Tb3bt}tmB)?}NvS1&qR}ul(vNHex0Ch=3K~#9! z1;N1;10e_nz^`e*;1&>`HXzD!Q4m|m7-Uy$AEC)xp9iuWZ78m+d;6)l>l zn+*FsC_JwNquTRPL0SEb?g@#uIx8c*o;p&Q;4!?0V9-gVMv9p^Z0!Xk93@-+GA=zs fR2tlPJ@r@qcsCZ`Yl+f@00000NkvXXu0mjfd(}zP delta 176 zcmV;h08jt^0sjGzB#}8H7P4R;%WfpBR}#NxA<}g#*?TY-_BeNuAsBylNklyYn9I-Sa3ITLzr@k^#s{EX+rQ=ZfZJE eN#e!d^apxq6M^t0pYjX<0000z<_X06e+36U0LxM^zaYOWP^1K*- z$sydHQFE0dt)pE_+NBd}YBuLW;oL`n!x4{up3Xzu=(nQ`N`sLifhC$J^WP1x#NA8IT|$j1gf8vp1jNs+;$n6EydEW(L@F@}@FKYsl$aFt<*|yJJNe hOQIme@qZ-z0MIEGt``r$nS%fT002ovPDHLkV1l#-NXq~K diff --git a/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage0.png b/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage0.png index 099e648ba1601eb05f56c7a12844691391ff2098..10e100734df843edd03b52fbb1994c9022648416 100644 GIT binary patch delta 145 zcmeysc!6<(1SbnK0|Ud`yN`k<+DS}Qk*$&l@CkAK|NlQwbgh8QBsQ}iCh-D3ximKQ zcvgXJ`^-~-5=4VBhf>KyThzI@xR@BW9^m?V?(RuNpmqjNS3j3^P6r1>)QPX=42e+&zMe_#Z$i~qjBun?;OAONx%q!G$RVUq+11s+Zpz`zxT gj~h@HHo(9D0QR>pwK|D*d;kCd07*qoM6N<$f>2#bNB{r; diff --git a/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage1.png b/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage1.png index 1b78b8332a05f43cad6ac818a638d05e3fa80a2c..09c2ab339530f42e8818115ecf7ea763ef24050a 100644 GIT binary patch delta 172 zcmdnU^ontU1SbnK0|Ud`yN`k<+DS}Qk*${q@Ck7R3au58nZ#z+!z5n7Czr;i9?vQe zz@~NBNJs!E$5;~N7tG-B>_!@pQ#-`~ delta 243 zcmVi?l! z(!p8*8R9kLvJKgg9wzbsAPnV#0TYyFkmh>EFzeS%Ms!7o|3Q?1EO^4h4rZep0tX=5 zK$7vS0{=l8pu%9yP$okGpB#oO-~c2EWir6L0}=zVk>x-ZK$*A!Oe2VmFDBq&00Xcv zm|XDb5hGLx3_#w1$w7s{0L1{9=8EieX4 tA_1IXfE-XD05b$#oFstF1qi^v0022nTuPW8_2&Qp002ovPDHLkV1f%}VaEUf diff --git a/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage2.png b/Common/src/main/resources/assets/byg/textures/block/crimson_berry_bush_stage2.png index 8c62232bf0fa44d6722e7d2fe3741745cba0b15b..3ac2a6005bdb3fa6188bdab07ec13c89e62734cf 100644 GIT binary patch delta 208 zcmdnP+{ZLQf|G@rfq~)e-A6$a?ZhW4%hhWI_=LFr2ZALT|5F*Zh-yt1(VWC)*25%T zz$cf+rXIl~9?vQez@`<*z~#uszGthLB+vlHk|4ie28U-i(tw-W$m(`6G95@swe+5PnD;3i6f!Y`tQjbc1R!~3r8E6@Ur>mdK II;Vst03)(XKL7v# delta 384 zcmV-`0e}9E0=xr|7zqdl0000V^Z#LyHXxBC6n_CxNkl3!vi zfqw)P5oV}WDq>#EV6*B9N2E$VkZ zlE4fXD-~3&DLKh1ILW;QQ7ZNcqfZi$;A#E#{ifpmXmXD{RCot%xmf&o6dlv?UG3VA zrZ!1nhS$om^Bin!*^ptHq?1rXE%%9mAv!^P!fAMgTfZbdn$*H4`9kbblYm$FX)Rl` eQTe{7wZvlJU!+m@-%upO?cpGU-;+L-AxHB zZN{dV(pS$#JvES-be8K9m-nQ^giCV;w-tp?l4Ab7_0G53d#9%I@Mv}~>7VCeee^&; ufyd&lOLZE7;BUzh#x_=mf z?sG!iXrl+hygQk5?>*ATAaf%2^dqpr2W1eL!9oWED z*{Jel9m*$UW&9QG7>-A<<{jbsF?ihp154hD_(-}TkzgE02WqMxu$WDwtDvQjEh-6Y zz&4pZ79@}eA`voDKyXWUv9{0j26%mecQb`wmD_ZnZLT6EVkk1I&*BZH? z5pi=Q9;7Btggm>L3={C8P~-ou(>U(a#AXz*hctdxCvp7bqs7r^z4b#A=dLn}WNh8g zAQh>5VW}7CTvW7E4lfgvlGJ?<@r!3m7l|fLXLl5*ASmi*)h73ggj~B~&Z{Xb2bb#2 zw_xu+C&B95xRMUa-@>?CZ{AH{F`|DMcCp~^Ry?8*z%v6m@|BY{BMJZj002ovPDHLk FV1l8u>gfOg diff --git a/Common/src/main/resources/assets/byg/textures/block/crocus.png b/Common/src/main/resources/assets/byg/textures/block/crocus.png index fe83c35a74c76ad87a0d2da1b125a17be8157fcc..aefdf51b426fe298b48e68e66450e107e330af62 100644 GIT binary patch delta 216 zcmV;}04M*p0+j-gBoYa5NLh0L01m?d01m?e$8V@)ks&3200030{Qv*yf9BBY{>C}M zvj4uM%<-KioQdVwZ6HsdYn4{mdS=W&j9Pp%#v*b)Xd|*p^Q!Iu0004WQchC_2TU&;BdP?hNXSAGNK2wfl%-OZD3mWA^aB)5 SaITX80000c delta 231 zcmbQrw2f(k%0x@0kb|54&*^;n|7HEuup2eT$EwoKWGHX4?}_rCpZ)*O|7RCo{X1s) zajvRTk=?!}XKv&wFfcHrT?_XHQi3Hxe!>6I0E6nJ;X8 YvFDAs-m_&Z&|wUou70d8>zopr00uK}SpWb4 diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_bramble.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_bramble.png index 110123cb3eb3f9cc3e0c4a3da7474eaa0cc662af..3206913302a92eaa483b7700b241f02175ced940 100644 GIT binary patch delta 462 zcmV;<0WtpW1cU^TBoYa5NLh0L01m?d01m?e$8V@)ks%;|?NCfqMF0Q*-Kvt@s*}{E zkJF`)(xQygp^MOmXQ^*esBToJZd09ZW29|WmuzI7XjGkOQk-W~lxSj| zW>1r6UYlf3m}E|jVqS`1T!>y-ja^TUT}+K#PL5nlja*BMTuqBvNr_oWg;q&~R!E0c zMTAvId{$P0Qbcx8QFu*4c27Hu>d|}v0004WQchEU06^y0W&i*HlSxEDRCoae!G|J3 zQ2+qY)6*atR#xg(w(JoST9?TC|Ig_hK*&J?AR)^#K!VI!Ah8N76csK|ngSb3G}f=) zsyhHDdDaeEkJtMGaI^VQ>3tcgAVA!^90AI7jkgYGL=n1y-EsYVQfr^mfrsx;NB4I_ zKTq2+z%k+;uD=WM7en3oaK66Vnt>$9OQZ+cG3 zlHAa~81ME_*E#9IhkI(**XGYo@ox-rnVXlqxuIxsdR$LZT$#UhM_goCKwyQh)0B*) zny|30gczW2C$$|u0i*&-!h`&R|5Fz*2p2D_oTw;KzuMEqF+?L+x0h9j*^r01IyDUh z)c*cApQ`VBtS?Pho9%_Wv6uNqkp)J~ViTEC61HY4yRC5hOz>ECX{L^e=&aM?T}zF$G%g)9SP->3{EHwD?}E;--IrCLE?w;Dz5c2^kNaaz zgQ-0?YZ@J&X6-##wmp2mOvKg4oqyM~$F2Ak-o~-K*)wPRZkt(A4=Zirz5X2h`}b!T b>kmfTt9CJSH?6z`3>5}XS3j3^P6jN1jPi9BoYa5NLh0L01m?d01m?e$8V@)ks&32`LV0-T2`2NNs)0vR%3W{ zS~lMsCzmZulyQGKge28C24_+9&J%nSpd}Mv($;Ync_K2DF z=G${^eqTM`zLX4&?tF9tvV{(tKk^|@K9;E_$Zvaqp^rzcj`UE%sdqlWKRu{^$#DGe zfIc2izZ}d;=HDK7zkGX$fOo(2Tu{o>FShe=>^zW5L?OYl zRzk*x|Nqy!a>z98OXof`%mi6T8uqYSmStTYk7dn&-gta&+w+;h3>iEgYbnbrRheP~ zldHhQD|T$###FSZwVEN^vK2)X5fBMMVa6vEP@VgGKaE=)B2fV zRt(9okIs-o|Az-Yc$kY-+wJC|$-~{kJzK3%Y=k8bOCIh)5P{I$s@^=z$-@pShb50T z^}*#h!z5^3|yolusT`AmpKxN+3Lwe_8Tq$%8Z;p#Gaj(y_nh0T)!?{pNw` z4^Z#)hm(g#c=GV+5Av|&0p4))aFB-|UJifzV`{m12-PJJ@@TJD&u@QSX&RmW=(Lkh zLgz?8U;f~bmp{r-O(1{n4~Ty7u;f912e?$zAKaY}9?;mGX86X#^v&aIUs6f?$>ZLa zF&7WI5cj_HEVwTAy!Yj1$_sBEIfVvm@;i^-{{akmBt4b*X1)Lb002ovPDHLkV1ndP B@Ra}n diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_end_rod.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_end_rod.png index 92bccabee4fbe6ceb02785375e94da2d41dc7476..6f9193ab03a5b863024de82750c86b8f34fea4ef 100644 GIT binary patch delta 213 zcmZ3_)W$SHLXL%*fq~&w;qw$A#aZAHS5dog$mW9R=MhQJT zU+}Qam}_w0fJ0BUQ-ThUy2N3DWyb{5{7yLRI4*gtpk-y@vQ5n_&*9@xN>L4!ikC!^#z_Tjv*HQcPBaW zH5hQPWO9qG{__94=;YqO9aRSBmY$aLuxj*s#;c_&veo2S+et;iII&|-0)}iO|sbb>YR~N&L=C|33-xADh%)!WaL+ c@Hyj>DJtH#n!bet-NoSP%I4>?&MBb@0BgQ%h5!Hn diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_fire.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_fire.png index c0846c61ea80378c329d309aa796c8d2d0cd9636..f6c0ece4dc4bf685382d7de942517eaae002bc4f 100644 GIT binary patch delta 655 zcmV;A0&xA$2Dk-~7#;)z0002+yYvwN000SaNLh0L01m?d01m?e$8V@)ks%;|7*I@9 zMF0Q*{`~v-v8(S|R_Qr8-y0{%123@vMh>-m$p8QV0d!JMQvg8b*k%9#0vt(1K~#9! zU6i|W<1h?GS;S;5IX@sV+wTyR(`E!(ZZpxV^~4h0aq|PUpf*hso2ic03n3O=6uP5|A>{7!4(8{bC*-B^!QBryj_l}Xnnnw>|ziTtU*S;!sn-y`#XtatWD4$~ai zpYw^thL)Qy03(UmYfIPS0MuP=$U-gvwDkl=cj@{KYVFbr)

    y?y>U-kuk!~6BT2q zkBKeYaNzC;d|TZ>Gnhwgu1toOUK-K1p3a~J@&~{X&thsgCE<)=SFkRQFG2kJ_Q^?~ zdHj@Z;rt}$L*~)EwIFnVJV9sARQd_sE03~;jB3~x^$D6rsd`sZlFOL#VaCD4v(=zG<&>?n1(UA)BcNV0*V#?*gX$bAU5}Emi3# zbyyV7^Dld3PK!UVc&t8Tp81i*{Xlg#@R7vSPrM};W)|wR$%j8?9AkL2grPbE9s6A$ ziAQ2pP=1sxN*jJ+te%Bj-}irjyc2ITr%bJr;+Jk2)%Ur(_-ZKXDttK}%E?)7I-sTW pMrU&B7IU0=?p4WIYm3re#ee@)maTG5wyXdE002ovPDHLkV1l$jHa`FW delta 788 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 Eg2@qIx&QzG diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_fire_1.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_fire_1.png index 39482fa963758196671508d6fba2c7198e6fb9fd..0d27cd747958646873973fc5274cbe2d780e6cb0 100644 GIT binary patch literal 13289 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 literal 17826 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 bwH(7nX@}TfVRLwaHZgd*`njxgN@xNAf*d{n delta 184 zcmV;p07w7R0o(zQEPqNjPg_7>i&8LwKqEIGJemgs&oClT@*Et>3=FTT)U*Hq0NF`IK~#9!jnFYqgFqMt;PRc9-&j$gGen;f*5iJLsomuH_vgTQx-EZx0FpXu5?{X41^@s6 M07*qoM6N<$g0(D`P5=M^ delta 1075 zcmV-31kC%%0=x*27=H)?0001&J#7F00004VQb$4nuFf3k000B_NklH z90%~<<=T2_dY9cTbJtx=QEQB8Z4k5vk%pOF;@& zHht0V&0M>7?o~TyohyCHI&CHLAO8Fv zK75f2AD;4@=^c6hjp~;6FFoY|K;hVt?&~3*w;#y!H~LVc;ioI#1Aumg?klsgH9H&H zI{Qz0`J`aAn4dk@AL992Ck}>kwt}K$Wn$Z$MX@{K#FCVdGLid%~?mppi`!Cs17<0PW;N*flAEg-k&3}+Jd&XtRR^#D|xMetPJoLpk zqmMs^*18IG>f-(KXUz8^K?Plq=Q&a4lR|jAO*_1ZTeN!ASA9wLcO3w5q8u0>Q{!QR zW(d+`wU`r25+}-Ra8iwjIZ>u?tfZoHM_&g)nsgM70YG9&${0$bMgv(?NYIRpBDKb6 z3?=K&Uw`q&0zxdBF_a`|27Uebv3NB4)^|UTfA;S5=x{nEWiz=rPAv&@W=Co2+W~DL zGxxX&JM-MveaLuD4gd&eKbamK)_x~Q6IoOU06Y3R{Ea>#7M+T)0ARJ437SExUOO!B zuBp9!BT6xRQjivxb?Ra|CDorkt6DIr{c`&70e?M;Y%&rA&5&<@^jDWeXGL8kuro{L z=)5iY1r2ST%Wh*YT_W$UX=v-@UO1GMiB-3>Pn>!l`Sc~PwpC_FDQYzA8tGT#VF2i* zOa9)Df7db5+KhgDn-!~FoG9y2Br6jODrk61{#>!!)6uPM2ZdvKRZmAMxBpRUqd)ju zmw#w&KGJ<%D@ce%g~aSsgcV}Z5YH1dqrFy=DK^j`^`|U z`rChasQPtE^Pp^&dMYY5!~+1V!^4|Kn19%NbWI+(qb}Xn{2SGt)gE?@^p82+4|*uv zvnNV1t3A{VT|jck`O}>%J(Lf2J=}vfz8(Z$>7jhE>#C#aAszrgjfWrb;Ee?Uz~AUY z&ljQ7o0*j!?&!(Y9@tz*NN;lcFX{Y^zO{R}>S%goJp8YGSgVJB@?ir#Y(zc~CoJAe tv^K9JA7*7)Kk(x^^5I%t-6N3?e*zPP8bAcB8g&2w002ovPDHLkV1htM{TBcL diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_redstone_ore.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_redstone_ore.png index 41ccb2c76a40a1b4ec1d24e7187a306316f4772c..dcde8e296dacf13eb562170f8f739ea80ea8229d 100644 GIT binary patch delta 260 zcmV+f0sH>T29yGj7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000dP)t-s!L*OeR(E3wmnHyray+Pfx~!D|XM-zdo20AB05>vaBV(Mrk^myi#!@0RnNt8|x*NqK zBULj1b~~iJHe1Ox0C!`Wt7mtTBLFs~Ig>SZBU1n~Q&x2|Vm4(&o;Ujf^su!60000< KMNUMnLSTY$jAUE@ delta 832 zcmV-G1Hb%~0?P)F7=H)`0000V^Z#K00004VQb$4nuFf3k00098Nkl?ye7OE`NyU;KN)&+g74K`U>G=eNbKq9BLDC=wB{DtmX1UA_$bWAi3$P0qG^(f9AUI;FWHr4 zE}nWFsya}l^MAw3ESe^P$a}mP%&`3Bf?U&i-hWcNz_%U;n^r>>T&AMFJfv z0P7`g5Tw!>0v#%y;e*)Ui@r8}bC;X-wJd{6OE5Qwa^nUAhJj~2hwbfgq{mI% z!lZEW1PR9z01jQb&Obwk5LeEQo3h78DxD#iND>l)MSs&|J#qwqU?TanU-|$^+0ELW zTa>Cg`ErdO)rX^0)#;tTOu;mH{(78^pOU0LR>kFRoV#>dF;QO{SdJk5dH-OsfdAF^MelF!kj`Y2U(Yf1Jic(o#(;e*yot@;;66iq-Eos}H`0000< KMNUMnLSTZn;*{?I diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_stone.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_stone.png index 3eed48e72e68d1365669308db23bd8eec283a961..dff665e4bd37397bf5b63b721feff05fcda71b30 100644 GIT binary patch delta 212 zcmV;_04x841>^yc7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-s!L*;esFS&w zh^v8Zop4!;V^MluNL@{M3IG5AeMv+?RCwA2!NCo}FboCIPX%}4r1v@r1H=^0G$sR7 zwHH8w{YT(E2>a{AZqRs4Z<&9PxhL0X2y5fVR~lNGBz6$=T1}OgQDMvK{p<<8m#1BN z#Q212p%8AY)YI4zlC@A=pwX4+o?)z98x?pDdH6=CN0DMA$g&=JtNI7g;}|>30b>LJ O0000YN|YG#Amiz@)^rhmbcm#+YrWf}80Uwc=W zdLlyrti2A>9|F+c@z{FylydTmV9*CZSS zmFl|mhgf?Zt$#vEPo@(DE^2`-L%ePe!`;??&EtIKfxn!#<*wfi=piC@G2Cr_Tz(-+ zOZE?s2nKzsQCgD7ka?T~kW424L}|%r91slp%;S8GtP}uL75MwNugtOx;kXE^MSI6X z&I+Qm)QY0C#BLhwA0Fvss&>;@nm8+T*2nOwm#Ww80dV^K z1vRt5-OV-9A5t?Lc-4Aj^8f$< diff --git a/Common/src/main/resources/assets/byg/textures/block/cryptic_vent_top.png b/Common/src/main/resources/assets/byg/textures/block/cryptic_vent_top.png index 6a085f57842f65f05e352fd6df12c99dcb13fd8a..53585a914cc2221efe3371531b2429bdf2b0b789 100644 GIT binary patch delta 281 zcmV+!0p|Yv1*rm%8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJd|w4c1Flew9Q ztATBua9MS1V2fi>a%Nh3UPy6XRcca4V@W+(LpV`DG(a*eLog^dE-N)DBrYf=B_JLi z8W>JE)rSB80GLTcK~#9!1;GJs12GH(!6jwiA?W{KTBKK`mVek8Rmf%zQZ`H#vD=iP z%PxgA7k9+%Ru`E3?G7*LWK<*B^A)|M|1;H591Y8&w{0skpE8V$p=gPmJ8#kD!h|v(N_<>at zgot99(NSuLPALp6LtV6;;9Z`3&U4>$-g8|KZ{MiOkthJ7;(ur1*$e=ofR~Q3%K%ii zwy+DO|Lz+(f@$P1bq!JRV=S)#kch|lve$&A{pRcRQ+}l9Fm(;PP@@0RMF5P-4y$Lzn9}hW(9BfFlXa2sOL(-?yeefd4*8GiyRCy zk?LaV@hg<}c7OhOJOIpnT*NC%1OfSU9|<7X-GyWN9Lqay?CnI*1GjyvJj84|gJIT+0S5x$ayQ}gxak`_1ArV1BZLB8$Cj#9aXfAm9X!LSB=V66 zrmochktjm!coKlop$oXYZm9R%fHXisIZ$h3LuW0kvhZvMQSl>)il6>V7ZDXdCwx_g zQ%Q>ZqJIN92()s4oxMoJW7vff!jJTvvw`okc|N@R#OTO?1Btiz*syGdQ%RbdWxgBR zB;qm0cJcg)&RglFZ)AV|#Vt4Ev&-yTyL9$;(;8`IaaHBY*bu2m3+m1;lF!HbhDk@f z4O7<;0D9WO^oAs=Rt2TKo$HfV89UiS)v9ps?r2R~cM7a!Rer60qp-ft#P|rJ;zy1| zaXqZVx$QLa~+QBIUn7ZctlVhoK*o6|Nt|3RFwLOR(Pa@X?rmkTcxf-wzkt0z; hM$Rc#mom+hFE8V#ZYWAZ6#+^YR1qK+?V>_df=XSq3szlrPuKkgUGW2oDj{}& zf`n9(AOsi@8QT!Rj1?!io-f~c5_>QU*CVmIuXNA3_vkr#M}PkQ9JR{+RmO{UIWAgFKg>fRmRtv=+&&D(^o zwZvb`&)L{=xN-A#^nt!_Ka**l zQN55KyjZTVQh%*sIRUr+ea!UHBRsP_KJ0X{Js(|Y_`bw0R}dM49H1BSjN0W2dLhsK zY8}f7usxr);iHO&n z9oE;YwEQ4S0H6T0{D9|=);KoPM%+i%x~Huch+Cye^jwOpLi^WE;JTq3+O___Iy$k z6XdeypoO#M*!8~buz&mzec9o?-(js-!S;NzV+T-T2^MAxMGXK>K z0HXt{O@wQp7xIX$W)#_+$}wN~0wJ3SdZ?)+zkgi$j?k3=c#S$EfByPIf4CUt%p7Ve z$&2y^{k6I5g7xoQOC2JwETeF|5b^MLE3IcW~)?;5`6+x4ok~Ltvyx%0000f8Xdr^W{iL;^V{6))dB`wS{e|%n%jmo xe|59cjH>A{fJ+7tZP)tP%5&`cW%kU>KT}2+)QEhG%m4rY07*qoM6N;tV1mx}K{x;a delta 148 zcmV;F0BisF0sR4xB#}8jkt7v=aY;l$R2b78i@_CxFbqQl8w8jjh75p0?~P41NH?hW zAEBnY=so=}0MnFGS|HVoN`s9tKJNaYcc6kDU+(`NF1A z#*S5Yiq?+COqGzA^HIY2m+66gOXhtZ___~w_a9S67}PMMp1lA7002n`MNUMnLSTZe C=|W%t diff --git a/Common/src/main/resources/assets/byg/textures/block/cyan_amaranth.png b/Common/src/main/resources/assets/byg/textures/block/cyan_amaranth.png index 15106ce0f452f5c12f27281fdd08c9c514a4f372..00a0bb77328d4828574f59a4f9ffb32f9af8d66e 100644 GIT binary patch delta 218 zcmV<0044vf0+#}iBoYa5NLh0L01m+b01m+cxRGn^ks&3200014+y5`l{VKoxC#m!t zlGamH_R8&)0 zvXXvT`N&E=d$_Gn!_fn`#|5K@xx)obU+%gMJ!X1t@AM39){Zf)7qh#1cGs-=0WBy4 UG?T|g#Q*>R07*qoM6N<$f`1lQyZ`_I delta 223 zcmbQvw2ogo5gzpS978mMeR~7NTogH+w1ubs)vvg4?|6w-hWQ28SO4Z7 zt^IbrSI7GIj9U+dEZ4~PdyB2VZ^mCzopr0HtJP2LJ#7 diff --git a/Common/src/main/resources/assets/byg/textures/block/cyan_rose.png b/Common/src/main/resources/assets/byg/textures/block/cyan_rose.png index e579114d309758ab6ad782c1a22594cd40bd078c..7277f2ee53b24b11875d519f2c7e48ea845f2bed 100644 GIT binary patch delta 178 zcmV;j08Rhc0oDPKEPv+z|K9uh)cyOH`uC{v?vnZTfcNvF<>PPh?Mm?KMCRdA;Mqjr z+e6vbKFP;Lj739-L_BLtGFLq*LN**a7h36i*Z=?k0d!JMQvg8b*k%9#076MbK~#7F zt-(nWfG`LE!BOK97epcd|Eg793_07)kLHzNOT&KhIi&9vYAabr$y6qi(a=J0(Ncn< gG;WN*oxsg`J)bZEsDPOY4FCWD07*qoM6N<$f&{--WB>pF delta 180 zcmV;l089VY0oVbMEPsIa^GfjQMCRd_`uEiR`%>W9KFP;K;M+sl*53R2=Kueq<>PPh z?WpqZlKJ*BS3O0HMI1U8Lx)5>YfC9YHYIUbPyhe`0d!JMQvg8b*k%9#07OYdK~#9! zt<1Fnz%UR)(H~}_{YMR(RQq)Y5)mb7IA?iLR^D7UZP())nk}&z@J!@0Vp+p^LoMOB i$_zWwdK@y(|Kb9a&HuFk;nw{z0KT0Nz~+Kra%t2g3AHeb+3Pinp1tfuvNr*_Lz8)7L4r|W5+68oi-Xz3 z>nc5id*2z(JwjF+S}!^RurE7XUv)dj6Aqdr{QeCW6B1escsWYM96cXsi57CRQzCMQ brWEiGg5yhbl>aNM00000NkvXXu0mjfq^W#t delta 685 zcmV;e0#g0i0=fl|8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MMLL_t(Ijdha0PZMDn z$3L{!9=%JU0cul1Bx;lhgTw@6K#;)!1~DPVAK*ZU#>n7bU<^7qm^c_G5<_AfOk7Ni zGB}Z#=q5ueGPI`j+H$l&>3K(w>lKHyC)n^#@B4k8=Y5_$pMP(|tCzF;MO`B#2Wf5+ z`Ty*c%p>*HUs;5rt}#FV!3~IhF97DAU9agj(#40ES^+!0z|`abf}!UT{a$2A0N_T_ z1mNw-e_bEkE0Ic9dH*p)xiJh{0nzV8E17sSy^)!9n<0CfA$yx1pYPD9gOet~_IDu9 zxt{~1?_4L5{(p_9|J;eXB7k!5Gq#FOftI}n`lGs>v5`JJsa(Mo3gs#Q*-it1E3=>~ z6(<%7xVji@1E8pDc+{Li+_ET?tNf5#iCdPlu>1Sl>edTny zjuubSRexrK7Lg7CRe_(A6Ih81%keD2&GA9R>1i4*3vLa&MX}EV7=}T#^BX6rLyye^%%^>ZTMUT&if`fQ!^%K@whB=y?CDz#AR?{r) ztsn;52%r4|K=;}ivSJKU5~@;R*Qj76G8|8LVac7~ zl9|K4g)%e?gDtd-8JepeVBN6Y~X015yANkvXXu0mjfaDr)# delta 685 zcmV;e0#f~<0=fl|8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MMLL_t(Ijct>^PZMDn z$3HCy^o~jiwxtaVRR^Mp#KgwIK|^4`0c9iUKtg18kVP0+(4p}kATGuMT{I3D2aLEV zVnQGi3Z_?6DI9GNdp~+tTGQxoy(=a@$(tv6-uL-_UzW}JZNr|WDx z01L?_t`2nZig_XedS^F^rTuLCT#lJT%}osHQR%%H5Wdxsr)u;)+wkE*XNSstU#lVIBh9EnaiibG&j_%oo z=gi!{gJl+3aU^JZm1ro&LUM^zI_2h4sZOa>Co3ytWyLk{v;;4}VIhNR8pw)?AO_uh zy5aWNLsZkidEeVV3P6irXq!JHbaMPl=X@;8)O3=A+pS5CdO_6a5+BB@|#D@&OK#&ebMz`^wu>1w$~T&^$bxte$UP8 zS6F$sX#+U=e3C>!^dm_USy`b}s=Jg0F=%I5!7_^&dbRlr&T#B*zr-?&?4_S@IvhU) zG3YjjBY%Csx()F5!&d}fTVoD7kQMvCrJt%j7vD1OjL7-M-TrQq!QiDHqM?|(3z{DN z?;NDkDdHn>G`&jK*>*mC+_3>1ike>Ku#j;nIv!{Zy@D7-)2r^@xC|__NM6nnj`R@? z#ZblOvN+)^P+rdcQ*ZTpJ$%pDXpSz&kAp%PuO`>S>e?1orH0^Zb9Vv2>-F##*kVA* T+0Jdv00000NkvXXu0mjfb&Es8 diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_side.png index fda4078b5ead6739d3e59894f4ad379746e430bc..8b101ceadaba637871ed67a9648110b5c72a7d97 100644 GIT binary patch delta 269 zcmV+o0rLKj1)Tzr8Gi!+001a04^sdD00DDSM?wIu&K&6g0022qOjJeK*x0qTwXC9Y zos?^hiC%+#Np^Elc5p&nTs&h|C{t55LOvWZEg2so6c`x}8x{=~7Y!K{3=R(oYiT!Q z0001zNklU9mHI|9>Q0+f4m}UIw{81$A3C zCdtfge}ytM2ZJqij2W6$8#q}=2&1{`D#<1p8pm-U2$?#gz0@Te$wzZDef#7?KxbnT zSvZbN6O|eWkvGkA2Km9?U>D7If)I;Z%CiZww-Av;quLVzQUN{1gPESgW0-%~;6^PZMDn z$3H!4v3C?ol-4#ZRF_5vVqzy3V_;Yh-Vo@%S zQPW$bl@zAy;JHlzB!IM%ik@sHMLtuYTpmNMpQ6@J8GBfa5=_@2t%TnIVFjyeTL9#; zLjY_V8s15Oe}57Hptl0l{Wfya!Ry52Wa2_#V!TA9TA_GrqyrTCad#5QxHeBg6%x z={oFgzru5y>{Xx9ZK5CD$=Td6upSD$|M(3#ndr>HRrFSP-|85tLkraem*~eqqm3lRSY6w~I|-1JiD(x9 bBq_!}f{Qip0n2(b00000NkvXXu0mjfazQL5 diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/crafting_table_top.png index 50f09c8a64f0a274938c64ea12be1cfe25d331f6..83ce17a51498035f66c0dc248fbe4034efa65aa7 100644 GIT binary patch delta 216 zcmcb~{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5ZAd=vS&_k@2s~;4%6`V z&~UPou`m^p66KW?;o;+EW7sn<5~#Am)5S5Q;#TsDITLeoa>61H8Z`O_1_Wp{PEK@M zv;YVs)SYL0ba-d1NM>`M)UjysiUo_MniqB?Oz2n?xYz*5TJ7DTJwx$@hEm5N0p8M9 zk4`PNRZT9FTtt{%MP;u_oN|eYjfs)DoETPMB;ufxnw~MAugL8=55u+@(%y$QYAOL8 O!QkoY=d#Wzp$PzTd`w9I delta 459 zcmV;+0W|*T0oenP7=H)`0000V^Z#K00004VQb$4nuFf3k0004#Nklkl7}K-z1qZol{{JJ*arE-K9g;{y)OyH{D>!UBp~fS zzb<~{N#yt^QVv29FnOE-`@WMrYeJb0>NN|u;}D7fx8qQ+S%e};O(Z2S^OvdDK7^dg z;S|=Z4KsgtcU0Z6rNV1hIF$uXypYt90KTaYU~z_18Er{4L4&e*@MBw3L_-4EZ6drV`5fy!)uH@-yG2L#<&)2(kL~hUbwbuHUL|$Yag#sCl|OM9dv@&1 pik0fmzpVFtS*_wE!z0Q67(>m}-=|G!GXc7Z!PC{xWt~$(696X5WE21Z delta 521 zcmV+k0`~oZ0+s}j7=H)`0000V^Z#K00004VQb$4nuFf3k0005dNkl4VE_jSDlvqm7OFbXg`rD@Iw8SRAn_1LJOxNh5n^FwsTjfogj8vY zR5g|{m2BVG#$L*Bb8nm=IMdbrbH4L^=Un6Ut7q3N;0GaDUVqZ4*XV4w^&UW$m+Bh# z?%vkx4L=C+`Yv|!HvoqRyWH>Doc*}u&D)R0yZ0wXmX{nJ?DFX0O#r;U%LBJ72>{}x zKqQ5((rC6>N6WF~S-l28lnVSH#H>mK`26LYULPNOy1fsdPBcNB6uK=_vD=OX%z1va zzd{%%g{~ea1%Ko7nS7ke*_i5LcdN(gR1hZxQ7Qn~Y})#v+EWF`6RE;fJppvK+l(h8 zfQ2GS5~YGH4G~F!|EmOCY{#NeFP91w&MxMQ)f~72q-}m6w8cuXNN3W8D)zh`ZP#Eh zGzNpA;Rhj49{1VvcC=Hfr41DrkfFKLx%HQgSzhWvR)66K;Zi}A3f3)MhZ<^?SO-bj z@;_9aP%vJ;*uPe63e~@$r2b2t32^k(Ln(<;!DiE5>)F-mYdMy__jUMPMtL+DtqgAV zbE<=4I~Luoo|a$DM5A7lK{}lZvixdAnhw~F7UT2T%C}y&81e_5w&o9;!DD~`0000< LMNUMnLIPld_+0h= diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/door_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/door_top.png index ad37bcac980c630dc464088415dde09292c67bc0..04f73cd6998ec3204c3f8f392e80abde3962104d 100644 GIT binary patch delta 246 zcmdna(#AAFqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j&y)eh%1m@v#4n9lDLn%g7lOG`2{mLJiCzw0vV_k zoJ97y=in@5xcIPvN3wkP=wAMBS35iF-vBtmMhKf`y}|z~mVXHV%jF7yZ2h+Y&Icy| zBr+#fDNWa-QQtH@U2S5O0&v*cBau0;-hRZ|-PtA>1^?W5^>bXAJFc&9RuRD{0$_J% z8>?AwkSYyvxm>Mjq`+1MezTquPNNF^yLWDD3jJP(NjPJ8G3NB)1G6!axuG%%XL#-} zhM(q~4^9Y10e`82jlZEMGB;nWQi4%HB6FIqNBh=MMVDA6Sg}kX9?Jgf{+4kA)*2K- zIl^Xe+UK}?Kr9oUK6_bv{^CsyF#W=bqBb018`whFMt_g_;@T{lFRo3$jMx!&)rE45 zi-U`Cp-0(;*1k{e$>T>i<&9sz|G*J8_l~>@)GyGwLkem6u2TPLwxlW?Z#xE@W{V-n7c;*RSRP9qZ8=D2&n`wy3Y s4k&wG%p)@u;kdp@V5~F^9V8v9-wc@tt97GfumAu607*qoM6N<$g7a?s5C8xG diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/log.png b/Common/src/main/resources/assets/byg/textures/block/cypress/log.png index 8c482437b5389d5ef5ea2d1362ead91b65982878..7b6a3bb8c47986133cc69fc7e76ea33d9cfc2eb2 100644 GIT binary patch delta 198 zcmV;%06G8J1J(hM7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-saB56vVMbnB zKvGaRL_{n*J0@ad_KyGn0CGu0K~#9!1;K$8gD?mMz|V65f_8ue77)?_Ow0g%;{L1j z4j{{(C%`tn#B{hbfox)Bld~0t>&mE>(APgtzY1<=*w}YCwm&FkCAhIfm4*OJ+46JF9^}ms<7mF3P2(o{fDQ$Tz>(u#$XMYeMY`ZsR~Os zH~^gYOSfU!PrAWj<_tehG<8Y7OI2OO0iN=b5F%!uX(ND#mzU?y5F!A1p3>Ci^1e$6 zbHtAmRbdHp)bD`qCDs_4Is?Fulg=-K))>0M={Wa{60={f|K9ZgJXQyqdO7^(?;9cX zJXQx42RI#@?SBXYPP)k4zy_``>ISD^6Dd4=Gg|bo{en~#cGL0o+!8|Mz3Z0|#MA!6 zE2O8U)J%wda=X*9QJ_l>R&+&O;H|m%anhm<#5MKjAK#V!+H(k+RJqb*8CN5IU{Sa^*_eS4tQIb8yWxr002ovPDHLkV1keh B)nNbt diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/log_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/log_top.png index e369a477ea771425b0d97bf69948c35480c44ddf..26b72efc163e4e6ac0b9d5889db779e7c9450a43 100644 GIT binary patch delta 248 zcmV6yy5| zt}Md=%X>$Pbb_&EW{wIxjC9WH46DB|dr2@FNv(|v+>E5&>m0oiW-A5OR_>jRuILRj yv(C{NMRe2|7Ux0;Ax1;2PD}~vVV;I*c>Vz&Mj#Q~M!LHI0000<}W!maHWm zY+WVS{g%6TynFBaKHfXHxxRd5i##vM*Cje$kmn_?YvT(+l7D55xO3#=x;6k-o|jy_ ze@7iUj!;2}jw8I}l-vRKpmD8nWI!j5H6TkuBVWOGN z<^WuMydYZ@SV@+dil44N0PvEm0T}dEgHiQ%dp9&WmM;W4j__QYmt>8OBle+sS3yXx z+d;<>NtR&=&woJ$A?Z?^F;>1V0eA0b*)EV< z`WpsC!(<&VHXiJDsEqtEdSV=5r;EM*)G_xe(o^7C<=IOrU>S81S0000< LMNUMnLIPld$Z_05AWI1mFRX7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-stfF$AlxvNN zUW0x~c5_j7a6(;NJX2FPK^78~0001XNkleCQJu$ delta 511 zcmV1t;i{8a@F9S`Ls1j<$auW!N?yRic`2%eH3kEh;7G{0~BO^>vrM6IAX_O{I8lQ9Y zmN4Y(CWjDSBH3T!?|HsAy^kN>)P>RbQgJcpbAKJm<3INoKYw8wkJvh2Dhi{iOooymDw7cf)6=H|@MYwR(qs#O8uanx5ZkRU6^mtz(B_OU zU%vwoj+$G)rE992TL8TChXAauuJO)wXTQ3+Ma-T~fC=$3=JLtpu8ro|>|J)aEsE{D z_x|1M+Ly|CsDDg`Cx=ufLzhR_y5(=L!e~UAY^m;w+6A5*qKzgBqRtEUc3mC;5UZ$I-QHLGqQwEqvWNpd&mLwRJkU%M97pwA}Bofl6IooG8!Vdt7ATSnoy z@gYwxqM#cx`)^oBz4?4r+q}1Pewz7-+vdN${s691CgZl=+cp3I002ovPDHLkV1f?J B`>6l` diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log.png index a91a3863fbe025ab56890fd40c769604a3258972..84cbddd11657a8188823cdaf51e069f8073b6281 100644 GIT binary patch delta 211 zcmV;^04)E+1mgja7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-stfF$AlxvfY zVv2=ajD}Bxeo1z4LX&7>T>t<8d`Uz>RCwA2!7&noFc1aM&kaZj_6e&!grO!ep?1{S z9)y4YBlsTZZLG`>q^VcRhv4#SUA`->?{iLN8c?k6!5hUp^h^>d8%`LwR0)=3VPwPF zgpdmrYd7MSh1l&(6TPCK@x^xwUUrC9xPhnX#@z`nw4rKM9ELM1;~(lM8@P3(4zvIO N002ovPDHLkV1fHsoEBRYcHT_ z_5iNP8tA@4^@iig@cm~8z_=_s%5u$gw&3gY1AyslK^n)zOF=6&wJgwmh452^4^6Wt zj0Bz3i~+((pmjx-g#a8+P_-?!>;RZVxf3~_LXu<-fDmSA!TxkGil*7q$syk3a>cIkhY}o(2Qkvt<$Z-XPFPP2gAD27ZQ>*nc+!frsuZc4b8v z2?ta41~Ap{FLxnH<__d$y9R~}bv5e#i)`Pgvjt)Xe*x=KGr6`!o~Zx;002ovPDHLk FV1hUI3}OHP diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/cypress/stripped_log_top.png index 0441df9f170de5fb191e51e368d7fef92cb14f45..d73663d7b983da4ee8f4bc863c8989429255f055 100644 GIT binary patch delta 230 zcmV!Y~vC(2F2g9?-QG z#RrTZfTW&@w?1UWmfDgu)e~Kc!}7PJL7yDt^P#u-e!-2D+FuT&5x+IebKN0+Hl)ZL zVHalR&SCJfhGHC2c`_H#NM6Qi>Kv?>u{5$?m?v>ai@euAwQgEhM0?{9L#VaZ6C$yC gFloFfU$f2q54FlCAlNHq)$ delta 502 zcmVO# z7cD6Tr-K*N@$e9%WQaBq=Wour{dtQRbWk$n7%gKgrvv!>UzdH$r%Q!w4hByuiIvw@#XxDV3DZu|o^bqfHVlzaB4P|2^J$Lm(3q6X2=oYzu8)(F`% z#x_`?4D#m3J&VXX8+8j#fs}$YD-I6pp_RxQwkl=rH*e0D+I6U3oI0KjI_{D=1vbe+ zmYb{V8RJnvys|8!*;BC`So!Dw-G?}xD5evIHW4BeP6^-!sw%8tj4cVaMe0Vm8r%EM sny%l*7|Yl1H&j{8cSOTLF$@&{0T!#*UCzaYLjV8(07*qoM6N<$f}6+Y-T(jq diff --git a/Common/src/main/resources/assets/byg/textures/block/cypress/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/cypress/trapdoor.png index 9ab2d7c23fc77ef5eadd7f077cb16ce6c7900d06..0fa30af37eef67a064e7d1701d1892f6af2dded1 100644 GIT binary patch delta 247 zcmX@W(#|wNqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j&y)eh%1m@v#4n9lDLn%g7lOG`2{mLJiCzwzqFk^v4OX*?d_68&bD*eFKfEai)0I4=VWvD5)jR} v9`H0fB6-1nsq@RuScbFzsI;kn>tx@)TP-W#g4zS1%NRUe{an^LB{Ts5Ip||? delta 563 zcmV-30?hq~0>A{27=H)`0000V^Z#K00004VQb$4nuFf3k0005{Nkl%(g?@?_I+@}%Q-=)2lS}AgsA!;# zahw#{s`RE>)Iok<+aX%75F#V+TYmsV>lFY(WTYaaZd5Uh zDgdtSs2t6;9W3(>%haixJIL_c7HP5sbO7pR3)i%8Y+dDy&n9T{VHU;&eocw<#gbHH z#m7dKz^}0&2H^XTUkv*_QjwuW>lJ=`hrqA#_T8rn!0}NpfBotuSJxp=+8rEQXM8r{ z{fBd<%R-tE8Go*6F39mv(lw3-p4(K6is!Q`cvX7s8tlsv-B|A^ngd!?no#<2d4$Z_Eawjtl^`B7)o55} P00000NkvXXu0mjfY@|#s delta 161 zcmV;S0ABy@0r3HlB#}8H7Qwo-uc@QZ%*Wl`-RJ!YQ=## z*1iebkId{aLOet2W)F!lbshK}Za9QJn@A3J0+a%fBoYa5NLh0L01m!yphw;hzn1$^?c9@TGt@#**vg z&SHT;HpmFr8<=e)ir0O5pa^rroxq#8+0Kl;mb4d9^mg{EogE+_4Ecx`KeD8hA*lZ^Dy*Cg#V5R^9TkBkYGPG#YDhcB;Uhw3jp()_aZd=%8d{pZQLmd73{Q)Q|Cwp%N R6lVYc002ovPDHLkV1ma9VQ2sV delta 198 zcmV;%06G7Z0+j-gB#}8HBGAy<%*VlzhlAbS-MX`_n2w9Fs-)D=%c!B7os*D~AZzQ9 zAsByvNkl5nbgP6s=i;(k2N|uK}#UDt09T={z)B~$&s+g@? z_kLk;r5mN5i75Mnlj4Q(tTtjbh-s6tGxST+hVDiw9xtMF0Q*eMv+? zRCwAo%s~!=AP@!6PlEf_G#-FXIRNOaDS5 zxN|`kNl7H5Fz^`Lj56y~uSV$f!nk!pC#}yI2#tnmi-Az=VB8uAfhUnKs}a6z-rn^E q`#)^<38?nL%FY-c8CmX>YdU@jRUIvqNMgzW0000oM delta 187 zcmV;s07U2bq4uc>V1mGjkUB$TfM>=Evuv0=hH`eY-2=D(0g`wLwT<#7KBaMTYAOm~$GD78= zQdutuB7jIhXXejgPUzENe3$?m-h3>!!?{(-028)->CkaYWp0ppC+gu_POn<*h2dXl p;+NT*C+1vIsw%gwdwYWE2NV@N7AAI|%>@7e002ovPDHLkV1mnYSPK9E diff --git a/Common/src/main/resources/assets/byg/textures/block/daffodil.png b/Common/src/main/resources/assets/byg/textures/block/daffodil.png index 9e243268a384a2ad93592e6f16b930f818f26fb3..f27d3fd1c27db17b76aac9607958a193acab1e27 100644 GIT binary patch delta 172 zcmV;d08{^u0`CEk7zqRe0002(-QrS_ju??7B7Xn?0RQ~||LK3`(CX8<+5efazNE~e zg|g*mfK!Yt%so&nXC@;~9TqtmB9z^k00001bW%=J06^y0W&i*HK}keGRCwBBU?2_z zFa$sttgKKG4h;y+Xw_v1W{3$d783w55>iqU62L<2=`j5pp!DepPzLXY3sBZsD9r;B a02Kh%QwmzW4FTN%0000T z(n(iS_LB|n(Gjzh1nLOh_&oqf@s$Mm1^-6|46X<6oS3L6ks0FY;uxY4JhvxMs6l~) zRaM~VlYiHFnOD9vp7T+cJL*gD|D#;T_Xgfu99q!O%)NwbssZaJ$xYSVVR>ab^X;w5 u+jT>foOvu|i;}y}Nq;)|!Or!|DsjgS?!B?sjCTU9X7F_Nb6Mw<&;$Tt30Y?V diff --git a/Common/src/main/resources/assets/byg/textures/block/death_cap.png b/Common/src/main/resources/assets/byg/textures/block/death_cap.png index 2b046d64fc2f286af288da877419ac1db72da039..d5e756530c96d7f408719e439ea9b45a39f69ab5 100644 GIT binary patch delta 177 zcmeBYde1mPf|G@rfq~)e-A6$a?Ib3u$krPK_=LFr|NnpElG*dS{Fl`xPA`fq3Uki# zvj(c$HZKw=*jJfdpA%n^VO@}5oEqWp?`&;&#cBsonxiDhFBnLJ!S?4t3xNz1PZ!6K zid)GV?M!T0#uBGab6Z(mJ=k;Z+|1&GJ-4jW*ELHXEsMW%uxHbnwJ!x?r9!z+pFYj_ WI^EXnW`lt?$Rtl!KbLh*2~7Yh07Jk4 delta 209 zcmV;?051RU0gnQZ7zqdl0000V^Z#LyHXxBC6@R2jL_t(IPh%JbqhL?~MktK}{{R2a zuzh~ie<+vX<(qFHiZQWlBbbj2Fbvo>FY-S~gSZG6Od}jzy!M1)!h*9Xda$~nAi)@H zI|l~`m=6L!e*D1D3<6A08U>ii>M?@w+YcfP*Kad0$aBdtstc)MwG68PM=st1V@*XF z208;x6^7eSUNKz0^9U-73b2|A1AUd*V6P}^8!-CEq=Lmz0Rsa76n8RHt?0>m00000 LNkvXXu0mjfVMtKA diff --git a/Common/src/main/resources/assets/byg/textures/block/death_cap_mushroom_block.png b/Common/src/main/resources/assets/byg/textures/block/death_cap_mushroom_block.png index b098a4f87987d0f61ca90eae5bda612bf2ff1062..f5a7547c7b50843a8bdba318f57ab40600360a7b 100644 GIT binary patch delta 159 zcmV;Q0AT-t0@neMBoYa5NLh0L01m?d01m?e$8V@)ks%;|3{Xr|MWvNbppHeIhe(!y zMh90L9smFUR7pfZRCwA2!2tooFc8GB%Mi>L0`&($I{w@y#TQj_rgB-4ZBNNi7>F#W zJ4fKL89+8E-(GuD*ouK}rbJHLOME)>mRtsZn70EP(e3;JA_PW5LX0^}_$t(mAOkssyh;us=vS+wV( z=n(^+Lvwr*F0(e}HKqN3cG)iH^^Oi`8*~$Y*!HUU0!zX0cFYolIM%MOl+TQKmRf zkmg(DW&i*H0d!JMQvg8b*k%9#0Cq`4K~#7F1;K#v`V zn>vM^L)@m$i~a0$IxgxIv*+iH{y6JFPNHw{*22!6&W*+?f0n-kjZE*BQ2+n{07*qo IM6N<$f=6>=xc~qF delta 211 zcmV;^04)FV0rvrrEPsiP&p=V8g^Sf^cfORF+Du!fS7x!dyX9VR!8lHkMOl+^fyhu~ zogN>CZ~y=R0d!JMQvg8b*k%9#0DDP9K~#9!O^<~E05J%}>I(a>`#?O->OW)e|a@IC@%A}uY3ZcP0m@)U78>~1qG~ N002ovPDHLkV1g@GTvY%7 diff --git a/Common/src/main/resources/assets/byg/textures/block/dusted_polished_blackstone_bricks.png b/Common/src/main/resources/assets/byg/textures/block/dusted_polished_blackstone_bricks.png index bc60641947b3a4ef08beff4e81b6704fe78b62ec..0ad538b82273213648092f31438749cd8f967e9d 100644 GIT binary patch delta 204 zcmV;-05kv61l$3T7=Hu<0002(-QrRJ000lmNEZz!A{;sp2Okm} zE(`^D8f#<#004hUL_t(|+6BQu4uc>N1<=n8m`Q}KW6++!blnN!0c^wG7}y)d>-RnM z2G)Q^i1ZZp!9xsbrH=!16Xqp>Zsjn&6LdX>6x)Q0m-OuWibb5uJwJJaxx^n97GYE; zVhM*Mryvg%sVv;p({jdI@N0F;wcLNoY8$kt67D?!0000Ua(_;m6B<$Jd!(@nvyrjl+7BHaU^lLzc-D(#j|yv|8q+OFPJciR4sU#MY1 zJQ=fY_y>q5W2R~w!&T_@M>PxkFA?jmjdpi)ix58Mhkq0H?$4Pwa&D$k4HS3=FaG|fR>wI=fF51l-q{pDv}y|PwZp4PL`di_x? zs;~txx(Wnk7d!XoH8?`};Pyy^SxI73^n88Bo~G6ju5^#}>;m)PE9Q&%V-^vwbLL(j z15hhaLOy>Az})SzT1t$r!m#*DE112S#pP3*bW@ZCma^mkc$0xh_vqxoe{cQ)c)3H4 TV5mK300000NkvXXu0mjf1vwmD diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/ebony/bookshelf.png index 63fdb743ccb0a5fcba90dc1e11cb0988e6ff8a2b..89838b20fa0f9b7f37a0655d981bf2243b9f9f88 100644 GIT binary patch delta 336 zcmV-W0k8hL1mFUY8Gi!+001a04^sdD00DDSM?wIu&K&6g003i9OjJc?U~^q&WLa5R zQCU|~Qc_4oQXo@rRzE%>SRze0IAtmyH7so#I!iP%G8;h~FfcGKCSNWtE>;^FDJdyV z85k!ZP!cXWCnhE&BqS3r6CoiXA0Hna92^=N8W$HA6%-T_5`PkSqPTtl0065=L_t(| z0R_PUPQx$^K+$iW+KTM4@3bE5Uh2uZXKhW zTeZFcfdGNv21$eO?4_Vw%PM-}@=G1}F`f=L)xY>ZAT5v-eKdQM`LqK!$bg!V$rN&h iPA>8pqIiI)D;_W8=R=66N!2j`0000 zVcbc#t#f+s&3E2>-}`eb#0t!U8)!P z#+~<|Q{WR`(edr=8c8C2t2hfPzF%VISF5F5YmL|I_3$qMTXn-ANrdk~XzOdWU51Yx zq~C@VJBIUMV}nd`>|aq1kK_hJPVXH#f}!MOdrtl1{p|$^PDq-@h`Z(*{_GV80HRmJFpA?~s0*Hzx-rDT|R>b$_$3FKUL?8mD`7WazyL$RFia zszTO6%38Hr@=LH4A|iNE6fqbKcv*kVq%vlIW&kV04(B5U%XPB{5yRq!%XyX&Mpahh zRlMkH|(Ih%~^qoS?` u3O&_Sq9rKGUDqvXf1Tzcg75oRFnwg+FG-!rW_v&JGp(H7t zl#-~}JEj?~Inx=B>sWWs;diaRM`Y{EMXGP(_{^Ixf3c2eC{=kfEr&udfgMsIA7Bfx{{ej$JVk4eo~-}? O002ovPDHLkU;%=4cVq|v delta 530 zcmV+t0`2{n0-ywt8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00G)bL_t(Ijct=Zj}k!` z#(yv~I|#QfNCbkIT>Jo(CN{RVehUi|J3BvurLC2kSQ%|>ti*y?*idPLxrCU@(Rgqh z_ZHsW#e$nT{=LoYJn!Gv9i!4Js$1=;27awRvdGiuz<(<{2?$6Bzx)xH6>K-pQ zT5SND-5xh@w|$_smOv}4wVrpg+aro1qA2pk%SBNDAR-uJe6UgqfG`YwQ4t|cQ|9wI z#u$t-=s1q~_J8g*qv3$(Z$1I=_QOX2Zk?Yp8V-2+YD}OtNs^G~YdY@KyI*p7dm=aky*_DV!}@#sD;zkiNM<};c{HO}R_d$C9fE0)~e z03c0M?<@8D{S{m*ZSs3eSg{~> z)6_q!!$gE6Njwbz?R2oaFaV|0){i41^{D%WH)H+-b$#>u U-mgE;01E&B07*qoM6N<$f)pnGSO5S3 diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_side.png index 4d9cac963a5b2239bcbc99e2ae9fb7ae4cc7f14d..200b547ce5747d93228316b6591bbabe7e73e2c6 100644 GIT binary patch delta 273 zcmV+s0q*|91fc?u8Gi!+001a04^sdD00DDSM?wIu&K&6g002BtOjJee?Cin8!PBs( zvx|VGcWI7UNHj7sE-o%9DJdi*BrP2qAt50jA0HzZ6&e~E7Z(>D6A=;;5*7~)5DN+c zJH)gA005IoL_t(|0R_Q9Qo}F|0Kk>x0EH9q|3`KP($K^fyMOVu=A@XE%0WSaVo14W zC9@JKB2q=96d^C&;dBOq^} XSVJb018ye(015yANkvXXu0mjf)W>JJ delta 566 zcmV-60?GZM0>lK68Gi-<001BJ|6u?C00DDSM?wIu&K&6g00I6^Z__{& z$3MxP?JC7MP|-xeR4o!=h?D`AY-|UVrZ9&sS8phSQtT_ zKnjWoEs`Y^P)=C3&vqD6AI*=q+}-zm-+OoOeXq3cxf4f9Y=0@K*fxcQNn-ZP@FY!% z(-c`ak~C%BmSOX_1c*<8I87;TQ&cEy8DoZEpB#Psz=IckY$*xDkSDj= zz;ytg^*&MdeII{k7l1~+ZUT=F_jtGenqW9EH)z!BT)WYswz0*{`%e)MoT)2FNUa!aP?QJ7xsgyzpfj%7}OeHO&$c(kXwAOSw9WzD%S?FNC zVE{sinJFDpgl2lZ8m8(w@G3G4WZ>Kb%YNYRI8=;s5{u07*qoM6N<$ Eg5psBumAu6 diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/crafting_table_top.png index ebc047016b864fdd59f3b354e23f9ac1466698a1..ac9b5764f9cc09a0647569ed2e1fe0f15e25180e 100644 GIT binary patch delta 211 zcmV;^04)Ff0^);I z9>5{@X_B-EM|lB=)&=6*h@cedMzh5%mM!;vdOcAtMz(`T8B9s?<}quH5affbCXte0 z%Bz~RFmEC1|gb)5oQ#xbVD&-wIV;L6`B_0|p{_$MY6bjFYb8A97h`$zzfDY!=J zppk9@3kg?iCuZHA!;#IWV61(twp5SxbdIjuZVC=_a(5T9X>SzA(_}rvl3$_ed-jKd z^5=}m(lr44LqXH`i&E!hyI_DUU9-w}$vsITf1=j#@tlnv2+#iy>HMr+M=56h00000 LNkvXXu0mjfxeKK3 diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/ebony/door_bottom.png index 06605c552a22468c50ec7862bd7f9b5f0d08075d..4c9ae0cfb706d51a6848c7b4829ecd56e84d1822 100644 GIT binary patch delta 240 zcmVkd!DHNFV!UEXafe?>!4}eQDq5*iBBm#reUfgX{6W z;{Z(WxEhf)zztOJS+-AP0)#4piWOWXnB0=LIZ#p#eQu@0j6wB>f qs?jiE4!}@snqP*XqLy3fT>Sz03@SFQ3t*i90000K|_m_KZs}%1^t#Zd;n6Um9~d+o23N_5h)#i60)+MGj9Tw zE&CC18{0E;J$J6`C#%)!&-r}D%!n}(Lg08jl2T$mp97FmqJQsuw%aZ1^_ma@H?Lpv z?)EdT>pEhL0Eh@RVvMLN-g^Kxn+@OYKJn}4cW%CX#e0vtat`$#Gi%6Z#$vH3$}(QO zdCPLS1VB}p<%Eb}W~gd8=gxIazC2@g8pjf>$!5mW>uW@$#LW!vJzdw82D2;YxP(la zo~O!+f}EHV0e^huk(p69Z4}fq)?Gw|7$b+n0TJOej%DP=gLH^#Xn?;h W9|I_R_^$^50000zGw diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/door_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/door_top.png index 2fc946aa9ee5fb6440b613877081cb90c0b22e24..bb1189e11fbe96e3020ba11ce9f6bd7e8b51bd38 100644 GIT binary patch delta 249 zcmVvBpyw|VuWH=HyrURYzZm8|!RQ*D2;BzOa^L<3Qk!T@#AUS9nr}kvq-BrRSHLyc>WT?a00000NkvXXu0mjfF&SsV delta 441 zcmV;q0Y?6b0>=Z87=H)`0000V^Z#K00004VQb$4nuFf3k0004jNkln~4PdzQ~MNcyNmp=(ori_@%07*qoM6N<$f_CLj A!~g&Q delta 216 zcmV;}04M*60-XYo7zqdi0000eEe}(XHYF%WWe!JJ6;W^$HcS^?f)W4#0Ea$Q{Qv*} z26R$RQ~&?}|Nj89zofsBAsByxNklHg2Bq_8?j+@Q zPqQctcR`p@v|+rndB#fi5YMVD5i$!+in1eL>?MX=kK~{{BMFk@BAGG$xt8dv@-Dq* zYJ|0H8iov%68$9yjXiZq&En$#ytFKY|L6S*&s@Z1Y7P^aB6>MzoR%1&;KU!BF#_w^ S2haro0000q&{C0;jTf7uM1K6qFF${L|5MEQ z_Hv?B=hyEunlsO*ndRLO8F)Rv@%7~i^Oeg|IL;FQuje@TagtS^)rCYM_ zgD&-#%-3C|XnzH0bSh)h!F(l!a1ji#`iGGaV9G*_US%Y?Z+GJfnm7-Vf89&}dlbl_ zw)xt~B4)l`H&Js&Wo)w!F>f`9h0~n5Eaghj3l_abmEM+j1K{~I?^~D;+JdpZx44?~ zoepgiLtVJvK=-Y!Zm-vlpsyCa#`vOYPX-?v{RJB<-x0tEb$ Cg2i6| diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/log_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/log_top.png index 4827ea9d2da57010476aba0c9c256c6745028750..377613d36181f0c26cb2b993dd227f54a4192e4f 100644 GIT binary patch delta 260 zcmZo+nZh(dqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j(UJkh^v>gfupsSm8qJEzOtU4 zo~EXzwuY>tqN0j|sJy(ql$4aXxVVsz&^)euL!g$~o-U3d6}K2CFy#MdFk@^J)(}e4 zU{G-h5AmED8o?lPX7}njin#7>Fbb9&pnbFf2 zRF{T_hPZ$jt5@#^f-nZv(8|auGeg4|)EJw^#Do$xs$482E~@wb1-g^L)78&qol`;+ E09LhCxBvhE delta 502 zcmVQ&+C|Y6$hMny)BpdIrkkX2AXtcpqDggOkd{%8w`7G7 z5D~1k7-InFx()#698-nEAF8IV=si3=Jpq&=?>#X_wAQ7d>pEhL0NmZ(p+-w}VQa$9 z1F+q0=N&=-;O*^g)_u3z5klaysi^=&q;%fz_W-1nP)d~|5h107a}KRFBEr?uoD8hB zc<*N&ff7H*wtv=^@01cvT~QrmKtzZ!A|fUFYPBi}Qc8#jN~vO=kxE9bb?IP?K`Djz z9`8L$DYVvS2!1%C{BSIs#u!pcvq9##8Domn)D_h*#97facGEQFEzct(WL587r&A9h zV2qjFf^&`#0x2c@aHOhh4II&0mxt-j^E#&~V~iMM=x_FiQv&DQ>|FCHPiK>rSAB*6 zrwh|s6JtDMeJ|%6jQu}@wrvZ0#>ggZ+y3{5QUGe~`SP*he!W1CJvSdJ?$-;J7m0`M sC2@G=VSCBuwn2?O_v-~$%ZL}@FH+25)zm4w7UQR0D(zFK~#9!1;N1)!XOX@&_BdU3tl%k z+Q6dGGi0=Y#n=Fh9Y6<22W+>#2f&aayJGUU;DmQvl59C`Us{Y(OC73!U5+4Fh?9Nx z?2tUaPA+C>tE#R1Kp---tT?dS#HA-@iP>M}j^3({(iPUw0~Qv-;WKeyq!{;ecxSXe bN*&t%ho~gv17(w~00000NkvXXu0mjf{{dH0 delta 390 zcmV;10eSxM0hI%g7=H)`0000V^Z#K00004VQb$4nuFf3k0003`NklKJp$VMzYk1^F+^H$lkNbH+5*cdj_t(XZ)fqf*$m9qweJCV3*o`G zy{d9N9ti;FwnbGD5dcz3hzJP~5mc3&Gv50e({&vH;oA44lz#xoIm124Y*n2XNY0s3 z3OQ#MP16h_g77G?OE&Ij;yu#|AgtHx2R7^Xt2uDaak*S> zbMO`dKfk||(toY3r~50WQA!C_#W`2231hagc*Z!^CFfj|MdUUIF~-4q{7QrWd?Cg- z;j{g@ZP{+O%;#jTOE{fQc<*bERh4vq$x1)B?Snq%t8*|O99!Odu6<9}brXbAO2t^j k7zY#24xjaW{ueCf4|dxNXz|LvNB{r;07*qoM6N<$f?6lG3IG5A diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log.png index 7f6c95b27b9b47b86d99f1b1bde672416f58c085..13758280adca39ee14d305410a536f2f56c490ef 100644 GIT binary patch delta 173 zcmV;e08;vV$-T z({mgKxB&ORCQjV9=qM;@t4)T0tPlRXuIuIQP`EqH45gHD_TCW@$V>o0YYnY67$1n^ zIACS~Fp)`AGJy90I&gQ?TCpNC#}E?9F}1BIr3~UPG648`(SLg%*)tOnF>DW28@i7J zUXq~M@B1FbYD9O3x%*Ti)tO!2DLy(-BAsYv{*kq0V>TtT3*tP_DP}3<8LSSpJhiDL z4l=W6k!Xu2)y?c{^HYS?Hq|o|wN{uJB4To&>+J51h#1y2yIKa`#je9fNLALQVK?h{ z0I=`-6M-vB{3iPUiq;yOYU|Q$+cw$N;p*ZaB|W>?B;v6@00000NkvXXu0mjfCM1U< diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ebony/stripped_log_top.png index fe7763094ffa50c062a9d7f2863c73470c15326f..f065ade4ef6777a0ed009b9decac1931f212c8f7 100644 GIT binary patch delta 181 zcmV;m080Os1I7W68Gir(0026epuGS900DDSM?wIu&K&6g004kVL_t(|0X4y~iA7Ni zLqXSYlLK-f6e@B5<$ZX|&dh%J>@LIIHNCUjmf_w5AxUryeRp@Q+fs&bi4(_Fn5`O+ zz{NWolIO(4bcd)RQsgQ-L}wz5OBk#RjxC$)U@q{GTzLnpPA=lu#mrW1+TL9;vlZfB j8QjLT&u+WJpZx$oSq>h2g}H0R00000NkvXXu0mjfmKRRy delta 390 zcmV;10eSw$0hR-h8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00B@*L_t(Ijct>;Zp1JQ zL|=43f{JzNV)y^QY-<6=0)_+~Ns*AT0JGD<8P1UWdOn}u+(hsF?i%OZ^2hbw+4o&9 zTWge3csw3>?*TZD1Avs$0+w?|;ok2zfF{*i8Dn6r)r8|X7=L2`D5(=xfYGH$DMgt-pAP_YPK+^{R7zpaNlFQ8Eu|Fk#1Uhp*19kPTE3JWW7PAU6XzU8 z(8m~x+FB#VNC<%tf+iYc6kH@3X_vKDKYH&m#!zde)`~F(YwfLsf02KQbI!#`DOY4% zCH3BaO}r+Faes48LJ0aMeu#uW1OMmX${@b9*6`jhvyf7vwWh!dV6D}MYtN;f*DA*t zc<+BDIOj+yE#q2BQA5QW32C*;xE^xOSZf($EL!hEh+OZT^E}zMO|^>*0ok_gcA=be keC_*wyUz0AF0QNo1GHw~0Gl%%-2eap07*qoM6N<$f?M^qz5oCK diff --git a/Common/src/main/resources/assets/byg/textures/block/ebony/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/ebony/trapdoor.png index 7a5433d1cbee3d03925ae23424e9487eb0d6e92c..6c3958d1a0f136552ad602d8e05edd9eccd37861 100644 GIT binary patch delta 184 zcmV;p07w6x1IYo98Gir(0026epuGS900DDSM?wIu&K&6g004tYL_t(|0R_RK4FE9! z1F)ZNn4j4>SlH>;-2_7F9`!G=e0000^TJmaxRMCiRU#z0j8$T_ntOGr*Bv27awX2uwUloDeMCLm-U$ARCyh^n%# zYpA)d>*2+Gf7#49j)R;tW=76AaDekXF|&udFww)4-472Z1CLQpp5SwKKkhP}=y&%` zM3{W04yKe?*MAi=3-Wbce-ycivsZPnl=6^$Z>N;PzVD$>M3_`Hw#>;sYcs>lq7V=h z@wR7Q2>98+Wmz7Ed5dF=M{DsH?$ugroac$EvMft1mw%?u=M%&z;6#_-T0>RCu-~8Q tuBi9UtCaHPhL~Br=q=or#!2`11}Ts>>U_d-8UO$Q00>D%PDHLkV1gs&yD$I% diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/embur/bookshelf.png index 2d5f11b3d7584893607a4d1af0df34b9525f080f..a697103868ead2b9e4448d089d4af427fd0bea1d 100644 GIT binary patch delta 372 zcmV-)0gL{%1F!>-BoYa5NLh0L01m(a01m(bYSxJfks&32wY9aVn+l1EiFJ+x9uq7b5-S`M zDjN|Z6$}J_w{2bk006s5L_t(|0R_R)N&`U*K+(HNCc7-HP^$PM{{Kgbh!0wkV%w!u zvojOV8Fo1YfCqqYjh&>o+Ck*g9!{3o^2lVo>0`6oB!0at!Df2T9&kX`0C?>T032IL3Wf2fpN~V$}%MNcpaR1DYS#v8}Q{ zAI|_>=GG5Cu65qlZe{KnH(Bc{g$5O74=8id$uqpK@v9}orPy8QhUg%!4*UZvW?Q8| SUZBSS0000;O+top_L$Q6&0+P_kTe{$L~ibb0(JqAYj+?tr9@(e}4az)>`e2 z{dXX|*N8!>VLU_|Bse5Wcs%B5#%LE_Ngc#f9>xy%W}II~1%{9qsTLb(bgxDlF&;WE+;FSC7{p#0M!Y(2I&jmXTp@E#{x`A}cWvSZ)gU6F) za+zj6n5ahcc)l?82>}A>ZA~d}!g8;cJsL|i=U9OoDL=D)5X$kn<*NVy002ovPDHLk FV1nq9i0c3V diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/embur/crafting_table_front.png index 64b9d0fe53d4d71ce8ddc2edc3a1bfb24a9918f1..26568ad37d82769050044e100b7639a572f39f4b 100644 GIT binary patch delta 267 zcmV+m0rdXc0@wnOB$1L8kt8C2|NsBr*wDeXsVHJwT}wPwL^n@BHAy-zLNqHJKt3Qg zLpm-bHzpYwF)uME9~&z(6(1ud7Y-g03LOy%5EB^=5*P{$5Cf_Lk^lezoJmAMRCwAY zkI@nWF$e?8Ns^v;)LQlbKh>eWGMi0k3v|D3=Xtx_ovSSZ(siB}0ron6kRYByiH88L<+ zvn@TWX-m;Ikx@Io-{=vR)k1f&9P;MnAf;Uk0!0X{VT2^D_KJF;fBwJZ>jwgF35leG RANl|Q002ovPDHLkV1i(IX~qBm delta 268 zcmV+n0rURY0^0(RB#}8HNgWXhRYW&WKs8-UJQ*=BC}LY2Kt4%2FG4gc6(1upCm%X4 zBoGrBAT~oK7Y;Wj85=7z!L_OX|Nr0E&b!)ewk4I8PCu!l7EL z>2;Z!s=2`8S-x-Ph9*1m5lHVqYb_#z2B3GMF-ADl+GeQDwKl`E*bEmUg5|GA9JJPk zjx}XNF}Fi4{_#9k%{7*~Al`*27{Zf-K_s%*dIN+*d~k+eeo}fZD%9`4i@rZtCwW%m#TU|>$RYW&WKs8A^FG4gc96&xGHbXit zBsV4*88I(0Cm$OtGZh~rB^M4J5(*s=2@n$*4iXp&3=oqlQ;7fo0F+5YK~#9!Est9g z!Y~X2Q}jq{>Hq=me^tgQzaH&MZj%De+rHmU0Ge%zw9kD%MXJ|9qWE}o*pe!d*?Z*s z9T}N1+k^q&IDmo|a`)Y1kblH{^2sr@?B$4P<;aNW%YnwW9RD5Erj28mzL143Debi* zYRC5*JtDJO1W4sDgyoQZ)rzcyDS8Z*%Co(SjQ+WP$=45ldFpK(0000wW$gW5FQc=4iXp>rj{p>AsBy`Nkl{ z2t`?}SZM2XnfqULK6E4zLVQmkVo_~N?@LovAtGTmYrQuVGO{7U!s}{=Dqpyd5x#BV z;T~wHfz^G70B|9P9X2NnFJk;b%n23j>4-SffgGb8dh%J0{~RorTtJKwB~7%X$Tdgg z9QO?Y20_EHi%2axOhwBfX79J4^M#>+0~Zd_lVptVyNf?R)ma7e4TDZ#00000NkvXX Hu0mjfZ<<@> diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/embur/door_bottom.png index cc9725cd813b012b108a1892b8a5bfe37f14280f..52b84b78f82bcdb086beb029c3f18d4cedbba42d 100644 GIT binary patch delta 270 zcmZ3$I+tmJL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19D@L#5Z4{i?9*)7W4&#*h&YG3 znEN}JmKbn&TIsjRi8+~QTj{AJipdzN%ln8)D=Wx}i;7sNdF=%1o$cx37*cVIaRNjB ze}+TpM~%Dc-pep757A;T2)`h^0;H&lQuho!4Hx>+O{rm#<4 zxR5=)fMGfNa+b=3<%JBZCWxeaE?c<_D6(vVXBE2?!zA%36RIl3r5GlZPg%-U8Cb8Eb0TYZ#7|A3t7GlL};<0fA#@l-^qIac08AwIdrYCN*v(ro(5&*w<03nx6^~Oeq@p%V0JZ_N}6^c!nM~xEzHZ%{9yJ=g^_sN@_oaz{cL0(jF z`8-}OMzJX~9e=4IC7RrQ&}2U~>`(*Xal7o?&NSU*CTT(M#Vp09%zQ;=CaJI%sF3rS zY-k<|QW=1}sIa7_{tkE&`@+I@hKq`(BQ@qLvO`U&D$wp|ET3nXO>g4T44rmIvzs)- z+HY>M#z*fRBB3BlYKl@-U?!=s(v92f)-H&0?8+0Vji}r^#&1eajL3>%$Bu6Bot&ey~)CMhGJ7Darl+b?(6oS^qG}zoVm#w zUXPpUNR5?l+;Sm06lQDJ0(~AYJJH*AW4oiF8Msemk+vndN2@T``0000* zc!h_!TL+ds2VF}%v=l>CL^n@BHFPitNjfiv9u`70D>^PDVHO-QCm&1}8zUed7ZnsT zeO&qg000DZQchDsbCp{m+@cgB z(MU2%N+I2>9@-jRO^8Hf<4Hlq?c^SpDjCSQ-Kk^c^L%I5joTYlCGVeSHx=ql$<6zD rHdJU=S?-=+@E%9uJ@~ls$M(m6e0U05GOXMu00000NkvXXu0mjf^uKhr delta 682 zcmV;b0#*IB0=ET_8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MDIL_t(Ijg6DdPZMDf zho63IcUzWhu?iKb(uU9`O${V+uot6{cq0A-Ts#lQl{+wl5nR=t~@$vM{ zRMS5aw^+*71m|oGs6K^Yz|W=e+ah`MNA||$shQz|QNk-rEa*eT%gcua6pzfc6N@b9 zLm1_%2&{e2oPU#CuEFl!@B_)^8f^M^_KHN>Ey1~40{{i1L~VcnS$A)kdZR&Wvf`2P zcs$Us&t6%wKVd;1V$_uu(9@Y)DL^DYxifiBQ`-Qz*jVI6BPMuvwPxCFg@G(oYbHtO zhA0A1G3#im9g9S5u4#_s={~EeJQ2;Xx(+Yp0Z#3FW`D^SMfE9Ua(TS6MAEsz+dn-h z9$5%E0W`IZiD-t|Y>fFr2%}sTTWJn9>D*u>ZVylPxY5)$BJGyF1=XjBmYRc_d>`bz z`H6y2;!0tmV5AMYk=`^nrh7yz)(zt=S-7S>U>S~Q#I=tp&&qyPW_ diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/log_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/log_top.png index 53d0fefc9265e572cf8be70a33f0f362447cdeb4..84374920e5f118fa8e01c8311a78f77707449ddc 100644 GIT binary patch delta 216 zcmV;}04M*b0+0fbBoYa5NLh0L01m?d01m?e$8V@)ks%;|8&FJCMRsCPZ(B-gRz+S) zIaNV1N;fDvIyy5mGc7GG!#zPB0001fNkltQc-0)03Z=2AU`2m2&WM>9kI*+;RTUMr$;vlz{4>QuZ`7}uP@A2O8Wy9ZYvB? SYYKh<0000%%wN3A$z=k^uj$0c~TIA9%A-c6G zBF#c2sc*^biR%u_o9;E)+f@@%u2|vArXCZoBiWN{F8=KsJ7<7;i2mFU!60XPy85}S Ib4q9e07CUox&QzG diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/planks.png b/Common/src/main/resources/assets/byg/textures/block/embur/planks.png index 4c16fceba5adc3c0c24048be3b7a1a4d415a84a5..dfb6cb0a2d9e9ac2252e1e0e75cd020f59d6a0e3 100644 GIT binary patch delta 204 zcmV;-05kuV0^9+R7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sT}wPwL^n@B zHAy-zLNqHnE+jE0A0v}=)&KwibxA})RCwA2!NC!NFc3h|Kfwkz89is$fitjb1;h#< z6`1Y61m8m|R9GI?7e19#j5uLhnBgsyFZtpFd;zd~=rp1Y?MOsAR4yz1lKq)`wlb4f y9F8y$Ghm;3Pw8-VW5{=-!ub}}EnCvw>)w_3%NEX=ck^`;$nBo4elF{r5}E*?H(AsG diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log.png index acaa282042652596af24287c52bda96b62a913f2..72b79b1645ba2183f1481dd87d5260e03b889eab 100644 GIT binary patch delta 205 zcmV;;05bog0)+yQBoYa5NLh0L01mkbzx6$TS{wJ zMrc$+W>P_3N;!pbX}ACY0C`D7K~#9!1;N1$!Y~X4&@Zt-9Kt={c6z503%E({RHXwT zy8jBi2h$>1+!1RLCZE{DGiw|8tv$0oI*#qBLJ2fWnraCwmYCEAmQ5(dCax~E7QWz? zs|rsvQ-cb72W1BExLba-S81YuZDu$FZt%wSrO!k~iTY|! z7sn8Z%e=h@d6^Y?Sf*>R#`sOQFUV84^pxN1nS4{G!r$)#|HE$0jP;N<>y<3wy?j)V z{o|E5;k@u~A5PvlUv6ybH1%qje2bEI_~e$NDnk{el-IQ{xOFyL@3p)$Wlipm)fsYc vn$OR-U)oSrlfK;DK{0Tt?V?%M!H?zF_{$2O)r?!-4|1lbtDnm{r-UW|eSS<^ diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/embur/stripped_log_top.png index 5e525a13029ee357cf83ab7febe44db5ce1ae7cc..d0e4fe0fa41f1328897e9b2a1a720c14f7a58418 100644 GIT binary patch delta 204 zcmV;-05kug0)zsPBoYa5NLh0L01m2pycug|^0000mMyR7X`(*^Zou^Vv+YDhiTWx} z7sn8Z%d)-Re1{bTocF%k)p>%k;{l67?DVvR^XXNM)9(D|nEPezJe_E^ul^RxZ5)h_ znR~M*Zv4H^=R)qO3AY5z!)`Ucyqx8Gw&U5!oJk75z7(x{x?du=-+M-^mPGWf_3K1^ v*H!8&*t^`jrI;=5y1&IeQLsgBia_1u-Le}6rr*ll0&=CNtDnm{r-UW|aGy_d diff --git a/Common/src/main/resources/assets/byg/textures/block/embur/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/embur/trapdoor.png index 8bc5f44c4699c0173acd915a52d3d7c0f0f11d24..5838ee019c3ff47de64f5ca1f04bd8952caf8230 100644 GIT binary patch delta 323 zcmbQmdYNg0WIZzj1A~Sxe=v|@EDmyaVpw-h<|UBh7vK}(I%DM;AgZ4*8Az6QbOXtn z-U$%F(zebW(d^S~*<-zJwum@~x|sVrn0i|2x5;wL_@e+QJlE63F{FZ#^`LhivmuYm!Q*18 z=Os8M`M#@nTmL3tzF+8{qI=g5t34`h^-v4(eDLpj`T4_nJ1u2cWOnXw4BB>;|J?bG zn}78F$apWSy=iQBI&GEflnrO?*c6*Pu0}FQ1%LHWIAFlQbWo#yagKj_sZhdp`5V@< zHVZbiubg$~%sYV%w`98Jtd(}T(6RVgRJ+2~W=n>g#z}Q&a)rOY=K9F*J0rB}^e$#+ Qpi3D%UHx3vIVCg!0J%4U)Bpeg delta 653 zcmV;80&@M+0-6Po8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LA=L_t(Ijb)QROcPNY z$3I+q@7fATLz6;4prq&-Bf*44qcLI7I5aG7j7)@~iz_Z}Y@Kjnb<#m{okzarr9kYA@nes zrUBr29;(q~eeRgm-853UoVyJG!T>{q1NbtMj5CsqBi#nIx(xI}2-eECco{8{7bZ7* zp>lLWIBMtsEbk>~?mgyiY=HqvcCD~L(d(9t5oAe*uPc&k~#XRR)S z^XK@K>Y2-8vVTCnW&RH=40=8<7#BI)UKHc7<$ zkZuFj^f;~6>6x3ocVUPyLI|F>isV}+^VyXH;2W?HZ2MJBY%FZ9AI_kf9!e=PAq&kP zkO*r`js+dqSDhWlne|%}VJ$G!0F+WJCJU^Ur+xibu78M>aw=z=WI`6Tx+I&jcz>R5 z!|01r>hd$lUMiJd>AKz(@ZeYb4rTz5OWxK^ zZiDKX%hu>H1LJ?Gqz3~Q`aYV!RZ6J<&V0)ZXzUwKj+AUO$PKX*h5n%vO nv=6VX^P(MReXe+Io&Ny z2&zGx&PntG@>LDUGSZqjy}Ks{Z5}yZ=gZgzn<$Ha0`@SnzsyGZ=}@7k;fH#`IujHj zn?lwUvu3XSF-$Vh$|^UJDdX+wm2@A3bZKJnNEZ$efSphyGR45_%qdeD~ZkO4!( zMSc6(TUBOzJ8s(16}c(IDn;`JqfG<*1?eeze0_4xw$AzrEZHTK_$J03`QGrL{#h~e zAF~@GiGB~QnSY(r2xq&scSV7B$I`dLk^5XSe;w^fsP~nJjg?puqjkZ<>No#E(cIm{wz}6z7U?u9LFajM(Z%=<3KynP!R-&^^4sh-?A*V z3AD4q!NAR}&WPgrtk*j~Q<21BLPpQZq~Z1ZeYMFg4>wM<9@%KS%z-2CtCa}g?{)@u zVOT_A5;CEuW${mFW|1Z{;sh>2YJ4wK1%Gs+7aRTEPhq%0G9hcJ^UIF<7bF~@51rVG z97fR#b3y4Sp<0Bc#v?F;GTm=qFG-z5MqDo~y|!=3tJ+o5jGu zusdpIkZ5`rNNQ!6S>|f6;+dIUYrxuPRf4ti>{`_YHjsg57lcL!077yh>n1;07zqdl0000V^Z#LyHXxBC6n_C!Nklu}T9$5Ph)-h&c}- zk|szX2wM07Rw7zjSRHnPV6SC@MXFe8qXLy} zyBZrUe9g?x?Y#G9*vojHhreJ%#b0A6!3z9z3FE0cf;nsI=)fV+7bh{MDxYBOD>2~^ zjDI2{7l}C(BwhrEDeDBk>0HAsk<3%bNnXSR)+#kbtq7&X0(zZS$(!K;x_Cqf37U8k zCgVUe`|m2x7)ZnHMhX7%H1Z1{uGmc2E(`(fQQ1Qlo0YmKXUjz-ms=8fUJrIez}}Iw z11eDcc(*FH2dyr0^ZU4K+@O8_fUEFG1Z->=f(Si{v5LfXqmB6NR>mRj(H9YYm-ums zbV95K+c*jLL|N~^UZV4q?Ki+#>1GCbQP$3=eu~&^(b+*C>9PkG}yx zuj&c_r0!4+>OtB(Yrw3*bghP`^ccAfWL5WEasioM9WuQN$SpL|b>=0>jbZI~pP i%y{<(NY4NO-2wm7ngj2&Pou8@000020!C lB&9MLbKbxrlMh7*fCa(j19Y(Vf?@yw002ovPDHLkV1mM*Nm~E_ diff --git a/Common/src/main/resources/assets/byg/textures/block/embur_sprouts.png b/Common/src/main/resources/assets/byg/textures/block/embur_sprouts.png index 87f22931283ed3dbf60f642faee13880821e0e27..b9bc71d71dfcda4ce6e255e57dfa5bbbdc7b2549 100644 GIT binary patch delta 115 zcmdnbxQTIs1SbKa;Zz@-w>dmk<*Uk*cXDkWw z3ubV5b|VeQQSx+g45?sDRuDHZGB7Bx(6TTnP|>n9h{!SemaySw&K+h3<$o-le-GBL Q0;*>4boFyt=akR{08&UIvH$=8 delta 128 zcmV-`0Du3o0lxu|7zqdl0000V^Z#LyHXxBC6=_sSL_t(IPh%JbqhJJpTXo9+p-h~B z2}(0;Du*b>rU@no0_gH^1CRl-24sLu9BjZ;Zw9!;jh_q*kFVT?vq1pHhtVJaGYswm iWJwsnCWdM#0|Nk7@hQ0DNzg(70000FzB#}WBks}>{0yjxSK~#9!1;JaA(>N3WP)YadX(^7A2BwPrf6W5e z&D4B#10iWgk!`)jIrP8(|D_~NMgsEtpS9J@P%+k|wv!gYucbk)sZ>B({`vl$wX{9g z$SAKlolaUv>^0^>B<#H%!psPycBw@(r+M`WwY5@}czEaRH zY7~pdn9n1Z%7C@yZ62szVb5hKXqU^fJtO1FPEHHHuBEqjz1q*u`0`Ko^W*k;zn_<@ z-xBHBo-83$+tVnW3!ZYnELJJlj%J-XFAKWaafDu8&MHcQ0V9+dEn7*W)p@qt%jeol zZj%H`D4VpZLp|=hQ3$MmwILq2Uz8E0&{^)+n-53tgOV2Z5|6}UZph*wJ?xcH5KvIa zU+?dPGRCMfS_34M?#2{^mNkqM?8X`oRLB+qx&Gek6w2c)-{ILe3@f^YFY~fP(Rajb|GeRu&;1Au{oBO0lxJ@Z<#KF_VDT*vbn1n(dwt-$-hoOLlq=bW7wLaw#u sbPP(@)yE@_J|2IbxgsLuLbfga1q=yqQ}Y@l@Bjb+07*qoM6N<$g60`6^Z)<= delta 614 zcmV-s0-61y1*!#*B#}8Bks}p<0zXMaK~y+T4N^&t8#xdplRJx4sigJ-`1Nz12ly?6 z0SuqqZpe~Ktc^R(YalWsG9vMhpZ{VM1}z9>_dj#V5vT+xLYYDF)y=7poI}cl;`H^~ zHz;9y%^onzF`Q0{3tF>}2??^-a&SFTf^rp#7kwIM7eE*31 zG_8gZbM%p*0;s{DWNz|*ao@G1-Ck+@ar?l4q@>m`H{aZP)Y>pA>z@1(z{f(tH&oX> z116j#%Eia8UtI?P%dW*qw;;_#8I_85Fs@t7r7ms<(ji?-B+ydy@3%F@bp13DHsG2m zG@mkd`}bv@SGQ`T7v~W|Lf~G={o#+*4OR=Tx=!sLYO8sNb)Nlyx{R06hoTgxgh(|s z#I03tpWjL&YG5_)EeH2giKdfyjRSH&FA?!FMFzC=Zx9$T+$Jb zZGO1(bcqQoWlsZHqZH%+{{M#nA*7W`Db<6*jIo>}V2c8tc8c z)|vq*iMeyb(J-E8=MUd%d;EFD+;@@w!rK=90-kYg^oSYV3;+NC07*qoM6N<$f|GkL A@c;k- diff --git a/Common/src/main/resources/assets/byg/textures/block/ender_lily.png b/Common/src/main/resources/assets/byg/textures/block/ender_lily.png index 850678c10f65b1fa5570bc656ac09597a0c26ad4..5ed61dc06a4fb12a8f76b3fe8ec2f2fbc02ec7f4 100644 GIT binary patch delta 242 zcmVIajZ#Yn|(23WLGMLS15QMNHt9!Y(p1b8!Hej5l0~rIVf?u#{d8T0d!JMQvg8b z*k%9#0Cq`4K~#9!eUD2H!axi|O=%||o8#f~ji4SpbS~7lOR>8{o_166&u$Jq0*{`cUAPRfV{Gg*|Mr~m)}07*qoM6N<$g5d^WkpKVy delta 254 zcmZ3*bb@Ju%0x@qNaFyX5LX5UhSb@$hRG?X|J;@HFx~njN>R{KN6=kbTfkX7u5gW~ zuUt;JMn$+*%k+!c9fzZU>fimJ^9x7`mIV0)|3?E1s%vK^O;nVqZ}fC=4ABUV?GNNT zY{20hJ*};B!qxBgxw5moF8?`xS-7pYUhu}*YX+MO>$e`Zx>?JZ{XUGrE>_b0cf^Fg zqW7|ra|NGrStwnSTpYug(#M!~WN-5X!JDqarS0841(E@q9oU14R2GyqM*hfMp2)?z sD_k+giE(bxs)9cLAC(1-;_6RW*GqG=ADP$t7U)(6Pgg&ebxsLQ0HiN%2LJ#7 diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/ether/bookshelf.png index 34ee47a25b2f4ad553b0c88d80b0c8d63009f042..6d3a8c3569403b733c4d6b44275324416d65c042 100644 GIT binary patch delta 338 zcmV-Y0j>VR1>ypb8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY8|53W(U&P#)WhU@dj}$8v>~$oDv+#ArTmK|2T8Se z#Y<;b?X!Umq)V|HBxbx=9SH3H0bv?Ey{v_g_5I0#48m@ghmZIBqZHPnK%xAqH{vT3 kUcNezF+@gdZOCKu2ipx0o=leb5dZ)H07*qoM6N<$g6&&}qyPW_ delta 693 zcmV;m0!sbj0>TB58Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MkTL_t(IjdhYuNEBfh z$A7asgS#W^7+d(!qF`ujtGF0}7tM)Qyj z!rfScK;r~#rhgepJ>lJ{ZU6$ey4ZU*hevE`B_c^jX6&~Hu=Q;KcGb&Jcyxp#wfEqm zu;l_9B?|zxSqI?WwU1~y(}~skU0f_w5(-;*2!)w93^qy@&+D%+Zx{e93o2U9eaW*abvCSe>+ILSSet(!FO6@(a&gG>f2P1hq`rL$n zd7-?Ngkuek4~mncPUV`42X^udwT)BMO(v(K*t>Z=zf;&dd6#Fc{lwc8#p7*>@^&*r zTwB22$Z4^CZ(sk(RH1M=Fdb_ zg;9N-TqXA6^dM;?&Er@LVtH=*FYR5Ok2~*psf$KqfruoL!;$#LVge((hP9G)mUy83 zO>LDAf{F;72+sm=CfkPU(_uwM%b65)6C<-m(=OLA%V$qkd~l%gf%dY3Ao|^oTwln_ b5r6yvNgWE=oXTB}00000NkvXXu0mjf;$uSN diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_front.png index 7a9382f9f6e6f965cc7be661e4b481833514b666..b887170638f1d83eab1793cea3c8134d62d23f1a 100644 GIT binary patch delta 330 zcmV-Q0k!^|1=<3T8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJb~vBHRHn=z1u z6_=V!Zu762HK~#9!EzjYugD?mM z;JSOA4jI*2N-d}F|C&qZ{y;*=`5=I40Zi3^Wg!F*^8uIvOeAAK#KZ;>W*QqQ9Y-oa zDyfu&0C(S_tGYj)?g*$gZ0~BepN}=vJ_hqNSJio%=2t~P?|(6Nv-4cn|2{HWb8o-d5h)C?&tQ#kH^hUFV)e1>~+OxcJt$x+*-~+ cZn=5E2MqBOPhxbN8~^|S07*qoM6N<$g4B3`9RL6T delta 655 zcmV;A0&xA>0-Obq8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LG?L_t(Ija8CMXcJKs zhQCST#H4X1V?vt7R$5S7A4I4K3MxJ*cIyKLcXjE;rMMFpuB6~bq#&hWaZ{`aF6u_1 zB0>?w6m6kuXeTBqO(#i7$4r_T7k4r-cXKZ1p4a`qBgNE|V}Fj0f!2dx>qdTh7XZ0y zAF^Kqz-k&;wVb%$c>+MwC=z=4hyVau4;XoxMxL!BXV~-oqe$pNB)Q4v=olD9;naTs zxCL58T!(r592j}z`FB{g9Ol_8UKmDR#P%KrW<`Og%uJL zQvjs=dy&G55U*)4B46aBb5u-Iu8^3RLJBJwyL|s?0Nk8@kA7p2Lg^1I;87Sly`N<4 z6f8rbv_tvX3@-q!VY^@0DgiKkVUXMRW(WedT*8uN0DnGzSOB1OJppmpOsBCIUJ2b| zYRW0^4nj}}NZk}R7$RCJ3k}q0hre}?{;i7%g6D5}82`r=`6N1<>4VS}g<8370p@2r z7YS%TA~p~ZNiEwd;vOlcrkrZ;0SE-Rv^l`f>Q}P;Dt6&F34a`b_2z~^mK3C)0<0RgQ4oLCk^m@K(Wcrz pgl!b?X-N@NH}S>$Q1li40h+`8PrL?v$N&HU00>D%PDHLkV1l--8T z5oQWZYZ*p7cMeoY9b*PLRs}UpI2KGF9YzH!J_Rd185%VNA%8C=4>J=F8Uhp?B&`*$X1TR2@N8 zO)YRYQ$=X)^=dn`z3qEL$oua-v-hggXB9%0WPL|Gx6}2g2zB^4)K~A9X}TvmVK delta 691 zcmV;k0!;n%0>A~38Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MeRL_t(Ijct-!NRwe0 z$A5Efxq~}6ZO%rt%CZm@I#YU4RwE)PB)Stpf`X7xC@AQztHLA*iGr>Y%n*tqy9(?= zkw`jtK+POmYvufQU>kn(`@SyT9Ta+Qo`>iCKmYgtKL1zevVYfT8Gi>jJ?NcojE}ki zFj}@?)H?x?6$v>N67|(S02C>LY2YrU060A$g;At1$-T!YpZX{UEQq1paK_&OQbaU^ z(*QYwJV~yRX>0*0jB)fmaw2p#As)>3HGhY$O2b zIGF7s1DNfY@_!1nN1#ENK#IVsYG0pHtR$v$z8_8D-*L7vA<(#_x1;pr?=8 zY$a1U7wV2|rP_5EX5n{qjadH>gL$T!#caH3E@h{ zSBs&(1yV7vI57Ac1ZH%2<3|DnC>OFKiNfM2<{U{rbS`_1mhkRGOUG$l+s{H`lEsQO z)MOO5QGclFt^UqZTIJU2?&6@?jx9JZY&0}qEF8Etd3csMNw0DSITb=qg?Q)gWZHMR zfT?=$kg{{viY_39QIk>Xjtjejz|7CDSigynujV-ET%- z0dPU{;Ra-@#Q);;(d{rcw{8c!_Mt5Y(3x!jXe{Xj0QQx?0K_Y*(3x#$=|lkoI&8st Z{sEDx`_mS5Zeaib002ovPDHLkV1lmQJ%RuL diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/crafting_table_top.png index 8b62514276d632a1d48187d9b443b69781f1b1e6..f6597828f1ec0f61f92fea979fb57b338ad45db1 100644 GIT binary patch delta 216 zcmX@c{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Ld2@DJsgriV8mRvTl+R zo|00g@{(FoqRPU8X2SeZyV#sffGR6IT^vIyZY8gnBbSqtGi&BKgT~OnfB=n#$%#%2 zKtMy?d8J3Uw|jfCh4X}tMT=V&EY@mX*pV=~V^QE@10bv2yPJK6;tLI>jzbe(d}#3S z)G*6xaA|T8kyaIv4V4UXwTX#|kvW_YR$!#!pp%-cF`KQ(?P&?ar#9&iE{1h+Ku0im My85}Sb4q9e077L+SO5S3 delta 440 zcmV;p0Z0Dm0mcK67=H)`0000V^Z#K00004VQb$4nuFf3k0004iNkl%Z?!jvI90^v81cni9yPLF}MdAiK5NW<-sbqK8 zuV3XKJlsDu##R8tGNBpdNRe@^tSgX>=2-3-r4vqXhRE28>VM@I0CKrtC}#)}UnK~g zq_!KXm!DKX^5-{U`*FNnppyB`%K$>esASG~x$y6Thx@0d8RV#Bj@BjCY?1NwEZb~5 zBr=|&REn-v1g9NQGsqdrnLlth{(%rNT9+u5qEt$;Ta)FF0BBtTFqAWDAe18O$ZoMU zTbwh#Yl|<>Nq>t22T%TkpDzrxd%j$JY}2 zLICF!TIZcJ{5$+5%O5}D`%J-)U|rF1yI*Z8{S=%tSXU6qMpN4jDwzXx+-|$IDZsgV zZ8yk96CTSwhv!#xwemksEBDr;s}+amSB~YLaFk8}JTXaMYF~DH8DNx7K6YUc#ePL? ipuSz_;I!j%{oesYu*Oc50M!)$00009xh?VF7&R!k27ie2GwOFRz^CgPDZ>cs`=krF$pJg z>@7#^A;(~)#VnH(FBX~Auysw~bldIowYQ zvtEt>NYZ>jn=PWGFSemo7XfJ1A%z?dh&KAK8mJL+7hk-de5>v(J)%QTb4CwyL)kH~ z0R89tfHGS^Rg!4cMZF6-9_WY6CWXmej*&K!>uD%<)Lg+WEgUoZxCH1oFFr4_=|Axt zJFPnUk4^Mhcz+)N?6+1xBaq0ZM#S?0(i|bj$mf;!M_-jz#J2H15Yn2((Fd^RQE#t9 z8VGwez{VtA_0V;pD}xDnKLn2^zQ`)8&xaT_9Ow09*aqX30IJ@h zLv@|4LsnLkzA6DTEv-6ZB!?=pDgNIG(d}iCP2S7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000XP)t-sj=`vo!Keyo zlnPgS3QTJ;KRG8fE(SSP1vO0_Cn5zaKG&s4<^TWy0(4SNQ&*64W|i*%004zaL_t(| z+6BQu4#7|mfZ_j5hn0Bq>HykE>?9Vh;Idfs0v0SKf*aHcI&TuYYM<{5hw+(HULoV7 z+3ll|Rs8l3`luCfo08NHQ zGJ_q*Dcr^Ov)_I9T|d!0A1X@tZG`ktMUIdj0IJCCwU8d_Yk!Rk=_cBQEJcwbT3t&> zmZE$Rt#0j|1ZbXILZ=5w%DK<#<+)QG8jdZ!HDffx9Gy08?MVFv0bB^ zi;;=;qsd@YOMf(qRFTuL1_dE>dfK$AS|7Lv;O$x8C9yRea9Svn9LH_43%AuQH3UWy zNvyw5v-kINYrkO7u+@$0<)i8BV_cFQ?R> z>{gFj$?MX_RFT^;=It4d&NP84@;}wx(YES>klpH$<3sfvKM2Sk=Bx;jWN9^Brc!Na zN^-Mi-#=vEKSqD(c(4z5lnsRR_&mL?0xt`G0lv$ypAUN+M*si-07*qoM6N<$f?V>} Ag#Z8m diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/grass.png b/Common/src/main/resources/assets/byg/textures/block/ether/grass.png index 29daef55ff3baddafd1c86426857ae1872df24b0..e5146fd437d8b3d76b5b0015f597bddbf77ce3be 100644 GIT binary patch delta 212 zcmdnR)WbAEMToP&BeIx*f$tCqGm2_>HB3}gs8smxYV=aFbwc7)JpGkzUF3}OwqEfDs$(n(@(X5gcy=QV$Vu^ZaSW+oWIfo(c-Vl0 zLE%bD*02BjnHd-ym>7&EFmPxxH=Iz~#4(|CnvPcEZ5Pi#&r9~7gTe~DWM4fVzy`J diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/ether/grower_item.png index 42808395b9e9956902068d60ac9b24ddad1ff86f..7b19fb7ca1c96e1043df4acd32181dee472a0421 100644 GIT binary patch delta 199 zcmbQk^q+BpiV$akM`SSr1K(i~W;~w1B4whYLcLsoPlzi614H1YC04t8b=HXtI_WHIc5_AHgCPVe8Mf~?><@q>bI*> x^aQj%S1~laG-o*Qg_)u39uvc5ZibxmP4W!-OhOFJCQ%^sJYD@<);T3K0RUK@MOgp< delta 210 zcmey*IEQJ1%0x?9N5uf25LX5U2CLn@>>W|cOUeQ-EpZdq^pn%qSz8*bZB=070hE

    pC&3w)aQD-IEH8hm!5SLI-tP8e87$4=%4=wS+`Cp3+F9@?c&?EMeQ7DW3v3n)^HlTwTJYD@<)-gLJ GGywqNJyt*f diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/leaves.png b/Common/src/main/resources/assets/byg/textures/block/ether/leaves.png index 94516a7dd329453fc32dfe19d0980eb77698784a..5a739acba78d49a95f2fa8070c5e6252729fbc75 100644 GIT binary patch delta 208 zcmZ3?)WI}CMToP&BeIx*f$tCqGm2_>HB3}gs22_J32|j$Ulx*`rO|3B z0kS@}YAh*9Kncc@AirP+hi5m^fSi0!7srqaM%IIkj0^@mO$KVW{`nA za^Wa@*>ankx{arf83#DFcpW;|^D9C=r)mn#6izQs<{V zfj5meGM;~vwm0&IYUyK3?K=lf8NX=T5G-_KZOHuu^W6{GQ~xpT7C*bD9cVX$r>mdK II;Vst02YE!#Q*>R delta 217 zcmeBRTFf*-Wum35sYHNJh^zICa*tgT11~MnEsa)731DDgkoB2#jcCBZh%gKG_ zF_R(-d&5sHulO5xx#E)^Rp5*wV-;~M|~0C`D7K~#9!1;IN4!XOX@z_&(v*vJ7E*k1GL1DYNQ-2W<> z!B)5$@)cAfOi~LsqUBsHyeUrUCr}j8XKGOD>En4|adR#&QbsHik2z6<2^XfFJEoSc z&*1=V&2iHVeh&#l1)-WnwF_c3>uJ6LyHNi>&J|sFG^FbWG%geV!ZZHY00000NkvXX Hu0mjfe2z?7 delta 463 zcmV;=0WkjE0o?V zEdX6vQ|ATB8m>3Rsl6?K#bAM_&B$PF1XJWC$uj!4~ zX+T*6z_|@IiF9=yt~V76IpegcTqo^-}0a3JlSplG(!TGJQ zcW;9RO_9gKEQP14+1NN4%iUYfZMUKG@^}mlo~nkX2)vzN9FQjcuHL-MuyNL5k>o>Q zi$(A4TrZk95%*v+;T~icv@@HDqWblw$kIi~M3Vm(+DMtW6VFW>xj&?NM3-o1n2i0f z3nHBJ%i#!$$yl@tN0&^-ZXm5Sah{D1&rM5L)@12I`5#HfC^q3p+uZ;F002ovPDHLk FV1lla-d6ws diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/log_top.png b/Common/src/main/resources/assets/byg/textures/block/ether/log_top.png index 4052b81b1b072e9efe05e7ff9d411c5c5143261c..22ed487e0d9b711e934ffc35fb6131eb988c46b6 100644 GIT binary patch delta 251 zcmaFH+|4vWqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j!J+}h%0a9YOahaTt3+m8m3-~ zI&79}1Z-{!g@8+!|)yB;W7fcYC zyl4SO^W!sHHe9%1BGz_@v!}_aDM^XPwbKg-7QNyrX>H6}ndq5xi^tbgTe~DWM4fM|oal delta 472 zcmV;}0Vn>80_Fpd7=H)`0000V^Z#K00004VQb$4nuFf3k0004?NklS z6otREQ?;#7OKFQGh`2I>b>&uExOU^lm2cn!_$EGsK0$FKxE4ggY+MuxiiQv>PHUQk zy2wm^w0bs~IhncloICd#$D6yeNACrI=3E(O z1JLjE5CBg{XB6PrU|I|voAUNP@xwJk0MjZQTOXVwbky+XB4KL{01VG%7EOq}%j|~Y z0G19;01z^qrvH}?PXUPix4DWm!rMW5Mx+O7jf8Y;=0fwPg(0fo*vN3I0+<$t=Vlq+ zo)a6Q3XsaKbbr?hdv`1;O`<6{c0%eb;}Mna8lu%kwA$&#pGp8qnm0r>^Qj6Mc`lJs zrq$#vEH6|jZLGBCdsfhL^*6u%ibGX{KOkCJ@Kiyr$Xl&m79gJiR3XPBs5P?7+Jdt6 z5lpg1${#8e?H^m98_BdlKci{=Y8;Jnv-_*bgdfOE_EGHsLsXLtsuv2j@*C4a-d!Q0 zSVh{|OBVTeR%<;_DX-uM5<`!(9%UdMXN`8P&gyc~8?T=u{6G@L3I7cUV98Ty+d07i O0000R}OO+vbu%w%S$ zZnmFvf7b>|`qXekdi}v|?_Unc7 z)XLKbP#T3vN_Bk(7002ov JPDHLkV1g{V#*F{~ diff --git a/Common/src/main/resources/assets/byg/textures/block/ether/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/ether/stripped_log.png index 3e0ae819316793cca15c10acf4b3812910d9a0ec..8f6daa6b154ac441cf803b0ccc4d70e4023044c9 100644 GIT binary patch delta 225 zcmV<703QF<1MvZn7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-s6`0Wzj>8dw zun=^j4{DVSV22D^eG5=;3PxeL`ICtN004wZL_t(|+6BQe3IZ_@1<*e~=|pxCtleBd z*ve8Yyps3w1fD_d#bCX<5eq>~#`oO*J6mo(>m6|ct)XMlz*_lW*-J_dQUZ~Fc*-d3 zrUtwn7$t{uzfFV|P+&xLkA#}pa%?;nC93IdMffrl5xg9UEQ-)mT|88;MkCt-cIQ-~ bdb;8dQGhUP6poUY00000NkvXXu0mjfCM8+c delta 455 zcmV;&0XY8g0o4PL7=H)?0001xk!Usm0004VQb$4nuFf3k0004xNkl*RRRKsphD|Iu6>BSN#3r{kV_9eh5iAbY-Dg-v7*yPe|CEqcid(U zLOV0e{Jw9@<=s6kR@t&l+)+`E+sABK+V$r5!~4{;y}1Pt4}ZIH|JgX7I1m5;cDUr940Zhl8 zel;QoA15ux7o53dE)qagI#Y#<*87VqFC~}@N~Fw|3ya5-o8_Ar6=bj2iZd^AAo>~_o+K; zjT}2}M!epyAssDxkDJx#Z_COfFAL7p+05Ck!05AWb1K2D0i4BkGaTt{72| zTKyLzDw#B36m3`918O8mA5fwbdHOF(&SqvCy3oBT8>X3ATk{X)nH$UwjFu1p0000< KMNUMnLSTYVD^D!| delta 402 zcmV;D0d4-^0iXkr7=H)`0000V^Z#K00004VQb$4nuFf3k00046NklYU z6vlr^Z=ea3U`xpo3XY+OPhfFyc69U&e6jij-2_MJ%AezqhXiHLPo729I0on!u5MABjSye(_KvmMaxPNB*`Xuvt;gxNc3xr17 zJkLG!pkA}@e(35)dqd>_`ZxD%2SbEQt$+If!1il(oRQO6*9cRPq%v8R95tQK3jz^C zRkHj3Q~-HFP_J!=)rTBI!~lkNluf*twjm@*p(rWc*q1G)EWdL zwsR^WyLwHhn15+D?g%6);qig3X}X5CfHjk9Y6`$Hjt$D zvL3+^+$@q?PV&m_%onQ&usVA>_A>w$avuRZ!y zz>|9H;Vmxd>ZHo6ynfdbZ)Sz0-%czvH+dhWRP#`xPI;Zo-u}g|e#d6S*>8wW6ge;C ksd~_TspCXDZP#DS)0Qf}`Flez66hcXPgg&ebxsLQ04f{DA2Dan_vukg3>Y$mOci#D2PoG^@SP7$AWw(Ve!czfNnSYDz;*6~T^k68C&6476 zjs9`ffU^`1jsYlsy)?corC1~=!bm`$A5CzU3h48rAv!olpI!*b>4lJn5x#X6t2z4c z1UAbiu+?seHcJ2@StOEVw?(nriedUMR&&$)JFZk^4y+}KQ=PH^PX&~J-PRvS+R_?`-& z)3t^4fmgF4(cQJWVm9ON_vi%d>wQ-@*nI*|1r5YKC|ilVxfN2CIet~E3{1k)XeyQ*pel|F5WNQSRW+Z}i~_#cFQW zXb-2;Me~KU+A=tEKyh-kR=-z-LnaSs}*-Ri= uDy8=ZwasoTGuWHFB{W~T?%#QLasL2=pvvGLG#V@b0000Ov!Aw7#a3FWu5K5>0Bnz6b4UM LKbLh*35-nuNw73t delta 169 zcmcb{_=<6Y1SbbG0|SGGE`RVuGX+cO0G|+7Am4gMxyP=FftQx(mPV_k1jzc>I?Jm8 z#m|(fP6Se%B|(0{|Dk{(*uO$(qM}5Ev!{z=h(_?)lN%Ws6nU5&Iv2dL|JbgtGsmGz zC8jNK#sU_h%W~gVDSczQvcBQhy;EVK2VPARux0wQy4T|Yi@8dF(_hAXUUu1!`d>nT PmN0m_`njxgN@xNAP2WEh diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage1.png index d062ff1eefccdb0607505ab1004631d75018c3cb..30a9cb5254c0193c76da1bfc92a7c1834d8293df 100644 GIT binary patch delta 178 zcmey)c#m;{gd7Vq0|Ud`yN`l^6lZ})WHAE+-$4*&+%Ylx?L)%d ztcQ5ABp`j@(18gD-kf1z6PDnS$Y5vi XZDso!&T_v5Zr1SbbG0|SGGE`RVuGX+P*0G|+7Am4gMxyP=FftQx(mPV_k1jzc>I?Jm? z8(O8BI{{_O^E^%fDejUWzu^CHz~JT2_-Ue|M68FWi(`mJ@Y$|Fz5@mvPTj3#kN>gD z>AgIjXCUMv&$rmXkyB-v?VC{7H>?_=%>Zg@iI|U!SUCBxUd|cd=)4xV4?U{9ln9 Z{F>)D4q5DFehRdU!PC{xWt~$(696+MK^g!6 diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage2.png index 9a13ee8ffaadf9dde595ee20e16bdda07d6eb3bf..9e26fd32182674cc00e8577772f68ba7fe516928 100644 GIT binary patch delta 201 zcmbQr^p$afgd7Vq0|Ud`yN`l^6lZ})WHAE+-vJP2%(~XeIZ;ueUMs*S#1$y}Z_&3O z^S%XMTH>*5;#K>f)-%cv*u2p#jaEwuNHuqgHnfuUv2~VLJG}0Z4p22?NswPKgTu2M zX+VyI?Jma zuzB-i-nVE&t5kERe~Z3dwf_lJS!N}q2c-B*g8YL2qX330cV;Y{s3?&g=IP=Xq7i(w zo15=|0*AA1)2{x#{|m!6oqfZW&D83y*|PAE@`FAvu}w2AtC*dZvn<@{UNwWWM|aCx z71=B=p6QDX4i~Fd{GSQ7d+ZjAv{an^LB{Ts5 Ddh%J6 diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png b/Common/src/main/resources/assets/byg/textures/block/ether_bulbs_stage3.png index 631289e28a637997642b952d1014c6021d489923..6a242ae3a0d9c8c94facdf0ce53b22f867a6863e 100644 GIT binary patch delta 218 zcmZ3%)W$SHLXL%*fq~)e-A6${inG8YvY3H^?*IrhW?k##oT#W!ZxG-U;tG`gx9HoC zdEWvrE%Dej@v8mLlQwUyXOthXd9&H_zHVu>T1r5wxl^>Em8_4gv%K1*I<=obJ&Ywm ze!&b5&u*jvIYFK-jv*Ddk`v0!OL{pi4fg?k&P zH?D4IY~0-4_>kdu5u2gGj{^Y`42x!FOGXGg@D#ImurzmTOgSiU%t4QV;msYvDaOZV RR{)J?@O1TaS?83{1OQg}Rek^f delta 231 zcmZo;TER3yf|G-pfq_9omp^!-nL?y-fKP}kkZ(Ps++)|oz)MSXOQY3N0%Uz`o#oXI z*u42M?_0E?)n?24spd}q7Ja*F|MR5HTcCQU%%`eAO0XozFZe$iU{GBr(U`gMsYi?AVdV#XK59kA#Z!1WdZjq7s?KVk z>2TNiuH&VJQ!2uye^$EK;n&v1^nJ5~n|0MaPNN(V;Tf5`v;STwyUrAB&+v))iyJTR U^8BrnflguYboFyt=akR{01AI$`v3p{ diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_bush.png b/Common/src/main/resources/assets/byg/textures/block/ether_bush.png index af6c7ce2d37ab87e3922066831e1538e35331c13..99ebcad13f5e508215d9c9608f776ae9568662ed 100644 GIT binary patch delta 242 zcmV0=fc_B$2Tdkt7{|KTu3mMF0Q*#4`UHo_MY;;_3kZohZzeCBKp-ytn}W z6LMHoOAd4%mJnV?Z5)ni8;4siJxnJwL?bT?KQKBcE@1#@+$n1c00001bW%=J06^y0 zW&i*HcS%G+RCoae!2yDUAP@wwD0nS8Ex7joZ@mNn00=e!M8@{n0O&nsKHCsLfBky0 zXNX|5-}i52?1^CPqxIBGUf*_xWM)szGp$`Iq@Iy?MOsdfI<6zhlLC<(ms;5Y$(o6k s0#H-cGz-8pWv&}Q+|#-Nz?wJk56dJ4-G5+dZU6uP07*qoM6N<$f;CWI00000 delta 286 zcmdnR^nz)E%0x@qT&Dn^5LX5U27x&DBS!y)iz0Gm`d%^opQO4cks(8BUd1}yN14*? zQ&so-sGD%x8$|2bhIsRp$W60S*W1DHf3C(E7iE2*cA?3+tALbPNswRge{6t(@zQ}O z6BQ-udp%toLo|Y8djo}<4LDqW`vmv$uDH7Qe<=6L_`8y6H;yy$|IK7rv@FMoQy{hK zo{Hnz7nV~6eFEZ(TU%9FG;-ta&)qa3u7A^%FvIrix3+mSxZkN+yj8Ya^o>T1&Zpj7 znWN|avh>YR?+|>h_gd$B^ozovS{5OXXPY$suU*0?u6%EO4!gtj*U#U#T&b;i$!$D^ VPi{f9n;_8f44$rjF6*2UngD(Be&_%I diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_stone.png b/Common/src/main/resources/assets/byg/textures/block/ether_stone.png index efd4f70396c3efced53e9d32dd1b35d25125f707..8e57d240407b9daf1f75031c6f2f98631830fdb7 100644 GIT binary patch delta 149 zcmV;G0BZm10qFsdBoYa5NLh0L01m?d01m?e$8V@)ks&*HV@X6oRCwA2!2uD(AP@t< z;DAIyxm3W<1qB8Fntm6fDwGSp$*LF}dhgjm%UPgsD$Pj)t3Iw;7DS)1^dq8=pG?D$$=LVqnPiq3w`>^;2`oyFbo4xg+Xitv0MQAtRQH@A5*>O z`GY~qJc+zgPzf9U+_Q!9RKOgEDw~!-@U>u|iKts}sl(|#wcJ(EWw7>vd*$u|%h|a` p<7G_@+HX%+|F(Y~6Rn?Rv=92m5nL*;Acz0}002ovPDHLkV1f@|J*@x$ diff --git a/Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png b/Common/src/main/resources/assets/byg/textures/block/ether_stone_top.png index 21b3a867e4e767f4423a0375a1d6cc1cb0b59841..979491ca42695bea98ec4fea8e85e0fd531c15a4 100644 GIT binary patch delta 178 zcmV;j08Rh%0q+5jBoYa5NLh0L01m?d01m?e$8V@)ks&32m8YwPn3#Bkg<*7aR9;`C zsv2AX003!8L_t(|+6BP@0e~0rLTnB#}8H6NQ+Vc!Y&vbaR!bt5jZJP`77oks%m=ZAnByR2b6@%;61% zKnMfio;bjP3s`ak_>=*Zu>VYtq`#Ve#c&1gbz)CHB;*5UxW7-KxPKGf#FkdvfWT0< zDOhE+YARPcBnIa5nj(7tqtlZ8O38r-EJ&S)Aa%8|g*C6}5NxXwfLf(e{SP^!4;0(F Sh%5jA002ovPDHK)LSTZpWk_WJ diff --git a/Common/src/main/resources/assets/byg/textures/block/fairy_slipper.png b/Common/src/main/resources/assets/byg/textures/block/fairy_slipper.png index aa45b751555b90e8d3258c23ca99c0ea3776dab9..c9baec3ad4248ad51929ad2de3f4d3ee5ff3756d 100644 GIT binary patch delta 191 zcmV;w06_ni0{j7xBoYa5NLh0L01m?d01m?e$8V@)ks&3200030{QUp;%=y>(|Ljly znd{|e%D-V>%sr#BNk^G4EzE@PlK=n!0d!JMQvg8b*k%9#09Q#wK~#9!jf+7Jz#s?& z*IHKK{||0Z_n@bez=nYV{uX$zej)aAcWdVIX7Hgrz^mVSFxI(rBFpR3vsQ=Lo`OT3 tV$jwbP&yDIlP(aV6v)+@kqKmO`T^8F0ykzVgMR=3002ovPDHLkV1m8RR&f9T delta 198 zcmeyvIE`t7%0x>go2Tig&e$&gdHv`AnXmu<`SbtBng4J6XX@*2@^s&y7|+1K5ETA| z8Ax%L1o;L3hXV#Lf5uM}6(wrYJzX3_G=fWe9tt%ma5Ot=mA?OfAouj2i?MSKNYt>| zeazpJ^wmLcr+DsqnMn7g>XPS-Z=B40z*YHj!HZ9V{3V5JC(W{Wf9%;Ef#Sj|#|#(O wEc5RSzFo`numdKI;Vst0J{!go&W#< diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/fir/bookshelf.png index e407b83f5f015ed1f3e9d7ea9c442dca3d53205a..d5253851f001b5ec98e9b5b3835ac67537dc5507 100644 GIT binary patch delta 329 zcmV-P0k;0Y1=#|S8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY9R3Y^a+G ziHV7ybyIbY5s7{Xi(^RF*5yba@HNm^EMK@|XnYi*SjtDk@{~x?Q!$e@BpT3>$Gf5Qg{uDl4Jt6|l z%#rZ1>Q?}qff~SFHz*_|GYL%bGM(l)G}&j497Y#CI00000NkvXXu0mjf(-njJ delta 691 zcmV;k0!;nc0>A~38Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MeRL_t(IjeV2POH@%5 z$3HX9^SznjX^u0AgCu4trUW9An{W{+3FRVMRJJf7g0fA!AS|Lb1^oko8+Xwnp&)`t zEOcc-Psfo)nV(|w%jxCJ8}B&NVw|TbbXMnn&$-|4x#yf~nSXwHw*-)ktyAx9cz z|N0|@&94QRn)z-9?6L$vE-wyYX2M(tgYLJvDJXb_KR34&{uG3}Bu6v|s`WqX6_Sh3~9!bJ=v=+C^@qf=gRLE@YU9CKOH4XENq;(yD zI#s1@FikF7K%4cD^Q~cQ8`P;PP~HcnTH(o^%TzfnrAPMyNg6Uae!5kx{V&MMUb;^& zkk7%uY=KZ?Ej3ODE$0$AynnE5Hk8#jx3C4{8S;~p7@CF_n&YH#Xj(i7|K@&86+KNh zHX`ut`hOrI5JjC|!ZtoKfIK>iA_QFPH!o=)`^aXqG&axE8LQ=H(jc-Mn`$3I6B->S zn#zBn`@rmF)eWh#KO-9O3Y|_#B0{;bBmVb@P?QNHkFBx?05>+m%xwFRRX3iFF90}0 zZN#Jv2s+q^6v$-@h(MHM;ZvkapRt_pX)C!@1uTG+UT%O(RZtb#tVlQVq;vz9s+c(y Z`wQ#4B9EU6tOx)A002ovPDHLkV1lE^JeU9g diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_front.png index c301d4fa1d22fa3747ee6097e7e02cdca810c47a..8a439d504421155ee98ae2329938ab1c719410e9 100644 GIT binary patch delta 265 zcmV+k0rvi)1(^bn8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJex|Nq$7*tNB_ zvX5+^byJIDNqJ2=WJoo0IUrX+E=4mYODh;bBMvwr7APJI8x{>26bum#2m~2?x&QzG zkx4{BRCoae!C8(1K@da1XIB<2M)Se_uL(lERHup1>#gv24S(+W1^pLBKDK7=4#tpl z@AfG~QxuJ5EW?etR`*(K_445hGrWb^-8>1!oh<>H4@`;(gK@WL3OBJ92!JB}COi;x z(U>7p2BA+tvf8o%uyzW00I=llMEu79=dzq)@DyI3L`(*bz= zY?k5UVb*r)03?ou$ZUH|-@S@ocCp0t>ji=UX3hej>R6bCD(91D_?-JrG^_xS+4dMu z4PfRhG&Kys`dSG9#aGnSFq#_1=+cNMbjDKy*xnwtw@1?G#wphhhIjzP6T)o}AZr!C zf=H+p@!rL8>woaNkLyF`av>t3+cu z(b$2FPb&Zz$sPcnzL=E`=bk?}6o|%j?4qFRZv>DG%zvDPk?bLzPGg#;5be@E z3DL5Ib;B^2Us!I6QfV~gW(>msV18j4fPk*G?I*iqsF9Go1Gg^jAiJ>zz-WJ*NT?OJ zz6-#^mw&TNO^lJt7X^cBsXn=ue>3}cFmYw138rBfOkE%4_M!BzCK78H4aqFm&5RNOpcpgxc0Dl4V;SI1cm=5_^00000NkvXXu0mjf4x==! diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/fir/crafting_table_side.png index 562c8cd374c0b01eb61ec70594245c244404583b..fa6dc88c0b60720e84caeeeb3998964c5cfe434e 100644 GIT binary patch delta 261 zcmV+g0s8)-1(pJk8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJeK*x0qTwX%Ye5-1)E8x{>26bum#2m$;p`~Uy| zj!8s8RCoae!3%1`P!vPKBfaZ76av}*G7AlD(`ce5l7k>Bl20aHO|LtM>xEMp5 zeAYUI2*VI8V^x&l6htDW^kJ6w?zNLUDZ|}IS0Gq|q593+3x^g4C+qq;K>=ebRhKPU zgkjYpph|*aHF#}Y7{PE9kT`JEeGphNqLLV-Mg}BNrVG(bH&xJoi!e-KHI$LY00000 LNkvXXu0mjfG)7+o delta 660 zcmV;F0&D%20-*(v8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LV{L_t(Ijb)QhXwzUA z#(xc~mTq;Bro*)0z-ik<2ZJdh1DOMH3Mx2IP!Pd`7xAXTcAi(kn+H)mdhjMV1qES< zI6*LsX7w9XX*1d+&}ED1g4IL*Y{eG>Uk>l@d!Ofdzl5p`{eOM3a1*O(kj<+AJbe6; zse@^%n;rn=11Xj_T;}gyAu6kBF#l|c0RUYS0GPHwZTfVHXtfD{oGIgKKxDHRloWtF*^Now0W)V6o1lt!^zo$wMDfMPkAb^u^SG(bQm zwV&X>i|u%9yMI0aj@PB$?jSo`*iIlz&ZKq$v&WCdDnt$Ne_V2hcg2*Go$YJyAl`sWe z6J+x$CvPqC>FEL&?ma?pm`vmbnaB;sxtA(q@fVd88DcdJga|-F2riyIf#vqF+#YtT zgK4|yn!sureX?Q`bIBxY)x|*H(q~EqCBCKY`^aH3cB?}>G(85?+Z~)tD&7Of>+<%S zK(~SzM}NI8dc(x=x$z%YKqy+2E762>Fph*t> us5>r_l;F*m8n)vhXHv2LIv`02{sCyoBsCAp-wmAr0000QR$Bl70ES6KK~#9!HIA_g!Y~v??;_Iiwc+h) z6Zf|G0fCZP;-Kpb<;^aFet<}~ZuWB}h}+>T=U~~+<9K{NuwU+4qV`l_O+-Y#!prHT zny*O42Cl_pV9LgZ4n4#{d8T delta 464 zcmV;>0Wbdc0p0_U7=H)`0000V^Z#K00004VQb$4nuFf3k0004)Nkl1_Za-4BJQvfVf;@8(R#d7@7UOCE`rx8&oSlw!$ zsBX3IdzwocZGR|a?3n>f1~Ktx!Ct%G(_ZzK`cHSb$mPdcB@{AdqYYowTBrn6!fV&F zPzg;USoPMQKmYEI-bdla(QC9hDPE(^Q47E^gSyo`2Z65IG?%`$&j})z*&+M|r+nRN z|09l>i;31-!#OyC!y*prtwDUBNICgGp5NffvG2K8Hpd?}xklCn7aG zRJgslqT1|ev^h!Forh*pLwWFm5W-uuOvG6`zwO@%?f)N$&B&TUlaPi00000?c$IC diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/fir/door_bottom.png index dbbe34a9a28e8f3c87c2f0f1caf1dca79070f5a5..4fa64d3d649a757a6e3dfeb159393e1ef1e8515d 100644 GIT binary patch delta 221 zcmdnQ{FZToL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY0*sXu3aX>fP4XQi)I ziic^qgPyCgnw*bw9!Nt;kY6x^!?PP{Ku(#bi(^Q|Ez@HgMHwAM+AhAYKPG7T+l_U% z)dhy=E{{D{K}?NOE>;K6dF!UTBl83TCN7QZcFdf-jQhRzWy`1ElJ6E@edW*=USeMop%5|c TXZ#_c6Bs;Q{an^LB{Ts534u~g delta 420 zcmV;V0bBm<0kQ*-7=H)`0000V^Z#K00004VQb$4nuFf3k0004ONklF-yZx z6otQpLPH@GUQ0m-7qMGKD8)e#5n4OxDAbOw{bBwCL69!uAUaeBt>_?_K-)Z!2jzth zagg^+n~LI@E;r}ioO9oCn)PbZ>$bSQykk6@p>)hyf8aFh)qmvTcIW_{wj0S#ZH?h$ z$aps6@L-!L2)Vj{!xg?q6oeR@^#=}s8U79KUq}F@)fGgg`2Ph4O2>1xYqlF4?`ciN2&q|$bH8O+V3(pd|o)fHM>>j>YoJ*o6uomT9c zk7ZGqBmM-lxPL4P2;cj9#zmyPriap)$SJ;;|F$rZ)1}14p+&g9m!At#`ao$!L5LiE zWa_0yT=pj*6C|bMuV*~Jc}6O2Etu`;ETsE}Zxx&z?b6w=Wn}ldEjs(Pj1t2K$SEBY z1tG)7(E1aVA_Nnj9$t{652Vu8mQ>pI0UQ%uEAxje2p!+U_wv@e;e7(5Ot=2I3~sUj O0000fP4XQi)I ziic^qgPyCgnw*bw9!Nt;kY6x^!?PP{Ku(>fi(^Q|E!Km(c@G5$upHPsbuPoC?}~!X zoOuidtSMJq`AZyF6|@u<@!seDSvj*axl?nxaNO+osT+6y-{wE9bggvz4Zghgysgjw zyt?kWS=yaZ!6oHHE$c*93uzb6+IyXDPTL%e9z1b8x#rlHfQ5oxEge%1iL$ULA7_g_ ckocd`Ley}!V%Uv0K&LQxy85}Sb4q9e0KqDsnNKPBL-%4u1if^(qH@I~beNsH{`l zTtni`dX?Ayh=aWywn_8iKdd3gG>jM~=ab_!8Mcj1W+}OkJypSs(V-LH%U#B^{x({CL z2LOfA($50YRelxl&h~&`Uy-XuN1*?mBw#zFSX#+E!pR#X??}xzmMn3Rkjs6z=PX2om=l))!-~Bs$ vL&cl8n4g}qpD4tOyH2KnBuR0RqgBKgqCv>^q&B*-00000NkvXXu0mjfu13|U diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/fir/grower_item.png index d47baad6bce9945790b32344ad1ac8a8c723e54a..c65e529357dbaa2a2ff27a4823a43e2c81dbcfdd 100644 GIT binary patch delta 145 zcmV;C0B--b0kr{;EPpLxIwessOE@ASNGlsTBP$;e5eWrv?y*7u0004WQchCNklr$C3`s z4<``oDj7Kty zM>~a1Gl@nzgG?`oL^*&bH6dm+A!RfoU^O9LGa*8OaWhMciNR&(u@Y9zajWu56{H-2Z>-8pT=EEf&c&j07*qoM6N<$f|>sPBAWrLnL}P zA!aloUNav?E+lq0A!Rf+k4qwEH6?pEIFU^^kW4pzN;#5EGJlIlI)h9(fJ!utNjrs3 zI*?5{fJ;7zQbU4LMTSv6bxqF8R$~AF00DGTPE!Ct=GbNc006j2L_t(|+8vHndV?_# z#8hv&+cZp`aMoeYfB&PEzIh%=z(cafC!SwkU$D1l-aq`a_Eo3RgjT!NA$5Cw1~ANG zG#*Wu&gLwVhJSgPqpXHgYP2R(+@!UIl-ablQx|m)VXh^+#2)IUz6$nuFyU~_VNtNt zkuat#C36Hz7yolVXN7RpSB_JM%Q5V#KT;6&qBvqK*MS#9E4e|PzYfgtKpB;~gWUiu o^56_5(Dhyc*pYy+aHq}>!DSNyUzxl800000NkvXXt^-0~f<>yCJ^%m! diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/log.png b/Common/src/main/resources/assets/byg/textures/block/fir/log.png index a6db6cf646e04ffb121cecd07a55f2640e689712..d3858a21399a100b331c11c5a1fa4393e203b216 100644 GIT binary patch delta 210 zcmV;@04@LE1L6UY7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sV?j1aFepPN z9yuWyFBlXn6bT{`2TJ=Mng9R*dr3q=RCwA2!9fy(APfc2Uy``CB;f+}0$51gKX_6Qm|^-y^#A|> M07*qoM6N<$f)kxo9RL6T delta 466 zcmV;@0WJRG0pJ6W7=H)`0000V^Z#K00004VQb$4nuFf3k0004+NklCa}!<{`+Ev_(QVfDw^2OaZ0rb`b7N$9;>ygYMnC z_wM4y_iul1S1T+om+&C~0ABqYJ}s}$-qvW)zt(8{d|5-dE`I_5tkFn)M%y&}R#Jjs zjfU$Y`u%~40YLZ=(C-g$UBp}~Sff#*Z5q@Q0oO&i^@i&-SkOdby}N(p20~R$@h2q! zKs^zxXcH5JHJXc?nDF)U4a?lb#EMeR002E}5x4%hg6ra0kqC!jce2Vb?AW6tL9v&r zB}-0yhMu)>U4MkCC9Kit_Xk!)bwSPj{=n=+)HcnD5&j!;hodUBFS`3?=%}kt~MXVSWJDHgzCySXfG&`6X8#|ksG6W}>rKdQnSTF=TfV8Vw zF$6g&DhV*ESuzBgxrx(QifNlRh$bpTVxeL!5)!-s18X0NSKuKK0}BHT6-xoNML}uEKVsL7 zV`L@r5C(HyC*imF`uJR*?;QP3=Je!v`T6{uy`4H!-v{9L)PJK{KiGJ;%SBYKT`tlc zjLE!w+*-bR{*a1Y1K?&j;_70AX-T|^&ta>^)x`(^(~@kPc>r85=e&oKGjKWUEC6`%g>-bq2Uzh&v0>>~axr z;$s>*6}!f#4}V`+mpAc~vuQ~TJ(t9^;q8o8;{Yd$xEaR1{tW&AVCXpjf_aSHFba4R zpJ2YADg*%8;n+=r3egMZG>igOA*c#L!zd&Khpk#dlHU?!)rT}zdXP>OttFM<-5jPn7~{@D{sN1&@Uz~;Q}qA<002ovPDHLkV1kOa1;zjX diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/planks.png b/Common/src/main/resources/assets/byg/textures/block/fir/planks.png index 1ae9d56450ebd18c7a71a2ea0da8bf20f535219f..4108423e734b9377d8864f1e9bd01b14447446f1 100644 GIT binary patch delta 196 zcmV;#06YKM1JnVK7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-svX5+^byJID zNqJ2=WJonvKrTfyCR%!5-~a#sZAnByRCwA2!2tooAPhypM-_yw2Kdat00kpB=<0y@ zm#{l9Fu0Ir$;zFUOZ8SR*1h7l;~`1IyNoeUeT~EiuwzWfDm^+>Pp< y9h10M?DYf*E{+7sqki%!YCBi1-r3LgwIlu%DijMkcX3Vt0000qLaJ8eUy(eiQLUfv5ZgRYNM31V{t z@vBML_Dn-rNPh?5WN)jGY_$H0?8ay?EFf#TF3$1kzL{pLt(&DvkZMS{+sV2ABGY+u z#&EY|hOAP*Od%Q!0jNAb-DkRS701{9ml;x~1mtJbn*g&pY=z4hmoZ=DWJ_H`GV0;6BAs9a`{8b^ z9C$*DqQ=VycXZpZCKQdlQwu1|K(F!JWAb6J`X*$Gs&xfMI9Lw+0l1bG5wD`1r~m)} M07*qoM6N<$f*ki$D*ylh delta 488 zcmVVRR5Bw^N~X&h$K65SQ-5b7-k$*2L@@w)QlhGo z8D@FDL!Ok4ec_IJpBiLZ=(U;-=*bEsPfA4FY7y^G%vU~nQtI{p*m%Cf`SA&Wcz;4X zUta+D`6J=lc_my2+}zA{<8(P|P`2G6GA%T?827uFGL(_#bd$C!<(&X%TP=dcgs;eaG_~XI@K5b`;fn1x0pRz!qHVQm0Mo>e(VZWk$dj@mr;-`tez!Jp^vy%21%Qt4 z+IemKvdW)IX2`T)6UBJG^DY6<2AR%RGGj2db@L{QabZV2&G`1#M|1}r+)wrxZ6D%eG492!*C#;J=rUldGOg|Rog_30IH)FKjAwp3$FIpF&ACNi^ e*8wUq6Ywt_wD52(rlyzx0000 z7f~7261SNos}|WyFV^W6`TI$_~6la7;5rlXA0Y|YgccC#=0RR9107*qoM6N<$f@#EKLjV8( delta 569 zcmV-90>=G<0>%W87=H)`0000V^Z#K00004VQb$4nuFf3k00062Nkle5`ky=}g;cPdnB76895uNa*9Os}V$p7f|xia0-p{OS(Kt!s$<8nbZ1*-sZ^v&h=} zH!tq$w&df{7XVDD10eMRVKhhT1+o!Fa{yjGdqf=lK@(b@kv|3C_2Cn?cIyCKo)6Uf znppx+_hYBe$bX;Wy8&8!yCC!@m{MnJx6Y@d&#Z>;2I_3u22wBJy8#a$Y@^jG8wf3r z7sp(l4*=+d6D1>y-IQf~Hz17WSV91hOFM+oTp{{lL{pZrguoJlrYtLhy~lM$0-&Xd z6f0|_7smitLM)l7YHi4MdlyUkRwKnvpV@PKyGSIYv47ugEq$EDPYJ$%9jLs}^7j(5 z9Uw8%4K#J3X%(>AD?rKKhM z-*N%8S{B;I<~r9`H$bvsQZI1qWaKyir~go>F={u7kNb@pknDsd1gSJgW}ljuom5d) z(G05u9y07S8vqPDec=8+3&#{?l>@00cvHH)3!Wc7RX_O)(nH>h(0Gan00000NkvXX Hu0mjfy{-bY diff --git a/Common/src/main/resources/assets/byg/textures/block/fir/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/fir/trapdoor.png index e49186f5d959af5177d2bc6e11e4330ec9b2f505..a63d4f37f8784e6d311c028992f2ccf138047121 100644 GIT binary patch delta 227 zcmaFD{F!lrL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY0*sXu3aX>fP4XQi)I ziic^qgPyCgnw*bw9!Nt;kY6x^!?PP{Ku(RPi(^Q|E!DHuVoe4D4i~Ry$d@@V>L|#F zDa^mJLb%#sve=QsIrk6kZtPy!u|ldkcGso|tC(vSewSIeJ(}sVN%h^j8G7d7pTFcj zd&{hURvY7 delta 470 zcmV;{0V)3T0ptUa7=H)`0000V^Z#K00004VQb$4nuFf3k0004=Nkl_X{6fchG(8Y^eOCyZ+s;McenTG#R_c-=Cc%~*NtiO*^kELOs~<46;cFv zlPI*Ncto4xpEexFK}mrWL1`fhyU%3LXDPACIlZ{?CQ)b)sFK$_)-M8RNX&+$u2j0>J{1BoYa5NLh0L01m?d01m?e$8V@)ks&320002@@6!L>PyWU^@tq~u zZ6I)xEo^`>WO6f5X)M7iGHOyMNnR&HRV`aY985SDL@*CaWj!(g0004WQchC9S z)@3ycg_~w)Dv^1}m+Mw%51_fjE{o|kDPT11%T;#S0IUgRWRIK2z`D%i$!f_<*_gRX zPgXvYuc-2jQb+cRmJZ$Lw3`FW!#VpLz~g?)_Gh#A@9wY9`@aD~lmzsHo9h+;0000< KMNUMnLSTXgi*iQ* delta 268 zcmX@ebem~{%0x@0kpFl6zrVlq@0evkrq0K?syPjYo^k3oauo_D=^oTFN+~jS3e|Nn z;Pe`t}6BQ-ur+B(JhG+zb`Z@M78*(h3 z!EkuOwEz3d=3e|3AjFy6Ry<-IifNpJr{KaUtMb31!z*3$s#mfj7AwK_!KX}8X8 z=zQpuYPt47_zUmD-Zn2y`PMIvNckK2rjcjWP9+Pc;BM=1#%&W+SA{hD+?%)Om8H(@ zi5VB33W$6ODHV_9d#LrjP diff --git a/Common/src/main/resources/assets/byg/textures/block/firecracker_leaves.png b/Common/src/main/resources/assets/byg/textures/block/firecracker_leaves.png index d5c5633e5cb2b4719627977437e1a5c05b70c29b..d102767a7d43d48fd85e0893c560b447260dc3cd 100644 GIT binary patch delta 225 zcmV<703QFk0-gepBoYa5NLh0L01m?d01m?e$8V@)ks&320002@@6!L>PyWU^@tq}- zk}cS6Ab@%?WN9qHDl$h*CIL1wh5!Hn0d!JMQvg8b*k%9#0C`D7K~#7F1;K#go0Lo)cOSKeD#J;WbpPM=|Nj2czhjmk=c?YwRXC_+#K6EX_teA= zAjMr0Wq!=k2K8J+}F*7puNCEIa1A{Fb_7PrLP-dA;jP6Z3SwW*vxBX4$df zW4--vBe^AtLS6sPE3u2c-X`JVz{WRY$%8M4+%M@fOnu>c;8)m&$OmseGnzeB6wrRY i@7s3CvrG%7ua*C@k$ID7uxAp`y$qhNelF{r5}E++B5DW# diff --git a/Common/src/main/resources/assets/byg/textures/block/firecracker_leaves2.png b/Common/src/main/resources/assets/byg/textures/block/firecracker_leaves2.png index 7356fc17435b1adbd4e5635d3a15c0d2405b5245..1cc3a8366ee164cfa25028454d41e14cc251bda8 100644 GIT binary patch delta 223 zcmV<503iRg0-OSnBoYa5NLh0L01m?d01m?e$8V@)ks&320002@@6!L>PyWU^@tq}- zk}cS6Ab@%?WN9o%OeQ)^CS3n~WdHyG0d!JMQvg8b*k%9#0C!15K~#7F1;K#9ZIHCY7ibcPEqR{< zCh4Z(>$$N)nz$)`HKwKwE!9X;NN6c+R`OOUOs9CBQ#WYS4)3`?H*A`2aQ#|P6Bw|y Z{sGq+1#us2yZHbB002ovPDHLkV1i-@T801s delta 229 zcmbQkw1sJc%0x>go0Lo)cOSKeD#J;WbU)5j{eRd0-!aSY?=M;TsNKj_U|?W)8FzgZ zkm4>0@(cbC2Mk{RjGrbdO4PS{x;Tbt1k3g_@-Zv$Fil)_`^W$0@(iCV*$XvNJ?G8K zcAa)Om+OtEj)t~m^?cvoJE~ik{ocuXSk~0d*V52?{?RppH{A}CSAW@dVZo9 cL)^B1uXi&~G8dTs2Ix`-Pgg&ebxsLQ0Dk3W#{d8T diff --git a/Common/src/main/resources/assets/byg/textures/block/florus_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/florus_bookshelf.png index 03aa5468826990a09343b04ecbf7b9ffd622b242..b4faac84ec908e7b14a95aaff40e7b800e0350d0 100644 GIT binary patch delta 346 zcmV-g0j2)c1?mEj8Gi!+001a04^sdD00DDSM?wIu&K&6g003Z6OjJd+wY8|53WYu=Rg3|X+OAFFa*h;@4qzR?PKkHu7P&G;Em{P$y z7k*sI8%q3^gH!E+%5130H5N&aIz_c9T}C|u5YKmNJ*Vrd&v5WYgSAd6)1W4Xwu1X+ s=@_fWUS}&&R7E~^X(cwuwk2iz2YT*OO}CDq=Kufz07*qoM6N<$f+zunoB#j- delta 712 zcmV;(0yq8Y0@VeO8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00NImL_t(IjdhYgOcP-k z#(ynWN-0-UQlOSbQV{`3fB*xgF%l9N5*LVzkr*^_a|RtW4h*br#({;z!8n;XXkv6Q zxU>NU`Ilna+CTKlVS0D%9Ve|r(-Up{rZ3O;Jn#3u@AKFeXMZOvs;<-0)I^)7nSYN| zDE=3Z#!?6XuOmCwL#xXTfLzk*utLeec6lB{$z$JmM!2U7LDh9yU2go|Dk;2~1>nP0ST2ncvwPC5}Nlnh?5POsmG(B^68 zkyPEotAL0yzDQo$VpM!iBm*_gseA6_DI7gy0I^%qZrG}=nD%(Cr0Y5 z0=Tz(NPqT7WAvf%F+> z(h3X<0Ic**v0-lDo&1IHJtuSil=qg;a`nDyb`UTX1{@AdDgfNtd4riqaX%+lmssZCha(Ycr!|-LQXruj6tP1m%M~*B(Sw#3si0onfA1-1f^8Gi!+001a04^sdD00DDSM?wIu&K&6g002TzOjJex|Nq$7*tNB_ zhlhunYfNlxY=vDyc~v@RM>2CcAX7RgBT*VfFd<7T7#2kuJ1HDNBMvwr7APJI8x{>2 z6bum#2$Dr`3;+NCqDe$SRCwA2!BK95KoCU1H!}?ZIYIfz{eQ2RNER5p%XX^b=jp-M zDf;q++>-8^UkfZpWhP05?{P@4AQ*@lJ1bEpbi}C+tekB7qa$*Bo(@r+2Lq8#V{rY! zjQB7WN|x~s3bC`@Tr1ZA+A8Y(i%PW6MUpsh1sI!wn3hhIm`3VY5v>ifnUlJ`e~WM? s7KuG2BElmACLituWaTaQaugN#AD1^yhw)&;Y5)KL07*qoM6N<$g5+y)9RL6T delta 717 zcmV;;0y6!!0@?+T8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00NXrL_t(Ija8H1OH*MS zho2p!UdGwM&U8O?35M;Agp?%}4GYDK5G1_t+OV5$_74QnMHk&vPzc?5(M?nrR?rVp zQUV1q({k#r;oqv3Iv+F#v5Y#J907gE{ z67e}%HFE%j6v0%|VyO2bm6b9rhCj|y1E7TaNF)+ucNbVsq-hHVm|EY#?UVqRN?LSv zv=Gw`WFY{E>w5qtKyhUZKY$Pf8{No4pellixlI7tf&mOOhpGs&xg4?(GEAyK_8E9yL2Kxr zRmslaNph98)Jg6XGbz~IUrLyCnHfBMKB>tD;O3<8apW*K_d=0Ar>Ye5-1)E8x{>2 z6bum#2rKQsJ^%m!o=HSORCoae!3k=^P!L4H*F7Uy216j^{(rZOm*{IcRrRwhe{t-7 zoOXYkmD*ni9M7_iDdn2yw!MTHnw`XD+LIcZcQ4@18*2&UdGw>ZD@lgNsZ<~(1kEj< zzxPob10$MWuKiheKEq8XO=XsCXGo_ oG*U)_jmto%eH(RFM@5PJ0|pOG*vz9GX8-^I07*qoM6N<$g4pVCA^-pY delta 695 zcmV;o0!aO`0>lN78Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MqVL_t(Ija8G;OH)xC z$3MG>9>(2eOgA@MlCjoEXfhNKf`!>~H9$hv+FH=uMxco+_e;9?HOoVcCP3 z7{w6hoQZRDm)+{_dbo2nd$`-xelG{kfiLI#{eFI)NS}ImYk&Mast^Ps0_)tVqU3V-%|f zst^EdSAPLG0Hs5!2M?g0vgCRdp-!2f3#aQ3iARdcRlPv&>RRb+GNx4)aLJq*q zqN@`~KogXkf4O+4TX1RJKkWmw$;_gDq zl%T?=lR1}zj@7A90Ns=X<6iDP&pHAfJatpLj0ZH~W}utWt+N(QQ*Q5#`vb$YUDgLf zemAhr%v#P)T#;d@I{6sww=PBTxUBpBKzLapA24k(w(sLdU7{!+&K3KRjVA9B703UM dv!#mS;UA|ED@Zd{6dC{k002ovPDHLkV1i#sJh=b> diff --git a/Common/src/main/resources/assets/byg/textures/block/florus_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/florus_crafting_table_top.png index 754466ee38b93b263cc1c3615ecb9181cbf844c6..142016e304f16f66d498fc5485f4884592fe362e 100644 GIT binary patch delta 216 zcmcb@{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z85?HnXyQ=0zG6TPlQF zsCa8jI4bi=iSkN{@bGc7#jq^r1gfm?ba4!+xRv~3&cvLYoUq7)27x|}jg6XtlM<7d zn1NuninFwLhj+#bXEtY{?j~mK=4Pp8Ms8<;?xsLy<7US0)!rT2GY&pDaH!!>0&i)n z$3`ud6-_RaB1D)XL}ji>oQjBvjfs)Dlo;k=B;uqanw~MAugL8=55pfRi33OX^fCb* O!QkoY=d#Wzp$Pysghhh@ delta 454 zcmV;%0XhEY0n`JK7=H)`0000V^Z#K00004VQb$4nuFf3k0004wNklP4DTOHJ z_tp7n7l6rh&Y)vcE}NMGzAw4DdBE$r0GwUUFm!M-oipk>KVAkXmrX`phsksvpNXTY zrJ5xp3fw*;gAlV|#R)P9QzB-;!fVwT&z9W1d}1_927`_rC-j{LUaJm(*Qzsgqu9{3 zV-7Ir*fdK9Mt{3jN!iw11|hyL<5x9L=Cx}T_O|OxmT~>KK?YAdJc%6vZGUq6{3B1o z;Gal2kU_}B`~isSPV%e{Wjg3P4Ti3b3_^ykP2XuCgD};Rl)z%OPW|>abXT^!;QNxr zYK>?d7SwT3#DkF!4UE^5J6>dJvqt_F%?u2R;TGDR9Hfu49tQe&MD&4vlx^U zU5s6-x8yK%0cAS2pIODgX5!*(w#6ljLFZIQ$Lg-0Rlm-eE0;&a&7=H)`0000V^Z#K00004VQb$4nuFf3k0007HNklYuW z6o#KEUz1^megQ2hMTw@>w#LRZjcB@3SB-JuAJDB^SMK_MTq-MFn5ZEdyD%Z9G!+_B z+F?Mznagy5mT@sM5v_M~KTb~W^S(xY+^}5Dl zVwzK@Pr2Skx_dqC0w|FXnG z-0XnY!6VizmF?vv0s)DQt7%p2gg_f zwwITv7@mxZ(SM?0+GLVbaDoxes0MN9$#I-2;x$ymnYf&=E zDFCWQ2mM@7)CAI_`%A9f9ANhbzA>Y9k%`Tkmri^^p?@F=g17HIW%lUfSX>pOMay)! zb!CA>Oc|@?@%$)if}Euitkr4^O&j4jWRo*gj25aaqslS>jX!D)(`GZ32B4ttVK)Z^ zOCR#2Ze&qqncah90Ka*p*L$=5^IJtH=c)vi-zJ)NAGF!4UE^5J6>dJvqt_F%?u2R;TGDR9Hf49Y$t zF2-}*vKSUyC7S|OWiYHc)zQ^aS+jzH%~4Rw-Lue(LD@vaqkOiw4Z|_x67#L>+jSV0 zxus7JQ7+YD=&D+|tD}MG1Oub^bT>iq%|HVyrW+f2mqxsmF-YIId#OIqoeZ9?elF{r G5}E+#s#Ep= delta 689 zcmV;i0#5yu0=)&07=H)`0000V^Z#K00004VQb$4nuFf3k0007aNklE~yEQRW=;7NM&Ab4pH;!XSqJb3G$AztmJAUR3JO9>Qh zJ;Y)om=dxCHgVH#Hp}LRT@T5wROd4DX5PG+_xZjjJ-9RPF@GIuG=iFmP?2mB8kBk( zPG>|?ReTpLXNWTx1-7)kz3t65_k)ePVN%GY0Vto;D5f%j?Vp>L3qZADAnUr$h2>zo zZs63m8~|45<~e9J0Vw3s)D06&2s9yR7-y)_2y*N219CP6KsKq;FwW3~2!d238@dFq znwCpUD8z(9Qh!yD9^YT`{Jhj?B>07&_gM9)CTsw1)}s?vnMlA!UfI~fI($zdm*(xq zuWYU_|HqhRIR0}qxo<=d1!3?`}dVNB=uA>P--7qhK^5?eYpb0@WVUzzJnp~cy zV>v^@GsE`l8&^{(vW))A!X1vu&S)sI%=t7mXE5SR|9_mNM4a#_6g>3XyFhxlT=0Bd z)oA2D&HrUl>S=UzC-9ZmpFHRE(+=sRxTH70&i*$Rug`Ma?NCf*sE#KvH`kY`8z!HB zv?dG|a#t>Ks2e7A!z8IH9Cteayc?g=v*FRwBIT1Bnh-dH5uu~KT^hz20Gbe#Pinz> zta?-=n}0$)&9l`Pta%!*YKH){W{LpFzV^23Vp=Zwur`q_VN*imsk%T+38Cvct8??v zYEp=&8Bdu7h2$3pz|X>fo(*@~(MwQQHnsrJb)BQVUGk~;q>%h(DpLzc7gHI`kjuSW z*Mb1$y*E@Oo0s|9j23cqdi}r6bkJ%dI}#)a7%KQZkxi=94U>vwv*u~EEr*y;px5UQ Xw7oOQB(m{800000NkvXXu0mjfi%Uaq diff --git a/Common/src/main/resources/assets/byg/textures/block/florus_planks.png b/Common/src/main/resources/assets/byg/textures/block/florus_planks.png index 05a546c09f97f9c7399806f53eed742347349768..f9a807f9bdcbcdab0b550b834bb48e5cf6f91e6f 100644 GIT binary patch delta 248 zcmV0=DCQ~{mBT*VfFd-I28apW*rsF0H0001zNkl~TA#gvhbm4px(9SZy79 zn43O+s+qRQ-(^bN{}Cby@!m2r62Ze4+FJ0000{-08n@F?OKb&CR{{0(P(ki@bKC#y2aNVHx&ju7sO?mfn?C8T(<<<7iXdJxBE3a z4ra$;R7ug@{*EpL4)kdwn;nO}WPCB*XJgh-S*665?f@Rswnkpk0uIX6dT33LiSp@YU#X4| zsr03YPB8xE`+E;4$O$i(|0AHa6tWkUxD`+Im4 z=%6NI7=LOU%WVc6{C~>~t3ZSiR)wgP|~ExmssDmkwi=ijzpw zW0{p^yG>k{alICu>n>U}jwHdg*XE>d6O$#@|CSlQmqtvyB9h24(z)WYaUFWxMKk=&ahe=DYz2xq}|K-XaQR1ZtPI~zT1%&9K_ Y0B6-cd`7^GiU0rr07*qoM6N<$f_twVjmF>Qu`2q%*p%n}(k`WZK$GeE8ZrvS!*|spiX+nT400000NkvXXu0mjf D(OOKO delta 429 zcmV;e0aE_i0lNc`7=H)`0000V^Z#K00004VQb$4nuFf3k0004XNklRODx|F7Q0!T(LIBDNk{EX1dmf&zNmYO@T5{b?Vh$%e6n}dFHtRX(_VxLD;S+Pl zm)EyD0G4S)Uw3TQb9`kO>7uoHece%3BYB4On{U4#K4JMa@_z1dAn^aO#zd0SsA~y1>gvsBsP@5s4ITyRoIB%0*D5Z zDAarvPO6X3Nq=nK9Gl(%q$;q%&3cX#xx73N<2*L~p!$jBgn`&i>H*-+JPRg1fcwXI z(v}6#MQeN0MN40IlW|JbR0X&*k0dr{Cvt}=ELI`QG_oTUlU_xezV0S_bFoNZ);ibC zgoV%^kJM@ ztt>N?{9V+7t<;qRrCbdZ#ayL?t;7V4gsmU_ZvbkU?djqeQgMrM0z>|Ph7-#=Rvb0$ z>R~v*m7>VjB&fr1up_gpJS$U%;m|S$Ar&<>ZH6N=YExWX(zLu8HdSR#uUwMW&2VH& zmy63XPoP|pr+Z16mJh>`L{GOVQ#5-R4o>rQNh$I4VK~s{IV-(H-J4;@B9~<@E}Gp8 z+lo}01Q<0}GbB}3W_2u^sm*Xm$wf^;ElHc<=xU2otrj`aLeeIe8Q$8T0lJgH)78&q Iol`;+0FCQdCIA2c delta 693 zcmV;m0!saq0>K547=H)`0000V^Z#K00004VQb$4nuFf3k0007eNklVP-NqYGM}?C)l3V;hgh5=X>At9$)lPY&3IM#DBD)IFiv63jossMTWCe zho#j!Bx6CEoj!k>y@@>m;7#TU0I#)g6iu02G>(!INkk+<8Ig|_jY`v?q%4w9B>-B6 z%_e&;pf_-MtN%ce0TXtr4NkHSW&_qP6$E_bk$G<&P^`$n~G zLsKYWk%$z;wA{s=Y6F0X6a>Jq`|KthO4Aw2b)6zIABHsm{MWrJ%&voB_bE+h&=iZ^ zgu}{wiUl>sf*NCGJ_W%3d7E4`j@=$mQWjmnxUGm3M1Kj3YzP^aTOt65dWS>31Gr`a zC}EM^goD|2xb9uu0*2CvL`0g?bs}8um%;bq`NF7>R{4HZ z$FTcEq#%afM~Vm7_E~PcZwiVdH^u<#4>P1uSX=yXgG@2B}f`-yiiZ+TYOd6sKQ%neprX+X+T!1&=l8sAmgN02OtU4=1+y;S4`|Hgmr7^Zv|vKQT8wCOIE^B7aUR+o$Lm!~&s~=>-E? z**+6{34;D9mq+aT*cmG~#{n>sNtRPOZ{0157~Cto1Yq{pHZ6aL<++C(_X7Nr696{s z14N~qmk(~G*{~1(tD+YS_%ht*@$psmAB8hKA7TJ&fA*mO&6+C!D(SqmO`oO}*12j% zHX3`;-1A{2Hh<1W`vA>0eHKQS7}?RtRWlNxZaE=PIWGZ{ZgdL&OBRP(y!h)OvxJwM$4_^mC5Q#yJgPE1e7c_jBa3It8d6}RUz(W}%gC#r4J zr&GJwU*B~|=|iD~H_leXUXli$AIi^FGqTfgudsI-u74;=gT<+QXkq53$?K5EPvzfyw~o$yzcAn+q|&qzwW&2?!3Ib!0sV*03K=p7*qf#2C!EE z0004WQchCOxqphhAIKn9!_ zhav6&YYBYYCpg3ic>e%{u>hYC4)y^k0_+7O{Q<;p4pY)snhl=-0000% zl?3?(|AzsFO=on@PgIns&+>F}4ABT)+T+Q`Y{B9|{3RcBc@Tz7q{b*${O?`0LyVxno z3YE=QclEKr}&t;ucLK6UO+g^wO diff --git a/Common/src/main/resources/assets/byg/textures/block/flowering_jacaranda_bush_side.png b/Common/src/main/resources/assets/byg/textures/block/flowering_jacaranda_bush_side.png index cabd0a3d5ba52c7ef2323d087c4136294608330a..33c7a7fa90eab7386f2cc39850cd905609acb35a 100644 GIT binary patch delta 179 zcmV;k08Iat0{a1wB$0s?kt7{|8&FJCMF0Q*(0k*$V$PmWh-^ZqUPF>yGM-g8bU7qS zJA%E?00001bW%=J06^y0W&i*HTuDShRCock!GQt5KnMacRN#L9i91CT(Z&rXI~S|j zIm*CvL1DUa7H+Rra(gv(Fh+3*F{YRZXK;4T4MD^kGi=f+dL=yHUS8KGNO79y`pFn6 huBAAVj3mX;&ps?T0`;4dz48D6002ovPDHLkV1n60MqU5_ delta 202 zcmey(IF)IF%0x?9Te$$A5Z6%il31g8an6%+oR;rOI(MP^@w|WzOBF8$FgQH>i!zYG zRTAVE{2vAwHl5KqKT%PlKFia^F+?MHX^$r#vmpmdHDmOj|A#Y$&L*BaxG6(?2Sd=Z zgcZL|JSY?3HQ{d9cG}CXbcX9+tG)N<^tQ}78zY!dn&-0mob_RiM>?Ip4~%|TDaD4# v2y>SD-v8;v{36mu*r?)DFys4Q@@Hxo&RVkkbN;f@8{{faS3j3^P6QBqin-c*b=1; zl%Wb~@41ZB)RB0;!$?RrruRGm(6J4YmN=kE9Jb`12PWyJVduNGnz$)GzWZWo+R##s zB!z^Q!e-^&rxd1Byx*-Gv}uR$zPe%4bOT)rY61hc)*mS|1S6|Q@X7!H002ovPDHLk FV1inLSF`{C delta 230 zcmbQtw1H`Y%0x?9Te$$A5Z6HC0tN;KD^>4so9+~=`H#!j|C@H&T-AGZY$8xxMWI0m zNO6?}`33)n0ftRybk0vyl&Ej@ba4#P2v+T9_a bE&atHrOy1!#?L(k=uievS3j3^P6VN+=?mMi745LC)tT6#)25df*Hku7{q}X!GIRPfET}i6})~F zyM7b9eG|HU61aR3w|oz`dl0pJ4z_y^vU?7+dJVLC46%9*uXzovc@3?24XJkxsdf#g zb`7R>4X1T~4Wx7oqjU|SbPb|&4W4rhopTMGat@ht4VrNcnQ;x6a1EDm4V7>WmTwJ| zZVi%d4UugPk8KQ&Yz>ZV42)_FiE0dpY7K~L42NnBhiMIlX$^&G4TNY7gJ=zcXAOa7 z41Q(}eq{`OWet2~4SQq^d1DNCVhnU+4Rc}*a$*gCb72f|VGUYBCs{!#SU@LOKqgf{ zCRRTsQ9UG3JS9&$B}z9UNS%Gp20X`wFK=ETu63feY+cJ44=JFON^4#oHpH;{^x0rWh74ME3!5Ia-|6kTu zCi5I^l04WTHnWKLK!f=98vg$eeg1#H@#&($_G*D`)qG9qylX3X`*V4w7w|S`@K&er zJUynnzLIx;y=ZX~Z=|C}Uk>lQVxC)_8b=!?+Ov4~)QL>VK=UzL}(8oAw?#Y?cj=qVB z^E~MAtaSGdhQ8BERV#ZcyhY`wDYgf04HpQzo+bABEAI`H?mFj$)i-bDm2-)`VTnvJ zPs#t^;QYDc@#J%wmo7b6(;fTee6{%WFHcs*r#_gr)?vTgv>lROf2Ub%g{9oFH))*J zBj>p?`45ZoRAZsfJ+fM}{&>H2og?x2s=USrj?YJgR1=jO+%{W(Jm%7;@+I`4Zr$}= qZ~Oh#1K;od@b&NFuuFf`{xAxwTB~f^x@s=a&kUZfelF{r5}E+!(P0Px diff --git a/Common/src/main/resources/assets/byg/textures/block/flowering_orchard_leaves.png b/Common/src/main/resources/assets/byg/textures/block/flowering_orchard_leaves.png index 2576a93607d6a2aafd9ebac261c3e48eca0dc8c6..a00a994670ca2fcfc75197d7c90cca13af5236f7 100644 GIT binary patch delta 192 zcmV;x06+ib0pS6VDSrR}0QCI)?fm=8<>SNK+4)P26LqjvgH&f6>Cx*ljApl}J4TR)FOcsv?wK^s1OUH*UmfC5PxA XkRl9PgOIt200000NkvXXu0mjfxRyv= delta 213 zcmX@b_>FObW_@L9Fara_v0dv{%;@YWP08Nzh6%`LDhcun{?G7qyMY&wH^tM%F{I*F za)N-6SxKT;NTPvAN`Y9Jm{F2|h=^IBiAYeAKv_yin1Dz~ih-e^iI9kZNQyz3NKt}7 zib+a=U_h8yp-EX%K|)B7NQqccT7X!Bk(i;ONn(JAUrK_ZiCIXRfLV%3nUI)BQb3}B zh>;NE%zO@`vz{FXJvSb5wx+fL;wH)j7da6RCoae!3jzOK@b4I>bX1un*aYXh@eEacebsH z`>}Aa;8^i`zB?N_b{{f>!l~$Et(>GOO$^6A;l!!0;gb@S_S;{cBVWs<@t7Z_a@eIB z-)Fn{(OmFsMh9)ul&`7EHhW(!2)DGNhPc%RK#$?CU>zXd#ymDbK(yKN3Q89d;mWwn dnI_WA=^tn|K1(eM-UR>v002ovPDHLkV1gmwb<$6(=4MF#-Ih#Qr!LrYKSqWH0hN~gfTJK%FN5kt)xJqigXC${i&^N5V{I2j%B?C>aurf z<5-5YykSS(xk@?GI;7+;g#T}`!<`B{`7CtUam}l(9`F2xCo_UKnh2OVo)q9f^aC0B V2JzJc+BX0I002ovPDHLkV1f*^ch3L- diff --git a/Common/src/main/resources/assets/byg/textures/block/foxglove_bottom.png b/Common/src/main/resources/assets/byg/textures/block/foxglove_bottom.png index 6e7698ac850af06dfe8f63e15e7ecd5a57e08506..0c4eee362872e97cd43e249cafdbacfdfe5f2eb4 100644 GIT binary patch delta 216 zcmV;}04M*i0+j-gBoYa5NLh0L01m?d01m?e$8V@)ks&3200030>3{ylIl;33@tq}{ ziREjhLfCB}dS=X1j4WVFyewxXBTgLy#1lyX0004WQchCEi65nXfoVb!psr>~2-2)5* Skb;{40000gmjv%URcU8*($#L{DjeMOU)fJKxJT#XT-7<9PyfHH|98wXd#Mux z1A{Yv^9mrvTN30K{2vK0*uGF|o2V#JU*YNE7@`pz+t1B+RDpwqu|DMczvs2PxA@L# zcPu=VU}A9Q4%5X|VY^D@H|q*AzR#14xW21#>C!28%NV(qnrM~yIDMbICvH}fN5D)| z$DezeHXqzt#;7&p;G?$-N(>@acsCTTa{kD0#Gc`Q&~xr%9KJtGdVc?7+{$b(!NIZr V3oBpAE1>fjJYD@<);T3K0RX)FW>)|J diff --git a/Common/src/main/resources/assets/byg/textures/block/foxglove_top.png b/Common/src/main/resources/assets/byg/textures/block/foxglove_top.png index dc80ea9f564c766ff07305127c5d234603306891..69fea3d31b8360f6dc0412f0e14abe00bbb3fc6c 100644 GIT binary patch delta 210 zcmV;@04@Kp0+j-g7zqRe0002(-QrS_ju??7B7Xn?0RQ~|=FsZXx!M1jp1!2aYo$W% zTw&WrO;e04U`xC#XC|c>A0tj38_)zx00001bW%=J06^y0W&i*HXGugsRCwBBU_b^J zp!D6n5Sn*yHbjU!doM(Y^W^PpFr%kuXC#Q`@bI{53SzJyKfYNQBGa>pDF7_vac!$< z06R$L_=d@%rVKnhJv`Hxf`vhH3>#QYnLxT2ZZdRM185Ji(`mJaBQC=-vI>< z7RL*>ZvFjVzFVVeg<6IhPxpgzz8mvvTuc6kg=%_+U0pQGmV3r*0l9#^yP`JpzB;PC zb~|t0^Q-^9uqXydN?cU(UJx`TNO=a6XheMn3m;d3c8G;~@D6DKOXXmTGX}*>0Tny< d8nXXjU~1xI2oBul$-oVCou{jx%Q~loCIEv3W5@si diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius.png index 91c6896520b9679d84d1d7bac84cc33cb94a6ade..3794bc2c20ccbc323fa14e6e4382d9600fa30d6c 100644 GIT binary patch delta 181 zcmeBWddoOLMToP&BeIx*f$uN~Gak=hkup(HpN)$&V;WCA`}xQ3;>*6D*uxHyO+ g|HYaTQWpy$GJwB78Sk|UxTi~WjHfwJif zK2!rK?vfzC;Qw&I;N{QwX`-S;ah#`%V~9rZ)Luuv0}320+EI;v|2OYu+UA?Ds+h*k z&R6q_J;T@KN8W}c`NxcxtUvz@VpE&JJY}7sg2vsN=1a!yLc3DeEq%3upEY5gc7A|* n1b4wJt3*c59_y)Za~?3Yf8&_wxYaTc=mG{$S3j3^P6>s%mzF}2T0fe*ns>2zEt*KrAmGA#YR3{s!-%6N>GbLKZ_yKPFsl!x%-%w zvDB=J|EO|_I1Bp2nVxK>DJ#bWAR#{YzWMZT#Ph;9vCoc48*90ne&F#E50Tpg`f30G N002ovPDHLkV1fp7Mq&T} delta 160 zcmV;R0AK&?0q_BkB#}8H79)?FBZ7@1b$%qAsv~G{BU@q^32ma0AsBpTNklQVt zSWHrPj6!lOeF?J9eV?r0c4hufVjMZ&Gk3HR;okKJk76e#hFa(>00000NkvXXu0mjf D4vkjZ delta 185 zcmV;q07n0Y0*C^TB#}8HA0v;OBZ7@1b$%qAsyF}tKi%CUXmBUDwWu$ArG@<1_XPw)pP;}oKJKj4K700000NkvXXu0mjf1R+gI diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_block3.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_block3.png index 5616784574914629859a17d4871a0709eac3e56e..07a31468fee8c84e621179862d9acbcf94ad7e73 100644 GIT binary patch delta 207 zcmV;=05JcK0*nHXBoYa5NLh0L01m?d01m?e$8V@)ks&32H~;@X-Q6d*wXQqG%n&lBne~vV~(2*}@Hzdxo1JGvB^5QKUC+Rj6dSjOD~H!>?o8 z5z&ng+tAlCLDFQHUw4uc#OHY)tYG_P?gz0%Zn0&@w78qi`UAM1C(AZ64Cw#>002ov JPDHLkV1i>vTeJWG delta 191 zcmV;w06_nY0*(TZB#}8HA0v;OBZ7@1XmBHSek7c#H~;@X-Q6d*wR2b70jxi2GArM3dB-U(5JiyZYQrOsIGKCk=+QP)vf&={gien4ao8rx60MP;j zqT%)in2mjUgMH+dVazxvb}m6IHvLKenZYhc$bPY_W&n|=O4+L t!N(Xo1LzOcZ6{LJn(KVvl9@=vAIEDF6{7x)0DS-e002ovPDHLkV1kd>RgnMy diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_filament.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_filament.png index f6920c747b1d578e5b73fbbcde724bc96328e9ad..bac49eaea7cc4d1156f50259b2cc6fa1c48106e6 100644 GIT binary patch delta 130 zcmV-|0Db@D0m}i9B$06ykt7{;4^T{0MF0Q*tK;gA;_P$b?pNXPS?wX~00001bW%=J z06^y0W&i*HI7vi7RCoc+!NCo~01yKp?DPIJNBLA8A%NMb&JA|XGUec?s#u3wMMTxB kmRd@@qN3s_h(GZ;4`mquajD7B4*&oF07*qoM6N<$g8rN~jQ{`u delta 153 zcmX@j_=ItS%0x?9U7-M<5LX5UhVX|UiXXn~fAnVc<5xiLk3COj0V%eUAiv=MAi%JB z|C0R^6(!<4JzX3_G=h(wVdOesz~LO2eD?49J@Ps^<`GAd<}Xb>oh2{7Gc`Ofx7UEJ zq1n__Y<-vK&LxNb2+qnim~hpMvt`>!ZgcMWf0({8yQ;EGd@_%>6KD^Er>mdKI;Vst E05lIk(*OVf diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_filament_block.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_filament_block.png index 4f9e1a49966abdf725c364df25d8be3cf381cad6..4e74746f159296b3601e87b9eb48675ff5ca4c3d 100644 GIT binary patch delta 183 zcmV;o07(Ce0)zsPB#~kjkt8C2z3TR>O62SCAe1ZS~002ovPDHLkV1jSKRE7Wm delta 187 zcmV;s07UqXOPgnqNwZHY02IWi73@L*SnL1*002ovPDHLkV1f!aSwa8+ diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_stem.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_stem.png index 5a594521f7d1ca159742dde3bdda7388d6346e6f..9af84106c3ab4c39bae5d903b1dcfa319ae64425 100644 GIT binary patch delta 178 zcmV;j08Rga0{;P!B#~bgkt8C2T7h#;a%DneST|KmD@HybI5Fr($;SWy0Cq`4K~#9! z1;Mcm0znJ}!1d}wB-@9`4=SL97oC$M0t(>20_=nQ%#8Hq`Zyh4HyVKONXiBzHR+I1 z&>&`14NHO(K*Qqm`70DCI?ja(!mQf{W5_Vry_hDV(}Lm(i|&h6!vVq)dO-O8R|(zd6$4|%w6rto3H$Mk9>grsh8VK$gNSs` z!F3&pC*ne(89b*2nPiEt05N*2y*A#?i#{~)>mi%35}r76bs?dhYob?zmA=a44$slc gYzf*5v9t0A2pbjizQYdvO8@`>07*qoM6N<$g4f?mUjP6A diff --git a/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/fungal_imparius_stem_top.png index 85261194bfab30b37f86623a097485f058d6ec30..38e415cce12d9383d8aada145d63eae5682070ef 100644 GIT binary patch delta 230 zcmVkt8C2g}=jhv9)QVs9cqsPKS+Jfpb84fKGB{LStArRZ9p{ zT`NXD3P)KWI57u0O9L-I1SB!3)B^+n004$xgfm?DCRZzP;H zAZG2f1c}mSJq7?FP-biZT8hXVYb)shRF6(m2mwIn$9h0%+Xi4xI28bZtgqVLn7P63 g`M6d0*4!ZR2A-Z*OUO!i=l}o!07*qoM6N<$f@!p2p#T5? delta 244 zcmVc83B#}8HH%@Y8T7h#yV^}LjJ|H+TH&sgqI!gp3F$hy#3P)K3FF!ze zfKG>vT$P)Jzr%O2wP~ZMC^onSks%m=nMp)JR47w5PYVvkAPDOOMHHs@KkcjAUK2Gz z`U9>aD&?vwK-B^?Yu$(U-iD2Kp^iBtGLnd}0`+;{i`YCd1ZuJNhn23VE!QT8`+J28 zE|0zE`R98y(9g!s+(`;u#NR>iBBesdGa!8mG*32MD+(@6bdI^J|N`)00003g1c=YB|_~@Rzxh!*W7&7Qu+ETv{U;X$8hOY4xqj>sNEK=1u ziwSIwo1!$4Y3P9x5h}Gm`jQOnk*1FS$R!UESESvc5PuHl+w)-(!K=)8w&%6~QYN|I zlD@EGU}w=2@FiX)nop=Ae$dHV@XOX%(5}hx?Q+(#(YIMzHjj}qIj!iGE?7XBCW%cL zi?Y&IIWa=LPA8z(9*J{%M0000qM~kA$F`xPQR6m$tZ>vA5CG<;~IL z(AVYP;?}^%yUo<(yvfI;xw@siyU5YU%hAZo$GE4ty35nm#Lvsj*2})ZxXIJie3FfO zjf{q&o2|5*qq?}Jy12f(oPn5*)!Nm@(96%!ld!kN%zxCcz`N7h)xXEegP4x6wVim4i;NC-V*mgE^hrcPRCwA2!Gi(BKo9`H zz1Y$vZ`-zQtN%iN1^^KxNzn|;@q#GH3aBd5bfg%DYFd)5AaERvUC-wa1ocqZRtbni zWAQ{XmCi)7xqP7zfg&!I%9Sd~m1-1bFbQ>~(QLIl?SF8$p#=4M7UY-T8K=6DPqQTAGIxe?r+E<0|=qB^b7!;7m^-+Ho(Pr^m_H* u5MG2g{v|;VV);+{`}zD9!^L7YyT<<3wk9*GqL2;%00002S97t?>&Ha zWCLjPBPl>S?oxp6cy0<{V<~`hO9}v)rT}QQ1;A$aJOJnYeIfh4dk(OV0d!JM zQvg8b*k%9#09{E$K~#9!P0hst127Cj(Jv{u|G?!YekZf}lH+i+K8(%PX0WyTsU*nS ztDRh6>Gr+B_pBqBx`n9G=gpBo4)rMxg+*$GgrpWEG+RG6)*>DnW46XmUojFzEGGa@ Xu4n;Jsn%KZ00000NkvXXu0mjftY%4+ diff --git a/Common/src/main/resources/assets/byg/textures/block/glowcelium_side.png b/Common/src/main/resources/assets/byg/textures/block/glowcelium_side.png index 9612240337c90e079ed3cffa14c54e5a7789cedc..a110375114868c0ee6f0452b507527f11b11b754 100644 GIT binary patch delta 233 zcmV409TT*kMKu5b0F_BZK~#9!CCV`Z10V1@53xwub}OZQG( z_Yik(tlrZV?P-EzCZ|Si`x#_eRUX^G5TtPp7GP2aZ4%}oU39@klkgt^)Bc)tp$roL j<+5Ei2^yqD(k5L$2y6#aJR=4<00000NkvXXu0mjf%E@4U delta 234 zcmV z$QgMo69zNeXm kH|ezNAP&``Hvj+t0d!JMQvg8b*k%9#0A)!;K~#7F1;K#<03ZkhAZ*kBPYz%J0K5(W zj1~ZRNdZ7J9Z=9o-ePnxo0sn3rLdFCGMd3`Gu=n?GT4{A)7i;e=9<@gYnvWklU}zw vnS)K&WZ!lqA6$F(o!bNUxZZOfxWnQ2yJ`X0Gdy20Ww8udLj?29j?i>WV15Q+`*dNaEo4VG1=PgkMj*}H32^JGn0QTT=M_Sxh!)Dj~I3@U6Heo!Z)3_fAKAE`X2R~ z6#@(l4439#e-5PhN`m}?|04qi*8_J>OjMMppXBM{7@`rZ+wUlJ*noqXRq06PssH05Ia@SI>&KCbuLX!2WGr_3Vuz=?V$AFVQHO(=eCk*P4FWzx~fX`*vy zG+AUCaBEaAe0{#bJ(urx_*=c-Z#Ey5R{qZ*7{j{H|DNw9pvxINUHx3vIVCg!0MO}n A1poj5 diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/bookshelf.png index db4ceb61f66088e68f3b37c0c90d3d44ccad3d48..88c45c750a9d98805e334ccf5aa255e9b7c39f65 100644 GIT binary patch delta 309 zcmV-50m}Z|1jPc78Gi!+001a04^sdD00DDSM?wIu&K&6g002=?OjJd+wY7_={fve?oXt%tE-+D`LJ1;|LV^VGJ_6rkYv&|<55IJ}?H0oyl~tC9ZR`A0$4png zSiCKN>wGpnmoA&Sxf%rlEFD@7X{kBmIFyS*j%9Iyi2{Is`P@Ql=En3x9(H5js9|t?(>5%e>E7=<=R40>X=8mH^tu3Osed#8zjwcpIeUi4B0e%L zm6n(S;Fv!ospoV6?CSd&EN}&x#R|RMHr-!OIkmDJ3g|hVz!d;gsty1TFE60!DvG8Y z$5>k?bt zyfOCsV-m?20NT7Z4fF#1{&+zBl5XoyTptsPh_{uF95#7hn|gC|WAblYj3%*4F`#Rtza(EGam3c)Sy4 zv&4WmTpb3(wKRoR>QqJ-ypJm0>>?M^1-H$(2(h3lBYV*{RPN#{@>kxX6_;t|JuD$`>fsDTt-)#g5&*H%#`^ew cZs5561#fW^6drnx{r~^~07*qoM6N<$g6%05TL1t6 diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/crafting_table_front.png index 9188bda6f603243c2cfd6c891c9fd5dac37e13f0..d008635876aa7777f688f49ef085cbc547f66c94 100644 GIT binary patch delta 255 zcmVO!F@HHwOjJeD#5=B}JVl36dUGv5eM~rTOS>>IHfTOFVmzWLDJ)n! zCr&C$D;R$VC^#V&YXC1B77ZB`3=s|pz;3uu0001;Nkl#{BNAYU?WCT;|RK+IadyihIsYx!BfWkSEDEq%t1Mjy0SvCS2QdhK28Up656v#JAJWbE`~jW92%wA5=IsCg002ovPDHLk FV1l_5Y7_tf delta 388 zcmV-~0ek+a0;~g&F@LvEOjJb~6bxi}q+M{CYXC2zDJe`}jDH6xEjdv-M`)0glrlhD zPg-_DPiaS5gR88lZh)*vR&ha1WJp$avbD5bY?4`QkvJh1SY?J)W{a`3v`<@nZ*_Hc zeSfU1s2dgyHbiAlUxKr?v_MdIODh;dP;NOyT|G%;5e^8gu79hrv$3$Uv8t)1CoWDh zI$}RceKu9*=Jf}a;VDUVRR{tA000026bum#2x^0os{jB1m`OxIRCwAYj!_Q7FbG2(aNIzbl->Wb z6Wte*Wxof?jAzX`=Q?IyD5uV6&AC3u$wHA*SJrV#g}Nd#&Tv{Ma%2?B%-ng7*$}!x zcZz#c$ag|Xm-bc;yg^1p=JWJHz7`jB-_6R_iV~XPPWD8CM((YCsDo&Ke!qX#tF@%= xTTFBQCs1oeybLHcIv7f!@B}a->WLUYJU=8?2f0Z(4#)ri002ovPDHLkV1oGPWJUl0 delta 375 zcmV--0f_#f0-pnrF@Ld8OjJb~6bxi}q+M{CYXC2zDJe`}jDH6xEjdv-M`)0glrlhD zPg-_DPiaS5gR88lZh)*vR&ha1WJp$avbD5bY?4`QkvJh1SY?J)W{a`3v`<@nZ*_Hc zeSfU1s2dgyHbiAlUxKr?v_MdIODh;dP;NOyT|G%;5e^8gu79hrv$3$Uv8t)1CoWDh zI$}RceKdjxiF&AP7X6(a8}kZBnHE5M|;12m6b$L3Vs^6j?jY;#EUVY87EMqMCYs#dRjKw`!1JO zEyzSU=<-6iB9)H%Pz6@~`aGZO)Gl>8;JUVd2655;%hlEo}}kdk83N0541pAyfh;LBDUeN&|6{g3bSbXMYbFUo|7GmPY2-g_&9Q zo_$c3N-Km}u--~d%37WaAOb9}T9XDn&t`V~T5IR~K4@PT6S!(XY*}{_z@V|IZ!kcJ z1?J%%?qLunW;s+H>Z*tE3|uh-7HJV4vqA#2uZC`+*XV@})%af6etVtP>^RKq{5(2k usqcCHQ%h2>^&vjx9;J2~J^R!jnd1*o?+>czo2HTg0000qA4jF6%GIY|Ni>%`{vJ^1VZ}X&i?rE z{qpDb%($xsN%X+D{O#xd_wiH$CVL1dgA6T94IxAb8}q%m`PZS9#eD0baS%0C&00020NklWMbd$2#fe{QwMazGa!NKrZq_Egj zwz4M>egnj$T1E67F=*OFWmCDKcdc6Oe%Jb8j+7{8B8tc9FPG(c`q8Qb-`e`fowb>+ eIY0W>SNs6%a1!{XV5K+!0000K9^;h$$4$)H$m%IGZpVuR>`6DOwL<&iPXDQe4^y01MXvgDx58n1lwEY8(y%lA}9 zEG(83c9egul&zBT@bOm_$*3cz-`a>J{MuHriut$vRsCX#?A^^mie+3fOo^{k|LWXP welN2tlErMrrdJHPKC>+=p2RNOfv#fkboFyt=akR{0GQ2Pe*gdg delta 602 zcmV-g0;TU1s)fs`S&A&@@5Acd7R6P*S86WeI9LX zQm_SquLy^IR@*HuPtS4Jw<%U_0$*VO#DDI{FIh4W(&BEK>X?ugfv*sbx$w@&Cr-u* zdB6uH=Re>in&|4l9H3weOiSnrNjzRm%$=ty(UQ$s!c-;tA{_PsxaoEm82tYEYe53Q z($3yi3Lq;|2Y+3!&i>{IfKR^1>*_%7XQ1&g2FMsJR~i(nHl`)G>ihtpcM)=Q>*21! z;n@l=9uDBXhV9fSH?sGpkQTCJ5cmprO^`$r_BTfyo_T!#_;pFsI@nF$J{j?W@cM+0A6R6B{OvuJ2OMeChTL5r$>mf@9-`;%I44xhA zrpIyz=;RnLVf4>x)6YwL=y_OKt(-VtBH^nD!Qiqs+B_K zz?lbbx?O~{n5qO7T?5U`NSCMQ#KTyR$o1*~thQU&PL0)e3xLPX?9Yq_mm1IjaM!ny z6-l|VK~oZswVc3LsOVZ7Y;+Zp#A9ry20*#7fictUdUXO{WnIoK*Q;wlcWoJfV%5fW oYD`r!cOoph5$10D_dXy03%~s4Xqb$|P5=M^07*qoM6N<$f}I2zrvLx| diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/door_top.png index d1536bf1e8cda82f7936c3eb220dc7a22b9c1dc8..8b9df5dbe6e6b5d7606b7a6e0406085893a1967e 100644 GIT binary patch delta 245 zcmcc0(#kYJqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j$D9Gh%1m@x5TEq*}$_m+_gQ( zslnHxz}qlYUng2qJwSDG>7*=>wvr&fUPCGN%87z@D;s2G^=IH3Vb6XLs+8viP;_t*_3Jmdl?lq*BU$e{VEi(!+h+AwaoU tQpoZAt?2D#7qocGrU{+pWd#5L delta 584 zcmV-O0=NBz0@VbN7=H)`0000V^Z#K00004VQb$4nuFf3k0006HNklt-MA3J)Yc%zfN3l< zC7B0rUNY%oI+Kjv)qVG#ciy|_+|u4rcftR#>o%()$FgwF`hTl+({fDQdI!5|Aj5>< z=8D?pF4J+J+U9OvpN{)9eV@VEIqideCL@JiH86BE10WdQ;xz=8WAZrcs*z#_QvfC- zg^KPd3kwqMq&``#kio zY5G3*y&eEs#(w}12>7blk`AkUk= zkCriIVIiCr0ET5(kYSR~nQ3zP`P~Ab>H7e@`tWv<_2)|G`WTr=GEDNu@v|W^OrD5& zD1W3jh6!Fn5Dca%K^DSGecs-3^IE2SR)6eL>E-(u3xBuX!D|T2ipAjUoVD%_Z^{F{ z{#nm~$IphG+I!shdI+bL<4qmS2%;-gWEYg)-g5c4^_MT-CVYDB0WPPbluSi;1mES; zAIz2J_s?JXs~H(AZ3S5C?jXa2+J?K_#8nO4dWXz`=bde8>+SsFDjq0`IE!@-SbbfF zN#UGrra_v>CBa;2%u3qGc48JU{mzLTlgUWoHN^4<*@ac0mT_TWw2bi@qA-FC6aE1J WdFql7W*nmc0000m_;}hmRf4@J7>bNq2e@W8gDGbr(zVX^;tdcCgK9RdQbMnM1^-mSu<+{E; zRFm=xt8I9-NcWoL`Z%-P5clb|+R1Bnz*#;E?>Z XnF5#c%e8EQZeZ|q^>bP0l+XkK3cp%Y delta 219 zcmV<103`pA0-yqr7zqdi0000eEe}(XHYF^q`1ob-=`+fyIH!{%i*p-*Y5)KLyJCHQ z00007bW%=J|NsC0|Nj6QO9MucAsBywNkl3%SP-&7G zZvvX3juT5VKc3>fTaA1dJEA!+gZ_cmYBRalIfh!`^AK-ks6e$PW(}pH@)-J$rHM5@ z-mQ)Wv<>lsaHEKf!>7=swAs`yjbl&oz6VWfuJ+}6pKD*ye_l`emr=veHz|I$A<6NG~5WE#K{U00039NklX9L_+S)Qk5Vj*G zlJGI1U}`0}6pMFkB}~hwYtW{^^VJFD0aULhV!43Q_DmD99sN2|w~NqA2uyrM6Oqte$fBG+cl68B&Zl&n)}RGaKLM=%GiR@fvzme)PO}PZN4r9QzC@7Fp=&AN66g zd!|hP_bc+h>cHcF(e63+@t&X1qxvU3zK>h``~re^o=hs{tB(Kx002ovPDHLkV1l@y Br`P}h delta 401 zcmV;C0dD^C0-pnr7=H)@0000dbp<~F0004VQb$4nuFf3k0000pP)t-sJ2rGGCQMdO zs~KyENkWku7&sY4WGyXRAcmnGXjUSlXd854FCR2QFGylUY+FENQaW1kyo!ea00A0F zL_t(IjkVL;j>0eu1kk+BIKKS<*Y3Ej)CO3pU4#$R(>c>? zG8l=0>3iS>kMzOWfAw`tRw(Fa6M7N)M2#?4&MhcY;4lR!t#|~g*IK9!+-jsxrUJV5 z;%+0$nOo1)k`oHLX{e9wfgT1rD4VKOg;$qDzgD@gp^`*wfx1K=cRMfKquXxB4K<~< z0UuxVz@3K{D1V$DCn7LNv6JamFuJ#@&1Up;d1nC-#S1Dgj<4?KDB zZ}Va8!Nr5x9Iqa158is}JS1+QXhRpDhUom^0rC@h8#XvI>yx#8A?rEXy%A$%p7J8|aVXIJ)lxs7;}5Ze>& zv3R6V*J+3AeM5qz!m?*(&Pr6y3?a%AQ#>BZw=eA<2SZl*mGkAH{SH&@q}FQeDMr{3>Z zUsYD5@oCpNK0H~zQLLlNSFOOQ@>OuJmH(=MR^ZsvA5R}T2k+lLy8M}6XFxGY0oM!b za_V}ay;ql0;Bo)i@C?;v}Kv(&S z|3h|Kf#Z5%m4B~1P)BF#s_$3=)6sWfWtoHrPu95xR6HJ5d800;RjvVl&op=Mt^u^X zw>ZF#oVZ>nwdkHF**wWCl%)jhXy33cgpaH?`PSc6TW{aFuZ6K7STo##Q5y|zb^Cj! zn55PTp(MG=iWC~Q7Egc;>9(T=l=jUsn9Y-$P8*+f6IM;Hx&BS+^Ym6jaxs#j*s4m} zMW1I%d*%U%<43MhJSfc}#5d zf-G#Z4*(-MV3}M#tqSz7KLE6kN84c14fF8EEBI|*&lIFpL0@<5uMbSRq186uJ|Bsl zJtf diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/planks_top.png index 1b7bf69dfe0cc523de921f871d35b9fcedec28a0..51b78a3ef41a96d94dad5e241d8a9de0fe67cb8b 100644 GIT binary patch delta 203 zcmV;+05t#71KRP0C!15K~#9!1;N1$!ypU=&~K#NgDdW-iwCHZ0iebA;NtyP z>3cXYTUT6x#yv}6MSFV6MJlGWBuWp&7`BEjcxs6i1t01=DMVFtn%k}PLVx;pD_6|J z4^mc4cot0+5iu;{hj*GgD=K`y0nG(26Re_$udUOT{Q)$l7FNH;iO&E4002ovPDHLk FV1k;GP+0%~ delta 452 zcmV;#0XzQN0n!7I7=H)`0000V^Z#K00004VQb$4nuFf3k0004uNkl5GGMhkm1AT@*L|?Y+?79l1ix9ABV#COww0IVd6xq|B)wOhW zbk8|*^!W1BaD+8&c`!Qw5|tq;!kWgfjr6qh9b40IwYb0aY;kI;*s)?(2ww zdbVAz7=-LjtA8~XYb@zpBT70RxP2#g5FQN26D7RAzVZJ0hA8<@UfUC$QYhEOkH&p> zds{bc3Xu6*L&8=s-t|5XX4jesbfR;z!rM+`3-z&1RCbE7kI-D_OCKXWB_8Q1=Qk5X z3FW$=+!X#Pi<09MXRWNwNtTOz@VEG&&MP0AJLvonB|RN^E@JoWy$5w(d2QBMPtfP0C7n~K~#9!1;L3C!Y~X3z#A&CFfM=z1?cn?0C5_K?EYI} z7e61;B@^oy!j^?u*{QLR$L`eE#&y44D21@*O-I44vAHeyEk2ZCh1jAx_(57%7oG@n zmiP&$agSWc??W=I>nhCY!XE1npC%Z26(Fzb00000NkvXXu0mjfm$6UK delta 411 zcmV;M0c8Hw0jUF!7=H)`0000V^Z#K00004VQb$4nuFf3k0004FNkl4q1 z7{`C@G+>HaYaODngCOiM@I3ZK_O(3^ymiRv+K$p3QeSo`NmDCZF3n5-PyR1YyqEX4 zs|+7F=?ehkb;xmlV7c31Mwt|h*P)$PX+{u7RB47^s~lCF8Gi_$d&30_DeS%};t%Bv zfS=FQ0$lLDxxr|4#TU|}RyosEY%BjY3>$!2<@j1%ErWsZnXY1%yN$ik1!$!Km~R^f zK^!p<(gS8RUl=VW9j&f*Aq84#j{Ac>^P2R;ne}15eFWMBf;j5jTBR97IkWp631w1r5-^~r*Js=Nu3TFH z8Y5kh`-pC1tyNByW{ru4`cTfSjFZ0fn#d#|q}O>&zZ7rd#|(0-xGMkv002ovPDHLk FV1iw~x>o=I diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/stripped_log_top.png index c6213aea6d5b5cb2474532e8698143e44c3aca99..9c498ddeebe1e217bee90795e886d105e3a8a576 100644 GIT binary patch delta 194 zcmV;z06qVN1JVJI7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sMTb&9eM~rT zOEO|SELb}yPAVzIaJB#d0B%V{K~#9!1;N1$!ypg@z%>iAvKChe;F(i<0{(p6#xJL07*qoM6N<$f+rnGs{jB1 delta 373 zcmV-*0gC?80fYmP7=H)?0001xk!Usm0004VQb$4nuFf3k0003#NklXigW36^qyECgvUO(Oe zXq&{)+gyh-(gr|306E%RD|$1NWoB@-O>1)vAe1qNUfYBTynmyZ@xA*3a6TLXq{eqm zl^V~CxR(-1#OeM z7%E*;%1k!CCPEo69E$CpqWG7UlvATFJix&@Q7c7&QL|jL7<&1bBr%a0qZI594b8!D TrX@Qs00000NkvXXu0mjf4+y3* diff --git a/Common/src/main/resources/assets/byg/textures/block/green_enchanted/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/green_enchanted/trapdoor.png index 50ca3fbceb31acc56e3ffd35f0fb37c1c78a65fa..75e7e3e37eac8a3c3877007e894c7a56be6c7254 100644 GIT binary patch delta 279 zcmV+y0qFj@1f~Lz7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000jP)t-sOj(pfQHVcE zeK3ng9R*mq|oHRCwAQ%`pnXFcb#h-y4Wm@G3#5&|8F3D1R9p-9o5)3B>X?2W?je zX~@>aJ%rZsHWvr)AoyM2L)V9;=bkZUcj5Ak@NSY3xor{can!2H6^%r+z4VlF39tHTkqONApx d;Nd@nAL(#U4iJO8`sM%t002ovPDHLkV1lv)ao+#{ delta 556 zcmV+{0@MAb0=Wc`7=H)`0000V^Z#K00004VQb$4nuFf3k0005=NklCR}po(=4=h%YXnJAwnRG=pp2h>8zX;WXS&U5n5@INrc@n01#53RfSe1{Mu~3xmEa{ zi8-=|t(vdb`y0u=iZ9<-I`1bD_4^JnevKhJKUu7wl=&0BU0_3GxeOaCmkj4ahO` zba4!+xRsosAY4#fShUILUzopr0FX~ZhyVZp delta 181 zcmaFM*vd3PWum20i05*x_#O7ihn#nO=DYHvz;mIt*F5bVuTmC2llESq6EMxtZ<79j z0|(~Jne*(~vvcRpF)%QwUamC;Qi3Hxe!>6I0E6nN XWBI;@Ez=MN+QZ=K>gTe~DWM4f#bQvb diff --git a/Common/src/main/resources/assets/byg/textures/block/green_tulip.png b/Common/src/main/resources/assets/byg/textures/block/green_tulip.png index 5180f542893099b3299b6c6145142b417c272cf8..5c0197b00983f13dc0a3ad38878a52c51d6e3941 100644 GIT binary patch delta 164 zcmdnWxP@_oL_G^L0|Ud`yN`l^lwyESh%1o({{8#47cXY--D~ky$85i9=xW`dS$bam z8nUyc#A{euGVaaiF5OXHos*(6v)4*Rm!=cPVvfJR?PyH#c~aXUKu7QUf9+$Rc&H)ny$tC Q9cUbbr>mdKI;Vst0G53}4*&oF diff --git a/Common/src/main/resources/assets/byg/textures/block/guzmania.png b/Common/src/main/resources/assets/byg/textures/block/guzmania.png index aff37b02aee1a606967ec0dba4dc4a964372fa44..c977060c4ff0cd7ab63fdf6bc8c2265362f854b7 100644 GIT binary patch delta 189 zcmbQv^owzViV$akM`SSr1K(i~W;~w1B4whYYCQu3!~Zw_|E^hnoU59>)agd9LU51H zK`kSlbhV`t^2&a)^X7kC2vo#a666=m;PC858jus}>Eakt!N_{Bk@0{653|CRb;thI ze*j7xU}Jc*m9b%~ID^ISH_QjV&aJi+Kk)h8XNCjJ4yDE=;u=DM3mdk)TE^TGB*J*% oBEu2|)yaGcDQb!gDQq8@m(F3_H8XH?Fwh_dPgg&ebxsLQ0H#4jhX4Qo delta 199 zcmeyxIGt&N%0x>gn}63V|G)A7I9K(cmeGw|g{2bm*-M>*dvuijWOdTj7#JA1_jFwV zQ6)is!T;fa!ONfV(?msy+6+$@#}JL+*q&%H21O31YG1bB@gEjM%HPy{sU&7sdcZVj z$}fwpS9FE8EE3joc%HGB_bbbvAEmL=)7}4tFkSA6S#pzSfw+Q&V!nGq^{Ez_7UlEq u?}KJaeLTgnL7=lIL07k|R7vULN%=X~IBtGF-~Jou76wmOKbLh*2~7Z1MOB#q diff --git a/Common/src/main/resources/assets/byg/textures/block/hanging_bone.png b/Common/src/main/resources/assets/byg/textures/block/hanging_bone.png index ea551766044cf88080e41500f85fe81ab7f2f91f..33653e0785152eafe395b3a11a617383fb8b2670 100644 GIT binary patch delta 196 zcmcb^+{83Nf|G@rfq~)e-A6$a?ZhW4%hgK<_=LFr|NkE-`tsS8o7aw9JhSW2{jPoXUE2!VuBUT7mx+%_pbz{zj))IDk- z^uusx{+T)FKQmm<7$X*+9}Nwv4^>Gd=4E+h+arE@yfm%Wn`Blqgfcs~sJwy$tXUi% z9e?&hBf)#!VEAx@w9_-9fZJm;G3k7DR0ZI6%b{W-1-I9w9@XdZCsxpGHq~F-$a((r zy$OOq{kxm87N$}uM}c#I=k@vX@`HDveTu5p&J{&n} z2IYO&w}elnkS}k?!W;D-3l!;u??a{$s<8@DlaVhkUSTv$GEW?*q~b~<*A zJA3<1GjJ3zM4JCvBRTuS{UE#&i+`<=Z?RY!yT(Exukr63M7{woph#e5<%qEW015yA LNkvXXu0mjfS(>{_ diff --git a/Common/src/main/resources/assets/byg/textures/block/hanging_sythian_roots.png b/Common/src/main/resources/assets/byg/textures/block/hanging_sythian_roots.png index 2858e8e79699709d9f676832cf9abdd49bd04a5b..00b026200514067ba4a4cdb41e2ea910e4c604b2 100644 GIT binary patch delta 152 zcmdnTbd7O>1SbK~|GaGvg1IczaX6EK5CT24RhA*EurGCe&`vOg5@O1TaS?83%*aQHK C*)bCU delta 256 zcmV+b0ssEi0lor|7zqdl0000V^Z#LyHXxBC6@Sx7L_t(IPsLNq3Bo`WoM#s{U=Q}- zRZy%#!K=Zmf?bFQk6ME0!J?i_$b`3>T@XAtFxh!|pUiF&xO>9q4ZdDbI!Y_^)Zz#g z92@gaVmtvhOY`{(n9kg&yHq;hbvM7Bfz!o}F&lYryLY1|*sOeuXeZjst>&?qIG{bQ za%m!HJJGr@I0F`OkSuc;*T);+8N{<`5$(|CVMjTPwS|}`dl3tz<7>+s#a_e$HRZa* zB+v&#mY!U4kpz)>W2u=O+#vJfS~F?9{DSJg@Gbs50Qdl0evqV`uCzP=0000tkQ?gh;uunKD>)&dAQ=c47&jYSOA%OmKp;ziA<4i{!a$;7 zsf%#L&GYq&cM`L6gR$`l|P$}+}TC%3Zf!_Hl z;eYcXvN@RdoX(yS;&-xGWjdz^{!T&ys2lWT_Cb&rgJYn=PTPp>6KQa<6vv?7H9>=k z)Z%PDM!agFsQ~e4Ca+}ssofrB_GP37DlSH#e;sL4f=*&t7ETYCHn1lSF=I^=^N73w XbEAuD$5FxQ00000NkvXXu0mjfgF}$Y diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/holly/bookshelf.png index 594cba1672e4c12764adc4845c6a345a25b6bdcc..be241a2b030e03bedc94740d7335528db24e0ee2 100644 GIT binary patch delta 349 zcmV-j0iynz1?>Wm8Gi!+001a04^sdD00DDSM?wIu&K&6g003`LOjJeN!L8l2qP4ZP z>lp@_$WX2gA8sGACmjEsqiiIRA1b&e5uczB0zWQl$VpkotzWm^%BYm!YTaI%L_t(|0R_RyQo}$HM8Q|pqXi-qEWX2m|Nk!E2#hStc&0~WA^-^_q$2S} z$I#r%HjL+@-dR~5d{3twdYDT@@?fl0@Dqgu81XOwPzErw4QVPA!WpzXQ!>}*O|N7U z0c1iT9iT%8;#QC~icc`B7aBHaqwuxu{dQy9dXM0DAG7R(@mhAbq7VPUo9lXl%YAae vP+@IXczLJDw7K4)@Z`y8$p|tbB7@9-oj^%65vug100000NkvXXu0mjf)#Hz( delta 653 zcmV;80&@NB0-6Po8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LA=L_t(Ijdha2YtvvD z#(xbdX_j@Znocakfih*nL>M|xibE6}+YUu9y35>{2f>5vwixgY26c{>+BvQ9*1c39$YxFN|(7&`nhb#bu z!zIHao}K~aE`Ni0J>2Z=_y{%ALImiL1-5BL$*=&Z*bc_}WvF{VgxwG~-pz%D=6NK6 z@48FHc3QO1lQN!X0wBdzpb`)OR4ot9^Z3@&Nw-x4VEND(QmPk#6>Sod0a2rzLyD_7 z`2wI2xifjy2WW4TQRG5rwgW)&!Zw!avNad%o=(VNzp2e=CKG6I?(-&9-)H`?iZ<|oMmfh&*CUE+aH4B( z=t|^F8Od~EK@Gnl0_>lep`6V!zq&||-D=Z(`g$Oqp@*ci<0Clv0)3_xB(Zp949WLl z{9-tmeSdu#(=-_r9uplHrZD?F>^(briL8^Qy8H>D^l>4~Kofz_0ipxLsH%$CcQ(Ac z_T?4#R~G|;fB$Mw^?d-wiW-e_4uDke0^R)|0MPXy!o@Wg%XD$_1rBP*0vjLRn(!4l n*5duYJg=D+?QQa3Z~g!#c^#Yt5Xi3p00008i z-L#^ST#|Tfhi_ziWm`;pUqNU~I9Ee9Q%ER2G9@=FAu%N% zEhL9fct8LE0FOyTK~#7F1;JTP1W^nG!A#rDNFaW={~=ifuYZ?O7ZH9u2_OMsCQv{q zAY{Oj0FpbDHv6G^9<&zy#c^uYT6{J`+AS9_VPdiF?`O0;q<$D@mj}Yz@7WLQ{sUH9 zy;phN!u02JejEW$LN^u%e_#ifnq@fbnL-^E7FOdX+5Iq!xZ;{Yz54{x#5mG_W zi}*4HBMD_~x#nuSyUTh1oa?=_hqbFi=)mEe^F8PHJKx{;`+qxhGJa%{;l-0@DDg3(N*GJGv2+`w=wazLT@zE3Oap*yKFjRGnYsq9oRs`4fXO3zs81$HFp;PQ_EA@Ffc0rnyane zT#_dQ<@|Tbz~J==<#L&9K6^k!peZ=2gzST#|Tfhi_ziWm`;pUqNU~I9Ee9Q%ER2G9@=FAu%N% zEhK$g-j@IX0E$UOK~#7F1;Ig5gisU&!K(g`m9z5xcht}^V1GbqGkyQ1fE0w8LVyyW zbihaf>0P1=UaBW74XfWhH97jlV(8Bz7qD2*H^XkN#*!S2^YlZ6&7iq=3d^il&+EE} zSy+`glrh}o0?tpiI?#b@moP-I4+;J9+oE2|-fI zw5!Xy>hU6*rPWz zfWo&NNkxcQFqR5U2C2^0|LTemBpae@dQ?_TLMh{7Wp(G!ZXG&flSC*buIW+EmEz44 z7cLS?*)&H_osR3}TnX3o2&E*^5ELPpdGZ)V2yR?DM&SDdzK`!nd`B`dJcJ?ypIDE$QSeEi+NrS9*-CVzR#S#!L^6aQO@0A`pp!Zy@LSMgO<31FWDtR zDbcG6dR5`qMk|5ulMtH5_}B;leSLjRpf=Y2U=~&==YL9!UcZVW1h+1q=SqJMx6d3w zXj;Ue@M9h?7iDZjX+W$8TL3uaBB7Kle4hhA?T8*%GL(|_;&0Z0{auIRoc}^RdH*SI zx1)LUUt?a$!1u|PwrESIP-`Xtwp+tBJ?cRViDWG{X>V_*TCFmh)d2{6pQO+W;GT!iu`!tJ%;*gFr&t{B)A1GOVVcUL!tV-re=B1HTL8VBr(fpo0cI4La)y{cfl w9-DfUtu39}a|^Rsowjs}O~;M*NXz0c4Q)n?s}J@59RL6T07*qoM6N<$f|l+t@&Et; diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/crafting_table_top.png index 67f9bcd35efe22d312b3f883315335dc328b045c..58f81ad7b0c44c2787a604ea6866c15cc62a2a78 100644 GIT binary patch delta 216 zcmX@g{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5ZAj~7KJu+`C1qQM z#Aw+#s+n4f%PR^?N=u3Ini_|_2db>_ba4!+xRtyj!=IOzcedf&g^g!#-ngOC*t}2? zNZ+{8)4cFZKwyBUr^Q^wqZcA?oQSy5t9au=1dttgV~XO90FQt`jxz>gW+rZl5}KTj zOM2!^o$H{a*>>)f+qpw|JePS|Sy)+HjT6HP415|QPMr+6$ywy)YR!;vTekP7N7F%| PBN#kg{an^LB{Ts5<*ZXr delta 439 zcmV;o0Z9Jn0mTE57=H)`0000V^Z#K00004VQb$4nuFf3k0004hNkltoPOU|s5UMa>3j}=I6TCu)DVWrHl&Fp_FqVZjen6w{2Y}L>3q)f;{yPl z{(y4h8q;>R3dkq~VA$&daC>)8QGM+62h>~boy7pA?ND#E>GTKsU7^~zTsV~)^;R4A z!b8SWOsllIHJ;{0tP;VS&tyCz{CGz=l^W&7wLTE|ub8%jd*Knh`2ZZBxXiu+Edc16 zqA<*yZN+6g)qj~ytE74MoG?tpdd_T&^X83?kmXry2q@bs>o%T6k$)oRK*m#!Ph9<+ zIdZ?8jlWvvS`3P}@5;q0`uu)L-oBo$?wn0EO$ zNU{HdNQBL>*UgQmvcC(H@rb8hcex8j8UgUs>oOUSHZZKN+g8N@Mj9=5;o$pIuc+lU h_pWpJ@lJOAe*p+)ur!{NNPz$V002ovPDHLkV1gf|)5`z= diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/holly/door_bottom.png index 651e16e36ee163b41f799988a4e8f4eac6e80f6d..0af7bc16021dd430467707988b9d76a38aad48e2 100644 GIT binary patch delta 241 zcmVST#|Tfhi_ziWm`qpR`~z`0DVbB zK~#7F1;If|1VIo4z{uQU9S{Ehoq`9ErrL<~>Fbwvef;#@YHC7ldshs6+FW6nZhc=- zUv*n&-9*9OuCuSUyEsxNWwm!5(-9rJE;6fkEQK+!S}UfiqE?&M&GQj1Vtd^=Js4#* r9mkYEFq%Fp+;ygT<#`L)++@o?M*TFKrw6~(00000NkvXXu0mjfQT%Qg delta 513 zcmV+c0{;Di0+0ld8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00GKLL_t(Ijb)R)ZWBQi zg}*Et@6XuCD_gQe-u3)! zjADw}8Sloo+MhY+o_p?@gP$MYZU6i@LKZp4^9>Il+{e|G(SOv&5XCV7pTBsA^?y@POU1|N_W5jQ5;hnLv0NGG~s$60H{?3K*){y@aYQxlTn7$29enA zQX79JSJFR+K_wBxar0X8^!YQwUIf6us~Uh!qvq}FHw2XhN9h1LH&($o6`mmMMIP7& z-z+g4BUVeo>wkfOg(aDcGIUvV4j#tI9?>`z=R5uv^H_+TC^+W%lcYC>{8y`vCdN zw`Tdu3ZUE-Ei4BPJgmB7Axn z0001hNklSHbtg^~fP|DTMMOnK6$(&F8XEZf5YSQ5B%**OL?S^VMvfqm*ywCu?r!(? zY%8WX?>cA5H2a}>Z{M4lz1G=zJ7XT{!9HvE)&aO^N_$NuQGWo$KRPrvHcRI!z^||S zs3_!1Z^CwC4jdFqs1+&-$#ud}T;tisCO=O)3{Q{wJ!usLz9>NQe8kcB0{~V<6WQ|d zg~S(=dNE)Kf ZU#wgV*buuB@!tRd002ovPDHLkV1je{@V)>5 diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/log.png b/Common/src/main/resources/assets/byg/textures/block/holly/log.png index 5dfa155c5b35406d652b34fb7d45c83e7cb75f5a..8646c093e080f549b3620ea40106d1c44959abd3 100644 GIT binary patch delta 206 zcmV;<05SjY1Kt6U7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sMKU8gC>l5- z6)qhSCKd}I4+MrX&F}yK0D4J8K~#9!1;M)lgCGnA&@0y6N4nEscMD#}91r z6VF$RCp6;xEx7zt$CoPZM)OLAU=+iqF`)``D%_%~^Y07v2ds$~YJe?VCIA2c07*qo IM6N<$f;MwehyVZp delta 482 zcmV<80UiF{0q_Hm7=H)`0000V^Z#K00004VQb$4nuFf3k00051Nkl5aK#50=PiY_kW06qA1b^+Jmx;T!$APc6WAnX7=vuI{B-# zCew<^2kx6SWsw75N5`=}5xmEkI>rHx?FoQ{w^yV|3=Gy$m4EqF@iGpOX+_udBuZWu;5`?vj7S7U0%^W~~=@`05~F{Wk(F!_KT z9reawM~Bk-s@rbc#0K@o5WHuwZU&O1!MaG={_%m8N&%?KoWs-eO#@l=PE-iq14Op> zj}LKzA3qNOe1G};iDP@BsS3vPg|6#o005D)NE62MB}#T|Pm%Fu4#0T6uu@t_S(a>P zTE$`^Gk8x`=5eyB%x4t@WJy$2<~N{9YkvLyL%lK78^d7TOkz_N6lucCYa59YmIV}u zyx7t4^4h+uAW6Gz6N|g9CwPw?U7YIh^c<&{d?0u~16wR5I<}|iLb0yIfM~M&W{uK% zz6J5OkS5mVP1665sz?(C>&Ud4ClF_SR07*qoM6N<$f`m)s%m4rY diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/log_top.png b/Common/src/main/resources/assets/byg/textures/block/holly/log_top.png index 9092abea9e14fa9f11bd579421e81cf1382f6e80..deb16cc4505c55cafb9d915e990494c6ad87ea10 100644 GIT binary patch delta 242 zcmVRmwmK{ zX{~)+l6Y)~Z)AIATSYP>Iw%@AA{8zj5hfN3AP)pXY2FzC004EH08%-9%_lAiUAlvv@fdHz&cx$=VZG@B%ie;3D|q_iNGZ`51TBXIxN8s&&P_ zHxKBE^?M)PP;M#! z#sFWxd?HA1DvU0Xc|qPUzQ6kgfXoYy_2J`Z##12x`1buL0JA>3thSij6*7*1k>62m zF}ntUcW+*Lg4Q{7kMsWRtCI|2J`e@{xLu()6=|w`2}YMg=78&LJ!}w(!sv1+L&gzC zmo%>R0i3OoaeqE!T&_DH>hZy>J@(CuiT~a;kWCIIhDoDKoUM7ZdtP6qz+arL5t(AS z?oOzjt!bU(JRr(A;^Jy?V&q*l;=ap!!sw&~fHYN{hb}x-$QE1=?=TjLVkTqX1;02S z4CA3gB#H~GVbT+JBcK_~bhhTv?7RmeQG-!I%XP=2-G4Jn;(l`fHbU002ovPDHLkV1how^y&Zr diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/planks.png b/Common/src/main/resources/assets/byg/textures/block/holly/planks.png index c9311a17f5576b886e25b8d04ac7f99a6cb820ef..6fdd4f5dd109058d5a6bcd17b7686290029ee7ae 100644 GIT binary patch delta 225 zcmV<703QFp1MvZn7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000UP)t-s+rh2fw4%?c zjMJfrzn6WqhiR>ST#|Tfhi_ziWm}T45oQ1Y0D(zFK~#9!70uBN!XOj{&`YX*KWaLI z13**#ro;{a;sC-5umNQQ-nNDX&H*4uklZj?Z?sbZi#0aI{aQfJC6~?&$oT<+gwrlu zjk1VF9e3>$xEAJ`PY{R%%^NPtSf~9Px1UXBbx*WfxaY=@f?klrS>tz7!*Mz+`zN8c bKCb!)9TOv(;>a7c00000NkvXXu0mjfZbx7{ delta 433 zcmV;i0Z#t$0lx!~7=H)`0000V^Z#K00004VQb$4nuFf3k0004bNklKw<;<5_13^UWQaE=ZXi(iJou2KiwK_ORO;;X#n&bX)@Q=G5W4&B#GISR3Io7 zOU5HWabq>>)qe;;=RsoD?HEr0)}YgllGvo)r{>^G%&~Vr@f_@P9^Su^|McEQVQZ)y1fJ(*E-#|GTk}A6*)(c}ltX88Ic}~W_c1-i+ bF36l;6y6rml6g)100000NkvXXu0mjf;FiA) diff --git a/Common/src/main/resources/assets/byg/textures/block/holly/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/holly/stripped_log.png index 30dd4b3fefa2a6c339cba0b1894407d213c5edd2..bdc469afbb55870d943df19f65bb440b26270128 100644 GIT binary patch delta 195 zcmV;!06hP`1JePJ7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-s-L#_5sf@pu zeYA&Zt$kdfZckXT*Af5#0B=b|K~#9!1;Mcq!axiJz|-LvNgfgs=Bb02jN<9Q?m+iB z^J4e%eu6K3?o@`X6l{Y52Wd)=e27tdH*?XKd0UGp;f$JF>paM=-)+O>wO0g-9@Flt=ab*S2&7LK`Kr0F>AE3Nheh3cB2 zK#YRmwmK{ zX{~)+t8`S7cx;_(O^0t}du3abc{n8i004?fL_t(|+6BR}4uUWg1<sskCn0hFrO@~3fMDT^T_%*oI8$jU*Lb&P z3yacdmK)jCIMlv6cU|sK`|7%`N~7_nu$^%jXY<)!xx?tGC`oAyZ6*M9!4N`9DM>s8 h*^-1roR~Sr_y?0N9{0y~V#)vj002ovPDHLkV1iIZW2OKA delta 491 zcmV-v7=H)`0000V^Z#K00004VQb$4nuFf3k0005ANklcC5^Z~LpfHP#NCkIvm!KUO;lpqA| zK#{i4Z{ zG6x_Zu#4LpTL9qauipS1C$R-r8}!`@5l6tpf~pPLv;chn`q46|O@~@n09=0iG@|O_ zT9v*#!1dkA=K=?CogLk-+4=)vlA=}V#}ILZRwc7Iv<13mi-@JKIxl)48t8*AEba5R zQ~PgP$gCeYg@3ha(W<0twmdXDF3x7aBVDs4%u?n>KVs$lBS%rh5vOPGM?x;D3HQAm z7)GNJoE`CuxeiWs_jP`lq)0F35xYIjXL0QZ#r2w93Ttz<1AWDeB^wXP5{_lqMA*4df6 zYOrr2I80s-tE){9#cGJIc*=y#VY%Gz!TGzFmYymho7($NQZJSp;c%tBi1qCa@c*+l h2UqvkQC}`cn16Q2)fy!^_Iv;U002ovPDHLkV1l}^ST!(LDdu3ZUE-Ei4BPJgmei0Zf0001wNklmygu6(YUGwJA&w{-4ZOwopTzg-uYrF8LF#%YZ|z~?la0&D!v00000NkvXX Hu0mjfv8nq!d6yLrcR4P*OpeKcMF`_#h~#5fX?33DHm>5Di4gfaS;T+Cd7%W;V7# zOyk*=@9fz-J1Zy0M{|HeX$Dc~z7mDf{1+a;!R|JRDk;;1t$$6MkE0l%vA^Z=O636D zPUp4&!1co$0Qb{JcXE^H>gnE*6>84z`idnelqOLn0Ed$aUf&1cyRQC3o*B*g=^0=E zSOqB4#8&Hwy}s}EL@acEG_?OT4eN>}7hx|5nVF@@gDA8F@n}q;bPM~tu9z9!5(B6# zMKrDp;&}J25`QX7VIh#EIq1?rZUD6 zz@iJX5V0w9C#)M({UBsGT5FMcgD50XrE^wLMJR>x^b0=-obcuKWqE}%O(>LZVRzB} zAaM8~UC6}59)l?4^5(AbT>l@c&)4VW6)KgpvpxiR#6P2PYmkI69&NZ6E5ihfS-4dI wnLTm(Mxiuk7uN*7ea5D$(57axzehKI08CN#nP`kH6#xJL07*qoM6N<$g0`p4!TWZ5){qKV?6-sZl}My|HH zc4iu8`pSA5a%LVkHUZT!mIV0)GdMiEkp|=hc)B=-R4}q0R1|795MVg4w^79>yTVCC zs!oX2Y%QbA|L`|V2QDzQm$L4h%JOVq_=A@R!u~PpKNjBExU@uI-K~bqKaD%ivwZV7 gQ1hIt#_9pLeu)LgBAE!=E}-EIp00i_>zopr0L@xIfdBvi delta 184 zcmX@cc!F_)L_G&H0|SGGE`KnPQVH-0aRt&%OQmY&NtR8MD4HnVJxwFj+uYaL$kkTY z&P>BhUs+E>ZqZ@0IG{Slk|4ie28U-i(tw;GPZ!6Kid(to9Qh6#@Gu`-svPL~`~UxM zLI+GPSQaaOysyP)x*;M*PvV=;j3Qw+;b{`)k4kwBIgT$io7{PzJb20M(_Ovt&*f7~ jL=N%iT{=Ez-=4az07k{XRZ|Lp#xr=j`njxgN@xNAx>`WH diff --git a/Common/src/main/resources/assets/byg/textures/block/hydrangea_bush.png b/Common/src/main/resources/assets/byg/textures/block/hydrangea_bush.png index 4176322c931aa9127db4d380f978e00dd95a554f..3e45ae5ae1d20059cea172e5845c4cff77f95233 100644 GIT binary patch delta 287 zcmV+)0pR|O1M32iB$2@tkt8C20002*eIQ|zNE~eg|c#w@uqj!Vu9#zk}Zg9 znUz-9Y=ALFYU@yGEPOM@NnR%^Ovgf1EodXMTSOc~E}0xXvRW9WOgI-rFb_ZPwxs|7 z00DGTPE!Ct=GbNc005auL_t(|+I3G$5`!=lqKRpZzPundYVLp0PWoAYmK88C1HeC^ z+{>565COEU%pWJ-;* zaY_JarHQKRZqDC;CZ0Q8bp>E^nGZVU8a>dybdDx^_U_bMgX%Er-Q;iW lLho1a0Dnh;>v?_I3n_&$2re)HG+!q)LMP zg8$%D_yNl`C){;B_7d5|2e&5T_ zYsks*E!>_-&itG5(#||Q1prQl#3zyq4huO^j=lPf6x8KDF2`TsjcuQPoS$AJYD@<);T3K F0RXFsmNEbU diff --git a/Common/src/main/resources/assets/byg/textures/block/hydrangea_hedge_side.png b/Common/src/main/resources/assets/byg/textures/block/hydrangea_hedge_side.png index da437992e74ed3bbc32b1a92578315300ee8c692..eade5347ae13f4276cb16219e9cba20a60a6cec9 100644 GIT binary patch delta 270 zcmV+p0rCFs0?PuBBoYa5NLh0L01m?d01m?e$8V@)ks&320002*eIQ|zNE~e zg|c#w@uqj!Vu9#zk}Zg9nUz-9Y=ALFYU^ZjGf-(Pd^5&LUMDI{$3j&tXd|*iE}0xX zvRW9W<3H?b00001bW%=J06^y0W&i*He@R3^RCwC8!GQt8AP5A&Z&DLQ0wNIh-?UTo z4#up5R}4{c%Qqd|NO;{d%<}0w(LN`Qn0JZ2{pv61dof+-0rou#r zs8^JWnhH$C)GOvHWg>&;R`Hnk3~$Ft$bLPnwPqCPdo=8;ZviR_05t&57R8_a0B^kr U#7?0i761SM07*qoM6N<$g4G6gw*UYD delta 302 zcmX@j^p0tQ%0x@0de1oZoCd>yOr3&Bx;4hfGL$!^6d60~&6Kg-QT&aLam~)c8Wn=lJ`_pDypb86~l_sQ=@>C1;*pc*VfLpqT%32au8|3Gxg6j~y_a z71jeOE-m>fNs}$?*Wi5+u|MnMwRTeF)R=-O@fo+I- zvfd&>P>avNbIqj1Ffq=fDd)98ASiJ(gSo|N21%F(Au{y~TMz_+vVZymY0wN13dde> P00000NkvXXu0mjf?Sgn( delta 268 zcmV+n0rURW0^0(RB#}8HMo?)iaFQ)#ax-jzF`|XCh-;Zz7^P?+j?8NnR&db;#6_AsBz6Nklt96U74yehX++}~Ms4xQJ|}Qssq%5$m3)=4@$e6@X9XnK SV?bg600009>00000NkvXX Hu0mjfsf}6? delta 228 zcmbQmw3%sw%0x>gkN>~^zyJR~X~&uR`uhI<{zXgHto;AK;r2%h3wtlG;Earnl9H0u z8+R};FbF=o{|`v>zgo(}`U>Hy_(v7~x=eyE zKk$Qgb^rhX>`6pHRCwC0(9v##FboAyXA5Hv_c~)XkpKVEDbPw$r9P}GhzBe?xjrH( z8At%2r6iJna@N+?<@5WuY0l{^9OxZ9&Vs4#^y}SKP1p{4`1x@^AXw=h5u1lQ8U+hH zd^6o5oGSz~+&7b?TaXKcy(2Vb>mxISE7>dN5kwzpbocNGzYaaG?L9ro(Qpgq-v7^F zx9Ge_zm{8%Lq`u!gCLI{3Zaf38A2O9>|GvNn`u`2 zr$;RxUq7#U2DoRS}0F(Gu89}0000< KMNUMnLSTZlnXXm< delta 350 zcmV-k0iph`1F{25RTi*XkcTUm@RojnMB_fJXXXpGm=RL6q;|O_=Is}a|<+t~bs3G`6 zC~OWXhd`=})bm+X$w@3y8!B8`3Oi0xYin(VQaOs_%=lbM*9K35W8;e2c_<>89WFZ5 z2eOt8LJ|yYN_YudOMk>rOu>Y6=Wp@JUSfv w%wu4EbKH6C5cV!Z diff --git a/Common/src/main/resources/assets/byg/textures/block/imbued_nightshade_log.png b/Common/src/main/resources/assets/byg/textures/block/imbued_nightshade_log.png index d572ecdabd3dac831881cab52f6da5dd177a38bc..4128508ecbf6ffd355a91aab5f089291277aba63 100644 GIT binary patch delta 229 zcmV7O)-d-SDD0tCwEoeda#)D92Nr2uCM4IP#IRE f{UoTClQWTiO0O@;)8|Gt00000NkvXXu0mjf``}+F delta 587 zcmV-R0<``00oVkP7=H)`0000V^Z#K00004VQb$4nuFf3k0006KNklWajRiW@mQyedc+d_jzT|!sHs-5dh>G!hc9uQBahISP31~1RyIb zF1tPYKh6R8nP~#B#jz6HzSf4{r3G_^0K>x(y+`Xz?%gNNDq-y(0%7N9#PwR=zq`0H)Y_1qjG3NJ$hDQ1 zYmoJ2G4lYQe}8F$jXsj3#25;MS{vFCem}p0qBLG(R#vnlkR+wov7kFgBk$3QnwjmM zfuoa^m8Z3$W^%TMyS@{b-5v$j>{toy2!eJ5FVl01az@Po?i`KS+ur2j%6^k1^(;E7 zIqL$CA25FRf%2wp&i&KVGbBkFEL*;}Rmj&rHMd%VYJY^NMrb7*?;p^8_GCd@uI-Jr zwrn20c}1F4{J&(-!W0N*tw$@Fczuqx11+%GaH(~^1YnaVN$QI`s>$k-cz|5vi+A6? zX5RR~{p9-VGSN{@M&E4a!)O-st>G?%=TALI;PMV|z1CmI#K%wX2{!t~7(Xj}+nWm> zH0BSjWJCf=$jXZ0;fUk?1Di-ckrhRflHRb&wL$JSSj;A{x+Gk7d))bwF318q!UeN& Z{|EWk06|xoe{}!=002ovPDHLkV1o2d9Wej^ diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_front.png index 718eb5598936991554432ff036b86bddd7e44a60..c40d77c18c8c6e30ebee65956d4d64f177f4a473 100644 GIT binary patch delta 261 zcmV+g0s8*T0>T22BoYa5NLh0L01mOYjblTDoZOEK_d=J7#cVs7C06eC>{$Y7!n&64H*;+5e^7kMK>$} z004|hL_t(|0R_QZPQy?P1;9DJ4pc>avHwN#P^+|Q%uK$1Pd=W@Yx`6AEN4=;jqO$$ zN|1Z^J*m)WmJzWm4(+Iu?4I6l*N5V~RI*m$YP6c(1Ab_&sA%mOr5()7?iie!*SD2L zwgWAhDTE1at&zNWOfLJ<&Kb$wp=J(kMq*)Xv;;^HJtf#?Wyt&kE^j(VV7w!B00000 LNkvXXu0mjfgLrGS delta 253 zcmVphm9K+ z4Kr(VK_d=JD;Ovq3pgPbwY9bX|Nq$7*bxp0giN)V2g!CYnl%o0GqYBIZ#@S8YQvp000000NkvXXu0mjf D{F!Sr diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/imparius/crafting_table_side.png index d1249ad6412976aee19403a2a9b977ca68d868b5..1a4b1ca74b8c6219df8167cbc6e00f585d6c773e 100644 GIT binary patch delta 250 zcmV_HeXCp6N@mX}m7WGwiB_K1vsxPy?ead(K3#*-$c{w_Eh&Wn zZ5hdjzlqTHjO5``gEk|vFwhbpLG+a1n3W;(5Am)vS1n%}4FCWD07*qoM6N<$f^m>y AY5)KL delta 246 zcmVuK5B#}8HKp7MaT$P)5v9&lB8FL^iOBfo3zr$&xs3sT^KzV>phm9K+ z4Kr(VODh;bBMvwr7APJI*x1;$wY3or2nN`+lEVXBcip4-p7a-L4*?D zcU;(EV22($Cl&4p)K5P%pd}q~{TwYFcIgENi0@gm+ioX92tlH7fk643 wvWEg9D3XolWQ(sy9!NQwNGA!l<0BEHztiyrzEim11poj507*qoM6N<$f^KSNK>z>% diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/imparius/door_bottom.png index 12eb96729d3d645dbdc7e30e525c3eda8c4dff98..c313d30e4bb97a8f5b547245fa5b011f19cd97b4 100644 GIT binary patch delta 173 zcmV;e08;;e0{Q`vB#~kjkt8C2g}=jhv9)QVs9cqsKzV>OYjZ1FVBs8PQUCw|Zb?Kz zRCwAg#=#kaFbsgvKTJUS>7Ar901bMkv`zr7;Qk|cz;}9>?#W)?9g{lfd^*Y|GW)>D z26y1>7bZqfghgG|G+kNLsopG=9JJ`sd+&VyXzSVH-GUN(_!>s_I_bk8lq!|+Cc=>q bFVCERT^JOw^=_ks00000NkvXXu0mjf@`5~oEA|6M%Kx7b6f(tVih*d3vb{6J%dTSwl#Ba_ z9f=EhC(-8%3{0fb@l>da#w$*tph|4PP;Iu~{P}~r_G*u6XqFAD$vKxnZ=xt(m?n1| e;Xr$Z@CDt*6!qM;PBH)h3IG5}MNUMnLSTa08BXQ^ diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/door_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius/door_top.png index d9ac071b0766830223204fb96b76f2e5521b21a2..73b62beede3e7c6a69f3c3d82416043df64e88a6 100644 GIT binary patch delta 186 zcmV;r07d`*0rvrrBoYa5NLh0L01m?d01m?e$8V@)ks&32g}=jhv9)QVs9cqsKzV>b zXl*lVb1Pb40001JNklA?53SYJ oR9nMBSW3+u?%VsW1+0wx1Gvs4ED7FvR{#J207*qoM6N<$g3Pu{jQ{`u delta 176 zcmV;h08jt-0sjGzB#}8H9BHGdg}=i^LYy)gpe@EAaWCd(a26h zL*czR)HVDSz`LGg`6)Yi1R_fKX;N^96>lSRr}8L&E>LR@%$cw+w3&v+Wjwwb6zw;C eQPN=b{|1nu6+!6NGhzS$002ov22Mn-LSTYIZ%a4; diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/imparius/grower_item.png index 813e572ecd3c485d29c13a916e9a9d0bb6ad89d9..829fc34a4e0843237dff791d3416e9d50c29e273 100644 GIT binary patch delta 208 zcmbQi^oMbRgd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul@&y<&h*h$~Rm<=$qC zGi&trERtC|N3^Y%BRH1JJ(AtZn_1tUMa6Jh-r1`_MT{jue!&b5&u*jvIpLlzjv*Dd zk`oTFOR%;o@F*rP^t_2;pQ^*Y?a{SUK;&u?YbTK}YzKL<|@hxU+d$RvuuJ1=_*j>FVdQ&MBb@ E07p?j_W%F@ delta 215 zcmeyvID=_|1SbbG0|SGGE`RVuGX+FVdQ I&MBb@0K2DCF8}}l diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/log.png b/Common/src/main/resources/assets/byg/textures/block/imparius/log.png index a90935815417737bb5e1572a5ab124ac319a29de..358560fffa9dcbee42278f33737b699ee229f0f1 100644 GIT binary patch delta 173 zcmV;e08;<%0qOyeBoYa5NLh0L01m?d01m?e$8V@)ks&322vc1OM_C6tO9L-I1SByz z9JBub003l3L_t(|+6BP@0R%A!1F-%S3>1ukf(`}c{A>CImfCfkxIR%Q1+Km?YQSIK zQ5UqU_~f8@%?^Qz#Vc&=${}TF*!by9p3r{4m9U+*a1Z4_!sz%Ce%`kY(Tg;Q*Z=?k M07*qoM6N<$f^0ZJl>h($ diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/log_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius/log_top.png index 828cd5a45fa6ad44f6c5680ac97ec79c538a5c7e..32e3e98f5bfd50b36fa566a44f09ebf79d18bf3c 100644 GIT binary patch delta 228 zcmVF5*#~lqE<~_RLwtJ*@#5pt#$FLDSnir(IK0a0`^|S~x3Ggps)adVrV@aI*=JTx}J=Q@jsD&9;#D eY1ys6bNmCc&@!joQI@g*0000V0;U3xB#}8HB?Kff2Rcg#Q(X#2SpzRWcd@l;qo{?y!$5g}PKS+Lm76u` zP*0H|7=MmQL_t&-(-n&`3c@fLM!$kOTQC4`0!8Nv{*iRk+F#@3qF2xhG}!J5 zq^C4}(}TxDlE`wsnxzn=)VrkvcHcgXWB)|{d66Q0#G>O!-9R`q1gjeq_Refgh0K|U z_w^Y?6g#E8GtAyxP;}-u_;_V*+VvH4r-)8bL?j4(q(V-tZcG*AvXq;xO#h`TF#$s5 R{Zjw{002ovPDHLkV1n81U&;Ug diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/planks.png b/Common/src/main/resources/assets/byg/textures/block/imparius/planks.png index 0c752cd87b567911e58212a2365c1ff464faff02..0f9ff5035e5b66bf9da7e93b28a0b51def6c1136 100644 GIT binary patch delta 170 zcmV;b09F6_0rvrrB#~kjkt8C2g}=jhv9)QVs9cqsPKS*^d4Mx(bMbp`7ytkOYe_^w zRCwAI%ux|TAq)h-n<{9if*cB7E;uL-00-b-!W;f~7Ba&ZpM){oXbDo1qM?tz&Rz@t zSoNZSmuTUIkk=Mf!k*WR1ur7a5@uF|HBqFLl$fJmws8~x(Lt;E6cUmh8l^wxI%n>= YUutR?%tB#}8H8C;c{cd@mFzr$&xs7{BCKzV>OYjgicFszXw7=LX^L_t&- z(IJ@FiSFgy#au{zxPwX5NEI;0y$FAdYgOA z3BPEr5V%Se*92}=EZG{z^fa19W}T!-Sb+isC!@E+7S0j>gd=F>()Ur#{ll1hk2TgG Y;a(FzLg9Xf00000NkvXXt^-0~f`{r$egFUf diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/imparius/trapdoor.png index d45f32855ababccd78485d6075d79a6a38afdb44..37c2da9d725fc5b432ff80f5298f03e6f2e39c53 100644 GIT binary patch delta 201 zcmV;)05<=T0)YaMBoYa5NLh0L01m?d01m?e$8V@)ks%;|6;Mo6MF0Q*g}=jhv9)QV zs6csuGi!4zT3~wQeJB6`00DGTPE!Ct=GbNc003x7L_t(|+Fi~u4#WTm13_%q{r{7% z$fb!TD&&Ddm1j`LZnkNXbj!GK0C#ZfQ0C3Bjuq~aa2dBxzpoK__6OD>U*n5f6}bZq z!)}vgv+c$#apk#-ny*pD!ol5f5QZk*{IksaG%DZ^-M<5Oay}Dm00000NkvXXu0mjf D{JB*d delta 199 zcmZo4C zfZ<;A-pGlH67_kWE{-7@!Kr+Na^56cQOXfn84P3AMlvs-%=AM3a>YQ8T zNk>oj7XkjQQ+CC5I;tGryu`Bq)L;Ktx9Z2XJ(lm~AM=;aD(ubp(;ac*|hMN!PIs3gnc8(U7oIfE-dSu5}E*QMp!8T diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_mushroom_block.png b/Common/src/main/resources/assets/byg/textures/block/imparius_mushroom_block.png index 6d42887233d0089a14d5f061a27b204bdfaf52ff..4b6b1a7ef697255c7b9bb4bb6bff2336f760049a 100644 GIT binary patch delta 178 zcmV;j08Rgc0{;P!B#~bgkt8C2MBcMF%&acFq8z216^4xtY<7nbL3jWF0Cq`4K~#9! z1;IfQ!XOX?z}WzIM7=}s0aPS+5cY0WnE!tz-SD%V!SsYA&?{~aG>GGfij_-Ll8}9h z<=-Q}*u*3Ol?(nDus?H-4Hh{c-&{lx>WX`1z|0fPdNB#}8H7C6kTMBcL%hK(GhoDOVuF1(`M()2%(AsBypNklH}3IF#Z{>vi;K(v71769Sce=D(o8JJjhyKEg@G@oMyf{JGv8Eux4NkXnD zj$ecMV34H?nAy}E3GTh@X;p_gkIyV3u(ge=(jw-~9uf&M{LX%djOw>44pB`juP~si iPtV+L<&$w__yg}j6m$^YC_h{P0000$3sUomT*;mm460H$+Gh4v_@8#?d6#N_y+lB-f%U+j&p>S}?wZ lZ|wl-_P%WZ_xAf3{sD~q0a?6+ms0=$002ovPDHLkV1mKnMdSbg delta 217 zcmey*xR_~z%0x?9Te$$A5LX5U2A6xAWtPt22#ytP>t(m{7OrS!Q88rJw+Bj9CAIDb zQd}iLe!>4?fML@ao%0hFCF(0YT^vI+f?fL<`HmWJIH^B+zvq9e{flW^Js11y#QdFm z;Vu6PUKUUYrAlW=GEon3oU6erwX zHAP8~?S?{-LT6RArbBgygX1yR`?CLwSETf>owR{(ZjPha`{dm3@^;az57a~X=HCRm Ojlt8^&t;ucLK6VbXj$6; diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_mushroom_pot.png b/Common/src/main/resources/assets/byg/textures/block/imparius_mushroom_pot.png index 1bfa5191ba350408c66788ec92bdb975630668b4..c735c82b850ab371e88a8f696788d24386cc6d95 100644 GIT binary patch delta 179 zcmZo+dcrtCLXL%*fq~)e-A6${inG8YvY3H^?+^$xifVW@OjJ~@2THiy+iY=WjozL` zGE3)(w)JuZ$8xzxvRipG>)W%a7*5MOdljgNu_VYZn8D%MjWi&~-qXb~q~ca`!U0wZ zAYg4(;89Gz&cM;lt#mo?J7gEh=MVL Zdq2ByN@TA;0|OTWgQu&X%Q~loCIEzJG>ZTL delta 190 zcmaFD*upeHf|G-pfq_9omp^!-nW~M;z0DS9*68h7B(rpmXj?CfiXpSUJ-d}RmwO~f za4b;af#&deK#IF0$S?Rm958tKGk%(=D3KNF>Ealo5!~Ao&38b7gXLr3);s?Xq>5iS zvfl5&i5Ax{kLC+3{^6mx^xC!Gg2xU|U*gbZD1JEUY_i_6(jzfCuMfs^)J7^CInyel lE$+useo$-&x8A~EjO$W4nLk-;Zv^Y4O=bW9 diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_phylium.png b/Common/src/main/resources/assets/byg/textures/block/imparius_phylium.png index 8efbdbc7cfd21c947683a556293e75c12768ea47..7e71e9ca250b57b5a386643f6da434dcced828fc 100644 GIT binary patch delta 256 zcmV+b0ssEM0=)u|BoYa5NLh0L01m?d01m?e$8V@)ks&32`ufoM`Ni`1yzKb2==ZhY z?XB73qS@S@)zz8Q(3I27mBzq~!@Y^Fn|K^ogA7h}3r1)SJz@?uQEi^cOaK4?jY&j7 zRCwA2!9h;MKoA7M%o?)-j{N_fme|H!MELXA+R$2S{#*bSKzmUI3QB8~MQhm-!m9OD zv1>de)`N;;o357A)$H*^MA5Ft-6YG%2G=!tWF97@L5=vn=VpX44deUtYkqOc7|Zt# z&uhGy;gWgI-|v-tFew+$X}o6nVBfsXbrarvaqjc^dioDouUGw}-GjUU0000A>0B#}8HJq|Td3{G_mMra&YgAF}muA6w%&6U~Qp8ERG?D(|#`NhM% ziP_?!#=wl#)tTt`wbam*^7y>q?X7_J{w$Fp7=MsSL_t(2Q!R}P62u?~Lj%H6#jWk$ z|F9crhvAb)6hKs(G_A@&(;D6?4NYjN-P4~JuYV8NK88_jq)<}>7baE+A_h}xW_y=_ zft`dWC=^Z&;h?k&)IS?hSJD`VccOCg569@4K4G4P65kQ|Nk>mVd4YBHW6cvit{}KF rW+uda-`;;?IDE`A#>$9eW%l?3R1E|KV;fbl00000NkvXXu0mjf0kLsV diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_phylium_top.png b/Common/src/main/resources/assets/byg/textures/block/imparius_phylium_top.png index 84619f757acbc7b66465ed3883b46b201b08e5f8..c4482f308a6b70ea6cf61f64a455d1833a3963b0 100644 GIT binary patch delta 176 zcmV;h08jt$0qp^hBoYa5NLh0L01m?d01m?e$8V@)ks&3299M%3PIU`LXbnAL4mDAg zmO-2V003u6L_t(|+6BRZ4TLZZ13;THfDJN+G2dfD1g*qI76>*P2C zc1ntgBEM!6x|AwCIM{rm2I`h9CGO4a>V`e{N-wZnPIV1EVjNe49RQ3oj3{danOpSEP9dA3YmU}U;8P_j?!3v4DC9VVTn5;*8IzL=Zd zumyX_BpuHsFRR*Bzy4Fma)&c8cr%Q|;j!#of{)(laYKqK&24;NBJ&3@y%Lpu*XS(( O00002U96LJ-l zyx%JHo4c(O%V0;Sp&mJNnj7qp)K(<SCGAwF{C zc^C$hv>B4QL`H&*N_p+*gZA}0AsgxZDYlv#5;3Z|7WIM@A7M8%-f2Q&()U-EGokHP ksP;gnMPwgFeXQL7X=NHfTeAaq3;+NC07*qoM6N<$g87eASO5S3 diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_stem_top2.png b/Common/src/main/resources/assets/byg/textures/block/imparius_stem_top2.png index 540c0f8016d35995ab995233e4053a09dcc66f31..2b54d0bff74923b6a69f1b035225f1919153b196 100644 GIT binary patch delta 182 zcmV;n07?J#0rLTnBoYa5NLh0L01m?d01m?e$8V@)ks&322vc1OM_C6tO9L-I1SByz z9JBub003=CL_t(|+6BP@0fjIK1;B?EK(qjZ0J1H>7wDhq-yxF%Rs%Ypr(|=bDNU>zi3wy>9v>CTrGnIl~@{l@_A6Z(Qu$1h% kHpENq8x8UqpoeMv0ZRN5f3EC+D*ylh07*qoM6N<$g8$}8MgRZ+ delta 166 zcmV;X09pU@0rdfpB#}8H69gnN2Rcg#Q(X#2SpzRWYEadaks%m=Z%IT!R2b70%+VDC zAqWN0N3;O!j!13(HLU<<#Zots6>b3z(jTA-`??o2F zT2Aj+&_?Yu&i*f{#=wf~smn20;942_YD=p(sHl+S4Iv}MUdO2{<-&1NAJ^*#ojedY U&Y(W}00000NkvWtM6N<$f)d6@p8x;= diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_vine.png b/Common/src/main/resources/assets/byg/textures/block/imparius_vine.png index b259934b72ef42f53a38526a6d1414881a8a889a..6deca4e722b98bb49aee63eae7c3bcbfc2bbcfc4 100644 GIT binary patch delta 161 zcmey!c$0C0iV$akM`SSr1K(i~W;~w1B4whYLcM5!Plzi61B1)G%@$|Y=wD_Cs#ZpDj#hm5^H_Vdm!WH|QBm7@k|7K5j& Lp9{-6r-UW|`t>`I delta 166 zcmcb~_>pmf%0x?9Q;7hd5LX5U2A6xAEzYdr%PA9W>lLnO*4wiPDEMW|%vd1BQ4-`A z{2u}s?ltd?oTw;~?C0s?7@`rpx9=n`gCWNej_Y6Uf8;yvwNl}qON5$JL$Qd#j`oj& zeVxmAQ<@YPvH1EW`}8pVQs3%4aaZemu9HD|e~Mi%KGuCDR@D8hmBCI?m(6c=$YD32 Obqt=aelF{r5}E)ukwj_$ diff --git a/Common/src/main/resources/assets/byg/textures/block/imparius_vine_plant.png b/Common/src/main/resources/assets/byg/textures/block/imparius_vine_plant.png index e571fe0b9b3776a9358ec4e06fcb485bef102a34..83ddf59ac7b87e37423234df3c587ff6e704bc6f 100644 GIT binary patch delta 197 zcmV;$06PDf0{sDyBoYa5NLh0L01m?d01m?e$8V@)ks%;|6;Mo6MF0Q*MBcMF%&acF zq7{aX6L^CTY<8|oX7~UA00DGTPE!Ct=GbNc003l3L_t(|0R_Q<0RSKf10ZI)|4$B( z4D8-PG7qo^l6eohTaW~>*FrKLTnq0dnR)gKkR-F$7O36b>jT=|ySDEQuzOWZX0TiE zUh>%8;vpF**u5i3W&qnHGvfi8ObdWydbbBY?P>wW{^Cvl00000NkvXXu0mjflC@1A delta 207 zcmey%IFo6D%0x?9Q;7hd5LX5U2A6xAEzYbFZR-`TXx7`ah%cuMD9Alaw**LWlmz(& z|AzpEd(C?zCn`$RmwCE4hG+z<_Ma4FP~c%QP5&>uJHd|c#KbvwtCMG*(VEAclc?tF zabcNSvCDy&M73YIq76*xk7cOtuxsbhK)dKo}Mqp6L^CTY<98a_Sr7{c-*6LU)p?=lVShkRr1qRS;2$EK1_gGdmV^KR002ovPDHLk FV1h3qbE*IU delta 276 zcmdnabdPC*%0x@qRGR>w5LX5U2A6xAEzYbFZR-`TXx7`ah%cvXt?|uy`p29~m;FER z|Em2@hpc%i89V>)`oGumW!jFzQ(A8{%svm)c;9_PERYf@3Gxg6j|mw3{htd?RFtUi z_H=O!(Fj)Uj}$v>z`-oM`NrDa#s7Dgx%~K;Jb}e-)wyDk)Mw|4FSJ#ilJXGfy`;mc zu>9Ao*Ux4)@O94m{`bTbC8o0y+4g@oZDCV!*6v7Fj}E@spmNW&_kn_@iA$(y2h)tT zs*4XT<~#Fx>-0BK{j7)U&ik)#D|0)iKX=`32gSO&X6|)D4s+i9y}rtRjS1Hd{qw?7 QK!-DUy85}Sb4q9e0HHjFasU7T diff --git a/Common/src/main/resources/assets/byg/textures/block/incan_lily.png b/Common/src/main/resources/assets/byg/textures/block/incan_lily.png index 2dfa74bc8290758c1623c4a813461eda825c1d7c..7814e2b18cb718e51cb43dbf7707375f65b6a84d 100644 GIT binary patch delta 195 zcmeBT`ocItLXL%*fq~)e-A6${inG8YvY3H^?=T269?xHqGEq^r9w_nuuK&~YQ)g@! z2lwdcq^r&3PgC}j6|S`hV9yxJO4PT}|0fR?Jcos6?eN z%>qbqmIV0)|AzvGVE+oCiHZ^x$(}BbAsWG@y@7lO6gZq2S$F>LysngTa?(e|x6Iv7 zmj650@iME*m3d?8Chw0M-`?Q3U)HG0+jSw8HAIH*kgGcLG9fGG{gdalzhmQ=zG>K_~iV$akM`SSr1K%MKW)#)%YM7{~P%jtY6XMFiz)%#WALy{u!*N1_r=pX= z99OeqKPyQW1AcvFPlv60!htFnOM?7@862M7NCR>TJY5_^Di}i#9-PQ*D8Rf?u=?ht zPyRQa?mjOi5gpW{k>a)H>*`ktQchEE@CZmr_Y`s{8D2Xfk)+`(=&oca<~29^}~eDWpODYud&wTnvnDsz(4rvIs(`}*Fdc)m zncXHTN>n6!x;Tbt1TXFN#lI_ zqZ!MD+;X0^8BI%i?DXad@1gT@F)o+G|Gd>?wFYUcA}zceW1fq561~k26J4^ zirwzU{{kwE_H=O!skp@$z_9*5!{J0hd4^*%y0sWmKPgXRVCR%v%}_IYha`hK`_(pv zis=Oj3`~mOBpH(A6C4;ga99$S3eh)bxsLQ02vEB4FCWD delta 160 zcmV;R0AK&!0pGLyhQ&Ie#r_sI)xWPT!|LR0skOy~3zvZ8!9 zQLU9JM`Z6H8$u)3$SW^Y8hu}X1v<@!ShtQt@ O0000c diff --git a/Common/src/main/resources/assets/byg/textures/block/indigo_jacaranda_leaves.png b/Common/src/main/resources/assets/byg/textures/block/indigo_jacaranda_leaves.png index 91bf3ff7994c9bf237a455a795bcfc6da03d9a92..e3af271e0dad198c9f6be081ed8cdfca9920990e 100644 GIT binary patch delta 196 zcmV;#06YJb0)hgN7zqRe0002(-QrS_ZWxgy9e)o{OjJbx002umpF=#0LNjnNB}=G` z{el1h00DGTPE!Ct=GbNc003`EL_t(|+6BRZ0mC2&1i+7B0MQPh&;dX)fT`?1Q}1AB zbxSM^db>$2*b&+0htOO%$3x(&;=~^y=Nfa-dw6c-FRG8 yFfHgPN)%8WTdW&p%68VoYAq4Jf$&P8pZ)=&DiDm!o`3ED0000^U3^|J+=LwWjBWaw_Tra!=HeK%E7PJO8;W5WT~{?ewg7>dq!h|#L~v|+`ds~ zTrExI7c!c-J*ilC=xBphZ_Gm07oSspzJ5`2dEZ$X*+V~P@z-u+I<<}e$Z89q!x%hW L{an^LB{Ts5F*Z~X diff --git a/Common/src/main/resources/assets/byg/textures/block/indigo_jacaranda_sapling.png b/Common/src/main/resources/assets/byg/textures/block/indigo_jacaranda_sapling.png index 2cd3e55fde53690c58fca6d88e75bd67fc4b2465..62312158f903d529bc7aa383df99a9303557ec81 100644 GIT binary patch delta 191 zcmbQi^qp~niV$akM`SSr1K(i~W;~w1B4whYLcK(QPlzi614F4-P@0{Kx7B=Sn{FrL zfEe|;v!}OJ->lxonOHoz{8B@%@x2Lbo|9*v o6jJKAGTYmnq454>rU%k2_M7)JZt#lX?gW|U>FVdQ&MBb@04TFUasU7T delta 206 zcmey)ID=_|%0x?9OX&cg5LX5U25+nRfjY*{Hr-Cf1*Kj=X?8BoiW)$1pCyIofD~s* zkYDhBC}0TouMnE3C{bVN>Ealo5!~A6$j7Y6!|XX{!@vLC){avzd<)`JICf6swEc7b z4)YTiSW{lEx*+azt?Z@Ar7+EJoeT?eZUy-jx?Z@w@{yNH_Om%_7r3=ev3HK1n{0K- zVZ&VyMTU<7Hgge1SbnK0|Ud`yN`k<)=5lMQK|>>{=ck$dM4U`e)iO`8}>a>I`y74#>bS3 z>@t)$ZFQMl2vosX666=m;PC858jxe}>EaktaVt6D0Jm2J*8!8$CEqm@*sOP}Si5uu z3opxH>Y2!}l$U8i&oc&Qj^?u>YUymjJi&)2FfP3*B_ScfaQ7j*ydC delta 183 zcmaFJ_?K~l1SbbG0|SGGE`RVuGgXTk<6~39Ze%EL`v0>2>6vJqdQboP+4enAN=0@+ zRr;%=Lx2=lNswRge;8ocbVld=L`8}8AWs*^5RKs8o1{_XT*G0Xne^~06dujd0 zg&%|jVt(BnA4oBq!F?i`$uR4I|XIa$?19{{uve^d3I%(vv>|pk4 g(9{~#bfysg0kAwPL}$QrKL7v#07*qoM6N<$f8T5c405?=(-^Jw*jnA28>Fjr zd8PzhxLFWSaKhzd+j!7&lcdd4gLf^d?(-&v`t=phUm5fwI8dC3HLDfVAB6ZB$Z@E8 QmjD0&07*qoM6N<$g2ggoS^xk5 diff --git a/Common/src/main/resources/assets/byg/textures/block/ironwood_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/ironwood_bookshelf.png index 78ece58bfaa195e18bc5c64171a655cd67e989b6..d29c7f63ab8dcfeb3e197155d614e9e0725a7f11 100644 GIT binary patch delta 341 zcmV-b0jmDj1F8d%83+Ra001a04^xpwCXpj1e`!!mR7JJ5wWym4iHV7ahlh2J5q5TV ziGB!ZXlN0RYhH2+RaG%tj#5%mPft$_Yfwo^Nh(fyycQNj zL_|SBL3c0*KR-W_5fNi31vV-bAt50h9UT}L7#0>55)u;jdWC=h006T|L_t(|0R_Qr ze@g;k5Qfof?&lfbmLMU+p#T5J5;A2!l*leSI@39}PecZ|Qh@n~p{fGo*N0J}Y6+yT zZ-R6U&xoMuRF4N-R=NeiPhuTll%SEEoJ<0>-A=M<&%;zh%QbeS2sfZ0+{_b+2LPZ= z=d*xod!ww3zh-W2w7advW!~kzAI{nXKQIl!c^LZj-Dh}RB@4`psgn@UJz%r%t-sW~ n&1nwrOWUgKSQr)HRtEe7YoSvDJZVk~00000NkvXXu0mjf@_C1> delta 387 zcmV-}0et?d1J?tP83+OZ005AYXf}~WD3K&1e*slVL_t(IPi2umOT<7B#kUdvphX0i zG#2UPDn+mj0h=^Nf=3ELgli(#2}ZE6l{5isOB=sHIzODh*_T^`KKAZrXWpCHdFSf7 zUIq{-zTZH}SQ1>+q-`*1+20RVPIF5balaU}9)fgg-BQ#ar}%XU}J%Hn9WZP|)c=0v}>u`(d)={4;jzuD=JfJQ)9EP`M= z#0gPQmSvvjn4`P|Y6|)He~z@DNZU5Ie z#Kgq9y1IsjhJb*8a&mHPY;0v^WnW)kRaI3^PEJNfMw`W)LjV8(fJsC_RCoae!2xa) zK>!3W&s-Ex>Hj|p2sP>LVCVT`-MV#u`mskJJGsTl@6XSFM~^J9-a?to`1SSoCl5H; zRbn4~SAi@xXxC&T&PpMOC8B49&>FpOFYQj($#cywm0l`4f z&B-U}BRDy^1WJbv-3r}0bQAgpS@HzZse8q(570SFAdn%&VALS?rzgFr^$cImJ>Q>m zbML*H&*xDTwOXyBDBA7ze-cL%^YalteWD~uVyDw7tkdbN*XwS#Ym9*qrNnU@-ailT zf8OI)9|hg^dObdy&BpUQBHRJRRNtCnmR|?W+~|V|k&*kNzaPi6oBEsP@{pnOSEDeNANar1U3*SZ~+S!kX%Dz0m(I1p7;iU~-PZ=-3qas>fk!GEwAfq-D;D=R@8*n_v@1)OMIiI@wTS%CIa ziGST>5_@+qM?Do6xR pN9rIadllfWn3QnM diff --git a/Common/src/main/resources/assets/byg/textures/block/ironwood_log.png b/Common/src/main/resources/assets/byg/textures/block/ironwood_log.png index 79b30b444e340812bbd7987b6981912d50ed518f..fe88e936ca67290ee87f27242b64f7a29f791911 100644 GIT binary patch delta 207 zcmV;=05Jdf0k?N(ssUzfcZX7(+yYxa>&S|RdPere~{Z1dP;BB znpsNCB1obepoZamIG*Om^ZltLS!BSlwj;$DJ>YU3^(eIqgP^FO*2$XBCJ)fKc{7m3 zCV#5QolV$UUr)Mi2Su#Cp90b@YT(57r_DeNR$*>L*}oD}52G}zY2}ISNO`uQNS%X% z@1ND$*p;!H{^9^_Qjx0$FkTV&Q}|JY!q6GBlyV7NK*?`GbkolUZz~=_d*13OcAGdJ cgl1cpFJ8~8q{_4=cmMzZ07*qoM6N<$f`Af)sQ>@~ diff --git a/Common/src/main/resources/assets/byg/textures/block/ironwood_log_top.png b/Common/src/main/resources/assets/byg/textures/block/ironwood_log_top.png index 74ae314bbe5b5a6f93a70350747ef986c009973a..fcda87512d85f58181e0a50c7cf826556d7d0f54 100644 GIT binary patch delta 255 zcmbQte3fZ}BnLAC1A~SxfAB;%wTa4V^_BrXA+G=b|9}1Z`N`8)=Pz6hVM7?7zJSE< zJ$MC?s;jFjDk{p%%#4VL@bmMtv$MpVTPd;O2wraR}(sn0L-^ti5eBM;~f22WQ%mvv4FO#pYLewqLP delta 319 zcmV-F0l@y%0+R!f83+ad001BJ|6!3uD3K&1e*qCmL_t(IPlb~^j>9kvM13+J!L_g8 z)(7xag48)lkb2w2b^+opNb4wi#6E*D@)0m1MM4`@L!j^h)CVOZ@nO<|2?K+kdX62a Rz!v}j002ovPDHLkV1oU}gzNwS diff --git a/Common/src/main/resources/assets/byg/textures/block/ironwood_planks.png b/Common/src/main/resources/assets/byg/textures/block/ironwood_planks.png index 3e5873a3a16e2d130af97ed6ec4344704753c820..9854239614a6297f8560cba7e14d9ecc35e086e3 100644 GIT binary patch delta 179 zcmV;k08IbW0*L~U83+IX0026epuLesCy^v2e}_p#K~#9!EssG8L@@|My;{M&Ae3zX zGAGCty!H?~E{qgkOr!7ZzTfxVzTMp+kp;>s0kNY90Dh^c%&I&m^SGbTU}m<7gp3eG zEg&%fie#-TfG}+jtB26C^DiOvP+tXsig_qVtJY(4oUF9Oz%IgO(M-G_cw2ivxIs|Q h9oRWcX4z-c`~aZ+U`u~*-wOZ$002ovPDHLkV1li_P9p#S delta 253 zcmVU@~p>BYY8m-rM>_F`MelHN}$BAaABwod{*tYFB4umG?t4Trpq&>|^cAPcb z7<{(^p&o^%q8-j$Y0k+_oXr|i;1EpowUU-6qtswl2!n(tNjh%vM#B4Wr0Uq6848`dom^_E1lQ^^=_ZFV5;g$HS100000NkvXXu0mjf DRuXl1 diff --git a/Common/src/main/resources/assets/byg/textures/block/ivis_phylium_side.png b/Common/src/main/resources/assets/byg/textures/block/ivis_phylium_side.png index 71ba4e97d57df6d62b88634744e7e20b97de2d91..7ef5f128e500f4bd6c1a133020813bdde6b7c79d 100644 GIT binary patch delta 241 zcmVac7q?iy)Hrcgs0dBw%T=4+TvWao{1K%lq55^4r+n5fvw|)2OK3J?B_#Fx7+{l5% zg`_Oh*xjF0RGf39>*ltSG6kp->cxjIdF;+@i79>rx+(}=RDov? ryseVMH33dIHfiYXu?w>(s>AvZ_z^FrzQ{zL00000NkvXXu0mjf69jAl delta 235 zcmV zRCwA2!9fzjAPfc2Up)a6Pf$BuH$%z3Ky!eq>@|V=AHnw!dd%%w3)DjOz0P=j?~)}e zQj<|gE2uAxC)ptW(#t8p?f5Nh4H6&AZA*?rRM$ui!;Me#Cv+p~y$qx-BaXMPJAAIr pk`sn<2~-vKDL(Diz>)^%)BohIATQF%M85z4002ovPDHLkV1h|2P{RNK delta 187 zcmV;s07U#F0D{rY-IvCw8tSKLi6qT*2HLPwr7fP9ApdphE*c(yF+T(y?8I+bFk=4 pa3&oz4B^@ND*s0`Ihh;(02D)&76{gh@*n^J002ovPDHLkV1hK1P_F<0 diff --git a/Common/src/main/resources/assets/byg/textures/block/ivis_roots.png b/Common/src/main/resources/assets/byg/textures/block/ivis_roots.png index 63edc874232750b2f4cef0249b06a472c0f9e278..6ad8e1f9f473430aa277765f6265b1640fa585b0 100644 GIT binary patch delta 168 zcmV;Z09XIe0n7oAEPr1He#oZXj#RRVM6!Y}vw9JmX%>cV29i}4VNC{RG6qmhO{1*< z0007XQchC<0+^kw6aWAKRY^oaRCoae!GQsTFbo4QjRG;w|Nl+`0002ze!=hDFLC&2h4mB04U{~0SINT2N0C^K0t~nfMO#6R;3yMSyBr?5Fr3)qX1;Px&e^2*1{k5 Wv;sNGn0WdC0000c67GZ7%l1&C?G6qoVVb4MU z000GaQchC<|Ns92-`uG400011Nkl diff --git a/Common/src/main/resources/assets/byg/textures/block/ivis_sprout.png b/Common/src/main/resources/assets/byg/textures/block/ivis_sprout.png index 7d5b63de7dba1388845b9217ec0f26d62719626a..36c79185042207d329d23f55623bb593cb3bae18 100644 GIT binary patch delta 151 zcmdnXxSMf;PW_2xcl$y%b-HY7(%)PmvZYFJcBWWcs92&)e^CJg0|R48kY6x^!?PP{ zK#rfMi(^OyBkRFN#s&ihCWS2DzyBWr#Sc_7G1T}oG?cvKtnfG3xBNl%E3LN<);kX} zELP-ISRKY_u!=z=kin#gok5l1LMCHE3G;y*wz`{h7gTe~DWM4f DlPWb? delta 153 zcmV;K0A~NY0lfi`EPswvvWY~pdJ&s~FSE#|-DwtvRTg1*6tve<@=gE%00DGTPE!Ct z=GbNc002-)L_t(|+I5Tp3d1lE!?bv_@Bc3zJEqPLm-LTKoaI>=FTZL=)5=00000NkvXX Hu0mjf-}XFY diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_bookshelf.png index 7b0f793145c22a0a4f847fee8ba3434739e97448..3d31f0023117be163fc2607c0b36c37fb975510e 100644 GIT binary patch delta 356 zcmV-q0h|7p1@r=t8Gi!+001a04^sdD00DDSM?wIu&K&6g003`LOjJexxJ}Qxy8f*y zyRWaoo1O5O0K1ZtxQ~#cmX@QElB|99 delta 650 zcmV;50(JfL0+$7l8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00L1-L_t(IjdhY=NK;W9 z$3I)^!o5>hHn&CurVmZTh$!p9N=B6FOUQb#f7(lL21al7Ry_nk_25%QX;4rQdorVl z63J0nT4EPsVZs<}Hs|K<88^JQhi%8yI#1`E@9+2HobTuBcz=86p3SOd3IhN|)z+NL z`%HG8?-NtF0IuA=1%O9$1F&G^<*>kpjTokhrYIyb^TeAk@q2NO+Uci+f(^J#Vc^l+ zXo>>BK;Iky-8a3crMtn)9_)OKYRmdpXFhe z3;@~GG=^!C$jnPWvZ-mQudndR9+xf(R0>Oqc0LBcWbG-O)xpx;dD&p4b=FmQv14%> zeSRD#4;-`se5y)KWfcIaT$ZE|E1vqdUakRf^@PKcH-8kFmwEp$2TMy!#;0AC(70mVF&^|CLaU_&uTgYUxREQ7Pn5x(xaij~&cyD3TrsPp+H zm8~a6C>Zeb$v*iF7r?}DkSSf~+_Q0dS7EyG`j8|v)H_0kVg~G3oURu$#Q{6pbm}dG zvDW2AJ%7@L5Q2-LSG0sXdHHCFrjqutx|OM<&M-5`1eGzuO3p3eP6B}dJ3`CTccTkHq!9R2bxqA5<%kqaPi1ta00000NkvXXt^-0~f;L|{mH+?% diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_bush.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_bush.png index 226bb94503c06275d4510e74e5d4521b18773d78..fbe10ebdb2d490fa77bacd7df04eaa1c9a52359f 100644 GIT binary patch delta 218 zcmZ3>G>K_~iV$akM`SSr1K%MKW)#)%YM7{~P%jtY6XMFiz)%#WpX0PV&UsRTr(&$p zyioHJKPyQW1Aa>tFK?sSYCsi?B|(0{3=Yq3qyaevo-U3d6^x+=4^Ct@6ky&cSbcNS zC;uBycb}J%hz{z}Nby?pb@i(RDW|D7cm$-RdkQ&}46mJ#NYd~XbXPJI^O_s|aamjR zBM(~*^RuSMBrnNuvM)APopZ5x&*$UT&)*b3%eAlmHgEdZH@5lNXV<5n-OsO_%p93f SedQ9+at2RVKbLh*2~7Y><4^AZ delta 227 zcmbQlw3cat%0x?9N5uf25Z6%il31g8an6%+oR(Xvcrh?AxES#JSxF{%Di%fQ1G$zB zYj*=F?vfzC;Qw&I;N{QwX`-S;eVwO^V~9quYhSm}5d{ur=YkDS|J(nVcI({Fb83r% zT8!6BQMGOjxv<<;J8sG4j*T2b#@17^EpIF_c>XN7!^YSnP|Eh%N86An#yHPA*>N>p zEs8t+Ez_lm0=?_a-IU$DQOKZd>JKZA(N XQWldkA@ij`Co*`t`njxgN@xNAg^*vL diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_bush_side.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_bush_side.png index 967045ba70c1a248bc5196fcbba0d232461dc305..f422607ba6c0bec708b1f172d85463efca1b09df 100644 GIT binary patch delta 175 zcmZo-dd@gOMToP&BeIx*f$ty)Gwzs}{dS_FLcLIcPlzi614E9}@;K*7u}1Sk%}Xp* zys}m-Vg-samIV0)GdMiEkp|=hdb&7QCLLR8A>~$*q;^qBUu8~m+VnrQb6?-vbo`L{OTRh&AN%$t-svoNFaQ59 b*iKhKh;gFhVc#u4(-}Nn{an^LB{Ts5ISxaG delta 183 zcmaFP*u*qJWum35p=f|lh-;{MNvzSlIOj<@PRlJ-ycobB{ZNh|kilLOc)m zncXHTN>n6!x;Tbt1TXFN#lI_ zqZ!MD+;X0^8BI%i?DXad@1gT@F)o+G|Gd>?wFYUcA}zceU8)eIOj>RM)N|= zOO!V;lmHb*d%8G=RNP_=U|9d3;c%j$Jj1aW-C7K(pOmLDuyabTW~iCHLy|$A{c0OS z#q@#%1}4RCk_<`m2@VV#xmR@=Cb^}|U~oO*v5n#3#>ol{)9%cj$FSl}+jNF6E}nl? YyJXYuPWgHQXbpp>tDg(YI;Vst0Kj-VL;wH) delta 160 zcmV;R0AK&!0pGLyhQ&Ie#r_sI)xWPT!|LR0skOy~3zvZ8!9 zQLU9JM`Z6H8$u)3$SW^Y8hu}X1v<@!ShtQt@ O0000Fy8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJew|Goe0Px-wg z!JD1Cl9RZPkgJ4(rF(dvacz-lWQJ5$aYsmkD_&bZKXWEiZzWJ;AxBgkJV_WdIuj`_ z5Fi*Q8nyrc0F+5YK~#7F1;J5D0|5|3!Phe#H{wUY`=3z^h<{mRXWA-#BE&4!Bw&G< z9iT<I3R0pohnabKW^Sps@rC%_1SWZ!4?Bu>rO7%llu{ zyojW`$N9n%9f?e-dQ$~KByxM9tGERf?YshKADklS&C{8CxM%>4B^@J)3KBAC8;&nyL;urQHT0oa<#wd-tqnZc;C$)Vw-}J|@WvL8t4pw)~0Kwo6k=O?>wCJb59= z9qEB>ZM)RGIz~DvxOw#&0P~A8lrEgd5;ma>c(ySIz<*?A0zm(dqKIwZW%0v$oWatI zB=C@z@2?ZeKu0OrNVBsQyfb1mE*sjsWx^_wkW_c2)AW1wo~ z^BPSl`6)L6Sa`dj^D90;kHL*fB{rgRCy_X|% zcp2!eZb#E;=;pXv2k$``_&mM)h7-dDJ#YO&H(OYCN^?+rI$a+F;Max|%cf?o7$_!r cAz~VUzw$sOsGB3jsQ>@~07*qoM6N<$f+C$1+5i9m diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_side.png index 7f24709485960e01f6d010b64e6feaf1d4adbf68..b8c9aa05f5de02ab948b1ab9b31a59fbd4219d84 100644 GIT binary patch delta 286 zcmV+(0pb3$1+D^+8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJew|Goe0Pr;j= zyONXBmNK}HkgJ4(rF(dvacz-lWQJ5$aYsmkD_&bZKXWEiZzWJ;AxBgkJV_WdIuj`_ z5FiSL)Q$iE0G&xhK~#9!1;J5H!$1&3!Pm3x#K?RE?tet2Ab&-PjpCiAO5X@En;Ilw zftWpkA%Z6-)`W0!f{o#*l$HCCAF)U`8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00M1EL_t(Ijct=XOcQY! z#(%Ws;J3r6={XZXX-N5m#3V(oV>i}qF6M&B3Nlu7I z0g%i*X)Oyt&@0kdAD}wED)E2hun^+!No!dbQ+>o23q=8F^B)6X(~wbZy@u?o^8yfW zK2?JSsOxNMuW)GM&8KLp57Jm4aHZ|p8Xt;lhoN|aUXl6PDdwgp2zo{4rY9I49bnJa zYRDsFgUruPaeo-^i-n?OH`WnEKLFWG8o?i+C(*&%g){&?i4GK5axsc5VVMT8P}DKe zGIZCNU^wD_Z?*Idfc|hd0G4T>l})rlj?%t~YU_A?9?xC<*8ys-KwdTo3N~x&pIQEr zA-j{us{Ev=?XtVQLw`KQ&;^m!@D^|0m08Ms#TWF7+<&}!4S>m|`^5Wt5kx*HNdJRA&Jj(gqMcyxM;)#W#^xkMkktMXUi6Tq%U3`fmOQ^PvYU?Pn#9pcB zN_#rK;CkRuZJqgB<Mh&2sS(m&aClG7}}gn|BFS^Qzkge*i)BquRRDgR`A&w1^^+ z2B$o^AAcnj(j@|O8brk)z+#WZOV#TpF2Z|Xoemt$?MBLDyZ M07*qoM6N<$f}6lRjsO4v diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_top.png index 1031ecf3bcaecc4ce3cc2676e5bb59195aeafaf8..69d9435c5f45cc8a80919752a599a551ba074fe5 100644 GIT binary patch delta 216 zcmX@h{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z9&E6+3L(XBrnYX~*TO z2877icuJU932W*JD5&vDeSMk32UJ<%>EaktaVvR6hCeSa?`*@l3mebgym3RNv3a2) zkiK!Fr+ML-fWQDxPm8&VM=wO)I1zE9SMkP$2p~J~#uUXH0UiN?9A^x~%uL)8B{Vr5 zm-Nh;I@du-v+dj|w{wT`crNp_vaqtY8YhMo82B_qoH`kBle5Up)tVvUwruZDkEVk_ PM=*H0`njxgN@xNAAq-Q) delta 447 zcmV;w0YLuf0nG!D7=H)`0000V^Z#K00004VQb$4nuFf3k0004pNkl+vp=T z*nzxf5`Um)bYF7c;hcNlIk~qR>z`x^z*+GWt7Kwo2Kx}L1b>rgic!=NNzA2gq5ULF zo}V58==TQHD^+a$d@n%|&jILk+W@@0zEO}r`@I1zyLs?3fUTd?vYYgK1NH6X-fpa| zl1a;Ma(mIhTlmz293lCR!J9dEW5GB&G57kEr z{)>zSZ{gz@7wVj@rM063u-Sqfq%T4>JSjiDVt_)l5}9e|A<6Pv2;w=>N}x@mDF7|I z32dh=w;+)xfB*hu5>3&JqE4sV&OFbwB0nz5HEn3fPw)iSPsFf9%+Ih*>yDFIMmdq14xDv z`?P{&v{AW4S{&>6R>+=OiTp-)OsffG)0000+iv@l+&-k2915nB5h{l)j&&p_&@>**J|-GpBD4R@T3AjKn^jAaoQo%P`XxER3 z#ur(5_ug}_1b-!maAJB20Hfc-FRTj1fFx7N=ZGbeLv=~Mp}w=Z!P}3Y0Psgt70c{W z|Gw`$2*@ES`5en@tF&r|o)`g1MhQynY;JIA^zbz_jcRF|*%u2eudRAiEwk%68~xtD z2w{|<1b|NztEFu$v&)q|z#Z#02uGeFX4lh1RF!8hUw;uxB-zbm{!8Q&mINA_M!8sU z>^q8MhH3PB*A4`U7?Oa9Ga5?}dLpNP}E1VRCU-exV%AjSCa6LQ*b}F%&zC`{#d$g!t*uyN7BLi~!3>L=*WdJZ;CX>d2&vVn=dbI}d(td}$x z1<~e_T9u%c2_}0yQGWy*>8_wKXIoGY3U-!Hq64K$`lweBsVYpM9yVzvb`e&tnfRPg xPy2!n;|_FR+}x#ngEDjU>Gee=>EzY;`vYCu92RedVI}|o002ovPDHLkV1mXTYl#2= delta 626 zcmV-&0*(EL0{;Y%7=H)`0000V^Z#K00004VQb$4nuFf3k0006xNkl5k<6UiyuU(22C#aDz`WHEqAHI^?jT4<5}L1!#U@9o_}*LeVTv$3&0m1Cp&wz z-R;E}9spg51p6ziNPOS;(hxt{*&_sSbg&D++U_>jJ8w~~l+knp*Rt`2$C-1AFFX~O z@57U0Lb95s8^pp9G~FORK7ni5%+F+b^kf{IQvenBD`onJM(7`cP*)Pg!fWtiVD$0D1Qr0O;ZPNVbKnpl4PR?9_5c6? M07*qoM6N<$f^V56O#lD@ diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_leaves.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_leaves.png index 6dbd9779e629c6558b6fe4912e25d5effe9d5978..1b9e5de08083ee724f8bdbc6556d289e83c2b473 100644 GIT binary patch delta 196 zcmV;#06YJb0)hgN7zqRe0002(-QrS_ZWxgy9e)o{OjJbx003k$2*b&+0htOO%$3x(&;=~^y=Nfa-dw6c-FRG8 yFfHgPN)%8WTdW&p%68VoYAq4Jf$&P8pZ)=&DiDm!o`3ED0000Yg2d9s^W45s zXIw2!-2s|Hx_!pu-qE MUHx3vIVCg!0E*O9lK=n! diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_log.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_log.png index 979b3c26b20f6a0135936dbc4e7f5a36769e9ed2..9fce85b1c4457fac42445e1183d96552000b09ec 100644 GIT binary patch delta 200 zcmV;(05|`$1K0tO7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-spKe->Wl()t zNN!L;VMRDjHZKCFs=WXJ0CY)2K~#9!1;L9A!ypU=z(-OBh(806*aINh15l|00NH<* z-XY4%PRrpXTk>}3<=t%?YKvPk7@ro8rV!3yrmhXNOwGLGUO}Oc^1w4wS&xaBX)MP? zte=pVg&ePvUSDM2_0}FpUX^SJ?AVog8mw#)n*Il0_Y+h7M?Gc$0000;7=H)`0000V^Z#K00004VQb$4nuFf3k0004PNkl7O{CGp#^~@Jb9)Ity0hlkAIF*dG517p+ zBi269c0JRv;=>`v?49~tUFHC6!X5yXY>;ICw(HsMPJ;j%72HTJV}cbnDyU?%T~A%+ zG%EOTVC@65$%ySPP?tGXAvo)F&J0CLaXQxcR>_VHszUhsZU>No0p!$g8r5Zv+k`zP zq|pGV%RKrFVSl4CpbFs9qBM|NRY+`DmwD6yI8v}8+epgUd}brLBwfAp;qY%gzyP}0 zIkDZ}B5RgTww2mci?v;UY_Rr$Mo&C#(m5)2aF!DhRK*EiRS16%%mLo diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_log_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda_log_top.png index c38d1ec707b5ec170200ee9cb3083fdb8c627d87..7fa88d436b24b50366126a168f92f0954ad1b6bd 100644 GIT binary patch delta 260 zcmaFFGKFb^L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Q6R75ZB$4Ca-R3T3TH(zc6=x zUQ};tKwC&yZKOwDfMcP%N204mw4J@5nZ9;f;vS%u*`6+rAr-e6CotsyXXtW06;Ts@ zyoRBGK}dknP*8>;VE4?-w6vLA42~NZ7zG6-B^aD0)G8S%D~qW!I3{XN%bYA}$`CY3 z+emqmr6@yDqNZ9>vY0AEQG%t~I#0^$Ua7=H)`0000V^Z#K00004VQb$4nuFf3k0006UNkl@UOs#HyXz?)+?}SWB!BPARdQ*;?2YTx+%wW5 zPPtNNX?}`!uTQyBXa1%GK)F&UmKJfIK6(zo1TdLz;VX$DOp0?^0E#m$dZ#Xvd7I)4 zddihI#4^b-0A8=I0x&KF0JfFF?RK!O)BthN!0mPbc(S}qE-i>%6(;RY3xF3ZD?}&! z9-RVE`cR_XX@6lQ1Tg?#NzHuRI0C?z9)_71diJG9GG}93DSRbKi+HfW5GJ;j(u|v% zU$hNC%P!t4=yykYWRhdVno43QiQDavS29qc6p!y0wE{+qyKPyj*0!V3Ryk~uq2kQQ+O3JbFo2wLe}o+}J& zV(K=B)lS_ZU^rKn=5D?E{Ov1_dCrfM@4PK-&_C}o@~g$h?k<*j!MpX3Smp)w<}quZ j*2#|bsU20R)?54mZ*={p_`ihI00000NkvXXu0mjffT#$xEAJ`PY{R%%^NPtSf~9Px1UXBbx*WfxaY=@f?klrS>tz7!*Mz+`zN8c bKCb!)9TOv(;>a7c00000NkvXXu0mjfZY5si delta 427 zcmV;c0aX6+0l5Q^7=H)`0000V^Z#K00004VQb$4nuFf3k0004VNklD_zu=478Y6>3S%LOT0j8@V)nROa>?Z^$S%A5 zajM;!*>C6jX2yBCy(`$UOr`*Mez12}=U=g8G;XCSm5-Vt)k)kgyn5GipAc2CM6BuXC@`4IZ6Y? z4Is~R0A8P8IB&N#4OPCG?|!}yt+EwYQx7x81jy0^SFEMx=J|n@6vcu}rkvJ7>k*)} zar(_x0buH&IDeaVNGAaIy4Tw)P0=|v2YH?oCt@=Po*yv&9$Cqz9$>U~IR+3aGUNlJC{J? zf@ z$S?Rm6fgw)R|rj1l&CNCba4#P2yX3jVlVPWm<}u3gWrW+I_zJel zy=2n+(A16zBr3L%QcaVDxv9>SLY& delta 467 zcmV;^0WALb0pSCX7=H)`0000V^Z#K00004VQb$4nuFf3k0004-Nkl=Me9_r1e?eyXXD5_v2pW`r?w!7IOfAw~A3K8$!yQ<9{wu*LBEfHBD%<#T+M{ zjvzPb8YO*CNRD>81^`5Hh>B4~6o(i;j-h$07@Kqr)3UG&i63D9@L-FB^9}$|0f?6d zgeY9{^RQ2q#190=c>t)D4XCxUfz5AvBKnTA3^^l}*Ts#8eX4YA!ge|IC}mt1#o=Fo zic$Ud1&*#w*nfZ!W!R^p1jk)Mb=)ON`rejP*CtFhmd}YFpkh=}*Yzv|-h&>ctmx3A zlqG(EVp+TdP5vAMLbmFcgLQ4fyy;Z%Zkp!D$c^Rhe?7nCboaM6q7(qx7~SP}Ze(&l zYK=xQp&V2Is2?5YoOrNeBV{DMhq|sqxjH*%ZR-@KWlRZ29;|qmxu=IaynRfvU5Mfk zpQDjjlpo128!O_Mf*0?@D4v?21_#1d4ny)N}iBgF*GF$J5j_t}5Cqi~vv!09Z!7yc|Hx zN{rZ%A?xPiagp>vqtX0jV++7`;){>sV2DGVj~;^`2VQhal@}`b2i0LMMHc<#?EnA( M07*qoM6N<$f@4QPhX4Qo delta 160 zcmV;R0AK&V0l@)~DSvO1Bd4q#GLQ##{`yY9Ql%0VIc-Fy}h>qj%m<@rzyCTeHZc?K^#ZPNy3F=D(5t83f(s-02%FY(-J>FG6I-8R;f(@ O00007! diff --git a/Common/src/main/resources/assets/byg/textures/block/jack_o_melon_side2.png b/Common/src/main/resources/assets/byg/textures/block/jack_o_melon_side2.png index bed1a435cf28f5b1cd4cfaf3e529fdefc8d4b0b0..eda5b709b117fa5ce9817c99f2933ab152b30807 100644 GIT binary patch delta 108 zcmV-y0F(d80i*$tKV?u!L_t(|0R_Q95du*R1+ctwW_~@a0S5mjaMDEpCDHFZUVWv6 z@$52wP}a%ZQ@10cq6r01Yb@&Iwx^Y*MTxI`lu0^L-DpY+6j)ocYlc5GmlwTECZX2= O000005AXe0rvrrFMt2y?f>HJ|KRHX-0%O_000010HhiOfN>(#0dn>uUIQStOGz~gz+jFQ0GQWG?F;aj zXBL|VQr~l&Z|H<1?kSPDt;$oCRN`pcF&f^?*3q6bq7KZ@;-0%O_ z=l9l7mNTLa0{&Bfp7o-00DGTPE!Ct=GbNc003l3L_t(|+I5eE z0mMKM0Ou?`(|@V4u{L-BarUJ;g|!*OcC9eh3B2Aq!q^qJ4oXNm9ww(8`?{s1BqJhJ z)I7q?3tpp~oEj0yih1Oqvyzn=-h-LYAGO;`hVS8>-~aetY{&p~*%ksE0N0vC00000 LNkvXXu0mjf0*7PN diff --git a/Common/src/main/resources/assets/byg/textures/block/japanese_orchid_bottom.png b/Common/src/main/resources/assets/byg/textures/block/japanese_orchid_bottom.png index 418c73d59c1b79a618aa4e3a592a4da8c3107d6d..0e95a26c3c49b402ceb1ed1f06f5dd3a5a8e1eef 100644 GIT binary patch delta 198 zcmV;%06G7c0)qmOBoYa5NLh0L01m?d01m?e$8V@)ks&3200030zlg8- z&Vayxj z;j89LI~c8iO5obFl-?(A+c_*+gyE*oeRGTK+|EuJ4#OgX^7 zTc2#(`3DdvQatZ47$kPe0@|6XdGQ&bq<2KA(g(LU1Jgw6Wvl=I3IG5}MNUMnLSTY| C3|FWC diff --git a/Common/src/main/resources/assets/byg/textures/block/japanese_orchid_top.png b/Common/src/main/resources/assets/byg/textures/block/japanese_orchid_top.png index 9064bc83e7a97feb0335fc1e23e3415dbc58b833..3eea237b78acb74a36f4ab60e24267369d5b0b0d 100644 GIT binary patch delta 200 zcmX@b)W$SHf|G@rfq~)e-A6$a?Ib3u$kxjR_=LCuh5kQ%_i5!pWb#4v+~6J^opiOf zjziCZDp*T`{DK*N{rdge?}+F$pg@ABi(^Q|t=f|d1rIy$xLoAlWbUW9QZcvV6bAbx)yHg-s?Q7H))iPd1#vKi@ zuywCpd~Cfjh9`k45Bu6#hMqoqEm#(MX0OPxEF@!(YtVl!Lx8`|wacj1SE9kMIZqD5 z?}CB96bzydZ`P-eOtc>o0<%}}&HEB#M9S*TY+#(xvnGNOCiFhg&RC{TMC1c5Rk5R| StBPL$0000M>002ovPDHLkV1g`{IR5|u delta 164 zcmV;V09*gZ0muQ6EPr*5DoR`ye3>R@e;+|m6IyW_Hz*%ZJS`y^63NbkNdN!<0d!JM zQvg8b*k%9#09Z*xK~#9!Wz2K3W3GK`pcy$Z zzW~`9FeAg+4@gXFrZP-`xpO@NaH^(E0BX~wyzgEs`}ne-!yPVo*Q{?q0sa8pivf?r SsVvL@0000>{`V|@8eJaTqjSbKV3V?$PP&@1pX^M2 zF)>TY;=W0bfhrhFg8YIR9G=}s19Ad9T^vIyZY3ui;A&a0Wl=QKj5Iw>^I!%;mrJK3 zSR8ml+mcpDZR6zWOK5u~@=akwT0he^rjA*hM+N@s7@t*ZkX&>5^1@roLY*Xy)g2@x b6{HxruJg{i^Ry`sXgGtXtDnm{r-UW|4TwH( delta 204 zcmeywIEiV31SbbG0|SGGE`RVuGgXWKJ&`DPd?$J^9lij3jCT1x)lV1#| z>X3ZTAt1$7666>B9|jmUozXczQBk5M-P6S}L?gJgmyz#)0tYkenl=Cbe`r`~?473c zAoBdN^S{`A)9PoLn67@wD9crHI-qd}ThFX^CL@n8bG9`<3p6rnhnPS77Ch z^@k5nlGktF_5G8Mfy~z==3R=+>>sS;7id*7Gpn=D+F7F{0dxt2r>mdKI;Vst0FZi6 AUH||9 diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/lament_bookshelf.png index b11ce5c1f1de55230eb46f0caee28a536ff5db6d..3cfb6388456552fa5c484320d91537b452425358 100644 GIT binary patch delta 325 zcmV-L0lNO31=RwO8Gi!+001a04^sdD00DDSM?wIu&K&6g0037|OjJd+wY8|53W-SkVr#>3~NwGLWN05Nh(fyycQNg zJa>062R}bQkr5GNCCnQHBAV8qn9`pbJ0IW$wL4Q1JwO5uc8VdQ6b{gp5YwX5@os|01a_=5GD}h+vlev!9d||w_XL6-g^fg837N` zs{?!qq5zi`FoF*wgGN!@#98fTu(G7=X`C<*3sy3HT-97-g>fl(aU+;dxUV;Iy=cI*z29tLvTk-UGt?d_I-E6Xu%{XBm7%<=; X?odlqH0id800000NkvXXu0mjfXaj$s delta 656 zcmV;B0&o4*0-Xhr8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LJ@L_t(Ijg^wUYg17e z#(($bB&X@kO&l7v(pW)JY{5m)qM%}h*bc$PrRbmqh5Q3{lcKY9(Y1@4i*#_YOO5yu zK|xwep;c-=O4^3feB9ixCJwi~X~^VR4(EBE_dPG~^C+q0On*yJRRAoz;@wsiDRmBx z3`IG7EW3gXMQJsg2!Pe!^FHbBSpbND?802vB6>B2RW(pnvYbA36ZJq45R!n9q{~^- z<*fe>2+8!53=bz3(6l)8#58)i-d6%zqS6I(A+YW3k1K_L`P*fG=_UQ9gNJOxm zx;K_S;EQ*wc|t)Az~_NB=GIU{B7*JKKxrYRj%n|*S%3b8Y43v4!ggyYs*04lmyLa_ zTHhcfB3=&utY>_m0fdkwF1?~*xcr>Ih6qSZtAY^H*Y(IKy4LUQ;AQ0p>2ek!B+=1H z0z(%$HXsQ13O^H?7Uy#66BllMK-1!#Ik0ADF{h>|B*R@+0le5+V9&Murn$+Z6p~@8 z^$kQUl7B!xctDTiz{GXGXz~3BhGEb@_=VwOj7OUp^84KDbK@*Ji+s-?Z|C5^I?v diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_crafting_front.png b/Common/src/main/resources/assets/byg/textures/block/lament_crafting_front.png index 53415d9b40614257b105b3a2ad32c474beefd59c..36f0dc2adc87024b15f279da71e16ad97d4d331c 100644 GIT binary patch delta 253 zcmVX%K!qh;)dva)8i(C*ec zA+!sWzX9z@vXAe{4UIqIPj&nb=zk=}000000NkvXXu0mjf Dml$Y` delta 560 zcmV-00?+-90=@*08Gi-<001BJ|6u?C00DDSM?wIu&K&6g00H<(L_t(Ijct-YXcJK! z$3G^QOVUe10&xgh5n3UGs9V7;lY>if5yU~Ei#n)_;8M^m5ottA^{)9eir z0C}fE+AiP)W0ddV1!K~7A@;SQ?$X--it;@X5)1D4k7P3?iskFPdVP}{*E)1MP3p~N zn7rK-f>L|5_BZ1KXRB8Lc=U9Ed$(74^Y%Uu?!IS{d4B-bW-m%`@g7Vv=nvZHz{hpV z*eM6sbpa%UL$xC|ROENc1SXV~7YzWOKUt6YkM_gdHLLXCf2ez*ca>~NNB%`D17pWv zangge*_ymFb^v}fnP#ATkAAO1v3N?xH5r(U42HT(-lM7zi+5_e99`Rq*3H|~+((yfJMnx9@00007Hwd_UNzQrf%($%|$qffx&|@8200000NkvXX Hu0mjf4<%%! delta 586 zcmV-Q0=4~;0@wtQ8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00I(8L_t(Ijb)NeXcJKs zg+G%?nsgFLATC0w6rvKLSa*WB$;w4HMR(#tp{q(!H-a0%g%nXi5ER6Ph`1A6+JFcJ zDY!90D=r+UX>^)UCqLuM&zl5YOy0|k9(c^~=H4^+oO=%BbAPEn3ny+8kC^}@6Io7L z_xL>=Qkb3w!0L8M83vm(%On$76gECwAp+=T=?U6yjdEs@lws&X)eO+MO}amR__)a(`T}U;q^6N?LyqXU$yz-W)3FZ=d&HvM_&c?7=%kD-$sY|K7QM%i1jka5xOprG7NKdfijX>Dg-iW#Q!O%1hAD{O(VjZPWC;(78 zv*r_6JMT#*vSe}>dGhQsmoBtuwW^e>Rp0q|70a?TS%2`|0GKcOnr`1c#kG~!Jb!ha z8&}`5#1R12XHWCu>Avs5rxlJJzY`|t^_xgfU|BihF;oAcE~VD2)*Nis1Zt;`9#jCh zzqS!7Qb7yWh6sXt4WexO9=Oqp&d9$Ad7$JdERA!pK3mdvN)EvHYQO_m*z~$BGMU4A zY~_LSNJC*DJEYD0WCHNBpz<(~9R{)!(ye@Og&letMH%7eUS*;wpf#8SSM2?#zbGU8 Y1yOJUndj1~^#A|>07*qoM6N<$f;%Y<;Q#;t diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_top.png index d366d9773068a8ac74d09db467b6e0a12530e97f..641ef1c54e1ad981f704fab9c3f69cf0bbca5250 100644 GIT binary patch delta 216 zcmX@l{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z84!HuH>(Je*oXEmVpX z6uh-19QpX9M0q7ec=)*4?63F=0aaFbx;TbZ+)92iXX2wrkHR7k8hH9PG&UM~PEHJB zVg`cQYR=Nd8wxX4II=k_ZEj%HZf=xlW;S+K*xV4v$lc7md1c`S%^3$14xDK?l)!7+ z>amfFrK8D3XeKLD1S`)GiBmItdwY9%FC~U$7>PLQgr;ZA=PPo1&ckrvi})$Y=`1!t PM=*H0`njxgN@xNA(rHHB delta 449 zcmV;y0Y3id0nY=F7=H)`0000V^Z#K00004VQb$4nuFf3k0004rNklw($TZ$Oda|s^gk#Rj0a5#crKX~6RB4u zLX<(AA}LB~-t^FY_wIfAz9%lu{qoP>0)W#Kk8$BJ2}Am@Pk$2bWJzXnd?hK%67lKO zE3dD<0FduCEVSlKsa}DjF?>55kkd5)KYxA2v4{C?!zzm2y$o=s6sssA-)-t|;^N#d z$A!ZxiunF?k4ZDsz^@BTnzcmKz-R6b*~T%q-ZRd)a9C(v7tG{{xjO`4?haW7)!8!8 zH3wK|&A4!ICVyervTeCZGmgg8uUg)$n}i{5x6fu9KX}AE{I0n7%A0s2Fn5O#R6_6Z zCY-LoN6~U%(u^ApK-Krn!z=HbP_KiT9I*^ECe2s|nwcD7(yTR+mcTwqT7SC>JC*Jf zj>fQ062$29puEgQy-2o|J~0csNO!W41-r`sgKZomr#kB@3%-&7$myDG9KW&JwQVm0 r_)1n;5JJ=uz0Acw<9zEq(~SQMs-v)x2vk?R00000NkvXXu0mjfYSq`c diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/lament_door_bottom.png index 8c5bb05abc5949af7232f3fa955d0e6f381c6aab..c8edd8f76e872b266926abd75fa0ebdcfc9fc880 100644 GIT binary patch delta 229 zcmX@h{FQNnL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19O(d`5LX!qJ0LUMf1#iI1P`ZH zN1JjBqjVGf1Z{Qy`;s<_Kslz8AirP+hO)_LEr7f#PZ!6Kid(wJHi|YGh&Wsf&y2Fl zwo7b0&-t?R0MkKx#zdx6Mt;fL$D(5=)ox#X>QLMkCO;;rhS~CxOa<@Vcl|i`+w#nh zi2l`l(zPse@_q;wYzpRjkn-&3FZZ>Xv)cP#M179@-O;kmH%!ZDx##qh6SGWjrj&d; d`Si+TcCS}5Y@7Ey;s!c{!PC{xWt~$(697gdSrPyM delta 447 zcmV;w0YLus0nG!D7=H)`0000V^Z#K00004VQb$4nuFf3k0004pNklH%H>sj5_dv)Dx~ z^uMgM`_Df!|IF^ZJNd8$Xne`dk1qhcczz5(b-Tj4jAWWp)qgnvZ;szn)j7U({QPx} z0*E7xpeXX4qWDZ7MbQP%=jm4N;z*;$6GjpoN1B=5=P}5;bxQ!&n}!j9Z{4GTg7u~e ztqD{zO@n}S8T)%Lw`x2g*);?5deczVIaQrw%mUv!)OgZ)(D*X=AZCdmFfdWj__C`& zvdr`W(3yC527mH>6XQq+fe{eOO{VETeGrbcroMjv)b-ah=6_(!g4OC9%9uqc$J*;B zi2$fL(!`O*x+PVebCsPvNS@D6yF_luOdnuf)|m(}iJt-R`qk+c{;adL*MCi*Z@Q8Z z$tE5hz8#Q7SpJH5c5(T!6A+>-Q(><{u(T&grYXiO1~`JFem3he8ea|;%eM~SIvQVw pR{Ek!NDob-x?P1o&<~ce{|33>*Yh*zJNN(q002ovPDHLkV1nDO*3$q0 diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_door_top.png b/Common/src/main/resources/assets/byg/textures/block/lament_door_top.png index 9db5161a6d3ee71e167aadb055203ce911511a53..76669ecb9c76a40260547954fd2cafaa9676a1e8 100644 GIT binary patch delta 259 zcmV+e0sQ{E1d{@g7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000aP)t-s92hY;D54GCRaxuZ{jSR5c1KF@k4KD1Ns@=^ux*lNG#1Ap z^#o<}vgdX}Z69G?TaVU=LY$ip+7v>ZREK^n%Tkhod*fNdx@ArGNGwfSv6w0KPxTn*sKA5BM?q!hYw7 zi>ps725~Y2;D7Y|g92b1Bk}pjB;&D9D?8sx)z-KOmv0wA;{ zZRe16JIkHN_d;mD_&IuuA4X`kH<*TlDtA&V8vl!{>vhGlZ1KGNDt`@twY}W~OtZz# zcCR#`#8D|f49^>80FaplD2e5VQ7OxiJyHktp(vJR|9=&#hb3IG5H?QB7De!Xd?3vO znUHElLvJ+E8_k@ZUbjmOwb}+z=&@ETnudcrxl}4zpKss4DrxwU@%2EdXnowtrJ~nu z^tz4b4XITP7Rxx(plH{ka6;2db@@`omDl7x(uqak?x(*?S>DT!rdG5}gQA%%%NCnk wFWKBeL?@w#C0tR}o?uy1QDl>(0gGkKAJ%aC*~B^=X8-^I07*qoM6N<$f}T+Ws{jB1 diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_leaves.png b/Common/src/main/resources/assets/byg/textures/block/lament_leaves.png index fc12aad6a432c467b0669f59c8c63dddb7052b93..6fe3c9cdcc96fd672778a97d9a02ed1eba8348ac 100644 GIT binary patch delta 540 zcmV+%0^|M91>gjbB$L4b6_F$ze+y7dR7C&)0K-#-zfps}QG>itfxJ+Fs7Z3BNO7e| zaim9ZqDF6^MsJ@*ZJkAJoJ4G!L~EKuYM4W6mqKZmLT8piW|To@lR#vWKxB|VV~;;$ zjXq(EJz$DGUxz$ihC5z`J6(i2TZ1}Vf;n1%I9Pu;SbaEFdpK5kH&u8xe^YlhQ*|~{ zbv06SHBoakP;xX-aWqeHGfrkuY%xk|F-mDLN@y@jXD>)(FGpi8Mq({RVJ$^q zEks`|LtZRGT`NIcD?wW-Kw2t4SSdbNDLz&xJXI(>R46=BCp%InI#DJ$P$oG{B{xeY zHcBNnN+dN&Bs54QG)5yce?=lOL?SUlAuvH9Fg_qII2|ZXt_UXp0004WQchCT~#)rSKCfMGI3H2V;~PCwun0{mL*6Ik7OGd4?4f3V$M5(7Wk__toD zCh!+D;9imEIY-(aH=yvgmH(hdWriR*u_Gr+?- zMF$ouu)r(g@Pbl+4Hn)mhJ(5qOu!CN9UNS#Vg+#)+2I1$K%yzQcHYvc-g-AA=q5Z| eJOVwwB>&+K9XE#44(X5p0000NS%GqV0X`wFK=BoxMXlDc@jA{qhF(6Z=6eDfOHG3+%|rX`lV><*6`KSEsapl9 zTQBt}T;!HtY8JG>Eq}UG`gEtvX^v^pS`OW|30a0-MJ53;+KwR_HUVmuy>^N7U32R# zBD_@1+?0(o47{o>!uAC=FY_o&&~=&XnpVJpm1~oU?L`e3rNu)LMj1c1S5S@lVlrZ?}mnHw!)-+}dmv z9jajyrDY$eW|?W=HOD04~1sE<~>&ge(!dc)ESs=dE+|9^Ld zRsG!G`|7S+UibG{yJ42uiH1(rNwKFBpKGoW->MmTqU~hS9HZGYrfLP#p`b0+U4o-`^!_mIeF=S7CU2-uJTZH>6R#+-rs6|O;z*z zwys#%r6S~h>N4YbdA+RSBzGmJv+^gG8@@5$KgZ*`{^9TE*YBJ3O#hL*M5|?$>WtbX Qpnn-WUHx3vIVCg!0I!BX$^ZZW diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_log.png b/Common/src/main/resources/assets/byg/textures/block/lament_log.png index 3bfd7c16bb62b6c8dc2450097313dc82492c031d..d87830ddc85abcbd3335876f08e6620d64ce4d67 100644 GIT binary patch delta 212 zcmV;_04x8;1LOga7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sQ8R2#FL6XE zVL2jGG8|DT7C|5qHYI^;`v3p{eMv+?RCwA2!7&!XAP@z>U)g74>;a({9tQ{p`b5~C zJeK<(!5K7D$nwx&Ta=y08{OvhHMRqNYex4igPzU!of>o%<4qG)_&l$ebU`Q&vBMO^ z6T&qJT32JbuOQ!kuuhD62bbt_7;N0WR0ZMHpP#xQ$L@cD2{|xHoca%MK_1CElKm_I O0000n=#H&sxcZI80qa*%)3v9!WYq;LioWNgSqVn{70ZCS_x|IJ?~0 zMBB^>C;9Lz;(v0jv32g;kR~#{Yz$G5w2HOOh=K$q-plTVHGDSvj;4Gc4JK%tQPp29 z9h9%Ut#eGZYKbM20cU5@=@A79Wn(rj{I}0kE2hI4+GfOI%5*r}x+iiclu(R>0p{5QP0B6z`*eK?xP?e#aJBV?!>U}oXkrgM}1M~K?pHqH8aE}-pdlarHA zSJOluY3oa8dU`KgNSc`$aB*>Vc^X=%YH4a}a%LMAvPi8`ovqrLX(XbWsiCR5($iQ( za+RjEBxiQBq^D<66i+wL)hSbYu56J|Q(cv+(!4}WvS~|qrg4smh>(bgKyc!XjI?P$ upmxZ>JHXS!(euL8#IT=P*JDF>J2O^JQ+ya=azYE}JO)o!KbLh*2~7aAvQc;d delta 501 zcmViz^=YLmc0MwlVU=loFG8zLQ z%tG++kboY$tpZ0P+L&;ZAa2e9a2<(({{D&lrbN`8B7OOmuV?Q8@Vy8C8N?`^QB{R4 zs;UB|GXS3KACrH4*E2A9e(SocNYP69yFDtmgklW@5>p{fgXQzFvYoTgRyUPM(F zG_B%aF#lagB7cL}&V_DD0_PDji0$U=>eR{rEbVx@XXm~j5x8Tv)$*FARVba=u2o$S zPxtWs2;Yxv;X0FCU$AW!WDr}O#>lEFtcixrx&+%`6AXRxT^)NuB8uCba6_??u*zWF zWD&Sy+tpkf^hQ>7f$v2FgN+2}11L;fS2wMiwn>&@CT{Ak4~a3$b>tv814)0gVvx?} z!z5lVPHcq#hyH+!tryAbJKdD*AH4#G_iV=DDB;)ogIav+qij03nc(Y=XX19*D>832C(akJc9i0?_W00000NkvXXu0mjfZ42u) diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_planks.png b/Common/src/main/resources/assets/byg/textures/block/lament_planks.png index 25cf0ddd43db2f9e6c815202ce15b13ac8fc6c90..f2edd41c3e80da6425144ffcaf7383ed96eb673c 100644 GIT binary patch delta 199 zcmV;&0671j1J?nN7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sS5Ki%N03ND zg+V-bI5KB6FJLPtPxNdkSO5S3a7jc#RCwA2!Lbp8Fc3w-M?lV(O#yc|6o60%77Z|h z+<~wE614atr`qs3x$DMx}EHP%p#S5=F5_I>=l;0Q9ae?@yrz zjKk5Kr+Duj4}Wg19$H2Izx%pb)Y$_9)F@+xO6QQVf{#%Ky`ene8{*%YNH#o~!&7W` z%g&!Oe7d1O?%m%5Un>B-ZJrR~^oWd{2bIoI?+awvMT>Um190|&t1f8XP)*$ba`#1) vxI#AMuFxZ~-7VXi0)2>A?@g4%okt+c?hv015yANkvXXu0mjf9VfiZ diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_sapling.png b/Common/src/main/resources/assets/byg/textures/block/lament_sapling.png index 683f81bfab1b5aafae23c606ad8864f095a4617b..6658b20b967f65a241a38a52d7cb4095c76f8d11 100644 GIT binary patch delta 184 zcmV;p07w6z0)PULB$0s?kt7{|8&FJCMF0Q*iZy6?Fj-?PN>C_1BOFN?5H0AMx&AZBI@ zAZaGG39#*^GtCyJllvx<0%q3Bes%%j-uX5IGWY!MU1k{!L~ebZp;S~byKnI~TfxJE>?O(PzHoeKFtKQ4(HYp3dZRHO73(O--@)Ddi0_mNbaTHvdu;$nrk)#2|B-dAg8R=;OU| Z;d|Jkqo2N?2sD_1!_(EzWt~$(69Ba_Kg9q5 delta 183 zcmcc1_=9nR1SbbG0|SGGE`RVuGX+il0G|+7Ab*wCgh?v7^{U=L_7+WkWgx{`666>B z9|#zJZ{rJ|s3=jE=;`7Zq7hu$$H{j?%A@+06|}E26P)Y0;X2a>ZjUkz=i~OWHy2jb i`)qko@jU1KCFWbxnY~wDv77?5p25@A&t;ucLK6TUx<`-z diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/lament_trapdoor.png index 2a15b740046cff3a49627d998262b521847d48b2..bd833adb00a3717352d91b206b6acc4dc65818d7 100644 GIT binary patch delta 259 zcmV+e0sQ`u1d{@g7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000dP)t-s92hW< zXysb2Od}}Vn^Q=Gb>P!0gINEkf-*%>l=MVO`@SFK z@tFVP!BW@tO<8cram$?r>85d#GRV7uM<<{V*~uViWsPa$*AJnEB^&D7<){Dv002ov JPDHLkV1h)4Wvu`J delta 514 zcmV+d0{#7y0+0ld7=H)`0000V^Z#K00004VQb$4nuFf3k0005XNklbW_sgHBH~NC0>N{ znw1`SIq>qF=lpw)_5SQbldB23F1We<0zeof060A#Ri=bNLVvZ)0C;}%j%t}vuS$OZ z`HBtTxe>lMFaUt32d6xF{2GA$;Rz4!AJH|>jc|HCwlI5cL_Zpms|nRIGf&L-2K1vL z0IHktMgWX|ej*GKl$sgh`TPf}Oz+G+vN@&A7S!48Xzu-=^`yoxa;b9FJOpI3CgO zKQvWb{kmsay4va4VRpO!M`p^C^a8c0cKZL@n&P<;s(Vb^EdXX!$A@Rlx`ER-ZySJ@ zFJ3j(GUNF0nQ5U~%uP~9bS_F1`EC=-tz3^US#LDouFhKm0gCE!H8H`S8{Ju17$jzR zLTGohsWLSRlt7WRt_!+%BjyN5l+{(B^eZ>e4Hg~z10h@%FN89L&;S4c07*qoM6N<$ Eg1LL~qW}N^ diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_vine.png b/Common/src/main/resources/assets/byg/textures/block/lament_vine.png index 1febc3c404ace3f33109407e18b62192130843d6..9199ac27717fb2254d7693bba24e6bf7720e549b 100644 GIT binary patch delta 160 zcmey&c!P0*iV$akM`SSr1K(i~W;~w1B4whYLcLIcPlzi614DA`oB*dXM}v5MX&(iC zYiCV`H9%3uk|4ie28U-i(tsQ%PZ!6K3dY`phC)Xicn%w^bN&1Oba?JD&r*hP-r6uMPQilNxNLrM7wbEb-dz#(1e=_7tWqHu8ssKQsMwe8#w$f1M_)<$JyW Q6QG?8p00i_>zopr0DeR|lK=n! diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_vine_plant.png b/Common/src/main/resources/assets/byg/textures/block/lament_vine_plant.png index 6bc4f9e0a50937f33a288fee7caf8b43722d26c1..d11650a1f77b8a635013b89a1e02d8cd4af2860b 100644 GIT binary patch delta 177 zcmZo=ddWCJMToP&BeIx*f$uN~Gak=hkup(Hp$e8lWg+NswPKgTu2MX+Tb}r;B4q1*7l5MqVZZhQk}y`2Me#+KhS&zPgg&ebxsLQ0K(xx;{X5v delta 186 zcmaFK*vd3PWum35p=f|lh${mFg95*`zO;{{L41HyS#s00001bW%=J06^y0W&i*HNl8RORCwCG%dr)JFbo4xIgxbxZ%h#= zU;y0x)3fyJt*@6qp8YD0%Y(6$xX5$Xv6@Xh=gVE8A*&~(-68BYx(mVKu?oaMC0$aA W0d>}+5t{%D0000>|t|HehI4&Cb@;p>a#=llzA zxYPWEGi=4k0f$qa3RXR#!B>Nq5FzZ)K!XUuH~=zgRgjocuvXu{rZg#4L0!zu2W83y U?w5m!g#Z8m07*qoM6N<$f_S@8L;wH) diff --git a/Common/src/main/resources/assets/byg/textures/block/lazarus_bellflower.png b/Common/src/main/resources/assets/byg/textures/block/lazarus_bellflower.png index 8b987c772017f98adf9e3958cfe22d42573a3fc0..f12ee5eff4a4f74a3ddb8ec291bbda7d90c300f2 100644 GIT binary patch delta 167 zcmbQj^o4PP%EU&|i7HC<3=9naXU@xB>hv}y@wS_9aF5PGEhC+DwWSjB%6_sUj!WW! zDi}+G{DK)Ap4~_Ta)LZv978G?Sr0Zc9#G(5-oT^#;6J}UBT$CHft7)SnW2ld;o%+T zhM2!wxtC0dyM15+Q-dp)Xu&&2FT)G*$wHeJUN>W_m2!}~#x%oRiXq|N=L7t$&lywS S{mWSiGQ`u>&t;ucLK6UFO*!!Z delta 196 zcmeyuIE86~%0x>gi|nON!96-U>1sZa{pbL`TYM7_l!+pdaS vI{is!{=9u$ymoK)CLGzh=U|6JRRg;MCwnu;soz;Zw=j6R`njxgN@xNACB|9< diff --git a/Common/src/main/resources/assets/byg/textures/block/leaf_pile.png b/Common/src/main/resources/assets/byg/textures/block/leaf_pile.png index 4febada7424a8097bede2218eef55f8a1316dfd6..a8724844d04915635373519216e78f50b1392ee7 100644 GIT binary patch delta 154 zcmV;L0A>I70p|gbB$06ykt8C20001de0*_nabaO$Qc_Y&OG`}K&*=aF00DGTPE!Ct z=GbNc002=*L_t(|+Fg%94!}SN0vTZc|K%RGO|+gA38RuE2{a3P3gAouoaIQm=F`R? z>3q`3Wi%U=&$+UGw6?xGxQflhz|BZ%W*m0&f5zQ6NcP)2ai;*_M2edYVgLXD07*qo IM6N<$f^lI$sQ>@~ delta 166 zcmaFP_>FOb%0x>gjhdR8!otGD#KfSWAa8GP1_p+2)~{CqDYlXzzu^BMz_5A$lKm4E zB?_WFT^vI+f_-}(`4|j2m_lFu-@iv;wnlrFdc(!VKh(EZ8tHeO*p={4JmldYYq)jV=nXU St(FJc%;4$j=d#Wzp$Pyk%}4|Q diff --git a/Common/src/main/resources/assets/byg/textures/block/lignite_block.png b/Common/src/main/resources/assets/byg/textures/block/lignite_block.png index 52e560fe544a9b810025234f24c9972aa29debb0..b8f7d6143a7b7ca46e0705c508aebc1028c2add1 100644 GIT binary patch delta 155 zcmcb{c!F_)gd7ty0|P_ST=7ppinG8YvY3H^?=T269?xHqGEq^Xh%>+^#8ppDSV@$J zivB=88kG87iH|`}J@mzH4 zMYhEzj%P0xIk~+m^NU=}^ISISN0-a}*2MPrOIVc+zICkBU zAsA&)NklZy5I3d}7v(gaVn5hi`00000NkvXXu0mjf D@RB+2 diff --git a/Common/src/main/resources/assets/byg/textures/block/lignite_ore.png b/Common/src/main/resources/assets/byg/textures/block/lignite_ore.png index dc64e589743d97fc1ad7d721c9f5c28b08651bad..029792257cd8d92175dd684c7b0235b3b04707ae 100644 GIT binary patch delta 367 zcmV-#0g(R01G@u|B$4A4kt8C2m8YwPn3#Bkg>Zm?X?A&GbaQ2Ia9(R`cVkg@Vo-8k zOmACCZdyrgSx8Y~U{qdTRb5_BTU%sMKVnWjU`#t+N;yPQQC&$mNKa2jPf%P)H(N(G zT1GZkLo-%FGE_h?Q$H^{MMY3NEKNEqNHr!!G9*JVB0w%6KP?|VEFL|7D;_*59Xlx; zIVc-9CK)y*88svrG$R*!jt2w)006E@L_t(|0R_PaLc#zPM8UsL7c9s|!4QyQtVon{ z|I0a3iNQ%?gHyteQ3)GSfLF6|AuLISUnjSlp9VV!%JDD^jqT)V*1AH~_1MI0?>--0 zmP!&qI-WbqNZ|PjG-`2Tu~;nQ_sRD8+p#Gf_dU|#cfT~MDrjQqs_SB^RKl?hp0@o+ zs>Js%jwkhDI3&Y3psG0x( N002ovPDHLkV1nVZm9+o> delta 374 zcmV-+0g3**1H=Q6B#}8He^g#yVRUnNgoTBen3boiTu3)!PCZ_0Yg0cjZdyrpVo+B@ zGd?UHRb5^@Djj4{KSWYdX?A&5LNan*OhqyzPg`3zCK)v(7)Vb~U`#t@Z*W~nI7UxU zO*$)HN;yC-AU`c1Iz>f2D;_&39B_buQDIghyOp${Q3R;{~P~**DODMeEV^(>fS6RWj|S+bhY3f9WhHu1_p+^ zHBM)M6i-QzU+{kfU=X^0?%YI0iTX-U7sn8d;Mm?kK4t|DXVH)Y_x|t8F8n=H=#rg> z9kYzs`*OClo0ek1x5^MFhA*2nvwfNxbS1fXqWkVVHR6@n zuWfnmpH=lHkq}9Zcv-JbjcuFmHmo*@`ZcfDte=~u>FUPq2YHvpeA{t=Jx7gW`d)sO Sr3Zk{WAJqKb6Mw<&;$T!zGIjG diff --git a/Common/src/main/resources/assets/byg/textures/block/lush_dirt.png b/Common/src/main/resources/assets/byg/textures/block/lush_dirt.png index 0c7e32466ed91e41ed67969c01d476a749d38f53..32c86e3ed6ada3533ccc13545b7791239ea45660 100644 GIT binary patch delta 168 zcmV;Z09XI|0r&xsB#~kjkt8L5UteEgOgl(ONJlv@NH!=gAQrhytpfl60BlJ_K~#9! z1;N1y!%z$ZQ1QXpAUy{aXMpa|yHSzPA>iykLf^y6qNfTPy(-s(=y3Q6yyGmY5_#M{ ze;PFPOuG=?D~NH!=gAQoR=Ur0zuM>#Jni#uYGAsBydNklnc&IFsEjIm&4GA+Z)W;!zv=dJl> zqnxWt3Dc7X5`t^G96=UCy*t$s2&Rqe@Mo)&-?$4EZrTpi&+Ewjx~lftFye7}{Q>x8 W4lrga=oJ6}002ovPDBK*LSTXc3r5xe diff --git a/Common/src/main/resources/assets/byg/textures/block/lush_grass_path_side.png b/Common/src/main/resources/assets/byg/textures/block/lush_grass_path_side.png index bdab0c5586734779fb6536fac725e0bd00d1890d..562c63145f7e811e0b034fa50887dff5a23efd2d 100644 GIT binary patch delta 362 zcmV-w0hRvX1EB+uBoYa5NLh0L01m+b01m+cxRGn^ks%;|icm~cMF0Q*&aYa`qFT$L zS-G82y_QqEl~S{qPq~v(xROz>mQ}WqP_>Xxw2x1+jZUzPO|FVerj1FRhEAk{NTGvA zor6cAfJd5wOO<|0n0-Z>drFmjOO0UteEz zTsL%EHEULXIAKgXNJvOWIWI^yC@vrt?WjgF00001bW%=J06^y0W&i*HlSxEDRCobp z!C5v#Q2+(es}Dj#G|@N5BNcV#KRwIxY47pR?(yDYbunMgRK>R>A-E5@}3({6it7b%+;z-IdJc^ z;N4S$7B;w_TOYNl*Kc97dvB4$j9OO@GmV{d1E-d{%x!kxHZfq`w9vkC@2Tb9n`iiM z>GyBSvi0!rD2XvIi8h_pH^KH%U#j1vrorA1;BzhQ diff --git a/Common/src/main/resources/assets/byg/textures/block/lush_grass_side.png b/Common/src/main/resources/assets/byg/textures/block/lush_grass_side.png index 994195496e4b85644a68c0d1815645d630720bd5..fa477a2ac8151552773d11ff1b06de7a60750bec 100644 GIT binary patch delta 253 zcmV#J@HYhG27Eh=Iwg3PCj!8s8RCoae z!GS@;Knw&y@qX+C15!5Z^$~>)T+j7zRlDn6Uan(* zbn27_08DnNdp>V*LpkV$1htUvk)}(v=00000NkvXXu0mjf DR%mpy delta 259 zcmV+e0sQ{T0@4DIB#}8HNuZ~pg^h)alZ$|efR&w(bXhktp2 zct|!VrmUqdAQpy>hID*$fr)`(Ogl(ONPA&TUteEGIWM^>JGzk}7=M;YL_t(2QzcFT z62dSD%W5lXBUQ%y|5FVcM++nb0Je6+hSoazxc3IA9EQhecq)IP*_hx)^!E1I2pVm< z@xw2d3Ivz=66)NiKG0*TnqJjpBGq<~7Uf|9GGxZ^h{`pCV(7|A1&C7AlVwtpsF>lI z5*@Wx&0=;*TwZHWpQPc?t)@j!j^goB+41n6F7LWh{002ov JPDHLkV1jq3c6|T< diff --git a/Common/src/main/resources/assets/byg/textures/block/lush_grass_side_overlay.png b/Common/src/main/resources/assets/byg/textures/block/lush_grass_side_overlay.png index 73be92b0d5cd21e9a2ec7233ae7462183c660def..d936ace44b1838385855f8d3283ad45120d66589 100644 GIT binary patch delta 189 zcmV;u07Czy0)+yQB$1&Nkt7{|Gf+%aMF0Q*tFfx4tfio*p_QGLi<66pkcftkhJ}rV zfr){Dh=6~Ge|dp;cYk(vesy$wb8B;IZ_|bl00001bW%=J06^y0W&i*HPDw;TRCoc+ z!2uEhFc1X6iOosGVgCPGMR|m7vg>50YG#h-EON4kd5p?6CwI!xVUt-f7rFp(Aunz$ r1X!{}pyjKPriJE106{>0k*x3l=GAv#?6-Ww|1o;L3M+Xd#_U{*(s3?&a>FMGaq7i(w zo13q}fWvvWm5XX!)&J96r-k|xoTK769UeEaZCZT$7N^RrWaFgse;MvFWjQ@xxjzopr E07`aa0{{R3 diff --git a/Common/src/main/resources/assets/byg/textures/block/magenta_amaranth.png b/Common/src/main/resources/assets/byg/textures/block/magenta_amaranth.png index 7dcef2c8526d88ce338807537511bf1da5a92bed..72ceb129869e743da445225bfa7d9b56e2924a22 100644 GIT binary patch delta 218 zcmV<0044vf0+#}iBoYa5NLh0L01m+b01m+cxRGn^ks&3200030zw`f@>*Z(4%sr!1 zj4ZMvi7aO(nGa?oP8}9G89bf^TmS$70d!JMQvg8b*k%9#0CGu0K~#7F1;K#AI>@rJ!X1N@AM39){Zf)7qh#1cGs-=0WTW^ UCss$at^fc407*qoM6N<$f-gE%WB>pF delta 223 zcmbQvw2ogoB#ViKTSXNf9C5mwu@)-r)^U1RQ8h%?$OanR}-_8WME*>kGdKU zq_|6h{DS|(0fU!6#Kir zkJf&>-m7E%d&aGYLY8Y}`@O~1-#6ngFIN4UC;RU1qo?hQj~_ejT&%M-_4euKp*v&# zYN#vEoF`kXR^_|m$eH5;El(JK2E~RPXZgabqU615tEY(fgbOz&F^8%~Yj^z+W$fc+ V7dPU zL>gi~4?H0XYW%D+vG=4-hB@0KZ+$u>b%8kx4{BRCwB5(ovGzAP@x5v7!bw z0@@;G5^HpS|8wTUtE%i?;ng!Wfb>F8y+v36q(E@4ki z5q=orj|d7`9=_4QEfIjuaH7EWAaaO0LO_-s1E_L;&F5Lxox{A17q1r-}5AN7FR#h^sCk5PV_HL8ZV&7qk7B|mLR`i81>}XKHP{%mIT>{L7`8S_LLk_=dq?D)%+87u5qlU$@K0!1n!m4Vic zg3%Bd{2{&q{oD>(~1B8wRq_zr_G{&OFtn`f|}(@{PMEoVw>SaYMosv87&%EIRgbezv;YwX{dJ zJy+9xs)t^*{_%SP&Ym+oFWv2Y@NLx-f1NXCwwGpz+-`S|c(AeNf3v&wL%|1$(~lQs z_&%H?Cn&eihd<`m%ZYZj8;*R5xKyRCax!z0+87QP0B6z`*eK?xP?e#aJBV?!>U}oXkrgM=`)B#1%*{$SUoLN~sEp%60RL zwQ=?~Ftai=wpP>9QB_xwlaEZb`V7)p666=m;PC858j#cF>Eaktaf|ifMy^8!BCHpz zr*2;+`6f$xNj9%YOtwy>@fFJe-k+@7ZCXFr6)&Ct((*>p-FuNNjvMD$-A&wIWdEb= zn11Txpm_&3F1d1{OCUK%>QlwEhz<{dBu$qqiRXhnQd~B~d|sjVVBXg!x7qjgoxM9- yRLN9T&@sSkuKza&i8n@felf22B+W#d()I5V@Lm~`X97ICvB!BLsBqFa6<`H7?TVl zLKT*XE~cA1hWY6T$J5Dq~a3FY*?o;o{FyIc7qzS9eM+JPWbGmF9Mi wS1qRjz+TK2u}A8xP6%M7hC4+rtwClssI2007*qoM6N<$f|*_GtN;K2 diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/bookshelf.png index d468537226bccde19b9066cab8ee9ca800a9b133..7b95fd584a92ea0e953bd8ad5b30d9a6c9c99c2e 100644 GIT binary patch delta 306 zcmV-20nPsZ0{#M!B$1>Qkt8C2wY9aVn+l1EiJoeRb&e5n)@jb#sYcz?N}f{9Q+=fJ#L=!eMU(7CgqNH zcHUbQEX)d%F$a`VlE2meo&5Q1Ih&1)peUdGYdZp=PGOE98QCUo{2b$-zvw@ z7qm8p9Zfav1^OSx+$B_4fLX%JHC@NzQOM_5ML)|&mAq!`N54UFRnFe#g@V^x%T(D9 z4J_Pqc)dN9d0}9PKQV}WnB?kFGlrHJ)@lV^TKfVHB@1Ry*03`G0000kt8C2*x1;$wY6odKb~rcT$?nNV1A5Ob%joCMR6i>I$CTt zRbebjFi9sYN*N$P4>2q@859h?$YFW_0053jL_t(|+AWVk7KAVeLs3kyV3GTub{;t0 zH6))P#kKOj&hxr+ktGGPmHq?P0?^9Lfs%4x%OlgnBfO+^-cD7JU*xr3*Y@tfM2y8^ zCfd-BaF=F;yRVNS6y1AJ9U%@J%rw4y?JH(B(6YiX{ymmUL~nsA& delta 235 zcmV ltOD3f`g(tXGv_by{s7`x1_T22B$0y^kt8C2|NsBk*x0qTwPmY6o@$6(n>3YRevDUjg-&fnaUya$ zT5L8|VJu24N*N$P4>2q@8x{>26byeBXvhEn0F_BZK~#9!1;Igb!Y~v>!8czcxlARC z-2aqpzy?W^ZvDLrf9Iy$C;K$BX?7;=a|cYV3LW}fi^6n*c4t+GiMau2ICb;;dMr$F z-ar~W*qBNMM0mo$I5Y`HKB8eR#^UqC1@Ika>Pd!hd{Y!7$)O}9Y|Q9E5{~>Dn7KE_ v!Hs9GZbB6iMd|<}WlMkr!fA*kbVZPV$yiH&AT0?%00000NkvXXu0mjf!zN{% delta 246 zcmVuK5B#}8HIvErUg-&g9I$9t=4@GezT$?myt3RGTZtm0*5sHdSFP zN--=pEJ_)*wYC5M|Jc~r8x{>DkN_8vAsBy{Nkl2q@Cn6jd5D~pd=_ddH0DnnDK~#9!W7u&nV@TrY?3mHn z0AiRldzgSm8SX6=?jQ!|%ua}urpaValZG^gWg6~ND&3p17;a^Bc64;Kt%X>jloboJ dRE7cO3;^G-H21#oSz7=A002ovPDHLkV1n65T{Qpz delta 210 zcmV;@04@KZ0-*wsB#}8HE-@@NCn6jd5D_3i4@Gezo@$7NPHkM9G-azlHB==mN*R}8 zTZ>anb3i&F#zBOUAsByvNklqswqYcCY5_;pV~9snZc#=?3$ZrrTpGvukdh1!`CJoHcXiOrU{aE6RaZz%7M1LrE3@0Agr5K?VR}A^-pY M07*qoM6N<$f*vMOy#N3J diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/door_bottom.png index 5c7df9fbd1430f7c6f22642b0f34ef1a5ddc2be7..861770d8dda5ddd2090d392df4f96dd26abd658d 100644 GIT binary patch delta 206 zcmV;<05SiJ0*eBWBoYa5NLh0L01m?d01m?e$8V@)ks&32#l^*|tgD`Ch?QV|j8}Dq zPHl2JT5L8|VJu48eH=Fc004POL_t(|+BM2S4#FT5MbWne*8tr?N$3U|-Ub>NgQoMZ z28NA42A16z^-j;lK5B3EXee|_cO+zQ#oG&!!z5u6{zwz{)@ti@plC4mPNImPS6LQZ zU%@ybaZ|c6P1Aqw1KCGo-Zks%m= zdPzhglM^*~P`hi^0vS ztgD`Ch?QV|j8}DqPHl2JT5L8|VJu2$Z??<;0004WQchC3GG zF_N$;Nh~o#O{E!F#!sbEF^<gmm;gEL>;eIzuX+N(4O$p?t^DnT)27R)yt^~b@Q@1R>FVdQ&MBb@0BCV$bN~PV diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/grower_item.png index 4498778e22647254c68d3ba4c50ce163489ab629..1cab0022c7834cd041476c55cdd840afd1a3b333 100644 GIT binary patch delta 179 zcmV;k08Iau0)PULB$0s?kt8C20001ChB|s-NmFw)a8*7>Wh!P&HAPq|Q$;pMIxOYB zvCsej00DGTPE!Ct=GbNc003S|L_t(|0R_Q<0l**#1F%#;+5ZnO0RR9X0e~c_3P7q- zGgS#BHT&k(Y-)01IooDKjca4rC#F94wT h0)TVB1pvL@2mIG)0gaA75aR#<002ovPDHLkV1kb$K_~zK delta 199 zcmZo*n#MFiWum2$MPi#(aIuMds#dV8nQMernvZEgs9jZ}r@NI70|P^fPhB36;wlO9 z3;quS44cmAoS&#DQJ?MU;uxY4oZ4f_#B9jHymRBf{|`H6+*MjAa9Bd;$I9>%mvRpU z{rz-g!z@Ef&iJb~Ix|$(bylUUYz>b-(q}euqpG6Wq&YOJYk!&IX`g|&@~L6u6{1-oDvwD04FI{?EnA( diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/leaves.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/leaves.png index 6cb729a79afba67eb3597aec591c8326b12b2563..fc6569aeb6cb1fdbba671cad83dc5e1f7a92b0ff 100644 GIT binary patch delta 200 zcmV;(05|`$0+j-gB$0s?kt8C20002S#>ShQn}mdfadB~GW@b@QQBF=yOiWBlN=lmL z{sRC200DGTPE!Ct=GbNc0047IL_t(|0R_Q==vDbY;uCgXyUm#!QS=V>>9_d|#UVB{IJJ2Kd^$vzRX1KqfEOzuw zgiEalo5iHvuEyS$A!*sHF+s^;3yMHW9HrU({a((gFxohqv z?hD(wcj@a%e2vYIR@+?(jjszmU1N1Edy|IwsxbKlXO2G>SyBB)QpAF5>)l@6@+ms$ zQ|t|yc5xnh`kp^6X4;BwUA6P6C*G-q*iYAVu3q8dXC9<1@TK&Gxb9~uxm5uytLAZc b?f$|ZRmjr%x~66&(5(!fu6{1-oD!MiWK%H&xAcma5Ac)aX6o??ms)&RgKmp7Di8W^BbKsImz9 z02``LhwpMe#7LkyC2gEjo7X@l%b0{V2~j5101%=OpeEwshLE?81o}b1MJ?@B=RdEE VE!1Ae)ARrU002ovPDHLkV1jN1Sw8>( delta 210 zcmV;@04@KU0;B?vB#}8KA4fVYI4vVVHY#vcJ~SyHQA$B(Of^$QHbg!*qw6RUks%m= zk4Z#9R2b70#xV#>BcZ?5Nm?C3m?8FWr1t^eE|jG}hlEe?Sd2ccy01zoiu1qv%zT>t<8 M07*qoM6N<$f~|p8LI3~& diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/log_top.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/log_top.png index 4b2948b833a362d1145b129044ce05ee131acfbd..7169635ad8ea8b50a9a92f925955087298582de9 100644 GIT binary patch delta 178 zcmV;j08Rgf0{;P!B#~kjkt8C2o@$7dV1A5Ob%joCaynW#Eh983Ab)QI_5c6?b4f%& zRCwA2!NC>5P!NXEZzf~QJPnX2K`lzqrG=EBflz_>JI6A|xYw>~l&oUC89FF}Gb&DV zXr0q)$S@m$PxF$G`=gm#wOd7i*`o0KMR>GQ*fC&z5oCK07*qoM6N<$g7!{J-2eap delta 183 zcmV;o07(D;0fqvQB#}8H88j&%I4vWUV1A5Ob)IU7aynXtPHp6ZqMwl=7=L<6L_t&- z(;bb`4TCTcLrqv92@Alb;Tw8f|J!ar8U{!d_8*}KmMlHVdNMi(t#vRI!uLrNOwR2* z^Bey6p+IrMu(M`f;fowC#RWqW<|HHfBClHK<%V=k3d~g$cF9Lot1p)xSC|rr9tys- ltkEyxurZBrupQv+AL54?UJ#ydpiBS&002ovPDHLkV1jFSOLG7K diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/planks.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/planks.png index 1e385124d9f9f4abadf73ed311c9156222a65acf..fd3ebfb5010a8f5bb45828100b373245b8a67849 100644 GIT binary patch delta 172 zcmV;d08{_}0r>%tB#~kjkt8C2o@$7dV1A5Ob%joCaynXUHdSFPN(*yMCBN|D)v+8{oy*a>%ibO^XnrFJ_NjugGRxk8I78rIu=?N|{q3<% zY$R`1>u4z#NlYt{ZY%0vPkG@;@+ e`+WL|_yI?J6psdA9HamM00{s|MNUMnLSTaEl}QNz diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/stripped_log.png index fa83bdc47e74e1785df2ee800641eefeaf73236f..d55d9ef30d4017331f0b7bd38b4263414dd7fecc 100644 GIT binary patch delta 189 zcmV;u07Czc0*V5VB#~kjkt8C2o@$7dV1A5Ob%joCaynXUHdSFPN(*yE@bow6?j^03ft%?#$B3?(_mSd*Oq(vPPY^1#YhBQj)pU+97t$#-i!DfO rSFEl8+mxQ6$bI=;8dFHKRi^MigO?i5Hd(Iw00000NkvXXu0mjf77SEO delta 191 zcmV;w06_nW0*(TZB#}8H8HG-5o@$7dV19BsT45|oY&KPlS9RuJgeH+87=MCEL_t&- z(;dw*4#F@H1<~&ir(P43+78GyitHQ!c3oR&Lrp;9{zt%~o9Yd4OgD4l3Q#V7WMKFG z7X3f8?kW{@5bIWXfIebFRs;9a+V$LFp8BmLe!@_y%P2#0Y?(&^B54U1z9O8t8t8)H t_3Ls2o!23(ZEB*uzb9??DHs(`EI%z(7D{i+nY#c0002ovPDHLkV1n)dQ5*mO diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/trapdoor.png index 79b429979bf16e25e3e149d8a238e8e86c2b2e6f..be807d68d0de40a64228c242be0b5ec261d2213e 100644 GIT binary patch delta 221 zcmV<303!ds0;&R#B$1I7kt8C20002c>glM^*^9x=o@$7dV1A5Ob%joCaynXUHdSFP zN-HNP9~>MA2M49~Hp~D300DGTPE!Ct=GbNc004YRL_t(|0R_PULIN=m1hC9r1@!-q z73_6P@=8=H70uY&zU|w-?PIA{tL2PEh=)osB3b!;=OKx_B7L`#CvmM%`&^#`y}x#6 zXiE^S5veIkj6@uW#ILa;AEJ-7YNXSoP6ywG} XO};}(f%WSP00000NkvXXu0mjfrjT9= delta 239 zcmZ3*w2x_m%0x>gk0Pt69JA0w9j~bgbv@ywt$w-lvN~2=xY>R1?1fh^3a%!RE~p`m0RR4XhI#Q{@WX iq)KAVCC`6mIKXY9&eCB0YPBZNsSKX3elF{r5}E+Ad1)~K diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_leaves_overlay.png b/Common/src/main/resources/assets/byg/textures/block/mahogany_leaves_overlay.png index 6cb729a79afba67eb3597aec591c8326b12b2563..fc6569aeb6cb1fdbba671cad83dc5e1f7a92b0ff 100644 GIT binary patch delta 200 zcmV;(05|`$0+j-gB$0s?kt8C20002S#>ShQn}mdfadB~GW@b@QQBF=yOiWBlN=lmL z{sRC200DGTPE!Ct=GbNc0047IL_t(|0R_Q==vDbY;uCgXyUm#!QS=V>>9_d|#UVB{IJJ2Kd^$vzRX1KqfEOzuw zgiEalo5iHvuEyS$A!*sHF+s^;3yMHW9HrU({a((gFxohqv z?hD(wcj@a%e2vYIR@+?(jjszmU1N1Edy|IwsxbKlXO2G>SyBB)QpAF5>)l@6@+ms$ zQ|t|yc5xnh`kp^6X4;BwUA6P6C*G-q*iYAVu3q8dXC9<1@TK&Gxb9~uxm5uytLAZc b?f$|ZRmjr%x~66&(5(!fu6{1-oD!Mh8X6iB5)$P?Gi(3=0HR4mL4Q^tX{&scvKgM1F z50M6VhQM@wlhG*@Vav4qNNBXsL{T(J!dULIW(WW!YMli&uxjIL&3oXrzsNm-fCUloZ*nB!c>7>241F6KskXTzSsZ& N002ovPDHLkV1hC+d_4dF delta 650 zcmV;50(Je%0+$7l8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00L1-L_t(IjdhYeXcJ)= z$A1YIa*Z6Tup+oBB)-@BjIHe@`fz&42C*Ay5TdX*MAmsX>yXVzXCwL*#e-Pv;ep&O^f@*Ikq8DJ;+x;!;%t@} zGzPs-^x5C47WwcyPgLoq=gda{`g=}MUeAFZqiVR=mWxv;alF`1qtWp0z-R2UkHzD3 kDM~Pr&pZ~7x827d7nK&d1hO`B00000NkvXXt^-0~f-@E^W&i*H diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_front.png index 270bc6f1152606ef6e76fd74a1780b99b1b773c8..f447407afbb3d9f5b14792bbb7ee19bce04f834c 100644 GIT binary patch delta 283 zcmV+$0p$LU1*-y(8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJex-#^jO(Za&Q zwY9bBu@$4EquiDgpP8AKl9Gjmg?n#rTSqoUG9))989^fsC>{$V77Za33>y{=859f| z4hLe|jf)_=v0hrF`;~W^xkMb_roJ@+gv=}?#f{kJeo7A}F zDmIFX{lzjp!0&ru{b*UV<%$hPF h15^r;R1QUue-zanMuUx=_c;In002ovPDHLkV1oKEc5wgz delta 640 zcmV-`0)PFh0*(cc8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00Kx!L_t(Ijct=nXcIvg zhM$BUBsi7~x>Z=a+IlJ_^x!qOVnuptFoGuuMJ#v_3o3%8XF+-p5hN;t9#o2#D%zW@ zlp;k!kj6tx-E{n64O=IZY%dx%QyDy2(0cKy6xpns$lM_XH zdwUar)*8ogxHOihG<^ptCB9NLTWtW8QZaOLqPSav=Xppe`S$BKQp(VI+m0`ZEopPt z_QXB6R!ab%mX^p^769Jr>Mjr7%+8XrEUup&#IG)gzJGjdB(G2`m13Pve?LP*LljFT z`s^P1>>fr6h4?(Gd_JE5lu{i0Jj~nM8IEtBLkNM|@}Svj<9QxRDIUKYj{!S!AcVkt z`4ei-4X|3P;cqi8@q<0UCc7!XgAEhDd;NPDo=T-cRtPqXp;9@)_~0@N z^YaN{q$Rg diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_side.png index 5c1950f1a9d5266471c8b4d5934c80e814c1e863..bc75acf9d93138b974db95ba5f48c59c892efa9d 100644 GIT binary patch delta 274 zcmV+t0qy?v1fl|v8Gi!+001a04^sdD00DDSM?wIu&K&6g002KwOjJex-#^jO(Za&Q zwY9bBu@$4Eqo0|XmXeZ%g@t=>Z(Bz;MKUBeCK*8^4lp1UC>{$V77Za33>y{=859f| z4hN-vcCi2e0Fg;VK~#7F1;IgX0znW2!K~_LLBPfG|NqFvVt>bCx`@#4E8#IB{saA( z$d_gC+frdj_I_9W8?k8)f@G|S(5(IdW+7o3?dN%0!X#{(8jm*wVbOHfUPp5cL^LO< zQ)UIwqj73FqQ+xrqLhGPJkVSdq#K`zhGr3jS$LFtqo^1mB8kS#mH`={Q#8pXha$)q YZ%RpQ-zY9701E&B07*qoM6N<$g6pJg^#A|> delta 615 zcmV-t0+{`x0`&xt8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00J*bL_t(Ijct=XXcR#d z$A7n3{5UcmS>j?~!y;H&oQ-W78zrPl5L>kn3z2|gmyp6LO~g`Sh=PSkN+lLnt8j)R zge`(aH11_E%U-g{+$2lzBeA&5dYkx~2Q!cVd%rjTDfRVsAAd~0c#RN(N~Hq8o$J@Q zaK4|UnF8RRby!(lSldP<+<;5$jYm84#Bc((s zg;I(riU8UIMnnjK>v{OT&-m0d%~a7$6?Y#@kf!ZvwAKLlz7K#65Cj1LJwgDmr8QZS zptC&yer#-zC4UKJ*Ck650LrfWPheL zGCDlKVy#ANXP4H_E>cRQlm*lRLKHGz|KY4aNFP}slqIGuvon-)YiSmhw{@!zJ zYR#p~1KhsylGe$ad<#Ps>YvH>esa3&6ziLt#Bod<$A4J+`!u(=S*U%a)Ysd6F#q8b z0M#@1dAIzC!HbiGt*1P^H3GoclbPHjM}1%eNGTCQkbGZ8^azr08EH#eJG*ourfHgI z6LzPO>h>&Y6!A5C49L95ahyCGk%GYcxjD+Nd&~!oxZP=KX^9>o*g9O|mwLS@aCM~3 zYB-fr|6uijloHSLP)bp$RG4}7ye*)$MhH>xxZ^na4ve6w(OTzEYMXa8Y`*WKwJt2m zG&y<(U|Uv+Mx#++Gy6zVjb)Vxg5cO+0I;kQe*v6(GB8pYxN diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/crafting_table_top.png index fa6cc971ae76e1fc3dc4483a7091f7f5c78f0f34..af4cbc65427bf2d193dfa4cc7182b2bbc3f30c9a 100644 GIT binary patch delta 227 zcmaFH{F!lrL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19F+i{5Z4!XZ``myWnle(Nypke3eB5k8GiJO3s;~8QaSW-rl^n5mwW*0o(l?zpUZHcx zj;Zn9;*p-!3k145B*SJ*T{?BTdb#128J6m^rPZqqVpwKNP6u&}SY|I>K6PocU;Ve4# bDwZL+S%>A}Bl9mnmoRv``njxgN@xNAdSP0o delta 472 zcmV;}0Vn?R0p@O02-tGP%0G<@D@=-eADi?k=K#czDoYe{cK8%K)jg!v5Yi zjh#)j)l~q5m5l6Z>g=F<*Tr^RlCl(BvK==fl9VO%vQDerp*J=WHC3Tjtpo+7VgbFZ z1E80645JQ!VSm&E4p6IB&{PF6pUXyU``mV1rj{AJ>ho}2K9^--zRz$QkB?8WJdAGw zzWwf9_eUOv$UhNrU^_17=a;~&?=X*>P^^Pev4COJu^kt~s8cEyupKutk%&NlIEwuC zJp8H5Pho1A^oJvateW)JGU;HE{8r+`eE5s>@@mbpa8ZAI6Rh%I&}w&Ro}98?*+7(~ z1e1x$(Q%VjyYtQJyzN%I!_je*$;3pK60EtCE=&b_foIR0NXCBBInNdo8q O0000F$e9 zi#F(3K1?+@I4|#mGk>{v>68;33nrXoZ1f9^HQw^R@^0syEt%KKGInOXXHIUh{~x$g VQ^`eDdp6Js44$rjF6*2UngCl-TuA@` delta 421 zcmV;W0b2g;0kZ>;7=H)`0000V^Z#K00004VQb$4nuFf3k0004PNklCETzPURez(3?NeEC58~+La~a@tCvGsCFhIKM}%wyRu|37(`>NoQoQ*{MvztM7i6r z)<(khBI#KEgW3+!Su7S`s-_74f?EB{T^C?7nV?QY1Z!=SS+_6G^P0E1zo%O{$K%68 zqjBq(7vOhwt+lm%5vk**#?VcT;eE5AYRx`11~wadSsupc$4BE^hY`O4*}lV*9g~e$ P00000NkvXXu0mjf`ZvNn diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/door_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/door_top.png index c4718d4fd33878a42e47344fbc705993dca0858c..7717af9ee29b7e0f9013a5ed05e5c210302b639d 100644 GIT binary patch delta 234 zcmaFF{EKmdL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY05@#4iphYqb?y?Xx4 znbRgsYHe+;&d(R*UUCSep(MyJn8D%MjWi&q+0(@_q~ez7$&I{+9C%nSfus^Xv@ZKrl3B zSeY@A7t-(AmVac|wlqz{zOEyqBo&C0$&5iMMXoiS_pt&vI6NEz!q5;;{wF)vI?7yn zYi+Jv-voQsG75_xN`budfV`z3gvI5Q^pU}#pq7juP7&ZjbDt>y1_%iU%} zW(+6ODZg)T-({#QOFHi(vR&IA{z5;EAMjesK|0q;i`85|wj~eO;4l&Fu6vV4e3UrEt!X8N)x?OVbwuX=k4R0000< KMNUMnLSTY)U(){o diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/grower_item.png index 489fc217d77e117bad64874effc4c6069ac4fec8..04c120ea2f58e883675edb7f782d12a029492431 100644 GIT binary patch delta 201 zcmV;)05<=l0-^$tM+ugqhnt(5mX?;0P#%9qVj@IfBSBmtKw2R_Ssy)CA3RnbIZ_=p zOB*sp7zJ+eC;$Ke0d!JMQvg8b*k%9#0BuP`K~#7FZNUi+!Y~W~!3Bqga^Ef{)c*e~ z5#mZDX86Yx3pM3UeK&?%xG66>9QVc68XgX~nQhD2@0*LeDNi1U#SkYmKHRU}D9$xc zx%Dd=(?qLJv?eoJk~(U6E}7c0%OX?+A!WW2WDtM{7E=buc~MU|00000NkvXXu0mjf DU%W~G delta 202 zcmV;*05$)j0;2+uM+uvoo0gWAmZFD|P#%9oU?WCiB0*dsKw2R_Ssy)CA3RnbIZ_=p zOB*sp7!`xPwEzGB0d!JMQvg8b*k%9#0B%V{K~#9!ZBB!ML_rK4<8G}HlK!jw7GmL% zGm4%>^sODq!=oa^R{T_P?`MuzkATpo5M#XOFO=I4rXj%B#o;GLG7&&fl>=EQC;K)} zHpIjZi`^Hf+!eS`n_L^NH-$f?Ip1uwELJn^i#F>=8XSuT&QmbQ)c^nh07*qoM6N<$ Eg3YT@5&!@I diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/leaves.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/leaves.png index 58816096ddd39ee78ae5d3b3f003fc996ce677a2..a91494c5c2e114d8073c51cc4a7ea886f7a20b2f 100644 GIT binary patch delta 180 zcmV;l089Ux0)YaMB$06ykt8C20000}csxOACN*RgDpeC9PZCvlMu7kT00DGTPE!Ct z=GbNc003)AL_t(|0R_QuIuTU*Ly%wkd0000z(@TD zx4?Y`b1qzkvU`@ZM0NKnF|Y~1K0r2rwG^Y^aN5D@6$56M0=F$?hm!yR002ovPDHLk FV1mp6RjU91 diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/log.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/log.png index b746524b376dd189fa7b59d6f5de63961846a231..6a807856522b0a9de514153ed33af6cf5ef39a27 100644 GIT binary patch delta 181 zcmV;m080P!0>uH47=Hu<0002(-QrRJ0004VQb$4nuFf3k0000FP)t-sg@uK6b#-H7 zV^2>{NIgA)U{hlN003l3L_t(|+6BP@5koNuM8U_@0HGD|8ET*e1)LrgQw-}*z z)?^^vo`Z3p*t%Kt0{fmpYF{y8+AT(x(wtH+V)CP%P{%Dsi7p=8YJ~J7_A2VUwbel= jO$lhLWAa5MBc1gJh+Pw!07v@500000NkvXXu0mjfb8Sg2 delta 356 zcmV-q0h|8C0rLWo7=H)`0000V^Z#K00004VQb$4nuFf3k0003kNkl$D ziN5dg5!ebugud^owKl3px~d95jIrf(&*yV}H@6Q1opWwX47_^`!|IcdT9^hOMZCoL zQN(ZRTeBb{s1s2)K%;82+dtn3AlSh`M5NjD`+DuVnKPbc@bqpe?H+&b_tOYwwdDq{ ztoOLqdU8a!?_IJvGQ)cpQc61^jR8P%Td1l8@2SzUwe_>xJ?H#h#Mu@lrN*Gv+Jrpn z1OH3cMmTozc6}0hnkKq&99LC6*)vVkX>lwJ1mF)|TKJNKDuToS0000b$f4bV`F1aPftiaJvAD+T>t<8j!8s8RCwA2!7&m6K@bJd-#rsp zRp=RlmCdRmk-34u0UXOM2qli-3QDF*Fna-}HzQc>Jv!?vcWQAXI8uzSjMBr_3<&8;UEj@|qh+6<6WSk7vst_l^vO)14-R}vI`3yCf rH=kV-3dtR(u!xDnoDThMC%BCN9*Hj(KVZCi00000NkvXXu0mjf6B}e? delta 477 zcmV<30V4i^0_y{i7=H)`0000V^Z#K00004VQb$4nuFf3k0004{Nkld29 z5Jg`M0qzWfARBLI2L^Nq_W~9^!Imy^6raNf$N{!Z6Gugw6aoybx=k|!fpC{9TS&u| zcJl#2wgP?)9D0&ssbP)#266~ z%Ce+s8USL9gb?!D^Z7g+psM_Qd>pc_*97OdsiG-y8xIAzsq!+?d_NrU-VXp3;v2!#I1;-)pTxVCg-@x7}{`j8?*C)>I*coW$mZ_nr^}zg8G3%<#Ilo!uSCWo(Hyn+?U= z<$@j#Y|E1E#H4Lm=5bk;05nZABdhD0yW{crsj9h+t%d8lp0%xMUsZHnms|c1!^GQC TXB@o;00000NkvXXu0mjf+PC2$ diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/planks.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/planks.png index 9b6a12973227b4c8a2a47f5e0459df669e42a73d..ba4825aaa0b5862d0fdbd26bb70ebd3d1b0fc337 100644 GIT binary patch delta 204 zcmV;-05kue1Ka_S7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-s(b3Vu!osz+ zwWFh>pP8AKl9Gjmg?n#r46YZU0001TNklbSa#tbCM#zVlg`A4(iHGkDxW6kv&E8-6UoEMco0D15L00000iOeq7=H)`0000V^Z#K00004VQb$4nuFf3k00045NklD0dg*1z&A*Wr1>cfTd7bG3$8x+7mkEvl5GsTtI^D8Tusxo zsw&19+O}n1A%w5}=i@;QV2nXkQB|A>b<@yw9mbfntg6IafPZ*MqQbMHNbsbLREA?D%?L_c9(*XKmz=>e3Ee^!nlQ+Njd!hAUOyR+PzTZh6 z>@^OM3yB8h7BA^PLJ2iRs2`J=w3q0gA)AOIeyF6Z+aHGaxL zK8tzDXVvw3T|)=}MqA=W>4-VBwr3Ai`_015yANkvXXu0mjfL-M@7 diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log.png index baa2b97ccce4b0864a90fe549819363fc509466c..5f65db49558b8fd37d5832124fb98b085aa81f83 100644 GIT binary patch delta 237 zcmVkTu2oGRH@1h={(&P4hn9hPMZ%0gt;5TX)%w|cI1t^Q9GA5vKSgc{1 z@gC1cGu?|D<)6R+!n&#m1bsV_s`{WIh{_< zxoz9L_c`Yff^#mVq^i?20Vt*1ZnqfYx~>KQfDl3{1wWyx0Dqiw{RFVCYmCvK~zQtE`petn6^>-FM4 zu>pAR2?RhyT5F^-0N8$4$rkq;&{|W~`~42U)c3o4vTd8H&hyL+on4k?KUM=^9LH`P wwQ_m8zs!7gX*?b&j(Ghg8(`9V->d%sTw2;E>rqpG01E&B07*qoM6N<$f_nJ50RR91 diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/stripped_log_top.png index 75db11ee6ac32c9db6d607686c7f53561dcc8949..f8eba4e0c431fc7deb337a83243691bc912ab226 100644 GIT binary patch delta 254 zcmV@CJ1g93HRf?EqKENF30rr{Z0rs4;=S0v$4iRG)EuqIj2*Ms} z?9C2L5yIbMpRH}` z8UO%30$8utRaJSo*RSVi_HiApwNi?8p65jLfuyw_MG+Bct?_?xM=2FZskLq|7q8y$ zm#dWnD9bXCl7BUmEEWsaF#urj{qa$2eYTc|y`N5TlJLX7vQHo-;|;jw&Z8*epzO(R z{7Gy5c03O7MKKS*`{Lg%g<tN;g(9V$g&JT zQ51d8!Q1g@jH#;1_kAIR5W@HU`FuVc4mX=k+qOaoYpw75#uxy90Z(}9nV%GytN;K2 M07*qoM6N<$f>u7-ga7~l diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/trapdoor.png index 7c21daa2d19ee48f605af3eed080ecb032c3ae28..29efb8e75919c1762a41484daebafcbce872ba07 100644 GIT binary patch delta 231 zcmVN(!&Ag%_~)0A3&mu+9OzfCpIc0G5K=Z>1n^Et7>vND!>DMf`^( zYhE?^|2H%5e|gi3z*VO!yy2R<$Dy1Zb_%T2rKH<1*X#s~k8= z0pKXrAOVeU;R%e1g73otc$)Zln7YZq@n~vdeB*%jzg{etojH($-|9hng{~aPXuVYw zm6Pd|OHE$;K{dvBWORX8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY8a#g{Yef ziHV7Xcy4u$5s7{XbZB4^j%!|W4KZV*WmQg9XbEXlGcj9^Q%gn+Yfwo^Nh(fyycQNo zLOgdc2R}bQkr5F(H8Eo-1t}&YAs!qV7ZnZ;3|n3~VE_OCvVTcLK~#7F1;K$z!$1sx z;Xjx3dacxfD2VU>YQl!tsUU8> zQ1V?*1KGLBBu9BYDq+i6HvsO7v$sv;$?iwXDTnR$r=wH`I8<|JTUA@L&*M0{YS&s) gULC_bOy&ms0|?PlC1w+poB#j-07*qoM6N<$f`Qn8ApigX delta 699 zcmV;s0!01Z0>}lB8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00M$ZL_t(IjdhYgOcQYw z$3Mj*ceJ#=?(tOKd1X#2SRc)fh3AZQc>hr5&%5% zR#^?kZmkgt=Xvs?4kRz6H;_b;gr-xL&~!%98G7vzdhHQf%ggtz+U-x^^t}Sd9jiHj zI&zt{b%nAE=YP9OOaM~nIBGHlKst5}GGis0q5eL~KF`ftz=oa&Al9G(FmO9ZJd!JN za)pJ9&T8u;%K#QklMOx3T)v(K(*(d!7ASpeEj zoj_GnmROcu*85jDwr~BThkeMh3)@Zq^}=2QKq$CELVwc%sIp7AJyrYeM2W|(#zIqb z6Za<{0>zvGJhDt@Uy`hrV`kceZWv^;Sv<0A=^PamjE|0RKoo@WiPb2LS)Ffg7rvfJ zY_2-mPJhA3!qxe00#!1u%1Sz}Bsh2^gRayTlPcs9*47n_sVVe80A=+9vR;xF57ab+ zwgNSW1b^ZY`0c-l8H}>p&0SN(lq936#ur2uzLppgYhu4TZ@R! zYP=`k1JL3O>k}G0c zZYmj*;ca;Z8Qc23U&d|DYSOx^-{o}AShB2P8Ekh@73YNaV)gg|TZQPWKE%m4^NSDtkg$HRq0%00000NkvXXu0mjf D*i2~A delta 641 zcmV-{0)G9D0*?id8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00K!#L_t(Ijct=pNEC4# z#Xmbp>6$ykOtK`3in~phgd$3c#e)&FD2QyAI`oGS>XMhBI&}$85<+=1iiqP)3s3|VvGQ-R+yKWt128i?EiFq0mo8oa;KSM?gVCsb zjfJY3xETjvY~Z6*I5ja|BWR9B$=i02c-oR5i44SScz@&->2w-^&bAi5E>#JRE@@hX z?d%qAxk7h+evvC&!&4$An&5}8Wyw0dTPa6_2#L78McUK3r&sq#gbfB blo0;`@tZ$&3|-13k!Kj2;wm1!2tMVR{htOW?`Ef8!&#ddD|DGD*?dSl z*(Ey>v+1zrt`fw3$s!9-v@CqjB%`^^B7PJLW)D992QsJ`zTfcnb!941KN)T@nZ^uO49<6?2tkWaE1tMa$yxllcT-{}PEE*Gz*T-2>sdt{3n< zPre(;K+L9@2E(HxgkeVtC*prOfUKfq*hmkSR@am6sUAOfV-zJr{mZxHEez%l%&#aJ Z{sGZ$3W%Jn&_e(K002ovPDHLkV1f;pCqMuI diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_top.png index 40cdce065f1b28afea78c303c640e04903650ff9..501bfbbadf5e3cdce052266023e7e31aa9d32a72 100644 GIT binary patch delta 216 zcmX@j{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z987gmg`%7*)AIX;Du( z33D+qQz1SnQC>+A9zJe1rO7KU0##Ocx;TbZ+)92iNAS_3M^TXn4H`oO0|GP}CMP;A z009kk=hX$93ZrHvvN%uJuxR0o1q-#B7jH`=XO)vle delta 445 zcmV;u0Yd)h0m}oB7=H)`0000V^Z#K00004VQb$4nuFf3k0004nNkl>ub}y1Hr?i!ItFxlIX)L%G*}q=GM8 zI9$$o&&PX?an|t4M6Lj+IY+dGOWhV!VYV!IFC}rB;kg!NS$|?Ca>e7rJphAVpUY#L znrT)NgjNpU(0#ZA;OY4VoodkQ(+RzU!2mVWq!W4!dVT$8oHe|%EnGUG$7H@>EHhe; zr5(mH+ahT>7E$0cn#Q~pDP~)^Tprun;VL|#W|~aq3!=a$3VenipIkQ^08Hi!fOX6_ zh`KGd%2xJRW`87kuCpq8)30s|_8Q)7BS|H%74|0f^ojysmwU+mlippJ^0(Xmh*+gj|t7s*A_3?t9SpyF3Z_J k*57%qVYczpOYUj)S7kK9cW2FC3Um&Gr>mdKI;Vst0K}VK-~a#s delta 459 zcmV;+0W|)B0@(wQ7=H)`0000V^Z#K00004VQb$4nuFf3k0004#NklmTh_z@Mw%4DCC+JDVIGpMP@u*gFI+fClhmZMEKM zw*t=2f3dr>NvJjd?w|0KulOb!Ko>x8Hnll`Czo=yf=w-<)|fbvbhpT;d_}1BB!Szd zJU2TbMaU(hXoO8Io=93)mmB8*j!kW@s}Pl|73jZFav5!EIoRI=Ak>=6 z>l@mwfKY2reqOLttxU|vGjWp5K<>qN6pa8fby6?S&5jiazzxYo(TJ$M9#wUgo2BS95JtF`B002ovPDHLkV1g*b B&Km## diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_door_top.png b/Common/src/main/resources/assets/byg/textures/block/maple_door_top.png index f0cb57c2119d3272e585f718ee747a4b0c551a51..24d1c70c0705543ad5ae42f35d51866c222ebca9 100644 GIT binary patch delta 239 zcmZo-`Oi2(qMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j$D9Gh^r(F%N9kx?uYmXTF=q`GKTrH)zYOXD+o+vK-Y-JP~-a!g0y znhE!=|Bjm1KD%m4U#zm}?~Sk0{XOe(E? z`lmJgwomiqlt#Tq#kNt^iz2!H@$-P)Z`&L<4`~GZ~K%=MF5gyK#~kd`!SB^ zN)I6I#{l?kAIEcP1tBx5)s-<5QV~=Pfud@5aei*EQLj<4-Y~eiVP|`b<@fI>8hNg+ z|FH6Lnef*oUw<|~Q!W+pJLfd&HC~O!+&?^!GYf{Srss9Z+dT`O-F)0Ul&`DUHr=xT z08P*9RBT)Fi5>_g$$*8j#YI1+6@(JaEL%@0sH~mvw~Waw7&K2#<^BhEkvO}1)&p6< z@m%8U4oiQ{<#mtF#nnD=@VH%DT6p_?vY`N)YKXPcmu)Ij)QcjCtf_H{h!pQg6fp}1 zj_1CJQ44T diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_leaves_red.png b/Common/src/main/resources/assets/byg/textures/block/maple_leaves_red.png index e992971c25d291efda3994ecfe15eb2c961dbbdc..06bfa8e6119fefe484954382d42b9b89d6138f05 100644 GIT binary patch delta 154 zcmV;L0A>Gz0_OpcReya+L_t(|+6BQu3WG2ZK+&&F%r+1YV36)ritAXIeG78{TPoSQ zkU4+fBMtQ^pLr!CXJ_LLng`*h12qj~Uka8jq*#?g_0QFWm&;DWw+Bg4{5DgyUAc6` zppvBHD7g1>26{bZi_$X7uDjEQ(P*ZlcofpzxY#Dk+Q#|^{u8npCT5wiPx# delta 181 zcmaFP*u*p;w0?%Ci(^Q|tz>~P5C2jR6O-hClmguZ?clVuganhs1b@!J1P}4Bgn*RN zf&`6Von&z_5B|i01dsGmBkkf;j)cGz&P0Eq#DoG-v4Yf6lN6w=QL+YSV46lUP?11c zYO+UZLIS6WRzkV}r)EK^NI`0nL5VMiX98zpN`RhTa)Jp^K`KXLfmdKI;Vst03OgbZvX%Q diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_leaves_silver.png b/Common/src/main/resources/assets/byg/textures/block/maple_leaves_silver.png index 20f80d469b04f8cdc20552baa63c9f5edc3eef74..6611863380b579652bae1054995228d691899f82 100644 GIT binary patch delta 294 zcmV+>0onfE0>%Q6DSrR}0PpYb+S=OH)z#C})5*!n$jHdX#>T_L!@Rt_x3{;gt*xr6 zs-U2tot>SPm6eo~l#`Q_k&%&(j*f|miH3%Te}8{_dwX|xcXf4ja&mG{*^-X{0004W zQchCDj{(lGE89tZb;r(Dsebvod zpv@n6>|8kk^jm;?w>1Pjq-G!qvr*vZN#f$sDtJtz0Nd#!pMGz13bZ8HGGZqkKv`Oq zR_Lbng-1V-(;>`9uG|~I1N3VhXU_)Emezd3gO1f6j%7))f>71wMX>-|2g3V%Ux5DM svq8rPfYdx=!yi)^ns_{Y+z`RzAA*_+M|>ikJpcdz07*qoM6N<$f{6iSnU zosN!Jl!`0Q*t*x!9s;Y^JiH3%TlarJ0@9%qidy$cmx3{;M9UeIV000DZ zQchF<|Nj6$Dyj4U006j2L_t(|+7*t)VE{o41Lc*Mj)|Q9tA9(rVfM{iFao*x3-TR5 zv;6%@`zEL&FA!n={Omz;URIJ@>GmTK8bcjPo`HSGl`_1pPy7!1$NPtGl@52hDAO@c zx)oEbWan|)jj^2b0dn2vIks-tU&ED1PR2-Wxaa3f0-6 zRa1G66CP1#>o~FDEZ2 z9ws0d9TyQ45ep9t1%z_uFaQ7mdr3q=RCwA2!NCoKFboCI-`M7iVmk|z1wxbDA?h8J z4gg~R9r_+bo3{B3a89AUo`4po;PynM^&4#&3@KCLQW^S_%1iEyKDg^7ihk4fVJ6f| zH#3`IhjtUXz;kKrbb~V|YBV636DQq4BUY2VL(esdA8*h(#PhNI0eEx}n&yi!Jpcdz M07*qoM6N<$f+VC+Q~&?~ delta 444 zcmV;t0Ym=c0m=iA7=H)`0000V^Z#K00004VQb$4nuFf3k0004mNkl$|hj{~T~`+TZ(Uie*I&q7;{gD5Wq%Pu2V;!9b)mqhD+||n z^nDa!0LX|4eIMZ(4?8PSR~9LZG01ZT*LZ9;-%{tn8Bb)^=hruBU}&Wfe*yp?&y^_h z`xaSUSt_?{QUGx1~5^kbs_TkREJjxp_6+0U0p4QD`=&} zcZzg+U0H-USkSt_`^V>?fTb)Kb7=~pgVqJyb~o{S2-o;=2Sg;YSbDl#4jd!T6^Ljc zNYC{j(ulJXtrT>j1_I6jtFW^YL^Mex2abp)>ax^ZdNnpo(8Y0y m3{NdW7iA(h5|J!Awe|-*-SIyN(|BzF0000iX((Y6=pv;({WA-26PO*P0~H0Ci3Gba4!+xRu=TGV1o$vR9oR zZEkFdsfo&tzHO~fGxPNHGAHr)w(>YNIc44AImmge=Gd`gT46lCeQBC`C)2`sW=}rb z+dKK_76~)!*)uJyyCV#B%8ZOX{ltt@Gs+B%&C1M-Q#t$$y!{KqHYRYCF=U2sPU0vM z5)n!W*_^^rRO}4|ms2u=jKa)J!Y(CsSQTn5OFw$?Cc|Vq)y3gSFVulHT#L6m}@(TgX)fuJ{0(2L-~G$n15maZ|wPC_@) zOFV35%_ey+yEE_1Jb!rK-0{)j{PVZ()OP}mF#v?WN3>g z0zk(z;%SVIXISX?in!AS;OXN7030bLQ8WhN)$?Z=B~dg^87(Wok4~2;8l$5Lj$cWn z%5sT{@ALK37k`#vMmn>Wo81_KOl}A~g%U-SC=z%oRj}KrrAh$uwqV&-gR~(o*R2JByz3S+{#Ie- z+wby!t63*6rA!NZ?Y+$9W%*WtwQ1q_6}83yNswl8gMTcSvi3Zc+6spnXHy22HP~Ru zk||Nd7?V7Zyn4mS&yzG|AZ?`8=CW`LxBe@Dq{DyE(R!Brq!&cqigr1l=LnJJbCzle*Y33P51{X>gwsU T6KcZ%015yANkvXXu0mjf7Si^m diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_planks.png b/Common/src/main/resources/assets/byg/textures/block/maple_planks.png index 92e7f8455c6dd2495833c22bb122b186024db75b..3338117f953440d4d2b41d2b841753b18f35effc 100644 GIT binary patch delta 198 zcmV;%06G8m1J(hM7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-snU95pcy4rP zU}aTKQ%gokLOeP(F)C_QQ~&?~Z%IT!RCwA2!O<0iAP_~tixsfMlke=K0$ox8(t)u9 z=)Z)_P%>oLk-D2KIL&LEzBBHzeset}srAr@){EpAM~1w$4nHQB<{907*qoM6N<$g7^wi AlK=n! delta 488 zcmVljQ z6oo%aZ%AI%#BzkXASEc6AR&e#!2kmb>Vm{VS-O-3iHV7!KcLLa{1G-LegFdtsT(yB zRV!oJdUll8Zf0=r<2kfvygu*VbMCng4i7%m##Dr1k6T+?tbZd*(;MqQe*QukQvqO1 zg)tQ;zt4zthyEZU4110&JgF^ab0XbAm3h%3-?<_gQ?Z!MTT}ak2vIv6j~WGqz2r1M z20(W;0QTsZa=B_AZEgTiE?4yPqE#=KE7Z=5=PikXGA}6XB><7`aC;B|@ZjEE$B8E~ z!MiuFYM(e9kAMDaCh!-Xr6~XkVEf^H0Qb?~x}QQaO<2t4EoH%%&!1|)qd#4ic@x60 zhf1bNs}P30e^b^X_2oV9+(36Vg+0SwSeG|6nd`2`Uf8D5)wgp%?P2fjUVHCZn)3DAclP&oT`id= zh-KjiAK$;NeYtYJ{Xyg;567ccb3Yj+-sGQlSl56H1rWXeY{=!_wIWZ e$WG+`ef$Ney!I%S7zbnk0000U}oXkrgM=ro8#8naoX7;zXROFRpB&3G= z1$(=BI@ws68tO9JYy+xfE(!7rPMf_r+wIbMAh+Gq#WAGf7VAMnz9s{ShKv348k8sK zJ?P*4_n7&+eVqN{M?&G;YnxwM zu+3h1RI2W_Ulhw>o4rC;mL7Y{;MzJ{NMU`!`yLljQTdymp96|5CTpf!^&QQ!jX1pP psD$&Dp4#YXXYVRK6wz1w$C$rB$3~z<`a94~44$rjF6*2UngEFjU`+r3 delta 502 zcmVc8{9XI{sdX<>LA*?`OoPf+1r;I{1%I3TS3(!5pyt@r92?8A z0odMt20(Rpw-9VTn*k6-3*sQe4?=VqJrw^4#WYhHdAZY5>IZvuDqEE-gV*&}gknmo z*}xsT^hX}O!MLNUzkm0p{pIsH?$G7p$1g0$#t%F+wH|lq5(lALWB1_|c!_wKpv#)Y z$fG~smK@P^!TuS^LNgb zf19VvV;{~=j}P1GE{IgHzVpKQUbUYSEta&J4UEkV?r)OhC|cabz#m{Lom%in@ zhOxQ9JP5Nf%4p>|%akQn?ZMjl#}D^4$Hspk)WuR^nMQ#-*sIgOo;=<{`IuH6QWPyR s5hV*9vO^N7pnpBd)yhXCzsu+RAH&k?f|ot%yZ`_I07*qoM6N<$g6!(`zyJUM diff --git a/Common/src/main/resources/assets/byg/textures/block/medium_subzero_crystal_bud.png b/Common/src/main/resources/assets/byg/textures/block/medium_subzero_crystal_bud.png index e0907806d22de22ed428c55a391a27355060c9a6..d149d3b9e1f5afb137b62bba0b5ad0e216d97094 100644 GIT binary patch delta 135 zcmcb?c$#s71SbnK0|Ud`yN`k<=1ELcQ7QoP-v9r<^8f#a+aHs5obj5ue0qfDZ=fh+ zNswPKgTu2MX+Vytr;B4q#jWIo1*`!LmwcQOx&j+LJ3JZA@COF6cp6#mo;9OE;>^Nj mdh6JDczARcDlS{d$HNdehgHITilG3|00vK2KbLh*2~7YS7BNQv delta 146 zcmX@jc!P0*1SbbG0|SGGE`RVuGgXb1|Np=L|KDro@}wPS8g73C%9y5CDgY_Ak|4j} z{~*AydH<6A6BQ+bY&~5ZLo|ZVo(dFVP+)NlynFoLcA2GiQI2UJ<|KZ+QeJTA?&9FJ wr&!ITJ~=G=yCq7`<~Sp}yH}3Df)Eiw;SM8~g#P3#0if9op00i_>zopr08kD(y#N3J diff --git a/Common/src/main/resources/assets/byg/textures/block/mini_cactus.png b/Common/src/main/resources/assets/byg/textures/block/mini_cactus.png index 65ac45954140db2a31f0ca0c9ba68bcb46c58cc0..fb45936e9b7637c98f58ece0db0634917a115b02 100644 GIT binary patch delta 154 zcmcb|c!qI;gd7Vq0|Ud`yN`l^6lZ})WHAE+-yslY6xHx*n5d{)2$a~hf9m|@xhXS@ zqIvHqE({RQDpftRRaSChB9+jmBM8<3xL`gJYD@<);T3K0RU2z BF%19! delta 152 zcmX@Zc#m;{1SbbG0|SGGE`RVuGgX~k`=`!do*PuF7Tu$rGQ-FzRRJi;{pa{JAjMu1 zc)mncXHTN`%;Zx;Tbt1fT7?&C8&`!CX1@ulu%!V@EjOu*}U%P-rlRN-UE=B}G#vY&#=sGap(k96uitU@SkO0001+NklQ08=p&P!S^=00wvy6+}jLSO5e_H8q>JiCq8$nSX~mWJY9+03=p+R+Th& zYyc*OL}pW1hD!h{h?!_rhSo0W~y? Ur}c&J00000Ne4wvM6N<$g04bcvj6}9 delta 724 zcmV;_0xSKU0^kLZ7=H)`0000V^Z#K00004VQb$4nuFf3k0007-Nkl*o9QPQLs`9x^vl$e}eeWxDat)1YIZ+s30oh2PoFm z51gpM+Pn@gnar3O$Hk@y?G?=2n!7 zuxnOIAdCXSC;-E3>SncjiigEt09*`gTFr#%S8KG7*4X(>rUaW0r+e^(HD=u$pH6S% z_~Q!dEi+Zu z27O|?gy+X-gFcR-F&w9pS{VS(kMaB%|I7pgDYmc?Bd<5;01d~aZksGm3Xl@V(9lhr zvZVpgFidi1cU6)tC%64~=c#T?68!y8|K?ybCu>s{0Dk~NeL&<>Wzt6g00003F#>b=_(58C<3g#DOXMXxjhAhEJof#*FQfa>;N`B1 znP(5k9lPeg%<1m=sRnn13vX-JN_afXDd=)obV~HH*?Rtsdt+A{POlSXkO^7ZlGo8U zk7>@@&O@d#?u?2{CpV`GHJme7-}C9A^@ftE;&pzK%rdhWgWA@y`b%5PdMCbJ`NihO zLqQcm@TCe!m0)55c M>FVdQ&MBb@0LhhrBme*a delta 380 zcmV-?0fYXP1DpepDSt905-=kZJS!J8CKNIy6g4LlFCr2t9uF)b5;!RqFeDQ1Lp z5i1}NIVu)8Dit~_7B(mpJS!GOG8;xT8%#GHM>HEgE*L*97(_A}Krk6eH5*Dd97;DG zJ1Z7FEEh*L8!jReLogXaFd0BE88IXiEg=#_G8sNC7da~yOn*2XLopdDAQ3~>^LqdQ z0MJQ9K~#9!9mrK;fG`XI&|n!2tWd>0`0jtb+53C|K^VmeexxFy4D(NrvIt8RlQ!0Q zQvuYbDcj#@ZP)k1n84J`TH&&k&AM^J2`ofGnl33K1+?!6nDe^!V(V(QRLSuM_K*Gz z&owXiEd>ucg{2l z3g+UHB4{t8r&=laLOhP(-+@R37uPqO?)0UMRVFN`jKidxef#QIRqTLBBuOj8eNQp% aG5-KVh)UJ~00000t! diff --git a/Common/src/main/resources/assets/byg/textures/block/mycelium_netherrack_side.png b/Common/src/main/resources/assets/byg/textures/block/mycelium_netherrack_side.png index 572b1cf1e19993016f07285fcd45028b137e2c7c..021919f3601e3045ee0ce8046889c7e0451bd876 100644 GIT binary patch delta 420 zcmV;V0bBmv1>pmb83+Ra001a04^xpo7m*_#f1*%KR7Hz%b9-%bgK27gWoK$-YI9*? zZenL@U1DEbUuRcXT3J$GQ&@#ULR?KwR!dJ&O;K4$Nl`~iOG8F-GBQL&K1x47K|Vo8 zIXOW&JVZA*Whf{;HaIyqIX*QtIWjd@At5m_ElVXOP9h>nARtg18!Rd;E-5N3CMi)B ze-%I+96K5sCn6+478W@c7Bm(XHWCsl6%{cO5-$=GE)o(f4-YO23(QI0q5uE@$Vo&& zRCwA2!3jdcAP@!6Nd#%LXz;s!w6u0qMxm~`|J8g?x-JaP`F;pP-v{r+hv2%-`{14T zKJ+rUaDKMg1TU`h{Wyxd-hW)~?#Hbcf49B3c@lfE-@A5-w{H(ukGu9QtF^eEzIJ9Q z#b!-Pv*pj4S&QqB9i9a_CT-TzY%MN_NvH(%^L2>^CPE@Hfi)2X${Zzw0BghqXss&L z1Zt@Yma18$@Hi*1s1^_`lEL@mgrb^>2}P8^M9o?Wf)rH(O5~~p$bV(=7{z2}4$ndW O0000r`nQPfsVMWrHDic};Xc;#Ps;*lRj6eLtYEm4~`&^C^f*iL-Etj(mctks?~XJ*cf zmi_$k6T>jB=X!;w$p+lTBGCxB@+=K&KptxwavCHeW@1dx@b$4DB|s5L(}^fzzQ~fK ze<(0RK!J%ypCQjNalx1bbJN6Q2!RAlDVGEf&SH^Kh=JPB^i3gob3)HBif(KNy*qzD zy8AVn++P0~Rgydz--iBLB4SDNjMA>EOrtmr)|0v8c?)}Cqq;q{v#RNOxxXe7Nhf!) zyCkjFqw8H>UC$PF5Qg`*ydkVgR-_e_^-#^C}UqDb7#kMS?4}$?m zsc?K^x$a(?tnwUUAZ5F~{?U50(OAcEJC6E@!yLyJe}xkR z-aRmlm{!SrHZ)DVu*W6S-)w=R-q{e;iX^o(4KU;cX)1J#7c;Aqr!v^%dHA!*J$w4b zCK5U=iyc+@ocs#OaJkqww$B4hVke)|Jt3GC55!P?~9ar z))agZjDdNwEKoOiz9B*cEU|1`f76ncR~;PQ7W71d$HA9T#31B`VH^bgZdbV_0`dZoDStp9CO;n~J{}}J9V0v(B0C!)IvOB386P+p9yb>qHWnN;6&o}Z z8Z#3aG7=au5f?BJ7B3GKE)Ene4HGO35-ST4Dhd!O2@fa;4krf81q&nu3L^sv zA_52@0S6!e1|I+g9smR#00SHV0viAU8UO$T3*jpO006j2M1Mh4c-jTQNm9f>3s1>B>(^b delta 342 zcmV-c0jd7-0`>xsDSsLO02=@S8~_3x00SNX1RnqeAOHp-0S6)i2qOatBm@d21q&ty z3?~N-CSb5&Zr04*&oFuYXBIK~#7F1;JTP!$1%~ z!Pm=-Z2^%$&JXuL94G__BsROJn<{Y|1HcA=&CVGLfkHohxw=)6D7^R@UZ!nC1aQfb za9#8(06r8ofK59X$!nvMz*ODDncJho%%XDUAiMzwgg5bl89UejtU1ppx!Fl1(Yjf6 zk&Pee)a__|`$T%N69D^s@V?yp+vHjxKPHVgElZyZV002ovPDHLkV1i7wgpmLM delta 681 zcmV;a0#^Oo0=5N^8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MAHL_t(IjdhYsXcJKs zhQCZECYdBAO&g@KH7>+g1wl)x6qSO4y0U^6j1>x&LeZUzf{3^g3a;F_>c*W2f*^&8 zq7>=Eg@yDXQZdcTkk}?9oyp`*6BpA=Y@>H|IgkIId%oZH{(oLqJykT=@0aNgIM{s> z1@Yhbm$;4$Ff}It0ca>L2>`WHvx*g$4nVPNpqzb(UdkiIo-=XUj+`nQC@u+)(|qOX zPYrcb zk1cV4?{{vnnt!Vz4W0D1GyxP&O_3{_qnFaxVe?T-&2X;|X+GXm&2RrZ9Z>T$ymY8^tBzb=r`gzFSA1o~AN6$5 zw?w~=41cjSIKVRo+LR{u2J@iD-r|oxZK4{Me+=3A P00000NkvXXu0mjf_=`MJ diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_front.png index 184a0246cb4143cfd31507e7619e4c00f8cf3e9e..31d35d266e57075e1096288c0499b93211084d77 100644 GIT binary patch delta 260 zcmV+f0sH=(1(gDj8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJex|Nq$7*tNB_ z+kGLvZ5*Rs7?xEQicS@IL=tm3AZIxbODh;bBMvwr7APJI8x{>26bum#2z&KjPyhe` zjY&j7RCoae!COwl02D*PW5S}6&F>J7qFe(EA(ZPk4i9f)>#KoAnf*Or38XZhzaRAc+ z6CH#W!q8j`O-+B%+?}+&;_z~J;JduZ``-K9_wzhYBy)M>^nc0B2!^gOmKXwH;kC`3 zv_|3hF96v~!)#R@Ufqx3FRRsK{%s2dz|a*c?LL)upQDz?VlKkVZHG}!0${7^uskV| zFS!`H0zjeK1wir@4PC*|6*38#Y&y#Fq(t2rPj03{ zWB_&!yEJSM%YPP+tmY66+hebG8X!zuQ$m49~U+_s|cqo2Gf;Oc9J7Qo9TMKI?(+L9u=Uz|NsYQj=*q9;?%% zEIt3u=6}8$3e4r=00F1f>H$zb7Ww-<$d_Cu##OGHCM#1ZKJEVz0+n_jLszg`y?`yQ ziYlKM^uNh3Wdb|}M9&MZ=t4FfrPA(S@WB7c|7QS-Bt@{!GHsMS08%lTq$X49xJXij pjom&C+anc|Y1m%ySdt?A10#wICRJL!6951J00>D%PDHLkV1i0mGY$X% diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/crafting_table_side.png index 4b2e134707d7d1611afcfff0f45e3ca467031bde..be6f88ed6090892658360ce68e0ed21aed92fdc6 100644 GIT binary patch delta 258 zcmV+d0sa2w1d{@g8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJeK*x0qTwcC9m zzHJ<%UKo~D7K%<4c|;O(IUr{_4@)Z;K_d=0Ar>Ye5-1)E8x{>26bum#2&;#Xh5!Hn zi%CR5RCoae!3k~xK@>y5XSateQY7wwPK220@J*HOkCxwmGkbZ0{!HbZfxIjkLp$?Y z>l9)Lp~%J_Glad~fY_)kg68MCUB*-l!ChU2A_VKZdT(+V+4u-2lhfiVAcCvP##IHO zS~5^7O1Mpt4|atiTofTT9`!4zGBu)-2vSD^B!JYIX&R5A9}iSSczUYgv;Y7A07*qo IM6N<$f-R?D4FCWD delta 600 zcmV-e0;m0x0_Fse8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00JOML_t(Ijct=VZ_`j1 zhMydpkV}Kxz>q3JY$$UTBrdAN00V3tst$!BKw|02#1CL#<_A#B2gh& zTB9gK-^DIZ0H$#nQRF{+{=HPi*zrUU@{EsyP0LAmCW zw@d)+Rseudih0W4j?-y9eDsOr3?TL zn*kj+!u8}Or+*6_HzJ!h=(rI8*|aegcyhy{WV_rgOc?>{10T7c)ZEIalI;S46mWWD z3b{DX-nUs_N$~N<3F|8f+OjdqHD6;oz3~i!Ck5JXxdY)@9zOdH3$=8aH>sPDfEt6`sN~h-2KAnQy3TX60hW><1Qk+FlL1OQz+}wFQ_c!SW zbC=bcDH(@k(}vDL*Nf=55x?6b01lg}Ic}8&EwE9{0BBA%s`^0AU*(`&^SOQ{sq^ru z@<$3Z`ca{tvC4QRDYOSlP@PflMt3muC)mEsLLnE|hRxRh)&NW)VmMu?)~Qc(zLYYk m4Sj@&Q926GyafOuV*CT@<`leMVjN}w0000{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z85?HuEBlDqVz%Efqp7 zRJ^q%9F_T`M0q7ec=)*4*3a4915{bz>EaktaVz=7oQXL(Ibo3p4Lp4t8XFBgCnp9m zF$2MDHD_t>4)2T=&TP&~-3`pz&CL?cjNHx&-3@`v#?6e~tGzq4XB>QR;84S%1m4nC zkBwX`9ZfDmkt|FRtTIO=PDRAT#>B{6N({>|5^>ZCP0yImSLF7bhv992MB{_~^-e%X OFnGH9xvX4 delta 450 zcmV;z0X_cc0nh`G7=H)`0000V^Z#K00004VQb$4nuFf3k0004sNkl5zBddFSTdBPwS`@b>-*K<4xWE3eTg6-mNmwSQ)|4e;d$hMpz}0z@uz z5?oyx0E`zq`c0EUK~EHLUCHg!oK`Ib!1be#rVhu89fOYj<7I$CL1)mh883F>H&Hn= z0xPdE=-AvnFOi;)o;AV(>G?4cJ!{abml=+xyllSEth`3QX@&(|yGpNK2B23jPMOhGNuY#YgfTIIiBIGWO`r91XnF!VG4ty+rVXnJJz(6+h^ sVCd<67K9LCL@#pU*EqjyzKF*E8)6EwtFmETHUIzs07*qoM6N<$g8WU-hyVZp diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/door_bottom.png index 2cd70b9ae6889c381b1ab41187364bc4144d22fd..7a746f6f6ed24e8e07a82842e00d7581a7f61c13 100644 GIT binary patch delta 233 zcmeyy{F8BlL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY05yH;^uuFT>%iD{u? zU4EjKE<)*+{O5$)ct9FTg8YIR9G=}s19F-?T^vIyZm}LT) zE=z_7XB?Y$@~NzG@%Z}nx7<4;3FS8e-1X}(RVT3|Ca0vew651K;^*`W-QhODd~0f+ zz@raaj7mCYU7J&H`^`zz*5gTe~DWM4fbbwi^ delta 488 zcmVc#H z5JexklmU_vC~oP1aFrr%(waa@`4qE98 ze#8NH(+!KP=JNcE(X7OlzTjivprR=E0NnJYZXS+vE8R2zbX}X!6S~e0Jwep#Abo)u z?-7^-0HiOl)lcXN7VBr7G@FOx+yZny+cuiS&bEziih3Qou8qPS#6fF*qh3eXUR}5V zIH4!>t$_C9x_>WGQ=?vopZBS5HhW&&I~FH-jr3pSBzdjRl!=S1(s}EqFWYaQJ$^kF z+88y#BvX-Y8l*3{JU`?2`bd!E^($U}oXkrgM>@bK#C2b;43K%dRuRZp949d? zRIJNSw9-W=-I70uD{B@|j;SQbFPMR$Z1PzPAg{yI#WAGf7VE){d`$)-tQU6wgTe~DWM4fbG~3w delta 512 zcmV+b0{{Jk0*(Zb7=H)`0000V^Z#K00004VQb$4nuFf3k0005VNkl|o4DUVE55)_~n zx`MH9ar<0pU4N&B#d*Wnx0s9uL|M&pRp8ksp)0TgM=%);2wl;WpkzRs%G29c*Jo3k z*GwK#2pqxfbJgF2l%9mp6$cYl3TY|1T!chf&CO$}6H!V0yvsSC``o`&yk@QOX(?L? zaL6~#8@kEFd82Dx^WwZAa6~JiyIpEvxhjsl2wg#x)p>ZfNtA9Go*4j`3QY~D;jf=O zBXk8n?sB6GH1;h5M`&}+w3HOpP8+2fH;?81+pom9nEU%Kh}xOi)Fv$@=INg{_S;~( zk1yu_9$+#WP*gkZN3xNv1eJo?dw{D&s2`uo=$?N zc}-c-ZGW$=1xhfM1o;IsI6S+N2ITm8x;TbZFtQ$OWISNN!=!M<^#6Pth5!Z!V+IEX zhHS=$UPgm;ry07lxDK51WxVo^li|d5mV{Y#To;y9%bPBE_UqabhMnTU4NKNDHr!*Z Z3*!=EI4gJ5K@Vs&gQu&X%Q~loCIFMsIc5L= delta 191 zcmaFP*u^wKWum35sYHNJh${mF!<-z38_f(!&J3Eeq9*F{wz|qd!7n{tWM>?bXEm~YK*EPmj|qum>3 za(8^JQIIt<^?11;iR;29=4*1X23t4JW-WMWXe*t?uC}O$%i{BOmYqzGPuvt&l{t7T or>!y~(%dAxF`oO5>HAtnX(QG-*|U#b1G*#eBoYa5NLh0L01m+b01m+cxRGn^ks%;|4p2-~MF0Q*--{~TiYeNO zDA|c8*@-5`f*8eu8O4DZ#DN&WfEK`j7r%cMynYnBeiOTW6S{p8xO@?}d=IyK5Vd>` zwtEh;dk(aE4YYa;v3d=!c@3?34Xt<$sdo*jb`7U?4W@Ptr*#dabPS_(4WV=mqH_(N za}1qx4V-d+4xDlgnQ{%9aSfSq4VZ8Zmv9Z0a1EAk4U}#Tl5P!=Z4HlY432CKj%*B! zY7B{L42WtCh-wUnY7K{J4TfnAg=r0hXbppC4T5J4fo2STW(|I241Hw{d}R%LWDI#@ z40vM=cw!86V-0g+4RT@)b72f|VGUYBCs{!#SU@L#SU@IKKqgi{B~d*jP&_41IweXs zB7%~CivR!s0d!JMQvg8b*k%9#0MSWAK~#9!1;K|xf@fk>;% z#x+b&1={QVU!?B?^N`y?K^X)g(APCj;Kj z1I==O^%~at87c6QkG~qFnugD)373lB?;m!IP0m(IZ5S7@n}DqBcbAUn(l_c%?4i!Y z@Nic1=I=%r0yh#25)g>JfC6M7y1ONa407*qoM6N<$f`NS%Gqb0X`wFK=ETu63feY+cJ44=JFON^4#oHpH;{^x0rWh74ME3!5Ia-mB~Cu zniRoOezU-~Dc_ zWo5iIsl1J8JQYbieK|b4YlSOymWI#;Fy1G=NleNswRgf0_Y?Ilp%70b0XZ z;1OBOz`%D9gc)~C%zg_LeB$Zi7@`p@+W$JNDM7&XxX{4^CLSk)x^y@%FXFzda9T&# zcvJP;@AVVxo?m~n_uQ;V_Y=AsW?a{3=wl3uG1{o(bviXwi*3^)WBJ>OqI;v9?`-{L zmDA99F{6rOcJ#iZW!dayx8)iS#ND|0{+pJV%na8j29I9+Xu15O=X3Wx)k_y2Xf6qm)+U3QJA;pHTXLk!ev`lMOSAoNLavrS`29RQ_T=a3pZF!` WTh25MP45Nzm%-E3&t;ucLK6Ujtxxj+ diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/log.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/log.png index 7124c3ad43cdd74fe574867e35743b08340584c9..2c5361455509324db87ffb612fc4bb7f2bf867de 100644 GIT binary patch delta 169 zcmV;a09OCr0=WT@7=Ho-0001Dofq-|0004VQb$4nuFf3k0000CP)t-sIT!{j5dk6! z02TxQ&y()&00016Nkl_ zy8!0Vk#+#O=8$0kyZb{}A00000NkvXXu0mjfY7a%h delta 335 zcmV-V0kHnL0p0?T7=H)`0000V^Z#K00004VQb$4nuFf3k0003PNkl3c!_Rcn{vO>ZI*bd(p8sfh!BaJAWRj7ItzqciGKTAB%M*p zmEav`k^XOe+myaz1NjDOBaSX>gE;51kZd2QxWrcKw!+Qr^m3){<{LC1Uz6XiZ*>w*FkVEBn^FmQU)?euIC(OQvWI+yW{BScW6XAXPyf7&4UO z_AL^H%lGcRx-a@LW2g-z5&&w0uSCLBMJ&_>00-Rx`19|BL4N>z|8hlGMQO-0$?B~I zu8RhMJd-2b*KfaU1Arf!Cjgf7*fP-r>-&~;7W)gE2Tj%X?3$k2nmV%@=Q|e!GrI9>X96PUDNaN zN&!%{J&Cg9MSpE<_p0qj(;fJKOcDtb_xsXW>~)4lI%dvHC!r_}Qx!2eJ0_^A?MKh> zeW5OxOjY#i(yp<9L`AGpF=B9PvN%3d3@5Z66icJ-HL=tB?4{KS)kN^Mxa7jc#RCwA2!BG{1FbqJ^*PRJy0tTAJ!Pb8$aloMt z8vhb@FIu6(hS;x(NzkNujJDD5p3lk&2X6`|O~*BwDADXA>Oet0J@dIIwHO68zD#{<5XBAf|RL}f`S|%2S}BUHdT(0({KQ8keY&miY5&fGVZV~@gu;NQpl;Xl(wUIXkJmRMST1hpZI$eK-*CSNqIe4y3+fn6k zkfg{gz+}D$z#0x(xqtw|CP-4kC^Nq5xwd(Uzej~}#%y^2z-<%*v*m%+rdYnaF0j=m zBih*pzS?A{_vae`M$FOI=QaZZP-NHtkfzc{pyVR=-rmO2Gzi=_yb^plAAB-6E6&3PJKBW9!L(V9!M|R7MR|%e!m~{MSKJ>ynrIE zdJe|^j((?Zcw!9)tz5LrQkAa$l)7A?Fj3D!uUk9+2PqcxI<<1C>JOZ9py$2nhwh2w aU#~w0aP;h#-8Lft000003!KD)$RcPT9KOo|E@rW XHJ2zhrL^q?00000NkvXXu0mjf&!R*5 delta 327 zcmV-N0l5CT0oDSL7=H)`0000V^Z#K00004VQb$4nuFf3k0003HNklpZ-@uHSj9SZ@;m zfOpm<4M?*A0DM0HAih67D-1w1@}9REVmb%_#anzYX~4(}Rey`Oi%{`~B@OWXzh}Uw#NK73M-dL`sx)M7g@U%EA$ar@Z?Q(rNRa_xRGWR$>P+3SrrFMSz$Ue; z@8G|B$)Lwbvq0fxeY`l+9^zTgq`b6Bto|(kI1zdb9cHtxkV1K@zXCnmz27;_hT`qA Z)*obm(ZW#8pZEX(002ovPDHLkV1g;4k)i+q diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/stripped_log_top.png index 9a2168f1e4cc97f41c092511b55fdc6d3003fe6d..9f2526e920e94c60285907e355302f9ecc2051f8 100644 GIT binary patch delta 227 zcmV<9038481M>lp7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-s+kGL`cOb}c z9=>fHv11#SRThd)6?sGwXE_hbeYH0L004$bL_t(|+8xU=4uUWk2GB224xsS@B(fWS zN?lFq0f2tey(t`kR2W^1J+{&9Ef2PJt~{0}7*UsEkSk1H=Ui#p_AsxVDA5I~g(Mro z1pisznqcx|8f(}vK4NV8KT^^is^G~ucCd@j&)9UZ;n#H!6O;&U4#PZedCN5hp#nvL dY+ZS{pTC>~CR{O#`3wL6002ovPDHLkV1g~gT3-MF delta 477 zcmV<30V4kM0qX;h7=H)`0000V^Z#K00004VQb$4nuFf3k0004{Nklf4eKq0hkM^+v z!1dJxfYrY9(+-i1#cl2A$}|>yUjJq?6s-0g`KIN$u=#8nl0?GMlG{>~O+)URlPmu6 zz3I^b*j1XhFMkyPMXebr175BV9UM&3pKgo)hor1e1oruoNI0IpkQSL0(^AMcEom$W zo*m;wQS097?_(7Zq_KE%X;+zok-A`>$R2`ok>$30Isy7Z`d&B}-1)#S`j>z{g^`k! z&GFI7%e%%+I5!U9Y`xld>?+MXk!(wCo-vC|v9)edYgSgpgVVxN@z3@d9ffzVloM&B zq(kx{8=B^M#XONcWb4D<-{>oAeUWckX5#_BN=>W+-oK6j^M&7B4k()=v+;mGaZ}Of T?-7S=00000NkvXXu0mjf;@9QU diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/nightshade/trapdoor.png index 090b22131c85c34794e551bc6b006cf37f891ebd..930d4dc6a797b47e8a584d87efce7046502062e9 100644 GIT binary patch delta 225 zcmey({E=~jL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19MJ%u5LY05yH;^uuFSMhu`WN+ zN*AGYOa4i>SMCC-E(!7rW^j0RBMr!@^>lFzskp^@&{61+0uSqj{Q}=#PGJto)qikc zSK=hwuoJtkH2#)9_+8Wg$W_%144OINwKxwwuk+V=g{ za|!ntpT|Gg!kqUt;qvFSyN|Oht+!Wg30x9!|3aPkMKPs5y`U18n*01pRc;++6RnQP YD;LVvMsD~V40H*Dr>mdKI;Vst04Bj%y#N3J delta 493 zcmV<#((%q9GYqfjPqN!dw1bHwR zPByj$vLn<%Ipv%9ZE)Ly-7py~DliRTCgp|T#vOH1E9 zjF*;Xb=_<4ZKh#%)8N0#TxpuUdfj8c71Dk6t?_5RC0XoH zn}U8IF%2`DYwYUm^ByDXN3UJ>1Ic};01n33b3`3o{buI;)L|H{UL`=4u6UYre(L-; zNR!zXcoU=~edeUoBznq;p7K2gdU8Ci@MEuPH{S3>d&)vLX9nFZ!n&00000NkvXXu0mjfZtCYk diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_berry_bush_stage0.png b/Common/src/main/resources/assets/byg/textures/block/nightshade_berry_bush_stage0.png index 6c61d1b7bbdaa43741af4b8fe8f501b0c5d8cd70..ba7731ba65f7d3bab5bd290d4d592f1a8c51fafe 100644 GIT binary patch delta 198 zcmV;%06G7%0*(TZB$1&Nkt7{|Gf+%aMF0Q*HbQPMI$$O*O(iigA}uT*CqN)7Dj_K= z8Xzd5!CJ9~B91;MNY5rLbF`{y~N_Pf`|9oTyOSokrfcfWtHFll_QuK$UfC6Q;< U+_*3=ponK`MeF#a z#~TV`ie%JzEjq3H?wSa^ndj&4zxgE)e70%3TQJkI@Nq)qI{&&ggTe~DWM4f(AG*4 delta 247 zcmbQwbdYI+%0x@qShE115LX5U27RjpGp9T?eP4NX2Pp*;F=-toT^%_I4FxSNRYOBX zX>EB44Mk0DSur&U8F>XMEua?RjG(VTN~k2rFZe$?V0g5DztBWQiTW~67sn8d;L^TG zE@nd>XZL%%e8unn-xT_$Ml_3K(mdT02j~CfPOwX3c<^8XYeGq^hnWGZyM-ac-47hb z6Pu$Hr`#2&60oa^j|SIka4Ko>H2y85}Sb4q9e0R7BiumAu6 diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_berry_bush_stage2.png b/Common/src/main/resources/assets/byg/textures/block/nightshade_berry_bush_stage2.png index e5add1bbc2325d5b25a3c3842d5d3abebafb1bba..e5ad1e74f563226e6ee1343b0fcbdfcd5d112a19 100644 GIT binary patch delta 265 zcmV+k0rvjr0>J{1BoYa5NLh0L01m?d01m?e$8V@)ks%;|NKi~vMF0Q*@au}^;Aq3W zRFRE4Zfh!9Rvo|In z78@)W93LGPCY$+tZ2$lO0d!JMQvg8b*k%9#0Ch=3K~#7Fjlt0}15gk|!QsgmX@lap`x_5yo83Lrnan@nuLtJf|M4}9QnV0je(S8NswRg ze;j~;(S&O|P!VT=$3%6Z`bJL|#}JL+(!NMOW%Q6BoYa5NLh0L01m?d01m?e$8V@)ks%;|NKi~vMF0Q*@au}^;Aq3W zRFRE4Zfh!9Rvo|In z78@)W93LGPCY$+tZ2$lO0d!JMQvg8b*k%9#0D4J8K~#7Fjlo$C!cYtYK=Yb5wZRaU z!2NHESR~+aj~V=nOyPrsI7GZLDW;gj6LSgPBukP^Sbyr@tmXv}? zRG5OhtAv=ej*_m9oP>sgmX@lap`x_5yo83Lrnan@nuLtJf|M4}oY+O|>wuJGNswRg ze;j~;(S&O|P!VT=$3%6Z`c6+5#}JL+(sQr*4jFK;K9Idp6=OcfN`KG)$yGVe<%MUP z90*sC{q+0~^MO6-ybUEiefkF;yb5^1Fq_LQz;}}3(^dYhCe55~wt}sB35^X`_6XQn z-sVfc81^e9Ev)fX<;s|_`Pp?1FTHzry>iP{*6pt9)9vebjZ<1z8GOqzUH<<2{&}(! e&WCf)%s(X0cXx?g!*ihH7(8A5T-G@yGywo_cYFE( diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_phylium.png b/Common/src/main/resources/assets/byg/textures/block/nightshade_phylium.png index b7ceb9115b9189006da4d21b3c2ffe92baa70b3c..ae56d6ecac5ee34969e6e0b4327f8ffaca98d4d1 100644 GIT binary patch delta 255 zcmVzX_=4-?X$Mtt9MGs2jL@qPL=zc^)#<$H(c zHQvl{$vo%p_ewsPl#AyyUbB3#Z(irR32(kQ_xXH1{Rd5#R{&CGsha=*002ovPDHLk FV1iQQd^P|8 delta 240 zcmV1)~B#}8HJry5i6C7D1DRC4SRTCFRuA6w%&6U~Qp8ERG?D(|#`NhM% ziP_?!#=wl#)tTt`wbam*^7y>q?X4VJJ|dAJ7=MpRL_t(2Q$37<5`!=ZLqUSr(plaA zf9yi_c0C|@go=pDCY!F#N4dn?AEw0r`CPpD5_Q9&MpLMy8dP9n3o&9arDttiG7iAN z5D6HlwbMf=ly?I4y%2p>1>^8Ww37V8(Oaeum?x1~;?pDdbhPvn0`}RCIZm{=g5b&+ q5heG1d;9k8;(eUaXGR<|v&9cI!~`R9osi=I0000JN+G2dfD1g*qI76>*P2C zc1ntgBEM!6x|AwCIM{rm2I`h9CGO4a>V`e{N-wZnRQ3oj3{danOpSEP9dA3YmU}U;8P_j?!3v4DC9VVTn5;*8IzL=Zd zumyX_BpuHsFRR*Bzy4Fma)&c8cr%Q|;j!#of{)(laYKqK&24;NBJ&3@y%Lpu*XS(( O0000%m6G0}2dG3Uea=*V{Pw_;e_! z&7Qz|JK1HIQ|8KB%>tWz9XqaYED2u7va*s}kz?uHfE9krOgH2$+Wpqyes=Bo=Z&)R ueb3b#^~JC6d{8X=?%@I3bGFwX%GF(9Vcf3#PiH02E(T9mKbLh*2~7Y1a75Ao delta 209 zcmey(IGbsL%0x?9OX&cg5LX5U220^0W#J$xK3hHhXkl?TQTbG1nMk0x+sgC*ffQ#+ zkYDhBC}0TouMnE3C{bVH>Ealo5p3JXD8#JD!F;}9*8lxGq^sU?bV+mCecNgTe~ HDWM4f@B&dF diff --git a/Common/src/main/resources/assets/byg/textures/block/nightshade_roots_top.png b/Common/src/main/resources/assets/byg/textures/block/nightshade_roots_top.png index 6edfa2b2b14c06b5b4f04e1ca173301cd939f949..1261a9aa459b31c02cc30aa44fbb7102161b118a 100644 GIT binary patch delta 164 zcmaFG_=s_W1SbnK0|Ud`yN`k<+DS}Qk*${w@Ck7R3T=LH$=7G5gY8U9;UY1?naX@E zdi>GK!a;?Pt89VNj3q&S!3+-1ZlnP@&YmugAr*{k4{qdbFyL`Lxco-Vi_H!<4v3m6 z8#L|SBB{7|afj%R$Ns(kD|J})rWv#NGkc#utEG6!HQ}72*Nb_{ef##8-C_O4mTAI! Q2WTFHr>mdKI;Vst03((=cK`qY delta 172 zcmV;d08{_s0qOye7zqdl0000V^Z#LyHXxBC6@Pz8L_t(IPh%JbqktIT>ofB|lu0@O zY2N(c(tihAA`QW28%VP9;?^TZL<_ELgB+SgVez-!(}77K_D7g z3|SwX15*eC%ECc#J~qQaG!uyN_~L7@=HqYs7-5?9_@n>deY+0M=VrVPqQIJ9Y;MNu a3>5$+PE|j>rsw4V0000iV$akM`SSr1K%MKW)#)%YM7{~P$LoG6XMFiz_9tjC10PJ4z@Ebg^R=l zXDaixC<_PqN4Nh0$}yG%`2{mLJiCzwcMIv3bWCjI`zb#2mXy`p;AdiGfTJo(!|TNpfD{an^L HB{Ts5znDFy diff --git a/Common/src/main/resources/assets/byg/textures/block/oak_leaves_dry_brown.png b/Common/src/main/resources/assets/byg/textures/block/oak_leaves_dry_brown.png index 8141e76d94aaaafce04df08fed0ccedb75f17b39..cc5cf12fa634e113a6aed09683bb5d0343e6b9d2 100644 GIT binary patch delta 171 zcmV;c0960?0n7oADSrR}0D@*eY*RH;K`BT$BY+HLxc~qF0d!JMQvg8b*k%9#0BcD^ zK~#9!1;GIU!ypU*!B2{SG@XC|23kM>TjO8T?nu#?KQ4kCI;6tXZXqYSwtv9rol0rY zZdu72%;J9B?P2ZHa>&5Tw;eq?M!wO)(b(-#ge#GH1dM1{J|sewwToUAb7$g4oL2G{ Z{R7rA4NM$o-Wvb_002ovPDHLkV1nlEMVkNs delta 214 zcmX@Z_?>ZrX1#}nG6MrcQ<{BFuxYTP<~_mM7eGE!NswRge}<>q4ZMK7sh%#5Ar-fh z69k0JN)p9F5)DLB3dG99jFJRO1kD0XM1qn8$`V4t1Vlno3=9QLghUL)QVhyOiV_4; z3{wgO1H!}#P0ErA5<-H2`ijy5#1f3e3=K^Z14R5&5)4huLed1xQcTK(#6*$;5(Pwz zgcxV$XYiPu_3Sw4aiTHMA>wFiQW|GT7eyiw5C8xG0d!JMQvg8b*k%9#0BK1? zK~#9!1;K$4#2^R&!Go~?Bq;#NH=ttyWT0!~B>CbXDXn$(Ux0k3k|4j}{|ryJ8+ZYElRaG=Ln>}1 zCkP0cnG^|yBpQgM6o?rK86^prh?xb3hy*1G6eWa&35bNG1cZs12&I^ar33_t6eS2G z7^WDA0maNr%908aLV{8Xgo@Gv#1f3e!omy^14MjN5)4Cv0@4J`QcTK(k`j^(5(Pwz zgv=ObGbs`ZNi+~iDG)OfGD;FK5i<)65eZ5XC`t$k6A%eW2?!H25lS%;O9==PDM}DX zFibHJ1B#iMlqD4;gaoA&2orI?fnB_$*oBnpTa z37Ij>%Foc@2+=*0z+w{R5OK7_Q7~i6#s!;{nioz|x)7t7$Pl-Kzu?E2p0hyrF?hQA KxvXB~%jR7yKU`Fg)77UudGDM18HNi(`mJ zuxlTq*kJ_@=iW;@ODE6#9bd+nD?Yy~o`%?QeAz*W!J$|+H$eK#i{RT#Df~11pUh7EDsWTJ^BHu uw4)`Li(QCdI%yWr7sg_Kp+x8>^G@Mxo`qURzf=Gn%HZkh=d#Wzp$Pzsm3agJ diff --git a/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_bottom.png b/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_bottom.png index 98fce3d3e4281de84fdf5675c70f9054f92acc3a..c0e76fb26dd86c9c09a195b0d34169418c707f01 100644 GIT binary patch delta 175 zcmey#_?&TqiV$akM`SSr1K(i~W;~w1B4whYLcLIcPlzi61H=FS|37^AaOcjQJ$v?S z*s$T{eBK%m6e1_lo14Sf&(vrEs^WoW4I(hAwL zTAtzBA&o~@l-RTS1Q`|F9N9vfC*5OUUT}b6u1EwU`;iq40o~qR7Hcjz37!t?3SnUQ a!2J4(kfLU5P304y=?tE(elF{r5}E)annBF~ delta 174 zcmaFP_>*yh%0x?9L(u@A5LX5Uh7B7w?Af#D|NsAY?%etC;R8_QK>cbHAjMu14=9EVxh{?~6RE(%=l=;P%e`89dUPV4@eLaoPL zxfM7C9tz!j+R*Yb?}D!Pl1rJ17xp+6wk0jq^>KP)8d9TM^XT7<(#SPpx<^^Rw~6qF Z3V(5AURU&iR|jY_gQu&X%Q~loCIHrONmc*= diff --git a/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_side.png b/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_side.png index 04916e9ff4166a57aec984abc85351582b446f2f..158446e4730241dd0ad50f582410cde52775900e 100644 GIT binary patch delta 257 zcmV+c0sj8c0=WW^BoYa5NLh0L01m?d01m?e$8V@)ks%;|El^BUMF0Q*% zILInH-(S&WMf677%(8$jpf}BEApMD>EM7)J9xLS delta 263 zcmdnVbdhO-%0x@qP=f%U5LX5Uh7B7wJbd`@&6_uo6E?YbZqlsY`1Henm7JN2FZ@?Z z?Yng8(wsxz+O~Yzvu6)b@x|NAF99imk|4j}|EPfBfpVbP0 Hl+XkKI3IqX diff --git a/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_top.png b/Common/src/main/resources/assets/byg/textures/block/oddity_cactus_top.png index 130c835f550b16c60ceda65bd64366213767781c..c2fd4a2d07b65ac6aab5e12434cb69a33e4083a3 100644 GIT binary patch delta 251 zcmV@v7w4{6_64r3Gxg6j|vzbD91`pRFtT1_H=O!(FhLpcVs$j zz~LplHgNaT|NCV#^gp*KEqGiKTWl)f9uit|k4>SeF>k}|JLap{6O@filCpUZxTT%> z%Exfw*&caqPDYWPcJb?bnLhXyr#UC_+13baX$L#}V!M0(fne&ai{*PxYfpAFSo_rL u(N7=2oH7-Qdx|xu=E#4OEUqs-$KUp!W5o-*N31}{GI+ZBxvXgxDOP*EC^@JA0004WQchCdBk@lXD16BVaKf9~7@Rh|6l!px{Hc}5<*Sk{l@CX@t(2FO9NUhi z118H(Y*_;}7TIZID+6|Q+BWVDU~6x?cH?ckJ)gUckK51V@v{T?1w;M1& M07*qoM6N<$f|7n#{r~^~ delta 218 zcmeBTTEa9zWum35qhf$hh${mFL(aBmE|YKjEq-QMv)L?TvSwIy+m0@(cbC2Mk{RjGrbdO4OHnx;Tbt1eczT6gsTH!+gOb&ZFi(bGVYHy;U&V zhQ9|2&Yb_j+#pt-<PSG_$MH%YN-yw>dlQ8T0N4wuTeNTFwmI PK&N@S`njxgN@xNA?W)K{tMqP0PVb^fb`=gpK^n=Awts zj!lbJI-hK#VRkMvkvn0^JCecd3W`9%wcx-y>Nav571Q%p00i_ I>zopr0MMOOH_R8&)0 zvXXvT`N&E=d$_Gn!_fn`#|5K@xx)obU+%gMJ!X1t@AM39){Zf)7qh#1cGs-=0WBy4 UG?T|g#Q*>R07*qoM6N<$fgoBxlB{vEUYf7k!xT-AeGMmKU5l>KCbdvtWt)x<0%85kI3P77TD zQrsm$e!>6YfWgb3@zX>_iTZj^7sn8dVBg+AF&9M+CvD-WfAuRa+&f-km0^Ct_0_+* zM{B=b@71yXJ>%9xAgwYz?ZGWPMZ Vi=LWa#szdEgQu&X%Q~loCIA^CV<`Xt diff --git a/Common/src/main/resources/assets/byg/textures/block/orange_birch_leaves.png b/Common/src/main/resources/assets/byg/textures/block/orange_birch_leaves.png index 223a64a122ac8540fbb6f324ff9d353942049173..9f23b89fd35528bdc97932c2b889f4153d6e5e12 100644 GIT binary patch delta 152 zcmV;J0B8Ti0l5K?DSrR}0Oy}D(Sa+tb0(T!AUiXVhyVZp0d!JMQvg8b*k%9#09Z*x zK~#7F1;K#<03Zy*AYAkR&4STTlcHP64ht&_MRv@M-i5VyksTq6x>1LCXA>JWw{Z*D zNZuifSh-n_nj5Qz?BPzr3R$V+CUwF+@-BPa!Eqb1vJd(A0TIYEm^1zW00000(4SNQ~vA>Zz;qD$?o;>HU6)D z6FdP62Rc$wj>>OpkjIuoV)`VddN`lDnaRQ0{k4NHGIbv}{v27G%5?CT_yM@<0cOUL ROVI!T002ovPDHLkV1n_EMGF7` diff --git a/Common/src/main/resources/assets/byg/textures/block/orange_daisy.png b/Common/src/main/resources/assets/byg/textures/block/orange_daisy.png index e9bfc6f4433388e40ff9ac0f9762475dbade8bff..b226767ee578791816cb7886dace3ac73f82c74f 100644 GIT binary patch delta 181 zcmZo>dd4_GLXL%*fq~)e-A6${inG8YvY3H^?=T269?xHqGEq^r9w_l~uIi0kh0xWy zL9_G@Y8e%I`iR%C_?wzrsi>)mOSE0r2>>c$ED7=pW^j0RBMr!L^mK6yskoJ#aDa_T zRKaBOB7v5L7K=3*&Ishp)?i3uIUB(dctm9d%hjb445=GL93;;K%(^R?R%B@Hvx*_s dFoKOCX#@L{#3z4Md4Q%dc)I$ztaD0e0sy2KIXM6T delta 189 zcmaFH*vvFRf|G-pfq_9omp^!-nX1h}Eu)WfRd3`fSgEM_o0=DS`lyLZ1kKVDuVD#Y ztqWA>=UaaeNO6}0`33)n0|qaD#!nL!B{D-iT^vI+f=hcGg&GVvn57-OfBtX2YPO;| zncqZba&F)~`HTso94-@5m>OrD+;x`o#b{USGF?O2<1MPPTfc_pB}b j3D4Js9Ctru`-q{+h-1%g+xxqK_A+?7`njxgN@xNAAOA^E diff --git a/Common/src/main/resources/assets/byg/textures/block/orange_oak_sapling.png b/Common/src/main/resources/assets/byg/textures/block/orange_oak_sapling.png index ab3da7a18e154f9b5d2389c4eeda0cac6754d2de..40ee54294225f1e24280363945d1e130610162e0 100644 GIT binary patch delta 170 zcmV;b09F6e0nP!CEPupm4y0NHe_=UrQ!aN-0Aol1T0b64G8AJf>iz%#00DGTPE!Ct z=GbNc003c0L_t(|0R_Q<0l+W_10Zy<`v1iP0002c08q>Tc)ECB9w3>1@5?Tzu8EiI z6i}USC8`S`xu6O#FV)@vHapcd*#kY3&3D26SDj0l?-80PG&{ Y1J(Bd!#6kst^fc407*qoM6N<$f_Gj&@&Et; delta 174 zcmV;f08#(W0n!1GEPte01jK3%cTNCfNC1CfIdD@hT0b64G8BO<=kEXj00DGTPE!Ct z=GbNc003o4L_t(|+I`N&fdxK_0s%1$1;Do&S|Zxzk^KLcI#Ag?n881WJyi?C&M6Mq67~BL$&@2# zNW-b(NUq8zhH2@YRKZVq^-4aFywyP|m|U*I>#gC-&U_A+h6R%<$xA_6eT88w0v~S= Wx&)Ddwi9Xq0000P<}m delta 221 zcmZo*YGj(AQ(tVvD9ph;)0tsUAj5nYh8i;lJz1_86^5D4j6RAC0cKMDwhTu@8FKU) z7P~XrNHNT{W$;mCtkwsLF!oq7dP@PdFlOp8?7A11#=yY9SQ6wH%;50s28fg5>Eakt zajUdHl!@7q!#PrMOX9V!|HRjp*WMHNQ!<>CJWno6D{|IpvDUlqZnItp&YOOR!!**c z!SVXUMLM1@tOBm4I&Zr@^@7FLsN%PGX4&b)v-jmmEs1brm=vt4z4N`U|X diff --git a/Common/src/main/resources/assets/byg/textures/block/orchard_leaves.png b/Common/src/main/resources/assets/byg/textures/block/orchard_leaves.png index ba65c3e21e27a4d6d936494feec13c9188b9d656..e309bce5662ef0dfc449d6dfa7190811f4b9a981 100644 GIT binary patch delta 171 zcmV;c0960?0n7oADSrR}0LHqmsF;a}b!2&EQ-bL8qyPW_0d!JMQvg8b*k%9#0BcD^ zK~#9!1;GIU!ypU*!B2{SG@XC|23kM>TjO8T?nu#?KQ4kCI;6tXZXqYSwtv9rol0rY zZdu72%;J9B?P2ZHa>&5Tw;eq?M!wO)(b(-#ge#GH1dM1{J|sewwToUAb7$g4oL2G{ Z{R7rA4NM$o-Wvb_002ovPDHLkV1kM$N&o-= delta 214 zcmX@Z_?>ZrW_@L9Fara_v0dv{%;@YWP08Nzh6%`LDhcun{?G7qyMY&wH`UX{F{I*F za)N-6SxKT;NTPvAN`Y9Jm{F2IiJ)1aiAYeAKv_aan1Dz~ih-e^iI9kaSc*ZJNKt}7 zieXBDU_h8yp-EX%K|)9nP+w76fLMZ&n4zIbVt|N$N`j$@SxB0IS&B)SkeEnPK%#(% zkr3m|{0ttGvz{FXJx(+RIz$}pa14x$yxmdKI;Vst0N4{nhX4Qo diff --git a/Common/src/main/resources/assets/byg/textures/block/orchard_leaves_overlay.png b/Common/src/main/resources/assets/byg/textures/block/orchard_leaves_overlay.png index ba65c3e21e27a4d6d936494feec13c9188b9d656..e309bce5662ef0dfc449d6dfa7190811f4b9a981 100644 GIT binary patch delta 171 zcmV;c0960?0n7oADSrR}0LHqmsF;a}b!2&EQ-bL8qyPW_0d!JMQvg8b*k%9#0BcD^ zK~#9!1;GIU!ypU*!B2{SG@XC|23kM>TjO8T?nu#?KQ4kCI;6tXZXqYSwtv9rol0rY zZdu72%;J9B?P2ZHa>&5Tw;eq?M!wO)(b(-#ge#GH1dM1{J|sewwToUAb7$g4oL2G{ Z{R7rA4NM$o-Wvb_002ovPDHLkV1kM$N&o-= delta 214 zcmX@Z_?>ZrW_@L9Fara_v0dv{%;@YWP08Nzh6%`LDhcun{?G7qyMY&wH`UX{F{I*F za)N-6SxKT;NTPvAN`Y9Jm{F2IiJ)1aiAYeAKv_aan1Dz~ih-e^iI9kaSc*ZJNKt}7 zieXBDU_h8yp-EX%K|)9nP+w76fLMZ&n4zIbVt|N$N`j$@SxB0IS&B)SkeEnPK%#(% zkr3m|{0ttGvz{FXJx(+RIz$}pa14x$yxmdKI;Vst0N4{nhX4Qo diff --git a/Common/src/main/resources/assets/byg/textures/block/osiria_rose.png b/Common/src/main/resources/assets/byg/textures/block/osiria_rose.png index 63fb27beab8bfe4efef2c3b99880661b913d8f6b..30b1c9be1d8947a2d8e00f66f6bcc8aa65231aa7 100644 GIT binary patch delta 183 zcmV;o07(Dh0p9_TFn`+I|JmC8(9{3F!u!6${kp*aw7UPUwEv!<|C^rjg^BEWed>CA z0tRn!$l3q^00DGTPE!Ct=GbNc002Ts zL_t(|0j$w>i4KLR5 o;6INo56oi zF)TJx9wSN|BUKg~djJ4M78@rb97q!mY6Jiy9V0*y4onFRBN`h-3k_NT06Yl|9}*ik z2M8Jv6&4Q=ebbeI0001>Nklg%vqL|GiPQ^&ze=H?HkRkl8jVIRb;J8lz|@)kpk9B zluSGqyK#O4>r1d-5op{VS4$^h&rhg@wGBLfj3n5)h!Fv_3C{>Mr5Gb11LAha-j@)f tMT|jG+)}>}kk~D$u`Ar)?DsgxKP(*#5u}%zy+r^3002ovPDHLkV1hxRXo3I$ delta 627 zcmV-(0*w9T0 zfnr&NHQBhyKFFIUKKY>k#oy!K(Ki!gVl?psH(A}4WudzZbm#{RP+Cu^@n$l)bI!SE z=H6C%<2Vjuo)E=8@w|SwYZ~Ujn~;6{X94=$r~N3B7%R?SFD_b+Q9tJEBzJ-o_Slgl@#P!@_2NnY-IveEf$)UTmnpdfLCCd;)HL6d zAOh{Bgq6r~!@;!>ki8l~hnCw}g~gc@BGR0L8u8X}O@9KH0)KD0*Q!pP*1^Qo2bqSl z0&2t|)Sr&qGLx)X@Wa%7sq#&)Geb%Qf1w@s@pc>PcEcd_2G1}g)L%-PZn@>M2I^YX zxTF9VJjoAUCsfqQb&g{eP$=TU1EmahiWaU^p94;5M zw(qay2a@x!T5Bxle6@?yhK?3jVOXgemZhnxg0k&Kz>6L~Iz{hLH*PNIV!o?4fnp4p zAR?IE-Ht}vG{YsgSHCbT>G`u)T_9kC{e18tSK%}93|x^HkzcrrO}ke52jJKEGXz=; z8(co${SgZ}TF3N|Q`@i?{P%1+3h#rW67RvMfEg03Vi*|caygcn^cNC3JK0n$q1XTb N002ovPDHLkV1n&8H*x>~ diff --git a/Common/src/main/resources/assets/byg/textures/block/overgrown_dacite_bottom.png b/Common/src/main/resources/assets/byg/textures/block/overgrown_dacite_bottom.png index c77c557a4f5c0a6ee9385aed2c1c6a759fd2be97..94b502472c36e6a0ba5fe74b9e94438820c44d38 100644 GIT binary patch delta 166 zcmV;X09pU&0pkIXBoYa5NLh0L01m?d01m?e$8V@)ks&32-QC^I&DYS($HBU^u&JX! zh&Dn1003P{L_t(|0R_PUVFNG_0zi^EsDg~If(Hcy|C)9OH*_nEswl*zy7VvJnecoU z#N=TLjrZ~zZU06zx)WD{^D$Lp>O4$wr;9VexvuC1eyS=Dw5TqjF0Laq?{M6IOGFk8 U9X>1q0000907*qoM6N<$g0KoiH~;_u delta 152 zcmV;J0B8T>0q6mcB#}8H6T!N)u&JZa%*Wl`-ObI{m)nFzks%m&Vo5|nR2b7GjnNeX zFbo1A69gxS)B${HCvg9vO!bHGaTh?PDFFo`kwzN|^M!RPeVzgD%C+l4jCK=}9tBT{ zN?wuq;fO?uf4EDr=LJp=VFvbFcVu1hH-d@X%(=Oai~0ihl?t60@Q@e)0000pP!$WmX?!~laY~;kdTm#jg5?qjEjqlgoK2Gf`Wm8fq#F0cXxNy)*(Is z004tYL_t(|0R_PULWDpN#K7JTW>`f|<^KOxt1{QV=bF9GIgh_{XYRQU=l9t2IrqG> zJ${DEIrj%&@4aHy^M$LZGje}vT22B#}8HL#e5$kdTm;mX?f+jGv#Mva+&)fq}58qk@8hlarH+i;IMW zgu%MBt*xzhcX!Rr*WKOSe}8|Gk&%s!jnK@;798~sks%m=j7da6R47v|P74;pAP7sD zj(u3gE%!g`g4U-(NC*Ij-EhFHq4j$+K(IR=-SAZYf_Z-<4o9<3oHpP&<~Kaf_zlh= z$Q)FGIaARQ!C08h$+Q> t5^Av;aaocg)MA&zvWlq13J;Ou-2YjP3t^MF$20%{002ovPDHLkV1iwAbrk>r diff --git a/Common/src/main/resources/assets/byg/textures/block/overgrown_stone_side.png b/Common/src/main/resources/assets/byg/textures/block/overgrown_stone_side.png index 4e86d402c6d5024f6db93a120f40f2b3048c80f0..75aa572323d24048351453f12b22ac1654ff3430 100644 GIT binary patch delta 255 zcmVgLZX+baa4oa(;1ibaZKTXlQ6?_(_k*0001q zNklc83B#}8HK%S_dgO7uWm5F|eev_Y*sfhLVPTiG6p2 zc4%m5rLCiMbaaG}gnxg3a(;1ti+_)gk4b~pG?5_~e~?K;K~yMHHBA9>!!QU_9A~VB zD(d|IzgD<64kH9Y299y!z!($r`k4c#=@sYiHRi+p6Co3zx0f@{V@>di1n?D189Q3JmqG3Jrn)0000hxc&AB!+i*E)68TC?VO&*hxDM$T)jc|WI~Rz{aGOU>I&FGRNZ sc-R6vb_5-W7Og{TIuL^R3GJ_Z0W7#NnWUEDIErKqm3zPldC)m^#e9gq?#3Gxg6j}90f?cXmnQBfi<($mE;L?ig9 zHz!|%0mo|z;i);d{?~`i@UCfMsane5s>S6Za?4Eg%7(MA?z!||P(L!Ox%I-mmrfTl zlpj1gn=;{WQSTD=l*7-Lavu>neU05AWX0-pkqB#}8HCGh?I_x}F>|NqzT@3Pg^YjbLJbaao8k9UK1e}8{yXlS5m zqjHfU7=MRJL_t&-(+!Hj2?8+?MZcQ{%vP{T1wsNA5F&V&1wCsdHZaUx*b1CD7OIl>^M41fOXbxdkE-YcL6Dx!I&6vN+E`P&A8?Lb3VL|D3?cm&-Dyq zUPx7-ti+8N-&%gPN`Y!)RcesZq<+>FB;9MdLmjI25%rIj#-e}!#Vu<8Lf13^0000< KMNUMnLSTX@USfR! diff --git a/Common/src/main/resources/assets/byg/textures/block/packed_black_ice.png b/Common/src/main/resources/assets/byg/textures/block/packed_black_ice.png index 63a81ade2d488fe155e282d7cd8d6d02333441c9..1f56be68cb2458b8ebface17063e82c993c80ddf 100644 GIT binary patch delta 138 zcmV;50CoSZ0j2?vB!6v5L_t(|0R_Q90l+{Igs_!@03;w`bew?te>6F;wvx7SSZ`Wx z!dY+FRDi1qn<(g2LPA+xRti;Hr=?c4>4CasZONgn(7g#~RYKncZncD7AYNNSOVDmh s&;+a76xGt|rmD59y;H5)tbO|dGcYx?x9^vd00000NkvXXt^-0~f+GbzI{*Lx delta 145 zcmV;C0B--L0j&X$B!6^CL_t(|+BMBVl|>;C1JRZe0g(_1(Sd;He=$Wfe?d667BG^N zHnF&>xjr@P*3zu0G)PEpFGJuEVrfqdX4mU|d~D1-+atj?#;gXXiKyrI?f<(UCN$~# zM6x{T^RAtFws(^oY;52S`0@RG<|%2fzy1L;Fg3HB)c_&@015yANkvXXu0mjfbX7t| diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/palm/bookshelf.png index b0cf19babf039f9e2f887b86592dd9a77491f1da..b486906d0c5376d3dc193322abd0dac708827770 100644 GIT binary patch delta 326 zcmV-M0lEIe1=a$P8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY9LPlBk<{ zsGAC#jcYTaFBCP)SKiDo%P$ zNIkq37I!cQKR-V^I53eB5o0I?Eh;1>A|4zY7dNIyxBvhEs((pDK~#7F1;K$%0znK# z(cAXT?h0r~#KidjU*`rf5Y2$wsppvcC;%$}o5ed628G|^=~G^bQLwgSMuplKl;DzX zaM}BP1NadU0AKDPl2ufaxVtpOq+^4L+3iFpV*xs3Eartd2>_VH2hRA8XS0FVS@jUt zX=4<(*hT7fZ9fM9a^ASkFFL=e!@ea6zkizt2?<%H6W6JwovlQWOr_Mr8h@~&U YKM9*hiM{5I+yDRo07*qoM6N<$g09emFaQ7m delta 694 zcmV;n0!jVW0>cH68Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MnUL_t(IjdhYiNKv9fBY%f({V~L3F62hpOG@&4M%bLUqbCY zt2sb?qL=VW27lYBGbbx90jQyyY;JA=pd^MMH&x*o8SKHP$T>@pv=RV`78QU?lM2ar z(X7=wEZy#EFdNG`Y|^&Qf?*(OB^K*LEEom=dMZLPUgZ1RMxwEj^@yH|0AMVyA#Lka z4fOTw00g`u03Nr4jGSjJt?e1NT;J~zMh1H<&RTYZ@_$Nw{?>|}cONag!Afk)%)y=e zj{%c2fTzwyM_-b>T4eEK08J~9*L6H~F3abz+qv9(8bNe6F)hg~7zWRqy$GFC=&1;e zho6#+!^C>p%0z3|GI_N~Vm^p0XL0-d9LVLecRLq7;+#diLv5^cx6l9NmL z=WPtjDu1(v!P$#N^gMj-93WliKnO<>#;*-w9~(n747hUM+A;k89IC3)-13D`qK?Uo zLi}HCCfHBd2ovmfAfyt@ICrtPIGY(_u5bjuktS4KO&k;P=+Yd<>KfBRi}{IV_E(cJ zJ`^I@T@Cn7d;*|-wT(ng459}~#*5_DBF6F>M=xXTNZu_o2W7@(_5rVm$L+8tDl-pw c#fp6V1++~mg-oZS-~a#s07*qoM6N<$g0$>MQvd(} diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_front.png index 8daffcff05df55bda352907404a44f416dffdd04..828ab5feb8e95b51c475162b7c9eb9026571ee2e 100644 GIT binary patch delta 261 zcmV+g0s8)(1(pJk8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJex|Nq$7*tNB_ zu&0u!n|hm#Z-;(pd1+2)TSZMsJ##rAODh;bBMvwr7APJI8x{>26bum#2>KEB(EtDd zj!8s8RCoae!CO|t01QLHE7>V0&=2;%O$y{`bw=O637@w}{eFR-CUWluwOKNTWM;E> zA%><2lCcUdnzL@eoP7PSL!()b$QV|J#&HOQ7c@-;OJ>O?OmpxU#vA|_jjtcdrcx)y zM8txSFf>bo)KpaaLUT_L=A`Z%A5D;n5zzvTl#u{QK*xxr(uyE&^cqN0nW<8O00000 LNkvXXu0mjfh|Xn< delta 656 zcmV;B0&o460-Xhr8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00LJ@L_t(Ijb)QRXcKW1 z$3Hm=NlkO1$qm(zA#LGWogDmwB6JFZN}S)cz3#8$&%q35f^EwIsP*FNo3MdY9C^{S4Q!PUh+A`Ib$-p zO+KeE^>EYy9Pxoq^r9%%NU|)G&g?mNZ`4EbyOCwNSww5c^(G&rv=RWDTidjYt?ZW$ z*t{8K{C~j<<`-&a+9@@oLcFP8W q;3AP&C##u+f*!JmJph8>;vYk=5~H`>BtHNE00{s|MNUMnLSTYT=PuO% diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_side.png index 4a2def32e00a0ce0df9d6dedeac2ce32872c5f54..fbe56adf05f38c4e0e2cbba96f171b6a02360971 100644 GIT binary patch delta 257 zcmV+c0sj8|1d;-f8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJeK*x0qTwXmm> zsGEA5jcYe5-1)E8x{>26bum#2#U$^FaQ7m zib+I4RCoae!2xQ+KoA7M?%kD10s;U3oyPd2=q6P@UkN|AqO;|s^SEYp<=9}V}v2L z1%$|EI1=>Wir5VI4pLn7ZN7$JkwT&}Xtn|>FexONj1lq=UfM@sN(_F&00000NkvXX Hu0mjf8C_$f delta 623 zcmV-#0+9WZ0{sM#8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00K8jL_t(Ijct>^PZMDr z#y>rXZ7IEmwnGhRw8lYna&geTanO*E7z2bj)R93qF=&i2#8n;q3vhEV#zErHNQzNV z7Shs?3u0;ehHI(4ALRf6hx0wI!Dsni@_p~Q=XvgV1E-VyM}JSJazxb#q5c#A&mTVH zTB?s#!vWxe8loUNJeZkA!m$MRr(U7}MAZnUVWZbHzJC71@WcoO(eVx!M2FnuD0)r9 zu>_7KSg&jYxCD|Uszx|>K0_uQCpS6Dn!U%Gy~psx2#xkG0H$FBkV(e@=mp5<7XcVh z!vM659jZ+SyMMC}z=oz#Z8{7lLR6cst-(a-nBe-2o0LjLhK4TU$6;j+xtG4B0$0%& zm%y(N0>9Fw4r{L<9 zOJveS1-&wvhIXu=(cbj}%B16% zhTRpE?0`JyN3Ws;*w9?I1z*nx)G!-n2So{x&o7?13jm4|;4fSUF-Zd&<#hl6002ov JPDHLkV1hc>D}n$3 diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/crafting_table_top.png index 2ff840fbeb534c1089a7181e1f7c5dbcd365b58a..f33474d6f070c01906885b2536e07f8776ceff5d 100644 GIT binary patch delta 216 zcmcc2{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z4v6t5y};%t|xL_mU5_ zQ1RB5u-D>~66KW?;o;+Ev-^1_9H_Fw)5S5Q;#TsDITLeoa>61H8Z`O_1_Wp{PEK@M zv;YVs)SYL0ba-d1NM>`M)UjysiUo_MniqB?Oz2n?xYz*5TJ7DTJwx$@hEm5N0p8M9 zk4`PNRZT9FTtt{%MP;u_oN|eYjfs)DoETPMB;ufxnw~MAugL8=55u+@(%y$QYAOL8 O!QkoY=d#Wzp$P!4228gA delta 453 zcmV;$0XqKZ0n-DJ7=H)`0000V^Z#K00004VQb$4nuFf3k0004vNklTttk_bU2hRR6T%MXBwiHU*Dguoz)Kf?qE2#K46lRp3xSJ??8I4~Kb1H@OK z(ZM>9*R)WKiDx?LyYIYnd+!m)N0$Ho@dd#C-Y)sHK{1yk4u9kMg4wH&r#`XF1itSh z4)%BbtIKl$2HhU@lEa~G#tJN@;^yIzW~U9n>DdK_J{)v=v?_(ImjMoKlUAj`pxX<+ ziQ^;7&!-Jql>)b;XO#3XZ7V2H(u;_gwnfd&&>v2izIK5bwWbIFKp&6V_6N)^1SdAP2aOR}@xXSj{~$s0;OZSXKQ1hoCz z(eqXwhQU7(aiFBf_1z<|>O0KiCKT(S>Sk$_9hCHFlpU&W7A3vNL?Qy?`6BYS*P*Af zK82-JjOPnPHf8%KDG@A^ZY54kLod?oHIxOt%6~zBI6k4-X|J+inF#=zoi_d9WW(yZ vZG9QQG83yT2qA)qo}|RDah|?>6OR86gI==dt%3K200000NkvXXu0mjfS2Eal diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/palm/door_bottom.png index a823bcacb7948eb051af5c729d223b705b614ae7..18d8e7b6139296c244b22334723922f060cd4f18 100644 GIT binary patch delta 214 zcmdna{ETseL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY0*VfmyLv#VzJ=C{{n zRA%~RM7#QW*lOmOn1D2t1o;IsI6S+N2IS;>x;TbZ+%i4Ak?XL6h{MI*Pb|wl>=#_A z^Wfa2wf5YkFITTBK6o!KyepP3CP{!}va%SntB!xP@r5&IvOOkiXTO`ZJL;Q3O40uh zYur23=Y3MB+r4a+@$H?__uM6p-(xw|vCcF2Yt6LhPs`$EDm||LVooTP6=#sFnG3X= N!PC{xWt~$(69ADdRkr{D delta 425 zcmV;a0apIz0k;E?7=H)`0000V^Z#K00004VQb$4nuFf3k0004TNklYU z6vlrI84}bBX%GsbNO5#`D0B>TXqN4as=br!PJLfVU4eiDGi5-uImJg&!T*-pEeLNc4iM4|U%f;z-kn*vvxf*rL*pnTFK zwo)lgVk^nDDai7YLBD6C&?8Vj=01Wy)E3#nF@7c?%n+Cj- zIGZogroiDJ$ba$@Ckj0}?dG2X>l<+b5Vw3|eshg;A39f@KW5&^vJ);o!E z2k?6m(Tx~7^ULd>Mv%>EQ{YTyx>5?hI;!sutug5LZ1?bh+q?V9adY;~cb1n( zj4PSDhX<8Yr`@bJBeMd`=1bHr?Cr0+as%b_FkOG9C?fPQPYYo3sROAj9m@L+yWz(# TTU6$900000NkvXXu0mjfBZtMT diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/door_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/door_top.png index ee566e1614796fb3a50525681ba88f9b96291b6b..6745f6e2cddba0e3deff2848049d488504cf9a08 100644 GIT binary patch delta 224 zcmX@f{DEV`DJI5-kcu-IJ1}ub!a&%78;~Wi0+*m0a05))0||*kkr-1#0=1!H`W@9l z^XeCg;v41dlF@B(M9Ru4k0T4_|dYg9(0DtYv4r)DT`tpibt6=OM zW)IbR4!~RVPT49keR-wcNPEwd3576<0T_=S2&0&2F#{gHG0>R_yLzL6AE=apOu4%s z<^Zm*T8W&cbnN=7l~nhOxQ;4eI_!V;< z1GSzLMlrcg`+p)iKRYE_%rfJeo}J0kSEl!mPdo<05e4~j7{!^1?jI&Ld);KY`bZ_% zmWfxZ{4i;=bW99)9V7L?*gO28@i!0rKvCTfO``ZUV}8RiEnU87g4FkZ|ujpB#? lL)n%|r+tx#A7!fqz$fTW@S~g)a_;~D002ovPDHLkV1m0($3Or8 diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/palm/grower_item.png index e2cc043f768b23f8bdcae4a9ffd5404863db4e88..a6c0819d2ed2331a13217bc8c22491bf712fa39c 100644 GIT binary patch delta 270 zcmZ3>a+Ya=BnLAC1A~SxfAB;*@rlZE^&SB}A+G=b|L?92>dTk+DRwY#P|(SdP|pYcp*+p5G|k?loF#GcrxPUdM3oZ{54&Ka1Pz{WLhAoG9{`2y&07 LtDnm{r-UW|YSdt7 delta 497 zcmV2L{<$0%L4rPuQ0=n8zVAVEU$Zf?UQSc- ze;hP63&2?jV6dao3b)}DG_?wF=#P}d7-WU%-8$MgZ>PtB7h*IKxC~3=OQP(|kYAr~ zr${`JX6s^D0u07VSYc+bo}O*K61Ou;4;CJX_tnE(ASb~jp_BrS63{j(Cc-%?UJ5P^ zGeu{ph@uM20cJ+UN?niLYQ@BJiYeMhfBhMZs12D6)zYgQN+yh*^h1=u!kb_%bgF4G zA*EYt6BEfaT<=6#5C*5;Met2|G$lLcUGl7enm~C5R=_05HxUH8g`Fw%_LqUJikDY^ zfN#aIIyXf9v)=r)U_|e)R2>wvwOF{A$z++1tqd}~2;4F)MmNDx1%Zv#aj@EWTi{Jb zXo#e>?U&I_pj5&}ic$tz+zpzqp`e>Ufp7-q;O;*1s{>9}mG)6PI9p91h-PXwa?HV} nl!GTO9<1--Ar_Y8n+U)+Fs#2shBmYV00000NkvXXu0mjf1cc;P diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/leaves.png b/Common/src/main/resources/assets/byg/textures/block/palm/leaves.png index bd3ad1eb9254d4dba214b651bf813a2f75fc506d..c7034a2ed83c8aceacc2a41947a6a223962760a6 100644 GIT binary patch delta 201 zcmV;)05<=d0*nHX7zqRe0002(-QrS_ZWxgyB7Xn?0En$Ub(A<{f-7KgE=XP}KOOAf z00001bW%=J06^y0W&i*Hc1c7*RCwA2!7&zsFc3h&uWb4yZ~!paD=+jRvi&|F_rHoW ztj2RFEit;Jg-Z#3zs!3f?B=b6%BN?5qcsFP@5VJEbf0cue)crObfKutDp7s(FG7dA95BaKa^qu`r}?p Q8~^|S07*qoM6N<$f*)*Hh5!Hn diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/log.png b/Common/src/main/resources/assets/byg/textures/block/palm/log.png index 29bb72f8c6035997548ba3858472266ae500c037..2b3f45a3656fd8f4274174e804ba2f314c9a3641 100644 GIT binary patch delta 200 zcmV;(05|`y1K0tO7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-srk8z>eqoDn zOM7HOZd*TYS~_S}JYi5cnsh?{0001PNkl84G# zHNhC^>DdeB0QCAAmzz4FLW}FsIkoQd8TS0AP%C9CMu3Xafxq z&!%ak95-Jqb$ob`Imfdp!u7+Erby9ZnLunE zozU)dx8N1=kbknR3D3_je-IsWTnMkV;USGx(8J*crN_JLwF*$(QK~2xQbL8J?kyn} zHOYI^2@;59v7%9{;QAq6FsD(gWXxoP$|W;F9+HIlU$D}e_m2dkV~#Tk%bQBWBGb~- z!_AtU&k000000 LNkvXXu0mjf&QQkQ diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/log_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/log_top.png index 5ea816f53527c31d9be47609c71c9ca9bb508c9e..0bb30174c00feedd4457807026de5197b4ea6874 100644 GIT binary patch delta 246 zcmVS7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000aP)t-su&0u!n|g)nQX(%y*FB#34<%kA=c*2(sQ>@~07*qoM6N<$f(2-2aR2}S delta 474 zcmV<00VV#10_X#f7=H)`0000V^Z#K00004VQb$4nuFf3k0004^Nklh^l?{4Gp)0@8l4O?NWCjdIzO$0mb7JmT0XLA6i4+&Xrk!Cpn z3gF#`w^R{?5x(aTgb^?HUUG49PFsWTIW@m;C*M>LJL(_y+*}UQs>19W#mN#J6J; zaJH}kyg&F@G7ubn`3yiZyIILdFdCg2AC+b~K^W2RHA!YS1YyJ~h~4)by1GRWMs%Jv ziWYp&sZqVUynh6ss|x{z_Fyo@Umt(AEg+j>dyM%tPX@aGN zs^BX7^H{3@rP_m1yZ_qKF2xwrEXVg8&K6l^g_qYBpi|j?UR$#1eOlkd(dd+}ZZV1H zW*64M_Z+T%sxrar{Z~LCl6Ffb0DFsrlE5l9%rLm0siN|VDQ{! QH2?qr07*qoM6N<$g3)~3&Hw-a diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/planks.png b/Common/src/main/resources/assets/byg/textures/block/palm/planks.png index 5c5860209917bf373aedf51e8959961cb9a0edcb..cce73d073aa9dc8868b23735509d23c70f47e262 100644 GIT binary patch delta 198 zcmV;%06G861J(hM7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-su&0u!n|hm# zZ-;(pd1+2)TSZMsJ#AVjx&QzGZ%IT!RCwA2!2uP6FbqJ!--m%FV4%qaj0Oj+4xkPi z{}OhGR;X|wb~iBznlz8z4#qR`T{)>=Hj14z?N@K2M6-{m2S53a%=ekpVgNfT;^BT# zEW#{y@)^0tOtxBfwgM*Mr>fyyFYyT0T)(k0|6;}!1=juREC2ui07*qoM6N<$f;S#e A&;S4c delta 446 zcmV;v0YU!O0n7uC7=H)`0000V^Z#K00004VQb$4nuFf3k0004oNkl0;#4|y=+L+5tMmo>G=)Mji!p;3ghY!sipgY$^n{yW zdzK6TIrp6N|M$O@_qW$$toAg`I<-chawNOepZMp;7Y0DntbY@$J+bnb&wR|@fNrZw z)2!#kvDzcG0RCcw*&ATUbV;0FI(b8Xu_;XLwyH?IV_Vq<^O?`LIsni%&j9#V2bSvu zfMKTwz;c~1?9>YQa-Cq@-rZ1Z^l{xOS6A1CiDgWu5^YoN@2!jitZ;0LFz|@BDcx3; zXq%$K0QYxw;eRhwg{Bd0)BKVog|7<1v8^1_r%O~OvjPiHZ zIgSSx{1?e?g}>NjJ_rM^z)diHRnbLG02Kxp+4R*(esZzg1Tt;>vIeJopy$Lddd_%x ze#CXBIJQ;L0y4YmJ`i8%|HB9aFJDuH(N~w|f{DQa!b0gi}-2miR oS)RCwA2!7&zsFc1a6&kaZb`-Er@LHgiA%|o+2 zO8)(i;0)+&T)8}u#!eaD1m|DfE_X%wyrv{$53zcBXB3C;LQG`XaKWHWE5V#BOxTbs z?-!wBZwB0sK%DuhCOU1s@0nP-F7=H)`0000V^Z#K00004VQb$4nuFf3k0006ANkluQa)m8kU$XQLS;i-z`{S_UvTGtbiphpvoUNYIL5>=(~tsmA^@8t4c^}pR*9zS=6w6{3xI-5Fdm)Q$MNWdqEn_+s*t7|;-x7l zo%b6Q?rv{(!C@VMhG!&H-Lf4Yz;Cu}k*Zs!aG(I#edI=h1m&6L`6XgD4*|HI49PQ1 zo@v~gXBh!JK7YLuF4m}3qUm)^GQgnU2B6n5U1b`PCoCGCL%0AHF4ij0BO2m z&~H;JRj9gk%Rpeq%jnBi6u@jAvP!h&;5S>O>4rShRNXp9#|Gvn$b^O$Fq?-c0eE?S zW|Kq?z@OjGxHXUWw*+YhAbDy(In#!^tPqSZ?xzm~hktc?ofeZTQ%nk}aIt34-|+bK z3P88*+wX9(=6W*ZdNL%_TXr8gg#(4(Y!UqDpe{}W;$_6;`I#Mi;FQTT&7j}@Vj@{% zrnhw4{^uI^^@~AFU~c^Z5HCMHBL1;fmPfzYvPKa}MW;->jO@R78CkGOh>CuR6N^YUyIo2lvcRV_w+xGbf7+@+?r1ZdF P00000NkvXXu0mjfqI3)R diff --git a/Common/src/main/resources/assets/byg/textures/block/palm/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/palm/stripped_log_top.png index 7a7c0ad981994347cbccbefc025c1b26d6f90fd4..7080059861a3912380a037cfd2ead4471b56981d 100644 GIT binary patch delta 228 zcmVhYImXB<~fI!%!ZN=C@FDs^=~Ef;UJw)(x=-6cQIx^NL`2cD`B3?0r9&NBUaF_ zB-uI)Ubm2~!;)WQ)((r;ahh5OdL45mdL<`ySXTXPm3m*ht=))RtwRi&NP`-@(xKP<%=bF(Cv~L>7T9 z8LKXqh>3fUcP;17yGR<%%)a+#cIWGtlNG?bV;}Kk7l7qW#((N|3BcdvACp;z3L^kI zZ3p>c4}hP)hlozw;kkUu>UPOZmKTkJ7|*pB1u?#V$YgeoQ@8P43&1o75N8*PUbn@! z?>_)&*ku5cv0|DmNXE(}pRQv7?>~G5E)f*)`O^si={zik4I_2+JVgi#RF zu*;GCbGXqWb6R3V^Dt02tZ_&8GR5wY3M@-D$Eg zr(8!VZ{NH$4P|Z9w8%t-5ha~el@+72XryMQ*%T!Jl$^T#pk@tCUqA1@i+dFX$eLrc zY6f>r7AlNz>h@Mw$TeR_DGj@9inWBI;iA)an9Q=RBy{ceLGy80W(smdKI;Vst06fxIhyVZp delta 445 zcmV;u0Yd)i0m}oB7=H)`0000V^Z#K00004VQb$4nuFf3k0004nNklf!NS1E^LC;_3BMQ)8-ED&|BmA7hzOB93j)8_aM$KfEkCs9N`AJ6gR~7G^wwHyLe! zJV{$CX9*V|m4C_5?{=3hxSo$%V&mgWYbY6|2T-q-MLHRy+3FCHw6|s1B{`jldf26H zKXq(_i0k{zRl+W$d#jTQA%|S5-?mHhl>H<>&VJ-at000077ytkOd!;i-VIE{^6P2GFTze;MkS(gUAf@8C+W-In0(4SN zQ~v7FA xJ%{!;9~{$e#mq*}e-yIg?wYichxMy_-Y0o$0@bSmaM}O>002ovPDHLkV1h5gR5Snp diff --git a/Common/src/main/resources/assets/byg/textures/block/palo_verde_log.png b/Common/src/main/resources/assets/byg/textures/block/palo_verde_log.png index 611a85139f095b719254d84ada8225d0ed649266..a34477f989242734d0b0bdbf242830b15ede400e 100644 GIT binary patch delta 224 zcmV<603ZLM0-XYoBoYa5NLh0L01m?d01m?e$8V@)ks&32o6KX7y<2Rd7h8%GR(%&p zX%|3XAUISUI#d!dM-cP*(}e&40EkIMK~#9!1;IfI!Y~j8(BB)Rs0T0+_ofMSpH#YU zDse632##B62c~-kb6ej-O`_1I4PVEFo+)EF#ZKnbqne;_a00Zx(BlXc%EIOLa$X&*HO0m ax&HynvL|oK#)o|X0000VeHS`Z5|F)Ho6KWdiW5L!AUISUY@ruG>2E-h zAsBy*Nkl40by?}+J&ZS9R`}a59HN_K@13()RE+7YRkl7dvx3!M% z@Z<#qYcq)+J4Z3Sgv9t(o-45cxzpzA7-q6DJw668Nv80PU`bq;+=A@I+(WUb^C?j% z4pg!nLvFCuB8rpHbGFK_f9^ZgozpgTdcGnl;7~O&JqHGcmV4}vKd$p6{+&b8YybcN M07*qoM6N<$f&iLXoB#j- diff --git a/Common/src/main/resources/assets/byg/textures/block/palo_verde_log_top.png b/Common/src/main/resources/assets/byg/textures/block/palo_verde_log_top.png index 9277c49b06b6ee52828fd6319880f67c5de1eed3..faa4cf4fbab6528d6a28e805c4d453cef8ef0ea2 100644 GIT binary patch delta 652 zcmV;70(1SX1*rv)DSz|ix$@(<@8GuV-Lvc6vg+Ki>)W#F+py`{u@RR=GU#|*RJK)t>@OP>eI32)~xH&vgOvS)UD*ytL4+Jt!LWP9plhxcCn`)UA_)f(XTetJtPCNps2Fz4QCTqeN6a1t+xWnSe%Jcr{hEbA{R_ zml4y}+7oF#Z2^zuIst;k&%top_0kf=NN4Ur zd1s+Op$LXDf8)f4wjd#NjdtkDD^!ujMgA)eGV!!qOR55cM(q7XMD-|{l`ZbOZ=uI` m!cf-g+sb!)5rOy2@DHKyeU0r$w)X%4002ovP6b4+LSTZI1%VF$ delta 656 zcmV;B0&o4P1+4{;DSupx6IX&3R(%&zcNR))7gT!}Om7!Ya~D>C6km=TV2~d`U?A4W zqTSA?;M1z))ve{%uIAXT-OZ)j%cS7Zs@=?|a-BH3s)xI(hP$bRzO0A9t%<&?hsCmu z!?BFPuZq8}iNUao*T$pd)~(seq1?-(<=3s_)T-pvtK`+I;eXMnz^{tl(W#KVTing3 zyQ+oZ)2Zavtl!S1=-IF3)~x2%tli9`zpaSh(y8ImsnNff%ej)rw2sTTk<7Z2(!ZGC z&!*?tuEMX1>DjPIX&2+vt>e?G<<+asyp`(NujkgR@8Gub`RV2&ZM_aaaL008|-L_t(|+7*w}Vt)ky48^)$+qP}nwr$PU-w*Ex z3BVN+h$J!vNkl4*4gd@SiOFJfxIDf=JJIixJv4BrCO^un(0=c-9cb{H129wr4;6EH)04(h(oT~&w^MK!azAymAI!EM?TrP+0{P~*n$3Y-DFE_V$_YaSS qr++yHKEH@x-`+nEKfk^ae*uvmG7#tyAQ=Dv00{s|MNUMnLSTZwhj>8% diff --git a/Common/src/main/resources/assets/byg/textures/block/peat.png b/Common/src/main/resources/assets/byg/textures/block/peat.png index ebd9c2c7646f6edbb774f5807436fff89fa72da0..0fadba706ed8f7d943d084fbb87d4e3c78345f4e 100644 GIT binary patch delta 285 zcmV+&0pk9?0=)u|DSvuoQgd8RZB|HZR!C!6P-0F(U`s$?Nk^Qam(GJ~l=_IYd4;MmR7;H!nptFF!LZJuxdcEGIE2BZKjl1^@s6tw}^dRCwA2 z!GVDTAqWIO#HbM2B=4SR|CRoX%m^R4%>Cn>Ifd(i$L~-ZW`BIPXyT*fP=a@tA@Qe( zi&6~@(_2t1=2$eZGE zndiVUTqmobWiO-HQ9UbOELrI=2x*z%KJ=B%*Mo~_mOdxRUXdqJg4iEa}7BYiTL#8Vq7r6q- z7NbA-gBI{WBkrBI_fmSbPlA!->~!8{npGXKjDEi2(@X-8J@lhJbGdRc!$|Xv$#vgh kVm)xdolR#jY8Tb~2W6ZHwsBlL4FCWD07*qoM6N<$f+3A_)c^nh diff --git a/Common/src/main/resources/assets/byg/textures/block/pendorite_block.png b/Common/src/main/resources/assets/byg/textures/block/pendorite_block.png index 229ba8d7d27958cc4e5b2f805bceec1458cfb8ac..d2cb4e4a0ea242d24f0c51717c9a2be119c7d839 100644 GIT binary patch delta 239 zcmVkc5T3CSFK%2nOH-P zQ9FZCJAzL-floPsK`m-QB3(ipQ$ib4gfx8{0001uNkldqEOd_fyu!GWd2}nRbJ0j1 p$Rv4YZDAITwLfA1evbXOAAjN~E&H2#(vbiF002ovPDHLkV1i>(L#=^oBK|v6)2@=E?(8|(>vGO5&1Unlmt6(dN5)n)j1#=)O7mWmqxZi}i+yx!T z?as{q&&>Y2@%C#+1IbwO8LL;ESxBQ6vw-E2_)#VZR=0Mfv^1~z*7d!vm5o(h`B<#e zzSG!$_TGW6=O@R*0+27yPBmDZTa@*BJtg(JuadlX#HOJ8ZKI(W2s(i>-RCdzPyb8P zHZ~Z{rt+zbLn4eyX@bs>zk6K~Pb3H<#Xz>A?9&M#o8`zZ7zB|luWf3&-MrGGaq~jF zeoy?_Vp+0+LB=Kv)7q8J<7CqVoSR^Di$*4YVPjJ0rS&j64oPQd(tV4?|42G|?*GVu ztr&X@GMWtvq4>kl=xbm)W9GBxIGEi8do5rO#K4@nT&d>BfH58&#@kR4)pMULnV6}q z*XVp!6VtHZ(rd&qfRVFmGj>)?j*~bIv;e?yfRPaluywVGOe56*(DT!co(sS@ndyiy z^P?Ee_`jfmx4Uwv4*`d3!PuMSV(v)~rt+9y!|eDzX6L|U00000NkvXXu0mjf=SJaZ diff --git a/Common/src/main/resources/assets/byg/textures/block/pendorite_ore.png b/Common/src/main/resources/assets/byg/textures/block/pendorite_ore.png index c7698639500dde455e670ae0238c4a573a919eaa..fe23905e0cc1a555eae25b3292338645eaf84710 100644 GIT binary patch delta 281 zcmV+!0p|YS3h)Pz83+Ra001a04^y$z9RiUfvVQCt@QwN+LK*A~#ApBwh*v ztT_Mx0GvrgK~#9!1;GJA0|5vFFa)JuMFCg-|J5ZnH9h)EphlXq0!FLJ8SQE;(b}IC zYJV-bY2G@L`K^qIh2>pXq_p~NvTUBPNbT}t0mA0_3W>A`(mgF})Ef~&_i{H#iA*QG zW|^jY{?(oCBWc=dbSJf>yHnff$Q#{} delta 651 zcmV;60(AZG2j2>i83+ad001BJ|6!9n0<^Is8v=g)+@vF>XyvYD|-2jM@qW%J-L8C@?y{bH~9h zJY?p*dH3FT?>+ZmY(9MEgoA#ZP8aa6I9U8LV9bZ`hhnfY88wH)hu*!C-O>ANx#R z+WK#>*DtGjvGWS?iXRtaNz_tZxtQE3+3A;~e=PA$c~6cCzWaa)+ME9#)I9L&aiW`WLX8HNHv1Ed1uGFTUHXsK%(;H5F6KA9u$cnNrpC%G=6_O z>k*W&4-%|COeBcG4CLst?NzAp1idR~P=m&iuumRJNAET3z*tw|AzIXZXnZ>OD6?mx zdJL$kGx+NcjQpeL4sWF}I7XtGa7ki29Ipq@?)lKJ&Ieo8mh0OA8kcPy{O?k+S>9E8 z)jmw*^D=wE6bbb}X;bgr>;kjA+Y)nad^i~oJ{auE1&tIEk!`u{a8IRj_99{Z&2h)K z3z9&o)ipPRo-gsP{T8qsd~JP3I1tdvo4Y*x6_9Nmi(j)=l`2I@ZU&&I<%6Lt#+l7N-wcB}TzjuNh_PV^D(cbc3J8 zw*%lI!U2BWKqQ}yN)mIIhUo1@(3#xMBxM04lm!cT1mFPPY`&1hEmk{%)R*k3xc8k= z++wanacwIAIXms#r<3k)+F(_Z@YtVfB&5^E0n7BKp&UK8On+a delta 684 zcmV;d0#p6c0=Wf{8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MJKL_t(Ijb)NQOcP-k z#(&hS6nb|8LJ+8Q@DE5`NE`?fbRwt(6BBD9Vxn|#(FB>C466# z5{+Rg6pU!vURx^1AFp@UD_4s{?S;~B`trQ*^M2ox-&^(R^?&2-Xgr1Jtzmyd9lOuk z`lh45n3?6=Ku?)2tgUZyXY!F_kR=fSEu&Xxvh3yM%5icT6=QCShxf)2bR&x_iO8}S zfZ$RTfTtaPXTZ&|??mGTp3iiGrwKADvLvD#SzO^rlu$~g&x+7zMF_avWf6LVQKZ&q z;GJ}a11O;Z-haOPimT^DXN3vC3{0RT(g0+V7s0q&(Q|&NAD3=q9YM7U03`ipG0wO} zTFDn{bv2G&Ej0oZBV@D<=4~6*DzI1=VBWR?$gM_5D|zN#9UvMnIFIC3BLLXT2{PIS zRbwMV+W=nC1Ar*X=(>iXTV>xZ)pz#@UeUv)3j;urZGS0}|6q$_*trWkwNxsJAc`_K z#_t0-C^gNXdvJxUnP>5X4=tnPYimZ+45v>?q!|gG!KLdO57a+|QYxBeU;D*ni6jzI^+EaQ*5q+0kowY#T10a!lbjJ(#9Ri+`3tav!&K3*~?9Nyk~jc9_25 zdW7)&0*7|6cQ~&X@6%iDwAv~Gw;P2b;wwwj*s%n+em5XUa=pWTG#%&tR)lJ)k)~rG z0qBYyCAl{S(OS|Oa S@{{xc0000g9=U4U{{ zQPEpmgY6iedV70s4snfRc-g@*_hv^sP>q0t)M7zFJBBAlM&4Upfl`lMLZi31gxWE@ zY_FLAqoQ*j!(&5Xs}+L6atu$5L%p{foA@z24Kaz{;TjspaHDfZ-Hqup=dwMq44wMv SUjopb44&++elF{r5}E)dIc5U@ delta 624 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 diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/leaves.png b/Common/src/main/resources/assets/byg/textures/block/pine/leaves.png index 2d3c7e5f985128bd5d4065040624f09829aec04c..ad6540a32df9f780d763e92fad8ab4e498830a40 100644 GIT binary patch delta 193 zcmV;y06zbh0)zsP7zqRe0002(-QrS_ZWxgyB7Xn?0E3u2ZGj`}y9^CGAjMV^8ixb%B0 z2a0Ca`5i21xwG_^lRfLTw^efdAM>`#aL$vKj#|wgxNBC%)}@8@2Gidheqq-;>l&}L z->E(CA1dv?_KNeSkMgnx+xcFC31V}((vD{*)F=x9=7aVtO1Ekp2YdHU>{u KKbLh*2~7aX=u&q8 diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/log.png b/Common/src/main/resources/assets/byg/textures/block/pine/log.png index 09b090465c6389a8c881ee36de32938cf47afa62..ad666eb108cb3b4ca1bafb73377a3806257fb81a 100644 GIT binary patch delta 446 zcmey({F8ZtiV$akM`SSr1K(i~W;~w1B4whYYJF91R3#AQL{Rjw8#AuFkPWwEE&7lnX#ZIa7Pd!2eNrfXz8 zy(wO}WYS&>rfnup`umi>s;-iJ7&(WxW&p Slq!LqWbkzLb6Mw<&;$U>FSNY? delta 429 zcmV;e0aE_?1N#GzB#}8He^Ev`UQ zHAOlzP(?XvUQ19#IC*SYQb#&zT}wtgGh|suX{lQSVwqkSx7xKT2DV&PCs^PSVlTCU{yp@M><3~GDSKvQ%E{pFj7HXQbJQmJ7if% zcWPK^UQ1k2Kx0@&QARjYMmczFS!P>FNj)`BL^x_)OB_ktm60JBf7wYyK~yMH4UX+r zgD?~X*9ZpdH8)=+O@q)@5el|es@C^^GV^!O*_i?E1n!ISK^E2H>WQ8qD#hAZ=drF= zVdD_Bl3TD7Kx$rE33R(|e+aL2GHSQk0&fbl}F0M#AOjZ z;3Zo#VW4@`A71cDZ?uxnJx2a?CRH`-i~EX7gQG53U9`*8Ss9DPLlJbdsA$XPN^sxT zQHL`YLN3l>PFwnE9eJc^k6Fg~Ro2wbNWYZ&1vkgG{0pAQ>x>GZi3SzAYV`H#YUS-8 Xx#<*Q>VK0900000NkvXXu0mjf14^)S diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/log_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/log_top.png index be3b96149a868e5f4b1e46aaf409dd62455ed2ea..98334e6fd2e624c0847421c2e60d1b23b441b0f0 100644 GIT binary patch delta 254 zcmVA1MoEh6|V^OV@D)D_3v?B|8^z0VN9-mL?ywHh0ES;`#mDb~4LWV_RcE z4dvK(+_dXmyD~fry*EmBuZzFM0A9)#T+$pcF~xj*Kp%|jk2K^eFd#zqkpi%jDluY= z669sk@I3$wF%$+XnH18G0PF-8pXR-1mG*9#&O@#B2dqyoBzrzj-T(jq07*qoM6N<$ Ef>EAft^fc4 delta 504 zcmVrO7#09+weqBUl1rLIPd-k8{e^~Grcv{IZ3o*HbH8^IOOET6> zmaq~Jv)%NB_+F;FnXY>3t?Jr`H_ta==mU^t1*&WMy@=M{9)FAFlJO*=-;4O81=rVq zi4X7beJ}z*#H04<9P%jZ+-SyljW`t=(C zfiwWfwLmpPB(xXKM;EAO035%13P9b>{Qlj`3W<>+GCCU!(R_u7M_qNzbe0lG1I<@V zXDPd6&f{(yk$=$c>*g@m!v1_YpWm2N;v4M!PRH&8@ljoK%S2brY}8z@*za@*#3vBn zUfd>$qE;EeWHWWTMjA3hvt5D>0NA#O0!epjIhs}}ctw4x6m#P05!X5RCMChj zOT^sl;HU1Yz7l7T*+-Ca$_ojaxNcH5td;gKcjlO%J|q5bxD|V!=9oqR0000tO||}{R_G%9b6m)hx%XnA9U&FU_qP&QQWFUa0%6BYEv%nNVhta zcU;oGDS7wh?tQ;}*LZon-=wn)6b3jtJV3n`%a!Xtj9+ol>wi}IYO!2_!T@Ybuq`o} zrbs#(k#2#)z=_$G?im2GYz_cWY)eoWIPuwO;x-hKU!srWHrSR>lW7WO0{|e>TM-*r zUIPF^Y61W(uMtucPtWhJZ+Q*XJwMs;J{*lPxb5%dAyx{LBaYi!3;uY8$w8zs`TRnp zTa^ubt720XCVxj^@(MKm{zaq{C-e`H)1}ng$4|wpa1gIjvMw6oq(W-q`l`3%F*%Ma z-s_we%N4S04n?FPLGnjVXIW)b;S=eW>!*JPirF|Ib$#Fqe)jQiPOHm>Ja m($QN6e%|Xmd?u2Azy1NT`2yT7qz4}W00007XHsrwRNc?ycK`qYen~_@RCwA2!NC!NFc1aMAEba~NdYd&cveGl4$I6o zfMWq9*nbJWhm*XJ-@i}^;+9l!Y9!2-u@)saJ}#slWFR(t)K1g#94}O1#c& zD67bJlYl-c-QDXzpCWxgMygQg0nOB&%St=E z+4tr>f~Rj^r@Nca*fb+CF0NeV2cP#+Z=#-HRv1!JxIWdin&L3wcd=Msf!L~jSL@7UC z|FEqOlts>Yb^SnMVy4k)PliOIsq;rn98nfIyXM4~GYP`%@!_7XAGo`j8TZ3T*!y>; z(J9!b*@cAtzJCE=^YW$x1sw1}XzY^H@K?c!iFtguzW}TDegI%ytuS#kyC55tCCW!~ z3V2OqrXI-t-5xFmmoWw2&WqH-@HS21nLqtwlX{OY_|9B=439@}@N?e8RGL4>V0Atn#9B|=OqFfBq?DaRTeoWj_CYR zWpw^H+b9{gX{K=n*zX$>6LWR-Nv)H=SD60;{?8$>4s9Fo00000NkvXXu0mjf0Uz%g diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/pine/stripped_log_top.png index 86c01c3c69fbcd9cb978a8558f618159a1f665b9..bd1c5f85d3e979fd28313027b87e6d5ebf48f242 100644 GIT binary patch delta 160 zcmV;R0AK&l0l@)~DSyVdnZ2--wyKS(pM#*1c#ME*bZk{?WKm>YOLP}GLI3~&VM#KgqpLMMbOwFx0GSBL? z&0akwhmuWd4#13Y0VTto;jAdT!~-l>(}KqC_%wjJJga#}>>2u!z>I%3YC1sJjj-eZ O0000LOKW6NbZk|n+aZ%IT! zRCwA|&ru4*Fbo6HxSB+||B2TrhO+N-AUImBs-9QXYHElLYB!u?$7%L{!`^C0vicDg zL!nkF!cJ^tp7mfjG=p_Rgh>brUob}gLJQnbSlGwOTp?n}b0=2l+A{a2aqOY$Ac2^5 c>-t;&10Svf{}jVt`v3p{07*qoM6N<$f~{*%ng9R* diff --git a/Common/src/main/resources/assets/byg/textures/block/pine/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/pine/trapdoor.png index 9403b1567472cca6d41c6027a40133f15b88983e..d14a2f24341a380b2eef1f221d88134413701a85 100644 GIT binary patch delta 229 zcmVA0M)`BWC~r0EJ0JK~#9!1;H^6fXIaqk1+W>0xLqoeq0PfA)nbrLwE3rHbU f!{^Y4dOQ9B38^(SGotqk00000NkvXXu0mjf_wQS6 delta 488 zcmV z6o#J+7Q5Wz;0LI)Dbkx*8Z3eYlqC>xK?DoI!oQF%|0i9Vg%lPWkdPv1y0~J>kT6$; zWM%eT+%74`dv<;PTAkx0N~yGk91zG z5_ClG^EdW)H@LdI1|R|0+iA15x`K#sc(Bdp%jbv)uiI-pd7L65?CrGaY^__ov$Z}> z03fc3a}EISbJM_saqn}SG{y%u&azgSOh+U^M~G|UeU6BjQABLC zsKqr+17ilU)d(m8jdRz5&d<%1-;`FL{e0h-tmcn`||a|bpQJ= e)7=lBtdoB%lmiIE7!B>MeIEVQ*AK{3?euwotG+t&=!4;_eul1oT;@D?Om#iRT(}c5=Rr)!4FSVk t?z#gL$>h#v5=PcWWXvMFYqGnt@&nfo0-Ne_CdB{%002ovPDHLkV1gGMP%{7k delta 211 zcmeBSTEsL#Wum2$#kXbG-&P#_cmD0exb+MC8kPNIgL`yz($&N)B^ekPo(Nf)0V%GM zAiv=MFu<_sjL!LqiW2qZo-U3d8o{|ej(p699L&C(*#7+Izpk=cZq+k}Ybgd_KL2Ap zGW&ei@*Q)4AE| zn~}bx%*;_inJgY{%3M4E0004WQchCFs!uhU=RBAHbeL}{p z7TScOOR~)})Y3zBvSo3;%VN!HxRctF)I?WC6Vtut8H5g;@BXF$0~=GP7y1AI002ov JPDHLkV1gntTjKx# delta 217 zcmV;~04D#80;mFzB#}8HG|W*!|HQwUEFQk3%+tBq>YI_~(CYv4{{R30y@zer00009 zbW%=J|NsC0|NsC008>wR5|JSoe}PFvK~yMH9gYbSz#t3)Ni>%Kzqm`<8O+u zcKO_+wx-PGsqyfD(lg@RhU30NA7Qsk$IjZN}W(uy})c=K=?Jg7;TEAZAT6ACQR0~d_lk@z)_PX5#zVF7vFb(dk6%e TYN~#l00000NkvXXu0mjf+EHor diff --git a/Common/src/main/resources/assets/byg/textures/block/pink_daffodil.png b/Common/src/main/resources/assets/byg/textures/block/pink_daffodil.png index 94d31c527736169437c9b7136c1cd8b7276d03f8..a88e27ed0a5fcfea2801ef1aba7dc4d32efab13f 100644 GIT binary patch delta 172 zcmeBYde1mPf|G@rfq~)e-A6$a`y?i+DAfab|6kVszw+$E&P)Gi&b!#S;cZOfZ8zWG z9-V_)Mmp(gOC{u${ba=~CI4i;oB>qLSQ6wH%;50sMjDXg=;`7ZQgJIeL4i-hK*K@8 z$0tBAEs^8wq^wy?X%)L#E3FzNgqQixH(=B`Vk^C@o^guZRfg0LdOH|W=eAz5QD78h YU@hm4msoT+1!x+Br>mdKI;Vst0Hc*Y?f?J) delta 201 zcmaFQ*v~XUf|G-pfq_9omp^!-nX1SCE6+acy!8KN{r{Qs-o_+eY}{~A%jmY7?@|eQ zopd#2KiS|O9WhHupbk!hRZD>sUrCT(@PA~$;CkTBiHV95nIWDojv*Ssb9(}X8WcEK zRRxYd`FEX{dF4yvIUjYoqrL?HKgxA{Z{WSfp#=@i+)KEo8nAAX+*HjSmRF`T-`=Xc tT{lF@na5JLD7ovL^rw>_>|DRB5_jz2-Wz+(cqh0l)!}DS!6m_3_y7?au7!!|3F;<=6lK N002ovPDHLkV1gs4Q8oYo delta 201 zcmV;)05<=?0qOyeDSz?U@aeU{G{65EK*^He?V|7FJd=5*B1I3^WoF5;PQI5EfKYG*lKeWH1mm zH8ge<76ys{^%)BYGZ-ognHU)=8Zs~%3L1+D3o0{+2nh=bDndF7F&GOf8Y&qZ8ZsCf z840s08VfNfDyj&9Ok@xe3Q|;5bP@!LCNY zcU2|}vy4zE`0>l<^;2I?i|$khD(Y`nW9F86Q<=#N_sa<8?cuh6pRG=kie2r{yO!BD zEd`|AEm?+VV(Mr4m|AO|BlRj(KezT?>Z(@k#7n7*P1OaN2Y;zkUFwp$*hQI~MaC z2z6`}SZXKLSuRsluA)d1r0xq9tpZV}@^ubuB)GyEfZIC?My`mF4J5|npg=>+xv74?@kSG_N&QWC;AcI{ST_RGBj0Hi?#p&002ov JPDHLkV1m&q)rSB8 delta 494 zcmV0R56D(S}8-R0NIt1s49UahUYUt52*zWsA|?bG_&>-DWa+v}e;)?aTeJziaTxib53 ze&%qVIz>{YVVY=KPD)3%%9h>Sga#k~?^TrADW^#`8oZfKX@4m=HN{wPtHC8jK+t3& zA_=GdYY=~<)`q0j#8gSN?b2widYz_FWHQ%xJ*1Vp zI;z5YgTOqera@~m?I3hA2_ecf#Tc7fo%!8x3qXd#vnV-H+kHlN_fex;FH6x3NYb>x&sD-i&X-z1`_Csc0@Oif1utiyWKm?F>G|Q z>HosRxGRHMK_r8?)4VuZm|1O%igxPeI%CMxT!Jp1SA~IciI}^^r#q9=m@BLLSfpepc3==Uo>)rc!7t?IL kx#oy$?0BzJV&@3?4*&=Rxx?AHrvLx|07*qoM6N<$g8I$$g8%>k diff --git a/Common/src/main/resources/assets/byg/textures/block/podzol_dacite.png b/Common/src/main/resources/assets/byg/textures/block/podzol_dacite.png index b06b43b1db0c399117db9e1f3cd2073441289576..324f736d75bf8ce8eccab62aa9f121062fcb5c47 100644 GIT binary patch delta 411 zcmV;M0c8H~1LXsdB$EUI6_F$&f8E{P&CS=)%*VmHw6Lk8rJk6%gTpa7P|#N*`!P9%n}$P*o9QNFHHH9!^veT}d8iLmp*8 z9%MltV?iESLLFE_9bP>hSv@ILJ{(j%99KIWP(B=4IUG$s98)?RP&*t>e>)scIvh

    U~@7w2WEe8pP1ku1EqG|8{93c&YpcIU-D}}fHx0ZK< z=c~Cl&3m>d+w0%%v%GJnf0Ms{H(AeW^QfGER7Y;=!{h92JYJ8AXFs;p@@d~SzK_4= z4(smrb$xlta>Xph-_qf`Cc0pdpAP(2I};1qFH`X($2V9}%=w_tYH(4e0;?002ovPDHLk FV1l#Npqu~z delta 417 zcmV;S0bc&)1MdTnB#}8He@`_WL@^v^Lmo#g8)!!!XGb1JFB?fN97iu3bx0qrW+Y=s z9#mKoLN^>vI~dx7xSp}%Q)ElqO zRy#>LZ|~g?==BG~Q92r@X)^hoW;6K8^Y7ZvyjUz(>u$Db!ggo&ha;YBeqLuYdjX5~ z_iF!&!rcsB?gZqFMRd*?bYzHu2n`{US3x3gg@IW?ScI8{SU^EaO}vkpHk9>Z@gaoB z5L7+qSQH3lC3HzN;z3PpJdPHj%A>6wdJhkHZWIyyM>Ur!)iM7AAbBq?Nqy`300000 LNkvXXu0mjf)c~Es diff --git a/Common/src/main/resources/assets/byg/textures/block/poison_ivy.png b/Common/src/main/resources/assets/byg/textures/block/poison_ivy.png index 786e30571388dfe9db484c3e2de88f2fea005f8f..f2813dae2379f7d60ded44bf8717942c6fbfc8aa 100644 GIT binary patch delta 217 zcmV;~04D#g0+s@hBoYa5NLh0L01m?d01m?e$8V@)ks&320001de0*_nabRFzP*6}w zNl8XVMm9D!DJdx+1+}dJ0004WQchC1I4UA=Xt5%BX!Zk?GeC@-;Rd2Rs`+xKvv1xTmx{9FJ! zGqk5{fUb``>h7@(ti0M@aytV8ZLP`e0Kmi7nydis!P032@RN37W&qHu9&jr^iS+`~ Tn+cCx00000NkvXXu0mjf%qvu+ delta 223 zcmbQnw2oglZ1qXfPer^P0gB`8Z$F9H#av=PtU@_LIwtgtwHCu11ZjuAiv=M zP{0uEUm-M6QKG)x)5S4FBUrURQ0#~T50m1u6My~pJot6lN}pNq9Al&9@zedRJChC+ zU#m&@8mRGdi{?b_d)b~QJ2*W7m;jr#%nv3H@5{oumCQ)>NUi@Y0QKvg|uFPX@$!{%4T= X&Y~5&{?R3%OBp;}{an^LB{Ts5c4A+^ diff --git a/Common/src/main/resources/assets/byg/textures/block/polished_scoria_stone.png b/Common/src/main/resources/assets/byg/textures/block/polished_scoria_stone.png index 4e047af2b5b9fd5916e00af5a6ec636bc8c8e7f0..bfa56b0a91002c12d55b5d4c8d6ac0be11128e36 100644 GIT binary patch delta 153 zcmV;K0A~O70q+5jB#~bgkt8dBIuHjg3X#%zxZ5JhPL>?XUhA=n;?5JjosXO!)=0M|s- z2ca{n^MG0OihIXKs<;Z4$-SNnTf9mA4v;R?}>x7;0lO4XFL}U-A?_u)rPw0000< LMNUMnLIPldB1=9_ diff --git a/Common/src/main/resources/assets/byg/textures/block/polished_travertine.png b/Common/src/main/resources/assets/byg/textures/block/polished_travertine.png index ea09edaeb8bdd07375fad010fd9f8a1dad73f84b..9349c2cbfe31f269377b95046dd3e18b294f3564 100644 GIT binary patch delta 177 zcmV;i08ami0)zsPB#~kjkt8U8)z#I*!^5<+w56q`nVFg1dy3Bh004MNL_t(|+6BSE z6@oAj1;C$xcmMkEzMB{Cu%rM5EI>&*F#VU{41j=u>x97cA}u3`f0WD^Ect%cHzJJ` z7L3&wmT$vtUD9G!z@+5Ng6O95l#H=%ew^MgD7mUUFw7KJ$+&FCv3sc`AjOr;h?HvN f9aF3Q*IWMsvyu}MVtr6v00000NkvXXu0mjfF!@zX delta 179 zcmV;k08Iac0*C^TB#}8N6Q!l4)z#I*!^5<+w3(TiVO_6Zks%m=d`Uz>R2b70jX@HE zFcd>m!M))-9-vD1r5*RQp96@%0bKO{NANS*<-JJ&ILmE-WB!t9f)jm4azdZ7?xR1@ zF_FT8tJli%3b-#d*OUsFO`Q#OnxcGUGH26u)PUZ|66KA4rf4*D+17Q};=!{xFFK01 h?FWY7+pmT82M&c26VU~CE@A)x002ovPDHLkV1lkORlfiL diff --git a/Common/src/main/resources/assets/byg/textures/block/pollen_block.png b/Common/src/main/resources/assets/byg/textures/block/pollen_block.png index 8ca78895d0ecb4dfa584ef3c5494e7f5079e0a28..b3a39ba24a8eb951a22a941180e70f89103a582d 100644 GIT binary patch delta 173 zcmaFHc#m;{gd7ty0|P_ST=7ppinG8YvY3H^?=T269?xHqGEq^r{`oq)>%ES9>ReYh zo7cQQx*Di3+SA1`q~aE10K@wK42LHv=`);6aTjHn^-(yJftyV&oMBITi5i16_bX3^ zE!i6;Ffa=JRAZQ^KcRtvW!@_}hQ!VpDGXglS}GYX6(tKWWWLGEWeBTK*Ns8JeY@6?AsBdLNklGLv9@^an7g?urW@M0_GFO|DzWp{jNv(sG_A zvXyBxScHRb@o(F&H0L}qq1fbBW1rExi&$Q+FAU-wnp(KMMpFRxLpVPJlnySE(x1}+ O0000AURkX{}i@p00001bW%=J06^y0W&i*HX-PyuRCwBrjxi1dK?uVF#Nq!xzJl5Q zC=iyAZ0XObZ#_(;Bp*uwNcyNH;WClxy)!dLN+e|*TrB2sOq** zAtEva(=BwM$SraLS?ORcx7>eO!ksyxVyYOwa(|-61dx1&p_Bjs3IG5}MNUMnLSTY( CR#Srj diff --git a/Common/src/main/resources/assets/byg/textures/block/protea_flower.png b/Common/src/main/resources/assets/byg/textures/block/protea_flower.png index 6000ba6457f3a8de8b73a11ed99af85e34d5344d..4b435b6649b9dbf703c2607948a0ad636e069262 100644 GIT binary patch delta 171 zcmbQt^p0_Y1SbnK0|Ud`yN`k<_DM`sQK|>>{(t)V|H-TWhc0|vvHkzd4Nub>vX?pq z_voCl4bVwfTPh*1>?hm9CvyGS`$a(2j3q&S!3+-1ZlnP@4xTQKAr-fh6Ao}oB=Ur^ za-26&>nVCUk XemRHqTi@~wpkWN2u6{1-oD!M{vWz<#x~&NitS4!KD0mpbXBs|EMy0Cm)fyS)NZd?i7C!T*r~gX@7iCnhRNgn`PxUYK)If4ZD${yvdh;W|YKIWk1>A9vz)@H8D#`1_p*1i_DJ$ zDejUWzu^CHz~JT2_-Ue|M17s7i(`mJuy1dmn2REZleX~Gzxovy?j0|&$}qp+`s&}@ zqqX0z_v%>xo^k7;kmVZLes8h$_s#gri&eko$-cY$=xO`nPHUIzs diff --git a/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_anomaly_bottom.png b/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_anomaly_bottom.png index 1ae189f7d17bba7b78fb05db22d7aa4727c03d35..a2d035ca0ae14b440df8ae36d420cb9bbf4ed637 100644 GIT binary patch delta 386 zcmV-|0e$}O1Gxi`BoYa5NLh0L01m4Gt>1u6{zSY zuk{rmL(W)$?Y8;T%V9h5@&5UpL-)Ay_-lXVk@mx7qw`4n2+1Su7mqeHeT_Wak`$S+ zU;oguUu{_Je(@;nKk>MokAcVS{TS}c=`8&G_MUwQh2UWY$SDMm1SEUy!6O05y!4ev gouJ}T(zWp50-R15TV)}2ng9R*07*qoM6N<$f{u;ATL1t6 delta 423 zcmdnV{GNG&%0x@q`h)+v17-sUcDM3(z&zx&WXmCi=vJ%UAlDU%$XaOZd?=X(ivn2RF<#-m`BDnNVjE&@Y*Lh-YP6+tDD#*A2>x{DYMW{DTrDMHdKY zrSx&nXsoh4-_+}ta`1e;ZgAtd`hA5Di}v136M5JF{B&8?{fa5ydfRV@_a8d^_VAL= z1;1JOdo4c;c%M7`)?1_h;y%p>6X(}GTlg{DX4-e=z)unXz!1r8gtA4u8A1hBB0JlOYHddc^eqd`SCEk7juW9saj=-I<~AR8D=44$rjF6)?` G5}E+1iQJa} diff --git a/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_anomaly_top.png b/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_anomaly_top.png index 02abc22032232148547b8e8fd8556e3ecf7edf53..4ce7e19955194d76c9f0a21aeea4a664325797cd 100644 GIT binary patch delta 347 zcmV-h0i^!m1Cj%fBoYa5NLh0L01m9>R6xqIBXcjK#R(Whk4 zp=8OPTE(AP#g16Gl~KiqPqcqTuYNkHb~mbWFQ{)Qr)DUaY#*mo6p2m`f=ms6M+tfQ zNsWB~0004hbW%=J06^y0W&i*HoJmAMRCwC$lvxhKFbqVeE)aGoYr&9`Qs4iID0M95 z1c;*MZ>%WNdmaTC*x_dr@?3A$`&(-XzaiGgKq+ql@NVEsCTJ(cyL6YNhwM#zY-FEE9 tPxWK`KfWypAQhDR&<2$@aH&Dj#|N~N6=qiDYx)2H002ovPDHLkV1j7stZx7S delta 407 zcmbQl{D66a%0x@q`qBWO5LX5UhI*IvW#+5$HJ0bdFYk-kv3J6~V{>0@Z+7p)5E>L?;rZVv;6U+J^y!B-#O9v5@=)I#xq+Pj2IZyOM?7@ z{}Tlmn!~2woTw;Kf6&v#F~q|E>6DjzOo}`$;-dXmLti&ue^mADul&VJP6}#ny`73T ze>#75^h(Rn_~5yd`RdDWON18uZhpApNzj3cAm8+2J;{bBo$zdCMut^q%eI?WBrM3< zP?6K)80FmWGP800+r>AYPh#w-ozH&LeWQNmi_0^M6;{s5`*hvyuW0z6cV;%*CKr3Z zJ)+B8RQ*ulPQ(PR+O-GryJ|~!|F*ev^OCvm6v>S1H7>P0QUB^)_A|>#XMS hNg?4cOQcH;1DE=lra5y2{sBXR!PC{xWt~$(69BbR+~5EJ diff --git a/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_oddity.png b/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_oddity.png index feb29d35298f1f51a346127614c7d6570f9ea28f..89dacfca17eed084d0639cb7a85bbbcec7091aa9 100644 GIT binary patch delta 203 zcmbQq^qp~ngd7Vq0|Ud`yN`l^6lZ})WHAE+-$4*&+%Ylx?LeXY%jy+ub|NfkB+qZAO(e|Y)a#NH0rZUZqDJnB#mHL9@>g|5nX9G1bmIV0) zGdMiEkp|?rdAc};RNP8VP~bXq>%a!7GZ7UH-d`9x3coRxA7d40Zaw%!$7SL~rVvwM zAL-B18qNHRIvX3s7j-H%HXamP#<8q>WkX{lBSYC$o=`J|)9gSa89ZJ6T-G@yGywpl C^irh& delta 216 zcmey)IFo6D1SbbG0|SGGE`RVuGlfut0G|+7AipbeQ|5&BI z`*XhCX!~;P*s-fuufBczHb}01`}XZX#dFztGl7&qNswRge^kKmKsi=&qM}50n5T3x-XgtSxh)E}IT*LeJlb4zmR-WOig(SmcbytQ>lr*<{an^L HB{Ts5^JZgY diff --git a/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_shell.png b/Common/src/main/resources/assets/byg/textures/block/purple_bulbis_shell.png index 89bdceacbd66c88fcce8d494e3f305e7d563da28..e9eea9864cf4873f199d94e44fd9f3286b666720 100644 GIT binary patch delta 582 zcmaFI*2FqNl7pFnfk8u;KX{^@_(Wy7`bz;mA+9|}N4s^8bm|>x);-XqbEwL6MYZvY zM(usgn)|bCCsyfhuhZUIr?sonaB-#K!ZM>prG`t2^*5Fn&8^hhR<5GUP*b!TW!jx}sb((O#v zuJ4Z5ZA;PYOw#IzG^mf(Zi~`tj?k_T(P{|Ss0q@l3D&F*RQ_6N!$g)$+vX#%Wkg;9lII z9=8;ROlGXkL7=E~JeSz9h7JXo9g_rLyE zIgUmiiJ;Zmr}nek9dX|FeB+E58O!1scbs*EHpK^dtY4fbYkSzDz9cNTc$$X$Y1v;2 z|LWFk-g=ht>S>>|iGQ-IjP&{qcA2Vuc;NVC>Pqj{J()Rcg&C$qzEkbKxm7tiUhvSv z$7x;M3469gHWhc+@FcEUl-i+bu#xHS%zGa%-QoK^;b&Ks#+{j;O}CmoZ~n53yC6jK z$-$-48(-WC<@2~6e9SDX+GejoeT345nJgmvUaj<D7sPe!Ca{V&Ah` Wc`2jOD@LHF89ZJ6T-G@yGywnw*7_m< delta 821 zcmV-51Iqk@1?~or83+ad001BJ|6!3fAdw^#e**(aL_t(IPaTuVZrfHAhCg18qA1Cd zELo}JSheE}Xpuz_G%e5;=*mF1eUZLMAEfI(LVzL&8Z_vbMs@61wj-;OrBD>b@v@iX zf{RO@|Nhg_zW?OMA5f2hNl)*i8yb05@LxXV_uv`A(XphBAp}7b(Ds_xD~C^8UlC;~ zf1*}2=!%_c_(Z;7$_dNNCnM!?=P^ZI;HQgfIMHIlc!RNJaATYzMS&=9pUZ2m^}l$x z8uN1T3vcDmL~_a|u^5^|zUY08Fg2{gR+>OQ6EiSVk+BV#dJU z!4tboqA_V6;o2SxB{k62h-T3yHDF8Bm4Q}8v#vX=*GqbCn?37@NqmiFg}ez)8AtDV z+bax>W%^avw3Y@6eU^z+Uit@tmxPNs_2yw+RE9o{dPh(Le8eckGH5(r_@1 zoPp6Nja>A!LBF<5E$h;)*I5-l8>PSFw7KgY&`5^pg_7~v?Qf5z(kEjOpV4YP_b{Z|>G{tjV&Q!Vl;scRA zM-`77YgDD-ST0S|L(Icz6`krOa}}42Jv!+Qhj)fmjV;~a(0NEVJ78*@fAP|Pg=ad| zZj`h7{nnSqC0c4q4y=8;?BU9`D%2cTvlv*rEEVvqI4599y=LQYLb5bNSNVx@xULXy z%Ug7{yVVxH&o3Fo4=OpYqY>k9qRwV?#5R37VBg!V7?zz8ht3hh`VnpIkc;@D+RCyQ zm;AvfJS9!T3aDJ^aeBonANznK9g0l)!}DSzb4?c2NO(XivhquRHY)vSuq6wGpm0001KNkl<=6lK N002ovPDHLkV1k97PB;Jn delta 201 zcmV;)05<=?0qOyeDSz9$=ftDh(XivUmes6^(d5hR4XLJ<0001!NklU{G{65EK*^He?V|7FJd=5*B1I3^WoF5;PQI5EfKYG*lKeWH1mm zH8ge<76ys{^%)BYGZ-ognHU)=8Zs~%3L1+D3o0{+2nh=bDndF7F&GOf8Y&qZ8ZsCf z840s08VfNfDyj&9Ok@xe3Q|;5bP@!LC{0})9?K~#9!1;Oo46K4Pb@aOKH=Xx)_L)rpeOL@t8 zh$JAA3^XxhWHD@k=w716x5UH`qKWZ?AN)^DOf+hAZW<*no6{xYOXtL>NI|elDU=o{ zeY>`IZST2Wd*|;*+`q8+bT)kI*s$0rq+(k)9tOYj55#eP#MkOS?m~utHTR&BD5^dP zpii{PDkY*}$>nELK*(G7r;`nwkiwda75hg$P~^*4ceC*SkE>S2Z0U3*J}Ja+XXc42 zFl$V@4943;hlK1wJ9ahyFcSXd;J4~bA-t6YpgO0nP=rHt3eY37%{&);rvI?hX%Ew+ zleH?K=C8`@?kjix6zIl(y-nR3f|pM8k-Q@`nITyO*JkQnw1Ea2K-Jc=1(F8oME0|u zk~}iYc%nwOpQZU_RC--zwow#S8d9*eeP<)#Bwg+N#ytKsl~`ZRs&#zy$6b8^&)iCC zv5;!9Swpt!Izik!9NMha$kEfPX#bnV)o!@{#d^a`)ZiW8EVRN!k=e z7&Ope@`d^|qQsPc==1-Q*RBOEyY}VYRzrj5%7Yh_dQqWFgX9>hi`p-B6M*jj#)lApYl|gT7IagMnd-nGzuV`I z8WnQ<{5FYmO#hYDK{+?8{S*0k^6ZY`bIpI;UeJOnTQwI$xw=L1UT4dwcc0u!b!CsV z^@&Ssxy^8SKDW8IN8(r~p2Ep;C4-G{9AlF>J<%fsxJ)t=3a&$~R=hQ}a-eg72$1br z_p7BPj^nf~434T_&JT^3So6tjZ23_>lHLdvmz~J{73J1|#b<&k{r~^~07*qoM6N<$ Eg0%Ci3IG5A delta 830 zcmV-E1Ht_K27m{UB#}8Bks}p<0~JX`K~y+T4av)I({=y=;Gg}oo!E{Yl7_TR(okj+ zN+tS0TRWtwT_F!&i&rp8v*(L z@)Dv0qwOro;CPsIaJW5UXKvS?@X6CB-V^8Q$=w0~`l7fA5eMsHkmomeKTXAdRX&Qk z;21%fJ~0EU9l|x$SgCG}ZIR1_ye4 zi<`yOda=_cwTNXZ2=egkLcVQgCE@JULDevy#WsqKLPINF8a_FHbfpKyQ7WcDFwKjb-J$WYdc3(ZO!ec!b z1wp?z8eF6q;;H7|-;0Bo-}M?ZPTG_`Kljb`h@53iqH=$mk& zs0|^a5kSHUFU1#sypR!6zx`3Tb0==u?X`!yZny8&|~JHZ*nw)=}{aNwQ557X){SXDa{0@&P51i zZ+T@K3({Nv6hzDcZH;4S^xrLGW>tWOhEh%#g&%W$2q1=kx&t^)+H8}IFp42&4DrYa zJsjvrX)W~l)jb^LNc>n)fLxuIp7P6Iesyr{YyX4qR;0K{>c;9q)wCep$Ab}n zl<9VL%xaZyWJ4O)4}<>?jFrdCdH?_b07*qoM6N<$f-0&-4gdfE delta 167 zcmV;Y09gO?0rmlqB#}8H6O3b$p?syYm9u+Ogl0=^k4BwLks%m=a7jc#R2b6@%fS(V zAPfY+i%>u~Ex=?b0E`8o(0@((-dTv3MwNxvG@9PTOK=YgLLZ)&ok(kVeryM>+}A1z z&3UwY1iIPom<5S>D`gNd+h)1~bx=J`feAfNZm6u1hM#}e7C)m?#IgVyMZCVp2Xa{t VGG_J7ZU6uP07*p#PDHLkV1izFMb7{L diff --git a/Common/src/main/resources/assets/byg/textures/block/purpur_stone2.png b/Common/src/main/resources/assets/byg/textures/block/purpur_stone2.png index 57ca7a74a96757e831f32c4e2d0e3da84ba73c17..a3c3f629de1bd4a62cf58e142108fbf5f7ac2262 100644 GIT binary patch delta 736 zcmV<60w4XY2BQX$B#}WBks}>{0=P*;K~#9!1;OiY+e82W@bmf3K0jhRY3;Oeo3vfm z$2twIh)?^Diov zykW_T$`FcLY!14LLW1R5NP;E|tJv-LYT7`6r65dNArVs%g%F$*tcq5D)*T(nLe~l8 zFjxg%zZb95tjb|FV@GHERaJ?)m9U_3HaP9;61jbKH-0_UJ)?;0PN#Eu@vqEeP6gUO z_v1;{Dh<;i%d3;;hwDjrzj&wHGcF57#h?Pcp;IhNmShOyat+ddS&BCOjrD)w`^mj( zs-wMKYiOj@K{$uaY zAFr~K4)=BoD$c(=yZ(OcZaXx{;QYfPUd4`St(M`@*?}ZWGDMT#XRhlWKRE;dw6rYp z3Mydy&pU)~F$$s&iE?45K|p0%RZOws_(LGwQ&b9p5@ S?@Yr00000Vi|K~y+T70}6U+eRFK@!@|oE`=nof ze1f>JS|;ZxDbrvcVE|Ex<<+JvQ+Kuyl8AzoD8z2Jil_ucB-aZnAyG|#7MT#7Q=*6p ztCk8_s44{x?%Z|SEq@WlEP;5O?i}kXx zm8pDv=1xwh{iC+T;olb*)TA4qtz?S~2$l=RX5MYZ1XXA>i(dcsem3x^Mjm~;HF!CE z_Um&7>5^?KR1q@5-#z@{u4h_$UgdWVs>qq2ax7$pAck5!E1TtiX%N>4$rmUbhp^mT ziv9fL&FN?`5hXX;4b9d>!ILPtzMK#K818?)W!s&)uGS1`?a%>x#pv$XTSxu)eSc5}rP-`UZVWe9Q-AJTnlYbwI|rK*mN3-LUyN#lYk&?LP>tBeQJ1nSt?ZH7FqL{Zmh ci8x2)f9?K;^Cg;oP5=M^07*qoM6N<$g3eBI!~g&Q diff --git a/Common/src/main/resources/assets/byg/textures/block/quartz_crystal.png b/Common/src/main/resources/assets/byg/textures/block/quartz_crystal.png index a11288d4a4dccd1420124b0222ab0a10ea78aa7d..0f49a52200164f772850e0bccb5c969287bd6a32 100644 GIT binary patch delta 214 zcmV;{04e{c0*(TZBoYa5NLh0L01m?d01m?e$8V@)ks%;|9#BkFMF0Q*_x1AX<=*Ar z*4@;`)XKWHq>i(ok%@bAZ(Uj!E>@NR0004WQchCoN^A^1oJoY~;y4>ni>J)#-5 QCIA2c07*qoM6N<$f>K6Xj{pDw delta 221 zcmeBUTFx{9|{p+XB>f*asjy=79?aHZL+m`g@$3_8V zm9_cy11av3Aiv=MaKPZ@&-iJgqC|a#r;B5VMsRJPx0tgchqJ34LrRh zOmy9vtHoZmb#cl>TG~hC?$UL1Hu}jhp@EGrCoYzO%ai?K=E7A{4tM`D-Q;F_pYxpW S+DD+{7(8A5T-G@yGywozr(vl8 diff --git a/Common/src/main/resources/assets/byg/textures/block/quartz_crystal_stage0.png b/Common/src/main/resources/assets/byg/textures/block/quartz_crystal_stage0.png index c0be4d3694a43ced3984d98375ddbd6ab50e793f..7aa4dbeb4627cae6d6632ef85f08900c0b71c813 100644 GIT binary patch delta 156 zcmaFEc#Cm@1SbnK0|Ud`yN`k<)=5lMk*${w@Ck7R3Vr|j>DAMFPw!v5a%$JMC4HM0 zOzf;K&X0|{$GvMSP@1tM$S;_|;n|HeAjjI%#WAGfR&v4u(S!u=cEc-N5)u)Yg(PmY z0vVTjge7jsUX_&aa^aG&h_R8l;jAPfArYk{Vc{e#!LZqbeILuM``JKa7(8A5SY6gR HB{Ts5G2b}$ delta 171 zcmcb`_=a(U1SbbG0|SGGE`RVuGX-0@0G|+7Ab<0MiJjHOub$r9wxsX-*H2IHU%PT@ zSAJ|1P|BZSvN@3ADhcun{tp8To6hK*pQtDi=IH6-7@`q;_UuMR21O2Lhvtlg|E;|* z%jvEW6Ma+{u p(l%v^x6kzF|0c;^lHL^_`|t-xOvO{BGeBz@JYD@<);T3K0Ra5ISwR2* diff --git a/Common/src/main/resources/assets/byg/textures/block/quartz_crystal_stage2.png b/Common/src/main/resources/assets/byg/textures/block/quartz_crystal_stage2.png index 6976f84f2b4f3376b8a8f7e93d8d5a4be77ceff8..3dbfaa8dbb34a08aaefb68ec5787fffc978a91e9 100644 GIT binary patch delta 202 zcmeBS`o=gxLXL%*fq~)e-A6${inG8YvY3H^?+^$xifVW@OjJ~;mkaO-aRthL|N80G z(|b?vU%Pwd*p*Yewk_$~ykKHyb#Z=dl(=5lG@uH`k|4ie28U-i(tw;0PZ!6Kid)GE z3PMxF9Wu&PC7d@h9?}qMG~)7I*pp-~(7d;4uL{$epuM&#IZ>62%bP0l+XkK3=2n# delta 203 zcmeyy*uykIf|G-pfq_9omp^!-nS!HYfKP}kkiU7s#8*%6egFEYv%2{1m19ruU%PT@ z*R~~n`LR(zS!Hd${XmMlB*-uLKO8W4`7?f+s3=hs>*?Ycq7l6GtRo+TA_udBzJ6>_$y|$t8X8sFibDn-?rDLym8#o?i={qrFb#!Dn y_m4BlIt;8j1rPRzaViMr2wWFic82pzsQiqx9Q0BoYa5NLh0L01m?d01m?e$8V@)ks&32`1ttu_xJbq_4fAm_4W1i z^z-uZ@bU2Q@$m2P@bB;M?(gsI@9ypI?(FXF?CtIB?(FOB?CkCA>+S67?Ca|6>*(w1 z>g($1>+0z1>gVd}>FVj{>FMa|=;rC@=jiC?=;!9>=j7<-Ke$;pXJx z=j7k!TPx;@;xo;p5@mS z+uGUM+1K3I(%aY3*Vfe5)zsM2%+k`)($UY-(azS;$kouv%gV^e$Hm6R#K6D3y1KX@ zQmdf=008GnL_t(|+6BRhLc%Z%0MK|JpcNd9!*(El!seo4jiXD^u%dPP|3Bn=aF-?> zSu0d}OK3bnuF;D#S8wYcAOAHyc;J1Ary3C{NDK%KmHErA^h2|$*kuT<9I~sVOfK!? zHbVoeC(cx-Yd7h@5zj2l&ed{xV3NgdPrOMz)H98~uV1N+VRTY^XsscA@%+=$BDp~? zFlkz3tL--OxAI6;1pJl4Mk%a5oA2BD7W~(gRp!#cI1izYQ;2%0oVkCWKsR$+0$3>+0|C?bg-Q;^N`$?d;^_;_B$;+}P6L;NR)! z=i1rV=H%ku-P`Z(?Bd|v?d^}4#a($dlB<>AuN&eGA(%gV^|@$ls2gwR#*xugV=;-Ih#>Dsb_3!WQge?J^YHNR<>TPU$HngK>+0(1)zHbnzrE+=-|_J9=;!3^ z?CRFg$m;3m>+0v|=Hubs+4%VQ*Vfeb_V(`X?AzDTaMhIYks%m=>PbXFR47vo&e=l3 zFc3h|X$hGy2~kFC6DxGlSOF_V+)z}&{r`W+KHTSX0iw7k`VyrY5Nbm(RA_|N2Z#L; z9~~znIN{X!Q-z4+gm(xDWy7;^W+pl>*p>*DIA>dkEWQYrgAz5=S6s^8H006D63+w7 zuVvHR=y)+siSx*RKs)c4rMjicyVYH5pbDDQ{ljBLi}QZ8X~toooFLylSM?AD`>5X=#nfU|&yAe^bE{^%4z(Al5(hD>9s| o{<1^>F^SE-EfQA;N~rw@WF;7_{S2@I00000NkvXXu0mh|f^m~U=>Px# diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/bookshelf.png index a45c6a884d758aea111c5bc03c9d6cfd89835938..83ae460b93eaeaabf4d033e36b27e46bda4fd6a9 100644 GIT binary patch delta 478 zcmV<40U`dH1epYoBoYa5NLh0L01m?d01m?e$8V@)ks&32wY9a0iHUQXT#AWbrFLV3 zfL3LWO?8eDhHid*cutvTR9%Nge`a-RXqI$wM^t@1Wnz$bV^McqZH!q)UtNt}at$$K zqgPafe@!`PPhM4M31?G6LR(`oTaIi=N_9yxZA>$1O)Y#gadJT|O-6J{Nl7YBdb}1E zQ9UhpFb8FSCShSITqR0NKR-WOGaXtcS0hA7FgRjkD;+I2YaT;MS}Y+kGGvhv5g3G6z#P2KNP$@c$c5@X}o0p5i_7* zG&Q^}?DMrnBdDcGCFV=#gJbv!E>ZeXfuGbBhf7^`QY7t@3Qaein{UE=ZC5%6NQo2~ zvGk(PG+Rf2O$_YzR=vRP;2G}@c*dao$r!`n_VmCgH~L*E5!AxIifCDx{&qfH%+Dvg z4u5(Od)?qfF&0002ONkl*yzf}|9=Ro z*cf0csS>EM9p{yE+-uxjs3{V>ZtqW%@Kw*7`VhQ+RxSu>8S1xsuXCq&ATT8OP<<;c zvE2m{EPn>&P|3)CW721H#b8}A1d5^$B5lub4~mjc%@NSbd_>r8rG=mCd{p*A`;apL0000!UO*2laUxlpG zRB%>he`a-PWs_%9LVS2mrFLUnT8d&{ja!66Wnz$5RD^AjS0^GIgMd~_88}Kua$<{0 zF)TKBU2S(`Q5h5rhHidTeLZE4O-My=*x1-}np|I9jdXEGwY9Zs7-*JRSBG7PMr~?9 zUx-JEW@uG@J=V4U(2*e+f5u5fK~yMH9nRZgfq0u?xz0JtFt+^)a={A$TxrnT3UBg01#eK225&Go6Hc3)Tt7;W%M(s_y)OWt zUmkfdcr2{5m8Qy|G`M|}&OZR@*JC^y1mbc2%UPH-RtCMnqqY^Mk;QYp9KQ?6%BQ6f>`~Uy|07*qoM6N<$g4T+oeEyKs8DchO0AT-_x8H mShmL|g3+^;_Ri%oikg2DQdbh-x!08d0000!UO*2laUxlpG zRB%>he`a-PWs_%9LVS2mrFLUnT8d&{ja!66Wnz#qEH)=19D{&XN*Op}i%N!Wezmo= zWsXh%|Nq$7*mIg(ba6*tU5#pJmRVPacU^5=helL=J#A`0Ux-JE4`ygrRD^e9QB{6D zeX`$$ks%m=#7RU!R47w5&f8MMFbo7xVU$*u;wWz8#HJ=r3zS>=|KCGphDV*9*%iQp zd&F+H-|spk&j28OAQQU>^`k)y2W9L!JRWKKgF{lD5M!F>c>-8sN-DWv45092;L}WT zEX4pI-yr}+Mm%w?H7~F{8+d2XudO+QZ2~&CQZD~mu(n#;8S&-Swf1IkwP3T-G`O|( z2JauN+b3fBa@4*JJj-qSDJ2N&Iv8Yw>u4*&HwgwTqCVT}95miRgeh|=5>6C(`30iU V5P^YtocRC%002ovPDHLkV1iC%p=AI7 diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/door_bottom.png index 6eed72ba7d95defc95b22c026ea1764e665820c6..aacd05b130c4c466d20c21d90e2fe1d6ff6fd925 100644 GIT binary patch delta 276 zcmV+v0qg$g0?`7HBoYa5NLh0L01m?d01m?e$8V@)ks&320001InqH-LV_J_cVu^4W0z}KYJW{ROjV0GYcF3-U^+r`W;Y}|I7TrnHYXw+4G0NII|tMN z0004WQchC(^%2 z`Gj`2re;PbPq%U^E>9^>GgpcCO<-VPcy-Iw6-bGe1o;L3#{w9%Z`Qt=s3=iC(bL5- zL?bw~&zq^mfWtXhYE_u**290#TPbcv1=il1f%*MM(#ktSzDWCJ237Fb7J5u z`@j+9V&A#0onfg0^$OYBoYa5NLh0L01m?d01m?e$8V@)ks&320001InqH-LV}5~IT8~kg zXH;=@Om}5OTVt1NSZZ@qR)0-7OjV0!RyH_mFJDbyIzn@1HzYeaMlmclCn6jd5D^Us z2?+)U)-?V?00001bW%=J06^y0W&i*HmPtfGRCoae!2x1}00;!Ziw#DLRpB=H|DSe7 zV8AwD7_sAj%J^A7Rk%i6^m@KuulKn^jkuvQ>+@G-a^%AZflyN;Z;cQZ!a3qFvfQ$8 zj<`XsZnfwbabsDwELcWdv=9iH7;)h}Gpnka969k(5ld#abL17aeUVtAJ4as4_A9sb sJkNLJ(;R^$h5a3IHg`yE0&4yN$cGL(bKm=60000907*qoM6N<$f}?VCJpcdz delta 314 zcmaFF^owbN%0x@0dUYikLme|-4$ka|tTc0#dSA<#=^=HEk%gr`<*6?5z6sVAZWh`4 zQT>7Gv*N6riqpc(d_udUlcz5&OD+x$<78tK7Z7A%U=Y{uB|(0{|FHvxv%-3> zfND4kJR*x382AnY@k9g8`sto7jv*SsrhUCa%?dot!mWO5?Sr5F`j@{;B%hV(yXkd? zhRPeF5)FbnSK}_nbj2}o*F3=|wqJIW5MW&YZ%=}?{Y-?_6y=Rw5O)t}^|r^cL_wcvTctNQCVlrEgv%dGq8m&UZh t``^P8RQ;S+^oSgIWubFOlyS;K_NdkD)=6SJHUizu;OXk;vd$@?2>^uFg}nd( diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/leaves.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/leaves.png index 79b63abd6683a539931e0faa3d1cdf8c7e3bb96e..5e199f10a2da62ff6bc1590dc4ee4669dad76500 100644 GIT binary patch delta 201 zcmV;)05<=e0*nHX7zqRe0002(-QrS_ZWxgyB7Xn?06~U2Ide2FWhydQDke%Mi45Bekl{?Y|Sx?00000NkvXXu0mjf DzKu@h delta 215 zcmV;|04V>A0-OSn7zqdi0000eEe}(XHYF%Ib2KtoDke%ME@dh~hB^QM0NwG(DgXcg z26R$RQ~&?}|Nj89zofsBAsBywNklOs%+8 zWUVyrcug_XZtI=dI!;IB2=Q*$6@ZO82PiwrtrlUKDXZKr!cabsz@(!&<+cxZ<9kOQ zKtLD2EG~nxlQSfYxM7^}A3*R%r2VijK3^;0Y2E}KXzs~<^!a`a5@HuRR(^S50>_ZP RWitQ(002ovPDHLkV1hhjR>1%O diff --git a/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log.png b/Common/src/main/resources/assets/byg/textures/block/rainbow_eucalyptus/log.png index 40d8a4b769961a5161b48b8b27ad079f182f5b2e..2933666df549bb01881cc21ad1f6600ff8f11eaf 100644 GIT binary patch delta 309 zcmV-50m}aM0`UTnBoYa5NLh0L01m?d01m?e$8V@)ks&32XPRDGk5OA=mrPZQIBPFD zLUS-rEH_9yEK4CfI7To)FeE}7FEURlIvz1BHY_YVC@M-LCPyJ9MISB~Cn6jmA2Jvy z5*HXN7Z4E*2nh)W1`!_|+W-InsYygZRCoae!3ko*Knw#w`4F&$Xxm~MJO6)ZXHX1h zPFdC@vLL#DGv`27-7E#sowqjR){)0TF`UO3@>}(oh53m%ONNZC`v`q9rdC=8r7iTe zIntknbIq&K)qJZa-MP;ApwzFY=DLNm!U<`1YIM-~b|+R%*;g;o?cq)=%|>eJLnK{T zYQkFYA}m8t?=Va~*RR1?=wc+U%KMo>7P=y6S6N;dX~_Bqylo1=hmct|00000NkvXX Hu0mjfRHJuV delta 294 zcmV+>0onfX0`&rrB#}8HRVN}GIzn?yRf}6=mpE%L4G0NZk5OluUNI~-DLNi7Pb?P@ z5iBe_J2*xtDoQL%AtNS77Z@uyNIMAz1{f$3FEURbE*BslG9*G9FhDRNB}IXo3&oKk z7=NuvL_t(2Qzeg$Zo@DLgb%{cIkwlPUej*x|DYqQ5CVNVH~>U9F-I8O(g4bKfp+zK z7(Za|kv7<@&Cf{l0$;?8$WdSoaq>HAa{9BQLQa-t?Vg9e z%C|q?^tG1)SCT%A&L*3jr9$~2e)_C?;zRZiN|DCNm!!$Y0$nmXPgF6j)BDg!$9w)p shM;UkEf?%@SY97?s7kDQe_5pA4_pFboCIpj`(Mn#C!G4|7FBx7z#P&-bXcT1vftp4Z#6)>5c# zJft~aIfTG!h3ZvAAR-XB_mxV-TU~;Jk5xIR1?#TlvT~Zm0ITx0R#|usMMHMZTm`dPE!a^YL9){zmL}LAM5#Lz5N4}&=rg3 Sl%Veb0000>1H%K5B#}8He+>u;F)TDYI7C5BK}l;uT8~jUYcD)iH7PYDazQPbXHoaiw-+j9Es1O*waCQD;*^Q9UhpfKYLJN>`aoN{l~drCV`ccY}^z zK7TWjgkX1Nejp$*E-+0xLUVqHS4>rlIXO=~Kwv;XS!GjfLq=y&32RYjnqI`#t^biB z7=Oq~L_t(2Qzef9Zo)7OMSsF5)J;PiJ6#&Ob(D6n?f&;$0LhlD?-uBJm zXzB>G)VbcDD1<;9EzC(o^x2xyU|_wz=P{Q&oSjc2V0(!)eT<((bFcXe#wmBI6<2av zET22B$0y^kt8C2bDCV0fncR}V~uxKkZ*Bch)0=cRET9}Wnz$fWkYgY zJ9bl4S5$<5O*w5#Ol3qxazQO-HzXKW7b*Y%0F_BZK~#9!1;J5n!!Qg)!N=9A1oD^r zpRxtwK$d8BCfvddhRYnPo!i;UG0xFIg=PpuoFb^v?2$Xfd%mtjKE|V2?sPVFj&z5R1@8R vRwSznC@x+twmB@S+2<2O22^KJ>rjk;81zXkX@we<00000NkvXXu0mjf1%_lU delta 252 zcmVa$GxKh(~QpOptGJm4RTttb@RjAsBz2Nklig)ye7G28A=fmGF|ZtC^$SF7K`%pj_Q2jJ@(XQE7Ybwoen2$>O4*hdk03=K30 zJLmsa$d(5bw2%~FlV(#DWECO|ZEsbz*hYcF3-U}8i_Izn@1HzYeaMlmclCn6jT2nmxb7Cis} z00DGTPE!Ct=GbNc005CmL_t(|0R_PUVuAn+1i?d#TC72o8^Nk@EQgU3KB^3HTucXg4Dym^E`$W+9Jg|N{0H)0F2JhFys#2#xj zqmgq&oEcfREV4%Y#X=xNmdLO0ey+=U9QR>~+yOjeu-C{<5=;_&MDFgcx?OHn{eDJ( d4Ym!Ke?TG=1FiUbd;kCn002ovPDHLkV1nMFax4G< delta 317 zcmaFN)XF?TWum20y}FW&p^h0Z2WP#nWtzE4l8Z;YZ-SLmu}^4sbn^7_l=9w!VrvVx z@>G|)#z>27{iy!H?1-%NS#ia|VQFDzY1vMNr9Ly$Lzb2$GcYi$cxYA!q@+rM{DS}E z0t_Nb47Y%)I14-?Cu#`R&+>F}4ABVIozN(B$biFHIAPu8SI_Ru`SZVDYMJe59B7kM+}yrcX3h;^PFJC#1Sak& zCHJ^z1Zhfdeyn)GXZxG3C1;ryhfeBh(Pi?t{O6mvI<8W3TW#d@%DQrq6%P$e!g<|R xwG{fDo4-oa`Sjl(GVeCNO`X2^+fT+L;;%2Wu~lw&_ylw=gQu&X%Q~loCIA(Jkdy!b diff --git a/Common/src/main/resources/assets/byg/textures/block/raw_pendorite_block.png b/Common/src/main/resources/assets/byg/textures/block/raw_pendorite_block.png index 073d157aa86e19df7d12900907a6ca410f5d487a..f0f0b3927bd658d06af60767722a8fa9ea70fb1f 100644 GIT binary patch delta 261 zcmdnad53+11SbnK0|Ud`yN`l4UY2E=sJyA3!63jV#MMeA4v6%{ywk(h23R%%86b8z zh~3(Bt~~bugbh?us?FC>VLV+uIbG`u_CC*v+-iI^1Z)Z zJFaEs%rg9Jw?Xvq8Pg0;K^5ue#)40R-pJm4%dd7b<;9KP&y^1c zBN4>U%`k(8j0Phrh-i$4+S(di`W^id|3O1jV?;|tP1VpKf}4sUN(Bymo#*I*d%%0| zIrn|fdC&Q-;rjA6lchaBbnLWJEX&bpTPDM?4Ei539ChV;I+l84&+e&Q#)~B8mG%e(VF%%6VF&f1d^IfPK2}NI2ZMvLO<1iAy4z?4Pu4 zcZE31L~~6%3Ongp2FQEnOHgsUbuN<0PpMjeEF(^d|Go5~Di_9Uo5IzMD9S=QED2Ip&G3Dvv;0Uwknj(x}wBgK+H@)w9C z60&;*?p;AlCdLdB2YUd51O2fO0}N)+U#KL8$^E+JXQ8 diff --git a/Common/src/main/resources/assets/byg/textures/block/raw_quartz_block.png b/Common/src/main/resources/assets/byg/textures/block/raw_quartz_block.png index 3853e7fe4d9a1e13d36c908acdfbfd46ceab6b93..ae812ed7f0012d3ea0bd69c0c2263a1bf610c4c0 100644 GIT binary patch delta 294 zcmV+>0oned2IK;e83+Ra001a04^xpo7m*_#e??GCR7Lyw_xSem_Ve!X?&t9AbsgJFyq?eVCh=zf~ zPBhB^005{-L_t(|+6BP@g2NyT1F#gh4mNNNwe$a{o)lS2^B5R?8>HjzpmFs!Bxfp) ze<=St0Lm63t@}A5xKbF1^byi3b+0|Zm>-SN{`RU1RM}Bhv^K9&52;ldr*!b@U#8W{ zVdN%z=}On~1s%@ZeQ#?A!F0fWxBc#ZeVOMMd~c0`x}IA)zQdn3z~6NJ8=w`>1PG=E sc!3IAls^_`n@Wdezt73k+)kf=bv+Jz5SaOHrvLx|07*qoM6N<$f{hEC4gdfE delta 744 zcmVjZ*6U@wn{E)8s0##WC~8u0|*BWcR0|~ z*g88O-t(O2y*$tR3g5nY{p#fll9ZH7`FHO>EZ@B^5D3^*QlV_4i0Wz3yXFng%*=8b ze-`-8?w&BooYeTzc_IS{-}q-R7_%%RZjxpTm7i;F@M7_JI-NmaH1rd9=7#)7jHHQ- zM$dBj{3Ua5ov$E2!{v&_0&tGY0;ed6uDi=LXeLb7QJ&{(wc7mLtg3~G9v?LFB@zlf zRjs6JeG63k=$OH1LJ1KX;ZaMA-&Y(wf7#~tMlb-n_38B%izS;%JY1gd@039jgrS7+ zc;8JcH4fM6)yZjO(o#}TuZIGgw6a~LHO3={#kw3klvrF``m_B*nCFtwkgsQ8JjY!i zA;p9>dTWiZRw|`E_b0JZ4-o7Tvkv)wzn{20Wi(x$gDp`e8Hq%U78~LmmkJ(*f1I29 zEXzXPjfLxqcI}Syqe!a!CtBH5VAxW*R5bSK#3WTI7hLO}t?k{`)|RJF9-B;Nj*Uf` zi>gQp-$g(_ySyt7m$a5fcT9<8K{qU)wD!p4irwAqBv*zEa6l0H_B>9f1CgO!pwjeU zum9sNgOyfvB$;qH5(9hMs_iw~e~IVM9??8=bLqkFaALrE#bg@nP^&Gr$!ev@r7t8D z?Off!?#x=5?}W42#)z>|+rq7TVp6Q`)WYd_>`bkc=Ggd`m0wdc3qnC%t?8m^8UoH4 zCLT`+1D>xGCCl*?Cc&W1EsDmt(16V}mSwY#2ZM)=Z4kpF_FyPdEaV&KQWOXTu1!rG z9f#y{ISR{(Vs~$U{Pd46a0uUUL}C1LCXA>JWw{Z*D zNZuifSh-n_nj5Qz?BPzr3R$V+CUwF+@-BPa!Eqb1vJd(A0TIYEm^1zW0000A>Zz;qD$?o;>HU6)D z6FdP62Rc$wj>>OpkjIuoV)`VddN`lDnaRQ0{k4NHGIbv}{v27G%5?CT_yM@<0cOUL ROVI!T002ovPDHLkV1np&Lp%Tg diff --git a/Common/src/main/resources/assets/byg/textures/block/red_oak_sapling.png b/Common/src/main/resources/assets/byg/textures/block/red_oak_sapling.png index fe0e5ff4c625f05916e59391b54dbaaf99520081..3dac9e44d68299f90b4d503fd0701fef160108e1 100644 GIT binary patch delta 169 zcmV;a09OCf0nGuBEPsDtIdD@h$s!D>9RpfF9(yMMOfnQ^A^^4A>=^(600DGTPE!Ct z=GbNc003Y~L_t(|0R_Q_0l+W}10X7|{C{x)0000q02I3bo-W>(2S~Qx`!WNnYvU!e z1ytu7iRuDKE~ot X;Oqg>e9^ob00000NkvXXu0mjf#d<)p delta 174 zcmV;f08#(V0n!1GEPtpS1IZ!`dnW*9A^?A3IdD@hT0b64G88)uMK%Bc00DGTPE!Ct z=GbNc003o4L_t(|+I`N&fdxf7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-sxpPXfXF{x8 zIiFQDmQyf~Mka_nB78j~y{WG30001fNklIXMQ23S9=**uoy)rQGz0f1N6NLP@QI{-qb$A2ga0m!QjzO=EvejL}s zGY!CUm64P?u1-(zrHy^;0K6C+Iz0w~Vt$_@q$>^-Jzz3h5IVgBW#C}&=COn`jTl8C zXNHSuoKO{8-n|_%jT74UGtP}w|FHxhE=#JsASrj| zn;2i78|6WuSbwfE27zJ}?XBk3#`NRWHCPtXchOoQZf@_)kHE8{w3)^U(su#)8|Qd+ zP3Q^+f#SVZCbFO@&8ur3EDOk(wB=DS2ozVRC&mF}_|i76L^qFm+Tt7uW4~LTFKtH6 z{=1RH^+iNnmiW>}AMdTDX~wc?y9G-6E^l6G`d**cM1QOw*3VlQ1d3^#>`Q_s&K{b{ zYyoACb0iK1Ti-r^s9P*s+g+@?Piysp3DM@6bh>D_P!(Hb)4VTje*F4vT(#XDX{{Jv zo^yQ>k(4`@tIROb9@1pCAg?xDUqpmXkE+<3!xCwlF~3idu6W6M1C&2JF}Azc2q5P7 zDQc*w@+;yQra(axOZqNUkpGF%S{+acFfX?J0~tzB-s@80>Hq)$07*qoM6N<$g2M+1 A6aWAK diff --git a/Common/src/main/resources/assets/byg/textures/block/red_rock_bricks.png b/Common/src/main/resources/assets/byg/textures/block/red_rock_bricks.png index 3e0848aada21c2461e79c695978ca5ceda257a0f..2c95d48e949e76cfb699f3cc19369e44fe142ea9 100644 GIT binary patch delta 245 zcmV$L%{pO#2{M0MIl@UWFyn{gtYAqG9+|>MS9+ v`c5j384dT+?q(Ip3=Ll*h4J%#`p%DkwxS>{$j2MX00000NkvXXu0mjf7eQt` delta 536 zcmV+z0_XjO0;L3y7=H)`0000V^Z#K00004VQb$4nuFf3k0005sNkljtpYh+8279|o@N=j%s0nHwPTkHwA1qBD7p@b7ajf8-TO|%hVV`lAfY&n)G zY|lE&YwYJY^S}50|M%?E^;O3Zr^@m;ydXTwr)S>0|AGf_^MCUfrfdfFFk(fQy-r9%{lC6iRZm4T%&z!1VBC z7_iAIge{1GXrYHmhESR(L%uaf=HpK5H0Cl4FlCEYf;NnZ7Mh){9C$2!Oxd!@D)PGN zIeNU?IQ|$HGk+gp3vSEWaWjG)Ox*(%dxIWEovt!+LlU?qrffNO4Le)0%}Zu4pQhb1 zR-{@2&{Ze0x+RgqJ!gS;Rs-1PWxvAp)$=pW-+uVa>sK$F=3Wpw?caU;>T2%Jx9`85 z=6QYRkpJG?4%**2X{WWkZYcJK`6>y{n0~fO{xi<8YkyoFV3SptvL#w*yiHb}8RcMV zPL*{X2qQ=6c9n3d>}28wPuPMsjGW67`5+Su{qPPPOzrYNnQByyRW=f>M3qrIKXeC&uaqk0wWvra`sg`ur$#opRO}#KS a`UeGECJ{pg*5cd%0000GUG)P5KAX9H5SR!dL8)7UhS}7?~Dj6F(OB+EOPb4G} zJ2*-qAw(e|Fd!Z6E)*0a5PuN0$^ni50065=L_t(| z0R_R^PQp+SK+!!HCX~bnB`Ln}|DT3wBUL1T<(wJT5(7{YB^AdxLV-XD#pKE<-l2eh zDzHzz+U-vDZatM(xK~obY z)ueeIfkJ=+CP{_N`BIsAI@crd1Lt77b_}k|@TPO!F0ecRTgUyPgX|7~82}6}1VIo4 i5g=nXr*$xIPU|l^0!$r2ZI*ce0000ciwY2=R9xW+3M<$vGBqWfJq@v+<((=r`rWU06c9rvt%Pl z0`L=Y`kvlXP2DsRX~oBL7if1B@9e>;#Q-kqIsiY#U3%&mI70g!MNfz#ZcLZ()PUyP zBfQyL9GvmF;`vBTLuwjf6tTbXkncr_;Yq?lAFuzF;)Z2qtvM>9vh{-7!+jRMIh2LS zjxHqtUC(8HrGJKb)8Nk36!{*3%HkrGN(CF}CA;a3>;j;%xyzsM2ba(F5RJn_3?XQD zR3@-(8vr-ibQ*!(iVLb^(Bikknq>|BAi$6kLyKSi!2mx9a>=9rQw@MvuU0eO5HnAC z|IY`%f&dkU%;-8|Qiz-nM)CP$vyWq~o94eIPM6E^{C`Uu9N8^qKfTQ*Jh(QI`J}5a zXFd?mcXj}9?oFT^g(OC$OG!B?FiK(Xx<4z*nOW`Dlb-+p002ovPDHLkV1kYAVe|k1 delta 459 zcmV;+0W|)H0@(wQ7=H)`0000V^Z#K00004VQb$4nuFf3k0004#Nkl1CpX8wO>w1e5>le?n_Lt-&Jv@wdGn>xG?@qe{%S#KLe6SZ%9P0H3CYY&LhKq$ts`@j zz(3-xKN9{07kWzUzV$K5YO1002ovPDHLkV1nI3 B*--!h diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/redwood/crafting_table_side.png index 9abacda2102afcf81cc5df9544296558956cbb9c..d9c2b462914b3e0afd633bbf167ce4647b6fb286 100644 GIT binary patch delta 231 zcmVGqhV0>LB=ffOSJ7c^5Ty`)wRAwU|VNQR_0 hMg<_zJR4Mi{sZ|EGhF{y&UF9)002ovPDHLkV1gv%RMG$d delta 444 zcmV;t0Ym=y0m}oB8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00D(bL_t(IjdfGIPQySD zocPxGLQV)I5JE|T((wWLfs_bQBT>@u4SWDS^pyMnLX><$3WNj=k&x0L9&+G}?c7;V zgx%PQ*~X{Y+1a@{xv{gg@zY!i5s|`*j==Sq<#MjWb6+5xIDZf~a$i)27@HR>;{c`t z>BND*?1ndR)nOu#dtU(~Qi#9P1&oK89}$7t+5iCVKVGr6+>~b5tjh4v#&Tx9I5^ne z1^}Ge7;SBY%((R)=Z`URU!biG_BtIHB3SQnJsKf6y1m6+Jlk-2bt56&#W9A~RyG1wS?ADFY8v86uZNc`!+Vwq z833|k_FOVJ7kFU3M^Y3pVThzOFi!+9MsElz2n>AX?!T^BSNorEBbHKcoQfPEH m)_x+Qn*V|RuCw?WWzH{@iquUdtw+}Y0000>Mmi_2sRtK$R7qE{-7;w~}AXnJ6VC6&88Wpz-X@8#h!MCnq{> z+6V-a>dvzlE?O{YQURND*TT&kCT`py?Yv>(Mj$(IgC>wQVZkDS8HqYM89j##f`pnp zBrUbA8(o5U=1%RM(|T9p6i+J)D{JfJ#IOP*5eJ>r^o;p@MQ+b|7}CpS*RP)aL5>0jmR$7=H)`0000V^Z#K00004VQb$4nuFf3k0004HNkl%GTXlfk2w*1$f{B#5?iq5q#!O#tZPk6^I12X)9Z&!3W%0ijep}O}9J$%)c{# zC$W0};l2R4)mK$6T`_1+po5=V?8ODRIHA)ypGBIzl`Cd*l; z8F^8ltTFV>b$#JAE6}RTD6(v_9Dq2~q&o+|C_0e)oIope)V7aH5u8+YRUbF+X{9)M z?xu|Ueq2jv#(zx&?SoC0*X^E*FB1G0M-oaA;!xM$&Dcx3NC3Z6h(kzs4ks1k$ec{U zBXF(PZo^NdJq0HfPK3_g_+}rX>P7NW{vz}6i?l;f+qayj*~8I#{?s^2uue1Plj*?= z!@;5Id@^O7W+$z-+xE!-!+||`p=)}zMMKm@JLg3~(-!{UZeg=Ju}Ovx00000NkvXX Hu0mjf3`oT& diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/redwood/door_bottom.png index bd2fd46eecaa23a64bbbbcb1f79fb59c14d9dda2..720811448c0e93cb76baf2510eeff69fcd28b694 100644 GIT binary patch delta 218 zcmV<0044vL1L^^g7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000XP)t-soIyd5Jw1pz zI(alSZZR=pEG%6uEm|olPb4HnAt5;&92;+*-v9srcS%G+RCwA2!Lbd(KoA7L-FrLV zH5t(dB#6Wk0WlIS&;uP%E+GlR_YH8&w03@ePM7yJ;Ht`008>B`75WJh85p2@RiuaV zW%ALX_}TzEdXFR9>Kf7kYvXMo)h^5GOquucbe6@!R9530ZBh%Yw3IA^rqHaVr0M%O zENE9*Hme!uSiEjFmtSjV+Ku;-m2r*-rDpU2#B))Mfak8GSgmGpnm>0P03XLA0wDMx zY&Z;zg4Pfptbe6(j$F#y8PhAIpp5h8s!79^&U0+j{w+J z)oiPAj(uIDrTmwb87?LOw(E7YXxuhPyO#%e-|w#jN^2?a=$^`JCQcRU#3^{{%qdt) qiTJ82QX>W9=)r-h{^=h8`~jw9_;EIAfwlku002ovP6b4+LSTZx;=L>Y diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/door_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/door_top.png index 8267d6a19b8ca21ea8a9b9b3c2dcc2791a30e2bd..188e5b5d808b82ff916d7ec86c627f722973026e 100644 GIT binary patch delta 277 zcmV+w0qXvg1f>Fy8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJclMoK3oD4an- zkUc$!Iy!(eGkG*LZZR=pEG%6uEoLbxJu*a3BqT&3AulF3IUF1v78Vf=4Sg9K8vpFu^7P`*ywT?aXF~17*~qtxV98`n9TmV{oDF1*k8CdMv4(=hHdJ@ICLrQ`@<-% zP-X`SfIHocouaUE5$W2u3UrQtx`!smcIKf>xo0C0WshX>Q>C_CRktytVR; bKVSc~)IIBdK@P8300000NkvXXu0mjfo?&Xc delta 517 zcmV+g0{Z=>0+a-h8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00GWPL_t(Ijg6DPZ__{& z$3Kp3#b8_VP$5Oi((IKgbzrJc)e)9v@87~-fW*egh*-kZp#laZRz{G@(6Y3}sgpQA zY~R^AmBG1-6BWcwckjJ>_ul9G&U$@#crTQ~vu%V@=;hhA*?(($Ge$_sO`hX?OH*b= zVS+QI@NJt+DYB{pz;|8zRYGm|T^9i7Ac`Q05K1AW(h0c3pu`ir#LIMN;;st&%66hfs=RYr^NS z+rRlW;v`%$Eq~X1bS!{%y0>?)88rI`9%KM86vEh@gD66TA)alM=DF$fUksYOS^#hF z#sl5g|1i+J09s83+q(C5du%VEl!?u%3J2inDDGpy)yKKF9Y68f{noRe_Le~4s#*nYh*$b%N)ZdOarwjb^~U9o!(rXR_xXI|GmV7!>qq*L zrt2g{f$#hEAO#H$O%{RUnDbGm!>fyn`dk#e+~4Q@)fImL`e9e?KBhF=00000NkvXX Hu0mjfjI9UW diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/log.png b/Common/src/main/resources/assets/byg/textures/block/redwood/log.png index 86d28678b3108e90b439f5a6faec591bcfc6c18d..340aa5b5f5026791152e7eeefd7fdc6b9ed2cead 100644 GIT binary patch delta 191 zcmV;w06_nY1J41F7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000FP)t-sTsJLQFe^?g zCPE}2GantmouVQD003@DL_t(|+6BR}4Z=_m15n$E=umt#v_VXg{R>7Q10elN3sTH` zc&^j7X`}jvK5#^%@H#?IeDM6;zZX?txGncsle5G#N;Tykqc}har1|F160E$QaM`F>);B%G?(J&O{k^ zEXAorxE)rmK6aJL7z2Hbm^M;Z5fzeYTIGp|P5A0x$SSG_GP~x*=|VEBO_cgnDnshr z0}WZtix(2n-5|9QlKpF-{4gE1z5f+M>ikhleKiN|A4{qIjkZ0tZ0-0eG---41~(Zl b{fqb)f1TQ}^nQIl00000NkvXXu0mjf{35ik diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/log_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/log_top.png index e2ef30b484e40bce76800a1392ad58d9ab64f277..85818b343456cd2d1b7e9aa430027729c624ca18 100644 GIT binary patch delta 244 zcmV7Qf=yq^NJ4Zw$!+a#CaBt z%Wt1orO_BaL_|%8(eo0M>EIF*B|hQic?hA|;x_S+lF8sECJLNk{IV>e(Rg?wBGcpU utK+UTJzR_;A~jr2?WSsLyi}o-E#80Gt3SVVc+bZG0000H_ljZ8r)%`H_f@&2OU0AIQeAQfmulJoW^!Jkr)%fZ7uFWrsd&ih(ZjUjSB zC&zU>^2>XMGn^|mrLbBv%rlOx0f5z-zvBqN&wLj61@@=5UG5q64&eReB|`|cO9|eK zuotO`r$_*Ht$!9=qp@0VR0ep6k%t&JXbOcs-*=k~d-Xr}B4j?--@R#)h(+~N+ly4L zRgV=-$YcET`pOUj{S@j1ijeE%H3b&}7(umKV18Siuo3N?4Iway@EE3qz$yhrETxvk z$(r28BabUY8wz8H^j9q$4%~U4mZS)_+PG7*NH9!hE-eu8`6MlfDSMn;BF&wAH4yfNRe5gS-gujVP?<5VOYnROD_FtfSH~k7(^G- z-CM@t?f!5gXti8d%_j&%il!Ae>p41kLkIr&C2s$w=hk2py5wTVff#HN6-lH+EJbos$W8Z8clX_W zn!GO-XGYRn3qUF5jqUa3bmF^hkpP>nLpeupOej)j8HEr4A%7P88m$44y|px2Q)XH6 zP&pTpynozas}z%EU7vwa*>@b<${30)Lk&f|E??*K1Sdc{Bz+wYyv$}H?spRB%g_Bj z8QWux$BlF1sd{6O+PUB?gh-OMO3_=(G|!Vqu}qeAefId`t*cRDac2SmxvHugZ2sQ= z@t`$^Uu!QsD14=4-L^^hcpq>*?a#;uT!`c!c=7kw&heDzq4>C{DndY{s4O06!>$iqa^?U002ovPDHLkV1j1-xb^@5 diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log.png index 8f09743bea644a74888a30fd3bf695a3a00ccda9..77ac675cd80ed7b3ab9f83b48084031ce7e6fa85 100644 GIT binary patch delta 188 zcmV;t07L(u1Iz)C7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-skUc$sI5>GU zG;T35Vk|6LDJf?o?$!VR0BA`>K~#9!1;Mcq0x=K+KuJUHGYx-z0SFB!*YjkYE&cKbq&p8+WAcCu&59>`Hp-rQ6{Xrd;p?lq9rP~yAKKr_Z!X%Ty5 qqcuwvvxNI9dzQixb5hu8Ea4A^COBK-!)%8D0000M@bIrS+4!|43Ed+u{k*wta>>^x@p|_Tp zGrI^|N>2jyK<^;JbY|6aF@|{<3fVseqjSvO7m_t4Cg)19-uDEx3<(9b1nf2 zSW{}i8r!KkQ-5WWdZ2(Ur9%2@W>*7xYfBl+aWt7~Q|nfCHT&dT1E_(ud8*bMgRM=1 zr{mfxCDV*`oO;%Uv!`oi&=Nvp*z_`iYo)q$;T~fF2az(JYM9Q3maJ;Z94NCcje_gU vx`hhfQurFXONWu015yANkvXXu0mjf&c?Gw diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/redwood/stripped_log_top.png index d7dc38411a645adafd5369e32c6c2984263d5126..b2d8cdc0db2ef48c69c714999d79e8452c318af5 100644 GIT binary patch delta 214 zcmV;{04e{i1Lgsc7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-sXf-f(DJgI% zDQzYuUMwqKAt6&89XlEtFclRZ4eoXT004POL_t(|+6BQu4#FT11<=3oKAH&!FnR$) zhq5R9&H)N#t%lCA`yNCzh)BZy#`mLYM06j=;SrzzDscQs`wBP0IlZ$e7rUI5c(5t4r2=kWoiuDwtvNm42mpgGo(?aZa#S0 z?+2T%>+q_$5<$!X+*cJqk6>y{pIqGZ@DDnm<3l*TKAEs?+gww82yA2Gx;ygRw)hL2 z6E!D-vo^0YDQ7M3Uta)h;+Wtk*mu+EX&q5Z5@WO9<72Ws41h7YXo&=11h_RObIp3BK8Ya!FQ1=yRqBIg z2NLJ(ks3n!B8%6l-dTheA7z5VYSrx=1|v0tiB#5UKwyO{t0002ov JPDHLkV1flGzzzTa diff --git a/Common/src/main/resources/assets/byg/textures/block/redwood/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/redwood/trapdoor.png index c8c8a4066995d2467602696d4504a817b078e842..98672e66e4e8a4b7d7794bd3e1f5e0f2fb7c5a83 100644 GIT binary patch delta 269 zcmV+o0rLKb1f2qq8Gi!+001a04^sdD00DDSM?wIu&K&6g0022qOjJclMoK3oD4an- zkUc$zJ3ELvI(alSZZR=pEG%6uEj=;=sxxL}J$zdBI!9-A*5jka;dM*}T7Yy#w15j$ngCE20<@B9 zCeU0I`2#Igqbh(FFuUjXIgggT&TZACx3AY#j@njglHSH!>NZx$-cm(6OYslDS2s^k TcIJgRIC7NJc`na!-T z&Fn`!B)e`(ZQj$&@ICX*yzfly{n62ijpoZG0R6o^sr^yiBU_8SdS zk+SHAF&uWgL|S9>oJ@r8NkS9^gi4ilU$3vxiF43s5Gq9~!eOU_&2v7b4FD4R2Y@#Z zyJRB#cCM^VoI@9#3wUZ2pg3Qgj)#LGQSSlqEat=6{fRiwtH-VKG^q%>+Iec$Ai!`i z1R$Qp0AwpOrhf?^e=#{e=n`8CK%HB36TVH>dqSnC7gs2p-UX{xur;rz-fzXTtMg6O z!(e;IyWrwsL_xrp`5fatZ%2 u^`6tsw+67z5w%)a=XloZt?M>#2jDNtlK9`&mH*`c0000o>+m+ri6J!zc6Z4c74lOLyX2ev(O;okft z#W1+-5exU`v}AJIN~+n|m_Jjpt~m!doFXp4QGoO-wurZf%MV delta 455 zcmV;&0XY7J0@VYM7=H)`0000V^Z#K00004VQb$4nuFf3k0004xNkl9l95CZ7dS|eCd$d_(I{oIFD^T z{}(^WK3*-yZm`s4!J;k!__k_UUMv9k{_BqA#R5_0+;sy#x_{rX_QR3v)4QwjjeJIc z@t)2(YNgOZ0PwT#0jQNC#jZFYMVW(#&#M&x`tgz$0^@yb0r;V2Y+Ckdzt~jt6 xE!X#Z)}zJhjO+V7U)v2b7(SsVl;eVGkst(YHBclUN(PTG<#q)d0;So zT{3)JGkaYyW@j#TUoCB8E@@;gabPTKVk~xBD{@^cY+fm8UMO}|EpS&bVqhg@T_j>& zeJqZp-hIF7-KlQ zEL0cHE(kY(vq69fN<+avxPtd@UV}wI;M0e9P!4Mm zh_Nl*7HpWPgg96X1ipU%17$$~nhO{hIN3R&ETAL{MEV~Pf&j>M6INbe1aqJO!+@W^ ze}01Lj%@q?U%!3^vp;`+52pYB`2?ns0fqrTetrYf|Nj1A`0x?pcWF5lFwMs=1g4Pz zh5-yvXMg_jm0|Mw2aHLc!vD)B?FBpg!-qFuIT%QdRrwD$peR-w9AK|rJ^}MTfBgui zxp?@%GzbVwNJCi=&9fKZL4-$~zc@U8e+v_I;OrnrE-*XT8A8KAYK#h)4|f49@IZiv zUl2^!=G*?4l9dOuxp{cOGze5=TmGND1Y$ef02z5DD2svN&3i~9`tao=0|yTenEm++ zBt|0qg#UL;Jq~v|+<@L0=NMx{Wx&q*@#hyqN{s6N$#X9;e)#kOEYHHh0j7mTe@>Mz$aj!fq;y(BAAwxkY$jSQ3kWwc)7ra ff;n)&zyJU{U7hIqh4!WZ0000<2SrXqu0mjfZyD^i diff --git a/Common/src/main/resources/assets/byg/textures/block/reeds_top.png b/Common/src/main/resources/assets/byg/textures/block/reeds_top.png index 386e544de3e0dc193a575d3ab4a4d465cc149b01..0ad3cba757f125d1d0dddb3e8bd776b4490d48eb 100644 GIT binary patch delta 223 zcmV<503iRJ1D*nq83+Ra001a04^xpo7m*_#e?L%6R7L;){{R30%%yO|plidRY`mFg zx0PhAj9;sRO00uLkZCQ6XFi2wJceUChh#5*T{d@AE^t>caZf61OD1VWB9}B}_5c6? z0(4SNQvd*Vlg&5)003G^L_t(|+O^C(62dSLM8Rz>!ixZz-~G=@UpeU_Yym#jfhR|YqIE?e}@lQZME!ODdP Zg*V#!0&r~vD3AaE002ovPDHLkV1l#eS+W2C delta 352 zcmV-m0iXV!0-Xbp83+ad001BJ|6!3fAdw^#e*rQ{L_t(IPh%JbLj@dOkn{h{(t`g` zE(&0R(l`M~5MMz8=7AcqIo01j4GhNBB};D$W7ca`DF ze}!WVAX_D66~SJB0kGk~@L1au4^|8|0OZfZM~*P8Y4HXNO311)fNcHv`3Hkd!c@k6 zhi-s`!7jaj?-s+ElZP0BOBRA%1U3NVJdiE7AAAIH!J0T(|G^dU@$-PiLEgIa@F|0= zvJsdM0`OP}t=-1>>dRLskAdO#qn}U~N&|zCumG3_Sp+hei<1@12LZSNAi&SY24yiY yNJ)x8Squy>Uc7;_7#O6bWEniO=RgCLfdK&2e|^&ao>B$?0000eIQ|zNE}+ zr9$OfcTq6mPF1|TiD=>S6Ry_fIghfT_6Pov8(@4Wf!!mBUuzs%$p+qdLQ_EM+d9vx*rS)Ft>1_p-w zv}HGe6i-QzU+{kfU=X^0?%YI0iHc-T7sn8d;MCqop#usW&R2IO6#f4#COA{?=LDY< zhh4543Z~58s4;!EZA5T(noWl0^|y;I-uKX#Z~5A8Q!lCXM8&m@^%oNh`!sWwP0@=k va^)=E8``^g*OjhU3I~oT@incy9VyCZ^qpOghs*Ikfikzm1l&e^kpMH<4 zOOu^^j+u9hpizyObcK;?gpg{3k7Tgb%N_1@rx8Iy*wYjFA7Euf*_c!j#&@4=3W zh*1$WD(_1}3;FU`By=L9SJ xRKzzZ0;@ywWXeBx>{Uo`0uJ!?P=An%{Q-O$6^md8k8S_}002ovPDHLkV1hHwqMQH# delta 364 zcmV-y0h9j!0*nKYDSu;QV*mgEgoK2Jk!x0DICFDzPft&TkZNCh6Lf%BVQ)iidQhII zig0~Xj+u8qP6dmgQLe~oq`qQbZ9zCi1COgqcY|A}uauOlSfHwmQeQNUm~@k!e3hSm ze28InfmyG(pJ#MRgO6#fw3}&mOj~I^RADxwtB`w#UwVdKV}Ef)oTiA5yU_js0007X zQchF<0OhwZN&o-=wMj%lRCwAQ%{77qF#yECmdEY!F*7s$|3jNEGm$T;PzoXhfC>W9 zR-$%hCy~9o$G*e?IcICj?jeVu0;9U1)%-O0%wDhe3)&AC5p>2fb@sO`mW)my=6Ws> z=Sp+N3R1sm%Vi6@A8Ji1uXGc;JIJfFSe#gXpe)aij?VKrJc3Raz-WJ7ylTMHK$O}( z#c6nM97@~T^xr+io8PyA57>%>K$Xw+`Nj8nBA`9s2Y&wml)M2znk}~6b0Bd50000< KMNUMnLSTX>#iwQf diff --git a/Common/src/main/resources/assets/byg/textures/block/ripe_orchard_leaves.png b/Common/src/main/resources/assets/byg/textures/block/ripe_orchard_leaves.png index 4d98ec9176b73dba73cc62be0b8d873203163426..1527d7fc06a8b27dae186da824f01f0dd9976d77 100644 GIT binary patch delta 205 zcmV;;05bpZ0qy~iDSrR}0LHqmsF;c3U}=bTWO-#%+axg0Aug#KC1DU1Jsk^~E}(}1 z0004WQchC}8?d)2ZJ|FyLS>nRZ6Ym_XtVF!Ax6{6Cf>Pk2xuGQ-S-AI zogLwALTSHqWf23!p8Y1;2w|bLqgb&JvOE%y1x6CI4G8}M$MXX%|N2*L00000NkvXX Hu0mjfI7Ls_ delta 207 zcmV;=05JdV0q_BkDSvroQvd(}Jsk_En2CsWWX8I#VGtGKU}@VVFwY?_sT(DeMx-SG z0007XQchF<0OhwZN&o-=d`Uz>RCwAQjRk@LF$lya8-|tt|M#RVE+GjQ%1ng*+uhBG zBeh}g=Ut}=ZNonAx2FY^xbOF^1)|67ZYK%klFX1=nc=^cNl0i*G6$bZQe`~&99lBs z!3QO)Q#_1L^0!;d2xN5i+k-8QrIRedj!mg`nSoj&Z8?Xa_zT(>18&D)6P5q~002ov JPDHLkV1gavSk3?d diff --git a/Common/src/main/resources/assets/byg/textures/block/ripe_orchard_leaves_overlay.png b/Common/src/main/resources/assets/byg/textures/block/ripe_orchard_leaves_overlay.png index 1036dd0a2ffe37b1955b15cba1cbdf65fd6574af..26cd844c1935780c345bed37a54c2b57777ea282 100644 GIT binary patch delta 181 zcmX@Xc$9I1L_G^L0|Ud`yN`l^6n}tEh%1mjwrkyr8J!)aDV3?gO)ow#0SYme1o;Is zI6S+N2IQo8x;TbZ++sb*$mpcV<8aVi;eZ62L_`BWi$m;xpL>ET_v5AfA~QYND^`26 zZV=btn`@MypuXdrURtHnoM=FVdQ&MBb@0F|3UX#fBK delta 184 zcmX@gc!F_)L_G&H0|SGGE`KnP;t%i%aji@RF;~p!>?ln+wrkyoD(+AqpQ$9sFZe&h z)9nUcKwg@si(^Q|E!)0U#sdsIhlC#dpZ$DwHRF{d(_ZAQHd$6Ed2hK jri|Zj1h;Dj%(Y~A@|1DEe>IZ>&`JhRS3j3^P6rk|gmnVFfAl9G^+kcfzghK7cPgoJ~FgMNN~cz1Yqc6M-Z zaBOUBY-?+1XlQ0;W?^7pUteEaTU%9CRor#w(*OVfq)9|URCwA2!2yB;AqWFNl;sQ| zD%k> zP$ey&E?u|jR(zsz2ED$UFD=bUIS*0YT;{<-sesb(OcSKS>B__m)IYzz2=NA$n&3 delta 266 zcmV+l0rmc<0;&R#DSw58gnoX0pP!#-XlQ0;W|ESUkdTmgcX)$>gPEC`aBy%{RaIMC zTXuGKh=_=6Y;0_6YhPbqrlzKbhK6BaV7!;nasU7Trb$FWRCwAA%t3;}Fbo4gC9x|- zU^jI6|67;aoCX+ku86z_LpufMC9eIWUT+rRzQ>8a*~iN&*nbHRRl-Wf2cI&pHa(s> zTgFCisl3R)zE7g%oJov0t?~x>{qjDc-Em|A<4KhBNy%OZ-cuzYWsIE0T`b1?6?MG2 zFR02!?zC4vJ5jv4#%^Z4Z+?m2NjiC`iXf29Qn{q^%rRiur4u!VcB}pYS^fxUTuvO) Q00000NkvXXt^-0~f=gq4UjP6A diff --git a/Common/src/main/resources/assets/byg/textures/block/rose.png b/Common/src/main/resources/assets/byg/textures/block/rose.png index 2d652fb96c40dd4ea3a877f8b5df011412725ff6..7eea0abb0537f18e30038cce8670f1de89e51712 100644 GIT binary patch delta 174 zcmV;f08#(d0n!1GEPw4>VeMC3c9$1&kr(enNZUI=?=m<=cOc~!A@>IlJ6|2|1PtH= z3)ln;(FO_31PUig8?pllI6eS>0tRkByq*9600DGTPE!Ct=GbNc002QrL_t(|0j>aLp(%&;S4c07*qoM6N<$f{E2X0{{R3 delta 177 zcmV;i08anX0o4JJEPwAqNcRU1?*t6(Tw$^U3FQ_c(FO_N1Pgxx2JbRB*aQpPJ3!0? z3hh^1J6|1kmlrrb0CJHRMRy=4N*n&2FvS1>00DGTPE!Ct=GbNc002ZuL_t(|+O5pB z0l+X2L(v~*&i<CW fX+2Mw7qhqlh6n+D3s)Me00000NkvXXu0mjfg#SfX diff --git a/Common/src/main/resources/assets/byg/textures/block/scorched_bush.png b/Common/src/main/resources/assets/byg/textures/block/scorched_bush.png index c8db6a5116f0f4ccd8fd1df351aa435c296d156e..ea1912768fd3b7ff32095fbb5edda3833f35737d 100644 GIT binary patch delta 236 zcmey*w3=yxBnLAC1A~SxfAB;*@rlZE_2B_NA+A87=&+>lpt!KW*wBEO5dY|4zocPBqLM_*S5A7?u+M;i|ZYj@#rTQfr& zV|_~_Jqtr!a|0c-&vLEeK%*H;g8YIR9G=}s19Ad9T^vIy7`Gn0F63Y!;t+Q5aHvq= zqV6C6-)`H(j~eriq0o|9}xY>F66i!U%`y38(!6ybPOb1+lvQPrVB=}m>I3DLO= kpN9p`T58zBbv}`OeJE43`Ip)MfQB=8y85}Sb4q9e0Aij_hX4Qo delta 322 zcmV-I0logK0{;S#83+ad001BJ|6!3fAdw^#e*qLpL_t(IPh%JbbO0XC{{Nv&tbhqh z;{-o`{D88s1H1-=1;+mW@bNvA2La(haVRdrYryZ{zZouEImHO&g2B(9KN-x8Y_WUG z$36Hz$W|zqA;drWe{@(9nD1!g@jo;m216r?3%2ZB%lP2IeTD$?y;~Uq2bnT{?kPE!IGEw)6VW&dvc2FfJ}`xMpiJ zNBm&`11u~o4EvAlVEpsv4+9$;8-tmlEX{vc2cQ3ZeEd)qBmhu=fdUT7MFR{B00<3Y UzY$b)rT_o{07*qoM6N<$f~PK!P5=M^ diff --git a/Common/src/main/resources/assets/byg/textures/block/scorched_grass.png b/Common/src/main/resources/assets/byg/textures/block/scorched_grass.png index ac92820fab458c0eac9335104419824c8c77a8c6..e4360465340bbdf23c2866d2727bdaec6791d5bb 100644 GIT binary patch delta 182 zcmZ3*^o4PP1SbnK0|Ud`yN`k<+DS}Qk*${t@Ck8!_UzfbsmrELm|b1kT%214Q~_ip z#$@=o2iaLW^LNO%0fpE~g8YJkG!W!1W1k45d_7$pLn>}1bF?zCaY-tsEnK+JF>4`@ z;=+}Q3mumxxMgL{aME!0sK`jtoFO=CmXz2!fl~s<0%i%`;}gvs!PC{xWt~$(696zgJ}&?O delta 236 zcmV%bxVoU~#7!#Dn03gjETaXO_ z*=%BB%=qltGpGof0U*y1F!)&*?AQ zz1ST!6Vu#uOc(DAtm$-@vpM@Aa?xu2ZQnjKpWm*{Ipzopr0HGE* A2mk;8 delta 136 zcmV;30C)e$0nP!C7zqRe0002(-QrS_HYE@`5C>Kr5@jP6NEZ!1`#_D6AsApwNklfHE=kVSUZxpKTLz_w;qwi8Vwjtdx|1CX4E&wc8W{pViG q6}xVb%b+hjnf&THW1$raZT$i9+YV9XT2N;I0000oUWNR2K; zu!8J_ToHH5Kt;^l2d08u_eNv&IN*Q0f0}Oo335xtcDb>oguRa#JYPTDrW6zR59M?K O0000z{QMQ7+kymVfZ zhR~1cCkcKQ`X?8>_Hj;W2=I<)O$?C>z6+eama+)nQAN*0UR1Pg5F`3#MP|0PkPy(A ki;6)r>E_TGSq%BT|9GnpXiTY9SO5S307*qoM6N<$f;-JbJOBUy delta 167 zcmV;Y09gO?0rmlqB#}8H6G#^gRvi*$BNjRk2QCZ+NQu&8ks%m=a7jc#R2b6@%h3^p zAPfb-7odRfv;dQ#fN)p<3jNn~e(x;AYfxq5H65Wh@e(`+1)&eGpIyM7ULHGuRQldE zBb;a4bD*0Yj#UAcRO=+LBAM=iHmRPMz=U2F6B?W3>DSja#>eOsu_AzuD&F4n4^UkW V#_avaB>(^b07*p#PDHLkV1oWEMDG9q diff --git a/Common/src/main/resources/assets/byg/textures/block/scoria_stone_bricks.png b/Common/src/main/resources/assets/byg/textures/block/scoria_stone_bricks.png index 5704d5b714fce3f997bd4f12faf91fd9b81b117d..5c97a5cf802c9e4c9114ad0925054e8d0aecd2dd 100644 GIT binary patch delta 169 zcmV;a09OC{0rmlqB#~bgkt8C2Wg`|=9TG?v4LT49E(`@I2?KSfyS4xT0BuP`K~#9! z1;Nn)!ypI*&~pPglmCEqfFc_NH>mrs()aK*NP~W0_UH(|U`=D0-XN)DpXlMeD<_t( z7!iqlGjhEfb*k#rL4#f)5DfDAnh+s+o2Wz0CX5PtOyMAWMXF~YvnuNxUD*57KEL_{ Xhwl=JJan{D00000NkvXXu0mjfaWF)` delta 171 zcmV;c0960>0r~-uB#}8H7DyKjWg`|=9TF}K1v(H1C0@Ee?Q{S9 Z54~Cv+S?vMK>z>%07(Z$PDHLkV1j)vNG<>X diff --git a/Common/src/main/resources/assets/byg/textures/block/scoria_stone_top.png b/Common/src/main/resources/assets/byg/textures/block/scoria_stone_top.png index e8a4e24da535d847deadf59cf7eea564b49e17ab..d22730633dd945873ab72be05cfa07979e1b9400 100644 GIT binary patch delta 178 zcmV;j08Rh%0q+5jBoYa5NLh0L01m?d01m?e$8V@)ks&32Wg`|=9TG?v4LT49E(`_A z7QA2p003!8L_t(|+6BP@0e~0rLTnB#}8H6ILA(NEZz{5C>%=7A_10=*Zu>VYtq`#Ve#c&1gbz)CHB;*5UxW7-KxPKGf#FkdvfWT0< zDOhE+YARPcBnIa5nj(7tqtlZ8O38r-EJ&S)Aa%8|g*C6}5NxXwfLf(e{SP^!4;0(F Sh%5jA002ovPDHK)LSTZ$twTou diff --git a/Common/src/main/resources/assets/byg/textures/block/shrub.png b/Common/src/main/resources/assets/byg/textures/block/shrub.png index fe3502c9d8d456a3dcd035839294cd97eb43180e..92623b886cb429ff857f7c67bb86a9eb99b29eb8 100644 GIT binary patch delta 214 zcmZ3>G?{6FiV$akM`SSr1K(i~W;~w1B4whYYCQu3L%}57oCd>`BIAHeova{r&p36b zP~B)386OLA7X$uPeg@1yMT{jue!&b5&u*jvIeDHgjv*C{y$4SUG8qc69DLO*DD|IL zZJM~h(NFJ%0uDAYk1z80HLMIZotdR`YgO19H^~KF!LA=y90&=FJuNFYORFoooWZ~N z$qLKkp)*#!n^@}haP_T~yJUGC?yBBA`!Jhtclq@A@3lLp%dh{w*T#-*DpT^KLK6$1 O)eN4lelF{r5}E+PWlt3V delta 222 zcmbQtw3cat%0x>gn}AH6lp^DTNxC@=hMsZiPNBLk2K+u2;?XWLSwZRy3=AJPJ+22* z+$BMN!T;fa!ONfV(?msy`Z`Y+#}JL++`fx^&Wb!vjY)TZ{g=1-@-8!SF`HjB^Rwmu zn(oNByA@YZ4$$B!jdNRhkW=OBEC_eD(uvQpwz6Z zk^a_m1$4C|^9;To>}|1BV75&$zbs409i%=OhN!iVXU>d00001bW%=J06^y0 zW&i*HV@X6oRCob(!9fCoFbo91l?oc#Bpb>9-|C@N=z$sBP_=@KB5LMQI7w3}juYLb z5r1lG&PohLXihRQNUJ12N8(3$WG43~I*VXsMBCA2&4`H1#E=6n-Y?9y6|={J*|MVh Y0=~xu3MI;~H2?qr07*qoM6N<$f?@7r9smFU delta 259 zcmZ3+be3s?%0x@qT&Dn^5LX5UhAk#Xr>HFXwf)b|!rxsIQ)bxyOl2wV2|VM(;1R?S z>Biu*G4K7`b?<`&{AbUey?pud-Me=mK79D`5-0S3lP z2cAq+l&CNAba4#P2#!4y$#>X*!}Vg*MnlOLBH#9373x{M;{EGi96uB5y%`P|WjQE1 zteMEXf^n*K!P+YpMhpTQiuf%T3jCfOsTT11U(7Xbo(fUHd*4_>zVe6Mo~96c<+(fO wGf8Xf1K(>>eJbjW)N1;BIFIiz_|0h5Bw(le{p&}d0~t6xUHx3vIVCg!0B@&y=>Px# diff --git a/Common/src/main/resources/assets/byg/textures/block/shulkren_moss_blanket.png b/Common/src/main/resources/assets/byg/textures/block/shulkren_moss_blanket.png index bc3e2f97dd78683153c214edff20b46decb2861f..d4281e3f91d32c7c3ba8d66fc0a2e05e9d62ada6 100644 GIT binary patch delta 182 zcmbQr^o4PP1SbnK0|Ud`yN`k<=1ELck*((s@Ck7R3h5p$m)n%VKRJ-0(o&*6?{uKbLh*2~7azEkL9I delta 213 zcmeyuIF)IF1SbbG0|SGGE`RVuGX-6t0G|+7AfKVql7Dib+@=iO!{tEU>vfF&K#Hv- z$S?Rm2rz8kzhwVJMTz<$$weKDL-=5S=issFlPGiFY$-*k%EK;V|*yd@y_ Ndb;|#taD0e0ss|nSbqQj diff --git a/Common/src/main/resources/assets/byg/textures/block/shulkren_phylium.png b/Common/src/main/resources/assets/byg/textures/block/shulkren_phylium.png index 8822cd5c2020e55b074be35ccfba8b9abd9d7428..b5e20c858fdc0a0446b620ef44841381b653d725 100644 GIT binary patch delta 273 zcmV+s0q*|m4zLW683+Ra001a04^y!=0R@pG6@LIZP)t-s_WHf<_O#ySq}AG#&Blwx zzKgS~cUGfTR-aZ)nN&rYR78|ZJdaB|g-SYqNi%v#GkQTSZ$Kz#JE!Vqubci4bO7P$*0#986Wr?snbt*cjH-o%ICyONOqA_3x zmss7(MMrSwjV|u=z4>+C;qm|9`~L6y|9^&Gn!Lf-A!ALtsWHa5!Sw_a39(!CgIXii zdB%TfF@bOWJ}}ZoSeHCMTiDw^2804I5I9{HZole_7LEYLEIPu_q~G8}&qk3%)WdA9 zb=#|jehB13rzMXXvM%L*2<=qFhOKe{1V(ri8m$^)@LAe)4jIb@n7E@<-L!F5_+Q97MiVrU0(B|x8s-jYh&-1+Ho)LP&dyt^Ut4(4;B`S`C-U7=aa9lkKA8adUL0sr$tbeci%1oEM6JWbq3_t^ErS1 zb7R&kOFJWQLvnunwy}T9sUQwawq|df5IIA0000cO~^r5gF=*G`R;J6ielG20X;q|ks01ldg=uUVNSl?c!* znlDj*ku|k^czeN5Q+k-*=EZmAj6(+VVj=9&+O0!8XsQA05s*TK`*kXh5EBPv@B*9x z+dOCNKr(oW`FCV9t}r|I40;`4_E+{aUDNA8aT8*?6lVcuUBJ8ZHkOstcAWdj0A zO<6}*5sJV8^Cs7RZ;%EcGu#`a0|HVI6dcfhOj)vF$6B}ER+-jRf~+Vj5&b{NfCJvi zIPl@>Sc&S%#yHXIN=np1vzg%Dgj51~W6s8T1+-qwDTpOts~$b(IQjTK^Aah43nW9) z{%?g@Exn);;F61IT~+=l%KGe}hw=i96z&27AQ_AUD37PLwmGnaXP=|mx4A~*&=Afu zE0yrBrLmZoKxk)?Eq(CNxFvW;?bsZ|NHx!n$My$g_%CvY0#)4r0000mYA~0nd?`S;}|* zaffGhu;?_{cdljjh|T$QqRQ|6W6M*@)dzY*5AN}*+V-d+<9#E~qt2e6)9yzcpTfv+ Uv|uCeBA{Ump00i_>zopr0NUj~`Tzg` delta 179 zcmaFF_>Xad%0x?9N5uf25LX5uC^lrMwq+Ealo5xlqipy&Yw9;ew?l2ZRSdS7Ucb>LI^!!CaE zM0A`#x7Y*b^e@xdl;?y_*x9I)9&#~Zl0!VhkqZ|pXD?yfRh-n>k$YgS{02XUPt5Z_ VaH`DJYvl*I%hT1*Wt~$(69BYZMqmH{ diff --git a/Common/src/main/resources/assets/byg/textures/block/shulkren_vine_plant.png b/Common/src/main/resources/assets/byg/textures/block/shulkren_vine_plant.png index 56f3a77c475f1585cd242fa3f56959dad8ec845e..ce0f880e1957e05bc3fda78104d2731955099366 100644 GIT binary patch delta 426 zcmV;b0agCe1n&coB$HtQ6_F$zf5T8rR7C&)04~IMFTi>!yL2YGaU-^FAhc^AvuYl) zXdSU<8Lnd&tYIUhW)`bpA){mxs9YYPVG*ZW9iLzuo?aH3SrwUB6qr{NmsJs!QxKF= z4wFy~kxvYeP6&)k2#iVxi%JKJNd}5Y1&Bxmh(`p6M+1gM282HXg+u^?e?tI*LI8n5 z0DwRMe?I_yKLC9`0DC&VtN%;S-fASv66f(%u9&ofsyCu?~3A}WfzSFMOI3!;qzOF*pESd^j zzTxaQwxoecP5Hw`!=|T>DxrS(bNlg0ktC!r+rO%D5GFuuufE~20Aiyv%V^ApzsD(uj$=^|7j`G31X?2odD(ZK9D&gn;J%am1N!_F ULsyZT0RR9107*qoM6N<$f~#+#82|tP delta 522 zcmaFQe2Ha(%0x@q`eOk;A+8Jz4D8*W48?{F)wT>ph73*4g3F_2H>NXG*)rtoF;rQL z%m`QBmdD)YDzqYop}|3JQwBq&4MUlU{N^lyDM1XSMog_P4CPh~WyZqOL#5}%F*G_V zE>2;{(NWlv&DLViP-4W8t0Ox_Q)L`C;{`v>1SUcQ#CitzrP^;V`U z(he&*x0E=1IC<4<<`KMOv{a=5?GNAOYu-unz3iU=eD^i8>k3ZL5yj0BKHZY7B NJYD@<);T3K0RY<+@Bsh- diff --git a/Common/src/main/resources/assets/byg/textures/block/shulkren_wart_block.png b/Common/src/main/resources/assets/byg/textures/block/shulkren_wart_block.png index a1d7c9ea0d49f759bc10c4833e4c58b690ede4fc..f67d91339c06f1ff3395d3907ec76d7568a37dba 100644 GIT binary patch delta 309 zcmV-50m}aT1;ql88Gi!+001a04^sdD00DDSM?wIu&K&6g002u+OjJesxBR(r`>#^l zuTa;hOw_1L(4a-gm_7NHFw>+gw4^Akjwr{RB&3ueqb7BZ{S_ooV1Zq66jn4o80H{esK~#9!1;GhI!!Qg4Kz|uZQwIrob!GqmQf9>8 zk*stU-)$eKY?zbsh}$#p4`0WkUx+20VQlP4xz00000NkvXX Hu0mjfB0Gop delta 751 zcmVEW)Ev)#xjK3;!KFw zg6*hBSt|g>S2@;%WZgd2I$pnanVUD}99{o{BuXf&5=%_lNl`5+RdA7`b8ZuU0s~;N zSnE&~Zr+&V2Y)k06VHDq>-Nbjp;Te3(*t9f{5$|407$GuD#2RE>DOOzdh{t$m&Dcr zinR_e9tB1dk4R&8JQ+0u)}MU|0I7ugW`iVh0F)|Zn>$D)yz$Qae6n{HsY^x^|9=Jm zKi;}dV%LbHn7`!*?n$|nuPRsrelP<9(kQ`KISBMRTYt3PbJynMs_~mf30{2@noIH0 z)Gu!CpemHLvVStfnUL*nA60EEeE#J}y!q~j1mO}IXJX>jHhXE-R1Xk%DeC*A#R@Ga*a znQ^MZVSjOeOe>z;cn$a9Ph=__PR6uXLu6WEgNGmpX=BJ$2plol*%uHg*gqKp;7rWf z)+yK!uT2h(qL9R;jAhsm+3gWzn>&aqWmPVkL$ zb^DaH5{MLxit&<##HFYz<6_J!m)~lDks;2+OK3_{m-5}oKI`Y7XXWKHukM-|+`scX z^{ho3gH9E#E7t0V(Yoe|&L!^10gn~;m`;Z1tVUIMeA*(w*oD`E#5M#rTv#v`fYs_( hfaX6e2-L+w{{=Z(VdE_R52pYC002ovPDHLkV1lz%V^jbD diff --git a/Common/src/main/resources/assets/byg/textures/block/silver_vase_flower.png b/Common/src/main/resources/assets/byg/textures/block/silver_vase_flower.png index e946e195574b5c5738705e5bc70f6d126cf7a5ea..f4c1c5fba0337992e8a3a63ebe49f6e0c1ab117b 100644 GIT binary patch delta 160 zcmeyx_?U5m1SbnK0|Ud`yN`k<)=5lMQK|>>{$F|aVdtfToBm&H+)$NvCb&mOCtXe1 zPgcxQGOHpg7pQ`! delta 156 zcmaFN_=|CZ1SbbG0|SGGE`RVuGu4T4(y~Bawe70{AjMS@`0EY34~pZ%||nE2}Sz2ky~t9j=C5WP{jJFvE<+f7>KRoToevxW~l zB6H0j1bs1fe&DIF(o`XE>KUe!HIYZBSeswF#Iq-AC;RI?mT$KMZDjCt^>bP0l+XkK Dw)aE8 diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/skyris_bookshelf.png index c1039ccd66777aa36c47162cc64f90a715f7448f..ea3c210ff5b4460c5017cdc03291509e410f30f0 100644 GIT binary patch delta 293 zcmV+=0owlj0`UTnB$1>Qkt8C2mAuP@ufn31mXEvubfULsn67=T06Cn>CYRG~n*f7# zbx(zyMSGGEh{HQ@hX8lB%mBT=5^1{tt)~E(H%3da09Y|WNGm)s-5QLJ zK}WBz>8Q1N294H!6buDM=4k)`0Fg;VK~#7F1;Gny0s#<2!PoOyf)FA1 zzoi=z#hq!Z^mCf;w~f>%+yhI0ElK?gL4ZAHOZ`}TC{jkxFaD3ZfSN002k5-03lV5< zc}qr0dnr(EZekwpoud7kXF;+kDTa5w;$ScX#Ud*bAqNy#)(!?1iUzDCNg;|^faZ!A ra}lE4B#}8HIvErUbfUL}ufi)2Ku02RYBZaCKdVoLoM)J>mAuPEdy+eF zhe0C_Cn6j(8A>P~3$?Yi*x1-;g3|esAsBy`Nkl3hRU@CwB$~s!Qvf{77@0`?@hax` zK&K#iMd4W6Wzx*Z9ieKrwiyKX&3jad>@DqpRTir^00005bW%=J$;rvd$xGFiO8@`> zj!8s8RCwAY!7UELKoADdZ+6E}(au5;6@-R@z?Gj1auY0yE1(fjiD^^tq=O-WX1fU9 zqi#dAtFZp8IO}8sIGDY!OJASC3TMc5Q^v^2%ca7hFFlF|OaYWYVZ;{B*@8^sufVee z1By71+T;6{M&CtdPW}B-#f_K={_J=-n9cL0us-sjB+7OxXi3^1MEotb>hEt)00000 LNkvXXu0mjfebs#j delta 444 zcmV;t0Ym=70`~)u7zqdl0000V^Z#LyHXxBC6n_DXNklg6UpgG zj36nr5yVRDEG~$hpzq)_q_MX04Q#Bfg>)uulvt>ZAYu%N5CtWF3|w+SBcAuo-JD}e ze=zLqH@ma5vv*dpSPY)#SIPH%I@#U2q!8ozG@Z-BP3U)f^zGQ}?;MrZw>JxPTB(q^ zwtw<0`hx*)gaK^O1|%K~J)Q%DOae}wbkc0Pf^pp~Y{Zc;!K{;s-H0Jgu#HAhB>=wY z;G%X;&9^pL8HWrjAt(!_N|_(tC*K(cUv#X&#@9}l_i=*!T#hHYbc{2pG@I72M#Bjt zTPhWGSwQLfDqwt#dH05~``dY-?=4Am9Dm^2rsoZkE1*P}ytf9L#5GA16Ra;Dbg79S z$8fS7YO06(^w@mn376REC%*1HYhg@Z0T|bHV>fyQ7&b}AjphsgOlvF4EM}c49tAX7b5n1SZQImtwa7Xsods8S4{_)((kMa728i9>*CnF_ m^ diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_door_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris_door_top.png index 1e5ee176264410b07867549f92078dbebf79522d..2026516febc3b9ea6fddf8c4f3ac2d3ee0bc93f8 100644 GIT binary patch delta 272 zcmV+r0q_3m1kVDH83+Ra001a04^xpo7m*_#e>_l3R7L;Z+W+0&`qI%j${H8qD1w(9@@00neX zPE*Or$;rt})s{;D004_gL_t(|0R_PUZUQk305B&h+->9k@0?&rK-F}19AS%Wn~>*F zdf8HGNgJ{cv`XIDBOHEnZ*g6>W6B>kxSrQP6h_Wc>o(WNtH^xuJnMN` zGuFb`vL3nbLhClL>>cF1U`Vzdc9CRILq*i5rZni5E9`nhW&_|gI}reJl3%$2X#N4o WjXgS>^K&`?00000_p^i83+ad001BJ|6!3fAdw^#e*ynVL_t(IPmNPeOB+!Xz4I_iVg{^I zVmCsy2#yvM>{Ldj)Rj^Y)J=5NzaUz=u(%MB7KBnte?rlXid&JYt%mv(8WmC~et<4) zh+i6EY%3j5zL*cK zfBYa$u(^Fee~(Y7ysVTb!QHq`hqm==J)2-|bt5OZp?P(O5v3Eh!-$?XG;*?|Sd6sM zneXYf$RCRB@ABkgf1ga+7j&ij$V->3C8&UQC#TJt#}(8Tim>*uqLLGc*|7l@fVSwS z!}5XPsc?uUelE~A%W%{zgk@PwP;S+ue*j&rhE2alrm)X><*%PUa`2n?<8tRPO27B^ z*BKj_Bu_P)2M?yD*I%8yupPbR#p%KYJwFZ}+eBLNisdM&883xaxe_eI7 zg8vTur6v4vkiSqmGQ$&zn3%h{2b>`9;%M2U^LTtb0^kTtE{9Cm?mHpW)dbK&{5YQD z=o=q+Ww2W!$&**@T$x%l*8=(~(hK=R5Xx0HIJDYer-bc>z@tzba$i`@t@O;O=0)>1 x5f|q!zz45TK`eb9=6-y|*{6FS8C*XyqW}Ei<#%ldPEh~=002ovPDHLkV1h8v5Y+$x diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_leaves.png b/Common/src/main/resources/assets/byg/textures/block/skyris_leaves.png index 04f4e1beacb4f3fa2d82c47ced01a2c447a17a78..47c5a60350d978f95564cd3362ade09672afce88 100644 GIT binary patch delta 196 zcmV;#06YJg0*3;S7zqRe0002(-QrS_ZWxgyB7Xn?0RPO+_@SiFfQFxGV|-9dH@_&v z00001bW%=J06^y0W&i*HaY;l$RCwA2!NCo~APhj!Pq6Qi=>SQ*03qUzD)nv^y8kMD zkGv#1tMbK`ZF?b-b39cLt1MI4p5Hx&4$$m;;>C$pDb;Ba0|CV>iz6{7=6wPKME14~H za-KcMmy@QLts^neu;YOo4O_*iM%N%%2*w||Gr1K>P{jmRE)SB8P1YEuT8f?xGiSA) zCGY0K%3Dk&N+MuJthUwoC_#giJkszT@&hw*MLnDYi~n2RN9tlu*eyXDH18 O0000r{}!P)5B6Dy^>ET63k*>#LqAkWH;q&z6v~p7h=C^S f`2*Dij|)wchni}du~Kq>G(}j)7e`2uAsBymNkljSH~s;SWjwy@V973z|G87l&wF*x514me>}Lmq$s|nT?*Od1g;LH0`H& f?jRbg_^Ce+^AajeTpA5y00000NkvXXu0mjfh%!o% diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_log_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris_log_top.png index 8a8ac3da8e8fcfbcc141c4445323f88893607855..89e26a6a8e18f409d4bac7d2dc27d308ca814c6f 100644 GIT binary patch delta 200 zcmV;(05|`S0)+yQBoYa5NLh0L01m?d01m?e$8V@)ks&32mAuP@ufk`Tu1|%WMSGG` za(_urQ2 delta 192 zcmV;x06+hQ0*?ZaB#}8H96nECNn>wPa({%c!e^MSmAuPEdy-FuoY)}$qLCpOe}G9u zK~xyi9gfQl!Y~j-#}WmQPXm_IK(fZZlEf@`po18v09#J`ESb|tPxFCNtycO9bY$&k zr4c5jdK~Em^L>*gH=^Hy$S*LN_Zr=dK5__=CtNZ=OY!&9#1myfg%=DPr@i+fZA$(6r=zox$iyuawW*R3Nr5NOKJifk^s4{KGya> X3=9*Fv!1sb00000NkvXXu0mjf5z|ND delta 174 zcmV;f08#(;0sR4xB#}8H8FZqzgs;Mtyvt98oM)J>MSGGvaED817fF#J7=Lj|L_t&- z(-n=;5d$F*LUGOlL~X#m5{&V*2!K9A{mkcaSk+9!deawNV5GTvQqsI84i8MDAW_!=R4ApbF{KapsH>;jb)d`|0T-*V|a8`uSLY4(k47sy+&PneWnFn_Y!lF4zhg%N6-o9`W5ti5=*N&h}Ca}M*3 zp;^sK|7={w(7k)&WxmGBPHUmpZxdc`Jj%Mp@d)Rv5A1@;PtUFax`n~h)z4*}Q$iB} DI{Q}m diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/skyris_trapdoor.png index 2b630374f36e5f24f5ba36458f6f18c95311c3ec..e375c4aa4992ecedb6bb3739ca4b0c023d47fb86 100644 GIT binary patch delta 266 zcmV+l0rmcn1jquA7zqRe0002(-QrS_J{OTA9)B%ROjJex-rE1&-ul?o@z~h&%g&X& z%Y?7ObfULsn66KSoN{t zlSxEDRCwBBn7QZ7>Dgya&t%w9mKvHGmX^(MB4^L;J-fHYFdRQEtZZbsCz|2dMrL6{ z19O>9hOJwiU0h6jdKji{QV~*g(#~esb_mRfWH@mc#IVVMF?txLZ8i}Ubhhqh*tW&R z#l^)tli|c^B@suZGcgP&a(18Dy=Pkv!}he^RjaOLbTjOneeUkvH>c+S09z$Htc#qw QQUCw|07*qoM6N<$fV!Z delta 469 zcmV;`0V@8;0+0ld7zqdl0000V^Z#LyHXxBC6n_DwNklY5S=@c$VE@0 zBv>iLMhh)ONnr#V!6<@Qh@fC=C1`6e{s7x_l0p>hVp0m)SlTKEOf2HX54_-s37q#P z&azPueX!Y?H#0jsZ!gB;Zq}y&HOC>}b73kNmQC?Q;zvw)w$odC{>bnU*-?vPb|;fP zwtvMt@a%fZhpprE?1DmaGK%ws0-p{JyWqROx-i2#_z(QJpE59?$?$C+iU*WTCO(-X zdgtF#sYK)J+iZ(~sAW~I%lAyk-?mYyu&<*MaMhqAfI`ggdoFzf%B$Bi8lnE;00000 LNkvXXu0mjfkcirs diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_vine_flowering.png b/Common/src/main/resources/assets/byg/textures/block/skyris_vine_flowering.png index b2456018f689c36d7555a23b03cba9930870ddc4..731c2aa1184c20ff5b2979ba5edd5281ebfff04e 100644 GIT binary patch delta 168 zcmV;Z09XH$0`&oqB$06ykt8C200030%+C0sq|bncpJ`)!P)s+!D8v8&00DGTPE!Ct z=GbNc003V}L_t(|0R_Q<0RSKj0w9|D|H}b%mo1umNV=f99PhG%mkpN=yh{f< delta 196 zcmV;#06YKn0h0odB#}8HD4%I#d{9jIp`_1%hX2gY0001lB8w3K000JbQchF<|NsC0 z0JFcOzmXvre|SkmK~yMHEsp^Xz%U2`QOp0oyhGPyYXw1+ZBA-ZWf&FUTLLQV=|}M1Bh}L4ysxCy6HGnwl#f$Qj3hAk4nj76rNmW`TnN>ZsR0 yywUO4Tq1QAbB0o}VuED_PHlvI$s9|R_6MHv0|>t04o-9c0000?mixLFVdQ&MBb@0A#c;egFUf delta 133 zcmdnVc$#s71SbbG0|SGGE`RVuGgXy_+aFi{|DUwujMvQNK;gF==FJ6CtR+Ey!T*7P z;rBMa;E9S7o+h3yjv*SsSG#WWGAM8`|Grh9cCbS}FF`oNvdiX|fX@!Uxfi;pC>A-? k=0@(ma$v=7Hor{_;!Byg<-L~e0Gi0)>FVdQ&MBb@0FeDOng9R* diff --git a/Common/src/main/resources/assets/byg/textures/block/smooth_brimstone.png b/Common/src/main/resources/assets/byg/textures/block/smooth_brimstone.png index 047647c82204ba127c4251880d74a3a18801370c..2ccfdf6aec82cab71cbdb2dbd7a65cbf99fb29a0 100644 GIT binary patch delta 207 zcmV;=05Jcg1K$CV7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-shGlAZT3>Ec zSYu01OgTI~Eig1EDlUmeU;qFBcu7P-RCwA2!7&npFbo9169c_ZA=F4Fd4T-_7}Jvi z>c9;C{}b57vDZ?|z2dY0d3ld3ySj0}1|vi#%<3A@4EU2|j7T5M0i!4fEIE2gV~0(| zsBCeP20@3@JiFS29|J(NSUfZuQ;$uJLVM#fND%+xD0^A!y*>&!5q$k`$BO^}002ov JPDHLkV1gQJPTBwf delta 406 zcmV;H0crl<0i*+v7=H)`0000V^Z#K00004VQb$4nuFf3k0004ANkl!Yw4^HjNhR#O&Rr*&Qa#{PWG9lgI1Z zpIiz?DFAXQ0Id5SfFXo~*eHc}jxk2MTnbNj_vC59Xbph3mVfq)DFLtbl$mx#J&P4 zB45c5AS@{m-Q=A#TQP z?O<1iA%sO&0e>uojZ$=DjEhd*+A6v2CQOXh^`3Wb_JNGhl9sdYiN#i8oJTlDUVI_3 zN_YSO delta 193 zcmey!*v>RTf|G-pfq_9omp^!-nW~9>Pn1r*r~mwHr6RkXyKY{%@apfM|E+zSfJ(S` zzxD=FoFzei!T+IvA=tk{XriJ-X@aMVV~9p@ZJ)PTg8>I~s?L_G^L0|Ud`yN`l^6id3JuOkD)#=e^0fs=uJ{s5m4R|f|N3kwS!9W@|O zQc~Kk*Z2x3mEq~)7*cVI^&lf7iy{Zhfuq_D6^u`=F*UJ1`Ca}?Qm24#`hjV=J&sqR z4W>Q3^Hf5QLpJ`oNY06ee1|`(d&?j4Fi&*U37x@b>cJYNQDTw4{IQVGnIo$*GcP9Y n*N-)8m|A;SbP0l+XkKMWI9N delta 421 zcmV;W0b2gd0kZ>;7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks00C-AL_t(Ijct=X ztLrcfhMxvwM93sc1`i!NbUOe4C*8puJOyKfp?5HHlX5gA#**GI-+q2x?^-*L#{+=h z-+!1vjBvjvT5FV2h!M6;5s}MTFoS*H0cfpZ2C6!Td6~g+6n{Wxvl%SCcaEdbS|jI- z|BDFsdt%#^7?}+@=ZPjpxV>Jlckdk-NRFdWYiC`*tQl>U$Lz~tb$5FkdK}u=DJbUkH{H|qP13BlZ_IaZVX7)**Q&3e@l`xbZ>GMZ)7VON| z-@#en#RXc|K<{IShsJ|*PN3WF+AT0P*4o+kos@>!?jB4^>Czw~7ZLvhJ5U*%Q$sV^ P00000NkvXXu0mjf(xJz4 diff --git a/Common/src/main/resources/assets/byg/textures/block/soapstone_bricks.png b/Common/src/main/resources/assets/byg/textures/block/soapstone_bricks.png index a782d42ad1385fd2433d1cfe9037f03b8d74bcf0..d99d5702a5314b4c4b15b4195b0a4b7f8651c501 100644 GIT binary patch delta 222 zcmbQn{El&gL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Lb71cLxUt3kwSqBO@Ih zH6Tz@Qj(XKmz0zg6BE1Jd1ob1Wu2#sV@Sm<)iWD;4=V_`J-n}Mz%-$0OS^Pbu~QO* zw&Ve&lqPA$8w~l<3q{sf|5_kp_H==RViZ@q`>ND%|E(?^J-_pm8ZMpp&1C;%=Dta? z@OjjaK*QM`9`hsm{#mDJPG$}N_Ghonv#1oG7pZIblATP{78m@A`B>xpD`WBe_44{@ V%8rZOZ-X4o;OXk;vd$@?2>=7lQb+&* delta 392 zcmV;30eAlH0hR-h7=H)`0000V^Z#K00004VQb$4nuFf3k0003{Nkl5nI2)<%4pU0@xzxU#?mJuIMcJ=p9-)y_TF-hix002ovPDHLkU;%=Zyt&u_ diff --git a/Common/src/main/resources/assets/byg/textures/block/soapstone_pillar_side.png b/Common/src/main/resources/assets/byg/textures/block/soapstone_pillar_side.png index 324a3e172c1f1a13e1f72ae79c433e792213c02d..296569b63befb24c09c93bf7afd34ea8d79594ac 100644 GIT binary patch delta 188 zcmV;t07L)Y0?YxB7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sM@L6JJv}rs zGAt}6A0HnX85tH97G%yz#{d8TWl2OqRCwA2!9fAQFbD&{h}ay^DM)yO1E_*h{~~sW z;AmJx*>G4yKW)P{jMCcX#r9nJ&O&;4T06o+p>%{o;USbI%Qb^I)@&6q+;(k<&CAP6 qB)3}kL#e$yKNOG3g9x5=toQ@sn;+U?ltB{!0000WM5UQl16f}atIF6a~_=djk@sejHm_h(E=ZP%ujBo`jHo>bE z-4)>*Y$9t&M752k9%BS>*jVn}f|)-q7_JB=NJOW6{s%94=EoF5Wt+v!3{}m70BRe{ zJxjqhF6&P=mPm&b5fD+%m*aOlBBgX3(XMI*Mrg0Ds_@=d4J#XM$I_-N*uU`JA1hp; h{req{@ZO(X_y@)TyX-B4c5eUx002ovPDHLkV1nGXmt_C| diff --git a/Common/src/main/resources/assets/byg/textures/block/soapstone_pillar_top.png b/Common/src/main/resources/assets/byg/textures/block/soapstone_pillar_top.png index 170344404abbf474d7ed17875ddb3dd34a55cc1e..f52c417883aa634c576ed4ee5c4154804b18375d 100644 GIT binary patch delta 213 zcmV;`04o2*1LXmb7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sM@L6JJv}rs zGAt}6A0HnX85tH97G%yz#{d8Ten~_@RCwAg%|Q;rAP@!6kE#1YZ1;%t08E&5Q{@0a zFEo65fO<6&W_52(O_<}Cr(*9rv5U-TySn#9-cFX zV{7rkD~7h+`Nk`JuSp_j#MXo1rGSqwpF6a66!eMyg|CReG*$!+s4LM2FI*jOXA69G P00000NkvXXu0mjf(_~cy delta 439 zcmV;o0Z9Jk0mTE57=H)`0000V^Z#K00004VQb$4nuFf3k0004hNklAvx z5QV=~MzN$A3Z{ipld)5ml&+cc|HnY4l2S-87*flvK%|3vs%-iu;XC=B-g~#$?RHo1 zJwxAPoFm83_W*o_PfEQ?^`YS_2S504~HBSvL*u zA0GfbK0Hv!6o68%fQ}gBIB6J|LnaFruP-mxIYnzN0N(ovW$CfjBF`?2bG#joK*zdi ze$Swknml1-HTLZHdjRh5Zz-fX#+c}BHk&kI{I&$(bm~%%Qi@WqD1@$PpwtELeVSs7 z0pPB#QR*^zzkhL#n_O+<99rvS-@0k2swE+WR1;{evDS`15af;+V-npMSC8i?AXjo;9= znT>xv;@V=n-CpN9%+odxS$jVJ?ZVLalWa?nrs&cs-!O%`uBIB~A%XcaF$tSs@%;RB h{cjI)NGkIof*%0S0ry3uuW$eW002ovPDHLkV1h8z%Ul2e diff --git a/Common/src/main/resources/assets/byg/textures/block/soapstone_polished.png b/Common/src/main/resources/assets/byg/textures/block/soapstone_polished.png index 285dac402431669cdb9287f6736af6fb2c8ee533..cb4c0aae5573a97030aa4e39d0dd8badaead1065 100644 GIT binary patch delta 229 zcmV3frD=j_fo{I`?XIxhVSU>+^@pC?(fB8~P(*RJG z<=1_H>-CBNxZm$6r3fL=wk^lwk=N_RFg)qHKTK0b-}h*}Lx0Kx&N;N+0U(;DVHlnO zv~5e@_dFgqjHwbRJP~4t_aolB1Oz=9z%*qz=O~H-t>=r6#|;3b6vkAa22!(9imvO( z%Cba=H+5a3ltRh_`~4mufrJne%Lp1v01174*tTr~nLQY>*5aH4ZmA~&aL%RI*3Ck^ znWhXO-dJl_?<aqQQ#czmS>8iQRr| zbND6%F6`%0>F)GAxMuCPSKMn98@)DMPBC2b?ly~hm{!oWA0M*c9pBymJ@C@+L}wAT dHp`l5`^W3WuAMvXs0_4*!PC{xWt~$(696-+KCu7* delta 365 zcmV-z0h0c~0sI1x7=H)`0000V^Z#K00004VQb$4nuFf3k0003tNklmSu2eGdQk= zvaAsX0pcV<+h$%+*Zh13T5BBh9G(!P4*spSQ>d2n#wag6&;x*hcUnU43JryTqOA?c-ssLaD-00000 LNkvXXu0mjfn=Plj diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom.png index 8b954ab31c2905457ff4f5804a3142787f320bab..4daefe91b9498434a5c04f923b7fbef2b6bd84e8 100644 GIT binary patch delta 210 zcmbQm^pA0Zgd7Vq0|Ud`yN`l^6lZ})WHAE+-yslY6xHx*n5d{wuNB}E;tG_#^6&q< zyQiOC*j@AK>-Akrq94Cd+rM9R`5KXlQ@r#gUA4t*RD=u^gl%nJ9tWysED7=pW^j0R zBMrz2@N{tuskoJ#;K0tq!=tm?)vQ7C&T1<~o{gcazc)zEU0pt((YP%4K6C0DyBW-B zb8L!}^kx)(KQnW4!ZA(P^>@n;^7P$QmsW5yW_Ng-aOfNZ!wN?!VNKWXQb5BQJYD@< J);T3K0RYKaPG0~3 delta 217 zcmeyzIE!h51SbbG0|SGGE`RVuGlf9i0G|+7Aiw6*S66MZEC2p`=}W3EUn4ScO7!Cw zHY!4D`}Z3t2tU2B`}(dW@9v%ks=T{OHvvfTmjw9*|3?7~SMJPMI8jleAllQ#F+?M{ z_v}Ny1_ch52Q~toUEk~P%$ODx9sOt5Z;9lO*J~V@G!`CXOE_o5D4NE$#d+F_3ycYC zF3K}3HF8kB7P+Q5vf&lWlt(Anj!3U~A|<^e|F>wK#lNQCocA7aXVv;D&Hy@r!PC{x JWt~$(695ETU{(MC diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_block_inside.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_block_inside.png index 80f87a063d3d6117317e66f0835ccaf1c3c5590d..2a48e510cabe72b30afd24ceb1809442de5750d0 100644 GIT binary patch delta 223 zcmV<503iRZ0;~d%B$06ykt8C2)c*f`^7UKe=q0DD6p@q-X=?yvf*?$909kAuM`#&8 zTpKk>G>uGl0001yNkluPP_0<0V4QXo|HAx*uXcUo@TjS^eS!@7g zf?G8wy^$dpf09W=K~xyi4a*@5!ax`X;P;AFPw+d?ws|tJjTQgMg|+WspNm_WT^*P` z28zkxA=nK5KG&Y|09wzB+-b}@q0`M7XrHn4v4J}8MrmM`-uox9!SZ-1#ao7Yl~LBY zLnDzFVK8H7X|1#nL&=_|gf07GqbR}kSA~J=fIQO2DABjTBWe+Or-*!@%tpja8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY4_g;;5Sn ziHV6Nr>u335s7{X6p@q>j%!|W4KZV*RcHxmR5LMKjtyyR3~NwHNl7YBdb}1EAWUy} zFb6+BKamj;8b4bZKU`xd1sgR<6){H*x)dBP80~^_E^1S>;;mNI jONvNZ9Kjo8aRL4TR*qIo_AI$q00000NkvXXu0mjf1lolG delta 690 zcmV;j0!{tl0>1^28Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MbQL_t(IjdhY;NRwd{ z$A8Xu?ZXX~sqCBr1vQ-|%G?)w=hnoJZLiPVx_GyVuAZxhbN=U?=Q+QBL4U*0NIDt{Qd&_-X=^LH zPgIuw8yBypkpMQIyg&gIpwMUmU@Nhn6NfV~Q^h{)j^n6nVU(Y5Nw=RyiiUy|8ZAf} z(LJ{ez@vTJQ=i_RX33l4@t6gS<**i}&}gC9E1|PY%rg+2r8hlEZ+em@y?)12Z}iAm ztB0ZJL9RIfw||Zyl;7y|*U#h?0XUkwQCEThtOc&X#{E2vx&J1*XehY-*F*|{KwS)g zzB?WiUsB7Jm~wH0wM<)ND2Ps-b1@?X;Y5m2(>Z2@06<-Kq4<)Fy+6v5HvZI?@0svn|uzhPoC(7mMt8ZZ^MLQ_wIpl7G%}j>j`7oxIE z@Y6@l2lJg>fW~mDbzrnBfuTU!~9Xei?$ zH}?8=sv6p`J0whIiGkoOhLTFeYM6^1KRDm^4Y8{EAhI`!kS{xtU!9K_Nk9L2qwool*Y0~TQp&{=6^$y|jV;nEimY8MVqj;Ix zbYZZTQGWO{0F9ml1Pn1)GNbsC#A8Xsf}dJ%BP-ri#s^u(S@tQj4TE)?dzN|1Y|Hb< YUuU2nAFU*hlmGw#07*qoM6N<$f~polHvj+t diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_crafting_table_front.png index 37fc0837c91659bb4ee93a9a60f539a53fed9d3e..e1d900fed700b89275f981d15a233a204c21a4d9 100644 GIT binary patch delta 268 zcmV+n0rUR11)Ktq8Gi!+001a04^sdD00DDSM?wIu&K&6g001*kOjJet^zZZDy6MA# z+Zy7&aDKc;+E@dSxWg9g~9wbs4A4jxk3EFg z6rG?ltp=EOzFGU3+G8H8uPU@Fkue->3a18va6{3~hG<7~X>E>Hyf`1m7bB3_ji0|6 z+jbYm#K?jWX;WM)s7yt5Ulcb%^I+hu*H59y#E7V%kg_E}0w^_#6|2`O&_5e?N^!4A ScP0P;002ovP6b4+LSTYZNNa}x delta 682 zcmV;b0#*H-0=ET_8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MDIL_t(IjeV0rNEBfd z$A7zNqm#CbgVWHqCgH|z9jrhJ3c*0UXqX^DhaeQ{QiOH&qzF;e*@Fr};!(DR4nhly zAk9L!5blz&L9sOrtP|=^uCwiQ7-wh;`Ys=Q-{Zaa|GobUbboY>I@bMbNQ#Qo+Y5j> zGELiw3+!xf0dTx6%J%mSq?IYWV`>_esU-p(U89aLeGAjj0ccs>q7m+S3*c$0#nma`}zsoea&Wc6CoC-lFy;q2LKe330Ec{&1ZcH zmDMFTfu2qw#NuFN5r$n@LM#qz**b7hkK|l#o z6J<7LqO@Inz`l{;?46f17AGdB&LuDrq5aE2zO$MpfY9Y~7Gj}NZ^u!`&G z>6AZrpMS^UZ57wqH!}4;@EH8h2STe%Ww!*t$Hm*kZoc4%+3ZRXC&yjd-Y#gGtMBPr zoev7h1ZRe>V-*((FVCS5K0Ne+p(80Orlz5%Q+~T1123T$bKa2QeFD*gSjp$m^ErfA z+}#61uVdg9`TI=-0w+%oI!Q>hd)r z6Q}TIW}CZARq)A|w2#p=Dp1u;l{WR1QwfricYnn9tO}@Wwx^3@NX0G22@LuF8IBlf zWlme9WW#XSrF7*i7vmU)!^X~DOGBJ(7*4cT?7gvLcTYXTp&%vANy;ujIkT{+CC>3)waHD%i4bZZ^&5tY$nZHk20dyyWr>mdK JI;RB2CIEd3VaNag delta 618 zcmV-w0+s!j0`~-v7=H)`0000V^Z#K00004VQb$4nuFf3k0006pNklxVy9<7#t-DELIrdNem1E(DOPt z%d-FoT>@Zj))3Y2#8pM1ON1`@bt{d`<#Cp0>3JP`UI%ObEUwuIIv+KXxjaCiz#G>9 zNDhwz;2yMzcYoXXb{_zLa*TMlO~oS~ksBfUcaT9s17CIGs`trmj<)@F@lW|~g3 zOtMg5_hX4Y0KVPlFFIWvT}kQWw*UYD07*qoM6N<$ Eg2U_<4*&oF diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_crafting_table_top.png index 3353b0647dfa35ab4d089d4dc8bb6b8f0d6c9865..0626bcdf646a33d7faf55a8d83be0beb5ada78ee 100644 GIT binary patch delta 213 zcmdnZ{FHHmL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19O(d`5LdIikHXUqdPeLqw(rt0 zE7vqCP|-=0Qw@?+3HqfXZwypc;pyTSQgJK!#S0B@Z}0w&gp7o8Gcz;I2MHM(K-$dg zc|wMHh)76~(7FT-!xAwwBeAk{4>OZ65Ifn!&rC!pM1;w>rr^pX+=hVC{w^VKd4lYx$4@O1Ta JS?83{1OOf-M$rHO delta 429 zcmV;e0aE_u0lNc`7=H)`0000V^Z#K00004VQb$4nuFf3k0004XNkl>o1o?>{p;hEwUCiNb)4mFE^t{vJE$aFBCs5uPc4(!c{?)qimjg(_C|>85~x+#+{V z9e-%MnCj=M<5DcQ?j{3R*(ZwS7ORf?XV|Iq&KOWEx2U`~kupGtv<{Fmh=~Z1W;PkI zSq$L}CI*N?RR?^3eKMPj0GLfite0Z|*2}TxaLF;i%vkxDZN;Sw@Q+)4tK!kPjFk_Y z7)7*(AjVSi8z5na0NHesl;&{K*9~|ZlWDKLPWw4U;SZY)^5AS)(ix;w%}Pk5hytd z3ZYX_(x(@EFLRSD`x5Y4@f4}h|5O0y)Kg7|#If5Nk0t=aygTXMUB%rieW3J$SkN&$ v7;Y4{jCmv>QV!6zz};Z+5jNSGyl>hc-`^?N2p|{c00000NkvXXu0mjfZk%KD delta 512 zcmV+b0{{Jm0*(Zb7=H)`0000V^Z#K00004VQb$4nuFf3k0005VNkl4z! z7>1vyInEqDf>Cf?OcxKOHQkK!9|9qNBLATMABBz`x_9c}x^ygbDsjA-OQ_)%4>3oC z2|6D>+@3q!N!GPki@s0#^nQ8LwA-*rEI03aTZ@IL=UWPb{PB9Qo@B-aX&DZHmI zXup3;JRZ?%cgWs-|MeFPgcW?RQJIzRu#xcE%%d%M@9f4#?Ev^Jj z?!SD6xcSQV;Q@L*yC(pvYOwRWTPtYh{O-1vx7r>2&>=93+fX8Ieo;h^Y(t4x-QTao zdl#3aacs{V7k`2L59^QzaJ74dkq zKb%zr?fz?$XjZ;$rf5dsFXn8S)2xa;{b>J3jlfOrzkLB9?Vpfqg?j#*#9NSSMcO|B zU^AWAW(hLwQ*zXbgtCGq^5+`%m0;L;4rRi5)vCeX!pE000060TXO(PkSO{Prt^fdNlNOYdrmNC;Qf_I@QcnSlPXQ&xNv%o|F zWlL2xhRMt=hQ^)-8Vr+|Gutv|C|EK~FiK=#a%0wHXfRAxR5oLlWJnNfF*5dEwVENp z5M+*l8ABpdBLkC%ffz$GbF!eanScdDGgFF@aT%i}0Mwf(dM2nEBLDyZ07*qoM6N<$ Ef|OTYdjJ3c delta 598 zcmV-c0;&Cu0^;lO^}c09)E?|jMXBP9j+gnRNr36yWi_E`FTmH@32~g{QmZpo#O`TA3L4EcPAXZ zdX3p^0dV;I1)<}}$G$s}(;b{Y1)ywH(iJj;bkoG?v`I9<_{%3;Ye48Y`0hlGo;9nz z{~*6Le_IXG3@H685-T9;+URSd8hIp|kX+xLphlU%$$tq>r%lHs5^${n%h@cw&u0HT7~30MfP5BPqgI!D#iJX1pu8S6^C159ndP%f zR3HGZr_*!=)?JNS9VPN8^*s_RU|AF!9&q%C_~jGKW(%j&Ms)2|AaoqeW(&X9OO1N> zW~&Ff6;DXasMU$Ob{eG68lamdzB@rL3S4U-iMKsa$2R5ls;)JlF!$0RWtDwVJQ_+P kGY_I4-(_C1kSUSJU*VAz@iVqo_ zlnrTXAWUx=KU^C%Nf3XB?EnA(a7jc#RCwA2!2tooAPfM(XEQ)(4J4U>mDE9pgBAzG zzl7bquL36Fhcv@`JH;bdbN$B3`~zZ;6#}7O54HdR002ovPDHLkV1kaO BP{05H delta 443 zcmV;s0Yv`S0m%c97=H)`0000V^Z#K00004VQb$4nuFf3k0004lNkll;tkfELS?kxKvFgUpmFm%i|s_$ALeaqB(g{Ui4>E*ppX9H%UnYAHsc7CD7QF zj*T?%VTO9ngMW|Cct+dy;@7! zGuPM}juh=hFC?CaXuHWSpw$)i@llBjeF4A>b!g7#w=B}-K>#VJF5G@L0cUW}2fRjp z;kA4M0N^Zu%&y!AU+-^d4Mz$Stv+8!;MU_@D_L`zUccJDI l8r^~9elPOiO!&V*@e74M`5zWwUa$ZF002ovPDHLkV1j2$$ua-{ diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_spore.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_spore.png index b512f40e8fc68007ab9684e22a5603d5faae3e3d..d6391a2d829f6373a0846b0b7a1278720c758a40 100644 GIT binary patch delta 164 zcmX@i^oVhS1SbnK0|Ud`yN`k<+DS}Qk*yaE@CkAK|NlQw^vkdRNB;izGm>{!=hxzA zxLGpU1t`i?666=mz)&{%tObzg;pyTSQo+c2a3g1f0}sOiZM&7Za~uj74%%@<*>haG zS^~KmqskCV$t)jWOyce!g>9!)wDJtiTZ1&>|nOirrG$F@={4 PXefiHtDnm{r-UW|gX=dI delta 261 zcmV+g0s8*p0mA~27zqdl0000V^Z#LyHXxBC6@S=CL_t(IPlb{(4#F@DMO_#>q$5m> zAST2WVCKY(9DoIh0R|=*i$s@7mEniDB&icDJ;ipDAKNK0v&zz7`K>8Nl(19H#dcBg zbYfgax1<29EGycd>%xV)X=Q=kdiGiLZ$5(r4sPa#rT2eAL4eJ#mif?eAOb%n6a?6a z!)_4qr=NR~AOQZ&z`t3mq<1v1Sq2@qCwsEbc)8x}t?-+srsJ4s)e+qvPy5}PDCH25 zxINH2DNwpLJR#cx45j0@cHz)8)fj(hF=|r4!T8x?)TEH>{R`6@3;jG diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_spore_end.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_spore_end.png index 5b53db58458b53fd6a681547254059c41cfd5c0e..75637818f5dee5356c7e971130551a314b9811cf 100644 GIT binary patch delta 224 zcmV<603ZL*0;mFzB$1&Nkt7{|Gf+%aMF0Q*|NsC0`}_3z|Jwck+4}p${r`IP_;m60 zZSCvX1NJbFJbk93eiOp<_>jKbh zTCEXSC%YF{GfP@h#Vx3}sn6ssU-)nlCm%A*LOx_3gnfwo)d#{=*@upck`G-*Wgn`a a`ZxfaS_cRSz=iJs00002q)DU-_@B`^#Z! za6;0D=aPfTl3WuF6Tgsc8xNXHip^ypI3a&?Q`rm#+FTNk-E3x6>mc&=k)w)j#9(7_Czu6{1-oD!M< D##VsG diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_stem.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_stem.png index eccfa77b9001802ba0547fcf2ef8d1bd5215956d..9b0ad99de77b7f0e093614b8a4e4844d5576ad77 100644 GIT binary patch delta 192 zcmV;x06+h^1JD7G7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000FP)t-s(72z%ql&hb zd#HqJpnPI1TWy&D003`EL_t(|+6BP@5yT)21i))RKq&|aa}^Lm1W&K+18shN`v>tMNI2u{l&5=*)>^Zg}Q|x`#58{tS{$7+- u&65&p)LrihjJJ>69aZC6*$q?|(^!8drxFH-?|OXz0000=^R=pwaSjndtZQVP!-)uD)7XJB42lBj z0k;G0f%6$U2GAX#-y|NrrPNOfPb0PqS`7i zXH#b(D$2{*SbsGWwaDJvB8Tu}L0_&_)u%q0-h_7#s@kbEBC?O_Q7;z}WSpamtt~3) zjRp4pPY&vzLok)GuFaZLuOedd(;}%tpl{=#C`=gV&ier(gg8002ovPDHLkV1lSW!59Dl diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_stem_top.png index 44d52d1db18209fc114bcb64da1c68f7182cdeb0..7e34c0aaaa9eee8048a1d8477a1f07d2f45fa127 100644 GIT binary patch delta 254 zcmV;^nX}0001(NklS785Qz6nc_XF zFWYQF%bhw8do;G%tgR2ipgSGgX6w^ob)58LVkS%36H*$er=C;c+yf#6t}FQ533C-; zm_T9TvQ7c=9Kq>*4^ZO(0dO^OY9Ar%kLKUOdEuh=A8lhaVvsnl3jhEB07*qoM6N<$ Eg68~h1^@s6 delta 611 zcmV-p0-XJh0`LTo7=H)`0000V^Z#K00004VQb$4nuFf3k0006iNkl;qs_HyHMM2vt@2_~1DJd!~t#UC004KrzX`x;6@scz^PU%~~yT<8^H&fNwQWj0#d~#NY4YbZye*EFxDZ;Qwe4Pv|&Zn-4Ev z@GtpR0|3RSprmv>s{!RIBAL#h7zLDei%GCKc{GrlQ@T9t_5tv&WageTGQ_ZY+#TRs zQvhP4KEvt?9@C&?CMxP%4VjTq!5emng%*{R9&!Fk$bZgyTcEeaf}0Q_M2e-e*@#oi z<^N_6?1$r@^B6$>#!Z0e3xw)loJQPH9zkb-ZYMz4tkv+{K6|DaEhdi!qz{fs9t|Rl zd4y16*y}|doURR=r44dC3v(VJgQ}_sZ#Y=!tQeJri=*Z83zsWw5^Cx2)0^4t<|)a~ zEqu2x6I`AP>3^Eszs`>6ga`?|J8Qt2ykTS_Cm=(%zkZ1vhANg;CBkd>CuvQiSX#w$ xXTkhDCt_Lt&YH`~)n&PUu+MlrmKDld{05#?^sHb>1W5n@002ovPDHLkV1k1JCG`LR diff --git a/Common/src/main/resources/assets/byg/textures/block/soul_shroom_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/soul_shroom_trapdoor.png index d784fd4c9332253c70cdeb0e12e4b14a7bc0b9a8..e4fca53d436b8d46858b810078b86a7e8ea53d20 100644 GIT binary patch delta 216 zcmV;}04M*~1n2>f7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sHr?VSr>qo_ zlnrTXAWUx=KU^C%Nf3XB?EnA(fk{L`RCwAg%0UjoAP@!65Agtk(F&; zXxE6g_dkL$as3{)y>RC3!0gWgvU-drD0O)nOywPP${!4AWl>&h1lhLqNk))fs&~R+ zutZ%adyu8sob;cJxMBQdFCrc(GnW=Il`7!#j@ew5vWvsZ2OaJ$VK2Ng=i>{fwHtn5 SSHf@r0000~VGw;I91LJM z0^q3A(R=jq1Ln{`Bo8${apl3Y*`(KEYP(ozmr1Y1!Rks(rCh6b~@h*MI1~-DP>N{a+mbj7U(}uHwIZfxDl=0B}4Ht6bq=bp<05Odj1rh5~ba z4N*KshJx|+3%a>ouj#>tDx6FXt6X7fyEvH~MkMrLBNF;;5i3Ix4+t6!&C^P|IG%@@ zEorcsEyYc9S_-RwuxQm;&Z=ItRxK;-{z*ZGf}qjRVSfqwU5qHcQ-c&%2T6${n?6<~ z2>M-2+l`x=eq8svSPKc1O`j!Fv5lg53~Is0^$Ua7=H)`0000V^Z#K00004VQb$4nuFf3k0006UNklC?coIgwS^#G zAruf4eE^p4F7TA|DIe^=jn)d^j&}$JM5Su3z)G}W+Z+^q=1a3vL`kpDhkEWoFz0iS zT;kc?4w6gPm}x_%4Jvx+qMR?yl4--2{t@joH#`m%-hY1KHi4wqcK`q>)Cu{N=?I2sJ0xu2~wS@pF zC6Ajm0J>^01rO=V3P0oyov|QQ(`LFuIvxCRphZ#QdT`^^Kz{D_&Di9&hyP4;v9wm4^hxmU j(Xo>a&>81XIu!61LzxUK;^?Q_00000NkvXXu0mjflFc2` diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_florus_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/stripped_florus_stem_top.png index fd12b752077fb820acb4b09d14003d2206850a79..0e9ef5fbcbbdbf75d130759a3a43b9beb9fafdea 100644 GIT binary patch delta 236 zcmV08qn272 zwVzs70fiYfI7%@Md;MF*KDg&#?fkDC%qCck(#25w0*%SLOJ$Kyp&f#dbB6Yn5@oRj zyXMdOml=@lh@28=OSP@eF@X+hV{O!;c_>ONMY!G7=U6QzL{E+=(%@yN$6nMUsq4bH mw}52C=R9H9_1-@4PV5gTq9B+dRZOb@0000B(`pw{CIfTz^pwP2M~y0&wPB@u~Ej zyWbOpuCbG~xF1ijGse=Ha(Z$cmbW(mc;C688k&@?975NyGX|?^jjz`oI>MtaO4u0# zfT8QtkPd2d(dEP3;&bl`VFD5^ZwK7%2FL-t{3}pVIKbqK=TPmN_@gY)$=6?Z0*9SmO1B9+Yzei;&Pm3Ny*QYK@5rLcr91b-)yB=J3C|fxmqt)*v z>vP4U{6MPKMG1h6v4ZphAhHne0l5B*wjEGkE70oqsAAGwbU{K&P6OmL!1ZU;*9vrm zN81iKDsHl$&$6G-a#Y*|;KyV{*~;OM=ETCO=AxUZ34dLqrWQCHY5?5y#@zJAKoll` z&^6k2BwAAoq-tsbfQ1nzUle0ugt-1Ju@Pr;IMj%RQ_V$}y>$zJH0RsT+a-dsmBYxT zm-3L)D5qFB1+bddxZ4euE??dbX#D9WR$>TUOUQ(-k*bRlAG;Sw4=P)E0FH{AwCx~i zWgKP<*MFZS7F2)(X`=c{!YZc$!i0**Cv}ELc*28w=uSwgxHV{Uj|N;{PqTW v>lShvaISdR8H4-rgq^IFjCw;l3Bi9<+YUhds1AOM00000NkvXXu0mjfifK4Z diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ironwood_log.png b/Common/src/main/resources/assets/byg/textures/block/stripped_ironwood_log.png index 388a97be0804ef5b2df861e3c28e55daf73e91b4..59b930948d86f1f51aaa6b8aa1f0b620959991ff 100644 GIT binary patch delta 215 zcmV;|04V?71C|1i83+IX0026epuLek7m*_#f2&DEK~#7F1;Igz#4r#8!2YE#eQ@8F zW)Q@X0inYn0uK1qTNMK|L7OBoDhA4ge+EsUW1?!o-dbj(qd(QS_dZ%?qhd}pbk5Nt zT^TuzHV!1Jk&z$cF_$c;tD{%p5h33uE2G!IV_Jf@F{9afURvVWr!(eX>D@PPu}*cy zL8v8w4FXq&y0IMpO4359LJl@rtka5<00E|99*=7`1N{? zqR7ZEib4iL_UH4#AW7~VcIX?1q2ZIC=lT2nmTipjeLqQ(B{EHu48s)lqmt-)y(Sg$ ze>_hazw&y$%=7uY-|sY2C

    lf3vj-cy71bIF3fM4u=Ct*c4nY7b4OE3_>z(=_l!f0PE_@0Tdd2pf`R8F92+L#pNqrR%zL+))sI z&}CUNp{goN>wIb_viEAWqBk`H1}$iyLKH)QO`3fI{O~zz+ZG;Z!&b`^qF}$@V{l}5 zfL0t`oVen#pqDobr+PaQ12TSGBsG9xAb1!;kQ$`|sjh1b&-4BOnJw7ztG3~D3;+NC M07*qoM6N<$f|eM&qW}N^ diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ironwood_log_top.png b/Common/src/main/resources/assets/byg/textures/block/stripped_ironwood_log_top.png index c3f06ce4e15e90abba90621c734aa978b3077611..faf4c0106a11a8336db52a2b60ff894a29dc8da3 100644 GIT binary patch delta 166 zcmV;X09pT%1LXmb83+IX0026epuLek7m*_#e|kwoK~#9!HIN|^z(5QF^Rhkxjg4H( z4EEk$aV>HOl91W9-R`z+yVE2g97vMR=6NK`wxzSvJm*|jqI8PFrOBZiFxpMH5H?C{%CRr;q9mu7y)$Fa1Mh3sb;g*NAJ%on#iH+VK|CP( zxDiE>Y+06H4#fqBZHFw&`o5;=mB0X`g`4r#?T6$C8KReTlLwyh`%wgQ9>DW&mj z2cUy|?X3=qV>QBaq<_&2ev;=%e_sduJnEp@!tTJ2F90k$3H2jpK)!GX=H?8TwkxndjJ3cYDq*vRCwA2!J!qxP!L4XH{SiVVkN(O0r$x5IIe{;Y%8){(soMd3|~QwORr2 zaR10=yW<=@`~439eZQvFhI8vZ1K>iWjDJ>}tHleGh@2mYZUjgG zqM+~B8N`}p{yzDdK;mh&N&odzR%q(G7-vsjV%{(8Sq)VL7ol+H~nLvkhPX1mLl zJEfBXWjk7Juxn>r%~sF~*R_C@NrTo)pV{zF_kIANH59O-QUf QmH+?%07*qoM6N<$f_0LzG5`Po diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log_top.png b/Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log_top.png index 80e5c25a4bcdd331028f86ca9eb9df1e9e50633c..775295a952d5c0b6582f9da805b11df33a20ed7a 100644 GIT binary patch delta 232 zcmV@})}AZSr$2afz2viOP9_!34|)FVR@*oO2Nx iCa#a1MVR!YiHQD_B_8^-_cGG}0000UnHKYNDG%Z9H!Il)w zf-dPn(rBGa=QO+8`RD)t8NK-W<@AXrG7*NxXbvzmM)UUUe}C@*eAqwK2djKZ<%FHk zun}+S-Qz>bU}W{(4lw)qqXq!@c6J89Ru}?cqnNbFu~Do=+$E$%4#4N*e zN>~GUjtX!&yJq1WTVc4i3$=tqoAxphhH<1*sHEiR=xaa={1N)i#%$Mn(4umeXot#) z8X9;j4eQI5iPU3kV|qT-75-lgMi%aq&V$LpM1Kt6U7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sS5Ki%N03ND zg+DoTG%sK)Cr{XXj&lG20D4J8K~#9!1;H^EgCGzEz`w@yE`dJqIDkaxHLyKCmiu4D z88lPK%3z2so1Mo8-R9*z)&qTQhWna9uV(yC4P4duL=`^ID@P_S2*s%#rXZfIQiG!P zZA|x5Oz#yBm+t*lIVhYV{y2Q360H0rP0Np;ln}2Y7GXy}n7iO!Gux&{g zB;H=Y64iH(vTez1y2OnzNC<<3>L(`*5)Yg`JW@A?>N`JHARvIcF`lArOU9!G0NKN% zCsa2E<-RqJQch#Hug^*!Wb;l)33$C(dCHgK^e&E4lqkee>XrZb^+vxJ1II47Byp5t z3VrZENZj|Hl7E;&cg9IR{F`XDnz}JvH-tpg-Ifa26q+zdP||z%eUcnUX?H%z=9ofb zt?z?!owsdyn8piaZe{&m+|7ro8*|pa-M(f#T3`xI9Hop$i?cZyWb;D>q80`T>&>b& z%?$y|DrU~6%Y%u+>Ly7Qa##K27fF>&Sb9Gp3=-ZyUN5=59(u_FmemwT^C)@4jICf~cewZIEOv2-S{06QQ$^(?b%pT5c^Gv|64s6gl1cQVzf*@fUriEF#_X!62LFX0RyXwU(21F3lrWcXIkyt?&GmCWHNu--O zoBZ6mbeJUR-~RwSK0IM7!}V5D9M|YDAsx;D`1$Jx0Dr0*1CR`IqFx4o=L)tm z00h1!8RP`M=5*c@^)kkzxzw6Co%eXE8}m8+#%8;0P0?XOc`2~gNQ1S8@=^dWoh<$_ zaCm%psu#YoiTX9o>#daOQ9tA5^%+|kc83+74im1oQe<3jCGWxg4}6X50r1k{3|kp= zn8@PdxE2|J(0@(_xqK@XGak+9xT)o(kX>zMNCr7d#V8d^<2{q&xTfO@I!r{TGtyck zCOS6v5@dsq;OM(&^W9d4jyt~h(4_Ae+?(vVkd&7~jty!fZDmm1xMi@D;G}xH!;0}} z-dfZ&?IT%A)joNu8x#0i%nE$n3QkK>Bl1pGD~T_!&r=fN|G^FQl0nX9yJR|95cRV< zl`0k{08uaFblyuN!0Gp%bU14>0N5Q?Vq7|$vDq%!9ac;y3pU%OWW-&jzvW-Q;w|&8 QOaK4?07*qoM6N<$f;-aQ1^@s6 diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_maple_log.png b/Common/src/main/resources/assets/byg/textures/block/stripped_maple_log.png index 742e3f2a2681864fdf2474c99711c359fc4a14cd..6ddaf66b99680d1276967697776c44fe3b587c74 100644 GIT binary patch delta 213 zcmV;`04o3C1LXmb7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-smyd^wf_Z*) zZF_TSa%f_1WL{)ePi0k3UnBIu0001cNkl){ojlBY*GT<}n5zPKV>d{nWe^NGi?!wqly5nZalW%DRr!E^YT;?YsSsbJNb} zgGUH41BADbb`IV9es(;S2Qp1MVWVYS-#2< zLa?dI_*sG%K~kze9ivp5OlgUfcZfWlNkTk2H8F~!cR~OF0EbCLK~#9!1;H^2gD?~Z;9q)y$P?<` z3shb}$4Y)R9SgmIJ%Gi4865(qW5?dM-v>1nfoD{Syn2vn1xL900Xt4}i~Kz5)_7Zz?3c$P9 zFRAMmwe33Ux&`3q!}|fex^9W%nSVgyex96C*DXz1p+-SKQ&vRN32BxMpbGrHMTtR= zwaZBiDoqYNz diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_palo_verde_log.png b/Common/src/main/resources/assets/byg/textures/block/stripped_palo_verde_log.png index 7256f12ac1ffe182aa9c232add104da605886a98..69baf7c7c001f9de7d32a471467086a146b1554f 100644 GIT binary patch delta 355 zcmV-p0i6Df1A_yQDSz|l!t>|A^W?tr;=AzRx$)n*@7=lY-M8)Cx$WDx>e{yG+O_A` zv*p;b<=3+0*R*2$*T$feZBrPIZw(Z;0E#-`H6rP9Tt(0|3F(Zr<9!lB8(pE%km zF#rGnv`IukRCoae!C6kiPyhhH>1!!akez^^9>Dvbh-e~<)IiJY=1lVW6{mf1E{bpI z{BO4kL!MR)6iTVXjK?aQ~zT^Q9MfM$Tlc$UWYz2)BUek7iK*4ED89k3|S`YoUfY}==z}= z6Zk%A6FDNP z+S3_``NE_?S7o~0?!YPvGm+l)db>R|5ar3Frm5x@q0(=j{vVocfI`}c!gWESfK_i& z5*Byeh`bOGR>mYhzFpe**Q*Qopf<*j_MMU+a)wq|fvr`L2KWX+W)6XK`Pno80000< KMNUMnLSTZ^mebn+ diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_ping_log_top.png b/Common/src/main/resources/assets/byg/textures/block/stripped_ping_log_top.png index 5fadc43e83680e556ccbcf4fbfed95a0c0038d91..13097f3639f911f124f433626fe5f8947af44949 100644 GIT binary patch delta 222 zcmV<403rYX1MUHk7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-svZsosoPmXZ zYj1aWlJ&XAa0I@BAKcrQ}@!>s!+4K6#cPwk6M!z77bYa1Vg@A3gz~bO?Zz zJ470^p5Ws0YK2Gxz{&F`00hI%uU|gfAaUV{T%4UR5!?0>;#gCZHA;tG^R96Fd6uB{ z#OHzAv~uT**MC(7;PD;yG);Z3^q4r-jDX&8Y5c8LI;Lrg(qoh!`-9sg)%r(&f$QdU z4vlnVj%HiJXlR;N(LdT9zFUXii}{R^F|yONp5!mSBN&=2w(U(U${LYoV|?qX!b*qI z;l^7S8eWujKgMAPV8gUs;idqCFlQ90rT#$21@GS;$PG6qP}fj2(fyYC!-ls?MtE;ngR#Q?7WrK)(KsqKuMcr@v_3ZRM;OEC+%2rB zeAMF1&*V-dHL5kj=XH;2;6eQ^1S7T>V{YE=!v0-izAC6bm0wSx3*jdGOJx86002ov JPDHLkV1oJwND2S| diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_soul_shroom_stem.png b/Common/src/main/resources/assets/byg/textures/block/stripped_soul_shroom_stem.png index edf8873046f4d70c2366ac006035fb5f9f0a3490..9c811bef9e80682cf813a8a3fcf5f9a341ad0e44 100644 GIT binary patch delta 208 zcmV;>05AX41Kqf% zh!1&t4|H}7X=@B(WGwVzS^xk5c}YY;RCwA2!Lbd4Knw-YZ?S;SSk$(G>ysjNaNq`r z5Iqs>ze3)_=ma5}5Dz7XZuq4Zx7x5j7jYX_TpthilBgpGTS-aG4u|y(vB03?hDb6~ ze_;x-Aiq&XJgMCHmflv?hW+f=r*@#89kUDv<~O+|B`On}Q2qhzq!H^&HL6Ac0000< KMNUMnLSTZ{aa6Vd delta 454 zcmV;%0XhEQ0n`JK7=H)`0000V^Z#K00004VQb$4nuFf3k0004wNkl*DP+nji0>fyG~y)q27<33MR3h@AqdWa4jrVS+$A`Kn$#h= z*PE#S6wW>WIsZBT$>{9%?$neeVm@aPM#M>iN>kz_0YIfGhktF()%A^yn^>bY0zk~? zG-YWCMW%Y>MHm5Ca*-(-t!X|#5yw0Sfa8(Fw)^hLE;dh(035bCwblTfstPfhPHD6T z&jX;y6#hE4$wL@50Anc;r>e3FnzBSl*(001xT?-CE&&iyBD^S~*4h$X!VrJO1;A)J z1;AgfdP)BkD}UbKTG4sV1Yi;b?Hz+LZDoxwb91Qcs*KUUwMZHIJm1YNx*1ZcYGR0WR z{szz)**{_~CeYb2o7wLEa>Zerqv)JT w5{gVAq-=kvPKgMDc7#(^{i-}XqT##2H=!oc4iLy4_W%F@07*qoM6N<$g2MRF&j0`b diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_soul_shroom_stem_top.png b/Common/src/main/resources/assets/byg/textures/block/stripped_soul_shroom_stem_top.png index f2dfa06561ddf1f417c655d9ca73816b54edf983..508856b24b9377a00de6e3c0a7dd35134fb9805c 100644 GIT binary patch delta 210 zcmV;@04@KN1mXdZ7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sTjS^@r>qo_ zlnrTXAWUx=KU^C%Nkve~ssI20dr3q=RCwA2!OH={AQS|^MH?W{0H1IVY@TO@P=FG0 z_hSDgID?{dc3V(zDtc8G5C5C}IOc-#g^3|K*bhmr8%&k6k4uzc$AcW=VXN$|tr_>1 z>|>-1^%SxRfwx>|TM1oBG8HT}2CY)Tt@k?pF M07*qoM6N<$f?#D*-2eap delta 518 zcmV+h0{Q*o0h9!g7=H)`0000V^Z#K00004VQb$4nuFf3k0005bNkl&f;BwerY2SbW1 zWfYECOeehh_=)9w2EZsB6A3}>>6fqPQ8)%55`rR2DU%qJG!lYzz0xs&B1>s^d`Zym z_}qW~2Ed=D2Y~H*l=~dpm1l)=p9A2$dkuh9CNTwI1I-U_=?8(X=8&ZvL02SkO=JF3 zOS6>TM$@CnQhyfH36G&nVp&*=5}(%V{iTkE14B|%B5E7JhoqQ_iU z>%aRtfIk=lV3Gmk&rVvm_M^%SkgivfpdSR3`7+ml@|Guz$X#o(xMR_|02h1#2KdS1?FI6rRn=$a<|56AGO z{0rCLXJ?buoH(^t)2iYMqi~FNN0qvq&n|vpk)?7E`rhosUtM(KX4m%pqW}N^07*qo IM6N<$f+HUDzW@LL diff --git a/Common/src/main/resources/assets/byg/textures/block/subzero_ash.png b/Common/src/main/resources/assets/byg/textures/block/subzero_ash.png index 47e234cbca0ff885d7e6d146263d380c85ce7f8c..b1d11504f51547b9f3a3f4053864c83b51523726 100644 GIT binary patch delta 171 zcmaFNc%5;Agd7ty0|P_ST=7ppinG8YvY3H^?=T269?xHqGEq^Xo+rR3#Pz|Gmj_Q> zS-0!hw56LfK8R%lRfl-GIEGZ*N-mi3TJMm7rsuh4#mAnng4%K?-|;iLb0X9$(L-Qj zZiD9%z0@01)XMr2m-#tcIk$w&QFoqQr7e8;EW=V4w&SXo{R}8`rQmZh^P4hsp9 zAsBL9NkltM=aS9%o{2MaRnyK5cntr4Qb$WU&e=b=Mr@tXe QApigX07*qoM6N<$g6YUZMgRZ+ diff --git a/Common/src/main/resources/assets/byg/textures/block/subzero_crystal_block.png b/Common/src/main/resources/assets/byg/textures/block/subzero_crystal_block.png index 2b59c150bf097a74457f7d020de3add2206bf057..4ab3c42949dabbaaf47a221e953b3750435c7005 100644 GIT binary patch delta 184 zcmV;p07w6Z0)+yQB#~kjkt8C2|N8&$|Np)B|Ed4~fZOq6xXenKr`|2Xf&c&jc}YY; zRCwA2!NC!OFbo91o6rE`WGEn(@(+;ZL)lF~T6KYNevnc%cRR69kfpea$@58|N m(yz*d@Df{W69%QuaxH&)EFFIV*b8_70000*$w)8n;u;d?}m9a@Uh`c lED)_S$+Tn8)9UB;2LL}3br62;L{00001bW%=J06^y0W&i*HY)M2xRCob(!O0N=FaQEEj2Gy?<4n$9 zB>jVaY$Sa3g^h3!wj_}QIKf6w2|nkB6ZF#FOVdOj&81oOWFs}StFVQQ+S^Xph#XjR zD>y+U?%KO9ganC{u32f2B-(aa+UO-+N7m@A+rqX=dH^qp0`qMIvM&Gt002ovPDHLk FV1nc2SgZg5 delta 204 zcmV;-05kuH0-FMmB#}8HFsc9l@Bjb3_y2&~@&Ee&Vz|sonWq2%01VpCrvLx|2y{|T zQ~&?}|NsC00N#VWS&<$J`%vw>Df-t+15cdX35@)V~h;}48}?TT@7If@YJ)U7^2^{ z058rQpA#l2+6Q{{kO!vPBj2ZDYTY3fL~VR zBRJLgWyL526X5fgX}alH05Rhz6CAF+U>XisJ#OJG4jV@?w{O{E;8@`KONZbA>mNM; z-dtOOa6rA9zlMAatu=dFHC{Uv0ER&}HY{t&bQomwM%P1Yjk(=)xE?>}>)Af9CIjY$ zKKFjTORu_Q5Pw1~umLe&Z#tOm&WzURDF9~W!BR26QS~nXwtEGRB{!Iy0nqNuFaT8T zG63^~zP#U+(Tj3_a*K-T9uNKErQ7~4&U4|g8({_1@| zOvcd#T^bvf#oktpx2qMJcP|MC6lHTVxhP0D$cO$ZxprrUQF62XpO1utM<>4lfvFco nDK`Lx-5wo#{yz*r#sR=T5_`^b}5XRD(wKR$NGzQ5z5V)ttGY1lH%N&t*WRI(bEiTvS9uJ9UeP$T*pP` Q00000NkvXXt^-0~f)gxm$N&HU delta 568 zcmV-80>}ND0>%W88Gi-<001BJ|6u?C00DDSM?wIu&K&6g00IC>L_t(Ijct-oXwzUA z#(&AuX|b{N4`pMhcnVm@=y}IoMo%JMbqIsC z<%f3!!1-8$Ps%QiX{zg9xVp(&Ngpt%R6Qof z6lo>w*`4??HZaQK>Lvh|)dNn60fl@_9?^CywQ^x`LLx>diJ%?Wr)Er zhtc&U0Jm?oWzVvD7>2>rWQ@049A~h<=QA}KlWT_zT8md{b|Nlv)*0V=Uagb7kk<9c6Wp5}o)?X?oNqDlRmCR_fWN@^iMFcTYswsvwxnTYQ0qQ($ UF!B!&00000Ne4wvM6N<$f?N@4;s5{u delta 621 zcmV-z0+Rin0{aAz8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00K2hL_t(Ija`#ZXcJKo zhriwKMuUkVe+Vt5il>0Flz8=KFC|_?1aB>ZB2-!kinQ2*2gQq}f`{VKYYtVU6sZWk z=tU)z8a0F{QG+4LrnG63$ZoS9UiNL8xxBaYW_~;Ky?M$|#D8Zm&io@9)&K~EG#2lB zxnM{5W$puTO84@!&tqv<`u20Y9!uLF?Jw}E3qAQ9K87#4rcLn$^qs2r)LRJK`KNz3oz zr^})hfafn-1pNRWYE=QKR)yaOEdaK*g=jLFB$vyH_J1CjZUy&J0@lo2hp|z;dlMRe zz6l0buk>G^$eEnAQ9&Gzod3wHjn7=XwoR#Q17I{e7|jm(e4C14u`sPm0Y^}EAQcJ) z0AjJ2gy@(vBZ;^!&z)J&0A8+{uy%=l%NctBq*vQ=M&52Jq#l0na_M8xTN;38B>=$9 z8wb*t&t|uY#bS(&>b&0UR z88~mHmyK8l&{S0+z1ot&POkvPMiW(4*xEMvQFH|zQ&olke?;>(*g3#z00000NkvXX Hu0mjfkro_J diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/crafting_table_top.png index ac53da4d744eb7ee63c77734f597a3ad20d1af62..f3aaa65a26972d61370f58d992d4951e07a2812a 100644 GIT binary patch delta 221 zcmcb{{FZToL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5ZA&Km0|_0P-!`D2`LW| zX$vt)3jt9nQC>+A9zJfinca#)K$W$gE{-7;w~}AX5zNWSiHbaE&=?vR5TMa8InikW z2xzD~ulDHjj+&Ls;yj^a(c&2k7Hc&x>`0i@u_$b@0gyG@yGwe8;tLHWmNX5^RSl9! znRx=5hDTjY9o-Wrd~-2$bq{R|5;PYV7e8JwLv#)gtAO`S$y>{t=UlX8W;k$DI&r_0 Rr6$lN44$rjF6*2UngB|yN#_6n delta 456 zcmV;(0XP2b0oDVM7=H)`0000V^Z#K00004VQb$4nuFf3k0004yNkl(M0 z6oo&!Kuc&#EMuiI02km2EcTGO&`aGl4^zFkv z_s4j7k~;ay0dOWGR$|IR7~I3D(nMOJ(hO;j(OP3BUpa4EAAf-TF2S=bd`sRHhzbRT zWV3w+;Qb>)G?)8bLSWDT`xwBtB!N9=zf0P0#>KD5i*oFnVb>JTCLv z^Uq%!-i=!b1AlYqvuop;eG?|f8{Wl@K$CXYLc^m%am~IT3k*{oo`>iO#AQxg*4#Bm zgz>TE_c{dp&OrmunGm>3;xZ?2mw3*ExXfA0S=))8z^T%`Y7fzL<({=ur7;Dgl0?Q>7&IMio0000RnA4b}!>yGlg?n zBWragOL_=Hm=gm~urp%%dZ03NgxO=3Wctu6c=7Vu=^JA1T7vzyn}Spu3dQpH@!htS-DjZTN5OU77R=m z(-|j;(tewndGo!0-+PP(h{enk^JzoOrwuXeA;fCTXdq9q8h_L8%6q?iK3BV`PU>A6o1#QerUn+x|8}_Z-nNY+=Kgv$w@~jj}gEc_7GVv1@Qw(Hs2~hRR?9a z7Bf$n#(gRUTD*TTc=P~xeam@%@^l3XQRv_(hd4R#`B89p>(+w#LD_M=5qb}t?XEBu z!)3cGv`8RFW^SO;Dozfxnif{SivZcPiRvn!nhL-VtrIt@d*h$6%>V!Z07*qoM6N<$ Ef)@q05dZ)H diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/door_top.png b/Common/src/main/resources/assets/byg/textures/block/sythian/door_top.png index 927045db2bf2c5550d989acb288812be5ee9b606..0e8440a026bbd5cf0e95c360fd36e913423b6791 100644 GIT binary patch delta 244 zcmV|yto(vV0sWu6jT5- uRzL>(a8b!b-<^;}fX0OZ!CiQ?0PP=E6Ef)a4xvr}0000TN?QX7k%gF}(hL7aplIH{nElc3<>?4o0LC&!Nd2X)q^j!vD5LqTv5G@2Ze zK_P)S#7i%2QJ>}R-tT*!S8T450@x)Au$|Feh9D!R!ra@oaDU5YZt#PI=a-cCw}j2s zEPjyCyNfwFoCTmii1XN5RbZ&({vhVI_nA8s+_H)7WQF}8$$iaw*4UhPvI4F3?EDCm zpVS!TlOcHC3;@I77qzOu4-(w6iP+yDl~Kll?Tr4b-l~AkiO!87BRD%P;VqjiRB|qa zjG%Mb7M;tsfPd^RLujm6G*&DYDkd@lLuEAUR$lq0+b(p{yL;XY&o62IHW-5n9+y@3 zDI)EXR=^LE!W4f&#Ts@gV^%?ilVdBJg1$G#xZyX*P?tGVtB~0r#8c%0SljKUi*AdH ztB_a!or5iZG{L-MPE4VXZ98y(y(gCDdK~RMaDMzY`Zt2=sPFi1&}A&B@E-*ppNg@z oGqwlKx;0e=m8hdu703|20i9ij2>GSITL1t607*qoM6N<$g6Oc;p#T5? diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/sythian/grower_item.png index ed49fb3e13bad21bda30c3c378504d2a69ac445c..d5d60e5eec16988433fe09a5badede434cbb3c33 100644 GIT binary patch delta 209 zcmV;?051Qg1CIib7zqRe0002(-QrS_J{OTA9)B%ROjJex|Nj600OY?Y|DvqUt0-VP#8-@Cqz9Vk;&uA00002bW%=J004HA%{Tx609{E$ zK~#9!V-SP_20=kV0YOF(Lx6#yn1K-_!oXC{0G6uKeKHBmSfw&^14v4M$@euxia}-i zYC153-S^c3h=|he-C%}l-b<*O7VQGCfr7FR1t1KWi%^E_L1YmC)wdQ=#$>&e00000 LNkvXXu0mjfgPu{i delta 362 zcmV-w0hRub0;U6y7zqdl0000V^Z#LyHXxBC6n_CbNklaMg~k! z8Vo>+kTF;+706tY0p=i!!vKl_jEsy>76d#!pb1fZa0ZwH0dzGe27o~tVJ`4fnos6e;}JcntPV>G5q}bi$PlM1y;=DdTIfoY=w7KnIZE0uWt2=OLI60|Z_0WWUD$dpEu^{QdKvp>-82 zSj^r0K0`_Of3RAjU9h87=*umijXeE7l-HUu9a=mL--xB&wL0EO|Nb~B^8djJ3c07*qo IM6N<$f>~aj_5c6? diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/leaves.png b/Common/src/main/resources/assets/byg/textures/block/sythian/leaves.png index 0f52928401c9ec3ce2077559eb68eb53ba1474be..86fd12361f29ee86bb79ba19fa0b62b5f63d93f4 100644 GIT binary patch delta 176 zcmV;h08jsp0_XvdBoYa5NLh0L01m?d01m?e$8V@)ks%;|4^T{0McKCwyPXH3hX9Im z0C!^mHdKBz0001DNkl{*Yhd$pRGI2ykna@S$gn<@XtU?#F2&Pp)hWJhwo$oLA;N^b eBhI?Wkv|3#@)iLIEPd7h0000ByOjMMpN%wSd43W4j zdiEmkVFw(jue46Usfwv=%I&7ld91Bpj6WQD*mw0`((cH} zL!a^wT?0B}?QVM+kHlwz&`004nWL_t(|+6BSE4TCTc1i%F;1*8MS1Lbe1 zfQu;r4pV?R8USye5mIEAof$-DyR2r&GX1vvY|-Y=-PFmDnpdiey%C4XMjJhPs@K31 zx}|+|-Vn&7#tYGBvGT3aRIhTQGmtkPfd$2kv+EW6I0O#MgzF$>eiN%*K8h%KE-p~l YKOZF>}*#H0l delta 444 zcmV;t0Ym=o0m=iA7=H)`0000V^Z#K00004VQb$4nuFf3k0004mNkl;osXE2+_PfQ^|lL;``C3qBO0ztZvE}Q6vXp?TX zh}YZQZ7*r=?)BY!-yf~>a7)n$pymU>*ALt955V_ipXHFP*?$W+UP78fyD5oA0FxyxL9b(5soa6mMhou7z5wv}R-#DkIsoVHQW}JHd#d6Z2GBaR->ovy1;ABSnQBK1 z$;F9&&QB!|QtNwSy_@DzJWKSqV1^PiS_l#~UD0udT{Q~xFH3WQ?R(mRMzG&_OTiST m-L&b{e3@(_3yo&k8vX&KlB=!?EFus90000?0B}?QXH)=TN&r?u07W$bpC!qp0001#Nkl%I3Oa$>Pz3eY{zan)VQKT4J;UtoY`dH?_b07*qoM6N<$f@g}#8_yr&2`uK4J__Hz%^Ij*RZs;u(Q_>U?B>E3bKer7LvG_ zTrRu?EnX(OPd)rMZ)SKi^Z(C#GxKMkm!$~4dH`^K!xUZxynm{-(*dMI-a+C7THEuC zCxO;BB;Aa#E+pNI#_AlmxBn=AfmU6d=5$gQl-ubLUI7_Jvx4QH ReTo18002ovPDHLkV1mR*-iH7H diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/planks.png b/Common/src/main/resources/assets/byg/textures/block/sythian/planks.png index cae3a0a7e1ac992adf1aea3464d0ef6ff5bc8e27..8494f4c868fa47e656e129fcce144076ee61ffd8 100644 GIT binary patch delta 199 zcmV;&0671x1J?nN7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-syQU4SlnIuB z1$$`(XH)=ILI6cI02Ki@=Kufza7jc#RCwA2!Lbp8Fc3w-M?lV(O#yc|6o60%77Z|h z+<~wE61c=e+A9KM4Hq8Be7M0^1+`UF8Fr-I-i5Yi^4^iUxS z@vuy?Y0O+^Gyl$H=G$>@uiXkD3={wdL*vC3i(mTm`-d&c7Jsu`ljWKutynEJqp@N- zaasj8g|5&35LA*@fF=x7T__9y+`4FzRwQZ3bm9;OiYzxp)&)4H$5a5mXDW)Y-nM>R z>-(DXaxm2z|4D{}}uq{{y{t%tXD8f3g4o002ov JPDHLkV1n6ay*B^= diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/sythian/stripped_log.png index f1003708d9081ee49757e212b834e3c989eacecd..6e63a98f5c1c47d9e4a10ee184a1bb44474692fa 100644 GIT binary patch delta 217 zcmV;~04D#!1L*;f7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000OP)t-syQU4SlnIuB z1(bdTo_7F%Z3T8^1Z-Udoi`K;0001gNkl*EwZ?dX z#tV!BYn#;WP1^JO9&!qU7gg9T40PJDm=27kVZT?;c&S+5*HR=DLm6Fi@oAW{qf2wc z^b$&#JB}(b20ozK$0XcP@<@}k;m46RXv6+FiE2Agma~ucJuq1&ZS5$Mgr5BmbMhD? T0t&~G00000NkvXXu0mjfe9&0t delta 436 zcmV;l0Zabr0m1{27=H)`0000V^Z#K00004VQb$4nuFf3k0004eNklfiKakBydU$yuEu73m{K>Hxzk9WRZIr!+L z==TGJ=ZLPG2tfGT1O7*pR>D{Vx^9H6oPw#}@Sz7acJhTNsSyH&wuXU%atiBJ(M`+& zFHf@f^M??-67+JRsGEo@<FZTb^zbK& z0+ABCAHHfa^;;)>EPFga-)tkxg#x63?^Ys7>H8pez?z)`A0$zL^K%I#HIV8}Q+*J{ z;aSe>i!;?(@KwvpQ`^;C1!w0000vrA^!bdzQ8OjF}EGUqLXdi&oFxcSNh_oC(n? z^ortLKTqGYVgpF1G&kE)Rv2TgwKf&QGv-n#Rt)}lJQHDwP~Ic}0000-%r!2Ef_0jf$4c+MM441-H8a+HeQ|2S6G(SZvnWQFe>&`E=$v$wJOm m;njsVz)1|!xgaUMgv(>iouK`xcft01UDb_R;i0z=9yW_oD|>eM#}4H~cc0IZKXyolRiNZy9ne|^Pgg&e IbxsLQ0G?G-z5oCK delta 344 zcmV-e0jK`q0p|jc7=H)`0000V^Z#K00004VQb$4nuFf3k0003YNkl1 z5QV=Lt5O8Xi81&H!I%`efFTzM!dLL2k~)`glN-2lWeB7Y2-%VdDiY9wQfws68rdfJ zHM_j|d$T*ERx!dhC_7oP^|LjCWk+ zzwj=*oJJUcCwn~y=_l`3DR2^;s&Glw)e6*dK_lnjcrL(la)3Go1*r8~;QYB9)%E)~ z@w5BC?QVcw0a4usY_>IryRgh@m}RCwA2!GVzjF#rOw1$@a&`tSD7@KTJi!4d{p+BE1`@j0#rvMIrG zLx>PdEb^;l$$U2J$>HJe=_M#U#q?e^rab8y>spLkudih(sz}p{*;>r5NDqSN#hC)I zJEHG7%PV=GqNr28rEJ1}SL{yK9Z>BKOXHptZ;Gz5h}&Te_y@nNPM={Q%L@Pi002ov JPDHLkV1mrZTwVYG delta 210 zcmV;@04@LU0rLTnDSwoI7_5~bduIT>r7&t-09s1`Q56+eAt7ZbC_xq$axyYd8ykf} zLTtYzzyJUMhe0X* z%Tw)@rmeERd)w(cZQWfxRnt`hV?FT4!OT(6I9UralPD()VoTUfFA@n_fj{Euf$S_B zffFQi-&?~LvHh0NnY9K}QtvjQZ={LIs0>j$XPY3 z+4g?+ex#*7RiFE107C*PfMx}n4QLvW5=aZM7{Cxf6W{AtulFi`vufV)2S6MUw`>oS RM5F)!002ovPDHLkV1j;#K7{}P delta 164 zcmV;V09*gV0mK227zqdi0000eEe}(XArybfoF>k!5}$h@dsj8c!G4th0004WQchC< zK<3zH00015Nkl6WIbQPx_2T)0ddhr(JiG+_7tr5~>rimM0M|RNYZb|e7=x7!B=2vd+yGD<0wEA+ S+T9EQ0000LC`-*YwSr8GbPDcwUWKg4C2pZa%KSGQpbxh6yNeap>IXfu4+4}IeXmN2igBme*a M07*qoM6N<$f--qpBme*a delta 213 zcmV;`04o3g0fGXMHGj#RCeEx9t8+n&Xh(ZjHE2a9!HHO}f?J<^APU4&wEzGB0d!JM zQvg8b*k%9#0EtONK~#9!Jx_&!05J$dLeloS|FG}yhPzmLhQLq>%5?KA@Cs_l^0ch2 zrRKq%WdYHCQA;#&@nO?x7Ovsy*dUviICVeisZe2N9D5qsxK1UL7I}VAf%tg;#LL@@ zzt~8miF^8aX3*~z+DsYwdxuV!49<)>ef{6Qv*uetr63f)-|`ZIT9)S*RXq=jPMQeG P00000NkvXXu0mjf`2}P> diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_stalk_large_leaves.png b/Common/src/main/resources/assets/byg/textures/block/sythian_stalk_large_leaves.png index 5fbbf0d93d04d6f13392a4087b9d2979db5e18de..65d31d2f2c3c4d1ce6cac1f04193f0a803a81951 100644 GIT binary patch delta 188 zcmV;t07L)f0pkIXFMq0$0GWdTigo~eZ2)dy0A*GH9x(S&00001bW%=J06^y0W&i*H zc}YY;RCwAokI4}OK@fw`F|GVF_G8N=0KkW0Pyl!X*@>J3-p-cg?0JKCsv>7;Z*a04 zXSUJ-j@;!YyTGYRH{ayIsady^Pd<>l?VYT*yy2eQJ;m<3<26}MpHwA(ZSSd{dw`X9 qs@yLfhn=QW{!YtnD2P7{C;&f++yc^RW(7R}0000KCE{3bdp>!#la(5uvf6;NiH2))YCE{Hu?EL@Z0RR9nlLdfmnw2h)$#iO_3uZH`C$m7W>wT96 z?z_c11>S)Vz@;UfSs=|yHtm8;T{g2*pzGx_n*qvqmkI#yI~xlC4gdha55E@yVND1< QLI3~&07*qoM6N<$g2>uBmH+?% delta 166 zcmV;X09pUW0m=c8EPtwz0KTRGigo~*g8*e#0DNr#ZeRegiE#q}0004WQchC3G-;GC}0J#tW US5n|C&Hw-a07*qoM6N<$f(*ezl>h($ diff --git a/Common/src/main/resources/assets/byg/textures/block/tainted_acacia_leaves.png b/Common/src/main/resources/assets/byg/textures/block/tainted_acacia_leaves.png index 8c685a91b1ac40c928120a008696a4929f089ef7..0dfb0f6f80d408da62b44c8f90c8a7fda147145c 100644 GIT binary patch delta 291 zcmV+;0o?wL1KI+RBoYa5NLh0L01m+b01m+cxRGn^ks%;|NKi~vMF0Q*i+5&&ZC!e2 zSbSwvaa~Y!TugCTNNQL}X;n#UQ9@u)LSRfmTu44xNjz3UI8i|~PC+(GJ~K)?FGM&l zLNzKsGblMOB;Mf{a{vGU0d!JMQvg8b*k%9#0FFsSK~#7F1;K#(egp>NU<*S z1?nx6bF;m~TN!GujzJ)H=`tF$PuOW#7cu@usMA7i9^aCmi-jIPoOqOF?35#Xot1YU pYD5d0_I@kvCz24D9lp=@2d5GS(dvV1JOBUy07*p#PDHLkV1f=^ZXN&t delta 329 zcmcb`)XO|UWum2Qy?205h--wW4Fdy1O=?JXpp&JZN}!`jW~gUjY(R{MT~>sLm$iPF zlSP7$ql<-JReFS%ow1XtmY<_pb8c)&j8AuYn!T|`LV#0Yga^de*7LHdN zHa8}JcPvxUI?j1A)k(0d`*7&mX<7U$P5R&WaISr*a`AYBb%~Ves)*GrUK{S@8FOjs zcBGwtKXnqfnceb&yBUIypU&)*_lmBN2 zUTWU|wmH8<{f9-|H=g?@|AZzND&B9O&Ko=Je{Jc@k9ODjdol%z6#g2S0$tAF>FVdQ I&MBb@0K-6zG5`Po diff --git a/Common/src/main/resources/assets/byg/textures/block/tainted_acacia_log_top.png b/Common/src/main/resources/assets/byg/textures/block/tainted_acacia_log_top.png index 1a553679a714adbca600a594241bf1eb7fe684aa..8ce32076313370b5825df46f5426914d70e6b1ba 100644 GIT binary patch delta 295 zcmV+?0oeZT0^hi`GN4v4nNTZ_ zOe$(vNMln&T}?k*Njg?XI#WeCRYW#UK{Zf7Gf+P#D=H!4Lp zDnm9aLp3QvGbcYXCqFVJJTD_SDwXbN|zMrQY`~^e^yFjZ#=2b9jLTl~2ascVKJ&mT&aN8fO2B43< t9BJc>@{zam^LlhY=K14xuGioH0h>%nYv@o7bN~Pf002ovPDHLkV1hvedMp3{ delta 287 zcmV+)0pR}Q0`3BkB#}8HUR_N;M>#D^J1#>uD?&3TJTD_fH!4m+HC045P(U+dQ$xCA zH?3VV!fii4GAEBrDw$9#pjI$LH7PhNAV)VUNjoo0J1tB)D_coAR!2HeKQU89IX^Nb zYFJ3T9!y}7AsBz1Nkl8?a6;0gfE&hf7$zT_ zkMpu(r9mi3q`gL5n6qlpVo*&R9CJ#iid1@BMJXLDGGJ$+n8)-&6^BVwB)5ONl@&pn zLQ0X+ED`90+F_Q6^&||XxfaxxqMB{&nR0204zmP!i~Tc|B9jpw2d%dL!5z2O+Lr6v l-7!CWcrNu7QMYisKVLsj444WG&y@fG002ovPDHLkV1j<8ZV>00DGTPE!Ct=GbNc004GLL_t(|0R_Q<0l**#1F#Ix;{OjX@l}s%+tpVvck8RG zy5=0LeAUBT2SVnC=z*vvq^mDdU){A*T?1eBM69_BnH#E!Ac*>Egu@{|$5&qmhsa@i z?s8yd*}Lq4ki&USAZs^!@;1A~K5wm!JnVZ<_PuAH{Q-gix=nrU0U{SN5$J^aSxUKWUKua=%lL!_vnaON-{7oY`ONN3P^F4 z1o;L3hXIC7XLQa_RFtT1@pN$v(Fj)U3lw8eh*w5)p`>HB3}gt!H3hcya#UrDflCRJ>gl_b|9er`m6U zPP&@1pX~2jMU#Qjj3q&S!3+-1ZlnP@xt=bLAr*|Q2OAj=7;rEv^n`u?f0TIw8$*z! z2XpL7xp*yRpYyxch42@gHn!!?l+*vKyToYT^iwqfE6dge)!Hpfx4gWWFK?;*cAJWz zNEv=3zoqWyEerC(mS2C}*za#uJU8x=%x1m06Hi(B^+(!s*fZHAX^Q;-+RWhT>gTe~ HDWM4fl{rlF delta 211 zcmeBSTEsL#Wum2$$)#oAc2vB5asJ=3xQEJqvekYIbkfy=dvq8W7%YU}Mgu9%k|4j} z|4_gX>|Y@?QBk74+SA1`L?c+YuTzjgk%PHeW6A$6{l;RM`B!xsq&U`F^At=dHWTk? z7CyQAj=j;RjdgZ?RVn)71)EF-!^@Ks$vMDh!fS6PIRuk^7XB0QQIB?xr<0S$v8 UVn+EXC;$Ke07*qoM6N<$f;Cb=F#rGn delta 194 zcmV;z06qWn0g(cbB#}8HD8Hq0#;h%ng>a9O$TTrqP(7qnXDBTQ0Hc0m;5Zw7C1YA5cNtruuWZ; wVbsIO=ld7J+=!_N0I>iHmLZZ0UA|I&uD}Bu!UbWa3;+NC07*qoM6N<$f}zt>;{X5v diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_beach_grass_top.png b/Common/src/main/resources/assets/byg/textures/block/tall_beach_grass_top.png index c533cd2f298cb23f49c671419055f769fdd3c3eb..6eaeb8e30c670dab979df376eecbe7304c4632ee 100644 GIT binary patch delta 163 zcmey(_>6Ia1SbnK0|Ud`yN`k<=1ELcQK|>=UY~w^d&8~si?1G;c5zpi71tvzpeSQW zkY6x^!?PP{Ku&OLj$9Mq=2iR z%R)9z?VB5tZUs!^-5xFZ$L5rZpG&ls^=9|XuPgt3TDAJz;idlbugk}O;$#*u)ivV* O8qVMe)VIzlp$PzG+dj4c delta 181 zcmaFH_?vNp1SbbG0|SGGE`RVuGgXbZuTMX|z2VmR#aE9^ySS?hD6>VUIs-_tl?3?( z{|5nv&HI<^pQtENn&9c;7@`pz+sDm!K!L~UW&7{=%7EV4#+lswxh(b1*^0zB9AtN0 z)mV9g?MlR%dq&%OsvLiuV(ep$57>Q;t269Q5!-9=i*?5OO$915FF#Gti#S=NT$QB% h@+OOKs_j)*JI@;|8aDf*4+E`d@O1TaS?83{1OQEYOeO#T diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_crimson_roots_bottom.png b/Common/src/main/resources/assets/byg/textures/block/tall_crimson_roots_bottom.png index e4ceea460371679310ef415417735c318f5e041f..599f9e4346f2a7faa360533c18a43db2585efd4e 100644 GIT binary patch delta 200 zcmV;(05|`|1BL>S7zqRe0002(-QrS_J{OTA9)A*0OjJex|Nj600Id)lk_I+r1}9Jk zDs@Zk761SM0(4SNQvd*Vlg&5)003`EL_t(|+9k#@5`r)gK+!)5>DdJPD5hU$px=P> zLAd`}9Pw2TxjoaeOOMDLqg+Wb{WGk?m2~dg>&m^>Dm{dUS_fcbRuN67zqdl0000V^Z#LyHXxBC6n_C)NklIKqiHv;r?V0R*n{|@S%)RH%*?Z57b+Mms z#H+>Cc$BY2;?sQF_vGNbsDl`zg?8__X`ZvUYS}()#^aUp-7cEfOq?gDFd+a&%|o_p zbAN3#2BJgg34llYG+Ng|;vq~3FtcW547x#xJ)9R!q1VA-`Q>vj*>9T}&p*^fz)5{~ z_U%br-?9bI0oL>S#k*0hxYWUMu^zAMCwH3JxdDI>fJcPY6D@ipa9Hgg6q~77LWrCd zJ1L(8L~wYo{P7&uDKS=fI#72YC`kaJM{;yq&Du$QpYdmSMDd6p!KYEW#$X<+uCtrd zs!wsyY(Ni(KmYd{@kVi=xNC}xV`kb^p*(;`Tvwja27r_pBo7HcxLSnRa}b{{t9j3J nF5Q9@1(^jTL=7G3u$kE(r8D^-W-cZI00000NkvXXu0mjfIySj& diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_crimson_roots_top.png b/Common/src/main/resources/assets/byg/textures/block/tall_crimson_roots_top.png index 2c3e4ba1bd463951efb5f4eef84d1b5babadd0dd..f80b82141b0569e721fc38587597d39e5f45ceda 100644 GIT binary patch delta 207 zcmV;=05Jc!1C0WZ7zqRe0002(-QrS_J{OTA9)A^3OjJex|Nj600Fnkatq>fN1~z5} zCr}0|(QIbi00003bW%=J0006Mc%||H0044HL_t(|0ZqX%4udcd1i)1=)VI3Z`~xAV zageEr;`AWk|6fR(8T@%{ZQ1~!Y1;+>(!TFk2jE<{`$|B!mh|oB8F7RMbHM5T%)Oxg ztT>wb3XVm~m<@c@II9el!WS9nRWTd}vPez?<8#NG25KnEv>$p45tc7gX-WV9002ov JPDHLkV1n8}Q#}9x delta 380 zcmV-?0fYXH0=NT^7zqdl0000V^Z#LyHXxBC6n_CtNklB9 zDg}CinqH$N{sWc!W2k7=LaWhJBlM_A*km`k8S|XGXPnvG&YNuJe9ZfvkJ%!GApgOj zJ2RYBJA>nDJt>1dL$cX}KNt%Z+FTnRb%*F}~En zL4UOwsIV(@YA?yS%lwUC;Eq8BAP~H)=QRkKR+-s^uA8UgPQG;yC(XU)Gy$yj&Q+iD zYH?Lh^FiO%4ru+ReNM~4_n@*7eeO}dCL`R|v#FYOa#XH`_j(yqM}p|PB)=sKlByzr z5J8kL+SkG^SyjuA+6U!juRyh!oPo?Gz-3AMz>^WyU_=ri5y@jJBVw@KK<@7bBmuBD z{7JI`6QVmKvj>W(6OjoVe!dlueFp%a9JYTgkO}ZqT&5GhaYX6NL_9J9BLn}t61TB( ai2MT9{L3SV=oY#F0000Mj5Oiv)-fo_hgpl=~ih(bbLL zIh^yuS__=_7L@|`K2bFQpUy-Xz(htAfOIwjKxa}7fSpQb0Vl{B0{}4s0Bsb2Y*#k` cvesJo189Z6aYs;^UIP*{~(%D}+DQxfDC z%0_DvM6Hq*PJZLvMTE?@>L~_V}jUFt$me#hs5CXyvs6+vg TS*h8t00000NkvXXu0mjf+^Rwr delta 166 zcmV;X09pUc0nGuBFMqBf0EQkGc@_X(0svta984A)n-M3p6hkGhh!_9>00DGTPE!Ct z=GbNc003P{L_t(|+I5YG5d={PLIwG$|AtRTFYn^SC&6xY&i(<*zk&Pwu~R>G{Me}= z)4ND*@O3(GK`7hj^qk@lP?bkmG9`B2Sg0kVFc_!=nvjj68Xsw(TKY?e7Gj4n?WNR!`UL;9RBRxbOGj6riO8@`>0d!JMQvg8b*k%9#0B=b|K~#7F z1;K#<10e_mu&8g5WB+}dfG`ZRfgv)?S=dW-MjJT$7~&=aoG;Aj4B)0u4>K1~+%Wen zHuXb@vzN0%cqjty*&06@%lqi!$73DmT}riAoR4bSi{k5rl=Sne)rFKvcV5>6l9^;O Z9sbdE1JC6?2*LmW002ovPDHLkV1ljjS#SUV delta 246 zcmbQvbbx7s%0x?9PxSzw5LX5U27hH+7dhkX0}Dge_O#vF9jD@H-B9|FMGaq7kgx&nV=g$l zn!Xf1*%YO4{Ptw|0FFZn(+|XWc~|ZfIy2LMQ{u$vPd8L_s}dG(dSmd7c~2XYwRp1D ze@-rkI&GGl{;JES%?*A(G3aO1MfZuPn1t5#2 diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_ether_grass_top.png b/Common/src/main/resources/assets/byg/textures/block/tall_ether_grass_top.png index 30ea71aefbe4b9ab60088b04497fe71a50a239e9..60071c7b93a531b26821e960a758a18b55249df9 100644 GIT binary patch delta 213 zcmV;`04o2w0*wNYBoYa5NLh0L01mKY?e7Gj4n?WNR!`UL;9RBRxbOGj6riO8@`>0d!JMQvg8b*k%9#0A)!;K~#7F z1;K#IQD5#ZPTG66UbYk0DCUrS+Po4!x{-nzMn|o}uXruYH!u9^m0qux|G4w)z4*}Q$iB}Q(b4_ diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_pink_allium_bottom.png b/Common/src/main/resources/assets/byg/textures/block/tall_pink_allium_bottom.png index 10031568e72a9fa9802a5426fe16897c3ec7b084..13272c14eae7d286a5a46a04df68e4abf2acea9d 100644 GIT binary patch delta 203 zcmV;+05t!u0+<4jB$0s?kt8C20002~&+Yc6*X?-0;a;y(j4Yr|fh=bxBTgL_IT@mA z$=v_|00DGTPE!Ct=GbNc004GLL_t(|0R_Q<0l**#1F#Il;{OjX@l{{dwyUq;+^w&U z>bf&n`KmAH8VETzL?4K1Lc01Q_0?G`)pg;kz7gx(g`69zi6Dsj>IlO=knz>m!4Mfv zpSujKEPIz72pQ&?K-O+{@;1A~K5wm!JnVZ<_PuAH{Q;3{18M|?QvUz|002ovPDHLk FV1im;TJ!(_ delta 223 zcmbQiw2ogi+|_eep`0^ZNCjV5(0??&Mm6(j`U46R0zio4qyPW_002ov JPDHLkV1hM@S5*K2 delta 212 zcmeBSTFf*-Wum2$$+udvq8W7=B)h4*_ zok^*g{NMXeS-m=bp81vX-G>a?`r1X8wdZ}hRGi1GeKl+T+O-m?|L4AKOjc2Q%(Elj zV4i%&+JrhWH?!3IE14CXJ_c=x^9pa3G=02o?4vHRpfFJOFT+W1Ay#Gf?Q-lu=P`J? L`njxgN@xNAdgxl= diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_wrath_grass.png b/Common/src/main/resources/assets/byg/textures/block/tall_wrath_grass.png index 8b217fbbec8d57d0e24d825d7fc7857c08de1aff..1dafa1df08e46c95e522b07bd288fa89287a0f56 100644 GIT binary patch delta 150 zcmX@hxQuavL_HHT0|P_ST=7ppim^Dz-HBn{IhmJ04o`qjh%1mzSGNjQ&^Hy5;h(a) z3Z$qc$S;_|;n|HeAjjI%#WAGfR_;MV!3F~Xh7EtVJGYkyGK)5G?0LYVE#uR1h=FrI xlcWpVMfPonqUTnNq>F48b&rnOS@A|b>oV)r7XH0CN}oS8%B(4P&Aqf$)IRJ=feO-7@T|kh$M?}2BMLu z9EvyO_=JhGC|E)NKg_@A{zf(s<|PaltbK5i5ypP>=`C@#qBgq#-4=8{vN(nd&}~Hq r=;46X02oMDxB8E+VeNy9jOgM3RV_DJNh)wa00000NkvXXu0mjf{2xrJ diff --git a/Common/src/main/resources/assets/byg/textures/block/tall_wrath_grass_bottom.png b/Common/src/main/resources/assets/byg/textures/block/tall_wrath_grass_bottom.png index 90cc6644b81ab52764a0bd7578587ae7b788ec8c..5b6f20e7e8428dea480d1e7701238a58891e632d 100644 GIT binary patch delta 176 zcmbQjbbxV!L_HHT0|P_ST=7ppim^Dz-HBn{IhmJ04o`qjh%1mzSGNjQ&^Hy5;h(a) z3Z$qc$S;_|;n|HeAScw*#WAGf7VE){ybT6C35E=@%;zmNe^p}D{MPRqhvueu$2h*^35O+~nz_uMd#mcgzW09_ Yx!nX_9^GZu4YYy5)78&qol`;+0OnmgBLDyZ delta 260 zcmV+f0sH>I0h9ue7=H)`0000V^Z#K00004VQb$4nuFf3k0002aNklejImQkQ-g| zd%zyGfrS@T~S6Pbg$7W%Z^K+U`$-(X9tNA0tGL5 zb`@CiME)5JbsG=Yb4HvfKmdp55hV|aRcPY)GMP9a*s|c2=JW+lGj$O3bPJ3C0000< KMNUMnLSTZ7du|l~ diff --git a/Common/src/main/resources/assets/byg/textures/block/thereal_bellflower.png b/Common/src/main/resources/assets/byg/textures/block/thereal_bellflower.png index 9c2921c00d93b82e70a7f31752b2e9e21f419cfa..b52dea17a276ed1f55c7005cb7b2ae575762a163 100644 GIT binary patch delta 219 zcmZ3=)Xp?PLXL%*fq~)e-A6${inG8YvY3H^?+^$xifVW@OjJ~;R|)V5aRtgg{r~yF z{|`(5Uu=22IsC)+)O`~YHnsUKDD5=P%hm~Tku%=4-#`VZj*i4=gpT><$kMCZF)y6x;Wm!J$vHc}4kx zdvd%-wld7V%zvVpt;VR~?hVH?_gNoZxVN6^YHHoP&LwlU3oj}0VO-O&vHaifXZ(M* T9?ahbw2Q&h)z4*}Q$iB}oUK}2 delta 229 zcmZo?TFNv*f|G-pfq_9omp^!-nS!T!fKP}kkiYc*#g@mLQ}<0s*wpsm|A+7o+kF?5 zy2u%K8s}x}ggpKK8K`Cjhucda#aj~O7yKUyFxb9OYMZDiQJ?4O;uxY49NWh&#H`5S z?0rWo>0SLjw$iuTdYGU2{@C+FTzZC_(S3(aF(=NmO?tn2oBo266J*&#Li`UWuXwV# z^=^2qLf^atO&4wQ5}12s=caRWMY?TBv XdF7MVLj$0j7(8A5Tv*mQB{Ts56SZSV diff --git a/Common/src/main/resources/assets/byg/textures/block/therium_block.png b/Common/src/main/resources/assets/byg/textures/block/therium_block.png index b4e99278d69f88d899205c84883876a60f9ac9e8..f2cd39473e170b4e4e409223c79afa69fcc1470b 100644 GIT binary patch delta 184 zcmV;p07w6Z0)+yQB#~kjkt8C2|NsB6=H{Q_)QG;acBq_Skc3%{f_t9KCjbBdc}YY; zRCwA2!NC!OFbo918`1z1XZRE31{^7Wkd*@PxdTl9C1e-W*s<{o->BtwLyIQokO1ut zo~goLqdV*$w)8n;u;d?}m9a@Uh`c lED)_S$+Tn8)9UB;2LL}3br62;L{WPDb3<^9L*XMZ_^)NO{7w-imH*j6mLbZu5a=;bV{;0FxKxeV{zX3Tg8G=Ra=)z4*}Q$iB} D4-`CF delta 155 zcmcb}_>6Ia%0x?9OX&cg5LX5UhK^%f3ubgb`tdcYA^Z3Lf7_ouYCgRmC?2G5x&TOV zmIV0)|AzvGVE+oCiHZ^-_MR?|AsWF~PY3cHFyLUia8RS@zi{~N{dW`8*giM;+kMt% zsL1!@+r#d{!2BdDvH3dV%`laNSFhGh^xhomwTV%ViQPnPY4atZ1q`09elF{r5}E+- CzCnQi diff --git a/Common/src/main/resources/assets/byg/textures/block/therium_crystal_stage2.png b/Common/src/main/resources/assets/byg/textures/block/therium_crystal_stage2.png index ab535df2407e01a7bfe0e0abcffca0b2bb6965e3..e1b3f0ec31144bac950bf8e5d249c8d83f9f7bf2 100644 GIT binary patch delta 200 zcmeBW`ocItLXL%*fq~)e-A6${inG8YvY3H^?*IrhW?k##oT#W!uNdGH;tG`g{r}(V z?_VDM_|@htzRP$jqpQUz>HtrlUz?b|!QmvQM6q;tX6EG|S|+WM?BnH`(>X0O y^zsokgMy{0OT)K@8p<0O=&X*43*Fbi$Pl_)=*H~T^4>tR89ZJ6T-G@yGywoveol`7 delta 204 zcmeyu*vm9Qf|G-pfq_9omp^!-nS!fIfKP}kkl%cIf5)+{H@|#%{r$_a53dSlbVoI0 zKl<_Y_y2#}pFIL9_;rnC8j#{C3Gxg6j{pop_s^Z1s3?&i<>}%Wq7l6IY#?8Q0SEJi zK#^@l|9{^)<14&hRb|R|#)?amn&q5A+$j3eL0dI>NS@$?C3_ zoA{2@1IJmsJQ&%XC#XzL<9zsMk#6vUb*s3;V>xAB_R1{+TF>C=>gTe~DWM4fN_kvy diff --git a/Common/src/main/resources/assets/byg/textures/block/therium_crystal_stage3.png b/Common/src/main/resources/assets/byg/textures/block/therium_crystal_stage3.png index 0a4bf80459ee86f2b9f61ddb6fbdad6a4e46104a..defb431cfe41e3cf4156997123994ac8079b5076 100644 GIT binary patch delta 208 zcmV;>05AWS0{j7x7#;)z0002(-QrRJ000SaNLh0L01m+b01m+cxRGn^ks%;|Ay7L_t(|+GAkA4?3VUhXj<-XbELBN5Vuhp-P0Zpp1~H1t6-EBg7rdu$bYPzOti% zfm3*TO4SU<1_sVV%e1O#ViOoAxYDxHtJ#Ep{QqCRd{Jxl{V=At3O#G%zOpkck8iMLy!O{e{8vTeN5&2O$^PQUWD1vPo)u~*;H-Am90mmH6BJi=*kjRX`adW(C?zY(}M8Oc!u*FtN$i0UglM^*^9x=d#<+_eKs!u000PdQchEDnVF%Xp~cht z!pk@S002fwL_t(|+G98a0cRNwFn|Fs!vTf~AO=6f0j?4#V|%j!gu!A865(Swz+eEC xf-LCbBZ_eWOmo6Srs+XN7g9h1GQo{!9~i&} z+`jTQA1X!?_$$ObkqOF%19Mx|iBKj%aQWUn1{4DfZImYR|NML98~YDqs1QK_H$cup zX`<*ahAVvB>^j{1ybO$DtV9`t5(XffL7E@keaIloD|HsE0uOk={2et6xPEegH4&p3 z1av;UeT5nZAn^ayZ=y7VfPkAAkJ9Aj{7KrilR{wG0dl3;JpnW**JL#f(nyUo?F zG(1x9)7T)m>tmqGw*9SCZNe~D$=ge=J`>JN5hH6o1mXQa004iKv=@^Q>IYf700000 LNkvXXu0mjf4~j$c delta 163 zcmV;U09^m&0qy~iB#}8C9u-hbR7D;&DIq^Qil?Bh+s*X;{l)3vr Rgt`C#002ovPDHLkV1gi3OeO#T diff --git a/Common/src/main/resources/assets/byg/textures/block/therium_lantern.png b/Common/src/main/resources/assets/byg/textures/block/therium_lantern.png index 09e7a17507abf22b33d6780fdc720acecf23061c..e8e2aae76de6cd89fe473929f7b1393bc75bf892 100644 GIT binary patch delta 276 zcmV+v0qg$o0?Y!CBoYa5NLh0L01m?d01m?e$8V@)ks%;|Hc(7dMF0Q*|NsBu`1RlU z_Tc#S#q#UM@anEak-;eU0)L7~G694@UcoflmW|F6#p_2|AF?e{kBius#IYmyyU{+%#nT5#v~+D5a2 zeg=KnHTTwwE#N=co!-dEldjjn9C-VeoYIb6Mw<&;$UQ$CvN` diff --git a/Common/src/main/resources/assets/byg/textures/block/tiny_lily_pads_flower_overlay.png b/Common/src/main/resources/assets/byg/textures/block/tiny_lily_pads_flower_overlay.png index 8050d40c4769799ae248262de7b05e0dfa15159c..ebc0ddaaace33502dfe39f039d8979ab40ece55f 100644 GIT binary patch delta 130 zcmX@jc#v^|1SbnK0|Ud`yN`k<+DS}Qk_!@pqvz@37*cU7Il+OQhlj_FFQ9D^I<=w~68Pft?JGwrzllU;>Z}p-j>NNb~>O uH~xdX3Kb$9P^5VXfWe;*hFuz9U;qGpT0>!9k_t!w00003xFh8*6uuEFA3&Wo@t_5*E$D4tMGkCiCxvX3{fI;Z~xpNa0B}x-KT^vI+f>X}~@*Pm%U=DC`-SU0^ zdyzMjQvWWrV{YP6@1F9$UrbZ#t&`|fDcuF7D>SQi2PE<`pDlaLwI)i8sqOxx2bVWa zVya1;`|%LNvzh99J~nR_Qv4CuE$~C_hXFVdQ&MBb@0Ezxq A{Qv*} diff --git a/Common/src/main/resources/assets/byg/textures/block/travertine.png b/Common/src/main/resources/assets/byg/textures/block/travertine.png index 13575c5c03e1aea6ef037b7dcf6204d2500aac01..7b4556a6cdbe3db912b197bd1f8341f4b1165e0a 100644 GIT binary patch delta 175 zcmV;g08sz#0qg;gBoYa5NLh0L01m?d01m?e$8V@)ks&32|NsB&?CjOm)x*QXw6wG) z0A2O~003r5L_t(|+6BP@0mL8-1HjC|(!GH;7=U14bpAE{9aia;(}*(1Q6i(B&x^Pz zpISyz≫qIjOgx!;H<1m@G>Z+9gs6clf@Rk&B7ZjjJAx&k4rvszpp4Udq6B;^{Ja daersVA3iP;5~fIxofQB8002ovPDHLkV1fxOP{aTL delta 158 zcmV;P0Ac^^0qy~iB#}8H6T`#9)z#Isw6yH(?EnA&L>;P1ks%m;Xh}ptR2b70&A|b{ zAP57%hzo!$fOY|Cx`Ew)rqW;XxCG7gQaF$Xj;Rh$+Y60&sF>COuizO2cK`V@=%lAm zke$`EL&cOVjz~P`SB?IT2proSt3H?#X0_bQAN7R5-yK${QP%AF0b#TZpv`kB8~^|S M07*qoM6N<$g0vP)f&c&j diff --git a/Common/src/main/resources/assets/byg/textures/block/vera_rosa_bottom.png b/Common/src/main/resources/assets/byg/textures/block/vera_rosa_bottom.png index f523edf19b29c19c1437d6d81bfc208ed22aaa44..a3539c3a00cfa71bf86cd2805ea556709fbf7547 100644 GIT binary patch delta 525 zcmV+o0`mR11;Yf8BoYa5NLh0L01m?d01m?e$8V@)ks%;|1yD>>MF0Q*kXdGbTWE_^ zVT)5@ic(*DSY?S(UU^kwhEH6EPF;mgTZK(pc2Zx2Oj&hNUV=(la!*`5lurAOi&3(Rs=^s4@gr4MM4WkLJCDg2}4Z;KTHHZNCZba3q()= zMNa`iP5?tj0zx>06jARH7)=nj9$K_00001 zbW%=J06^y0W&i*Hx=BPqRCoae!3QD(K>z^2(K{hT7sL@9A#2ZyUZO@X|9^@ZNK;8F zNd%xLCMgaF0x%#*dc(K`bO|9?8f6G&-BBnJE5vEySbvgYpEO7)V?i*ICZswu5$o#W zqYKMS>X0g3o z+&Js(fHP{X)t}DEgG<$OpTn P00000NkvXXu0mjfo2s}D literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%GpK0X`wFKye3ktp?AqCa*|uJ>%|>L~nJEHow@;z_{+{e$l0Yal!gQg?`bIreQ_?G1=}R zVMf6Ldj4T1p}Ah+epO*4!@k{2ozS_RgHnUizT{oE{!5 z?g6@CwybuchS5&kZpI9zo`Sw^OisZpuC@$D_6(*zEOvSf$}S9+ehkjOEcW&cCjN|$ zb_~W=42A&=u3;?hz(6=)v_=+4MU({j1^=fFV5pdVhy!Q`XMsm#F#`kNVGw3Kp1&dm zD0tP=#W6%9SohrXFeXERwnU}E4a#NVhLMgg;b(3g=-Zp5|Nig&PT@ZLBEM%R&zNg6 zq#a1;lGq@S7$CA_$yIxvmq!h9+>?S^0@rNq={?-yG}H5-n4?zJGK~{oe0*jcJ(KAc z>Hf?#@t{tUP=ruxs?d^Mk7~MNdl$wX2(3MP^=?#iS6=3h((5JCeP?yWj8`vI9XXUJWDP!Kqo3d7)LB5BqSalI0!&35HlMW7gT?< zjQ{`u0d!JMQvg8b*k%9#0ANW(K~#9!t<1R*!Y}{?z?Fn;{UGSSR|4Z1$hqi#{)u|b zUmZhQ-$@EfxA}0gI3dsbr<^imsO#wx8)}G4J=obYT3XBy+3lHeKBUfW&^j*|P1fm+ i25l$?*8;KpQqLR!0000({Vk)_T-k;XO->RR4<#?s>Aspd{Vy^O)}5kN|`B*-uLKNi5CeY5t}L`8}E zB2O2`5RKray|;x9D{#0Nay`4mCj9e%{#iZax6bjajUQPa()zghpHS*bo%q06QSMXE zcfX9&y9I!7Jms(6S$X>8+%Hqut`&PW6;)%a|D|2CY1#;$V{KT@US4$ q4w*@Z+Wrn>Y>Cu8Wv@D6yE0tUAWy;{Ly;dZ zh#xeEA2Wj>G<_dDaw02RDlJkgJ#QZ^S|>PRCMr!SM`Rx~dNn^F00001bW%=J06^y0 zW&i*HkV!;ARCwAok4siXK?uas(ENNVg6@B<4zA8~Dit7#IJQ99ZHQxjZ)>;7Vj3v5 zWttEz0M>2;anyZ*d^l3vZ3*lJkx8lhojlwjj%cmB-TpAXAw})=Z0%r6soTOddjuQS z?G6AX%5B(bB7sz+A(H>|^#jDQqSOZJi-+6C5hCyGU*j|-M~#7PVu4RlyT3a}1|t3w RMEd{$002ovPDHLkV1i}3ZC3yQ delta 299 zcmcc2^p$CX%0x@qT&Dn^5LX5UhC}ks9r7lxdY0}sib+({T5pvYq;1=&|MM~Pfn(is`Ci(KZwemL6TDm~(qWA5#0V%PPAiv=M*Z>3Lr2|hU zDoWJP@^or>`us!e^bAjx9pX;kDt?$GskZ3%1GPP2xD~Z$u|2<+9Jzd>!{K!d$M&?yxmxd-ytMlP zbFArvrM4bnS`R`Go_rW$zBMaiZjs^})BmUKU+c&2F!*)osJ@A=U%h$Mk=X@LO5Aze j-Ps&k!x-lmNXFk^!)^EH5f1jqxB7#;)z0000;eCvGx000SaNLh0L01m?d01m?e$8V@)ks%;|7*I@9 zMF0Q*>nTpY8ab5!B5nvLS_U9c0|zn%2>-mTk^lez0d!JMQvg8b*k%9#0W3*GK~#9! zz1Bf$!!Qtq;pa%G+k!&Z0bii0bN~wpAE9d-+^&27RTr5bg2>XgHy#{AK4#tsOM6|C zKJD(_t*F_Gn5;?ZP}(AYNqXDnKka%sim%BYBoht^Sc+$RB#(#x)R-1~B~A$E z-t)7!hjF=UKdyu)MJvXPr_4ur_;=y)JQ))c#N(?Kp?w@ZFI^@YM1JtNyA_u@pXDLX z&jTCSug&%=#C(=Vy1-CH7Ohi0*;%kwJO$79SsqCRPr6y7;?W)!OcGmkO`@e5@ni<~ zcqeS_c9iE;gVeQyNd4m3+H$l<10GL~SK`Z&y~Q&<{lb%H1@eO@H0HJUe&LZ+C}@u- zQI7pu^VH}0EYI`#!-1%Xr(KWo^xqqjBS$57-y4c~dFA;Ben&yn=vPYh00000NkvXX Hu0mjf#8$W_ delta 521 zcmV+k0`~pL1I7f97zqdi0001uj0Sv>HXu10P)t-s0001$03z!tPHqS%Py+`t1qi+x zIa&rF0002#M8l&1000SeQchF<|NsC0|Ns90Q%`sjks%j<0iQ`kK~z{r-IrUEgD?yP z*N+hHf8va+k!*?VcQE`Qx-eDKkstXx)AegmcsEcg3xZZk(~6*$!Z8GR<`@Mv59zJ8 z)<>z})$#lqCBHGR9|O~2pd5@sfUwb+=!k-#BM5qukCuGQXaomzXfzuF8&M&QF+IT- zAMcy`a2*7HrN;OdAJQ+uhjd2(FlOobQSs3?@e$KXv+LbJ`_dmq^o{J}Y%KxIj+%UI zvwoau{g4jPfI3Ig%< zBp+)QT+}f^UQglUvVH^~(2?iMUH6x(j}|shTukpErIi=*{(=+gs1%5gyq-SDM?Qbd z6B&UxoIjEe9N0&x;Lbjn%|ZUZkF=W2fVYPMZw~|FV~zj6kMsNhe6w|sU5yWp00000 LNkvXXu0mjfD0$(R diff --git a/Common/src/main/resources/assets/byg/textures/block/vermilion_sculk_top.png b/Common/src/main/resources/assets/byg/textures/block/vermilion_sculk_top.png index 13187b4663628ae56a3e0cf28bceeaeb4d07918d..c8d0e6532aa8330e39a03cc10299f306fdb26da1 100644 GIT binary patch delta 527 zcmV+q0`UFW1lRMh7Fkz%TUadA-y)9L)GhDYVSidMys4`ZlF_e=J6k9W!$& zLV_bXlo&#IC^&v3Ig1@Pg&{IuFhgoBHHRHHWGz5{AvSU*GH574bR;uwB|T**Jc}1C zdLJ-aEI(x_F<>b?Rx3whCO(80F>WF-Xd^mjBRO9rMPeo{a2+>v87f>LIAR?%XB;Y6 z9zS~kD%qG9ApigX?ny*Je^hwd1;L3zf?qB4x6)!&(wVDhq7> z|7&^=gy2cTE7hah?`)V5h-aD8E{Gq#3L>RIN2asbB9lTUMGW|IB{M$O-zbon2t+2Y zH>Gjrty{yGu>~>Lg-$HD|DK*WOECmlGR|+@Zl`#4!hB+aS7X$)e{X;86fSmpZ-c*z zOnW*yDn=A|kWg`IO$XkZG)L)NR07*qoM6N<$0fP6u)tCSP delta 531 zcmV+u0_^?R1la_TB#}8He}zI=djKk`AwkP^ji@qKZXz(OAWnrLGQBNTr7u&iGhApW zL6jImaxzG-7d&MtF|9UQq&!|?CO(TDH)kU`WhgwYBSg(;g>xxFS}Z?*AvU)+TB;>a zXB;YG9W-AgMVvKP$a0FnP;hE3HN7xlvL{H1BQ=5}ImT9YZY4d7e-|y(Zi{{-IguSR zjVC#`Em(3UGNCI{U@1JpVSK|gT#+9-a2+>oEJjudpNd!_UULeb& zd;kA6(ZjsX3;-7gn90-THF)|5{PfQ}lKv=dho^T}g4Fg{+2 zRRQJNvWv~uVaQwUPC|uow5b)J1X^*z@^&nI+}EQV#n6kMRtSMm_qCE$g5u~|&JQ48 z*lSZ(hX6utn+6_aE@8e-x`zL@Y|3{DA6y9HpUv0zPvcC43vCOn9lGJ7NPh*=AM2SM VKX-%hSO5S307*p#PDHLkV1gp$)@}d* diff --git a/Common/src/main/resources/assets/byg/textures/block/wailing_bulb_blossom_petal.png b/Common/src/main/resources/assets/byg/textures/block/wailing_bulb_blossom_petal.png index 69908cc5b9830285ee94d6ae83de4e58d3d59326..a5595daed1f2dca65a1c3fd46fc4477741f71184 100644 GIT binary patch delta 214 zcmV;{04e{s1C#=g7zqRe0002(-QrS_J{OTA9)BKCOjJd^Qj-7x0GDg;hGNcXN33A_ z*a57DT}hZ)L4H#}XfBI}^Z)<=1$0tQQvd+S+3Py>gzo?V0B%V{K~#9!V-SP_2D}Ur zM-fLb!^One10fhdP0=EN@7zqdl0000V^Z#LyHXxBC6n_CsNkl=evTOitj-*G8-z50#FQSOFDP+ z3)34BD3{^=_xpk%4COL_@&-gBYlN|3axk?Zzziay9P9q` zD1W7UaEjf*mscgJftfP6IIi?~iA2XRPA|R7IC-?}lQ|X-BNBit>wz>X>=e zfOyY#dDwDo!+~4Ed|I`6ShQ$WuV7B8W<{Z0Ntjweep5hbOf|~U00003bW%=J$l2=x z=th75004+dL_t(|+Fei47D6!y5^A<~EAan+w&T`Qyr>*N4HFHWLWhaG-GhiYMDcZv zZ|7ayGb>8(F-Gb*R8gGQHKv%Ez*cZxIsIB=Y>c&sGhtJ&&Z^nOP>CootnVH@=8~h*GZq z9-so&D`I5cyPUOM@7f*%X8e{Jc7H7?guKAf1*R)x1afp1CM)Vi7oQ&KrclPR0PWF2 y#w`_IiF03L_KaE_Bi|V}SworHXL;xe90z}+Y9xQm0b7v(0000e%Aqv}5ZMLD65t>d3({DDzxo9FS_rskIM)u^h@a(yKg|N}F9#~p99FYE ziE9V*@v2?)*Y+-(ZKMn9R@{dMIB+?mwZ9Oyz`#NmZL^UJ`wLW|*U)O))I-2UV-84Q z7087EshLwOP5qFNz~}yfDEbB}MDfZG SZ$MuF0000dLg8~66rVODRzA?skvNSMQaYO)IF$4uUbPB3< rvL>g)2RrLsaZyZGakZ6v0N5Kp5JD;EO_xF&00000NkvXXu0mjfPxVF% delta 356 zcmV-q0h|8&0iXkr7zqdl0000V^Z#LyHXxBC6n_CVNkls$%oStfG(wx498G8KXxoljTT)oO z7pb1AxwW6`iLDn+ODrMWRaDygK0000GTVg3JEvhv#!4%IX5__#AcWPXp)BhxDv zHYywCNLuwRU1QqAnSHZw*0GYyc{im}rt95qiN2kBJ=o zTc;&R;!y|QhWf;yNjrykh|_syXZ8|Fkj!Z_<)wzeA}yGRidTvKr@%k?FrhMdru87buH~{%K@9B qiH3?sk}^kv|B~Gg9}ulg!e)PB1|BL@CetMV0000#F0D{rY-IvCw8tSKLi6qT*2HLPwr7fP9ApdphE*c(yF+T(y?8I+bFk=4 pa3&oz4B^@ND*s0`Ihh;(02D)&76{gh@*n^J002ovPDHLkV1k+|QAPj& diff --git a/Common/src/main/resources/assets/byg/textures/block/wailing_nylium_side.png b/Common/src/main/resources/assets/byg/textures/block/wailing_nylium_side.png index afb4bef738854d95099b29bcd988746edc2be4ff..e22de8adc7f6e85b0feaed53faf27814cb672495 100644 GIT binary patch delta 232 zcmV_#LjV8(jY&j7RCwA2!NCoJFc=2Vj|~{XO1zsA!UEWM zC!`D1%H3dvD+c>}7urrhJEiY|u_8Y*mVxIy&korME$2mdE+y)!Du-e)*rbuK)+EF& znP?`0pTE&dO*UYWz3uG7fmU^?>1Q$O=1yKqC?!6AA&=%swDxI*x{Y2_d_&l<>#!>b ims}s5z?GtZ0;U3xB#}8HC22>jhGNcLNtl;w?^;2AO*m#fE+t7fEHx=2TSYi(Qbe$$ zx>J!M7=MmQL_t&-(+$MI4T3Nj2G9?50~Tly24Dq37cdm@E^WD*_?J3B=>Qtio=r@d zQs3br%ktu116Hu2IW$MKjOE>_}T z@l(^yU?1y+$PE)uvU#mz*JI;}66HFrvc- R%WVJv002ovPDHLkV1f^2TGRjl diff --git a/Common/src/main/resources/assets/byg/textures/block/wailing_vine.png b/Common/src/main/resources/assets/byg/textures/block/wailing_vine.png index 138aad81336936c9d7e58c554e781765b9fc4fcb..c6c1a45a1347cc60fec743b5cc3fa252a46eb1f1 100644 GIT binary patch delta 187 zcmbQl^n-DNiV$akM`SSr1K%MKW)#)%YM7{~TF=11Fg^QyThh5q_cgJeGol>pf*mrp z&CH(!lwd3g@(X5gcy=QV$cguKaSW+oWIfo($e_T%tWb3BzdxUX<>s4A_ug>6W!M~^ z@!4UE+B)e2U-!NVZ8+)sjcda8*rbP0l+XkKcnwF8 delta 195 zcmV;!06hQr0g?icB#}8HENMrqQ$T2jV$NMjm|8)8muv3;007UwER_HN00(qZPE-H? z|NsC002)gJMv);He{)GhK~yMHO^?wQz#s@hQI!AxufKw$D#Z``|ZcN=Z5|OJX#%mS_@ft~$h|^@hm^!VCZnB1{-GjVyI0}Lh xr+g!buZs^x@((p}2YsR4R(F-l*kuMHJw9**P-nWT9{>OV2>?k&PDHLkV1gGqQsDpq diff --git a/Common/src/main/resources/assets/byg/textures/block/warped_cactus_bottom.png b/Common/src/main/resources/assets/byg/textures/block/warped_cactus_bottom.png index ec7904ee450a3ae25ea888618d16da4772ec873d..45a64168eebd06d68b348ee58d86825b02956391 100644 GIT binary patch delta 157 zcmV;O0Al~g0l@)~EPr~_&T!1eWT?MOm9PMjZUBE|x~~!$00001bW%=J06^y0W&i*H zT1iAfRCoae!GUcUF#rQGp5u1^c>}x^5&%H{k0vI+*FH>`e=h47^2|lgkn=by0LwL~ z9y15C-ggELGnk1B>}Lb6X!{g$tfatPyc+Vw72AO2a;KpQ02Tm$*>f)_Kpm2k00000 LNkvXXu0mjfZEZeS delta 163 zcmV;U09^mU0mlK5EPnuhWB`$FaLmSf)6Pqkuw{0*L~UEPr4A&SCt{TmQ#s_s)Uh%TVXBP1&hU*r-m|s8H3YHp`$k%AZuI zmlU*x6tjdCvV;+vg%*B>7GYa_DNJnu0004WQchC&Z1N|b;P*}&%7UP&hMV<)71Ipd@#ou1zU1nn@XPdFVeNgC)a!H0=?OE f@0kTiuTF!1a{>p22Vt=-00000NkvXXu0mjfr0r?) delta 232 zcmV0*nHXEPsLG%T3v-5u1fy{?1gWmll487GYZyw1rLBs1&n=6|#gj%AZcx zs5Z->X!p)r|Hn}0v0?nqP}Qi|hOVpt0004WQchCsCu55O#q9!wa9s^?8kzbcjgtc%_0CCXzs0$mf-+Y;Wn!896bPK iSyi58UZ_l|0Js8;bpy?J&-QZw00009@s7}|YP}Qh5%b+&O zpGLojRH&B}w1pJ2gcY)c5u1e;eufrdTa(OON&o-=0d!JMQvg8b*k%9#0DDP9K~#7F z1;K$q!!Qs8FqyV|05^5w`~6o%0ssKKY6Ac@J^;LG+i9=bKxB>3)CkbK2}uLmx%WXk zK#+avy_N%G-;tJEIH&I+Z-{ lKV(&pcP?EQARVixhJPOa2V99Fh#3F?002ovPDHLkV1g0AZM*;g delta 237 zcmVX!p)d*r;3o$57|76tje3{LWC-sEesDUjP6A0d!JMQvg8b*k%9#0DVbBK~#9! zZOR3L6j2NW&_{k#X=8lue^l0eqh)@tKQ(-*n*M%uNBSdGQ)cMb4?UWYG@#96EVKm# z8M7YiYQZ$NNXsTH)UH?gx7pHWr5>YdibE?Lb2_ia;j)hFzEX#q! nxZRPpdfIc}ek#Rt#j%S>@Q>d;L zbLumo1Y=2%UoeBivm0qZPNAoZV@Sm<)`N|V3h)hMCW{}u5?3X6DCY9DZ(YyAUZ*BSuA3zG zYlo3RMK0?Wj_6m3v04-6^3JN#EYrXH;F8EHIi43ecJ(|=hxv}Nmji8Q@O1TaS?83{ F1OSX0OgsPp delta 214 zcmV;{04e{90;K|wB#}8HEJMEO3%7WO6eA002I4?|lFO00(qZPE-H? z|NsC002)gJMv);He}+j!K~yMHC65UXL@@|LsR;K!@_){xX|$9@r9Np)wOX&H9cT5L z>q9ev6U*?*kNtL1A2OAoEaK93L!o`to`J$Sp|MJ|eWbmCq~Q;z)uLnoX96YJ;5v&0 z!HKCJP-ek61Oi+N^j~l;+{SVLWN_FllpFDIE?c~bQSxF19GF5-fU;ob1F=s7MT_tY Q=>Px#07*qoM6N<$f{0#PhyVZp diff --git a/Common/src/main/resources/assets/byg/textures/block/weeping_roots.png b/Common/src/main/resources/assets/byg/textures/block/weeping_roots.png index ad4a89a8aaca5f3ffeed2609a44d5ff2b807d2e5..fda4b3a123172886990283949447dc07c048b930 100644 GIT binary patch delta 160 zcmZ3&bdPa@1SbnK0|Ud`yN`k<+DS}Qk*!w`@Ck7R3jKds|MWu9l+Kd+(&YM*q!vGKfIaS)A5AN6hFYEt5eENdn`O7y@5fXuqo7MlgFpvLGE_vYTg(Auf g7zLvMH(+1@0L^biB2eF1qW}N^07*qoM6N<$f)n;=dH?_b diff --git a/Common/src/main/resources/assets/byg/textures/block/white_cherry_leaves.png b/Common/src/main/resources/assets/byg/textures/block/white_cherry_leaves.png index 24d54220f61c430dce2938e55c22cfb5a15b5fb1..b87697960c1f764ddf92d626e917993f27682e6c 100644 GIT binary patch delta 207 zcmV;=05Jck0*nHXBoYa5NLh0L01m?d01m?e$8V@)ks&3200030^8f$a*yhmc|HQxQ zn~}bx%%X*|%uzuACIbQh0004WQchCFs!uhU=RBAHbeL}{p z7TScOOR~)})Y3zBvSo3;%VN!HxRctF)I?WC6Vtut8H5g;@BUsG0+O&RpLzfQ002ov JPDHLkV1oOVTf6`O delta 217 zcmV;~04D#80;mFzB#}8HG`^(F|MLH$g|f_1LF${4=FsZ@#J~UB*Z=?kw$!fj00009 zbW%=J|NsC0|NsC008>wR5|JSoe}PFvK~yMH9gYbSz#t3)Ni>%Kzqm`<8O+u zcKO_+wx-PGsqyfD(lg@RhU30NA7Qsk$IjZN}W(uy})c=K=?Jg7;TEAZAT6ACQR0~d_lk@z)_PX5#zVF7vFb(dk6%e TYN~#l00000NkvXXu0mjfQPpeN diff --git a/Common/src/main/resources/assets/byg/textures/block/white_cut_sandstone.png b/Common/src/main/resources/assets/byg/textures/block/white_cut_sandstone.png index d8b2ff7d047ffd43e7e54a5a479024a562038ba9..9d7ab6a716651365cd6949acdbfe73d40f23a0f2 100644 GIT binary patch delta 138 zcmV;50CoSW0j2?vB!6v5L_t(|0X@N?5yU_Y1VQB=lu{5~I&`4ukuTTT-(BaiXJ3|( z2LwnenX9ilkIi0o9Yr7-!qk!QiCqf_Bmi~^i9$ruwE>V<*Ct#Eq-zNVB#?APPzVBc sttfw8@=1bInh}KzI@QzNJ=3ory)NFV^S&9!00000NkvXXt^-0~f(~mpMgRZ+ delta 142 zcmV;90CE4O0jdFzB!6*9L_t(|+C_{p4!|G`1Nr}>_(E2%Sv|6L=_R4+Nr3F0yPo1a z=i=o|6+Fq&l497yo#_4z&D z&8rWjoGq=biOWwjBX(k&EOLG7mwKcVk;4002ovPDHLkV1l3)JM#bl delta 136 zcmV;30C)eO0i*$tB!6p3L_t(|+9ir14nR>1gLePR&0?|0*>AphNzvy=`%9X%pYO^;RYwGnT7xW002ovPDHLkU;%Rfp}nDoIq* z-a~0iNX+pJ)sti+;;DVMH)W$$ zo*Kfuk%otC##7Dpm9Lr6zHJij(jWu+P|@ZgAIiM0000-B!7EJL_t(|+AWSJfdxU3B&Rd+)IQsr zvi~5S8p6DhhKFqa^Ud{@wM@O@?n!%L{ginMbbo(Gz5y%&+7Z9TLj>6X0000qdnKBsU3=xTmA2Ch8nk2cnGh$jmq=%^H`-@AhC=gdZ8Gi!+001a04^sdD00DDSM?wIu&K&6g003Q3OjJd+wY8|53WP`iHP@h_ z^U#!4Nm8hkR68kGbpQh0o;ED^t4g_`FmmAuTC<2Kzr@$&M$l9fxvFz0>H}ao zV*>E{l+XU)!F`!@ror3KeQ077YDH^Mvx&35XK*iLGGCIIFGjepDvNdSyg4zDQS z7&+Y21n`J1077ArN?Ao$_uJ^U@&{{#vzNy@b}LC1Re#Yh{MQ$9O=n;%NLi{Q$Tgi* zq6|Q}U^RxLe$HG{sVgSmzjP7k_K-86UV z?bAOZ;D7TAY%N?RH#f^pUbb%FU0Fdi47fROH^o29pePE1<6nv8dst2=WEZX6tD{$l z8*$cWk_asyv^2JLw$8%4MmIx-LCozYizV@`t@jw)IZi7k0$^)@TgtGmC-DY*i5~j| zz|{5;^3FJ<{YY7px?*Caa*SoBz_Drhprvt3dnAwOA`}*FMlH=fqN~Fne*hSSA)lp+ RFa7`k002ovPDHLkV1mj#KcoNv diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_front.png index a1f950a9815989db54a54a32667a7c0de14077ad..f2c8f70ffddd4113253b7dcd38aa80c77cca01bb 100644 GIT binary patch delta 267 zcmey$GK*<~L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Nhq)5ZC|z|KGTAW9!zfp=r8a zk?KzV%GU1kM%GfY8rDjhLSpiIGK&0y5-O4+JiJ2E+1gu;ff{Ffx;TbZ++v)-kpG|I zvWZRCio>S43|CyzPOV9GiDkIz8sc*#EY+9c=Jd*aFYEW5nagn5*fnagot-bkRiCh& zV{z|d8Lq^+#2j@}@@2R^uX5k(34%a1cBWB_4FrK|1Vwy~x&j$j6j@`AhB4+c+y)s` zIdL!0GH0vB&IUj=uBkw&kXVLmZfQQpQr&VHUe4ZG_j2d%eRYm@(UT?{fIQ9M>FVdg Jvd$@?2>{krV|@Ss delta 616 zcmV-u0+;=o0`&xt7=H)`0000V^Z#K00004VQb$4nuFf3k0006nNklCuI-_mpGR(|756}CXX9gz6s{PA%Pk#c?4Ks#@%e;D)P_0jp zCLsWo!C|7d$KtI)0DLbdl?C5E_>}a;ZkPe^>&G8v=5nI8haOSeV`eVL_hPzXhHz{u z!Uj+RGA___McC9Dg64unp2p;9Omo4aB5YDw&8&@MEyZ;0(TsdwIx?x6rO!fL{a|m_b2Vi|I;M%uUki=f?T? z@~0B;y%^!xynEB*{CuBOs+RIJ-sh5=p4Zm`)2?wK92*%I6q!UgRkPNkB5Z_X^W@P( zv-jZfG5`aUW7WPjY*7{#yWSwD&-4w0PDe4Q)gsEmqJQ<-XKQN$=Fe zIKV(dOJ#xUx&U+nd6dE79B2mP6AAT(puKDfdwpZOB5ZEnpEflmzy#<2S!Z3ZQ(2fibOLE=?P#yY z&UVPoc1R|B0F;GA66F+`aqO& zT{(S|N({qcsK-7!D~YcurDMwqZCD=x7a=I_zTNy~Q;ohT#;*oQ$qD z42P7BG$$E>%rOb^-s0-)!*J9z)Ou@(X$-@St`)gAR;*eJ07~jNIa$Fn&j0`b07*qo IM6N<$f_E8aRR910 delta 570 zcmV-A0>%B30>=c97=H)`0000V^Z#K00004VQb$4nuFf3k00063Nkl1v8mt>kIB!oyUg@V^!O7S2OMG6K%K~V6Y@aV;pC-43v9tu4aq`i14^dRZMg9s}& z(1t}4lkTtC+1uo@6t>uH4cL0b2#eZ76&hbG)tGiB`1OPNv z+k|tU$In**nEElP%=z(U%8DtB0tLY3`4!tc8R6W=tZ?qLy^}HZW1>JInl26D0%!pl z=a{`ATsl3$V9y~-W3n`6u;0DpDi+z8x#xM|ys0!6p4y?#AgL*FkejLdm-bfGO6Z^s7-GR_&D)<|V; zEnJ>oG4*3x7zN7OUI7qI7a8Z|DnT?|a+O#}01e^VH>S`qsBQFHOQ-EvPlx*_JbiH= zB?}e{&7ji>?Y&_&pGlHmN;4P?w*Ywm<|FSuyy9^Ggn!p>pIHWjVUO~P0>$mEHlw2p zEntG-c^*?g#`8Qx(07*qo IM6N<$f(h*ep#T5? diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/crafting_table_top.png index 102f203e430819d4a962199081ca94a0a0674367..8ce5d8c6efb47386482973cc209136a3923bb351 100644 GIT binary patch delta 216 zcmX@j{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5LYLEWmRKuIW0R`4QmMn z13?KDDN$ZY5guM4X+CZ?W|oDEfGR6IT^vIyZY8gnb5BZ2YU0du291XU0s?k4PEK@M zyZ{JT)SX)=OrF%;on-C2dBVa)9Sat*Ixm>80LTtpqyc1gO`6O#Lve+MO2;9A!oWt4 zP6?}74KA}>IoNf`hD delta 445 zcmV;u0Yd)h0m}oB7=H)`0000V^Z#K00004VQb$4nuFf3k0004nNkl61GquVWWHdtF3p3FWyoZ{pej;yt`L4?3UsbI zO@trec#^|zOK87gXO|)IcxDO)Zh+%S031&uM^gagXlgh>Jf4wVhS+`Kb!0bO=Zf-_ zm|Gj(uImf$V}Aw>sv;$QeL?sUmfa(LeYw81#oOrLE;ydV@g!A|e#zVTq~L$iQJ`~W zrY`)*NEUu{*P*)#25x{HP0_hRj;0LU0G+FjBb^3kU38{>i^i2(7s^w@Sr^!{r$~-_ zv(ZeukzEz3ail%KL? nU|E)lX!hM7a}PV93c;WgqMQ=004tYL_t(|+8xTV3c@fH1<*@|wx1C~F!=<> zA`kjzMO>vwvc?jsV+g^#&lX(|2en^&cpe$KoJn79j4XS2$ysN@ql_^6Fk-E2PqYl! zWDikfKuXF%d53b>tTa26)h^aDBfbC0BNu3uyhq!NvV|wKN`^8sn)DE(FxpH+GckS; aV(ed3_bBV1#?~GH0000k7mSnfb>AzAp=0{c0$^RSVc?F8K2GhDMOvvZ_0%pkj&ak} z`w}AophEU*r++9i#v-lw%#2X8uGpbHX?|-i&o|>4F?7V(u`iuUZj<-F&{;I(IbX!AR`@x zu9)mRrz^hHl>xBxAfHtLat*}aI%T1jeCts}2A-JMZt* n_lBctEy4eg|BYoE))jmJl`I8rEqd-&00000NkvXXu0mjfDe}@& diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/door_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/door_top.png index 9b5beac3160453dbe666e7ba36b613824c8eef20..7cc183ef968330596021f75a226fba0cb21dc07d 100644 GIT binary patch delta 257 zcmV+c0sj7k1d#%e7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000UP)t-s9XlFIStmMF zI6zGzFhwmmLLMkPCM+`-A}JCaArF@0t6%^C00DGTPE!Ct=GbNc005LpL_t(|+6BS8 z3c@fL2G9=)F&)K0yM-d%#i3;TDaFeJ6xuD647w>4+fhLa-Fg~hz`U*JpzFt9H->=Q zVpndLWsPS$9{X>o@xB)@I#TeDhCwm~JMom{WerCpDL<{?KG3W=XYj9tP>2kE*r%N4 z6+DqK@=(EDIb$24;98`}g@PRtt!E;JC8ITuVz`NeGgJQogw`bjKC1kH00000NkvXX Hu0mjfdxv5T delta 502 zcmVP;sF&&X>kfsM|-4%c&jj&m)e}AD5uzxub1=iiSKScQl zUiZH_w>RdSlGpurtc{g@z9~7r>;PDOdb%s9fBx-RrDL{Q0#He1$P=z)ewI&ZrK6I{ zn2#y`hx17q0Wb=4iCl0rrj-u+lmbxL!aEvMNoDdyuF~h5Qr{zh{P~?4O-ww6t?iKbn4S28EaZmh-{LKl_fAbX&yl2Tjwpucry*|_=c1lX-6FYrKW=J}Me%r3~FK?BblKt1n!WO=g%7|P@(ui|= zyDJ!?I~o&W44`sys$y6XfX(`Kog|%_SRZP_{9&2wQ>yaAeW;1E)v`C~z(dx<3egU) sQWxpC?T;j^^U#BkLNIl{DfNE-0b(r`U$Hu<*#H0l07*qoM6N<$f)yp|Hvj+t diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/willow/grower_item.png index 6209bfd57f81469ab3b76308aaf428b1634b63a7..928901f03e90c9cecc0153b90d62fa7427e3f495 100644 GIT binary patch delta 376 zcmV-;0f+vc1DgYoEPq~dFI#XbT6GatYavo<9#my3Qe`GiU?omqBu!o=OI{;NVhv1N zCrMxqM_Lm^TM9#43`JERL{=I`QzS!J4n|TOKvfDsP#!@}B0x_cKu;Y$QVv2*8a+`D zK1?7!Odmc=A3aMSKS>!oNgg>&3N}I55GykkDl!!)FAXLw6D2GQqvZJ|00001bW%=J06^y0 zW&i*Hl}SWFRCoae!HXgSQ4|2cDakW=MP7wVw_@#T-8$C)|Cbp60C0Qi>~a6-0O0(6 zZ!)_&dAK}21aVx92mSk(-n3qQg16__;qq>`87*Q5!DMzF>u%mOYJ~BiA752Ty=e!c z9xi=v|7=D9VbSrF>E;47!8TI}5V-k32q=P-D@A~U_9wLp0Dh}BB>+g0+yankN$?NL W$q?VXWFU+H00000fhdW1D*qrEPp^%3QA%PNnj2>QVvpT9!_8+Qe`GYTM9W$3R-m$Ls$+yQ4d5` z8cSXyKu;Y-RUb`WB~D-^Lt6|-S`$`lAzN@NKu;e&OCMfxFF{ZqGCUVGKpHYV89PZH zK1?4yOCMBaD>gwJK~5qoGZim57))CyHbNXKG8INsBsD)9CVwpxK1?7nI~p=P8Zrc3jU7!pH-NV6%;*B+c?1Re)DVRFqY{Q&IpT)plsw z4nK(GCrqIqAk7ejJc4$B3IvcjPI3rP5kWna$RPmCOFhf+5o}4JO4Rq`5!Jd-kR9x|98u=)lJ3!`C|6T3OL*TjeHQ5FS}fNiDCJkw-H*; z{Sq!H&A#A#@yOA+SuJ<{^tBj&Ds5g^GhyHBm5(1zlv~VF%r~?CP%mfi;*N7HpFb+p a`qir}Qut~l7=8=r76wmOKbLh*2~7aSBjU z6oo&DdJ<3Q3CmcEi!sjPtr^-O7&--~boLU++Mm?bkfm!(U9=Vrf#4y7yO>f)28SqE zLJv(D)WO`B*YqtCN9Ue`A`tj|jCx0XQ@*?(T^JyzWdA9a=bwot?e%kGj-`rCcHG^?VPb(Xkdt_AUUKaIX z3sMZw)5;P>WHz6+@-6LlET)r?vZ(Q;SPI-sChx|rsTx}-m^+Fu^W1HB{}4^p*kI%M zMbvGglkgxQVF@wqb|{P526dJFVsaG!my3!5d?C5FZ)dsMppy_41<0&`#l?lG8s3On zo~=C<1?|W8Z>_qUhupr=uy3)^u>TU`#g|X5*p)8QNdgn@V`;2g-%VCJyZ?o()g94w kX1Cxb@4mbHe;qWyU%g?%BC&aO-v9sr07*qoM6N<$f|R=SZ2$lO diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/log.png b/Common/src/main/resources/assets/byg/textures/block/willow/log.png index 8613196a600d4e9fa6f7427478310e27fb8256e7..44d38361aae69ba0a749e81d94948e23644aa846 100644 GIT binary patch delta 203 zcmV;+05t!i1KRKlw&_vR;*KI$el=tTaq!lhwVH=^VO8TP!W z5nuNQWUQ9RDYxw?IH5Jrw};if}3GY znf2l{4qz@wnK6e5BCn07arkSHGK0Bb-GE1C0UwntAz}^@PCg2QJ?mzr?^>dy3y(oL%wIK34A}3w@f7onTc2Z&~WrkZq+|4=}knDv8$!ZIkvlFl? yWL(oY=pINmmvK-MCsL0p#HUUC_*13K_yxgL4?&t%lMV3z0000DsVInG zP!u*Z6H68}WpLiTa@Ne5tArSWHwqh@8C#h$v@K3cOG~p%XLe|woHcXSGOKikwq@CA zY0EOr8QLaiWlo!BnGR+wTV|EYP&P3uEp1v>Dnr=9tko;0Stc>CO$KSVN?~B0Y-Vh1 zXqC#~IBVvrnX^`zGZY)AnI(!Dn==%#c9gPq1XTb4L>Dr*aX6M+00000NkvXXu0mjf DO@3Pg delta 494 zcmVfgc z6h#m5*i+*P2~H~#nne)Zl?6g#$^YN8qf(_xM6yag?8F}2v7NxeeQuJrcjbBWH1Euv z>o;GoXaC}%VLBO+W(B{K6{2`(h=&H}YSvkSEgey)`8*plPk&advjTNB8&i$8WGt|? zBfj#mc}3I@u=xfv+Vf|g!#jvC1I)l9V*%%m7=v=I#%>%pKbHUmXCBJ$kuFP`dQZA6 zJ0ht8eEB{mXbj4h4x+Z<+mA~CijCt?LL|DoN!y;RK&`U^t#<@x9>vCC^NN=w^{5}9 z{2n&1P)?zwcz=kxNG!_lb!)-Cm_$cwpgq9m6-~YGrc@8RuKDm#=~aG@s2||A(2bFz z7%8R+nGi{j413~yMS^>XE#F%Es3_Dl`~|=a^pT10&%>v?J`$XothDxNPA15mtA|~e z3(=wB@z9{AlM%nx8BYC}g&Ds5C1uA2rY>OmOAd zUdn?Ea@+bbiBZG!)8NP?Ap!U>?E`Q>&!3SgfVjEfZK#Iis43ACX8-^I07*qoM6N<$g8SU5*#59ch{ny0001PNklO z@;TMi<041T)n`K4AM6OB;p%qMYCAk?u;%*pmH7vp@fL^HT&ny400003fu+N9B&@d11QAHi4fsl8N_8WKxNDX=Uw_0ayf5S$BPXLi{c=J(#- zpHEznrIzc-h%UBK&ipoLy_cq@I8>-@l%oUHkel@$fU#ESK!0KKn$py4*8677)vMCf z0F78g0@)x3mF7>g`zcVxq2l{91zg3U9FrPp;SL zOt&%+2;bGHmw(qKU2LPg`AT0evea_7oDfF^Dobt4cQ=nDHuTv9@P{5Mi4Ec9_X+6= zUGHwV(!^ED%PDHLkV1l=AzgGYN diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log.png index 54f207da240fc7163691ec7fbeaf3ab284bf3ef4..97b014e66cd69344f326cdaac71831f1a5485e52 100644 GIT binary patch delta 245 zcmV6JS$-mSJ&UB~O^xP;sD2`rr^Ef59d>qoom z-u_uyCdwV%N5_8H%rX&s127J=Sf*8Jp|t$ZF|Wg~Ba8DFfS6}u+~BD&3c&a}b5_B} zahR2sEPL1=FMkXGD6TmcF660P8eeAsWvK*!Wm*9+)?q(>`h2IfJdH6MBq#Wf{gGiRUwnLBvup8^1Rx2u#A#wv;_t>=_dvq!5|N)*%fwwME*#&|kL02I?j z!8ImdHhXoAP3t);bK;k`RF>-Pj?MKmVE{g?U74$Y0pnBan3Pcz5dZ)H07*qoM6N<$ Eg6(hE3;+NC diff --git a/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/willow/stripped_log_top.png index 4dbaa2e5ab55a03e4c58393c03b4106c06087253..858fbe3ec46e8bd6dec7b4d969bec0448ddb4554 100644 GIT binary patch delta 246 zcmVS7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000XP)t-sW_UJNW-d`) zDo$Q1LQf+aq~N@~Z)>c7L-2mw z;P5RNXQGCD6A?8%&er%4MGqMtL{V3e)@bLN9?}{eqfl5r4Usbnr>pm;U_T$_7buWLGA%or_m* zcILgeGw%HOHF}h;&14#qMv7#m(9y=FE4aP6V>G^|_r_&DOMj`W2Jz+lfFx2RkwRq$ zUIh+CUgHIlBCkmz#d?(k;02Phx~Gg3wqqdykvd11j z1K{(w0fTowV!J7^9SeZ3Ki>nOvI79&&;u}vG`3vqP}za`rbN_L!$WnCbZu02pvY_f z78>^gY3zL*zkfz(uq`!>3&YqhZY%2g4#25Fk=JKnT{VP5$292r4ryGR+0g`+zSIV# zYnw;Y%5+YDwJOu#U!gCy-$tL4RgN_pUz>#AyE-fG`i}Aal39mHo|oihB8>~`sxf=f zwyJGSrXgZ74f*ps#tY=d{QqaG>pP^8x*VgPahtVmQD>6?Y&Yd;mHploXe>`b8^ zTf327V~vM>4v2gHJGH}(k zaFWxoR?{&SSJD)cQRI*PD|Hg2tt7}Vn8D%MjWi%FnX%nYqV7@#>7U zAT zvu>m5GeEY?xW2j4DleH%W&&V3nTg?epk=#-DQlChkbf7)D7Ag_z_dr@C9>V(ecavN zi%PAn`>Lpisj;bEt(+uIMWxo331B!LXrm^HQ(?MeTHn}Z>5n39K!)RiHPeJC<Z4 z5S(?bS>_y$2in~Gqey4VjOk=1g0n7F`GV&=h|ga_{pmDdG0*qMI9su)Uh#bAzoY!L zENGgo>p)$$t+cAF2#3eDsl}G6tl%`TvQ7PVl#6`5x1xYmw7b?)y8O*5Jm0ao{{Y91 VDV+9b(f9xW002ovPDHLkV1i%uAx8iJ diff --git a/Common/src/main/resources/assets/byg/textures/block/windswept_sand.png b/Common/src/main/resources/assets/byg/textures/block/windswept_sand.png index 1ec720724ca82aa58dbd565ea8c47b91c1716794..815be81f45674789403ea38e4d5f2194d06bb367 100644 GIT binary patch delta 174 zcmV;f08#(%0qX&fBoYa5NLh0L01m?d01m?e$8V@)ks&32?c2-a!LZu1qt&FA(UyuS zTwKBc003o4L_t(|+6BP@5yUVE1i<4J0P_M0ryziW691aI3ukf5fSi~)q2RUId;;Bm zE6p+QKhuKP<6+@MTNpeCkrt9&;896dq7BYALRGSZ4G4Ms9;ma8`#^GDn^z%q%clfC cZgN9E>cJ5aFO>6qYXATM07*qoM6N<$f}gTVTmS$7 delta 159 zcmV;Q0AT;?0q+5jB#}8H6XU_K+Own8q?XZ^itXFWuAbabks%mV$^c-!0Rl|$k_D)g{bwrbpLKUKguxxS@Up693Lez<$B-!}9D;g3?l596F_;hu z!xb;s@b(OFX*(y+5lj#|AZ_Mta>-fHzt|7j>z!9c#|f!ue7T+5^aokq46twZ5zGJp N002ovPDHLkV1kljNdy1@ diff --git a/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_bottom.png b/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_bottom.png index e01f1795704d0f61375996098b30bc5299960ea5..614dce45b45a795f3d08a8a5eabe9bdf558f9532 100644 GIT binary patch delta 179 zcmV;k08Iaa0)PULB#~bgkt8C2=gzz1!LZu4qt&FA(UywFgmJ4q&7c4P0C!15K~#9! z1;IfAf*=qD&>ztOK-%kPIDl4rn4Eno-2W=Qhbw5~tN|-+P>u;IA@xz-D2-di{)6P~ z1BICPU@<-&C^j_P3C;(;4F>IzDaHrvq8phDmdOcP6tGy${^-!^&W&XzMY<)&Rqv4S hscCeAd-Kh|><=kw6<#*ELyZ6c002ovPDHLkV1iWYQcVB= delta 179 zcmV;k08IaY0)hgNB#}8H7RH2e)ufi=!LZSmirTiL=gzy6CB=-9AsByoNkl=O9Tud%Sp2@*dK%F-vb>5&nQ6kqo_8YX; z=BUKEI|<>{uP8`W7Vwwao@8_hn_V@IT*a(--RQ h*~1XrV~gz}f3DsbMsW{k!219I002ovPDHLkV1jF2Rf7Nk diff --git a/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_pillar.png b/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_pillar.png index a1d9975c9fc968046d489691cd0805b147a16350..055b3046838da2a198f5bc9b636f81d10e21721d 100644 GIT binary patch delta 164 zcmV;V09*g|0r3HlB#~kjkt8C2?c2-a!LZu1qt&FA(UywDf_1udXnPAV0{{R3Wl2Oq zRCwA2!9fAQFbD&{h}ay^DM)yO1E_*h{~~sW;AmJx*>G4yKW)P{jMCcX#r9nJ&O&;4 zT06o+p>%{o;USbI%Y!)9Y!xxwc5R5w%gak7w_5i@sl7Zu6pzY-2%dEptoQ@sn;+U? SltB{!00000rmlqB#}8H8PS%C?c2-Mq?WpLXyd`K#DaC&v!k`r+1rsJ7=LO>L_t&- z(;dvQ2}D5%1ke#IWI!xnK{meR7a+*S!m<6gaNftjr!WIycrc0V;EVdyuo~go!w1Lo z>Jt}gV)HYIiHqxC*8iBeGEIop#q#M1p5D`h!~G7F$IJH@>1Am;;PN*mTz7Ty2kluH UuCEP^mH+?%07*qoM6N<$f`({Sl>h($ diff --git a/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_pillar_top.png b/Common/src/main/resources/assets/byg/textures/block/windswept_sandstone_pillar_top.png index 84c26138e32c680d14e711a6368f204e73db267f..97f646e317893a9e34822bd066d78fb7df3697df 100644 GIT binary patch delta 177 zcmV;i08amm0*V5VB#~kjkt8mE(UywDf_1udXnPAV0{{R3en~_@RCwAg%|Q;rAP@!6 zkE#1YZ1;%t08E&5Q{@0aFEo65fO<6&W_52(O_<} zCs{hC{xZZ|aBf*1o->AHYw^M>hPK`L#w&cUNg`*&)`Q`tfR8VqJG6Er6!eMyg|CRe fG*$!+s4LM2FI*jOXA69G00000NkvXXu0mjfPeD#g delta 177 zcmV;i08amk0*nHXB#}8T4a9*-v f2&VycWfuMbs{9+CuuJ#|00000NkvXXu0mjfjyUdp8Y YFdz_5|4;sXhI;PS9H3+ZG;2Dmg_cj8B9rZ&jB$S};$TJsns zw!HDWU1XsL9q2%J*IVEjA&QXrHb-ds!4oV&*mbU5%pM|H;W-{1G}QjSssS&7WcI}2?-1gpCoyFmN}ag0j*&0boFyt=akR{06_Us A-2eap delta 198 zcmey(*uykIf|G-pfq_9omp^!-nW~NcxxY{U{#Rf5MP|}9&iY+i`~TYaMETFp)~WYY zDzXDA+^JT*21s$21o;L3hXV#Lf5uM}6(x#dJzX3_G=i7*+~zx=z~L-9)%*YdW_QE1 z?)AnKFI{eHd;OO&T{HJZxPtS!dCgkMi#+u&q%QSK?Jc}rdRS+E?@=p}S(_cMKK#RO u;Ggi3>GKEv0Pn|nUv?*E3GQKfz_|1(NAu&t6m(+sDAfabMg1R>8ejO&&$jQ0a?5(HQ}3x%WT)kG zT-tWKwdgxRpbEy4AirP+hi5m^fE+JR7srr_TgeFuoEx|fMy%rXS(L!m?zo!C<-|ee zRV_0c6<07WX=!cUEV|@KB9|jmUozXczQBk5O*3-o?L?d`@Paxj`1sxuNgsA3A1lO1ZCm zQRLHs4;SMbdvCgFCC&OQU0QyWIj{F_uZz&6H+n8JUn*raa!k9t@)2jw-cV7^jW?~V qtT`_1aV!dKtP!4Q(QeC7!QgX>{obSIC0RiG89ZJ6T-G@yGywpXlTs1@ diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/bookshelf.png index 3ff0402d4bb25a200ef4212e6d4e6568ff501660..7fb5928aa0377378b45f255f39dcf31b625982a5 100644 GIT binary patch delta 526 zcmV+p0`dLI1jz)DBoYa5NLh0L01m?d01m?e$8V@)ks&32_4@kj^YHiDC+X5V(Zs>f zz`n@6x+41QwY9aqu&}+bud=77vZki7rlzl)m<8YSrj(JQkBXp-hn|dxmWPUoiHXB{ z19grOrfC#Aj9YkOSa4%pbY4j&(^gZA>$1O)Y#gaZN^aC}KcKNl7YBdb}1EgEs*pQ#W@o2W2K< zVJTcCN=rXKKOs*vS~DG5CRZawNH92JV=EmkH)|e4Nm?u+F*0P45fL3kEg(NW7&<0V z7e5&@HcS>g6f-yzFf$(?RTD2B9Uf5)Ar(XwcZC3d007xZL_t(|+BME;I|DHkhT&tc zeXS8hMF&%(G}FjnVyj9V>ns2N$GAr8`Ebtr@g}8}s2g8LD%Qy?j&eve5)uh)gPWhv!d4Wjq!)j-nzRAHQ$jiprF;G`HH;WMgk|c`Y+vPOt3l zw=FSohu{Kp{p&$W2&MHuMA@-pe(hkyaU@>9j0a8uq delta 509 zcmVwY9a0iHT`jQ5ZTVZA>#-EFpDCGGi+p zNl8gRKR>dkr=X07XjxD&IAR|kRbeSyQ5QdVFbBxJy7l_{BKqtFf8X8oS1lGSae=e9Yig?u&}0-k!xL2AU{46Ff(ITO)+DmFXN*_{zcW$0R2wb90Fld3lzvCgMECUlitm6tAp`geHomuvTPEn%6f5JV^J1q^xy({32Gmjy2% zdH_GzTbS#MN(#Hjo8k>p+NWtw31@9&vjm(gNp=C37VusUY(8odDFa4jr6w&#btv2m z6y*=1ci$AP>>snKmCz#Cos1lGpt;;3wQ#wp!<7DecDsaO}d- zNSjR*ewp{E=sRw=kguh?MZxV;$gZ4rA&uvxyT$n+Nhz0#N#qAfG#j0)KD5;+{|3=| vj5%l(|AIMa5v|8(R8MKk%M#+h-}w{f0H!WWjFoW!015yANkvXXu0mjfEfTng diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/crafting_table_front.png index 5c193755c4115a9521aa844bd01843f6a95da353..1490228dae90ebc622a606bf841db24df5a0b25d 100644 GIT binary patch delta 262 zcmV+h0r~#$1eXGk8Gi!+001a04^sdD00DDSM?wIu&K&6g0022qOjJex{gD6cPuAAf z#Kgp?sHnYzCOeEP)PFbgTfi6&lawm6$T{Wk zoDt-8jTNz`!@bSf`rbDk1_3gYNRSRo6h{@A8gf{SwpP_(Y3Vrn-Y;!_+t zpgT-TVwJe5r=v+#WVE%8qyK)V!^GVI5a4mJijtnNXjIir$9Z_T|2ka>sQ5|3P(lIDgn|GV zZ*A0xyL6i00T>V7z-nv|d7=Ptet!>u!Y2#KGw_aM*#I2E-?7{P?3R-TNYBtQ} zzDc{~2(U5#p@0btX)-`=v4NIWiKn)SuOG3w9_8u94u4LogwrbV?D0n&%f@My@Tm%` zw^PDEJmbmyUS@!I54MtaG8Uok zs^_6t9V8JkDLx&AoanS(qu%%4ZLAJmL9c;`H9JfS7_m2HJl|)>4<#%Kg1)_a9{>OV M07*qoM6N<$g3n=Rt^fc4 delta 616 zcmV-u0+;=l0`>%u8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00J;cL_t(IjdhYiXwzUA zhM%@Fm(ez^HCRYdDs$K|q^qFlMW|5o?%gac?W>&3$I|})ZYP5gBxTPlccjN04O<; zT0!CVo)3TpX@5ZGQIfNh-x-_x!CF2+t)OrV>Pf~MLp<&Or#@qgGJ3 z@qP<{w_%CUf&3p2ybOkU;4nDsitB;b0q@#-e>`Y6I&RjgZ@QJ-YqWF|OE+BxUQk{h z!x;GkK0l?DMza`mJy3EYrId!*{f1?%|2Gf#{QL$h%N;7ZWjikb0000 z4a|gUe}goX1o;IsI6S+N2ILfZx;TbZ++sbrk@t{+i0j4Q^L)MQj2tso zOmJvojc8~SoH2v5BjP|={};>l+uhxk_tx@pJ`B2eV?isUf+45EoiKs+hi_O6*2Fqk zE@!npdGbqor*`0Tou`4@Cr8@<&KGtIcHs|Iy8rv=s@T&B50^(?ydYCAvPxl}+2b{b Qfz~s4y85}Sb4q9e0OtW!{r~^~ delta 426 zcmV;b0agC#0k{K@7=H)`0000V^Z#K00004VQb$4nuFf3k0004UNklcGZZr{cOSxCzEa1Vt zYIb)%-n^Mb9J+F}p3A{vEaT9Xc%o|me7@K0!D1{&>$#No4}aMK0Krq}%tRZE{`AkC z;3)v0;|CgYp21)i{6JF6na)h)JS!5kmi-3?vy@#+&_uNfL>~Y;MCo?AvRGpy4D3S>I^#K5i8aXb{Jq%YzW$Vm@?Ku!U zRWXVIO~LjYrLgTeussL+%?>&<70YVN-D+?2Kng>D3j9{KSlt1UL?r{Fl=BRNr|<)< zpvp5$mNVQ=7j-7z!&VlHR85j!AGm*g!{|?IROz0A2_sr{?$zaK{DIH+!?s+NUwBi< Uu{8MQ?*IS*07*qoM6N<$f)BXFA^-pY diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/door_top.png index 356ce06b6dfb3cc501172da8cd3fbf199a95a525..b23a42d89c299b58beb5c3d1f7b210d1158c82e9 100644 GIT binary patch delta 226 zcmX@g{E2abL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5LY1m|6ShKGwOSr)vSA> z4a~m4l z249YX8(~-d6ZRK(G&UH7GJCW<=G^PiU^bQSfrjFNAQp!UI!q?kx0ZbQe)Y$`-b0Fw Z_T^8t*_N4{1tlS2n}5Uq5Hiz0Zm zUH`2ZC^BVxI6GblRp2zlGl#J-h9xtaW0Nn0*sPGOa*rpsd zSi8vMl?wFdXX$@_;RF?|W<5@dvX@>Kb7ulT%$>-QO!&hjz0r{r4Q)jRgpBXeK)o77tMM+^liZ)(f_K^cAcOyuwVu=iE?## z$~hG_=(O^`#%Q8{9JlDli~HZe696-7&xr!BR6xmSC@}d^BkjFP@p-+2x4OX6?k3Uw h?!dyN5VNvPegIzZn~?POe|`V}002ovPDHLkV1j2G(0Tv> diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/grower_item.png index c6917d0446aa90c122259c87878155d715a6bcb3..f26be008e43ef21234f2abc00e383dca15c516c3 100644 GIT binary patch delta 210 zcmZ3&)Xy|QMToP&BeIx*f$uN~Gak=hkup(HwVr{2;pg$>mqk9wk={o&Y$Ls#JZ#L0 zWOQtd^~`iN_0&}k)SPe!Dq<`N@(X5gcy=QV$jS0_aSW+oWIfo(*v!Deyg{UpqV7K9fzNg22jrcM>T9;7WwF@tC;C(7Rl(?80&f1m?cMgM|wFiFfc4X6aE`W zahC-71^PtOc978mMV|$~8TpU@PIe#Vo=bpFa%3sOQwU$C_{wFmU z-cDgGZf-qjn!xYxF35R6>s0rQOX*MjCvjZSNZ>f%{%Uhb8~aJ&6HP8|MeXN4-8(fk zSo>qHQ2pMF`MWnSlWK6@bjAB&t$w-BiA(A01HQhEFkJAPU1T9!O~kkVR~fj0PV;p2 Kb6Mw<&;$S^=UpfO diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/leaves.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/leaves.png index 0174626eae5904227053dab6c96d547ea99e0eb6..3f6e383642a7c60191bd35494e867c4b671ca339 100644 GIT binary patch delta 201 zcmeBT`o%awLXL%*fq~)e-A6${inG8YvY3H^?;r>>?wFYUcA}zcJxKmQ+O=%Yb&4i& zg7U}HY~u9%N)>QRHAb(5l}M(ICn!gz(( delta 197 zcmV;$06PEr0g3{U7zqdi0000eEe}(XHYFtOz-F!?G}dcLUJ)Mv002DM43Yo<00neX zPE-H?|Nj8{whmK~AsByiNkl{M}0of+|g7YkM0NdT>;M8J_Q^A000R9NkvXXu0mjf5n4^& diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log.png index 7ec6d481047ee4ccc25f47a06a9be8acc6a7b3c2..7e2c58984ac790ee3776013489a9dc74ee50cce8 100644 GIT binary patch delta 204 zcmV;-05kv91Ka_S7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-sV_8dCN!GMU~lIa-Ok+k>$!pcv|d__#)n@wRMZWw;);gsCV zvZ#$G?FnjJ@tRPqu#l@b!wmkdLmW#9h=Ejk2NRBSmi+QWAGh7Lnddz zHIW&7Uk?L>(SH-CR4bq6h;x>U%S|IVr%dlGrd%%QaY}^IH|>;a#kfVa-Z7nhJyb^c z{QHE6vj4nm##)RkZ2*`s`r30A<@q!>ZaZhW-CYr<#PxQ3HyH!aS=*?_wA8P!;4i9l z);2`JcbLbA1BIeQF)B`}5e=iqIm^$(ky6;KT`jAK)<8;g%ET$vb&U`I`4>c#ELtZ} xTo+No=->HZvS_26SJlh&({W;buH+Y0{sP#?_#i+>BANgI002ovPDHLkV1l@F+ByIL diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/log_top.png index 125a4afc09962d009679060f07db15fec852216e..9070f17b85a02a0d37c91d4029c182a037c658a7 100644 GIT binary patch delta 270 zcmV+p0rCEc1)Tzr7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000mP)t-s|NW5v>`%;& zCp(N=HhNH9R7P1!LMUQDQbj!?Q#VLFHXcYXJTopfEh#Q1Boi+lNW=to0001+NklQ<=x!K?cLnU0KpOwA|V1G8UWEpGc=SlG#mipIe(X#nUt3;0MR+W`@jEm z4FJ$bv`3eJbPWK&IkW*Hf0rHrp*i;nk$aRa0D?*RDUq9$EC6Cj`5+Q|lpFw2H@SJ2 zf0PXX(K-MByZ@IM0MU7unVET)CIG@jGc-dpMf*( U0A3%o00000Ne4wvM6N<$g8HapzW@LL delta 636 zcmV-?0)zdX0*M8X7=H)`0000V^Z#K00004VQb$4nuFf3k0006*Nkl40_I=F~ap@W-~yU!Ny)Lc;tK+s6&#gNx$j6@BiTcz3=<~6Dv!#)7!TeXn!`3m_XB104|pdT8D!4 z_&!_D>1mXFE`$9>2NrQ`7i)bP0LONLU%&;d^+hPwakgFqU~N1BufhF?0!7LQfV-~} z^gAY(c5>rBt3)RO-KL=2O`w)O0;>Q-FLv46gg=82C6p14?V^@ekxha4&_XkGq(6uy zcbfu$@{&onDSyxm9mf_(nIxIk)L1saFbFwz4)9xoVGuG5Lj0D%ZwcD(Kcg8s`APw6 z;~4-70L41d$u63qGYmqi5AFca@AQ!VfH`XcfMe%?Stt`n)lwEYmI|=<@*a2%99sZA z*7i*Rq(7h!;57(kgp$+K;5C4ed4cfgcZvX1pLT!(?SJhGJom|(BR*d#;Mm_tYbwc% zp2D$RqLU!*F8x6q+5g-uG)*O$Qq^;X3EJ--)84M&*e;r(Pt_*ID@sPeT3<%p$)Xv0 zEOTw&L_T^u>SUPl_l(-;OtFrX-%&;*yco+2gg4bGYZe&>;S}HR^uTLytx_Jx2>kx~ z69A)To^=}}fH`YnigRq2lzMd(qhq_|D>tB0KrLnCM-yXbxqhb?-{W04%l*@tNyYk^ z1g|k#w#{Y07|#bJR+eg~H>=mDtJdxi4lA<9rOOSBKr0BkFP%~0L)PzfcmpyS2nrBL6h5+ z6^DaelWT^ z54d-|P}&XoV%_*4n=jk-<;>>GVAZZZ0KVR1r1Mw&L<{{bO#~Zg@RbjAP5h#3=J&r_ zO1l9Fw1CF0+6UQu$>{1l&?K5YKYGnw?5nxzr_^+TMl(e1g=9Kz1@rZuli4H?u^Z9Z k{e{N0_W%F@07*qoM6N<$g4`%;& zCv1#cJB(X8f>k$rP%?2!ENw~-8F)=;q8ERDet1{1zQk_cOKP89N8WW6ZgPwP;MxuVG%HohW@Y}LdkQ+uiqVU) zGQYX+0Jt$J17ObDCjjbibVYBRzra!Fh|JdtsjMMXExSJ~B{R&nPvn>Z7$^I^ejnXh zdj|ljmMw%ts(&bpMJ=tqihl18m}P4KfAp($Tb)3&QY)lh1a><6&fh;BdRnT5831qZ zoEW{Bx#n#jxnv-pOJofpy1Z`mVx_5i$8qb$@vI>L=rfS5TQkAd-hpekNRNl}Zfxyp zX>}n!OKqpE4g;=V2E5}f} z0Iomv0N`Z5qBlxYbsx)0>ICf{B|-5FO|vp@mMs9`_-y9e41f>0gju$#mTi`;2OlK> bEI;xer0@Gh-bD`000000NkvXXu0mjfqNg#M diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel/stripped_log_top.png index a9c425060558fd380826bef62db9d3b67ce06d0a..762a83efe715bad9f21ab7e874abd45f6211ab0d 100644 GIT binary patch delta 240 zcmV-B44x2dQpi+xcr~VJQM=8{1VFUsI0000;T>)D0njTAGKI8Q2gnrCpybf^KlpKJ8>||sqKV{9 zK6}{T(e@;Irp?W}x5dR-Ws$}B6~12f(Do#x<)@lg&DxYM*D!v!0Eo&lM$UliNUo@J zsfL8aDJJfa3xE9_r)4m4hfLfdPRqb)8MJ@=5o$7}ZT3Sagp(^ODC>;7zlh2)Chm~b z!}|dAOq-E2;8tcCfD8Sco@ui%{p@*Xm2i+-WHHXDX$U3tx9ecl&?^RDvw5l#R~1Ii zfF6KVBeHmd(75Y@RTCFo!=h)}0Hlg0`QyZu6af~N5`XBG2IH*zEMLhXa%+(uN60nn~Kqy2FSz0wd|fJ`Ax`=Cfz+c~6OP80bOCo0E?s|o;{rz)fT zx9NkbNKd}wuTgSnuMdMF_JvH>u*6}2xT-L5hav{QJAU0HB(L+>16Y0Oh&=yiq**R1 z$M|~B?^{?nRWzw)Z9pX|$L6dI%-J~TQvNtGH4-*wpPo$nej z4a5L@d>a>$Lf@BR1{Gab4@^3&lbI_W7LNdj86a(;usM@lN!QQ7dFHvg$BA zD;;Sv^Zv=nmv~-0$ZOJT;VrA48oV<5?z6b50W2J@A6Gq%_^)WH*#B&6gb>hf22WQ% Jmvv4FO#sDaQcC~; delta 440 zcmV;p0Z0Dh0mcK67=H)`0000V^Z#K00004VQb$4nuFf3k0004iNklYU z6vlribV;-hl}t`%u;}1aA!AW6=2a9rx$2;AAowgH1)*cWxHuH*kgYnDcF;B*uS2}I zx5bEOI-Gm{eBXEO5jE>6fU-!*5(PjQ3tkXmTUn$4WQih-#eev+$lL0C&;g*|%{d=* zC?}tI{!Udm`2=7&`2yf^|D9X+1c1BcGmR`!;8uxV5W!#yz;rm~Hw$Bd!B69DXy_?= zLcg1@!MCZMUR?mkW=I$dP8f@U3$WE0iL@T1EK;QPAX}Z00G!>tnYbS41rd%HM24pp zN(-c|n!Jh|eSeA+#}=rrsLrxPRSf`Kzge4TBMW0Oh{ITL$|A+}n|S_?+3#O;ydW|Z zvP9u%PSfFdO?|s)v+;B|#`T*Of;!lC(I#)#Z?3igtKVi@9U54P4pjfZ4lMGvdb&SQ zo4%U$)FN*yfZd}#Lr2uCrw*@Q0eHFmK;MN%X5Yke@-fBZ{yW$6w(%RA{L1X$B$1I7kt8C200030+nN8?jQ`Ys?Z9U3ziINUZ{?g@%%4ZribK|G zNvCES00DGTPE!Ct=GbNc004bSL_t(|+U1Zj4#O}E1DTq!X-WM5 zcMB)T;5|!GZFdkP;DEOVkTzsU!Hvns0EiS@qcUzzMNndda&a|Ekr@(ETLCby1J@aP ziFh`|xJ2dRWwMrlomqBe+V>l~Jg4hnpghlWy72P+N{{jwdynz?jDPOY``)7;N56Y~ Y0Xd-!3;a(paR2}S07*qoM6N<$fgk2CY#-yTT2mhHJt(d7S?`Zz&(A1<+LUCwX!XFi=1{r_6er#1Qi zZ_i|4U|2rSSQ$w1l?3?(|3?N4t_SX%n5ZaG-|gw*7-Hdn^@1Z`s{sc~09(|Suy^%$ z?H3sS+P*I3;(=^q-w8ifiz|c&tB1G*<}#)~n8IS}m@ROb*(XGiDRg7YIqN{l^F$D#rUak4v1d?a5u7 s5?`=hT=B!)+A}}z9KTcU<#L37>mvzI)qsc=ppzLqUHx3vIVCg!0F@kb*Z=?k diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_blossom_base.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel_blossom_base.png index d30695492ed3bb2c44823862244b02c922cc24eb..06c41d6ef8bef280fa7ae0359c34b57bb04eef17 100644 GIT binary patch delta 196 zcmeBT`pP&#LXL%*fq~)e-A6${inG8YvY3H^?=T269?xHqGEq^r9w;%>)~{a8EKX3~ zhf7STL17zEh_NKdFPOpM*^M+HC&|;rF{Fag^wcMjeWPQ@hbK#)aS8cRe umfQ?n8?*FVw2+7NJZX*zhg!~^7hmv;$4hDZ&euTe7(8A5T-G@yGywn+$w?3Z delta 197 zcmey$*u^wKf|G-pfq_9omp^!-nW{>hpnScW*-TqMA1*PVu+g$APawrw666>B9|#zJ zZ{rJ|s3=ii?CIhdq7fY1AI-;L$id{e_y5fD3-i-_e=(G1neIO@A$Me1@FRoYEEi&aonYL(Ve#z!mwx+Tr8lR=6Ouyu)##2?bFek9m?2dqCUtz$p x8=lP448BkQJ$+_f*t}5PVqeAjJ%*nd4dyVpua}J91#}Q6gQu&X%Q~loCIG3TN>%^> diff --git a/Common/src/main/resources/assets/byg/textures/block/witch_hazel_branch.png b/Common/src/main/resources/assets/byg/textures/block/witch_hazel_branch.png index fbb35f3f0aa4765a137f87152ed24402ea20254e..8885b6b0ff988e3723f8e78c21f8b5ea0f738c53 100644 GIT binary patch delta 176 zcmbQs^p|mh%EU&|i7HC<3=9l!52Rho_DqiSj`VU`r)c6~V`iqS87C;Or>=5K#5E15 zg0UpXFPOpM*$ogU+SA1`q=J$4U^^qTBM-BJ&h-6n_7?yp7#JEv7_=@;WV+$EzJwv? zyth8Xy$a?P9+IDf5~{1O+TITGu)j0u-2pQ`wi7md#f)2@KiHgi)-1QZx5s;M|!VQG>P(Ae~Q`!@NIHd_qd+UWTc=gw>i`Sxk>B&tYHP-JF%_xbb3%!F9bzE)P9vCT}m6 zOZy?zHV4Ut%+=os(-3lSe3GDe@m@X7WZ}52NZ}ZI!icRRjLWJN3feNf9 zvdIdfD)f9!5Vy#?PGO87gE^9WkQ=88%~TVL!k4I0CIe6Km`ldEj|{FE!`2XFj?k_* zHx97KR1-N8xu{UZyN3|Q)pNQu&q1LjH&4yYGym!F(mcMbo_lZO>N#DS=kUez`R9k{ qxNn|e`{FrYn`hTG&+zno{&@gGZ&~)EU(JXB0000| delta 325 zcmV-L0lNOx0*V8W7zqdi0000lfeK}jHYG6az-F!?G}dcLUJ)P1k23u0Uj6%-0000# zHx?`a000PdQchF<|NsC0|Nj8qgS}aiAsBz>NklJzTy;W!% zEb5->(XmsHqD}M9|M7<&dhEL%JT{HL>A}xvG{)2Fe|Xh{;zN(ZVUn%K9^j%!)%kb> Xr~(J*5jKrQ00000NkvXXu0mjfa37Sd diff --git a/Common/src/main/resources/assets/byg/textures/block/wither_rose_bush_bottom.png b/Common/src/main/resources/assets/byg/textures/block/wither_rose_bush_bottom.png index 7bd83f9d2d188e89636301bc686e65e2bc7ef94b..22d182f09109730f98c9a844e3976ee6a8c7c94e 100644 GIT binary patch delta 252 zcmVfI87tlS#TBX%G-XVgG zmt_d}9$Yi`kwT%LS8^D4;7ZSNSOMyNmjhBIa$W!sw2gp?v%7#wI%^t>NKtd!u3<9n z)38~>bjU1xBar{PS1BO!IJIT~dg%cG_XGfvH}D7Q2qBm+3_NQ90000*a=AQRKmE{o{8RxEF(4a;!Ix;7#!2d!T>=8h*+cPI zoNf}gyf@HMK86~sxC~^|G`O#s0$F`TdPd?$Kev}^KHo9k;CDTwWE~6SDw6HFPRC0`g*&0 z#MU`C(VA~6l_ESQr?Z82w>M>TiXY#+7MeVy`Fz|53!DHd?DNG9cn@~mTqh{tZFr{r zgTsm@$|;1yVF9vna!$Rfpma9Rqr)gyLjg``O#mfVlzA@>{mY*nDFHB-ai-Qg?^x3cydsdH#W z8_myd^4NCj=dO8yC#wJaRoQFgo_q9Ede5HfRB!c)beC%rcZDA~HTTI68SMsL_4&$z z8rsX3oM#ES_=5Gw9IIb!Np{zB{%SM5F120!J0|3)z1zopr E0HftxsQ>@~ delta 523 zcmV+m0`&dA0>=c983+ad001BJ|6!3fAdw^#e*xS{L_t(IPo+~$O9D|8y(3Xlppb|R zS*TD1nPpKM3$$`px~fh6f!g_Z`US1}0}0Z~O(4<-VN^JlCT0_)eP~6m&TXDFeXP3h zxNq*e=iGDed!q;;=s#vN{jZivr7Y}g+U$>Ne<}bto6S-r5}|hGh#HM1ZKd}VkieU1 ze}5|g2w;$GZf6*fOeRIM$HV8+nBcp#jg>`#ifZ=*jr8029Kc*IN4l;vk(v5QAf;gs z4{&HAM0&A^5S<%cgjQWH7a4}Z9z}4*GXSX7YLO!_MfrT5yk0LkU+N65J~@dRXQX=E z1Qh_=?=Q*c_j3VOP_5O;ZnsmRP@r%)e@t$-o53LcYLQV7JzpKuNzFzF`v*K&CfMCC zDo74E-Z&9SXbYsM?i!xvI4T}i+8l!+$8wFa3BQ0;B#jUBn9&bH#}JjvWp2$l&2c;O zDlOLtB^VyS7#xzYB)GeA(E-b$cL?NEchVXDmWD*MX4LMORK}zNz8 z{~Q1S00DGTPE!Ct=GbNc003!8L_t(|+6BRZ5yT(}0KtQ?03;~@$v2>50cJw~HT^Ep zt$iVixs$jtWS^$jU`1jzm8X!QKhQWirCyBsqTi0UH`VWleY(|@MK*VhoOF|2?F-x) soF@d?$8Ru5eaxg2)RG~C5{)sr{;XRJ`Dcs)lK=n!07*qoM6N<$f|nvoAOHXW delta 210 zcmeyvIEiV31SbbG0|SGGE`RVuGX-6t0G|-o053bBP+DA|siB6Qr9O~-irvQrNU@a! z`33(60fx={m+YUYC{bVT>Ealo5vr-{xO#Uf1z8x_r)VZu1*L%nH-u|ow?>OT<8rS@0C{|=T=-WPtw-D$o22WQ% Jmvv4FO#q@lRR{n8 diff --git a/Common/src/main/resources/assets/byg/textures/block/withering_oak_log_top.png b/Common/src/main/resources/assets/byg/textures/block/withering_oak_log_top.png index 307728e928df78f8e8ca83b417d33c291e28dd7f..dee19b790083b494d81ca0ec048e578135edb4a8 100644 GIT binary patch delta 309 zcmV-50m}Y~1AzmOB$2Qckt8C2c5P*DWn5}uSYcsdU{+0ERZLG$PgP4oK|w)CJ~c!- zF-JKqI5;>%H7Y(aCN?P`GbbJ|A}uc?8Z00xEFl>w9VRLt79<%TBN!hf8WJKH9U>PU zA{h}P7!e;88XpxI9~KX|=KXyD005^+L_t(|0R_PcLIOb$1Hh!6Y{sE~RUjzhwfp~9 zT7~10d3x>3mh0)ZBSKXKx6SIN1}%0J4y&);9BoIi>LzaJS8iRg$xciQTLx zhnNUTiQR6!V(|k~K>uhw69RC6z2igEQswYHtTo zV+{FT2Y*5&K_2U!6OtKB>T6951J M07*qoM6N<$f_9^KeEs&QjmhP(xl? zTttwMn~Q^^)z=9q$5;~N7tG-B>_!@p6X5CM7*cU-Zl5C`iy_D1J4`44*V{OC9R9ZB zPErT!AM?7#FO#YoAN>h=I@__*;D*wrMTP}cH`4`fTIMsaZLkYoTmG!&*lx@9PX%*M eezgn6!x;Tbt1o!rNiybiFV0yg%;Xie~j7=|B>GVjpK0oAc-&ks$ z_26D@w$8<^rUy2EIbkJMU8dv{ap26v*{(Adm|T(S;LNgT`sK|X(|r8w+zVdw?=WW= nSxFQyxQl(iu`NJdxPtLuFWa6?2hU6aI)cH|)z4*}Q$iB}^pZ;R diff --git a/Common/src/main/resources/assets/byg/textures/block/yellow_birch_leaves.png b/Common/src/main/resources/assets/byg/textures/block/yellow_birch_leaves.png index c98231c29c50d51395d1faddfc36ad99bbf604a1..3186ebea271d97e7a2de77d23a413c9e626dccdf 100644 GIT binary patch delta 152 zcmV;J0B8Ti0l5K?DSrR}0Q2TE+`}!ytSF<8BN|4ofB*mh0d!JMQvg8b*k%9#09Z*x zK~#7F1;K#<03Zy*AYAkR&4STTlcHP64ht&_MRv@M-i5VyksTq6x>1LCXA>JWw{Z*D zNZuifSh-n_nj5Qz?BPzr3R$V+CUwF+@-BPa!Eqb1vJd(A0TIYEm^1zW0000A>Zz;qD$?o;>HU6)D z6FdP62Rc$wj>>OpkjIuoV)`VddN`lDnaRQ0{k4NHGIbv}{v27G%5?CT_yM@<0cOUL ROVI!T002ovPDHLkV1lpnMpys< diff --git a/Common/src/main/resources/assets/byg/textures/block/yellow_daffodil.png b/Common/src/main/resources/assets/byg/textures/block/yellow_daffodil.png index efdfd3022adbe914db84cadc9d1976b9190c4324..ea35932118b6d566011766881280c5d7c087d758 100644 GIT binary patch delta 172 zcmV;d08{^u0`CEk7zqRe0002(-QrS_ju??7B7Xn?0RQ~_|MkHC@__l*<>$T7@xDFV zr^eZ!AH|5QN|YBPZyOv`6c9cXOQD0<00001bW%=J06^y0W&i*HK}keGRCwBBU?2_{ zFc?4>%*;>`HZ=&%=#k+FW{8Wlhzo!i1*N401z;i0N|^o)Q2O)&D1&#y1t{w*l;!~m a02KhqnhI#{50EJN delta 201 zcmaFQ*v~XUf|G-pfq_9omp^!-nX1SCPYoaU+5Z1};QyaLKd(Q%xj_E*@?+2UUO3vZ zMmb+vCPc(*inxHC2vEnzk2^Dg6kkb@U+{lqz~Fk|&WVYN5}6^ME{-7@!E<{8g&Gt% zSXBj%KKXZ@mwDw&<2fI7xud=W|3Augd~e{r#i0ca&D=}4rW&wrlH63y9hO(7GvD5- uyj?d$$(hGewkWylob;!YAM9MetP*$Z;NBa1&3Gr!Y6eeNKbLh*2~7ZVa$6n% diff --git a/Common/src/main/resources/assets/byg/textures/block/yellow_nether_bricks.png b/Common/src/main/resources/assets/byg/textures/block/yellow_nether_bricks.png index d5c82db7784d28a4d0d9a9ea0c9c70a97d0cc650..16d6c8e7e4929edc5189bfa3e193ea61b5f1dcd6 100644 GIT binary patch delta 190 zcmV;v073tf0`>urBoYa5NLh0L01m?d01m?e$8V@)ks%;|6;Mo6MWmktnv(#1djMr+ z09IB2Pfq|xM*uHDA(H?A0BT7@K~#9!EsDVn!ypvJ9^HUU(830o37QN5ALX8a!u}&v zQEJOKYyOdURn8Z$oI0cvrQGtG8=BWX?^NYN^`Av&gd>6sHshQ19P?5ruM$cy(K+aJ st%l`>>DnJ5^$wEak7aoP6FLEdHq0hf!8W_Ogu#2Ho|xG$Tqf}vdCPCaL2r-t>f?aQzJzqR+v?xo9O zl%@zywRx_4-sAA=ldiG13N!B{eoEOO^?uEKiIB_cS3`VV)bz8A&)lEUoNl%H>$?C8 gjcSKAj2tzLys|=unGgAsL9X(2^>bP0l)%^o09QRlod5s; diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/bookshelf.png index 5d18d631d4311bc55a6d65a343e27b677188bcf7..a0588273e0ab9a700ae41b2ffd25281eb940a897 100644 GIT binary patch delta 334 zcmV-U0kQtL1>ORX8Gi!+001a04^sdD00DDSM?wIu&K&6g003H0OjJd+wY8|53WkjuDA|2&-c@mRK(lj%!|W4KZV*RcHxmR5OA~BQaZ!3~NwHNl7YBdb}1EW;Ggj zFb7{Y96vulSuYon5fNi31y3gvM=2FIAP_4V4JZa``v3p{vVTcLK~#7F1;L9-!$1%~ z(L0aqR&B8eqV)eiP9#P`YonW;9nX;>82}alc5+@J5lD2kr`07JM!@XnZdvpgnGN{P zF!-u^Z2&(NF@RYGCORJz*$KoRAFNM9^JU|p=_(h3?gj*OHz|P$9V`H=&O6Fj^ei&a z+zeA$a?`T+^+!+au5Zid4S=ZoxZX};&t=Bj=f}SO{ZOp gid+ICI=F=a|1q^z5_1pknE(I)07*qoM6N<$g2kD9;{X5v delta 683 zcmV;c0#yCp0=NZ`8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00MGJL_t(IjdhYsOcPNQ zhQGE`IxQ3%+iE3^m=H^#5sfj#kVX?DB;dl8j}TlC!`8TQt*kUIT*{h+l`Kur1UDou zh*3gnu|7hybf}aWNa7X+NbT}0Pm)5 zk}v8whX$}Unrc#9>Y$(*l=V8%fN1A+cwC$f`w&7tc(CJO%`jMqh-?o%BP*vFh|Z9gAhBiI zp4d<9p{XVpR)TDmbfRG|uEJjR(Ycvfa_XSz<$usEegp!DAHE{oAL*e!If-Z(Fn-ydF|~LRRaH6By-YlJgz-HG(r<09cZ`&g zVsIpfkd}2~f3UYX?^^d&y^}7(AntY}VIiLQvVgI%$n)O*JvrH#wQ@M=?KIK4>y-vLyG30{%9a-BFXdPZV1G@e8}UB(0*F RnVA3p002ovPDHLkV1jZWH7WoA diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_front.png index 3a59fc91e66dbb32f3b84743d661f083d1b82d8c..a251950934ba66dcb8d9b0d186b73d0cec5929a4 100644 GIT binary patch delta 269 zcmV+o0rLKs1)Tzr8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJex|Nq$7*tNB_ zzil?FV>XspFM>)Vb2%VpH5yqj7fUM`PbU*WBMvwr7APJI8x{>26bum#2y5)Z2mk;8 zl}SWFRCwA2!CQ8NKoCR0D|HVXoP1>e+swl-HltMO>o?&si+_9j1AUsv( z{-#_w^}?8lSP&9Iv#%gG9rd}d>VwLU`#EQP@Ee!b69! zKT3pxmmCELvRKxb8Iawbj~!dJ!{^Mp`CeXlzwdkA_j%suOMh90zIXpp5i_e|XaI2U z{Z9tEG*+t(08ZvJ%x?;wTs=-4zJRfr7197^R>cb=ybzXMkKs~|S*J!pQvjIX6pZ#; zI9`OARRM4+0RT#jXl7N+tV&+Araw!MRBG=KRWZp&`v6r$0j+Vm0%UHXw0z^w~Cd~pNL7YiJWryqYI&$|J*J@bRH zv%O3#tTT8_XRaJd0AI+F9?h;YXqy;$9lu&95W8{$FG@fs7S<0?_#*+FN`R5qsr=o+ z$m;<6xt8by@NDvJ0<`petVLnT-9pPqk(OQWkOr^5x_@YyG_PL_v$nP-YvpaU>!*5{E3e2kI$nfz=OynxEOGJS6lPY%@uFmnP9?zcA|7Aq zO#s?_U}jZZ*9E|~ZJbJw?7gLj%(iW})l!zB@0~8FXqogOAAGKa09-zClw4;Awe1}M z9!!1W?tirbz6X)iVC0R z5Cg_{CU5j5^rVrhb^K}_Bd=4k3V31Era|1~{~ADAQBpYjI~DF0K%&P+O`s?#rWZF5 ljV4+qjc7EJ$BL5TA7c&!h=g5Pga7~l07*qoLj1eF4i8Gi!+001a04^sdD00DDSM?wIu&K&6g001^nOjJeK*x0qTwZCmP zt7A5nSTBM~BXc<*W;GgFFBeNI7*8h?K_d=0Ar>Ye5-1)E8x{>26bum#2ynN8NB{r; zjY&j7RCoae!BLXJKnz2{C)pFA_5<#J(qt;Jw!40}q(6@3&wVZVYa*}ffaA1e49PQR z_a(&8EP`yxV}@qe1B8u)Xf&UF?7}33#;H^w2tmEkv(;_cmb*EbJ{@)dy&Ff73r7(& zQOQ7v2+eDPytpF_%|#Gl<57-Akx3yUiAKsufCSJf%%rnChWrEg{z9}z$BRq=0000< KMNUMnLSTYHXk*|2 delta 589 zcmV-T0DM?$9Bw#L6=wasOL7d<(2I66OAIRv@i!i(@$kdA$ulom7kX;6X>^L{(z(Wt7 z%*F^FP>klh?0~jfv;i2vR`F87+{+^00&(`W6>jsQe4Xb zAn5b}(A7lOGH@+}D|Hv&vuP}P94BLrlQGMFmAF3yAWBjIe9s1u2)3Fn0IGB602qv? zh|z>ZoXBnMA%9{t!7R%RV3td>0S|9qWIyb2t8Q~PUhn)s*5`BH3PIc-vfEDNfLKUK zFSid_T5$Pv6tT46(i49qf+#J}RNwGZ4hT9uoLYs>$u!GdoLU7KoM|p@SD|@M<@B0u ziN06uCyAAr!xwV@6`eD9)G=I=lKfjn|pLN8o36m*XMJO zsE7sZwlg27`xRk`YZ-)LNGnQb8e|mX{xHuf3P$4XQ(4?tD{PZ`Q21G%Wg@=&9AcJB z|M}pkmjJLIXgO~n^TO{Lg4LT+1I05IGEcq~eGo(`zH1N*+56yqra_cQ4Pr6#xKpd- z8mNJ)M@GGy96{V4<^uViO_Zbsq12Lp&j3ogt`W3lL4=Z*(xWvH=(@&Mvz5JtQvMbI bbY0^w0H+LZdp%dP00000NkvXXu0mjfw7Cy< diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/crafting_table_top.png index 73e275e0b5a4a1bdaab0387db4bbfe12dc9d8705..b88720d68fd088be7582731df89ae07c5452e854 100644 GIT binary patch delta 216 zcmcb@{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5Z85?HuEBlrbXx%TPlQF zsCa8jI4bi=iSkN{@bGc7ar5g$165Xdx;TbZ+)92iXJSrHPFUnY15e+E#zsTW$%#Qs z%s?<(%~{&J!#iVzGn=zgcLTF_bF)MzTO(=+Dt6}dg$b z#Mz1AmC_o$hQ(m|hICx?q!AQI$Bl^SNrQGdPk%IHzWzolr8PP=Gbm_U1={620PS*~ zZrwlY*3Ezebbo3lrL=}t$z>z96_<{SZOhU}oXkrgM=ro8#C3nJ84#^bHk%fq-{hs7 zW-1k_FYd1{tS`+kEx=hR^KdpuTS<^#FoVOh8)-mJo2QFoNX0GIgNA&E6hzn_{O7Cf zG|seT_@cPkhP&`c`&Coy6ej>gTe~DWM4fTbyD? delta 498 zcmVqfm|Tk6Vg#ebQDzi0(WhCYIxj%%nn{Zo$Th*kT_}hu}qj#^tKIDKLhzO|vN2ZZR{VOi1t85!`WRzrUIJj94o@UuE(xeUxJRK|$rrlC z>I08e^1U&pNS~SU2eapAyLz+58QB6XbSuDz^2Y3Xvt>RF0k~aedzI6?Bs!nqJIJ~3 zjiu%9%fJ6yh<}p?fU9sKAb_N5NNbpX{slnbDgZwHOgZyZ_drrLd%{J5k~nZx_eiDj zy)nMiRZlBTp<6_?G%xYJG4VPhI-f}FJCIax^WqWjzWl~_hoqI}?W-p&?pD~&$R=== z%=IBgG4TG)vyM$(5(SC{_j}+wooIop_WBQ8MZC^r%xm#F6P=7^R-s!_->7YbGEDXu zHq)$ diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/door_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/door_top.png index 360429650a154a33d12743098d61954017ae1328..a0f64a65311feff2853a23ed6306a33eb91209bd 100644 GIT binary patch delta 204 zcmZ3+e1~y@L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5ZC>=Wc zSx0uO%60iDrlX6+zCJX6w&UIV6xCgurli*I+~{gFFO&27gX#}jcjRYX^4cIB+7vkb zf!ME)dc`N#IQhO2URT!RdN24*{?eyEZne&O`HP`xr$YC=`7$SfHZpj+`njxgN@xNA DEPPar delta 408 zcmV;J0cZZ)0j2|x7=H)`0000V^Z#K00004VQb$4nuFf3k0004CNklrGjtXQ01ELf4ys>VodI=`uY~ zyGj7Oe9pJJmB6tS-wErv*nwjad9c`^CK2HIW44uT1Qh@F{j2yiFHcY6e;~4A--RYf zYf)HludX*mR;Un9O`QH;$Tk883wjYy6Y4LM>mBN4r4fgK|NKz^0000#Z zd_H--UWf?pzUrzYr z4))%0cW$K=%#1lFrIa6@s*1ZKB9u}9777s|BDhDyf*28N%8sJ7#&H}=;G|JX`62)q zV~}>HfH^(&h<}JxQ&noM+-j|qQaFxd!7?*cbtymR#NC(oz@l`|3?$TSN}=}YDe8{q zmN%!znYwJ;txa9>Os(~6WAe=Ai1@K?*CJ`=|7{PLnb?q39{{21dW3mKpkHtA(OBL0iGKW9~4iL14)y&U}^%{dVf{sDNpK&K;DeAEB{ N002ovPDHLkV1g`a#_j+B diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/log_top.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/log_top.png index cd54ac00351716750075d4ec1326c518ea98c560..b569c03eed9344e8d90af93b6180fc01bf5d2471 100644 GIT binary patch delta 248 zcmVV%7 zVOLjIf=VMwN=jxm8a+KdSuYnhHa1Tu6EH9^mu0^`0001zNkl8mI>-gc95e&F<``R62M$zi|)WeETf9xgn5J>ob)I zujJb{Z7@Dpq)6{D_sq;ijnT^BqrPH}7v?A>CM%V5g+XVficuSMR+ydCn0k2(t}vJ_ yGqW~$TSc_h2EqH3QYsOM)ro13oPUS=(j5O$Co5d52VnsK00007}A-w?RP_g`xO;&HcCZLZLEN42@~ z3Du@T+Z_O(-oL_HOJK~Q`j?Lr0Gf7C$TM;{ySSujK|~0wwUo6c9tSjSclaT={US?{ za70;eF(x4h!+($>O9oWSKYsy`aMYQ)r(L{!I#^q44-B;3`6})84X2Z5Lk9ax`%J9nY)tt`0k&c;T)0YrM5yw#!J*e5i(RJUuad0oAhm+?|eC!zXO*Y2t+bF|Zo#yuX zhIkzKWGBJNilV49v0niWZvRh~m(bl>`3iRj$03dH4_sLwB0x8dXBU@9IOIV;t9GL_fFFW$0RtvFu`N?AmNa|ERn)9Dlu Z#XljQ;U`O&7|Z|w002ovPDHLkV1f!a>Y@Mu diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/planks.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/planks.png index a80d10bb42dfb12fa4f892836502fe05ae173dba..41e5bee4e0620defc51dcd3e22faae4fb6ed90ca 100644 GIT binary patch delta 198 zcmV;%06G7>1J(hM7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-szil?FV>Xsp zFM>)VW;GgFFBeZI6BuK$WdHyGZ%IT!RCwA2!2tooAPfM(XEQ)(4J4U>mDE9pgBAzG zzl7b>BbK zOS5m^o0%QAe!gC=GAr@=7H*HbigW(O7wZTC;PowJRw6T4ZGR>J-(e#w+V0RMPEsOSuw-vgSM-%k z5hrPVN%z7X+J8i{AoOnx^zEuzAJ5KJ*E(oF86K!o=gl7R`8ulKS=ShPH#U#55a-oX z3V@9)4Q&e3sVZO87a)=aqMB?y)Tb^shv>NB!J{1LXDToHnfQJm5$As!G%ujisOMlK zOG3{wJZa5mldGY9x4)ySKPB9Z1}YQvEQG#O{|AvQm?w^d`cl)M+5_C%fh2nvqiPexA&d7oudKoaji}idEolD_AaHH0`*=!Lp9$PPPzZrL^{%QaUw!vQtKY2I z#OBmq{!16&kbjp{-O%oHCa@G$vv)<+^k)Y)t>f$-;!K-iq3=>e}HO0>AGrMCiv{m(Cv(PP6oxGZW0;Ner(MZxH zx@s5b8JyY+u{YM$6X{# zEss(tf=VN1H5yqj7f&Y>dWMDr0001bNkl}ov_sej0B3$)l? zt5;~Tz4s82ijma>dfNA@K0*sg289+U@(9G-+8ARvOq+8r$^rrLd{h73{2Uj;L8Kf2 O0000pb(|Vp9I#~LPStp_7X=4 z)7;hAa+weC-2}dj$aPW`nQqCGBPdfRBk~eg0koaCd#q)L<0|?r%~6riL2w@r*1E z-TA5a?qXCDX!7w4?J1_l2JeF0XL0CM<>Q%Ekj0^s2#}A~Z2)|&WM^kBcb0+*ps32) zrKx_nN{{ObR)0k|l@wLUp}5>`He8?DQ_eV1CTgSwDRj8A;SGpbw1>aR4pPzNz8DkOaEMAU&Jv2kj}BEG>LYN{Xtq3bq+w?e>3dS>mlh5{B);5k$H^ zWW$9)b<>c++&cZ#dv_x&-?k4zq`(@|IrSZ@C=kQCX*9@7fBpZ0B+w|4)J^S!1V-B4 ly^TJd?6!AQ8}%g6`~m5=$LeDGyzl@3002ovPDHLkV1jEA)A#@Y diff --git a/Common/src/main/resources/assets/byg/textures/block/zelkova/trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/zelkova/trapdoor.png index 79f321c56df9edd52e625ad2aa263ae26badcc8d..fa985811a40ba4ae29d44f130a6f8d6618592735 100644 GIT binary patch delta 228 zcmdnS{DpCXL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19O(d`5LY0*I@xSmgnpBka+;}B zq`tVny0E@9zq9~nWdFh>ke-qtzhDN3XE)M-oGMQj$B>F!x(99f4jJ&UUC8g)dwHRC z*Oa|ZpXN*}+y3eDO@&9sU)W-1w|>9im)~A~yehW)`%6R4Z5O|n?Rt>Ol`JM=`s4to zYW;%dv@1S2mMUvb@$feJS|0ESc*{{aVL?`#koum`#3ROWSq9Hq9xZ-*m$kI>es(9* b|KE&X`(=yI*R^j4I)lN})z4*}Q$iB}n#fxK delta 424 zcmV;Z0ayO?0k#8>7=H)`0000V^Z#K00004VQb$4nuFf3k0004SNkl<>o-<&uSCn*f)9{o(ov*Ou!g#h&>;TU4OI6o9oX%GO^jb9l3V>pNe)}-w8%#nYn1sgu za3q+7hQwapKMgb#HgQ7Tt)6KU_-^r{U3aUe4gfVUfKk7hioJ;w00wO@6}w!r)O<1$ zq(wbRI`ZA3l7HyfCd=LTFM(s5bQ+$jl$Rlz^|)TN04TORbj>=cPFC2&3DJ71E{yuk zR9~k)k73tWwjvNiPZF)cBvkXz*S9|$Pg~HPOIq`56=b#`&R+@nn9R)>cK!6ebIo|R zP(hKS{~OYokn~!$(_4tvTY9Zp=Ak^jhSV!I0MRby@gc66i3^ND+dG@=fA9lW-Pw`$ Sdx!b}0000?( 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 W6kDd(gWF*M00002@ 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 ji&CIaqP)t-s0002y?El%@^U28Ow5-sfle?6I ztwmtTR%F0IPM|eFj{pDv=IsB=)Ah2y?47LSa*5YPV96&yoHji}7A=AxBqsnAU=9ur zWkl2Ie7VYh5$dt!bo?QJspT}i25@RQ zoxTSE%!o0@tpLQ%@hZT%<#e{+y>mW>u$2LkbIyej!Y&2@*arXrt?_heIbBK!Zgm-Z z40-@P1{T6D0Ih>nfNRU?`Wk?=oPVU0GT!|}=&Z%KT*`AVCmFz({tWh>Q4pNxUPuqx zkIq2Q5CXs%l)=oe0I>6QH|3>}ujE9ht-Bd4BdqG8Sk!K{fGGkY#Fn&)Ew`Q}nZ3Iu zX~|mU`;_MUeNO4!@suUwoQ_w7tqgp+o4pI5)n@=)11y#IIzSb|lE7N!Yk$>OCvi#Q z%K#=5u9vX~K;->HB}Hxd(Ibb1rO(`=bn(pb<&k;i%&D+Y@h(mI+dCPg&eHlF&2BEYSfJE62wCOK|stkJoK0j~A mX-^2Z+t)PhN#d{l>-GnyVkNly>;V-30000peNkl3}Lok@hziGNzP z?NjYJwCW2O=1V+2v{2e<;KBNQDE-I8#GH?9+jf{TY9vQJfKijw%+^C#GHN7GwdVkU zuw>Lojd}q0e}AN8repwsQPEM}Ids&2`ORlP472}{8z3_!qkj%QZ!FpMyA53p*@j%O*Gft1bo)2vS- zw+~vLEn zA0M_l4NFFiRB5LH00>L+7!}?1IV=J{lPhkj3cI!K#>s&O{(s%dy0ssd1b@1cShXf* zt_TCIB16dqtXk8tyt#35pwSs8Tj08B(Xw7fAOW*(TC^`OF(hyU5CwPxShXe{Ao(9t zGdkLmGNYn{WQpu76Ns@gQ!-8tG|%H5S~f^rnJ7O0LC)6(r?{yq#1O2)tf9QbkiZQ< zW{{nkAc7lt2kS+=2l1c#A%AcKSoH=S4B5*Ek>j)PAc~T{_`V0B=PE#4kB_c<`<7BS zEqwj+$?9>r3^3%vOzg}v9B^W z3bScn(l322gI28xwQ4JT89|hC0MHQx`{A8Sf-mWpz6?NIolQDO*>t{u<8le2l zI$ywEAj2FUsl9zm0o|cMRyt^=m++@PBk5H?& zvbC{||3-YomSnRj9)Cd`>$;6KDtgzp#7o>(5>giQ5!;|7jf#HmQb+dkZrN71I-sQ> z*{{2;7Io8tsTm_bWKEI52;!K-O^chV!d_PLUjzOklg;+js;$u3uQy;+boxG^l_(h% z9ag;oF%UJplPd2V!qkioS7$$)nt`p2ZAaS4W?p>Tt&MG%nt$O)PK=6}TJ;t(avlI+=w$$)bs6~rzPP!uM9Tko zXwiBAO#2J%_J60e{-+!MFI(HY!tWof&)*r?08h;3ha%FL&KGE5?W~pMk%WfS*Us9F zCT839O~7nIY@A^_UqEVNmcE15_iFEx_P9MM@59 zG-$M6avNyP9@*j5OckP(bI7^(J`U`lL#^6&ZZeVZDt~7d)@)y1;Kh1!VZ{#06a4<} zaAsjG{NEo2*{NRx$b}VqW?{|qgd`T1i+2Zg9Y0aGAKJG|tGUSp{hE>W9-x8Gc^p^z zHqvL01EE%JC7n(?W|Vjx33}~6-(Q1~|4go5nADnj-r{nRuN#=i8esS6*{zcUjph$O z-v4(f{Z~ZN05?AUXcYi-t%ASzccGcU@x5P2^=&fqXf4}!{2aeWGH~QC&)5L)RM)V3 s^b7!S_1brMZGvD-OiWBnOiU>J4-ARtk=uKPKL7v#07*qoM6N<$f@oi+j{pDw diff --git a/Common/src/main/resources/assets/byg/textures/entity/manowar/magenta.png b/Common/src/main/resources/assets/byg/textures/entity/manowar/magenta.png index 58f1f97cc973fe979474a14c1781e4f4994f8bdd..ebb9ec6c5fad37f6e840bf25f60fe94ed5d379d3 100644 GIT binary patch delta 652 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 delta 1672 zcmV;326y@62%!y-83+ad0063Kao&+37k>s*Nkl+g3{+Bpz?6hgx zC}rDd2&n`Gfsk0iWd&tbReRdQ9(vm|0))%~4z2ieD2H<7zzM;DKL-Sd9-^`!wA$rw z4{e%mlh~HqZBjRXZO4x7*l`|*H{(AO=g-WzgC+ctM&IZ6dw+lP=FNL=3|+c(`F|s$ zxKT-NUWm-S0-02S+~NlFH*=(>)_CQcXI!bjOP4M?BZLrcYNw(8-VOM@QL`x-a7#N4 zHG5YE+|o|NtLjgtTWaP%pNr_><1)N-2gbjSH`xz=KK8za{#eHA(HrKLnmK$N4xg~y ze#fZAJ2K#wnh6bT4~N5H!r`#Bo`2ZH8$PC2>XMr24L65F4IOvG32HSd18%9AVs?Aj z_ec-EM|!OF#3pKBQwH49y=d&X8&2@{CS<@ZHDi7RlxY70o%PMA{)b8cxTT$j%6vwK z+)@**<^VTQQS*ApB{h*xw+_37x_(`*yxh`G!~6gEbpYH_GfQ_`huxy>XMb`tKZ@vn zm$pl{w=aWR#qE|qG*Ew&6tggLQnB$SADo(|?Q4Mtj@tfKVBFHlZ{Fp)n|@p}Y)3&s!UsW){B_QU4(L z2OuAV9=)#383<`IO@4>P)^4=l0oTD-1phdQ|H-=|W}KJnn*!fBh!pezb9a@ z_pJ4D+wK5mIZj_C3^(g*`NFRYj?3NrAx@-n1c1tH2_KNn%9T@JMSo5>#&1jQ-7CSp z??tp{5Dq@pJcL)LM6|RF>n~rplt{E5dzz*(cH`ZS{`#}$2#VH7Pm#7>UsB=$TOZ`FCTt+Dd}6C_C#79BUv4fb?Ex%D2V$=29;gH~~!$es=; zE!(s0m)NQE!ihSiEq`Bz&ai#i)+(+Qf6^Xzq)yqF1Iii5&xvT`)%a*=!J(!O8nFc<)u{uNTfj1SwzglJx1g^q)r!rt zCCgN9fp-d&``as4?n_(cco49!PVq)cpv;330d=%KOskhg)H4mas|!R*M^H_3j%TuN zQ_A4^TRrbqQh!9f^WZPR!r}tK$s<%Ri>R2^JAV?yB;*zsDEQ?1zM$`At*T=OtX-WU z91Ek&2AT}&Y#LPPC4&+ZC|?EOq+c4R%P6r8ddcEZ{b1UKDPN@#GaIaBv-Cne&0l(D zf`1olWur+4pl@ld>Ia+_T5!nrzQY?3X-b(i{A{v#vVSm>Cm`~aGHHVG5Hy@?mNIz) z0PzZphnlh$ewO>+K<#&$;GqzB^mOq&g%z29Wllz|*;Fk!#F@gU%ARkV9q|75+b_=^ zIB)=fA4lIl3otxK=yhZDhb?*ISrwSi*WDs}3B4>&C*g6D+Y?XmLF)8gVkuPT;?&PPuR0la55-+rlH z7SY0!TskmPf6R>cJ=7+?+L2qLu*ggNtE0~zEwPmp(f)K=&J9XY{vrNZ2AagzYy0}Sg|B(Fn!UL(NBOUPEKTcl)NG;8gOiq)(2Z;-{ zBlb6pJCA&Azv<-oy(1@%6DP(6!0Kv>`CIa9&nF`<@`srOyL9Q&rAwDCuJ9Y{8?BUS S2L4O{0000$ztRWouG4=P%9HpD-=*G5l<@&S` z9s)rg1VkMHLLLD@9s@xhe*!=r1VSAHKpq1#9TF%W3o925C>0DQ6A2>`2hRNnng9R* z0d!JMQvg8b*k%9#0s=`yK~#7F?ZMerQ$Y{~(1VIb0f%6eLAk*pYAOK{6piT!PO)ed zRFp$?_y7NfE5qV};7Yj9cW+F}s8rIB7rl4hk;uz?C*qtUFLjcMf2blaRgug&MP4eJ zIZ;Jkq9U1yA}EVfcco1)M!ej z$3)&$uFu`yT>lLKK9b2B&CFB1VMMcuGag*te6q2zb69Tz@Qj|8Qc6b8=rN+xY&Prl z`eJ=?c6PDe*Bt5qVD!mSpD|J~qH}6#sdEMZOO9#Cyb|Zzf5$!sUX**5m)Ba~(U&6A zkf|rmcY+fPJe$8-n!a=I;iK(ue*nPfn1-Tv3I8#Lp{>gFOzB!_{_g761M~=E8ZzgJ z^G#t21M9V0H%g_Mo0X^Uj{v|^qNP5IJ`(40=qli?&rV9=riZCOdv^ui$cSNS>^(=EDIST j4LSJWGxI(}24d7dd3K+MNf` delta 1020 zcmZ3$euQI!%0x@0dTnuDV_6{|O*wlt$zUV(RA<8?KN}5E9yMW3WkGg7bGc+E^#X65 zhEU_47&A+4v1B9VBx9vOZDD^Mp(JDFr4hQx#&RyQOipr){@Owga?Hs_O3T7^&eV9N z8p*rJGCIjI)i@X@8!0%-v7{KuovHR-7NNT|Trb&J(NT`MxZYg8KEib8jI zKy9H$JEcTjiCF;#wY9Yg2?>tMeAV`*%foe=!i`gn6rJRlHRQN!>`j)3YoD!gJ6G*~ zw#I!$xYm*gpaP>>2cs0AAzFeCax6D)+(4~1Gpi^ zGHg7dr#4Yhyq?L^)5S3)!u{>^%;L)i0&QEbC7!h8nxZY>ie`FDru$j%2%8apJ5xfjHF zDK2`Dc1Bl#bLEmAF@cUHA>5@3%Bo^79d_{J|#4Olfj zmgzIs85Tc~`n2rO9HwrAj?NGLMGaZzPWM8#Ts$M7XXTcflOz$9oor%~a8ATyQqal} zwy9oQqt;rij&WNtMdjqBph;);c3jqA;bL@G4B)WfYIHgf$RWbi_dn#pnVZF@53=+W z=X~OncAGbSj<9w8!$(U`*KfTg`rdFI@3*#>amM=A>Lpw2))v-2bt}GVxo+MZreZD| zUkk^$aP!yOujQFvdv7s2Tj_A%d5Ps3=|XF+a)lkcTiyHn?YCoD$L~H|Vrj^{fo((W zDT$oTSF=j3=H@Nmz4dAR`dO6hd>?SOJ%4#`^Sytc#r5N5_tZVEaa+u1BCh5urLOaO z;s4Fs;_utP+WYqHUhBI3lh{-ev)?BsWwE!$uCBF_c=PRV_lz=yjeQoI zITot-pPS5dO)vjS*8cxI_Ne=jsZ4FNi!+$K9 g8v0|IfAZV-4hi|szU)h?fvK3m)78&qol`;+0PKO?ga7~l diff --git a/Common/src/main/resources/assets/byg/textures/entity/villager/type/skyris.png b/Common/src/main/resources/assets/byg/textures/entity/villager/type/skyris.png index 13dbec764012f3e134ade96f32d5e592965ce8e3..139ab58ae7612fd859af403176a50c3a6e6d8667 100644 GIT binary patch delta 706 zcmV;z0zLih28#xeB$2Tcks~920002z#TetX3bmfr#gYV|d(@I^$gy_`fmXnhWC(jq zzi>mbR#1{yHKtKFnOrP5HX(COA0Ip*6)zSI9uYGm5D6^IfpGu;00DGTPE!Ct=GbNc z00KoxL_t(|+U=L?a-%Q|g;hYuYE?sk?fbv#j$~^l@oW}Der$K9ha|>-1bql!B%7#8 zz~eYV=&Ha57;)8}m_-#MzXF(&@+$xy26+WAvg@inc@vIT0p1G^INJ+E0GJsfRzwMu z%Zwu+k%UA5X(dMki%1XjDnO^AAv8>nqW1%(sxU~6=sk{KuBgR9ln#y`eOD1}RlOtf zRlrx(J)r!y0HSqS))x4Gp8>XY-5%n^S0fKb(AtKj2C<4@+qN}4uqy%BT>-GT1Ylj) zHO|3USMW2yzFQ>-{(Ke2vcQv7ghyti8d(hBvEa`D5mja8%&e-_1rM;A@}z@0Ag3IF z-5lGt3NQ;X7g)^!ah^j&E%5Sam(|e@*xlXx%OHO0Zvl5Bg%>c%=mxVK1$2 z$|cm}A=<;20S1V!b-=O|z`pM}`+vEX<+Qv))=J=eK--A*IS~JphpU-telnrv@L>L= zd8Tj_%-{h0bwC@miQcJef8 o3AMKo)momy-jLRp)SHNY0|kscmfJcuSpWb407*qoM6N<$f?TdeRsaA1 delta 803 zcmV+;1Kj+J2JHrrB#}8HXn|J1l55DId(^d_)^J0y#gYWEcM0RP3X)_99uYGP6t000(rQchF<|NsC0|NsC0 z|NsC0|NsC0|NsC000Gj#sO!mg1m+0*$&^O%Vt|V$>$MSmc2CbB@`{($$}1dG3qfA`zuP@v89 z1#g&@I-lPMV>l$F9*bul} zXv_-iAEN|4pVg9;2^h*ve}Q`n1-KV%2ncs6^iLt6;vvvqW0%_4;{d5kMSy`pAq&t0 z3dm8B0l=^l2re;)vzg?H6pqjPonx@B=z{ThE4Ede0!s=6Xa~FWC;){E1>ge`i<_C@ z-7x=H3^xJHtO{{|OKsDb&vJmoo*cB64Poj^b__q^@bVWgje>F0Va|Gj$X&iH^ z;>u$fOuU&k9B`jIAb@gYiNEW0vf0Ur5)w=I4T0+l@5}Hx@prh-9p$B{A$FJu6!V#F ze_a5cCSYf_JtZJ5A1@Sswl=#`0oOx%K1{t;rIYuF;zfzXDS zP<%>Yi!XtHLcnvye}}=E{hZ8rpIyX$ZUQ=ZwcverVFYswtMMx%;G1pmgje2eKCHjo z!q(u$W`BS@LIJ+%YW{VPITBt@dXntx1e+<|Smq7v%(=@x%mMJ`4jecl+z<=5WK?pO zeHcOREqOp>gA~w)>|A#XroiuB3&6gi6~7EnRL()p+7iomEjz*y$ztRWouG4=P%9HpD-=*G5l<@&S` z9s)rg1VkMHLLLD@9s@xhe*!=r1VSAHKpq1#9TF%W3o925C>0DQ6A2>`2hRNnng9R* z0d!JMQvg8b*k%9#0s=`yK~#7F?ZMerQ$Y{~(1VIb0f%6eLAk*pYAOK{6piT!PO)ed zRFp$?_y7NfE5qV};7Yj9cW+F}s8rIB7rl4hk;uz?C*qtUFLjcMf2blaRgug&MP4eJ zIZ;Jkq9U1yA}EVfcco1)M!ej z$3)&$uFu`yT>lLKK9b2B&CFB1VMMcuGag*te6q2zb69Tz@Qj|8Qc6b8=rN+xY&Prl z`eJ=?c6PDe*Bt5qVD!mSpD|J~qH}6#sdEMZOO9#Cyb|Zzf5$!sUX**5m)Ba~(U&6A zkf|rmcY+fPJe$8-n!a=I;iK(ue*nPfn1-Tv3I8#Lp{>gFOzB!_{_g761M~=E8ZzgJ z^G#t21M9V0H%g_Mo0X^Uj{v|^qNP5IJ`(40=qli?&rV9=riZCOdv^ui$cSNS>^(=EDIST j4LSJWGxI(}24d7dd3K+MNf` delta 1020 zcmZ3$euQI!%0x@0dTnuDV_6{|O*wlt$zUV(RA<8?KN}5E9yMW3WkGg7bGc+E^#X65 zhEU_47&A+4v1B9VBx9vOZDD^Mp(JDFr4hQx#&RyQOipr){@Owga?Hs_O3T7^&eV9N z8p*rJGCIjI)i@X@8!0%-v7{KuovHR-7NNT|Trb&J(NT`MxZYg8KEib8jI zKy9H$JEcTjiCF;#wY9Yg2?>tMeAV`*%foe=!i`gn6rJRlHRQN!>`j)3YoD!gJ6G*~ zw#I!$xYm*gpaP>>2cs0AAzFeCax6D)+(4~1Gpi^ zGHg7dr#4Yhyq?L^)5S3)!u{>^%;L)i0&QEbC7!h8nxZY>ie`FDru$j%2%8apJ5xfjHF zDK2`Dc1Bl#bLEmAF@cUHA>5@3%Bo^79d_{J|#4Olfj zmgzIs85Tc~`n2rO9HwrAj?NGLMGaZzPWM8#Ts$M7XXTcflOz$9oor%~a8ATyQqal} zwy9oQqt;rij&WNtMdjqBph;);c3jqA;bL@G4B)WfYIHgf$RWbi_dn#pnVZF@53=+W z=X~OncAGbSj<9w8!$(U`*KfTg`rdFI@3*#>amM=A>Lpw2))v-2bt}GVxo+MZreZD| zUkk^$aP!yOujQFvdv7s2Tj_A%d5Ps3=|XF+a)lkcTiyHn?YCoD$L~H|Vrj^{fo((W zDT$oTSF=j3=H@Nmz4dAR`dO6hd>?SOJ%4#`^Sytc#r5N5_tZVEaa+u1BCh5urLOaO z;s4Fs;_utP+WYqHUhBI3lh{-ev)?BsWwE!$uCBF_c=PRV_lz=yjeQoI zITot-pPS5dO)vjS*8cxI_Ne=jsZ4FNi!+$K9 g8v0|IfAZV-4hi|szU)h?fvK3m)78&qol`;+0PKO?ga7~l diff --git a/Common/src/main/resources/assets/byg/textures/gui/biomepedia.png b/Common/src/main/resources/assets/byg/textures/gui/biomepedia.png index cf14cdebd206bac3de8ffc86bcb6bead0d322384..f9fda5db5b1b14d1af6acc4d3c2d501af035dce4 100644 GIT binary patch literal 5181 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 literal 6452 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 diff --git a/Common/src/main/resources/assets/byg/textures/gui/biomepedia_book_gui.png b/Common/src/main/resources/assets/byg/textures/gui/biomepedia_book_gui.png index d1d458949f9bf5df8e6e5a47ef6f94c082db72f9..4d74a29fb24df894f15cae6682e95d877c57d3db 100644 GIT binary patch literal 77969 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%0A-iiAm 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 r<9w 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 diff --git a/Common/src/main/resources/assets/byg/textures/gui/container/hypogeal_imperium.png b/Common/src/main/resources/assets/byg/textures/gui/container/hypogeal_imperium.png index f1180ef1b2f2d982d893c420d02a92abc851f8c1..082882263ddb7055fe13cb20109e91dc783f334c 100644 GIT binary patch delta 1513 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 F0suGPF@XR8 delta 171 zcmcc1_>pmf1SbbG0|SGGE`RVuGgXZRo2F;=MEVq2T1G0@%`61U@X7N00#a-xL4Lvi zL4aZN{w4b-DoSLBdAc};Xar9^=O}bQfrHtB>B;|iJ;rR={HF~Yloo&Nn!n%~OGOLA z%q-q%hQceNEEo5+nUvgb_L{UaK4D$0t$~BPXE=A(k|)(pZLj&eSZl&_ZWJ>9WN^@7 VG0bB$JrA^$!PC{xWt~$(69B~CKWP8} diff --git a/Common/src/main/resources/assets/byg/textures/item/aloe_vera_juice.png b/Common/src/main/resources/assets/byg/textures/item/aloe_vera_juice.png index a965c8c6a75b5e5d9c34d5f3bc82523b40e97fa4..2a7e83ea37b25a6f996b76e61ba3f72162060823 100644 GIT binary patch delta 238 zcmZ3%yq0N#BnLAC1A~SxfAB;*@rlZE^_BrXA+A@Re&2ll&HssFvHgcux~on%7XvD4 z{Qolf+s2Ty-9DQtAqvi{U)sI)!j)W4xH8K#Ut@quxl4llf`K#$90!8@o6qEd%rs9I z$B>F!rRQFAH7M|~KDc>w?oFS!f91`l@fp4NBk`s=RwJU$sXoAK_Jb3atD8e}-&Q%_ zC|Q5mBj8Md0sq2_t2;v2Uk5YE87eR*mUS$dz+yMqd4&L@Oj68rt`jf4cSrnL)48<1 Zg!#cr_M$fFP2wQyJzf1=);T3K0RREVW)1)V delta 363 zcmV-x0hIo&0;mI!83+ad001BJ|6!3fAdw^#e*ry7L_t(IPh%KxzzC(Wf-AY6|3UQC zTXz`3cizUT7N-GMo__!TsD{C*(LS7}(O^pNQ>01P)MifGZ6Cua)|A!sr6C#lnB{Pe6qkI1iayEH1P|(SuE;T`a(IAFtoSFa*U5pwLGL9MVDzAa8&$Hh>WZpcr`c{R9Kd>HL~%U~#T> z&nYV= z`-I?KPr`u+j4qHN3~~R~U_=|bW)Q#-00EF8=m4l0%0dPV3;^zfgTW@54m$t<002ov JPDHLkV1h0bn0^2N diff --git a/Common/src/main/resources/assets/byg/textures/item/ametrine_chestplate.png b/Common/src/main/resources/assets/byg/textures/item/ametrine_chestplate.png index 5740e8ed16bdab66999bf3e409444c8154b66eac..eb5eb93acbe74fcacbcfe8824144814836160d16 100644 GIT binary patch delta 526 zcmcb}a++m=BnLAC1A~SxfAB;*@rlZE^;ZLYLR^7D|NsC0{pRWK*Ux^xeD?dvi{Fo4 z{CW8D&%IZF?!NkS`}Ln&ufJbA_5I4}@0ZSeKYRB3nX})IpZk9J{P#l_ejL2;W8bA8 zyDtCOdHKhV%RjbU`LXHh&vn;+uDGSeUA672-yl~5xd0Riv+xlhB zwhxOIeps;R%Z&Q%ALcCnGHK_B8B0D)U-GeMMTD<;gr`M>yJdu%WrV9`gtJwIlU1an zb)>y@q>W9al})6nU8IR!q`pI>o`bQPqOq!yv5JzhvXZfqvazDFv4XO(yt1*Jim|Lp z{r-$TpwHY(g8YIRZeR!X*oAS59y?>j0W@=sr;B4q1taT0PUnLO3=9{RcZZy7yP4$6 zZnfmXUAwiv{@bto4pheQpl)N#+QiLqy5bQbWzy$A1l_cbdz85R;;FdG)8C_eMdd2| zXT5EH`TMxdt8KHhZRYk{O+EZ8(5B?3c Yf7@H3m(|C=9|O6_)78&qol`;+0K`El*Z=?k delta 533 zcmV+w0_y$C1knVL83+ad001BJ|6!3fAdw^#e*xx6L_t(IPsLI_PZUuUJ#ThE=&({u z+!&B#`&BG9!D3@+Vdpj`5E2tCpdw-+#+dLQpfnK^daR5wX8kC(FiJ9f2peW#cUg!M zX_k4j&vW05hFJ<46HeyNoq6}3bMJfi;oPC*b^q=y51OA5jb0gr#dqbL%}7wXUGU%l ze?}R=rDY6WzxkYVZIq12f9d_>HdY6+~N2D;j-kBKo=yb)2+JYd4QjeDMrx0k=ZLeI&?V8}z=s z|7fS7zc-;;B#K>V!_dSR#_yrxZ~U8(?cgMIHCBcbk4i|^^Ixy>oKht_1sF7ve^}*V zan`0gt}NcpUcB6c6G#gPIq+dzCUy%U>408WgIMUS4x-jC&U+i7zfCck?^|zrBgT08 z9h>gZ<3U~@@ZLV1MW(kezS`2U2p=7yI5&&RkImE-KP4c@4-ME0WbH4QS=mUF{{w(O X;N;gFB+B@b00000NkvXXu0mjf2@m-u diff --git a/Common/src/main/resources/assets/byg/textures/item/ametrine_gems.png b/Common/src/main/resources/assets/byg/textures/item/ametrine_gems.png index a3447900ce147df2328328470819ef195e0a90a4..a17e38ce31bc6ab1527418826348cee7a513fe74 100644 GIT binary patch delta 545 zcmey*a+hU-BnLAC1A~SxfAB;*@rlZE_0I!*LR|m<{|^-X_wV1|FR%W7dh_?g+rRJM z|9$u2-`kJ>-hBG^`t!e6U;n-Q_Ve2DpI1))I)DDx*^9rhEJWe;>W|`^cR? z`yc$-_xSzo)W6$bf4GwN@j}+eFO@02ZCGve; z!ufd|?`x7i6y~3wEczj*!x|_EzRz`lJoBgten(ervmh-Z%L3}FayIGAgBisQ~=Y2*EIr7UgqiI z7*cVo_Po1L6N3ozh57l6yOZ9pXjpWEyDL`k_22W4oo-kxj@;*}rdZQj*J$&xom~m(}}}794Awvc$Ms^Xm@Qg-70Om+fUe qZpWw~BKBH#!Hx8MtBe1)=cjoKw)kERvt{50I@;6K&t;ucLK6Ua=|&L% delta 580 zcmV-K0=xa)1pfq(83+ad001BJ|6!3fAdw^#e*zRqL_t(IPt8(GXcJKsJue!kGYvC| z)gtIZiy%t03W4G#AfiYu>e4I%wa_XS(TWJ-2SM?(5kxGd;0HJ2rW-};LJ%>Q;-grM zjiWJ9R@coXy5laKh`~Zv+*oSX^elC0hGNqvMz8^%5pgMT~dc#>NA8(5B zr{iF64WJ@HTE7)$$I*Ezi1!MlTX)gAe}<%(Ol%EbyRsmY3RbnP1FN=CNxueL{vBH9 z)tJ{ZOJF~~Oo@P2~FT38GC`24eFRlpfrq z)5c9J2yTgjJuxxTt%J)GSb1nI7VW47mt0~u$|KK^9lC+VUavs;<4cUbV<1Kif7Uol zF#K>3bv^qLh`Qzx<~qjU4CheM`&=as5Oii&u%4f$q4))GtAO91zJNGEIH^3OV~sNf z1sl%iygQ^1IeG`IW(=E8c-Y@nG#2>H}?Ceq~_&_w3kGOZ-iK`}df(Mq(PPljPOhW%jp ztMOQRkAS%0HuZ^UF`v=xdbSk0@`|l@M#N6JM!WrvYu({KQ($%}!|Y<0-LM_%VNb1v)LRuCFhZ3yW+aEf@iax*aWy8VkGGgMqHCt_+Sug03Zg_$(VPv zlP^_2OcG}RAr@MZfgbm3-tl?)L6JBE9-``B#4CTv2>^`3+l94J0vXI<<6A*+io_5K zlECCSPKBh9K5-+`zz|}b&D&#v36}iI<{)ov_WqT36J7oVM0dxGi6_0IlfVD~002ov JPDHLkV1oEAk9Pn7 diff --git a/Common/src/main/resources/assets/byg/textures/item/arisian_bloom_branch.png b/Common/src/main/resources/assets/byg/textures/item/arisian_bloom_branch.png index 4985b0f14dcb8017bba8ae563d4b261d965fa3c5..4c638a0696d128bf5f82b52e7d76c831bb18b256 100644 GIT binary patch delta 171 zcmV;c095~%0{8)tB$0s?kt8C20001`kL!|r-Ggq#U`MiAIlom)LPR<-EFdZ*8WIF^ zVdww=00DGTPE!Ct=GbNc0034=L_t(|0R_Q<0l**#1F$Fs-2V?R0RS2R=n4SnI{`Y7 zIstTDm;mTgEC6Io0D#H40ALG18d-1)b(#kET(}hrsS9Mx(h~sl9uoi_-n=&pfN#HD Z;0KbX0c0QoVetR}002ovPDHLkV1gd1IG6wc delta 200 zcmeytIGt&N%0x>gizv(e&3Q)>+&4|Cxf|;3w6y=ViaL^ztSpng9SER=@xN diff --git a/Common/src/main/resources/assets/byg/textures/item/aspen/boat.png b/Common/src/main/resources/assets/byg/textures/item/aspen/boat.png index c4ed67f56533d6dae5ae5f78519425a77f7c3156..4795455b682e0d0528b8a142e205425ba5c6d6bb 100644 GIT binary patch delta 258 zcmey*Jc((7L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19D@L#5LY05Z*KjG&eZ)C{2upCis{{LbORYw666=m;PC858j#cM z>EaktaVt5Yfsw6kH~)ej?emu|Ihf=}PTCa6RL#tMc&o}>kSQ9B0{;V$7=H)`0000V^Z#K00004VQb$4nuFf3k0005GNkl(U$F#S!d)@FXM>7cs9WVlD`_o+w~KLCSYWB{H@3INs?nXMy52a(>J2i)B{ z<8tayS3MST8X$Ea87+-h08}120r<0bODt41g8_GU&5EZ=mMMRb?BylC4kyPqw>72( zCY#la>}WT%3xBYZ&fsdbaDKOsuftgz0H74|#D9$F1dklRBL_%s=LIAdaw#gO~v3RyU;dnW}63 z)eJD?8)7|mkKI;JgV{t`eG!`Y%5$q5648h@{J5L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19H9W85LY05yuIo~XX^Ikp!#qR zZFTkVNgDe=N=t(Lf*Bm1-ADs+)ID7sLn>}1CpfV4@aX6P0iQx!*T#*)Er}XFV$LR0 gCP>W?4e(|xe8{J@b;&hGpcV#CS3j3^P6>=n00a)Lz0fsQjP`M>}0 z?^$+is`Z0kGcKsw_NGWm0D(@$jsSyAGDZgs7$iAXWEcSPgHql&<_^ZiYz77!1QxG& zaw3!s2--}=-x;?^XiUm;=tH`wl<}sTOKcsHRR!W(|MWuhVylx*;B-Uc>3Wv2N)Q7p6Wd-o?yHi=p+VDS3j3^ HP6_2r0*x#xE7{;(UT6O}34pW&0O{GM0PHk+2-Ao_v{AD#jfk<+btAi% zOPLrX@sLqYUjp#?`(KryT*}ZoI8jhtm!`<6c?WREt<~ynErh(7H8?uGy@}Xo j*<4=^MxhV&|BG$_a6YKosr0Yw00000NkvXXu0mjfi{<3Z diff --git a/Common/src/main/resources/assets/byg/textures/item/baobab/door.png b/Common/src/main/resources/assets/byg/textures/item/baobab/door.png index d943ccd78257a245ca77ea863f91960cdef5c8d8..5b567595bf8d64fd25560e4fb7a6871e7a8c9dfa 100644 GIT binary patch delta 151 zcmZo-+Qv9Rf|G@rfq~)e-A6$a6@}~h1AIbUf&3M{zBw^Q(Y{)4)(X;{PqqSu7)yfu zf*Bm1-ADs+Ts>VJLn>}1CpfV4@aUX7c1(>=p>5KnNkTIgE;w+6CCPwW!@x+YL6YeO zk0TJg3DPlO>uz9D7Vc^^(3XgZ>FJG?kzjZo!v6E2v(SE^fefCmelF{nof4V==%Fu? delta 227 zcmV<90383e0fGXM7zqdl0000V^Z#LyArpVONkl!6HR!{!5b8J2Fo2G@tx1rblh zn;Bs=G8>y(ioJkh04$-9Z2&Sja{eh+F?35X48Wxk7r@91_>wXM0|UdY`|t4Q1z1`~ dPjR@y2LP37J_SGftK0wp002ovPDHLkV1njsUr0-pkqB$1&Nkt7{|Gf+%aMF0Q*(X>y?uua3MNxq~=w3#%lkusTpEsc38 ziF7H1a3_mv0BA`9VnzX8LIGJn0aQBy!V#9m00001bW%=J06^y0W&i*HXh}ptRCwB5 z&RY(HFbqV|>DUt-7VWL+-`wXXd{Bvr680+YhLR18r}& RJv#sZ002ovPDHLkV1n!^TC@NF delta 237 zcmbQww4G^!%0x@qShE115LX5UhDdwH5NpObC&mmA7X5$(o5q zr#JXs+~VI`shQ-)*ixY0S)vKl5+2072uKN)1o;L3M+Xd#_U{*(s3=jN zwwtd(fur?dUQ0&Sp8u!I9Nr$gcI|&}#-;0LD(n`V{?+{Urh@dE5`|lq9Rht80V155 zj#3LGc_ka{F6d0;c~gD*z@+Zx@(t^F3noPKf4H+*_s7Mi{TozoIeObxmtAQ3IGyqP biny=+yq4#8I!XYY#o+1c=d#X;DWM4f6+>%z diff --git a/Common/src/main/resources/assets/byg/textures/item/biomepedia.png b/Common/src/main/resources/assets/byg/textures/item/biomepedia.png index 6481be20152a231e10941b9c0514a1afa64e8b71..517cf71d64c511d839a94d0264b7298248c8959f 100644 GIT binary patch delta 210 zcmV;@04@KO1CRoc7zqRe0002(-QrS_J{OTA9)BcIOjJbx000aH0O{r6(8j#BsG5Fi zSSDI@A6a1{PGcEMQxh^k6d)yPo20@30007XQchC<`YZd^IsgCwXGugsRCwBBU_b_| z7C`B;E-0Orwg5s;OUq(lSXGghR+*NufMI!CW?K5Rv{?+R%F?H$mCX!fSY@78mNwJb zkvn0#az)xqXOoo-+(qUfdN%{Zc4Y|7z+GfAb2r%J?NFM5dpC*;0L#23f-r7g!~g&Q M07*qoM6N<$f=ESEH2?qr delta 345 zcmV-f0jBPoGc>LG}(4NB~_k$W|BtxrU984@C^5j!jY+ z?0;&o0bg$3XZXwg4=f1+=o(;#fB;Awgj3~N8Gc?q@EdFZ2yD!a20Ir7kTt*n$QvMy zb7S2ZwpV8|SlBs%#Ti8uRR42Z+Ay5zsb_fp@D79j1JWoZrvzp{dvuQ>wrd&K z8{m+{W(dee5WuDJ_ti^aF?ckh8v;^{PeS9H2e%>72l9#Ho==fPn!3d!w#ndLQu000000NkvXXu0mjf3k{7g diff --git a/Common/src/main/resources/assets/byg/textures/item/biomepedia_book.png b/Common/src/main/resources/assets/byg/textures/item/biomepedia_book.png index 917c1bb45906dd36c7fc13b045834b0fdebe851c..278db5bab986064334aa993fd8aae1430438c6a9 100644 GIT binary patch delta 191 zcmbQj^oMbRiV$akM`SSr1K(i~W;~w1B4whYYCQu3!^@`+E*#slZN;p*tO&KJ68XqP zCBI}z?_gmg2N4C;X}QK1fr=PQg8YIR9G=}s19HMWT^vIyZk6^q@*ObXI4rToP z8%AfT_NO7zk*iMJ_wf6&)zaXY{vzI&*7xMpR;6rV)b{wmdS_zBj2(xrxb(%(67{*- raouE|l5(olYvs%f5orlCI+OYT?_%Ef`&EQB&<+MqS3j3^P6g8(|{{`N%}Is1hZ=WJ&Mfx~zx`$M$SnF-t^2_2ttC3=9ma&MVx3 z6n9CGU+{l8VDR#1{4`NfqAJzX#W6%9IJPg4?|=e_bGK3Io&N_GE7bM4T>ic#@JIeS z1}!1LWBSFMGaQgJKy{6W4W3LGo}t1dVeT>St47Teb8#dn{Y^?P!-{6A*9??KnR&uRL5na@}} zl0186+ng1*W)&W~cWmk2t*r7V%UmwjF(g$gc5TW}@N}56VqYVxfZL0`DF&N41isd# xh8m>pEoJ28IHoXb>nkQH$eE#G+78^dg=Ly^04vMUMqPgy1y_^-_c$ERvIfRzzbj zp}In~LcmSaEQZ|)Iv!%y?vA(qZ}T4i-@G?(9-L5GIj`z5xUcj12#(c*Gm~V$^{~FnGH9xvX&ylsOD2+8no_o`gx${@?%wk&+*T9(a zZ>q8OgGVCOi4qbAn)E;>tjWo#S;Ka~Y1W#EfW-a2OAZS%9Br_+5A`%-ILv*5L3{Rm rPN{;|Uv=3)AT6_$=cs{Y3IoI0K+FA?e?&gTe~DWM4fYWq*( diff --git a/Common/src/main/resources/assets/byg/textures/item/blueberry_pie.png b/Common/src/main/resources/assets/byg/textures/item/blueberry_pie.png index c53eaaedd963f1aec44d2ec343d5344916c4de36..10772dc1d3e09951375243cd907a193fd8a09da1 100644 GIT binary patch delta 224 zcmZ3?)WbAELXL%*fq~)e-A6${inG8YvY3H^?+^$xifVW@OjJ~;R|)V5aRtggJXCdN zO~%2M%1gcp*#XB7@nk#fuqd_cGkA W6Q5CYl=n8!LIzJ)KbLh*2~7aYw_d#f delta 227 zcmeBSTFf*-f|G-pfq_9omp^!-nS!T!fKP}kkUt?i;NhXFvuhIe&P!ZBDU!iu%b7J9 zabDuQrWs5!_B*C|0@b{};-L?ucuRu(g8w4{2HO`(Z4(tG>T^6@978mMd(V0E9X8-# zx$x<@*?0SV_C-sA!shnco}cz0c>N!4lbPAfg2vq^1R7kf+_7=sZOQ7I!McQTz0|{3 z$1D?8WV6@BEO^Cz*EfP~+V5LkjylT~FB6mwtfBF(8#rbr UFOx9>x`@Hk)z4*}6H`JH05GFm`Tzg` diff --git a/Common/src/main/resources/assets/byg/textures/item/boric_campfire.png b/Common/src/main/resources/assets/byg/textures/item/boric_campfire.png index c0d0f52931ea43f61ec62ca7101f76b27d33b635..605fdc02b5e60b70c55a7af3282cbacfdd3f697f 100644 GIT binary patch delta 236 zcmVPA|R7C&)0RR90*Z1Jqe!>}s0K6ESnDtYr9!UpM{U)YF zR^Ox>A=3Ub10t+QI{{F_T9I_`G^JWlE#J+;T8gspSUdR=E7katF-?ZZFWlQaOL$~@ mYwIj=-|o#LW;Mk)fIlAm^#y2@n*Lh=0000OmI818?*4;Is4&<4{WF_0Wc4OjpQ7@;&+qAbCN;oJAW3|ySd3|R(;87>>$ z0?X;1Q)8HR!4@u8(zlc0)YYe8ydLZUHcamN!w+Crzzxul6<~P%;VZ-2 z&%eP6L41%#5P1CZ3x?dGi%-D@zync5PME<`PYx^z(+tvh?&eFdW)MJ@g8{G$VE!Q$ fzygv2z`y_isgTe~DWM4fs~$V} delta 168 zcmcb~_>OUc1SbbG0|SGGE`RVuGgSjSmtfC;RGBFv+G|vkUPNF2f2H|r4N%_iN?ARS z;wTC73;quQ4ELJ%Mov_eNbvS_aSYK2PVEg8Vo>C8Qq_H5|F}#&W6d9dXS|D^no6I@ zY2^|1Z_-K*XkiLI$rSG(`0m*~tp@iWyA(U@9mdKI;Vst03nq_eE=Vo8@35jVFo z=_F)GOuEM)77$j-%sEwJ){G_T4K8!$#vXQ1dZVZKFu{~Z_Fby1K(m$AhA0k(4d;dU V+n!$%iUS(T;OXk;vd$@?2>{kKI${6- delta 278 zcmV+x0qOqd0n`GJ7zqdl0000V^Z#LyHXxBC6@TeTL_t(IPh%M7z)D}>zos(Je<&9# zV1m*Z0HirBikZQ~j-3IYAy^FnX?C?^X0WtpWYE`OU@+0cZ3rWjh69+*(qaq@PhT-G z+<(Hr@aYQ!!^v}h8Qy>S!*KoX7Zg1xE`VtU*$mPQqCuMZco-Ozm6#a>c~~%90yhoa zW`AUQ+aZV{_kgasdk@tmC@ugw7iKfe`5+ouGsq>#0L1`B8HlFi2mga<7$4*f5dnxd zK!zX#lmLN+J_x}44huk-X7qqWF#rT$ffVM&&anFs#5R!TGnamX+32x=VE_!Ehc>## c!2%c<0IS|`zWtpWc4V$OI_w%Wd5N00003zxrr`}WweV-b^f?0xwA(3}6|n;(nB zbY8uBbdnFG)h`Dhcun{*MbVh$u1KVqlo4ELLCV>Ealo5ghBsD0IkxV=>pOu&uA>Sc2xW(5f?OoQ| zu=?dup(*v&#-`PivdTk>T@4B&OcyuV**C~t`MrlZ@$8L8yZ_;R4STCEH=f_MRs08& Zh-t9UV>55f-#|Arc)I$ztaD0e0sz_zlo$X2 diff --git a/Common/src/main/resources/assets/byg/textures/item/bulbis/door.png b/Common/src/main/resources/assets/byg/textures/item/bulbis/door.png index daa71890b0e8a5b0e84497c711b7d93a5c2d83fb..ea2e410c359ceb090d143f5f8d45276b41d35823 100644 GIT binary patch delta 161 zcmaFJxRG&!L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19R2{G5LYWzZy+;$`J6(tX+XB% zCy66KK2u4MUoZnh+2pepK%SGQi(^Q|tz>}~CN_y?$ABY8fk5y`LV;N#gK^9pUj?OO zZl{h32&#*km>RTkG;f~Nq}*kB3w1ma41bESwX^k9nd%iPgg&ebxsLQ E0OE!;ZvX%Q delta 209 zcmV;?051Qr0pS6V7=H)`0000V^Z#K00004VQb$4nuFf3k0001+Nkl(XVLnS7l2|1$1<=^cMy%f83w7$P5Exg*)2b5xpP tlllr~2eFw98Z%iNzWd2C%z4iEf%)`R#!ESS%2GgvdAjC??bRfGH06?ebj;J$wEbiyEyWmsAY{)% zAjwk_ zE{-7;jL8m6ncNZz3WaB98uI`_j+MIAF8+E01A`}XUfkQ8%+JhxzVqGMjoYgwB>YO= z$4L}#Z*P3~^WELmA?Lpt80=YLSDY5;!pD5L`={(@bI!yB0wLf0#yV^|^e0BedC z(_~4SU39)}lI?1H?%wy|_u=6^z(1B0-`L-+h5**!lF#kOM1MbC=|63LSl4KtKto#! zCn~wlglzb#?dOmjGL=b506pXhifqx_bfSaEq-sB1Z*nxu`I2c_GqpR`h%e6piYL1JwY!Zkgv$c6s7Rc#h zkJ_q3u%Rb`C!}69fXPkNiw3GB3*_}n9c$=OTXn>PlK}SAQn*tr38GiI(z6xMt=&Mo=>Wya7uhQKrdvNpOdlO>9vZdd^GAy zfS6be3^~L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY1m$FO0 z0zoXFls}K?{_>UmAPpr!e!&b5&u*jvIbohIjv*Ddk`o-*d3bU%pT2y`s?fHvb0hbR z#A#t+Jc$}y(;Otc1lV@Zo}lD%Bu3zrfv^yd883t3oz?|ecUW5$c#0iWS9nxfwmf|F jh-q8X-aSCjz{p^EMf7Ho@$zp#D;PXo{an^LB{Ts5LYhK> delta 286 zcmV+(0pb450j&a%7=H)`0000V^Z#K00004VQb$4nuFf3k0002zNklaemkw~;^l~SYd5}+=Do7vwi z{9BdiW?}a~I`+c=09#oSYprib$*U!aqgGeqd-$fQsuBZiuYaf5eFFfnyPhTX!$7*2 zw0p+gQ~HFj769P&c;+3O06z?*imqM+i2-b7(NtA&J^F+!rFvj1 zOR8&#H*oL(Iu7iQ=^emtT*(eOY|!JW=>6Egt- kla1(0(H<*p-{tpU;qFB07*qoM6N<$f=C2`f&c&j diff --git a/Common/src/main/resources/assets/byg/textures/item/cika/boat.png b/Common/src/main/resources/assets/byg/textures/item/cika/boat.png index c690af66ea2afffd27e5f3d8216ba4828128df8f..d8ee9868e96c408e2228cb89e95bc384cf517c1d 100644 GIT binary patch delta 253 zcmZo+>0_E8SV`Pz#G7b`=&5>WDmm$M+o{OeD$5G7bK8N;DhcunW^j0RBMr!@ z@pN$vskoJU-jVN!0tahAcb((X1AqOk9dDm4JF`LYzoV1J)A+NQ@dY!}_Ev_4b{vqO zxvF9J?}_S0>z{fAoLm{ZCOdbB=JvB%ubt#}x7z4Oq@KCK;3W~Z_AIl4=plo5(M${z zJGTDga!``HXqB&_XrkoRd9A{^vuFA7^PlBS<=MP{cPD289m3%0>gTe~DWM4flo45% delta 501 zcmVcX95r$4|SR*`~R=|T`eXb}{(wF|K}Vp@yE zjsufOX2yEE2;OEg?W#SybKd(t_uRv|@QvNA&jS_)~Fqq??sZ zC=cgFySDoNI0OwP<;kLWUhvp{+svo4y?nZ=0Wg@l$MWGRX-y45lvXpgCyfBhho_<2 z7m5QBNQX4qUc@*&)O>+ky)Wwv#R1koe`}e6?U708vPCI${b1zLCc$`d9 zkIXAp3w}~ElYfzR0aiBmd2A-=$u+3^zO38I`ELNg-i5=`*dPFDO(m_V7@`kD^zr81 zxrDszf55t96V!|_0KoNcB&0Q-Xjut)UD;(k-@vrGqkucee8B=BlhT^TPIZo5HI>4QZkdce!$1?POAo3Vs1*s r(BaFa2PC4OX(DHdHt1jV{}R6dMLe)Ocx}mZ00000NkvXXu0mjfMp^3+ diff --git a/Common/src/main/resources/assets/byg/textures/item/cika/door.png b/Common/src/main/resources/assets/byg/textures/item/cika/door.png index ebce9cf550e128d927691e922e75b2260931ae63..66db9622585f464dca8365a4edaf03dbef088444 100644 GIT binary patch delta 185 zcmX@bbdqs`L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Ekv*5LY0*dd=!(VNMwt8I3Nc z9-2zF%Cef8nu`l096%aMg8YIR9G=}s19E~qT^vIyZY3u;u=DV&S(ura$*IsbscRDV zjD=FOX0aq1NG(}la3h9wp;A_xfu>vYCnkZzy+(loi;nePlsFX7{IbZ~yV)QnCgwoc fhNVEDYQVrSt6sRvf3fBnpz#czu6{1-oD!MuHfq{X6n~fFDhJnL(AH(&rpqm({s{m);e)pL{RfrePW?*1o*mM5{ zih2wK7#J8B7F~V-XYaZH0`7`TV^s_Tn6MeZz`($;>NTtXW7UDr0B$x`22~+mhOfVVGwj{7mvk2(8#H6a43sE-!^Xp~ z;^`NLH*7rk4Y>X8GfKQWyErqfUbFhY$geL95z;&iBEP<%s7HxL^aR7ez(CL|7%qS% z9Atp*9h@#;U^GC)wXL%3|4HRVa5m8fFfcGMxF|~CQcu_b^rT7%003q*wg>-P+R1)XT!k zz_q@zriF50Yga}NG55d#0004WQchCMjCaE$Qe`x$DCy_asvfGn&$)n>ZqCB0-yqBJ_ReL759yF r7OfD;xOBN7OnBqvF%ipcX79g0G=Bn`26VLY00000NkvXXu0mjfYTZt9 delta 186 zcmeyx*u^wKWum2$No!H!zD>(sJihzx_48YoPGyI?T{(T|)Pb!G3=D~$9e05gXGxG> z@P8;^2==cKny4sIk?iT>7@`pz+r!9pz<`5!_2yUqQHzX`)vd7!X{?r>>~pGY0okrh)<5pVmaOTe$~#6+%`K8@$otzkXYH{ lV|Yy9Q^!57@J{`^`pcHETDnj7>H#`}!PC{xWt~$(696LDRjU91 diff --git a/Common/src/main/resources/assets/byg/textures/item/crimson_berries.png b/Common/src/main/resources/assets/byg/textures/item/crimson_berries.png index 728d24a1db5f893d0717d2bf6dc20e64707152a3..220dad3419f37aff7424bebed73d81f7fe7f25b7 100644 GIT binary patch delta 235 zcmdnQG@WUJgd7Vq0|Ud`yN`l^6lZ})WHAE+-yslY6xHx*n5d{wuN&YK;tG`gza-;- zD#I=ZrgjsiNo;157}Nuln9|tPlNqD}*tASV8ABO_T^V?c8QAMw4c`MbFqQ=Q1v5B2 zyO9RuqmdKI;Vst0GIbs1poj5 delta 242 zcmbQvw25hg1SbbG0|SGGE`RVuGlfut0G|+7Am5dN$C!bA5`%g&gH#%udMJbNBsQ}E zHm!COrT`_T|4TA1WJPZg8!oeh6l>Ak`omr>hnEa978mM zbNd>(8VopGEQb-yb@t{ zQ<{I_@s|m&w5JE`zH+wt*XD)kO6!aSmbER8;MAMgBUF%f((Ux5c158H2Y()keO~kD f@m&6oYLD3BkMIQVZr4!&xzE$pkJV+JQ$iB}IHh5g diff --git a/Common/src/main/resources/assets/byg/textures/item/crimson_berry_pie.png b/Common/src/main/resources/assets/byg/textures/item/crimson_berry_pie.png index 9376ec2e288bc3c628c1fa4e14a32aa8cd5a9ca4..299cbd55f6853dabf5df88a47d34695af2d409c4 100644 GIT binary patch delta 212 zcmZ3?)WbAEMToP&BeIx*f$ty)Gwzs}{dS_FLcL0WPlzi61H(0UhCOOZGb|Vu@$xKT zW9(;T4Oe97VqmCYURL58n@JTRnDfS^tThY_*W4Kv@$xV+FwC%E2v=n2 z0;*tOIJTVC21xOi1o;L3M*mdK JIwz)tCIDAQQ?UR5 diff --git a/Common/src/main/resources/assets/byg/textures/item/cryptic_bramble_branch.png b/Common/src/main/resources/assets/byg/textures/item/cryptic_bramble_branch.png index 518f2375c8ca480296d7f346ec2fe7ad4df68e68..7f9b030ce5d28f76d1095476e8ef7725b8b9a5fd 100644 GIT binary patch delta 180 zcmeyv_<(VOgd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul@&y-Ap2r zmiBLKESZ^~(i-Mz^62DopeSQWkY6x^!?PP{K#rHEi(^OyBkRF~f(`}(3rgwZx*wnla=&j}dv_UtYC1@?HMHS;p&Vted d>*?y}vd$@?2>^oMKpX%7 delta 187 zcmaFB_=j{DS|30fUq`v)e>PiK19f7sn8d;MhJ!z5@z8OyMj4{-4bLVvD4q?+&p?!Sr({`OH_cu88fZC#r>mdKI;Vst0Ein%0{{R3 diff --git a/Common/src/main/resources/assets/byg/textures/item/cryptic_campfire.png b/Common/src/main/resources/assets/byg/textures/item/cryptic_campfire.png index 4570737627c6c445c7924d69222cc04f2753a555..dce1576bc79d74bd19cdfc5750eaed68f1dc64c0 100644 GIT binary patch delta 220 zcmV<203-jq0;B?vB$1&Nkt7{|Gf+%aMF0Q*{`~v-x2wXPVz`uF?`Kw@giV-uNtSd$ zk#RzFS~lMw8(&H*$paotJtnaLH#RF9tgS`x00001bW%=J06^y0W&i*HZAnByRCoae z!9fzjAQT0#@L(KWw0Qqpx@F+k1i%C|z~l!4r~(8`r6ve)DL`PVwaSD~fX!JO1j;%n z2=3(Nk=(%DN55LT`siQcCM{Z|`5IKKaXwb7v4=suV?WwEHiL7zr-kid$Oixb0Qdt* Waw7E<3P?-<0000(f<8H6BQ-u3p`yMLo|Xz z&qN9xQQ%;?z|iH*aqM@z*#jffZ~o%^U8~n0c*V=$ZKfc{Fn61d!=ieI1p*m$GaW=0 zo#ele#(d|%H>G6_2ZSxA_h>E*EloIA-Y9Z#RT#VGQ^BjxOdVPyqoqwB)aI^Ls(TvH fFCp{tFLOdI_tpKEjm`j_#^CA7=I64`DWM4fjPYoI diff --git a/Common/src/main/resources/assets/byg/textures/item/cryptic_vent.png b/Common/src/main/resources/assets/byg/textures/item/cryptic_vent.png index d9a4696d73c618bae8088c7a61cfa6b3ab8d48c1..f0d22e06b8ceff6274d1e80d66e876276f9ecbd5 100644 GIT binary patch delta 156 zcmaFFc#?5~gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul@&v1ou#h$~R`)Y2*I z>QZaU3bNA@yTTosL+naT|A4eHmIV0)GdMiEkp|=#c)B=-RNP8VSRi6xAmNaita0{D z&KrirnFfnjr#752&{*l15q59`i-EF+iAiH4BSXFo3(NVOiYY+744$rjF6*2UngE)0 BGvWXM delta 161 zcmX@f_=s_W1SbbG0|SGGE`RVuGX+zL0G|+7Ait)pAUiE_U0rH(h+S8>!>OfHfP#)n zZ<~M=M@f)h@P7zkxYxWla-yO{h`pzaV~9rZ-ZPeb3Px# diff --git a/Common/src/main/resources/assets/byg/textures/item/cypress/boat.png b/Common/src/main/resources/assets/byg/textures/item/cypress/boat.png index e2a068a9965283a5966fb22780601d3c819f76c5..142c4d115ad284a72634e0dbf37b1310229fcf5b 100644 GIT binary patch delta 258 zcmeBTnZz_fqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0jzNG=h%1m@y`*XJ?9#bYvU@w@ zn(I7g=UbN*ICW>JcBHD5Mabs_%7!@T*jj2j>2upCihbMby#-`YNswPKgTu2MX+Tc1 zr;B4q#jWIo21d3vWBvs_$^OpHjwb%u6E+1hR5LRlzNm0__w>+%U*7I5_mz}rDtT{r zn=8rU-rnEqtglUJJm~rD-Cgn7{YC~BlK1v%UpH@WJa{s~Az=#$2vmlt2?ZBt}tc+mtI*bP=&fO(}GADFMkUf@Eo&>R_i93LV6uh3XtrnpujZdx&DzU_v;Y+jljBiqWYEM2^aBtHMFIF{Rsd-CDD3U$1&GvW z*2Y4D@%_gQA$uaOJ0NXW8MW>+0CI;N0IaNLNW^t<2HIGtWkz?UfEIp0u23L05n*#{ zuhqD4DK~B+dw*3&xd3a~AM^xeiraZ&6Oq;c0Ha!FcILSt)RZtaB~1G3UmKE$>!jB| zI{^Tt)1m_cF#TfAhOB;AVQ9c0_hsMKrMIuAtbjjgKb5a5h*2#AAbV9xr$yR53d@U2 z-0kzDcwG2ZH{X8AtY`C*1dvMV*6sc~Hr3Y^q~039@^#`8vEf@Bmupna3jyK+c=IkJ z?f%{oO0Sy%h8~Tu@u`Ggb)$G(RLqOZ78*^dq;B26_Ym2uVpPj)|NKrp0l;W)zB+-bD2^}-Twb|V`Gf=1|0iwt@sZoOri;;IRX>_0000lquiw&<(r=S*DP3=Hnfs(bc@lQ$SBWW0L&`K(gDga@-N_ZGE!c4#sm zKK*j@H`Cp-j0`^L#(!@(Y%!&=@!?%&wzfXL8Nw0_PLB-^SNzU@3Um^Kr>mdKI;Vst E0G!-m3;+NC delta 475 zcmV<10VMvC0_g*g7=H)`0000V^Z#K00004VQb$4nuFf3k0004_Nkly(M*k)RRkrj$a&MY}Bub>&9-zufpAx>Il?xF}s!bX9ky8^M-@kaRTF zOcE~1b0HZ!iMZ+6&AoHJduEt{8!A~W?C)-s0Pg!&4!;bS`hSbM{jcKlmf_$C8jVJ| z*lV}j5j0xt?{1Yl8xvl=8v+} RdXxYF002ovPDHLkV1m=$-dF$t diff --git a/Common/src/main/resources/assets/byg/textures/item/ebony/door.png b/Common/src/main/resources/assets/byg/textures/item/ebony/door.png index 3785495175503bf7a6d642c422b182d72fb753a8..e229eba6c52a4b5957383e9c5205409c3a1c08a5 100644 GIT binary patch delta 138 zcmdnVxQcOt1SbnK0|Ud`yN`k}1CpfV4@XQef0@f2e(+o-k-(-m- nDygw9nRVE*_}Q76!V(O}-YFD67uswH)WzWG>gTe~DWM4f<`OJv delta 154 zcmV;L0A>HG0l5K?7zqdl0000V^Z#LyArpUaNkl(}A>m?(7tiUE^T!x=O*G#I3%rH85)C^i6J7*tkPGOX`u#t>&g=H$*^ z$$%UN$l%qhR}7b~-op> zvqi+&*UhKMLZnSj%*9Z}*+9w3K} delta 350 zcmV-k0iphn0-6Jm7zqdl0000V^Z#LyHXxBC6n_CPNklOg8s!@;QE-LGzvi0eChHvFpUc^{r~?T%4A^p`U;{Lq}lQJ z6}V=6hA=TQB7DIurUhj&FigC`#IWc5UB-#C=br%4xD3JS1sK@4X!1pE6FW;N7c0PO zfPeG$?+k@c6dC;Ea`mA?I01?Qs-I3kSwMetU1o4GRQ?acdb(N+m#^G_$|3*@lm>&_ zd=?Dtz$j!0WnfTX5MX%yMGYzgiP{1v8yR4DVJ=V;C>lXDND~Zz_!BHJeT*RjiauBx z02u@_1QaG94C12$6azr%0G0+o0K^8_3`YW>Fo7A23{VV!r308km>2%J++}!eZw6+g w158gL0g&y;Ucv@2G82@E7i``I%S;Rm0NROkVn7MAApigX07*qoM6N<$g2POVo&W#< diff --git a/Common/src/main/resources/assets/byg/textures/item/embur_gel_ball.png b/Common/src/main/resources/assets/byg/textures/item/embur_gel_ball.png index c04cee89d1956beae0be74926c06d417ec30e783..ceddd92dc29a3f1989767a587cc74bdc1a3d2565 100644 GIT binary patch delta 181 zcmV;m080Oi0{8)t7zqRe0002(-QrS_ei)G?B7Xn?0RR90{^DTvx+n691=x86ziI=h zUIUCy0%kb^hn8BP00001bW%=J06^y0W&i*HR!KxbRCwBBV88}CI-qp0X(x#02zD_E zp8#SQs<@bf7_CmqF2fR99I3`(vpX5Tj?##A-7DtS%K25R_#iHZ_siJmTwAsWG@XSul!DDW^}s7v4bzjb=pYljFy z!}A>`>whvIdJ~*`M9Jq?Lx$S1c|i*24FvKPwi#|xj*M(*IC`-m+eRRt!%e8OP3X(t uKa1o%;#!+lN=cmEqmX%&`F@PSbMDw6w)!Jp)9wP@z~JfX=d#Wzp$PzBFH|i6 diff --git a/Common/src/main/resources/assets/byg/textures/item/embur_sprouts.png b/Common/src/main/resources/assets/byg/textures/item/embur_sprouts.png index 5fd2f7daef82300f5d2c7897b867e4e42aa7095e..f576f22eb9b5ffc546e37623c300a1f87d8b9918 100644 GIT binary patch delta 117 zcmX@exP@_o1SbKa;Zz@-w>dmk<*Uk*cXDkWw z3ubV5b|VeQQSo$f45?sDKENv>DIsAYBPt_dAv9G+LdQ(9+Tccx*}KF8+zhMVv2-5M S?-vKEXYh3Ob6Mw<&;$TpO(6mR delta 130 zcmV-|0Db?o0l@)~7zqdl0000V^Z#LyHXxBC6>C;WL_t(IPh%JbGzPcol>bASH~|xs zX4q5?QH)I!Ob!Il<>3Y(17r=z0Gl}2fT`XLaETi~85ka4xeI550E`c#K>%hL+y%&z kFn~=A-Oy1m@PL5<0OxEexVr`%RR91007*qoM6N<$f;cuT#{d8T diff --git a/Common/src/main/resources/assets/byg/textures/item/emeraldite_shards.png b/Common/src/main/resources/assets/byg/textures/item/emeraldite_shards.png index 4c24193815fa69f5c74cac42d8d207c337b507cf..a43fa46ce4d0da3b96e3003874bb819a3f41c1ee 100644 GIT binary patch delta 166 zcmV;X09pU|0ptOYBoYa5NLh0L01m?d01m?e$8V@)ks&63007(n>#zOILGy$Fsw@Cg z001oj+^Hqx00001bW%=J06^y0W&i*HOG!jQRCwB*jY$f?Fbu>pp5^~fF1Rryw^H3S zV0o>-*uI_MxrG2w%nU0mQp%Zdk}DBUq#YHD@Hk2l3+OA0?c}aTQeO7Yv;TnytV;oW UL#up{0000907*qoM6N<$g6soADF6Tf delta 167 zcmaFD_=9nR%0x?L?O+DS&n>tAzh=;7SpWAd!zvvH1_t}CVp9V@X$6xi+o*=U0BlWa5u!LfN)8K`hfV T^7d%~EoSg^^>bP0l+XkKR^3Zp diff --git a/Common/src/main/resources/assets/byg/textures/item/ether/bulbs.png b/Common/src/main/resources/assets/byg/textures/item/ether/bulbs.png index bb2f08195d59f7d287c683d3dfde65cd1dab83ae..628e40a9500f304f4e13383d0723ca210419b20f 100644 GIT binary patch delta 167 zcmV;Y09gNz0_6da7zqRe0002(-QrS_ju??79e*cKOjJbx0091?_V}LmQPQMHx{=jC z`N=%(JD7LCJnXYM-z{}pWj8`YA12uMQf~kN00DGTPE!Ct=GbNc0025kL_t(|+GAiK z6_`M2hbmDp-DJ)a24>9QK2-pb+GD;POmiPDsR9e_VR2vwspdYwz`y`f&4bHy07T{r V3lN1)XP^K8002ovPDHLkV1gSXLC63A delta 206 zcmaFL*v~XUf|G-pfq_9omp^!-nS!rYfKP}kkRNzyiN~&q)-%d=OQZiS`gYa+=K-5H zKjwXNmRCDz^LDf4{Zw-&pt74MHKzb6zLFrn;Qz>g!S%qM6B89BGDAFF978mM*PadJ zJD|Y9e1Xv~b@TWA@7BDS_G9lqk9Z}S8=tg0j#)bNr6Zv%VqQ|@i`N?JTXs~J39{an^LB{Ts5ZSY%) diff --git a/Common/src/main/resources/assets/byg/textures/item/ether/door.png b/Common/src/main/resources/assets/byg/textures/item/ether/door.png index 69d48f36566dd86c2cc3dad32cab4d0c3533e4ae..55eba58e3d9dc8b3bc0ceff715cb7fb7d7eea385 100644 GIT binary patch delta 133 zcmZ3&_|0|P_ST=7ppim^Dz-HBn{IhmJ04o`qjh%1oh%9s*p@6M`i_xj7D zMv$VCAirP+hi5m^fE;a47srr_TgeFwjQ1`Cuxkh^ygG2;^?@#@hNB5y5*5yy6IgtB foId>jU(djBVm{x&TJz}DKy3`3u6{1-oD!MA6( delta 153 zcmV;K0A~M|0jU9y7=H)`0000V^Z#K00004VQb$4nuFf3k0001ENkl z6G0b{0&uzj8Mt5H3}^4u^c?^fpxa7S7f{y=zYnh>*#H2FixL>bvDPz&00000NkvXX Hu0mjf|E)R& diff --git a/Common/src/main/resources/assets/byg/textures/item/fir/boat.png b/Common/src/main/resources/assets/byg/textures/item/fir/boat.png index e91d78271c3f9782f6cfb1db6f734902915fe42a..e4be3d5f52f06472e9122103ecc294250bb2bd62 100644 GIT binary patch delta 258 zcmeyuJc((7L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19D@L#5LY0*sXu3aY4GfP>+THI zj#QPh2>D81tDHdD6c5uBSF3Oby$}Z-S7S9NeQp~?v0pXY0zn3q1o;IsI6S+N2IMq* zx;TbZ+)7SpU}S4E=3mfrSU>$7%SD@cldp8ERT~%>%$c)fYt~M+8F3f4uA0=CIO*D| z<8u{`9SdE3uky^Ql!O~9TeGfC{x+G1XEs;(+DV_g6BBNP=q-u(qV$!4Ilpq@gt&-k z9_GVeomB6xmo((z+0(U4{D*V3goMPqxP*is|K*>turcUV>8xl|?+^yMhr!d;&t;uc GLK6VwCt}S2 delta 486 zcmVodw)SP^I+4f!&xgi6=`8T z11N{ULG zU$(Uiu%0^PbAP8mxPR-AS^$8Xe1RX|2P{Is7a`z_u$j&qkPZQ7rF%O7Ae}t0K>$`3 zmkh{GE}MrFn;-8p#GlC{vj$seGv7Yo^}yA&3JCi#O$-K&|8E#gG1~33 c-A7&V3X#X3->1Dgh5!Hn07*qoM6N<$f?J5#q5uE@ diff --git a/Common/src/main/resources/assets/byg/textures/item/fir/door.png b/Common/src/main/resources/assets/byg/textures/item/fir/door.png index 307568b96a20135a5ad9bb49f0fdd2e24407fd56..a17908201ced484ee710bcf03542e86fb84540b6 100644 GIT binary patch delta 149 zcmcb_xRh~%L_HHT0|P_ST=7ppim^Dz-HBn{IhmJ04o`qjh^wTeB#=43G}zTx?cdcB z5g>=DB*-tAfuU^jSqmV~($mE;q~caG2QM#gDueLD|NrAtIqq+Lr!{5kHa?drAdYm^ uRK-7f9im)9yR%t^Rx_Opi*>!s#<0;`?OLWdU;G)MDGZ*jelF{r5}E+U#4f-9 delta 194 zcmV;z06qVu0n!1G7=H)`0000V^Z#K00004VQb$4nuFf3k0001tNklGE20CZhL@G+_!asU7T07*qoM6N<$g03e_0ssI2 diff --git a/Common/src/main/resources/assets/byg/textures/item/florus_boat.png b/Common/src/main/resources/assets/byg/textures/item/florus_boat.png index 7201b13b16efd302b7406692623c5e6a2df8e16c..63f984b9b5c3b9a975b7c140fd4d72c820eaea0a 100644 GIT binary patch delta 261 zcmaFPJe6sJL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19D@L#5LX~QJKwrHL$xDSr8U;6 zGSsRpLOv%@);2*e-Q6g~)hfh6C)i5eNuS$VQ^rP7?CX&XNsvJ$L4Lsu4$p3+0Xc1+ zE{-7;w~`YY7}?tHiZAHtEk8Gh@!}mTck3AbIs*fPH|gc+|kW`(X_XUcpyWcoFZ>#t8rOZv5*~DSR3FHXIeXy1hj)z3hyVXKP&Z&;xbLoa`t6r}4}nf%@O1Ta JS?83{1ORq@W~%@I delta 473 zcmV;~0Ve*H0_Ove7=H)`0000V^Z#K00004VQb$4nuFf3k0004@Nkl%IHlhv)Y_yu2?wvNUgFZ6zxJ>bIBd6p9`o zHjc{@RC=tfWX0mV&B<3E02yPP!=MSk>RlAmvZ(yNks#WjS#%uN2yoqye@{*73dG+x zijJcg_0TT>Eb}=4mwzo%lez@;^^F;0oa@HD`TJFoTrvs3ZR^H0>^!N-fM__#VbE0K z0<7why(ywYK15prX-|eInuEl+n@fpkg{PC|It+e(3`Rs0^q!yaUp@v z7vyIxw4s0s7=%oW!NeGp4U^ToD2th1k{9U+^`=99)^Zn411Ky^iTC-8GN`3i2!PW{ zk+-iB)SC`%yUWP1k4QMc*}2|Ja8#;lTW1w1dfyCScT%3Qx%-buIKarTkG6e32X~c^ zN>vRI%h@CZd%c5iKL<6~MSOVklt>t=H5<^?V=6362@h0GmWnC&@u>O_)r_m`UX}4= P00000NkvXXu0mjfOaJ1x diff --git a/Common/src/main/resources/assets/byg/textures/item/florus_door.png b/Common/src/main/resources/assets/byg/textures/item/florus_door.png index 799c0a08cd5f2e74b3bb04e73fb04448d2a2c9c9..95fdfaa6e1dcb3d6e58ddb82f7c06e146fd8f589 100644 GIT binary patch delta 203 zcmZ3?e4BBCL_G^L0|Ud`yN`l^6id3JuOkD)#=e^0fs=uJi2$DvS0Ftr+b1U{r#058 zGSn*AN?pfQ(OOgH`^wYc7ACHI%Bs-T zy>N!{jKoJtX-sJ?ZEXjaOp0~jDNCL%(lP5&z*d(cR)NC-0lKVb3e3ENm{u2h7kaX- z=G4~rXEqLE@r@C3=y4GiPZnriyJydyH4Tgm@wsA?UHq740&QdPboFyt=akR{0DtyF Apa1{> delta 405 zcmV;G0c!r+0iy$u7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks00CM_L_t(Ijm42q zO9D|8#eYS{!x{XGF`@*s(RI>ODLPklLj0FB44uL%j?=08bDgn|@}76nCR z6q#+WK0JB)x7~@=w~>W#=yqP-0UYWJIcpgxQHe_3K#59DEq9owtltnervMzBoKtIG zu9t9jlp!&9AAjI}eh<&KQmnLYDBx)uG!0YFiM^>30v^M|% zsCzNr;Hoe50qD|%usP+*yj$5kNC%wnT*MDmIDH|Q2@V<_00000NkvXXu0mjff6l7i diff --git a/Common/src/main/resources/assets/byg/textures/item/golden_baobab_fruit.png b/Common/src/main/resources/assets/byg/textures/item/golden_baobab_fruit.png index a1d0b960cf32f28fe571b34cd71af82997a89e3a..28c83ade9983eec8520e3929f4d4507974baa40a 100644 GIT binary patch delta 177 zcmV;i08amo0{#JzB$0s?kt8C20002~|K|4ilIreP?8`;lq7$-Y5p^g6R3r&h5(!FH z*9`yw00DGTPE!Ct=GbNc003M`L_t(|+Fg!G4!|%71BuO2{{P`Bq&}oRF(V@|Q_QUF zpZu#wgIVs#3_3kZoEbsDqr~9^0Ex|O?Z&yX_ZL8VWRIBsaE+)Scv!+DNf(dFIM{l# fD^vKHzVONmEOG*aYEp@O00000NkvXXu0mjf^y^Ey delta 190 zcmeyz*vB+MWum2$MX3hUrWC;t70x%OU0=Nmzr9HK+mA{A{yz&5;$&c8*gb9eb0Ec4 z666>B9|jmUozXczQBk5I+0(@_L?bx1H&X0?0tfTL2Z#RZ-x0W?_p|6(tHwvKL+&l7 z{A2u`jWfL%&a6F|w_@9~y@#hTNbmTrd>}bxaox%41<5YztiMwh3h-2Y6l04y6L?Td o&_^&>Md%8G=RNSgP?i(Yi)@1!#^um8Se7QV@pBHy8Z9%v7Pr>mdKI;Vst08+M1 Ap#T5? delta 205 zcmZo*n!z+dWum35t4e@Rh${mFLsEjAr>#iM3W2m5zUh0^Uwq5kbl(2#qwqVg5YCMVVYgUTcBjXfOmma6Z24s;2Fr>mdKI;Vst06o22 AmjD0& diff --git a/Common/src/main/resources/assets/byg/textures/item/green_apple_pie.png b/Common/src/main/resources/assets/byg/textures/item/green_apple_pie.png index 14ddcc801a7f665c330325be3fd00034a6f28475..b09615c3dfa568a47162eb40ee9c83c4eaac5d08 100644 GIT binary patch delta 196 zcmbQl^oMbRiV$akM`SSr1K(i~W;~w1B4whYLcL;uPlzi61H;2ZRcF^E?3m_RvqE5L zqr;>k%L&;5X*GQ50U91L>~ifL%0NYoB|(0{3=Yq3qyahMo-U3d6}RU0d-E|kvanWW z%>ON4ku>XXiq^&zU92wlAE%oZ@u#)r6@{g;nLM~I*&HFxE^tw~Y*VwsqK2+p4Xf_0 v=d4su*&waaA1kYV%5Uw?>4E!dYF;y%$1+V>ZE3d{Xa|F*tDnm{r-UW|%Bx60 delta 199 zcmeyvIEiV3%0x?9SCs&t5LX5Uh6&jLX*GNg4^^FAlTfolV8=AirHu}giY(IuG(2M1 zfeL1-vT*?^o{}KH;Qt7~AawuSxrvGrCGnmvjv*Ssy(b*`4k&QA1UkAL{e6GCamK7; zq3Vhc_itMFm-XaRZ-I+ZtGB8&T)B4P+7$)X-W#9wSZY?;yiXRAsh`n$jJwgSpSk!) u1LWBSW+4tbnt_ID-Wm!H%1-*+(q^(YiejsOPDlWmRTAVE%;50sMjDV) z>FMGaQgJKy{6W4W3LGo}T|p8h7ytji#kO^N@!h9p{hk~y|Bu=3d(buSbDI8M<}((L zB+s7NHfP1HS%ru09b3A0E35p;GM9^W3`v!WU7PX~JRPR2*w@G^;Pzr~ios?Mfvr;CHFUNY3V9Z8wC*ii2IFZYGHvA~X+geIhqH3cyAC41lwS zr_3wX_Bu$%Qh&+?SS)3jj^O<1k~=6(vJWD002ovPDHLkV1mIy<(vQj diff --git a/Common/src/main/resources/assets/byg/textures/item/green_enchanted/door.png b/Common/src/main/resources/assets/byg/textures/item/green_enchanted/door.png index c6d254bd59f43b5ae122ba7b89babe8c0fb9c380..8acd81f81fa859f23c6ed3d8b65c8096000def45 100644 GIT binary patch delta 136 zcmcb`xPozl1SbnK0|Ud`yN`k}1CpfV4@bnxzckUe92_7|ZAYkw4F!bpXXl@jY6=xRSCB^2J iEH2LB8~_9jj10dO`Lm^NM7#tV!QkoY=d#Wzp$P!;2q?z@ delta 187 zcmV;s07U<&0onnO7zqdl0000V^Z#LyArpU*Nkll*(LOhZv zUO+Ys#(!|&E?k^qFAM_%SkMKKLmEBQ3C02g0|Pvy$%+N(XZ%Du905=acq;XgWCJHK pynqa_`I(>rY%_$&PCdxjUQ%9l&0y!d|aWxTA*lHHqQ-zyZ|xO>ui zg7I!MZDXMgzf0$L$b4A)FLdtA#{8G7${FO>-LqyWC^|&qT22zqmob^Skv56s4|IkGGj TYk56@j$`n2^>bP0l+XkK({fp% diff --git a/Common/src/main/resources/assets/byg/textures/item/holly/boat.png b/Common/src/main/resources/assets/byg/textures/item/holly/boat.png index 64940941a3e567058e6025d6403a47f3df8f44fc..69ebb62349ad253b0a62ed628114ac08905fa26e 100644 GIT binary patch delta 260 zcmZ3MVymlnb1^q>uKIah zdv~aWgwW~J|G!tgHa1Y{-o4|`j*`iZijfzO*4F=zVrxrL{pj>`|8hNp0xeCho9lOO zp4ON+X;IPB^_#OLB`kP#)jzD?b^5>ogJLG;!~g#qs2eaaJUXV?c)7YD8|WeiPgg&e IbxsLQ0KXz=HUIzs delta 540 zcmV+%0^|LZ0;vR$7=H)`0000V^Z#K00004VQb$4nuFf3k0005wNklGD z7{-6QDC4fXOsxxMtRn~u8OoaAq$Ii<;U6NHz(cqP@gQ`Nf=+>S62X%PF(^EA5icdh=-fe^9AHc z$O8$~hKC2zA_$=83!c@r{-h7m@W0@rb-%t|*|v;ej+g9jD23CD8K) z5#D~jNlH-wP=C(E0Wd3;@4SLm^(RVu($_A)#?C7`TATRr{;_}n=($IK0RW%B6qp(x z0YHv~kRu_qi5aws8FG6i0h!M9@=(9epsINR0QUEifE>%LRO!2LO+aohFOY~!n8q_d z;23gsNX4vFF)LN3#z&aW^m6a!9ddgm&UeNr9~_d1OMlE=Z+GF(HO|jw-5Wza0u*jJ zD}aV=vG8D-QMHZo!6CMDL|6(Ei#Ad;oZlTRuB`_)ci&LojbU5tzAZ7RYHYpOCl+la zECsQhBQZ}r<;Au20A$@OeVr&RVAvKS**{dfgxg60k<sVU3Og0w!jL`!7TiR5!#f23o=3>FVdQ&MBb@0M4^Nu>b%7 delta 315 zcmV-B0mS~z0m=f97=H)`0000V^Z#K00004VQb$4nuFf3k00035Nkl5yZ}=rrZS~lu`0DgWu>E8 zk|U{U6DI!YKl}Xod_MSZIrU)lJTR5l#TEeHbH!I0zK!MF@qaGy?m85|Ud#!iP&~j? znMS?^0C@lWD%}ZM|Ej`&7_LDj`jfnHml{KZ5yDAt=v-G z-Uewr!S`H(C`7BAB+c+Ww*-H51JptH4}CVPrBpI_d1cZCuwKm3g|QN!`Z00OVX6$n z*-X~09@N#P4>Z;<1kpt!{!ChDdaTRe1IXOK~#g6F@Vv{qJcAE2BTm? tVk0NRS%%dKM>2KW7%bm4Fq@f~F&MvOzT*AwC@0W#22WQ%mvv4FO#q;JF?Rp} diff --git a/Common/src/main/resources/assets/byg/textures/item/iron_scrap.png b/Common/src/main/resources/assets/byg/textures/item/iron_scrap.png index 79dba628ecd0ff626b14c79f9b590ed25f51075e..cb1c54596bfab44f3c086ea457077642021f23a1 100644 GIT binary patch delta 186 zcmV;r07d_c0`dWnBoYa5NLh0L01m?d01m?e$8V@)ks%;|7*I@9MF0Q*;=roduamEi zccp`EYhFrBKrKHtCiHr8%m4rY0d!JMQvg8b*k%9#09HvvK~#9!b&XLDz%U3xX+^mI zjThUQtV_z@dl&?6f%M}!bkrj_+d!Hl$au}doiqTGQFWo$g~bw$WxO!cJ(;$X!EKbR o^kkXd><#E0`(m&1!1V{$JQnu?B5lU_L;wH)07*qoM6N<$f{C_Ht^fc4 delta 192 zcmeyw*v&LSWum35rF4K#h${mFgO7vmjrEfs9ay!#uY759Zg!lPy{Q^deDAKg;y{YC zB*-uLKNK(o`&S4}RFtSp@pN$v(Fl(14dgpuz~OW{YU_9Vj{>>Vd*lxXC%&0)$B+@z zkltm&@NAQMC&P}oG;PktoRiH8J5H6}y5M?1=tP)X%bL#%jb9w9oR*TaW2x3Ay}V~9 p6Eeb059Wq+`ctzNnz7g{R6s!!PC{xWt~$(695NpQj!1w diff --git a/Common/src/main/resources/assets/byg/textures/item/ironwood_door.png b/Common/src/main/resources/assets/byg/textures/item/ironwood_door.png index 2325ee7d645125ce9c6442af4c71f4c364a127e2..5651b051ad3ff17d493db9e271be60c5226e4faa 100644 GIT binary patch delta 141 zcmaFHc!qI;1SbnK0|Ud`yN`k<+DS}Qku4Jq@Ck8MQ&ao@?b`p>^JdPRnV+AZmzNh6 z6=i-4>h@Mv4kqz#lQ(8D*Dy05?pC{cVF8DMY;n;lHfHC|Sudsw z8=Fc;4cD74)?dQ+gKsoJBHm(1Wbq$T-o`EO!y$a!F zKCJ5c^v3(_ED4DU-dz0;)8{89BASl3ocliK+%Gtyq<`^1ekJYz)PH^D?dO&! zKdy;?1#^jM3cGMGf6E!q-F@=N1$9mGD{<%I`3^lR1%Q@}({0-T96RC1s8wj04HrZj zHS20j7y*o0#Z~>(T*L#J_@A--<5j=9Pj^Ae<`*&d>1vGmb5XQp9HUkd=4bBFMpreY!E)9dD;ai?0#Z?_Bh7xl7IlbF25K80IJ{0B=s}^Ewe$(Y>?4b z$!M!=mka?(rxqxF+;Dd=7##ep3CKW!nJJQIGXnDP@qNOoOf0H+0RzaTT#mrZRNt(p zNv9ULeSMwnl0hu0P;d4Kt1@?Po_65xHLfi!J2$dd1%K$|?3@60+culeACO%PQE&FJ zJBRpXA4+hNs@3Utu(el|p697Vm#(9O_CU;Q1d%(jU;vv|cM*Yx)2H O002ovP6b4+LSTZuZt-IP diff --git a/Common/src/main/resources/assets/byg/textures/item/jacaranda_door.png b/Common/src/main/resources/assets/byg/textures/item/jacaranda_door.png index d51cd6a1842d9336cd494c32bbaaa15bfd704f40..4e1fdbcd432a1ed91b053a2170cb7608d11c6f1e 100644 GIT binary patch delta 181 zcmX@hbd+&|L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19H9W85LY05aQ58YlP0fjX=)1z zi?*|mxG-@MNNGusUoeBivm0qZPKc+AV@SoVeTjj+V@OEK>prhUjOP^zh)SLoL1KxU_Qwq>@U2$?D c5HRvEIGOXYbMkmv11(_iboFyt=akR{0H^#s+W-In delta 318 zcmV-E0m1&o0nGxC7=H)`0000V^Z#K00004VQb$4nuFf3k00038NklD%4 z6ueHwmQ8G6Jk)`aqN*vFRMP>ok$lI#rg-uXv~bhVNI`;v2NGh-pp`~86w6MW2JVpk z)LlERU@YtBWeHu delta 144 zcmbQhxPftk1Sba@0|SHn=l_Wl6@_ckJzX3_EP9g@Br*y#O&g6 w_|BwPdgUuq5yQl%tWPGm`FHL(VBpcoFhx`EG>3QFBcRm`p00i_>zopr0M6|{e*gdg diff --git a/Common/src/main/resources/assets/byg/textures/item/lignite.png b/Common/src/main/resources/assets/byg/textures/item/lignite.png index 5f0cd8b01c978e12e9814f6bb213ab7b40f305ec..45f85d3d69f268328e5052f1bb1f3256149aa62c 100644 GIT binary patch delta 202 zcmbQv)WkGFMToP&BeIx*f$uN~Gak=hkup(Hp2wuP}bhB z5TuB^B*-uLKO8W4`7?f+s3=jJ;pyTSq7htr){&1{k%#%fqZzY4{AXY98NfgFnz~Kr zq4fVxS=)m9xtRrb6eSeYHRou~;9-g4Qh9$y!;q(G8t1XB27Ly1{SalvOw$X_9Vc@< xE;?&o-4H(O(u25yBS&B6_m@~^{z!e#{$(Z1@ax34^DrpUXO@ GgeCwIr(SFT delta 504 zcmV5@t&5i}5gIfERv|>Nf&oEqg4nD0w-pb$=)oQoDM|#39xAjoR)~s}O4Ybd zSa!Q6&BuC3GiI~i`krRz$NS9t4m)r{DYF|ZwQ>X?I$wFYeSesk&no@D&D&0ndIRoX zzZuQW9=?7NgT_8qYUSwa#U49N8vw^H03f;{0Ed4STW;%$Bmt?t6Bn* zmc~KSILy8qJHsn7fv#!@-Wq&zieU=aa5lkfjSUh`<(Qr&}dme4i!_uo*dX;By4kYBXZqO1t@dT5F zX&4eRty=M(guMOogvwGEbv~5y*neOe1^^4Wd9=(a_S`nz;ounZn9_wj!tYaA0w_n1 z8cjt3ST2^L8|BLq(B@Kvy?<3@g^kv(0z`K!*YJaYuz$q!?M(na{`3@p)it6AcNWN- u@XhT3+2mtdE|#JhXiS%^T;hG4NPhu|U%=Q!-M-xb0000zhDN3 zXE)M-95qiD$B>F!$q5aNY|lbhOD%A@%p{V;D&Fyc<>a~?hp=|HKmY3)7<5V`E*>fS R$_>=P;OXk;vd$@?2>{LdB|ZQE delta 136 zcmV;30C)eC0jL3x7zqdl0000V^Z#LyAro|8Nkl!G?MNrek z?Hl0wm?(7tRs$w(-@u4$3obF*xquYFf=w{rGvGf118QKw#3*usysI5?E+Awp*)Djv q`w(RYQ0#)iX#hqn+Y>g0000voY~si zIy>LGIzPWVL$xDSr7S`|Cr~!TLB~m-+eT5W;htVT$cU04zhDN3XE)M-oEA?P$B>F! z$q5aNY;AYh7xb(>e(92fNqOX?MFC9A%!jwBxRxb4n+mMW*?J?Qr%}=K=8qSfT#VV+ z+>RttVZBC^Is8nIOP_VtVwPLXg+O?Q5lJ=WdEpEc^0T|Ea0MIlI03if*)9iu--R7}W zo|_)VU$q(l6PXME%V0}LP#WDQ-dPp^n;)kEc>Qk00Zn8w)J^lL2V<$c&j?UnUt-P} zr_pS3dUOQ9?0>?7a~r8ZBo;%{v@WwWRH}7`U-t2*`4xaKr4n8RWOHObY0espWQ|3B z99%e%xUTcP^4Sk?=ZovQQ;h36pSFKGkn;Kx>BK*d8+%VZaML8DUsZw5D+nR@u(HL* z>OA_Wigo))IsuThcdEY?1v&%cK3T>QLIAL_I?vn5L1V1jM;=;jBH;jPG{oUaUnjy^ zv8c%GQqnB@@oo1nYBWS79N?kV_V++SfQB{7kPO0bnO!V;k;W?LgHOqLc)*#^3Pb<82CJO?ARYM>;k%n!PC{xWt~$( F69BfOU?2bh delta 495 zcmV#j1QLKrwAhe<`F&1N4M%ahG*w^&Rx&t^L@Xc=Lhctj||b8n4bzsfJ*fz+kd%RgWei#X300d0AJ7#Ahi&oHA}k(Ks6S=W^~m> zPanRZpX~lOwUf4{QJNTSjxzx2H(mhb#CZt>{0no1~WYRmle7i_8nP4Q~qH=vlbO<0M zKcxr+-XuW&ir>FlsjYup=0NbhC^AZK2^P{p;a&sq&Ok?&r2;c~*Siw0mb9#cFP lQUAYc)WqbV+i)L`iU**Aq|m8rY&`$~002ovPDHLkV1hjG=CA+& diff --git a/Common/src/main/resources/assets/byg/textures/item/nightshade/door.png b/Common/src/main/resources/assets/byg/textures/item/nightshade/door.png index 7a39a7d59427ce1a304c54e79cd2e24caa1d0953..8fec35900364a098318fc033d3a3a0083a9042bb 100644 GIT binary patch delta 122 zcmdnUIE!(D1Sb`6BdMi?08STWrH Wqv2b5y1g5yjlt8^&t;ucLK6U9MJFZz delta 145 zcmV;C0B--90kHv)7zqdl0000V^Z#LyArpOQNkl)x7e|XB0jYF*f1@7%o7!fe^rO0g@LO85mIgi_LrZyzqbK@sEtqfMvv` z2%iDSnsLSsK^H(ZlkWl~L&$Rhp)eRti3|(?yf`d&(Ia*F00000NkvXXu0mjf+($iM diff --git a/Common/src/main/resources/assets/byg/textures/item/nightshade_berries.png b/Common/src/main/resources/assets/byg/textures/item/nightshade_berries.png index 17c6a0b3a69dd8c94ddf9a06d5f6ac6bf4d8893a..3d0c40e29518ec3e58a8d39c9a93fc8abf19a3fe 100644 GIT binary patch delta 219 zcmdnSG?{6FiV$akM`SSr1K(i~W;~w1B4whYLcMN)Plzi61H*^cUC$n59Nrr;vDZ2; zTg%KTPv0s*&oWL;-&fVxP(epaUfn@TSy5bG?r=vK7f=IZNswPKgTu2MX+Tbrr;B4q z1!M0)N1?+CJS+ztZ;2{O{QDmh9wSp!VxI5$Xns_SMOCBHB?ZPSFEosMqc|4uM;b*> zWV6%Q`XT1`uM;*RFVC8~72cS%!mjK1oh-qoSAWj*Dh0{hXYKMS)?v84r<7SZpGoS# T`gfv0>li#;{an^LB{Ts5(-lt| delta 236 zcmbQtw2f(k%0x@qP=f%U5LX5UhKaq_A6|Dodyt`Tm0;$ScX)3|UbdE+zOT5voPv&) zl(M3{x`Uo&oT{-QQ1OnXJ8XfJKuM5a@PAam@IX0Ma-yO{eX*yDV~9p@>A8n|hZQ(j z9^7LQy#4mx|6J~jX-iN3QJr5<@uBb^V?*i9hVblYzAm;c*K~gim2h0FcKD*`o^pU; zvGQ#ulenCDb$gw)P2%TVmzWsl&@C9Cs+#yKZgr5s-fMOLKU!+5{@bP0l+XkKBT{1Z diff --git a/Common/src/main/resources/assets/byg/textures/item/nightshade_berry_pie.png b/Common/src/main/resources/assets/byg/textures/item/nightshade_berry_pie.png index 5770cc2ab61a293caf9cb894e2dd29e4129ec2c3..1e58e9dfeac160c228d59f03347ad1ddeb5702b2 100644 GIT binary patch delta 212 zcmZ3?)WbAEMToP&BeIx*f$tCqGm2_>HB3}gs8lvqI#Hx6r%6jP;A5FI|0V5{PN`4LH zoOW{&{ggvF>@Lq67`I)X@BO@yZO!iqHkY$YzgImdxqqH*|L5m+v#XeWKAmi{0$Rx6 M>FVdQ&MBb@0JHc{CIA2c delta 217 zcmeBSTFf*-Wum35r+R=-h${mFgS>uxc7nawO{+zSZTZvt03_G5;~S5{J|@Q<*v6m-PnA|9Hw88sEBsV`lO)86%*J7(8A5 LT-G@;B{Ts5F!@MT{jue!&b5&u*jvIYFK-jv*Dd zk`o#j+1T1RB$`VZrx-5faw=Ba?c8F~dsm_7bvBF#-4#;wcI83;vG)3_|zMotvmAkr(Od;uxY49DBx5=zszT^MNSW zfPeq*bGf+9=1y_1{37m9nXHzvGJ>JkN@c;u9L5d-`3=9CDwrfDe>k4-)sSUVVw}U} vKA8h4w(G1))LwI{^~f!_`Z(Lc?JM)6E{+$=g@1ek+RotV>gTe~DWM4fOp;He diff --git a/Common/src/main/resources/assets/byg/textures/item/palm/boat.png b/Common/src/main/resources/assets/byg/textures/item/palm/boat.png index c00ef4959bffb9a9faa0a36d2de131d9149b8d50..d64cde0fc985770e3e1c095401f0d278f6910e4e 100644 GIT binary patch delta 249 zcmVLY_=k`;v1$%D&r@PMX!d9E|~`gX=)>M$5IqE=gj$=ZcVFrqUu&;fu}Pys;p{QuiYhdp$5!WS|i0e#DPDzv0Vv^?iEdK0^Jfn<{#4W>Uku8WxL+%yCdTw@x#@a9e zze+fi$ML1cO8Q(;AQu?>&7vKXYTzQu1Xr1@WEp~%2lgAY-X6{)*Y{{w&rgLqJCf17-z P00000NkvXXu0mjf)jnT4 diff --git a/Common/src/main/resources/assets/byg/textures/item/pendorite_axe.png b/Common/src/main/resources/assets/byg/textures/item/pendorite_axe.png index 3c76cba0b898a5cec59b3637c4a7d4f74cc10306..4631bc7234f88a4646d6bfc485c7983d3e7aba97 100644 GIT binary patch delta 208 zcmV;>05AWW2&e~;83+Ra001a04^y$z9RiUfvVQL=2Nv5ore= ztT`f0iHU4_Dlz#+RpQ}mfLw6%Es*&h$ovQ-z3+jn>%iL>_;CR|R|0JCPXA{B0000< KMNUMnLSTX#WJy&3 delta 325 zcmV-L0lNOE2b&0x83+ad001BJ|6!9n0<^Is8v=g;6-h)vR5%f1V4w$Zwe9#1!r1I$ z!6t|-2GSUu7Y7sizx!|nBa8#0@frZre16SwWIZTsCKMhL2c+3OG=KqFvyp)XgMpbf zidS$N@chbFB;yzu1jK|HZk|2F@aHzF78L)W=m2tb1Z}~#dB-$^HNSdwhe1qCh2hTi z-3)(M-X8|*MKuo11dt+jApwTnw-$gkfi$B7yn$$}?E7E9MUCOXqWuhazn^1dxXu7} z(f{`n>@b6HdI6;Qzlt!!$3vGOnqfN7XsiZ+G_%TlV|ab)JzmWqvoH(*Y5ptxj^Xp= z?*ui241kA$nNlX$e@rsB7(SdLPBX{=lvpj0l8|Khew~9Tn?af}fWDabe-Oryprrr+ XR!?Sz+s7p2TNB8wRqG-iS@W#sNMdu0VRm>SsNZZj|R9 zNDp7@oL(GY)#Pg1VdS1*Vef2UW^JVsXQq^Ctn8~V=B*=WtITO66|g!QsEx5C$S;_| z;n|HeAScSx#WAGfR_%F9z5@yZ&KKniA`Vskzr0L}bAnL$`M_3F=J?K!A4-qjy%go5 zzS71`!tc|<8+-;`{BfIP7pSh^n(`nOj-*Vk8m W!Q?qVC1MKD8U{~SKbLh*2~7az6jUMr delta 266 zcmaFF_K$6Xay&1%?g`H6#mbyU7WU3&N}2j%-avgu@84emQi3Hx ze!>6I0E6npvQ_%|vCF;%B|x;Tbt1jqJx3ms74a2DJjvHH&cEv{W_ zlf`B}F=Y91f&IWGrU!SV#mhUa8TvaE|0!^uP(34C?Ws7uN5h(J#;Py87p^vyF^9~4 z^CME^!rdd2pJj@qn=^i2_g$4SH6rZfX^Vq;&)Dm?^PGDS!5<2=pTX1B&t;ucLK6T{ C*=x}N diff --git a/Common/src/main/resources/assets/byg/textures/item/pendorite_hoe.png b/Common/src/main/resources/assets/byg/textures/item/pendorite_hoe.png index 00d646de60341577f103696065547697dcc4a576..341a01d60410ce6429a7a3dabf6f49307ea038c3 100644 GIT binary patch delta 187 zcmZqRn8ZFof|G@rfq~)e-A6$iFUv7aRM}Y1U=ZLF;tCX;vHIEM`4780uBV5ubxtpK zwe2u+Pq46eHZZd`Q_3_}_SF~j))BPR5wun2H2SX;brh(Fu_VYZn8D%MjWi&~+0(@_ zq~ca`LIWck8{0M$4dp-s#zPOPbvDbMGU{sf%KO%Q;ZCWzLeEbP0l+XkK;ln;= delta 298 zcmV+_0oDGJ2Y?8W7zqdl0000V^Z#L!JOZ?_BOC&M`bk7VR5%f1V4x5%;?wVH+wmVJ zzx!|nR<$fJ1?V(Lb8uc9vhaUwhF~=nrb|cA7VLuf@>vYL%KQw|vr`#Zc$pafs|Yik z+qnR&7q0=x27wIW5a(jpaAFd}%T=csuDm}C*2@G_gpUR(UNO6j;m6Bw3@RV2P?Qqo z0%K)=-~S+I|2lOSsF@LH`yrzAfo%e5c1|z;ugqx#j}c@i;57+m^T$J%818;QhgB`k zFaT*5a8YBxry1lDtfqoA{}q16@cHt0oHoO}f#Cv>W>%SRL}^BGftgY!IFNpcTq0UC w$N&@<@Vau5q#5Q7I1P#_T+szrL~RBD$|qwHg?}kK!2kdN07*qoM6N<$f(!e9E&u=k diff --git a/Common/src/main/resources/assets/byg/textures/item/pendorite_horse_armor.png b/Common/src/main/resources/assets/byg/textures/item/pendorite_horse_armor.png index c061b1974965ea1efe22348511995645f7ffae58..ef61d928f659ec2fa5638bfeb9a18925378d7096 100644 GIT binary patch delta 189 zcmeC?n8H3mf|G@rfq~)e-A6$iFUvAbRNhq2pcvp2;tCW@4`18bbPh=RTQ*v$#PMnR z>5F-D3OjK#>oGAKEb4!?2B?UsB*-tA;kn1(U5|mhU{4pvkcwN$2?`7|5_!^sH4b-J zGWcxPkaUzdv*;-+50BTh)ne_&1_lN@T~d}zZ*GY_ee2d-SqX`VL)u2u+F1+?HmJ6_ nt&NgP5(I6fxUh&Rj(>N5qJccyfJY-8|r^>bP0l+XkK5Qjjy delta 310 zcmV-60m=T92a5=h7zqdl0000V^Z#L!JOZ?_BO3yL0R>4!K~y*qV_+CrAU%BTe{>%+ zp$ib=gAB1!iGv$Nv;iQEa@vXvGgk&P>KgkqzziYE0DsFyux60!U}{|Kjr5jS^o!y=6GDAE6pNuF@i?6maBD6CwfDHg? zKDB*+Gg$of>$?p91Vk8k#CRBfzxu+!3Zzf$pNFgmg$=d_WGe`OG=rQ7(gf2CqCr4G z*^I%$F^K^b9$*0|0d~QQM_1sQLE^}oe|~t!z#uFQmIuj!EI|ff17L#Oe8OP4pZ6~@ zfHfkk1hPTuL`9Vu815h>zy^SvjSO^wHlhO^m>L+3E=P;}&GEq{?+&zb3 zMTI#~=I+^GhT81iv-cce;H=Qxz4Ocg1_p*1nS0KF&E=eP0K2^a#tR{akCwVq00000 LNkvXXu0mjfiH2QX delta 358 zcmV-s0h#`&2fGN67zqdl0000V^Z#L!JOZ?_BO3yL0X0cPK~y*qV_+CEz(O_qKM12c zm<3$`nUAbN-^d9pB_SgAf5Y*5MwmJ{115m1DJUr$Cd}~W*()&nFijwxAdQE&&tni1Rc5$<_Y}kcki;XPgq)Eg*pUDK z|1)q)@-WCrD1xNGnm{zj##gWJf|ziC5(^-g7=~Cf{Q2@5tO;2I$VPO{AX88b0105z z3=&5MUq8KNxDUh^Uu|V%IdOX`BPee9#q8ltYLIOP3BvpfQvlKkW5XE%mW}_#<#ZSX zfYApt0Av#kAZvn&foQk^AP&e75Df}l5WuAgEIDWh0PKjBOFpQi$^ZZW07*qoM6N<$ Ef-8)UNB{r; diff --git a/Common/src/main/resources/assets/byg/textures/item/pendorite_pickaxe.png b/Common/src/main/resources/assets/byg/textures/item/pendorite_pickaxe.png index 176ee8a16bde88c4cb3c0717f0d2b673b95b1205..89b3c41b9c0ca632df488579f566590aeb871224 100644 GIT binary patch delta 217 zcmV;~04D#!2(br{83+Ra001a04^y$z9RiUfvVQ;=BTX+BODqvRBMCCN%=W1O000AYQchC<4iOGT z$)W%N09{E$K~#9!jZa$+fFKN;GGxj|cmLBGBul^#W53pRuM+)(bP#R9g;U}zVtWV- zphDz==%8L{$(YyJiAAx)2^>QAod^lDKMPhL&M{(_k6VMQR$t!MqrHN(_L=hrl`#Vc TCy(6B00000NkvXXu0mjfr<70r delta 364 zcmV-y0h9i*2f_%D83+ad001BJ|6!9n0<^Is8v=g;JV``BR5%f1U>In?h|K}6wjKY` z#djaB0IO9|@#MR6XZt6ZJca=v&F&##3_MaCU^QQ!{b0C%<_g2D2iL&-ch8P8yngdQ z=+Vc^??D1AU{Nf@l(cZTsEVd5gPO7d!_&JL7@oiTzyQ+>Qh;Fq$f?h-Z2f=b{b9K4 zxL$wgfW0IQG~~|p-Ef0J47ef`Q6!GBvhV-@D#8rEPTgeyxddd$!7bekFbkNF)M79} zngv|c7(O1l1l9nuUC~4bMIBB9U^YKkw4dSb_j7QU!U7j&3RVMrUjcwM;|{yz{PNi&Lp`eNSyK^R4l9vlE{;DhIc@7xan0000< KMNUMnLSTZaccj_? diff --git a/Common/src/main/resources/assets/byg/textures/item/pendorite_scraps.png b/Common/src/main/resources/assets/byg/textures/item/pendorite_scraps.png index 3e966e826f187be7b5f1c5f83d0c735370ccfd64..a11f3294db9f70e3d841f37e2157598e1b1d0c17 100644 GIT binary patch delta 230 zcmV5fk`lULMU)TCvQ0=YdIlaG$2|k5kjxMIgkJV00eYWPE!C85+v$?JKq2R z0B%V{K~#7F1;H^2f>0O$;BObC%jFGP-|W&T$-9X3BhipJcm?++L27Y`cZR+X003Zl z0##0X-N2lOM71nAB3WKrdygTRwl+s}U(-8B+?w6|==<)RsK;_?(oUV%QhpyCF|M(r gJ|fBq>QVsU56p-!Q8mp4Z~y=R07*qoM6N<$g53F5aR2}S delta 404 zcmV;F0c-xf2k8iq7zqdl0000V^Z#L!JOZ?_BO3yL0b@x-K~y*q#ga`+!$1&*CsHg? z5|hxh6@%47sZ@%Hp!BL&|Aj|?k4OK3N6$r1^&ogCieJ!6zz?L+94uNi=AAg}RtgFp zoWt%r*?DH)-3`%yhw)nj&FXd{we71N#VH|+qh`RRLXlqjeaf3Ag*O+f?8gQ=j0OnX z^U_9t7IjYcDW_VcLboa3ok@%0UQbezocPt!&Wo(H<`Z(>1otyBev{L|p+p zkd9*z3yW(s7(@&M^qtu+7zG-PJ8(<$Y~Of$uMQnyXjgz*02KH+e&ChU_~4owM0Z`X z^FCdkA5x{V%7q$B<+-{_0ps${q82{@4|R8YJt-F()PIfW=`rNu#_}dj*agnO%eA?o-l12i7 y1c>mgnnzKKH3sECeMtq}=sC20?(b`V%0B>29ghR2&f=2*0000OFsuuR(!_`GS=!k1XH6|LK-91Ne^IjjN8}`eVzGc1&!dTbS*B2E&Hf zS(*;9b8o$Q>??a^x}W^(&0Bw;-TOSk%q2&ik5z?9C~Z=_0nk_mPgg&ebxsLQ0PQVB Aa{vGU delta 291 zcmV+;0o?we2l@w)83+ad001BJ|6!9n0<^Is90GszNklf!0tJngegDgfn=(i%8!&)uU(gWG0CPSrJ#cZ5X6N+c|2l%U z|9gKX-UHKcNqh`5jX+^zWgoC+Wlke-=z|QwrU$DRKsNtZ5oY*!=n})-@8__pff24uBvCh2c|HW=Taxy#Jdv zU0ZB=(c+5lzhDFS8UP&;HG!OScjI~d@${Oxcrmm03>wUUT*0%s1V{`r)%SAI+UKV6 su#&whG+6=jo>xs4IQH3U21J?0fhd_2hj+S83+ad001BJ|6!9n0<^Is8v=g;OG!jQR5%f1V4x5%lBl22)wbgw zOwaDa6^tw}4ly)Hb8uc9Tj#Fj0_fzi3|c_!VLSju4D+yFJ*Xm@DyInaMwZ%U|;~z0ai`_ z)5F*P2eENE8?F(^z;F^sqoRsAgSf0V!=6p840peu!%%~407^nKR`&h>UqzVV@}Ui2 zHR94b3=B^h{^K)*31%8dvw({l!^cCHz_w#vKEHwC_m6K3AVZWnjZk6-rUyi`z@qM# z@Fj)^i}u5v47T+x!+#-RC1mv&Y_JQYBqSOBKNNV6>{OVo@7~^n8;YSDCIAXJ5Qgzd Zp#d^sr9QvJBuD@N002ovPDHLkV1inwtULe! diff --git a/Common/src/main/resources/assets/byg/textures/item/pine/boat.png b/Common/src/main/resources/assets/byg/textures/item/pine/boat.png index 3510dfc41955a5c49f6df55e1cbfd46ac85cb763..949efa1599cf252440b6e3c2bc53d212136a7bfb 100644 GIT binary patch delta 251 zcmZo=>0z26S}%WQgJKyyf@!r0}hq|iKcpy$G_*B9r80P$-Q}&xkceuc=0jun2Ve5*?7NS)nH>} z+|?mdxoGApg@+}NH{J32QQ+q;@|w#(VA>vmqXzs9!ckLJd}i38xwy4gm#-nx^i>6G xLg>fP_FRSVymv0E!)`mwo7izJ>h<%V(#46a65MnC?E&UiAO~ delta 502 zcmVKK?xPJl^OO6Cly3GTl6OvKagVOF= z-?y=+oxrwCY|BK~gTlO-d&$(u2mpsi#{e`MzkTPW zHmg5K+z9*11%FuG{!C&}BXqheAOI)TU;h9ArE(K1-oB7x$)Q+sNKP-3oL=O8p)4R~ zOr@~(L9U=PsMlQq=~n8&l7PHhe@$lGg{tERbRe1ZFxNr~wq=q@50eO%BF=|Km#f3-O|yuaho6JOBUy07*qoM6N<$f>IjlHUIzs diff --git a/Common/src/main/resources/assets/byg/textures/item/pine/door.png b/Common/src/main/resources/assets/byg/textures/item/pine/door.png index f42a7ef19986f49500d0b226f1f5510e0277529c..12a0d3226d384e33b84ec5149e3e29899af1a228 100644 GIT binary patch delta 130 zcmX@bxQKCr1SbnK0|Ud`yN`kFVdQ&MBb@00=%RdH?_b delta 171 zcmV;c095~?0m=c87zqdl0000V^Z#LyArpUrNkld!oa}5 zz;Np99R?U1ou6Jbff1(xCobG4XzSIhSK<0t&?WPdU5RkPRk%14LF)*BA!5MX700l$ z>F0vv2rGumw_h>LU2%*dIl>A>4kH?I0bNxwlxQW%1^B?gr$h_`PMy7jm5q(hz`z&4 Z004M{Je!})Hq-zB002ovPDHLkV1g@uO3MHM diff --git a/Common/src/main/resources/assets/byg/textures/item/pollenated_bone_meal.png b/Common/src/main/resources/assets/byg/textures/item/pollenated_bone_meal.png index 0ff4ed9a078815d582d39e7f973c964bb86f82b9..8efd2dfd912513243ae962518c28c0beb9340c9e 100644 GIT binary patch delta 186 zcmeBT`ouUvMToP&BeIx*f$uN~Gak=hkup(Hpu%cjP3HM+EPlUt`$U#8Bu26ku?S_L~i)*h_-^g8zd7 zgOoS3+eAf)`fN`Z#}JL+*gi+00}33>(j0&OpX7C{)_82OLGQuk{RRz}dl@+-ej1%v zBCtqI!N_6m9*6T&T4kPYS<}j@*Q9d7C}8c%%S-3EH(mPBnq2Xs;HudvV;Av~(nzf{ q?rCdhly%&%=h1vxWM8oOH><5Vi_N#amxV!2@^tlcS?83%*aQHVAxyIX diff --git a/Common/src/main/resources/assets/byg/textures/item/purple_bulbis_anomaly.png b/Common/src/main/resources/assets/byg/textures/item/purple_bulbis_anomaly.png index 354843c95b11bae5bd3e504c82966548551c6b79..1344f5c0ca21928bb6ad5d8079d1c62191784cb6 100644 GIT binary patch delta 244 zcmV6`e@JpFQ5LOX@Bp|S$U%I<4Ze(zyUJbRzopr013gAQvd(} diff --git a/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/boat.png b/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/boat.png index 07c5b91ca9abb02b7707c9e6a6bfafee8362ad04..cc91361b4e71b2e957dbe18a65f0b0ad96b88490 100644 GIT binary patch delta 278 zcmV+x0qOqm0@DJJBoYa5NLh0L01m?d01m?e$8V@)ks&3200028g>;sPX{B~!jeT8O zk5QX%JDF!xg<@ojXeD@GZ-`|ij9Er}SzB{qKwMgic32;OO*w2)9dbb}R6s0IJuN~n z3n>>50r@sC00001bW%=J06^y0W&i*Hhe4FHyxUXeFIgc);yG6S$xVk_XxF>O{v znc~>V6XJpuq3#3bC1AH=wGSYgcFy!PX+xZda(*0E+bu+yH@Md(1Cn#z-Ba>fWkB+X cSNEUi-?OO+Q<0l|*Z=?k07*qoM6N<$f@p_vV*mgE delta 304 zcmcc2^nq!D%0x@0`Va>lCw=bO`PM~_y4@M7Gt)zsmL>Pr#@72<#zb|sCZ$C62Nowf zg+m?CvAVUUMA~v?lX?S zDS=astC?L+iY+<3u=vSC(a@0ddcN^7dK|vNSFhc(?mx}yJ)tel_(W6YrCrJo?WGs% j%y{;=_EuB;vp)e12b4x5#I`mM$RKS~2;)UuNUF~(NfkrcUy85}Sb4q9e0N5!*!2kdN delta 200 zcmey#*vB+Mf|G-pfq_9omp^!-nW~Grl1#m?rJ;^lnz>4GqJy=CTU38wad234^7P)? z*rjF3y#>WU rcS$MK{hU6nam&)g=Pxpqojx(CTw?dwdH42dpydpnu6{1-oD!MTib z*we)^q~ca-?`4Mmg}dfW%ftby=E4g$#$J(ZRi)E{S2P2elF{r5}E+)zhPwn delta 423 zcmV;Y0a*Ua2mA<-83+ad001BJ|6!9n0<^Is8v=g;c1c7*R5%f(lfg>EKoEu}HK1S# zg_2lHDQfkkAU)W-Ab98l_zXUgc=7I8i^pCi7ZLPkTM3FuL#2c&^q_J73A3yT;-L#| zb|>@w^Uow9T5wta@tv*HlylN=@<-=|eETl}fR;+Hc{OTmx2arlh_0=aRL~!uX(7Ea zg#drAuVoPKaiUZDy-O`pZ~*wQdqT5m1_+Gv%hMgZ(MoFb%Ynd->*$IC3KYi! za@`iaMIpN=IGBzngkN)all+@2;Rv8C?B}xyA4?KM_4zEIFnHjQ^o(Q^mVCK#3xL}P zM;yEDU&uXLb*g%wQc9o6JD-=!O+7@*ge!kum85^P0WpYtB$?ffR)+;jO6)a?^bEdK zze}(TICva!lC%OCV6C~Q<54`+Gr$m269#DZoQGM(__NjEY}myzVN{0w=Yg-&O<@W0 zV~kYQFd(ih{mKAEM9u(_Q+JM6?#I3CMcVhe*$1O;svtj^d@O$!2Mb?+09J3#wqFl( Rz@PvC002ovPDHLkV1g**#HRoN diff --git a/Common/src/main/resources/assets/byg/textures/item/redwood/boat.png b/Common/src/main/resources/assets/byg/textures/item/redwood/boat.png index 81671ef823bff6472f19d74244854b8e89772cbc..3c6906d93b4d2f5696c5c6c9c6f55cae93e38070 100644 GIT binary patch delta 253 zcmZo=>0_E8SgTe~DWM4f`5s!0 delta 502 zcmV{BsQjJZa)JQKS(p&05@gThv{1c1drCxFo&7m|HL==P`Yz@j{t=%TY z%{05rrt2Ye$Y%AV?`^)9_nGhen1O$kF#g1E!*aFFaRJwGeg^TkxIoN#&}pcz77JkT{m`nEtg9` z($_)d_=%vk+6N%`V(EGES?ArkEZ?0+^ta64~Ox*uo=fHybR0l=~6@vu+;Kq`e)3L$NTv}v@yYskHY1@>?B z7@RN00Ra6l)R1xA8J0EV<*)Z_toYojWVIiA2mLVQX{p4)*%^7$WLXIMVF*2Fv^uQa zwdi_^jTL}u^rHF6FaS1-#pqeNtU>eX5%<{h0C=kod2dv+>3WLG;ELJl6qcCc-Dh(& zLd$WC=bcWh_3Q9gDH)tEve)pj#1ymBDK3MnjbgO@ s#KaQdxB*}$KhtKh7)?O`>i-x02KukaRf|bbnE(I)07*qoM6N<$g2dSQsQ>@~ diff --git a/Common/src/main/resources/assets/byg/textures/item/redwood/door.png b/Common/src/main/resources/assets/byg/textures/item/redwood/door.png index e1eb3440f97b1f8a869b78b0a1958a631449563a..1ea89d6a9c7b92d57759e657160de67ba2bfcaac 100644 GIT binary patch delta 188 zcmZ3?bcS()L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19MJ%u5LX~Q$I-FF$|^}m$3;=m zQbtCQmv`n4rL7>N-%*z*db{U=N>p zwm9nz$~5&Ry~ol229Lhi;$>ZFrimhs0cfU4`)&!8Y05c@H176#aY+)VfOm{?gt7{N zB98qns1*!C0BEt^e*A?tyete26>IJTvd77w-0C)>0CF#hWRb*k{q@0yp&>r0V#5|_(VrB{idjX!g zQs99R2bHle(g55egm?t-2=>T=b$E803CIQO$+;)#^Z5&evjX&efSB3<0000 zq|Zze6Frk$8`dtH^B`Ke0ANW(K~#9!V_-lB z3=HfY9UUDFV8+T>D?kkHu7zr=Kn#}7MCDAdRHw2Llp&~S4pAehELs3k)1{=O0%EXt z2{kH;H$WLuU^SgeN}3RJ1QjJAQZr}H0x>vNty;Be0RsT|2pigQySA(V0000(^imVuLU?fMUS8x$R&Yruay1_^BPy?x&_o@__l+ z3_&pJ&&bhz)Xuj)po^76Gt^!T;}{!88njTmmvoR$PQZLRbhY3ISNd z00h3g`vAru0CEM0Ey&9W<|6}~VE}SA2qUvW^62RVXBc1um(QPpvJe1k7=WS+*$Xf> z!DvJd18iQv2C(J@P>RE58z^=}<&<#e1tOSc5CADg#~^^3oEaDZsh@}H^c!kC00000 LNkvXXu0mjf)N6z> diff --git a/Common/src/main/resources/assets/byg/textures/item/skyris_vine.png b/Common/src/main/resources/assets/byg/textures/item/skyris_vine.png index 0b56efa361cc9d6e97b43877f8fe4ce39a99b09c..9001cb3cc50745773944d5b7936926922ebde96f 100644 GIT binary patch delta 160 zcmey$c$aa4iV$akM`SSr1K(i~W;~w1B4whYYCQu3!~Zkqek@#azM*Y?W^zq{Pl1!2 z#qRw@Kncc@AirP+hi5m^fE*W37srr_TdjSLd<+IGELWrc*B3b}^R{0*=@a3y>P*Dj zgG*C|LK&+zu5C*c(N%D_Q)}Tr#`Bi>JwsBA!ZH3s+a?@ae{+sCqr}GMNCBXE44$rj KF6)?`5}E+l#XIW& delta 165 zcmcc1_?2;j%0x>go%xx`H32^V&z$?QaLM_GwgM+R1_lOB!=(p+6njaKU+{l0V36`= zcAKauksapg;uxY49NTx1i9wNtrSs2!_2Wu+D_4{yb*<^{*r@0d!!)VE!)0nY^ZvCJ z)-H-2$?NU~Em`6$_o1-mtNz(J4cBT}5?JE+BA$!0&g&7J*T`~gcjryUW(St1#usn6 Q0c~aQboFyt=akR{0HoVQ!vFvP diff --git a/Common/src/main/resources/assets/byg/textures/item/soul_shroom_door.png b/Common/src/main/resources/assets/byg/textures/item/soul_shroom_door.png index 98959c5330f9ec3ede3015d23880376d3bc0c18d..68dd20384bb424b6c4edf673eeb1aade8f569e84 100644 GIT binary patch delta 198 zcmeyybd7O>L_G^L0|Ud`yN`l^6id3JuOkD)#=e^0fs=uJ(Ey(iS0HV6_mS%IHN2VG z3O@Og_A%0?o&l@UJ%AF7B|(0{3=Yq3qyahco-U3d6}OTT9N2kybP^TUWpXOC&0H8@ zG$S!9M}{Y9!>YC&Y>g5*tD2e`6WV4h3Q&shI%Dr4c_u;7)Qru0W5HrRrI*Ob!%&qkw0}l->PMhm44$rjF6*2UngEnLK!N}O delta 359 zcmV-t0hs>Q0rmor7=H)`0000V^Z#K0000DMK}|sb0I`mI`%#ks00AvYL_t(Ijm46^ zO2j}Eg+D`R7o%9%(L$oTpzWMd;wy8P$S~oNXWhR*~&g+3VMI&G)pg9|5 z(AIhMaHBOQmuseBNWuL$1Au85Vib~H6g9P76lvh2462sSkLM?C?+uQ30F-SCs0~t$ zJmR1WmMgFl-C+O8;i)ET5TMLz?PVs(1E2X~*)VZp$>cW%>b83IH3>!`2j8M6K{YvX zs(t0L7FeAg&wR3;;@7;BDV}06$z%b06>Nt$+Xk002ovPDHLk FV1n*ep{@V` diff --git a/Common/src/main/resources/assets/byg/textures/item/soul_shroom_spore.png b/Common/src/main/resources/assets/byg/textures/item/soul_shroom_spore.png index 878445b62403e1ef57af4c1a77aac6de15f970ab..652c1d81c978423f1f971fba7dbbdf8e0c57c958 100644 GIT binary patch delta 176 zcmey*c!zOadpTPS7>G=jmC-PO-!ol`;+0OplBw*UYD delta 190 zcmcb^_@8lt1SbbG0|SGGE`RVuGX+&6pmBL)ZcIT+KgHDddaZZ;Qo`$HzB!%9bPhsre4)QEkKcI4% if2#U5nSFoQuCf}Ka^7Z-is}Vg$l&Sf=d#Wzp$PzA8B6Q{ diff --git a/Common/src/main/resources/assets/byg/textures/item/stone_stick.png b/Common/src/main/resources/assets/byg/textures/item/stone_stick.png index 8f40eec48e7006b400b0b9191c04aaa8469383fb..75a8390e3c0ba51a51f68aa541cc1cf753107be3 100644 GIT binary patch delta 89 zcmZo=te>D0T#%cQk`NXd>hEZ4`YkyBCIbTlV@Z%-FoVOh8)-m}oTrOpNX4z>1O;A$ s%?mzCMt=A_lPyB7_xyoFP1oxgOm{NmNc6_;1gd24boFyt=akR{0Hl{7o&W#< delta 95 zcmb<#Wt^ZB85!#DXlq)Kn~{gTe~DWM4fqJbP0l+XkKdmKg^ delta 187 zcmaFG*vK?Nf|G-pfq_9omp^!-nW{n3jx+E7|M!}?eC7ZD|9}18`~82z?T zK#HRz$S)Wu0|E^9n)gOdRFo)=^K@|x(Fm^XcjP;uz`-IO_Tj(%I_)rD{<++596TKU ze^6G?W0d|OxFE7yIU%L{4pSn}6S0H{l_|>^BzZYgJ2%ccHp~B^hgx>rp`~GZjPbvj mWlR01CYAkq_%zG)J^%ee)|_=2Y~DcY89ZJ6T-G@yGywo5iccc| diff --git a/Common/src/main/resources/assets/byg/textures/item/sythian/door.png b/Common/src/main/resources/assets/byg/textures/item/sythian/door.png index 223c36a1ccafee4b10cec2284833154e74659eab..c3f0a25dda04d749c9582901a89272738a0777e6 100644 GIT binary patch delta 107 zcmbQj*v&XWf|H4vfq@}uuK1^kio)TX0X`wFK>nI3oUWz}3BlEqfE>n>AirP+hi5m^ zfE)!+7srr_TgeFxjBLw7S4&CEaB@y$nK4_cv)|$R##M|A3$F-wN^QR41ysx6>FVdQ I&MBb@06SJ7hX4Qo delta 116 zcmV-)0E_>N0h9rd7zqdl0000V^Z#LyAroLrNkl8}R`Q7ogif2w=DX=7sclP85tRht~j7!KeYFDUpGJfdK${ WG8JEwM~RdG0000! z0AySRTvQCn00001bW%=J06^y0W&i*HTS-JgRCoae!GQq+Aq)htD79MtVE=JV0002c zJQV=O{!R)2o|P8>eBL<#y?JIGfM!3*%@1J9%3&IyDg_(xnJ*l)22yok8&E4p!+=cg kW&l(!y8*Zt0002^16_*(o|3`7?EnA(07*qoM6N<$f{IW@ivR!s delta 184 zcmV;p07w7Y0o(zQEPu(O9Fc(l(6KdwaR8Zz0H1&Wx1Tlt*){+Fxw@-8|NpLTUI1iV z1+R$!aIx~&00001bW%=J06^y0W&i*HT}ebiRCwBb%vAyf0SH3TtDw`f|K+~!IDZE4 zTR_U(6+M*2lN>$qWL~`9;|*EkV}?$9^UhV{(JNGNC0PJ{>oKcyUl5#GS^=5@K&N~F m*V*N*p}3JZ=-_VK`0D`PrU9>DA?|Mg0000k z!inFVKdEFcHx4K>b!d*=abVY!7>)^Z*`Am@V41Y`zwS%fouRuKp6gaz5(65=;OXk; KvX0p)p$Pz*Ogdly delta 174 zcmcb?_>*yh%0x?9Q;7hd5LX5UhMKa1?6kynb*Ww94yTq*X%4Xi3ckyEQ4XXyN`m}? z|3d)7z2?1<6BQ-0!#rIaLo|Y8`@H!W6giyPxr+Wv-+q|9=x#uK)RXRMUvd;a=P76@ z%_CJ1*QFy W*t8$KTCfvnErX}4pUXO@geCyh_(eki diff --git a/Common/src/main/resources/assets/byg/textures/item/therium_crystal.png b/Common/src/main/resources/assets/byg/textures/item/therium_crystal.png index dce4e6a4f64686bdd923fbdf7b7ee6294c72d3c4..c646a70e603d7ff8ac19467d0161a5b5becf21b1 100644 GIT binary patch delta 208 zcmV;>05AWc0*C^TBoYa5NLh0L01m?d01m?e$8V@)ks%;|9#BkFMF0Q*`~Uvy_w?fU z_1X0Bx8~x5%fE=mwQ!h=T7YXdcLgT^0004WQchC+eE}u5rRcFHGIkVM$M&Zg#PxV*|FWH_N zS>esyb1X+Q;j*M^D|5yGv0CkTA7=rQSRL^00wj*YheYO!&2LYB!2;oN$>{X}0000< KMNUMnLSTaMds=b; delta 215 zcmeBRTF5j(Wum35qhf$hh${mFL&veL1v9!I{rLL&`r;B5VMsV)=Xg+5}4wef>hgZL;KgjxJndjx7 zf&CsILhXODE6teu<<@M*zK*gSM!zkqs$w|!11~A_N3b|cp5RWsB+zN8-@xO3D9?5J zvQ6)Ii*I9}4^-9~`JOFmzt3~!&%=|4%tPgme_?n0D#>R6bQJ@K Mr>mdKI;Vst0I?Bc(EtDd diff --git a/Common/src/main/resources/assets/byg/textures/item/therium_lantern.png b/Common/src/main/resources/assets/byg/textures/item/therium_lantern.png index 29cdeb36172a97f512694df64d6d2a9be9140312..f278bff643a53fc47c97411b42aa74176576bddb 100644 GIT binary patch delta 173 zcmey&c$0C0gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul@&y+nXdh$~R`|NsAw zetbRl;nntMkD5>K_Y6q2a|vGAk`0n$ED7=pW^j0RBMr#0^>lFzskoJ#;K0TjFw2(l zR6=v-hQm{)EOnNAnHn&2i%EylH-T`D=Ce0h7R^5!AbH9_sLkNUTwkt$(uIr+-P<{@ VmiJsT1RBKP>FVdgvd$@?2>@eYLb?C| delta 178 zcmcb~_?dBn1SbbG0|SGGE`RVuGX+cO0G|+7Am7d<*fSut`Skwn&mJB7@aq5n|Brrr z1&VidMDGJqoFzei!9YPUU+|FR3NW@K)L3w0u1fJ!C(P~j`rXN2%{nbVk}2% f0UFe%a#V`}2X7De`!a<=00000NkvXXu0mjf&QeB> delta 204 zcmaFQ*vm9Qf|G-pfq_9omp^!-nS!lcfKP}kkl%4^Yr%}}*WbTHHDo{f@%8urf7_ou zYCgRmDCOKzBn70nN`m}?|HA;orZYO{Cn`#mCwaO!hG+!Wo_7>FpuoX=K&a!ufBTrg z)pO-$MT;GqsBQm~QIIiC;Z`zx%c`^d9h1%`H}AM4DBZG7ZiOAg5_6VS;$N-?ocqb( zY+&(RcumGv&JA1d2lvl%{r}m^@fxo`+nkhpFN4`rVi_JE13H4i)78&qol`;+03{Y! Aq5uE@ diff --git a/Common/src/main/resources/assets/byg/textures/item/vermilion_sculk_tendrils.png b/Common/src/main/resources/assets/byg/textures/item/vermilion_sculk_tendrils.png index b1bd6239bb0b24e147ca1ccaba865ff98b5120dc..c4e7fad3839367c3f8eaa4c8d106df533846f756 100644 GIT binary patch delta 167 zcmey$c%N~CiV$akM`SSr1K(i~W;~w1B4whYLcK(QPlzi61H)@gzkO1cQyG-;uuoFc=lkU;2{T|0|v{@e*QIo=4H(y z^xs8b!gS{8g-4y6eST*095cy#HNj7L`^B|0cI9v==X`*KTHdCv-dIdF&@)n=#&oH5XoUCIVXTQvpv1RZvjW-zRdKm%#Q`wDz7H$ Rbpq{U@O1TaS?83{1ORJ0KuZ7s diff --git a/Common/src/main/resources/assets/byg/textures/item/white_puffball_cap.png b/Common/src/main/resources/assets/byg/textures/item/white_puffball_cap.png index 620d63d6f3da29a6ad53554f55ebd7a4fecb1281..e64dbb9c0742aa92becbf5ca2f077eb810bc971d 100644 GIT binary patch delta 189 zcmV;u07CzY0{Q`vBoYa5NLh0L01m+9s>;osfb+Sbz2 z&Bw;TxS5N3W>`l;D|>SQ0004WQchCMjCaE$Qe`x$DCy_asvfGn&$)n>ZqCB0-yqBJ_ReL759yF r7OfD;xOBN7OnBqvF%ipcX79g0G=Bn`26VLY00000NkvXXu0mjfh>=Yb delta 186 zcmeyx*u^wKWum2$$;|GmV+VFTdHnG8>(}@1-b#ybzjf`>rL)Hw7#MWs{tX9GoFzei z!T+IvA=tk{XriJ-MY5-hV~9p@Y!4&X0Rs-^)tg`akKc1-3y+vq#q|fT;`<_c%ohIq zyrYayP_jAFsYBsm?6(cP3!9jgvyTY$r#;JjAU-)Vi{*6V`&BzPa@*`Y#K-G=Kw@Q& lkKr+aPaXHT!aMcv>MvWuYUw`Rs|V-^22WQ%mvv4FO#rl^R*e7v diff --git a/Common/src/main/resources/assets/byg/textures/item/white_puffball_spores.png b/Common/src/main/resources/assets/byg/textures/item/white_puffball_spores.png index 46f7f56647bdb06ddd90e1e4358bb42542e2b7b5..fe12c8a94a896f845785107c9a15c867644c068d 100644 GIT binary patch delta 148 zcmcc1c#Ls^gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul^LHc;aA>({rgUAlDk z_`GI|X+S<>NswPKgTu2MX+Vydr;B4q#jWIo16(Z$JgFS19FL_9ISe@tELpIMMR64i v%aj8#Zp^G57Lys985T25Ihk|7fro)%GY3+9Oq($dYx0000V7NfKP000DZQchF< z|Nj6$Dyj65AsAmuNkl(Z%0fBs-gPFEvd zdu?tjbv6S^Sab)Z=^Cani-yoKvp?PfMitMIAf4?#!l-n{sPP8Mo^( WPEly%dzJt+kHOQ`&t;ucLK6Ub$v`9k delta 172 zcmaFC_=jg8+&c;TbE9~czpNW>*w;KOs+<}h5r1(mYi1VYzB&)3=9k%Q*>?s zDejUWzu^CHz~JT2_-Ue|M3S$ki(`mJ@Y+)sxf&ceTmnsFPyhe_phS(U>g7_##P^9y z<9_qAJQiM=wulCTMz*#-)&RH1yUO1?n6%&feCj2Cjf8~6uX*9`??tjN+wS&$-thw;_Edd8 zWFheQ#=E<#L*maTCs@q;`|j?d6LxHEk1yZbyZX|mgaiva+8nX>=>pJj%4-1Jg}(sMO$8vHhe-3`rq=@yLH{~RbT@MubW@?* z`Y9$+X2GV{O9kH)RRB(|CIEzkaq778Ea;Ti@UJ5gel)pZ+i~uLVLB)PhM{7ts;O}S z>Wx#L+BzRL&42$wWPoTmp;*a_Zecj4GuG&gH4Z=b1jNi`C`@x{06^f~3dp>sjx8XD z@AIN^$Bw-&e5v}}jvua@;;Afqg=lzxX~wEb;N7B|3Ub$DYs13OWUQ>pmrI@f#+!vk;a76s^Z4N67?)MR(r=n0DOBhF#rGn delta 251 zcmV3Df>$aM=~i!!mm{;&-gE{27wPJ3rtlu4}j5kO~& zhMl+B<-1(BPR67JHxTQMGVp2JqD&kMUy2`rjoOI70ifr?sEy913dys&1CS{h*cX+c zjUZF9+o+8|iH1zc?v0EB_;jagQGj1!Ho)x9^a98YQq?%u7TEv*002ovPDHLkV1n$% BcESJv diff --git a/Common/src/main/resources/assets/byg/textures/item/witch_hazel/boat.png b/Common/src/main/resources/assets/byg/textures/item/witch_hazel/boat.png index bea91cb6cb483e2bd9349a8f8b29346eb06dbc8f..a8be38613ebbfa061fd79acb59ffdedd31043b2f 100644 GIT binary patch delta 258 zcmV+d0sa2^1Cj!e7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000mP)t-s00030?r!zW zC%uCvn{PWij9ZInC5UAtF?UUNSRZUr9VlWzR6r~rOff<)3p^nf-bZp`00001bW%=J z06^y0W&i*HgGod|RCwBBV1NMzhBFVKj3bYflt463lJ<^n1$zbthC|wW@7~x1rf;pi z+r+@2z4z{uMIeUg-MjCybek9$q+{>ieYWBd1A}zy-MevlH4F^W9no96Urj&2z}(Rq zy{~d*4FiKk>+a3pXVow;FmK&#z+b+Gfq}u;fPvxvf0z>(00UMqgek7qQvd(}07*qo IM6N<$ff#Wv=%V0|Ra~5O6&yqmLbt4S&y+tv!45{;q*S2} z3PvPDZ3Lqc6MgaVz~>OW=H=SSv)%LY{qA=!=fFElX>KGF!+$nF`L@9B(SxKnSIb+? zsS!WfJ$N`6vYWNG_^AWxI3yFp_ShGb#RV0B*hUZlPlpeHTB*w6;-v$kG@3JM%VDft z-8pX8qPhfWc{N&+amIBGz^3&Xfb#JLT2u!v1ys$X>&DndklNLqFc1FCGt%1&z{$Gt z)>qX5-hnATMSr@bxB%I`KlF9FS@~}K7oq~(ocu#iL>$6-Pnh$bFx&e@0nws5gTD$g z0Kh0!BnW^xH!C0?f9?_wJu<)Sk^zknPr#2S;73nHFiI7Qv9E0J7l{mLl&co;(4!bQ z1t6CS+spSu0_5#z=jCYtU5CG!91T*gS{UXN-c}XO=VjvH%w10~v6ffTA5I<7U(5ij z$!@lGDri0z-c}XEd=i=%<%zYtl1pJP6}m)%AN@t40kDHT{jD9%2N%~S;FgyumkQgB i&}MzSKOpVLyXqMmN~XUt-qg7$ic!kmrIItA!YZ_2n5}tQI2A09=4}1}7k=N_;64s{y!DB1tYF c7Eqj-0Jo1QV$fZ6I}a$$SQ6wH%;50sMjDWl=;`7ZQgJIe;Q-$$MUm=C55^hMuaX||J=?Wo z#|{w#ky#SEEv&iQj72(k?2zDUb2AXpwBqh+ZF2=OINN|A&0vaF=d#weG!t!u4eXt5 r%SufQ3=F1prIk3GS(|YnPoLrNS<&3D3|qDVZDa6s^>bP0l+XkK4GBW~ delta 286 zcmV+(0pb3D0^0(R7zqdl0000V^Z#LyHXxBC6@TzaL_t(IPt}sWY63wNg^x+0gbjj9 zK!RfJD+oSBsyw2VFJTiTq?CY-tcZ;YqK!q+d^>Y@#-FuLKA63CX6`w6xUBvU?{7M? z{5GfL<4s~gt07gMq-iP*hCz2_a7zR~&(h=0<*`ZjDH7eoOiGA*eQCLN9q0ts4Xit{ zS$}tD=|q~Zqz5+pZMdNDQq0{;$3=uJn9aNaU_ucfA~(@=d@elfU4+~K%p~r_Dkr|c z!`@6XgUuq#a}ZGwcQQB|eM;kR>Er8nh#WFVreAxNl4^J=mK&n}xAx00000Ne4wvM6N<$f;_Q)5dZ)H diff --git a/Common/src/main/resources/assets/byg/textures/item/zelkova/boat.png b/Common/src/main/resources/assets/byg/textures/item/zelkova/boat.png index 70652b73fa65b004f7e15336a5c581f4dec50779..05e8128b0a9ea724e46e1de57e9c4ea721f667b3 100644 GIT binary patch delta 258 zcmey&Jc((7L_G^L0|Ud`yN`l^6k~CayA#8@b22Z19D@L#5LY0*Ki6z_zIAtoYDcQd zvB*2<(xp-5C@%POPMrNsYrcse|2FeeQp~?v13)&YCr~+1o;IsI6S+N2IMq* zx;TbZ+)7SpU}S5X$-kh-GymKi#*1^z+z)&6R~r}@oUxSJnpMd&BktnXRc(zAGp?+1 zw^cZHEOhm~$T_PL6K-g2&AR&dn#&APW?}S`l(OIB-7(8A5T-G@y GGywqrWnf$Y delta 485 zcmVJuegKlbZA-XBJ$wu(6^!H?wjUY%tWFQMSl{TdiqzR(f z5{Z*3eoP$(oGwCcXL7UiEYEx2=brO&FFdl8;YMYx6ae&`Q-2N{calC_W22gzOHZj< zu)UNGhP7(rG6IbNDr==+<)z1=)gnuR)#5Y&SJ$@yOePZmK^UTh&8pJ{5XR#(J92x@ z)R;^rs5d)ek}+X)x{`5Xy3haH>2Gr8cyb2n2qVC$>##ldhQ|3huIr=g>ZrJg8RJhV zW;AJBfU5P4Tz@uBdVU<&^+y8$nq7~b@@z!N>n3^KWdG>5faFY#@9u;Q0I0WZ2?Frx z!)pPtesw4>+~b>>{~3f24y;__$OT1<=gFN~pjpP!Qc b$D`^W#&4rvn$P;400000NkvXXu0mjfnnB>z diff --git a/Common/src/main/resources/assets/byg/textures/item/zelkova/door.png b/Common/src/main/resources/assets/byg/textures/item/zelkova/door.png index d2e70ce2773aad00d857770aee1023a7281bb0f9..69696c35b76e02e57aaf269b9dfb23711b46325e 100644 GIT binary patch delta 124 zcmZ3=*vmLUqLhi5fq@}uuJ|V)#aJBV?!>U}oXkrghbO=%#1%;I&o%Q`7nT;_Jm>C_ z08&&EWh$YA$c VFs#GFV-8R?gQu&X%Q~loCII|`BHRD~ delta 149 zcmeBWT*^2>qMn0|fq_B(^Z!I3#aJBV?!>U}oXkrgC*IS=F~p)bIYA=hK*yPn;o|@N zdzST@-#_%#aG|%@4ozc`9h!$l4~ZyuD>L&jd$2BM3pmKob(xWSm&&#seUUYi=gb73 zJ54-nz#ttVw3<8J|3;~}Yu*E9!Nc4y{8U&N;=Lq3M&9LH*95eS!PC{xWt~$(6970F BG>8BI diff --git a/Common/src/main/resources/assets/byg/textures/particle/boric_flame.png b/Common/src/main/resources/assets/byg/textures/particle/boric_flame.png index 160476f418f7dd9c2cb0b5e8555f65e09618e739..ef29d11859709073c12a002adc5085fe03f8b24a 100644 GIT binary patch delta 120 zcmdnbxQ%gwiV$akM`SSr1K(i~W;~w1B4whYYBU1_!>#{UdcW3K98;E=#Br-ESrsV6 zSQ6wH%;50sMjDW#?CIhdQo+c2u#u5Lf#mdKI;Vst06vo@*#H0l delta 111 zcmdnSxSw%?%0x>g6`4sK7RQu(zt-IPe}#d8!Q{j&0U*U%666>B9|#zJZ{rJ|s3>8p z;pyTSA`zaPkeJArXmF6@v7zB2Ly4I)6nNCqCJ4+p$RpC^VYq1n1B2{YhO_M~E1iL+ OFnGH9xvX!~l%$WFU4M(B@3%Ah(4u);4Ov|IRQxbvt7(8A5T-G@yGywoSQ!OF@ delta 148 zcmX@gc#Cm@1SbbG0|SGGE`RVuGgY1cNA|y(J@HJS<4henJ#`fi8#AC}!uvixAjMu1 zc)mncXHTN(5MYx;Tbt1TQ`9&Bvg?;e3$k(r@|5$Le9_$JSL$W{9h9uH$~d xGDDN$8P{IXJIUV~CS8w_$qyaRV!PC{xWt~$(698KVI8guq diff --git a/Common/src/main/resources/assets/byg/textures/particle/cherry_blossom_fall_white.png b/Common/src/main/resources/assets/byg/textures/particle/cherry_blossom_fall_white.png index 7761b9d865a26182f2406748616a15f5853d6c63..e26623dc525591ccaec6118e6adf0cf2e917b4af 100644 GIT binary patch delta 146 zcmcc1c!Y6+gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul^LCQ#!4r~l6`yxOMBPb8eaxVFqQ=Q1v5B2yO9RuXnVRihE&{2PEZh(;C6ZulJ3fA(0tQ{ tQ|ZWxlr7hVA+UvQ_I0x9;A zAiv=MV89^d&FnT&Q6kvR)5S4FBY5qpgIo*>JWK)Mm;e8N5+%)2%JoU%lYrGHL59sy zforWJCh;GLoRpyQEWKH$V~1)jqS(|-Lw%Vg7F>%eT1z*@pvA|BDp&vux> UbmK?XPeA1ip00i_>zopr09Ml{LjV8( delta 111 zcmdnSxSw%?%0x>gm5mH;_oda}M}_^|xSD~1q4|FV7m#8t3Gxg64+IRqxA6r}RFtsQ z@N{tukqA#tNK9l*G&sod*wAp1p~TD?3Os6Q69i@)` diff --git a/Common/src/main/resources/assets/byg/textures/particle/skyris_leaf_fall.png b/Common/src/main/resources/assets/byg/textures/particle/skyris_leaf_fall.png index 549e2e3e60c1a35bb4d170a680356fbc9dd89ea9..9135a9a75a36ecb4c7b469dd24bee52df1d42284 100644 GIT binary patch delta 147 zcmcb`c$9I1gd7Vq0|Ud`yN`l^6lZ})WHAE+-yslY6xHx*n5d|l1(f)I=G>2kOU^g6 z&Cg7>^G`Byjc_U5{TC>~SQ6wH%;50sMjDW#g#xgNdss!gQu&X%Q~loCIC)tI&A;| diff --git a/Common/src/main/resources/assets/byg/textures/particle/witch_hazel_leaf.png b/Common/src/main/resources/assets/byg/textures/particle/witch_hazel_leaf.png index c4faff92ac88f81c39788b6bbf299a4b03377061..3a0b84b6feb66c0331b987c255f3b79a1eaa749d 100644 GIT binary patch delta 181 zcmeBY`ouUvMToP&BeIx*f$tCqGm2_>HB3}gt!H3hczYo2TDIppMH3Gjvp7L{J#`f) zlWt9*1Y=2%UoeBivm0qZPNb)cV@L(#)q@)u4=XSnIWS%BMtw@TLy&sw`%lpmq`mky zOyXTLY3*FEZKi3hF>Z?MH+)K+a>q*hNyc(7vkhx49aO~|_5^WTUYj9Wv?W+k`j!{p gg<1X*v+64uiWwQ6dMxa60ouag>FVdQ&MBb@0F+ojp8x;= delta 192 zcmV;x06+io0gnQZB#}8HEbYK%)@wOY&x#i8YdvGoW?; zfS4l?F(Rxv0?>Rm=%eWi0YnCTeqrY_==RV!=%?Gk0d={xek};#4O4QbD!HJY+X4A1 u|CepQ!#X>&_L0_~eWZeBxPs*zL>`Pm5EEZd>jVG*002ov22Mn-LSTYXR#4Oc diff --git a/Common/src/main/resources/assets/minecraft/textures/models/armor/ametrine_layer_1.png b/Common/src/main/resources/assets/minecraft/textures/models/armor/ametrine_layer_1.png index 45f963f530e5099d94c7fdd5f5906227411039f0..31eafd2ee9530521fbd8a5dc468e1718ea15c08a 100644 GIT binary patch delta 775 zcmV+i1Ni)x2fGH4BoYa5NLh0L01m?d01m?e$8V@)ks%;|v`|b`MF0Q*|NsC0{QUp= z|Nrvi|L^Yq@9O{W>HqEW|LyJn>GuEU^8e`L|Kk7u;KKZ|H{Sx(V73g`Txer|H9J$%ZvZK*#EoT|G4A- zw(0-DuK%uo_W#6#|F^yWy`KNI#{amZ|Fo?Cx0e5^)c>=b|D@dis=fcB;s2|z|E;6{ zm+}9ixBr>h|B%!FiST1(4g~-J00DGTPE!Ct=GbNc00IL^L_t(|+PzhOZ<|02HMb=r z*_Qnvts9n=*a=-6?x4plAEQvV^eRGKA!@I#!R>}MMQI%5%L7J;$GN=>Ip zV#dY;D@{Z=mH5sGWDLluP7404$hvp&> ztabf=_sLrZcy|J@V%^iJCM#222R{@KY`pKF)*bNP8CmNzdsAC2-F=z6v26|3lw||| z%K+f^{{D983}2gzZ=`96fTP&;y@U6d4H1CEr#=DzcHRvUh`+RaXg9d4_&M%&q}!Z6 zEy8XjhCdVl)%W6ztD>l)D%8($x5T*AQhl>i`g za*|-0rDy`?4)>jh=gPJ>%$+2Z?{hRQUQ_=2+FG-kl%ggjt4Y&dq&=@G{gIOmSQ1=n zZMS_Hv^DP>!0UK-h7j3s&ZCbqE91e#~9|3^qtZj=>=0s;_ne1V+IULUiilVBD zsxLfbFn1i^ISC%;ow`+3RWJP`m1QGk(@0Z>t9U9LK+QC#uDqXN@cJlrCAzDea=Gtxg^;!<47;Fv?+-hk3Zw(i5d8bev)Bj+#h`sMxp<^8_*5AOztYZLN3F8j~rVVfeD zp$LM2<{~^!h0#&4TA*7CwIaCR439dX9fun@DDCjX0E{&Sk0g) z1xyHd8yEow20(fTI(5+83g{5%enDFw^xNP;7u1-cq7T#`p$P>{F*bT_@4Ag+LQ9I= zu=#J@|Kt2Gf;cX(-hJ79CXe729AAWE*T%whu?&ccaxtWw@i|+)^TOXT7~^_# z&>5X1oQHEtBndB5&Uxk4IPlIDVl)SepHGF6?Vi>j;zW%SLEATC%1c$4 zjc&{>u#4lnXoE{m?a;rU@4T`sRx_I#SY_PSUh{scIUyZiC0s9JsS57(jOVz-YW1In zewGr~>~cNQO_zHKl7r+uiG6eC9i5b+s$x&%bVoQx#udD#+)^D#WcjhadWvTRY|*r5 z`WDy-btYc_lACD#bZKRxQ(mr1@zsSwvYp5oo*+SipshZ(Sh3d}J@!2$Jaj_{8oY=9 E2bmxIDF6Tf diff --git a/Common/src/main/resources/assets/minecraft/textures/models/armor/ametrine_layer_2.png b/Common/src/main/resources/assets/minecraft/textures/models/armor/ametrine_layer_2.png index 4afc51d66ffaf00943779975775eec7eccc8ba37..8d7846a49dc9ac59de9fe60868683183da5661ce 100644 GIT binary patch delta 350 zcmV-k0ipia1Em9yB$2@tkt7{|OHfQyMF0Q*|NsC0@9O{U^8eb+|Igh2$m;*izW=`Y z|H9J$%ZvZGm+}9ixBs8CjA!qR z00001bW%=J06^y0W&i*H)=5M`RCodH!9j8YF$@GiIYbzZVUWCvwf}#AX|B0Y#fIy4 z%jtAF{RI&62{bMF1a*~sf>kB|1%LzykN_!1;oc{DpXfc%?^BMVTS7IdT2xCp3O159 z3O15@O*smBE7(fdEn$z8qv(%<-;%Zxwo;CQZAsk6> wNOs@Wuqp3)y6?|!xx4>7-FJ4&-96-mUn`vsR>3o~YXATM07*qoM6N<$f&~Y$0ssI2 delta 400 zcmZ3=e4TlM%0x@qdcOdl5LX5UhX1F#{~u}o4+Q7${9m;F|MZXl53c)vcHjTabN=sG z{D14Q|A#L9U$yuDj>rE`y!yZI=l^xz{x7-n|Lv#$?_d4Db@u<^y8rXH{NFGOXw*50 zzrsLDswBuS7-S$;z#yW;aEpOqqOw^18&4O<5D)LSlP|7oHsEOEzO+tk#kskgW$*uY z>?bqV4tV>g5Xz3ogd-aT(2uz0Y2+ z5O4b-BUHpA<7dlBulZ}b4m$jNTPSs4)`>M+XDa=(JZBVHeI|UnbsT%G*Nih==9{;M zz1Sr!IQ2$!%%m;%?q_^9zZIqZ&x3FBmk(Y2%nMAuPG3GjHL_VWxwl+Ahk1vw{ky;~ l2mgd8#XOqJ_3Wp7m(Z4XN*gr)14D?x)78&q9kWwH69BMa*H-`l diff --git a/Common/src/main/resources/logo_byg1.png b/Common/src/main/resources/logo_byg1.png index b67f98fbc12b475fd19221fe8e64c516e8118600..4c8c7dd56005ed6f52b66b44cc88f4509a0e0c51 100644 GIT binary patch literal 2704 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 ZsdLG)7VO0ouJ~@<*4hD8X?gzYe*i7>2OR(a diff --git a/Common/src/main/resources/logo_text.png b/Common/src/main/resources/logo_text.png index 162c1073966cf642809719a7abf642f28051dfdf..29f8e48cb205e6faf83bfdb3d96f9f9280c77946 100644 GIT binary patch literal 76854 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 literal 90461 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 diff --git a/Common/src/main/resources/mini_logo.png b/Common/src/main/resources/mini_logo.png index 890365c452d7c2bd028801e6dfce520c3ebf80b2..9649619208b96fb78bd6a572463bda00ef9f6116 100644 GIT binary patch delta 2316 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 XvvP?SUxbDd00000NkvXXu0mjf9k-Bc From be2993422170fd6fb6d824b7286313e348f5d062 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Fri, 27 May 2022 19:24:48 +0300 Subject: [PATCH 54/90] Skyris --- Common/build.gradle | 8 +- Common/src/generated/resources/.cache/cache | 99 ++++++++ .../blockstates/potted_skyris_sapling.json | 7 + .../byg/blockstates/skyris_bookshelf.json | 7 + .../assets/byg/blockstates/skyris_button.json | 156 ++++++------- .../blockstates/skyris_crafting_table.json | 7 + .../assets/byg/blockstates/skyris_door.json | 142 ++++++------ .../assets/byg/blockstates/skyris_fence.json | 10 +- .../byg/blockstates/skyris_fence_gate.json | 80 +++++++ .../assets/byg/blockstates/skyris_leaves.json | 7 + .../assets/byg/blockstates/skyris_log.json | 17 +- .../assets/byg/blockstates/skyris_planks.json | 7 + .../blockstates/skyris_pressure_plate.json | 10 + .../byg/blockstates/skyris_sapling.json | 7 + .../assets/byg/blockstates/skyris_slab.json | 13 ++ .../assets/byg/blockstates/skyris_stairs.json | 216 +++++++++--------- .../byg/blockstates/skyris_trapdoor.json | 79 ++++--- .../assets/byg/blockstates/skyris_wood.json | 16 +- .../byg/blockstates/stripped_skyris_log.json | 16 ++ .../byg/blockstates/stripped_skyris_wood.json | 16 ++ .../byg/models/block/skyris/bookshelf.json | 12 + .../byg/models/block/skyris/button.json | 6 + .../models/block/skyris/button_inventory.json | 6 + .../models/block/skyris/button_pressed.json | 6 + .../models/block/skyris/crafting_table.json | 12 + .../byg/models/block/skyris/door_bottom.json | 7 + .../block/skyris/door_bottom_hinge.json | 7 + .../byg/models/block/skyris/door_top.json | 7 + .../models/block/skyris/door_top_hinge.json | 7 + .../assets/byg/models/block/skyris/fence.json | 7 + .../byg/models/block/skyris/fence_gate.json | 6 + .../models/block/skyris/fence_gate_open.json | 6 + .../models/block/skyris/fence_gate_wall.json | 6 + .../block/skyris/fence_gate_wall_open.json | 6 + .../byg/models/block/skyris/fence_inv.json | 7 + .../byg/models/block/skyris/fence_post.json | 7 + .../byg/models/block/skyris/grower_item.json | 6 + .../byg/models/block/skyris/leaves.json | 12 + .../byg/models/block/skyris/leaves_snowy.json | 12 + .../assets/byg/models/block/skyris/log.json | 7 + .../byg/models/block/skyris/planks.json | 12 + .../block/skyris/potted_grower_item.json} | 2 +- .../models/block/skyris/pressure_plate.json | 6 + .../block/skyris/pressure_plate_down.json | 6 + .../assets/byg/models/block/skyris/slab.json | 8 + .../byg/models/block/skyris/slab_top.json | 8 + .../byg/models/block/skyris/stairs.json | 8 + .../byg/models/block/skyris/stairs_inner.json | 8 + .../byg/models/block/skyris/stairs_outer.json | 8 + .../byg/models/block/skyris/stripped_log.json | 7 + .../models/block/skyris/stripped_wood.json | 7 + .../models/block/skyris/trapdoor_bottom.json | 6 + .../models/block/skyris/trapdoor_open.json | 6 + .../byg/models/block/skyris/trapdoor_top.json | 6 + .../assets/byg/models/block/skyris/wood.json | 7 + .../assets/byg/models/item/skyris_boat.json | 6 + .../byg/models/item/skyris_bookshelf.json | 39 ++++ .../assets/byg/models/item/skyris_button.json | 39 ++++ .../models/item/skyris_crafting_table.json | 39 ++++ .../assets/byg/models/item/skyris_door.json | 6 + .../assets/byg/models/item/skyris_fence.json | 39 ++++ .../byg/models/item/skyris_fence_gate.json | 39 ++++ .../assets/byg/models/item/skyris_leaves.json | 39 ++++ .../assets/byg/models/item/skyris_log.json | 39 ++++ .../assets/byg/models/item/skyris_planks.json | 39 ++++ .../models/item/skyris_pressure_plate.json | 39 ++++ .../byg/models/item/skyris_sapling.json | 6 + .../assets/byg/models/item/skyris_slab.json | 39 ++++ .../assets/byg/models/item/skyris_stairs.json | 39 ++++ .../byg/models/item/skyris_trapdoor.json | 39 ++++ .../assets/byg/models/item/skyris_wood.json | 39 ++++ .../byg/models/item/stripped_skyris_log.json | 39 ++++ .../byg/models/item/stripped_skyris_wood.json | 39 ++++ .../recipes/byg.byg/wood/skyris/boat.json | 34 +++ .../byg.byg/wood/skyris/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/skyris/button.json | 34 +++ .../byg.byg/wood/skyris/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/skyris/door.json | 34 +++ .../recipes/byg.byg/wood/skyris/fence.json | 34 +++ .../byg.byg/wood/skyris/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/skyris/planks.json | 32 +++ .../byg.byg/wood/skyris/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/skyris/slab.json | 34 +++ .../recipes/byg.byg/wood/skyris/stairs.json | 34 +++ .../recipes/byg.byg/wood/skyris/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/skyris/wood.json | 34 +++ .../data/byg/recipes/wood/skyris/boat.json} | 6 +- .../byg/recipes/wood/skyris/bookshelf.json} | 11 +- .../data/byg/recipes/wood/skyris/button.json} | 0 .../recipes/wood/skyris/crafting_table.json} | 7 +- .../data/byg/recipes/wood/skyris/door.json} | 8 +- .../data/byg/recipes/wood/skyris/fence.json} | 0 .../byg/recipes/wood/skyris/fence_gate.json} | 0 .../data/byg/recipes/wood/skyris/planks.json} | 4 +- .../recipes/wood/skyris/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/skyris/slab.json} | 4 +- .../data/byg/recipes/wood/skyris/stairs.json} | 10 +- .../byg/recipes/wood/skyris/trapdoor.json} | 6 +- .../data/byg/recipes/wood/skyris/wood.json} | 7 +- .../byg/tags/blocks/wood/skyris_logs.json | 9 + .../data/byg/tags/items/wood/skyris_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 7 +- .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 8 - .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 19 -- .../byg/common/block/BYGWoodTypes.java | 13 +- .../byg/common/entity/boat/BYGBoatEntity.java | 2 - .../byg/common/item/BYGItems.java | 72 +++--- .../overworld/BYGOverworldTreeFeatures.java | 20 +- .../byg/blockstates/skyris_bookshelf.json | 7 - .../blockstates/skyris_crafting_table.json | 7 - .../byg/blockstates/skyris_fence_gate.json | 80 ------- .../assets/byg/blockstates/skyris_leaves.json | 7 - .../assets/byg/blockstates/skyris_planks.json | 7 - .../blockstates/skyris_pressure_plate.json | 10 - .../byg/blockstates/skyris_sapling.json | 7 - .../assets/byg/blockstates/skyris_slab.json | 13 -- .../byg/blockstates/stripped_skyris_log.json | 16 -- .../byg/blockstates/stripped_skyris_wood.json | 16 -- .../byg/models/block/skyris_bookshelf.json | 12 - .../byg/models/block/skyris_button.json | 6 - .../models/block/skyris_button_inventory.json | 6 - .../models/block/skyris_button_pressed.json | 6 - .../models/block/skyris_crafting_table.json | 12 - .../byg/models/block/skyris_door_bottom.json | 7 - .../block/skyris_door_bottom_hinge.json | 7 - .../byg/models/block/skyris_door_top.json | 7 - .../models/block/skyris_door_top_hinge.json | 7 - .../assets/byg/models/block/skyris_fence.json | 7 - .../byg/models/block/skyris_fence_gate.json | 6 - .../models/block/skyris_fence_gate_open.json | 6 - .../models/block/skyris_fence_gate_wall.json | 6 - .../block/skyris_fence_gate_wall_open.json | 6 - .../models/block/skyris_fence_inventory.json | 7 - .../byg/models/block/skyris_fence_post.json | 7 - .../byg/models/block/skyris_leaves.json | 7 - .../byg/models/block/skyris_leaves_snowy.json | 12 - .../assets/byg/models/block/skyris_log.json | 7 - .../byg/models/block/skyris_planks.json | 7 - .../models/block/skyris_pressure_plate.json | 6 - .../block/skyris_pressure_plate_down.json | 6 - .../byg/models/block/skyris_sapling.json | 7 - .../assets/byg/models/block/skyris_slab.json | 8 - .../byg/models/block/skyris_slab_top.json | 8 - .../byg/models/block/skyris_stairs.json | 8 - .../byg/models/block/skyris_stairs_inner.json | 8 - .../byg/models/block/skyris_stairs_outer.json | 8 - .../models/block/skyris_trapdoor_bottom.json | 6 - .../models/block/skyris_trapdoor_open.json | 6 - .../byg/models/block/skyris_trapdoor_top.json | 6 - .../assets/byg/models/block/skyris_wood.json | 7 - .../byg/models/block/stripped_skyris_log.json | 12 - .../models/block/stripped_skyris_wood.json | 7 - .../assets/byg/models/item/skyris_boat.json | 6 - .../byg/models/item/skyris_bookshelf.json | 22 -- .../assets/byg/models/item/skyris_button.json | 22 -- .../models/item/skyris_crafting_table.json | 22 -- .../assets/byg/models/item/skyris_door.json | 6 - .../assets/byg/models/item/skyris_fence.json | 3 - .../byg/models/item/skyris_fence_gate.json | 22 -- .../assets/byg/models/item/skyris_leaves.json | 22 -- .../assets/byg/models/item/skyris_log.json | 22 -- .../assets/byg/models/item/skyris_planks.json | 22 -- .../models/item/skyris_pressure_plate.json | 22 -- .../byg/models/item/skyris_sapling.json | 6 - .../assets/byg/models/item/skyris_slab.json | 22 -- .../assets/byg/models/item/skyris_stairs.json | 22 -- .../byg/models/item/skyris_trapdoor.json | 22 -- .../assets/byg/models/item/skyris_wood.json | 22 -- .../byg/models/item/stripped_skyris_log.json | 22 -- .../byg/models/item/stripped_skyris_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../{skyris_leaves.png => skyris/leaves.png} | Bin .../block/{skyris_log.png => skyris/log.png} | Bin .../log_top.png} | Bin .../{skyris_planks.png => skyris/planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../item/{skyris_boat.png => skyris/boat.png} | Bin .../item/{skyris_door.png => skyris/door.png} | Bin .../byg/recipes/stripped_skyris_wood.json | 16 -- 189 files changed, 2003 insertions(+), 1213 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_skyris_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_bookshelf.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_button.json (52%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_door.json (60%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_fence.json (71%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_leaves.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_log.json (52%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_stairs.json (66%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_trapdoor.json (55%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/skyris_wood.json (52%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/planks.json rename Common/src/{main/resources/assets/byg/models/block/potted_skyris_sapling.json => generated/resources/assets/byg/models/block/skyris/potted_grower_item.json} (61%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json rename Common/src/{main/resources/data/byg/recipes/skyris_boat.json => generated/resources/data/byg/recipes/wood/skyris/boat.json} (85%) rename Common/src/{main/resources/data/byg/recipes/skyris_bookshelf.json => generated/resources/data/byg/recipes/wood/skyris/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/skyris_button.json => generated/resources/data/byg/recipes/wood/skyris/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/skyris_crafting_table.json => generated/resources/data/byg/recipes/wood/skyris/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/skyris_door.json => generated/resources/data/byg/recipes/wood/skyris/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/skyris_fence.json => generated/resources/data/byg/recipes/wood/skyris/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/skyris_fence_gate.json => generated/resources/data/byg/recipes/wood/skyris/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/skyris_planks.json => generated/resources/data/byg/recipes/wood/skyris/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/skyris_pressure_plate.json => generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/skyris_slab.json => generated/resources/data/byg/recipes/wood/skyris/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/skyris_stairs.json => generated/resources/data/byg/recipes/wood/skyris/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/skyris_trapdoor.json => generated/resources/data/byg/recipes/wood/skyris/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/skyris_wood.json => generated/resources/data/byg/recipes/wood/skyris/wood.json} (78%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_skyris_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_skyris_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/skyris_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_skyris_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_skyris_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_skyris_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_skyris_wood.json rename Common/src/main/resources/assets/byg/textures/block/{skyris_bookshelf.png => skyris/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_crafting_table_front.png => skyris/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_crafting_table_side.png => skyris/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_crafting_table_top.png => skyris/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_door_bottom.png => skyris/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_door_top.png => skyris/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_sapling.png => skyris/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_leaves.png => skyris/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_log.png => skyris/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_log_top.png => skyris/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_planks.png => skyris/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_skyris_log.png => skyris/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_skyris_log_top.png => skyris/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{skyris_trapdoor.png => skyris/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{skyris_boat.png => skyris/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{skyris_door.png => skyris/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_skyris_wood.json diff --git a/Common/build.gradle b/Common/build.gradle index aaa1329c02..b78ae9b7b6 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -6,11 +6,9 @@ plugins { archivesBaseName = "${mod_name}-common-${minecraft_version}" -/* -tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) { - file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png'])) -} -*/ +//tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) { +// file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png'])) +// } minecraft { accessWideners(project.file("src/main/resources/byg.aw")) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 98467cb113..37facf90bc 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -298,6 +298,7 @@ e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_ ebe08b1ed3a3712b7564b40d5b62213a05691c31 assets/byg/blockstates/potted_pine_sapling.json c568537b2f6cd4b868dfc8386a77ca4d95dd2340 assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json c9b0ab69b12bd90d984e5688e2d677bdbf2571d6 assets/byg/blockstates/potted_redwood_sapling.json +d66ffe92bb7f24afeab7b74229059ec8cb5e7bea assets/byg/blockstates/potted_skyris_sapling.json 7e278fc482e1a11e1ef41563b8459c8ce7de324e assets/byg/blockstates/potted_sythian_fungus.json ff9d3784136d0050b9e9b694444ea14d6984bb54 assets/byg/blockstates/potted_willow_sapling.json bb5b76d1bc73cccb791145f47ccbb90096602a31 assets/byg/blockstates/potted_witch_hazel_sapling.json @@ -332,6 +333,21 @@ a99e0b739010290bb7c3d10e39ae0a0768a8b357 assets/byg/blockstates/redwood_sapling. aa37e62134eeb2ec5ddd1e6d1d11a7d45c9f2ebe assets/byg/blockstates/redwood_stairs.json 4a93cd3f90e44278c2e51d38cc981b76c33e6fa8 assets/byg/blockstates/redwood_trapdoor.json 08db9f7765cc53b997727d649f366dc944063c7f assets/byg/blockstates/redwood_wood.json +30713b51911af7f67076436fdd6eaa8bbece276d assets/byg/blockstates/skyris_bookshelf.json +41aa2aafd48099b387e57c16c883d62c1f2daf00 assets/byg/blockstates/skyris_button.json +257a15c6346f90be3602c06ba471dc630e0a8ed2 assets/byg/blockstates/skyris_crafting_table.json +bcbd17c4de0ba05848a8b15dad77d4236067207b assets/byg/blockstates/skyris_door.json +a99f37d2ee9136936565ee09d24b220e490766b8 assets/byg/blockstates/skyris_fence.json +e3e43bd5ff11a0b34b4886dbebc5e9ab7068598b assets/byg/blockstates/skyris_fence_gate.json +f050210d50e92bc9811effa4462ddbd172c25271 assets/byg/blockstates/skyris_leaves.json +1c4970a234370e4078be9d97128a688fb57ab3d4 assets/byg/blockstates/skyris_log.json +5eb0fe99714ea86fa7978eaeddb7e114c882e3a5 assets/byg/blockstates/skyris_planks.json +ecd63b24ebd68cb6863a041706cf7a4bad2aa05a assets/byg/blockstates/skyris_pressure_plate.json +2d1ef6f38249d92c85b8fa742278d8ea10fe7745 assets/byg/blockstates/skyris_sapling.json +d411e2607812059c5eb953d63350964b2d801ee9 assets/byg/blockstates/skyris_slab.json +cda48ff780127d33e6f01361dfeaca39f9327c1c assets/byg/blockstates/skyris_stairs.json +8338eb33a93eb376972c6ac3f2724c31557f9642 assets/byg/blockstates/skyris_trapdoor.json +8d06785c16fdd81cc415980ca7310391c0d50ac3 assets/byg/blockstates/skyris_wood.json 6566cf7f92aadb61d379dbcaef0473851bf3909e assets/byg/blockstates/stripped_aspen_log.json b7cef1857889d35956251b732f6dc286b30b7259 assets/byg/blockstates/stripped_aspen_wood.json 18e5da620766a46763e48460bf581be6047b4345 assets/byg/blockstates/stripped_baobab_log.json @@ -372,6 +388,8 @@ dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_lo ba8af5af681e7a4c1fd9fa346be84fca1d132a53 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json 67e9d9e8018903bb568c09d12767a0338c1bce68 assets/byg/blockstates/stripped_redwood_log.json 625fa0a3b477df439a0acf1655277bd844068167 assets/byg/blockstates/stripped_redwood_wood.json +73280ab092ef21a2ccc364aec42bb89d0b040c86 assets/byg/blockstates/stripped_skyris_log.json +32abb82467f2ddf621fa2a4ec79245aab2405155 assets/byg/blockstates/stripped_skyris_wood.json 80f81ef6eadf7614e1b101bd2d420b2a67b82180 assets/byg/blockstates/stripped_sythian_hyphae.json 4fd8e8dc0c0d9ea8178f1a7b563e1f6bfd074a7b assets/byg/blockstates/stripped_sythian_stem.json f6b1aaf5a69ad8142f6e0834c64a73d0c4e74ae4 assets/byg/blockstates/stripped_willow_log.json @@ -1163,6 +1181,41 @@ a1b1d64d36cf817b36611e323b42d2750b053bba assets/byg/models/block/redwood/strippe c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json 304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json b92686745b20a33080cb669a5d23b8e8e0b4915c assets/byg/models/block/redwood/wood.json +9ea6888335568e65263832db5e81b8ca10fbcfa1 assets/byg/models/block/skyris/bookshelf.json +f5f56106de555ffebf7448b2d5743e29df77d930 assets/byg/models/block/skyris/button.json +5bd0ea67342c68603f2e41f1e104fd4c3c4902fc assets/byg/models/block/skyris/button_inventory.json +2717bb30ab8de6264c7c62cb6e2e917ca30a350b assets/byg/models/block/skyris/button_pressed.json +2a4fd33a62663eff2182c96f01a1baed930739d1 assets/byg/models/block/skyris/crafting_table.json +fc56ef7dd0db6406a1e1ff5d10763f1e856c630b assets/byg/models/block/skyris/door_bottom.json +63005fddb8d650fd9472d38991ac6f8b08f719ec assets/byg/models/block/skyris/door_bottom_hinge.json +5ad0e1a8e212dbb33d8fb2e0bcddbd029779b6aa assets/byg/models/block/skyris/door_top.json +e2cb06bb38b4b27271a2b78e2e61e0152cea16cc assets/byg/models/block/skyris/door_top_hinge.json +edf211fff12478c2100ec3b98a9d8f5485951ebf assets/byg/models/block/skyris/fence.json +3992f292eb209cc9425a69e3efb4ed0629544af4 assets/byg/models/block/skyris/fence_gate.json +8dc8f4bb379bdc160b74eb61fb5b6f32a923854b assets/byg/models/block/skyris/fence_gate_open.json +7cddc031f8b955e92f7b2b62cd133e156c3068dc assets/byg/models/block/skyris/fence_gate_wall.json +cebd3cdb7a737aa64ebcffae46be68b539b350e0 assets/byg/models/block/skyris/fence_gate_wall_open.json +7a74fc6f4a2b5d8959c49db3857e0c574cf2457e assets/byg/models/block/skyris/fence_inv.json +d0bf673675e384988067fb2ca054b18c1bd5b13c assets/byg/models/block/skyris/fence_post.json +a4ac8a8eaa8928abab08bf6f6a437cfc0d67e01d assets/byg/models/block/skyris/grower_item.json +8fb017a0da46e75f63bb9454e531a8192a6647d8 assets/byg/models/block/skyris/leaves.json +192bb0f3e8b490e4ecd5b5f754fb005e04b0bc2f assets/byg/models/block/skyris/leaves_snowy.json +bcd28d83aa6744ef566a364bb36f7bfa7376faa9 assets/byg/models/block/skyris/log.json +e9ad55913d8b69f5ac6c9d5b22e8585b0b61eaa5 assets/byg/models/block/skyris/planks.json +b6fed392982074dc8d55c240beb7c719c8cace75 assets/byg/models/block/skyris/potted_grower_item.json +5aa4c75ece49a325df983f690d3bb57960fdc9a2 assets/byg/models/block/skyris/pressure_plate.json +914a496841df359078acf40d0b3458393979a46d assets/byg/models/block/skyris/pressure_plate_down.json +16431bd21ba37faceba9182b072ba513570499d5 assets/byg/models/block/skyris/slab.json +706d04c4738ee1a466a12832ea71edf93f33c651 assets/byg/models/block/skyris/slab_top.json +d3ed80f613890d5830584cc9057252980c544bee assets/byg/models/block/skyris/stairs.json +3da2b9d02e8bf5fd5cd61e9eac37eed3c44431c5 assets/byg/models/block/skyris/stairs_inner.json +67e6822dd2cd9ff3eeb64ddc2eab8b2e23446ec8 assets/byg/models/block/skyris/stairs_outer.json +af9040693f0f02e9dfa536bf37a8ddc473f2a09b assets/byg/models/block/skyris/stripped_log.json +6e6b4bf6195a05979601aaffe41330c7a4abe8a8 assets/byg/models/block/skyris/stripped_wood.json +a2cfcf7bb008ba34fcd24aa3f6d2bb60439675fc assets/byg/models/block/skyris/trapdoor_bottom.json +f8c761485fe1ddd4db3b99c4f7cf183b2ff1cd1a assets/byg/models/block/skyris/trapdoor_open.json +718bfcda46c14e1067099c273005579c4a6d3f93 assets/byg/models/block/skyris/trapdoor_top.json +bd7e271b11667ca274c3dcae59cdd28830dc722d assets/byg/models/block/skyris/wood.json f609435c668bc7df2b4629289101e1c3f38641e0 assets/byg/models/block/sythian/bookshelf.json 35767dee2ac8093d6860bfb48a4c665b9adfbd26 assets/byg/models/block/sythian/button.json d053689fb4513489f8f1ebcb7f0c24d13001530c assets/byg/models/block/sythian/button_inventory.json @@ -1629,6 +1682,22 @@ bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.j 68d710d727c23617894f7e70dfa8f788966e0911 assets/byg/models/item/redwood_stairs.json bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/item/redwood_trapdoor.json 30853e542fa6fd325fb9b54db516b5cf6c9ff71a assets/byg/models/item/redwood_wood.json +90f1531fc9dde5637ac51549c9d3244b83f4f8f5 assets/byg/models/item/skyris_boat.json +8b0d64177140102116464ed3374320b6f4dd3f19 assets/byg/models/item/skyris_bookshelf.json +709f7c852829ef541cb4c59c57d530a724172790 assets/byg/models/item/skyris_button.json +e018d92f41b547bc7d7883b0bf55b7f6a70c5729 assets/byg/models/item/skyris_crafting_table.json +304cea558254a55fec3839c5558438530ffb2343 assets/byg/models/item/skyris_door.json +d78d6ca789933a9f6331b91e4da754964d9ed621 assets/byg/models/item/skyris_fence.json +8ba7551c4449281b3b6529ba12d2dac3a3520a52 assets/byg/models/item/skyris_fence_gate.json +b0f7f8504f9fafdc0a2ae4ab6cf48c5ae667156e assets/byg/models/item/skyris_leaves.json +37f871a0f5de332301942c96948dc83d5c844746 assets/byg/models/item/skyris_log.json +e7843e5b430e1861210b4ff66faaa7bc86fb5685 assets/byg/models/item/skyris_planks.json +bc63e25d4a09e9dacefdb219a1ab1514d8000d24 assets/byg/models/item/skyris_pressure_plate.json +5101fc54f3156790bf7717b118a4c53d38889e73 assets/byg/models/item/skyris_sapling.json +b83babc96b05faae942a83eef6038ebba01c121a assets/byg/models/item/skyris_slab.json +f399f2ce0b940d0e451cb2062c9cc1211f21c038 assets/byg/models/item/skyris_stairs.json +ed4b6adbe2630c9f163c3788471e0f570be1c668 assets/byg/models/item/skyris_trapdoor.json +32556c83388b115cf9bb5e78a377556b88c65e7c assets/byg/models/item/skyris_wood.json 5eb73c5eff81302b6160bf99e9a395f4a881710a assets/byg/models/item/stripped_aspen_log.json d562898c1fd9a5390654b3360b230abe9f2fa357 assets/byg/models/item/stripped_aspen_wood.json 8f311f72bc1785f527a93215c655ee1b7997f4cf assets/byg/models/item/stripped_baobab_log.json @@ -1669,6 +1738,8 @@ e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wo 03df4f31d47d36fd31fdc70002686f80dc3cb46f assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json a86cac25410f11ccd308ab3cbf1217e18eb73895 assets/byg/models/item/stripped_redwood_log.json db8a7ece8ae147b5b60a97bdaaa461d45185bb09 assets/byg/models/item/stripped_redwood_wood.json +ab724ff0d459c79f56e4da47b80ac5bf8e65be68 assets/byg/models/item/stripped_skyris_log.json +f51e6982334b412786b7c85e1a7b316ac8ff10cd assets/byg/models/item/stripped_skyris_wood.json db07f156bfbdffbeea263bd9d6d42ed1183b37c7 assets/byg/models/item/stripped_sythian_hyphae.json 5f18b3cba93df79fb8333a6dfe6b62a5fa65ebe9 assets/byg/models/item/stripped_sythian_stem.json fb93ad2185e85033120d127bd82f62c6a31f7e4c assets/byg/models/item/stripped_willow_log.json @@ -2008,6 +2079,19 @@ f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/w 48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json ce977027d630e1d18301bbff458916b11621daa9 data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json +19d45ab8f2448d81ff581a7b3ae57740e956cf3a data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json +692c9b250fd64e1577a32ed705210ebef1844960 data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json +fe93f9d42ac9af2974e435cf70a6dd0adfb66de6 data/byg/advancements/recipes/byg.byg/wood/skyris/button.json +097b193a87e5439dff7dca87f83ca5cb81c0318a data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json +33abd0a4909407052fec6cc204ba87ce82d6eb51 data/byg/advancements/recipes/byg.byg/wood/skyris/door.json +aab1b61b74b8e343ac121d35dfbf87b607311534 data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json +91e61481d1b7640aea47e3bf37c39fc14bb450d8 data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json +ab1a468b669904bb3b22409f06ce5345300b54db data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json +b630b384d3f541bec7bd863d16aca2f2b8a7edad data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json +a83d445b4c5452b3e0f13e3ecf19b4ec7adae235 data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json +6732c2a40272a07e9477266dad98b084b3f0ccdc data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json +1005e61c2f79e7a742e473ac164b11deac03fe5c data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json +3ae4185f349cbc9d0bca245ecb212eaa978d6eff data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json 57ee2ed86380b7aa0205fea50d7418d03aaa71b6 data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json 93a68ce74502ff43c1dcaac2c0a3bc1b69af1b5f data/byg/advancements/recipes/byg.byg/wood/sythian/button.json bed0fe7f9f783c594170979ab9af60abe160f5c7 data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json @@ -2327,6 +2411,19 @@ e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json 5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json 87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json 77068fa435484d2dfd95ba3a45308c36d6593157 data/byg/recipes/wood/redwood/wood.json +2631ce235ff2f5221271d8c25bace19779243d8c data/byg/recipes/wood/skyris/boat.json +383b11a75a46101fbd060f8ad1232feb9d9e16c3 data/byg/recipes/wood/skyris/bookshelf.json +b2aa86756f081a02c6c78c00b0a42065a264adf3 data/byg/recipes/wood/skyris/button.json +8728371c728bd571cef555668f5a07675e8d1df4 data/byg/recipes/wood/skyris/crafting_table.json +9208b050275cc74fdfe91c6cb03150907f7d704d data/byg/recipes/wood/skyris/door.json +669aa3c9255a1fc6ff72cf23ad07bdcc81ab249b data/byg/recipes/wood/skyris/fence.json +d696d556a315190ecfa8963a2aaadedb542b5cb0 data/byg/recipes/wood/skyris/fence_gate.json +4f299bdf264590c0546189f4acca5e4c0d898bea data/byg/recipes/wood/skyris/planks.json +102d1f688da4cdb83de4da0e11e8efcc85551d54 data/byg/recipes/wood/skyris/pressure_plate.json +c0fb8c5f94db8296362f5579e94236fb5ab9a118 data/byg/recipes/wood/skyris/slab.json +4ad1fd1d426c4e72e754936c08811fdb2cd4a96a data/byg/recipes/wood/skyris/stairs.json +d2cf8c3c8524cdb3ce6f363aafd50fd989008a03 data/byg/recipes/wood/skyris/trapdoor.json +b3572896d593001a84adf0dbb35959fb381aa5bd data/byg/recipes/wood/skyris/wood.json 39a5771eb4c4416d1f1c0e0301ba8fa706bc828e data/byg/recipes/wood/sythian/bookshelf.json aacccae5dbf9ab6190d494d9321b7af851aef0fc data/byg/recipes/wood/sythian/button.json 7ac944da1dfe8ffcfa39b910be5b8c9a481bd47d data/byg/recipes/wood/sythian/crafting_table.json @@ -2523,6 +2620,7 @@ c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchant be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json 9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json +c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/blocks/wood/skyris_logs.json 629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/blocks/wood/sythian_logs.json 7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/blocks/wood/willow_logs.json 7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/blocks/wood/witch_hazel_logs.json @@ -2548,6 +2646,7 @@ cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json 52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json 4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json +d9a7b8dfd5afa246661a4a4a85c6634ac826b8e5 data/byg/tags/items/wood/skyris_logs.json 1e5d0e7d58c86949b1d2eaa8de318a1f4b13139d data/byg/tags/items/wood/sythian_logs.json 5343112857899942ab8f37d883a572166eba5b13 data/byg/tags/items/wood/willow_logs.json 7832a5cc7d64149d49991f418ffc960adc4ae871 data/byg/tags/items/wood/witch_hazel_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_skyris_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_skyris_sapling.json new file mode 100644 index 0000000000..bd74f7e069 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_skyris_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_bookshelf.json new file mode 100644 index 0000000000..a2bf91fa0a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_button.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json similarity index 52% rename from Common/src/main/resources/assets/byg/blockstates/skyris_button.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_button.json index 3287dacfb6..8f655e677a 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json @@ -1,118 +1,118 @@ { "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/skyris_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/skyris_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/skyris_button", - "y": 180 - }, "face=floor,facing=north,powered=false": { - "model": "byg:block/skyris_button" + "model": "byg:block/skyris/button_inventory" }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/skyris_button", - "uvlock": true, + "face=wall,facing=north,powered=false": { + "model": "byg:block/skyris/button_inventory", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/skyris_button", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/skyris/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/skyris/button_inventory", + "y": 180 }, "face=wall,facing=south,powered=false": { - "model": "byg:block/skyris_button", - "uvlock": true, + "model": "byg:block/skyris/button_inventory", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/skyris_button", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/skyris/button_inventory", + "x": 180 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/skyris_button", - "x": 180, + "face=floor,facing=west,powered=false": { + "model": "byg:block/skyris/button_inventory", "y": 270 }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/skyris/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=false": { - "model": "byg:block/skyris_button", + "model": "byg:block/skyris/button_inventory", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/skyris_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/skyris_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/skyris_button_pressed", + "face=floor,facing=east,powered=false": { + "model": "byg:block/skyris/button_inventory", "y": 90 }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/skyris_button_pressed", - "y": 270 + "face=wall,facing=east,powered=false": { + "model": "byg:block/skyris/button_inventory", + "x": 90, + "y": 90, + "uvlock": true }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/skyris_button_pressed", - "y": 180 + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/skyris/button_inventory", + "x": 180, + "y": 270 }, "face=floor,facing=north,powered=true": { - "model": "byg:block/skyris_button_pressed" + "model": "byg:block/skyris/button_pressed" }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/skyris_button_pressed", - "uvlock": true, + "face=wall,facing=north,powered=true": { + "model": "byg:block/skyris/button_pressed", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/skyris_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/skyris/button_pressed", + "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "byg:block/skyris_button_pressed", - "uvlock": true, + "model": "byg:block/skyris/button_pressed", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/skyris_button_pressed", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180 }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/skyris_button_pressed", - "x": 180, + "face=floor,facing=west,powered=true": { + "model": "byg:block/skyris/button_pressed", "y": 270 }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=true": { - "model": "byg:block/skyris_button_pressed", + "model": "byg:block/skyris/button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/skyris_button_pressed", - "x": 180 + "face=floor,facing=east,powered=true": { + "model": "byg:block/skyris/button_pressed", + "y": 90 }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/skyris_button_pressed", + "face=wall,facing=east,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/skyris/button_pressed", "x": 180, - "y": 180 + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_crafting_table.json new file mode 100644 index 0000000000..a865f82621 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_door.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json similarity index 60% rename from Common/src/main/resources/assets/byg/blockstates/skyris_door.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_door.json index 0d3fda6709..a0cfc20713 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door_top", + "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris_door_bottom", + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door_top", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris_door_bottom", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door_top", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door_top" + }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris_door_bottom", + "model": "byg:block/skyris/door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris_door_bottom_hinge", + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris_door_bottom_hinge", + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door_top_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris_door_bottom_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door_top_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris_door_bottom_hinge", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door_top_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris_door_bottom_hinge" + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door_top_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris_door_bottom", + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris_door_bottom", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris_door_top" + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door_bottom_hinge" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris_door_top", - "y": 90 + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door_top_hinge" }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris_door_top", + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door_top_hinge", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris_door_top", + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door_top_hinge", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris_door_top_hinge", + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door_top_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris_door_top_hinge", + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris_door_top_hinge", + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris_door_top_hinge", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door_bottom_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door_top", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris_door_top_hinge", - "y": 270 + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door_top" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris_door_top_hinge" + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door_top", + "y": 90 }, "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris_door_top", + "model": "byg:block/skyris/door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris_door_top" + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door_bottom", + "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris_door_top", + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door_bottom", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door_bottom", + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_fence.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json similarity index 71% rename from Common/src/main/resources/assets/byg/blockstates/skyris_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json index 7557c0ca9c..f00a980a51 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "byg:block/skyris_fence_post" + "model": "byg:block/skyris/fence_post" } }, { @@ -10,7 +10,7 @@ "north": "true" }, "apply": { - "model": "byg:block/skyris_fence", + "model": "byg:block/skyris/fence", "uvlock": true } }, @@ -19,7 +19,7 @@ "south": "true" }, "apply": { - "model": "byg:block/skyris_fence", + "model": "byg:block/skyris/fence", "y": 180, "uvlock": true } @@ -29,7 +29,7 @@ "west": "true" }, "apply": { - "model": "byg:block/skyris_fence", + "model": "byg:block/skyris/fence", "y": 270, "uvlock": true } @@ -39,7 +39,7 @@ "east": "true" }, "apply": { - "model": "byg:block/skyris_fence", + "model": "byg:block/skyris/fence", "y": 90, "uvlock": true } diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json new file mode 100644 index 0000000000..e86d6e02f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_leaves.json new file mode 100644 index 0000000000..b6ad521e7e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_log.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_log.json similarity index 52% rename from Common/src/main/resources/assets/byg/blockstates/skyris_log.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_log.json index f0e8f25c7a..289a8ef071 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_log.json @@ -1,17 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/skyris/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/skyris_log" + "model": "byg:block/skyris/log" }, "axis=z": { - "model": "byg:block/skyris_log", + "model": "byg:block/skyris/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/skyris_log", - "x": 90, - "y": 90 } } -} - +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_planks.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_planks.json new file mode 100644 index 0000000000..fd1d18fcae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_pressure_plate.json new file mode 100644 index 0000000000..ee0665ce12 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/skyris/pressure_plate" + }, + "powered=true": { + "model": "byg:block/skyris/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_sapling.json new file mode 100644 index 0000000000..750f4704c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json new file mode 100644 index 0000000000..71a53383dc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/skyris/slab_top" + }, + "type=bottom": { + "model": "byg:block/skyris/slab" + }, + "type=double": { + "model": "byg:block/skyris/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json similarity index 66% rename from Common/src/main/resources/assets/byg/blockstates/skyris_stairs.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json index 5a7ad50e57..52f290456a 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/skyris_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/skyris_stairs", - "y": 180, + "facing=north,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "x": 180, + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/skyris_stairs", + "facing=south,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/skyris_stairs", - "y": 270, + "facing=west,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "x": 180, + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner" + "facing=east,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "x": 180, + "uvlock": true }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", - "y": 180, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", - "y": 270, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "x": 180, "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "x": 180, "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/skyris_stairs", + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/skyris_stairs", - "x": 180, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/skyris_stairs", - "x": 180, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/skyris_stairs", - "x": 180, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", "x": 180, - "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", "x": 180, + "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", "x": 180, + "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", - "x": 180, - "y": 180, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", + "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", - "x": 180, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", "y": 90, "uvlock": true }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner" + }, "facing=north,half=top,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", + "model": "byg:block/skyris/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", "x": 180, - "y": 270, + "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/skyris_stairs_inner", - "x": 180, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "y": 90, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "y": 270, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", "x": 180, - "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", "x": 180, - "y": 90, + "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/skyris_stairs_inner", + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", + "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/skyris_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", + "model": "byg:block/skyris/stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/skyris_stairs_outer", + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", "y": 180, "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json similarity index 55% rename from Common/src/main/resources/assets/byg/blockstates/skyris_trapdoor.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json index f53cc4c287..b40f19761d 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json @@ -1,69 +1,68 @@ { "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/skyris_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/skyris_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/skyris_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/skyris_trapdoor_bottom", - "y": 270 - }, "facing=north,half=top,open=false": { - "model": "byg:block/skyris_trapdoor_top" + "model": "byg:block/skyris/trapdoor_top" }, "facing=south,half=top,open=false": { - "model": "byg:block/skyris_trapdoor_top", + "model": "byg:block/skyris/trapdoor_top", "y": 180 }, - "facing=east,half=top,open=false": { - "model": "byg:block/skyris_trapdoor_top", - "y": 90 - }, "facing=west,half=top,open=false": { - "model": "byg:block/skyris_trapdoor_top", + "model": "byg:block/skyris/trapdoor_top", "y": 270 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/skyris_trapdoor_open" + "facing=east,half=top,open=false": { + "model": "byg:block/skyris/trapdoor_top", + "y": 90 }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/skyris_trapdoor_open", - "y": 180 + "facing=north,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom" }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/skyris_trapdoor_open", - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", + "y": 180 }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/skyris_trapdoor_open", + "facing=west,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", "y": 270 }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", + "y": 90 + }, "facing=north,half=top,open=true": { - "model": "byg:block/skyris_trapdoor_open", + "model": "byg:block/skyris/trapdoor_open", "x": 180, "y": 180 }, "facing=south,half=top,open=true": { - "model": "byg:block/skyris_trapdoor_open", + "model": "byg:block/skyris/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/skyris/trapdoor_open", "x": 180, - "y": 0 + "y": 90 }, "facing=east,half=top,open=true": { - "model": "byg:block/skyris_trapdoor_open", + "model": "byg:block/skyris/trapdoor_open", "x": 180, "y": 270 }, - "facing=west,half=top,open=true": { - "model": "byg:block/skyris_trapdoor_open", - "x": 180, + "facing=north,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open", "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_wood.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_wood.json similarity index 52% rename from Common/src/main/resources/assets/byg/blockstates/skyris_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/skyris_wood.json index 35a3c8486d..6b0c1ec6e2 100644 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_wood.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_wood.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/skyris/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/skyris_wood" + "model": "byg:block/skyris/wood" }, "axis=z": { - "model": "byg:block/skyris_wood", + "model": "byg:block/skyris/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/skyris_wood", - "x": 90, - "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_log.json new file mode 100644 index 0000000000..c7c528f68c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/skyris/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/skyris/stripped_log" + }, + "axis=z": { + "model": "byg:block/skyris/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_wood.json new file mode 100644 index 0000000000..f5989b7354 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_skyris_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/skyris/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/skyris/stripped_wood" + }, + "axis=z": { + "model": "byg:block/skyris/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json new file mode 100644 index 0000000000..c2090dcc59 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/skyris/planks", + "up": "byg:block/skyris/planks", + "north": "byg:block/skyris/bookshelf", + "south": "byg:block/skyris/bookshelf", + "east": "byg:block/skyris/bookshelf", + "west": "byg:block/skyris/bookshelf", + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/button.json b/Common/src/generated/resources/assets/byg/models/block/skyris/button.json new file mode 100644 index 0000000000..0dc0e8c541 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/skyris/button_inventory.json new file mode 100644 index 0000000000..59a95ed8a6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/skyris/button_pressed.json new file mode 100644 index 0000000000..c9d698f58a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json new file mode 100644 index 0000000000..2b303bebdc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/skyris/planks", + "up": "byg:block/skyris/crafting_table_top", + "north": "byg:block/skyris/crafting_table_front", + "south": "byg:block/skyris/crafting_table_side", + "east": "byg:block/skyris/crafting_table_side", + "west": "byg:block/skyris/crafting_table_front", + "particle": "byg:block/skyris/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json new file mode 100644 index 0000000000..db00107811 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json new file mode 100644 index 0000000000..bca6f16da3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json new file mode 100644 index 0000000000..ba90161c16 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json new file mode 100644 index 0000000000..e6cdd0017d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json new file mode 100644 index 0000000000..c9f1dba861 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/skyris/planks", + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate.json new file mode 100644 index 0000000000..3773ad905a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_open.json new file mode 100644 index 0000000000..b3397a7ca1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall.json new file mode 100644 index 0000000000..6d359b4f8e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall_open.json new file mode 100644 index 0000000000..39b348b0cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json new file mode 100644 index 0000000000..af73b203bc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/skyris/planks", + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json new file mode 100644 index 0000000000..861c478d3a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/skyris/planks", + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/skyris/grower_item.json new file mode 100644 index 0000000000..7382351af0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/skyris/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json new file mode 100644 index 0000000000..fbcce3ad66 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/skyris/leaves", + "up": "byg:block/skyris/leaves", + "north": "byg:block/skyris/leaves", + "south": "byg:block/skyris/leaves", + "east": "byg:block/skyris/leaves", + "west": "byg:block/skyris/leaves", + "particle": "byg:block/skyris/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json new file mode 100644 index 0000000000..8ea7521946 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/skyris/leaves_snowy", + "up": "byg:block/skyris/leaves_snowy", + "north": "byg:block/skyris/leaves_snowy_side", + "south": "byg:block/skyris/leaves_snowy_side", + "east": "byg:block/skyris/leaves_snowy_side", + "west": "byg:block/skyris/leaves_snowy_side", + "particle": "byg:block/skyris/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/log.json b/Common/src/generated/resources/assets/byg/models/block/skyris/log.json new file mode 100644 index 0000000000..c544f711ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/skyris/log", + "end": "byg:block/skyris/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json b/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json new file mode 100644 index 0000000000..6c748841ac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/skyris/planks", + "up": "byg:block/skyris/planks", + "north": "byg:block/skyris/planks", + "south": "byg:block/skyris/planks", + "east": "byg:block/skyris/planks", + "west": "byg:block/skyris/planks", + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_skyris_sapling.json b/Common/src/generated/resources/assets/byg/models/block/skyris/potted_grower_item.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/potted_skyris_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/skyris/potted_grower_item.json index 245df5b258..f506ab534f 100644 --- a/Common/src/main/resources/assets/byg/models/block/potted_skyris_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/potted_grower_item.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "byg:block/skyris_sapling" + "plant": "byg:block/skyris/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate.json new file mode 100644 index 0000000000..0f00312222 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate_down.json new file mode 100644 index 0000000000..eb9ff29799 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json b/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json new file mode 100644 index 0000000000..c5753bed4f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/skyris/planks", + "bottom": "byg:block/skyris/planks", + "top": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json new file mode 100644 index 0000000000..915aa4f17d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/skyris/planks", + "bottom": "byg:block/skyris/planks", + "top": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json new file mode 100644 index 0000000000..824150b6ff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/skyris/planks", + "bottom": "byg:block/skyris/planks", + "top": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json new file mode 100644 index 0000000000..efe6964eae --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/skyris/planks", + "bottom": "byg:block/skyris/planks", + "top": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json new file mode 100644 index 0000000000..9405fd47b1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/skyris/planks", + "bottom": "byg:block/skyris/planks", + "top": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json new file mode 100644 index 0000000000..218bfe6512 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/skyris/stripped_log", + "end": "byg:block/skyris/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_wood.json new file mode 100644 index 0000000000..102ae34979 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/skyris/stripped_log", + "particle": "byg:block/skyris/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_bottom.json new file mode 100644 index 0000000000..da0342eb3e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/skyris/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_open.json new file mode 100644 index 0000000000..fa6cbf9ded --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/skyris/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_top.json new file mode 100644 index 0000000000..aba3d4bf58 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/skyris/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/wood.json b/Common/src/generated/resources/assets/byg/models/block/skyris/wood.json new file mode 100644 index 0000000000..cf97f01963 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/skyris/log", + "particle": "byg:block/skyris/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_boat.json b/Common/src/generated/resources/assets/byg/models/item/skyris_boat.json new file mode 100644 index 0000000000..44a6f124ef --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/skyris/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json new file mode 100644 index 0000000000..2f0d487b64 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_button.json b/Common/src/generated/resources/assets/byg/models/item/skyris_button.json new file mode 100644 index 0000000000..8d1802b883 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json new file mode 100644 index 0000000000..b7168ca0ce --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_door.json b/Common/src/generated/resources/assets/byg/models/item/skyris_door.json new file mode 100644 index 0000000000..9fee5ca36c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/skyris/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json b/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json new file mode 100644 index 0000000000..50d8d1f396 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/fence_inv", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json new file mode 100644 index 0000000000..5e5104bae7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json b/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json new file mode 100644 index 0000000000..12005777e6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_log.json b/Common/src/generated/resources/assets/byg/models/item/skyris_log.json new file mode 100644 index 0000000000..31d1239ff9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json b/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json new file mode 100644 index 0000000000..23e5e8168a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json new file mode 100644 index 0000000000..7d9ce4d210 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_sapling.json b/Common/src/generated/resources/assets/byg/models/item/skyris_sapling.json new file mode 100644 index 0000000000..72d1c795cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/skyris/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json b/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json new file mode 100644 index 0000000000..d804856962 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json b/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json new file mode 100644 index 0000000000..92f562d855 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json new file mode 100644 index 0000000000..8266909237 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json b/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json new file mode 100644 index 0000000000..b49d9df8e3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json new file mode 100644 index 0000000000..9efdb9f34f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json new file mode 100644 index 0000000000..52ed670c3b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/skyris/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json new file mode 100644 index 0000000000..db63c34b7e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json new file mode 100644 index 0000000000..09a198146d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json new file mode 100644 index 0000000000..005606ec03 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json new file mode 100644 index 0000000000..e722ce814c --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json new file mode 100644 index 0000000000..ac769606ba --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json new file mode 100644 index 0000000000..7092d6f07b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json new file mode 100644 index 0000000000..ef9952ec5e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json new file mode 100644 index 0000000000..9b760b337f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/skyris_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json new file mode 100644 index 0000000000..a26d9a66d6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json new file mode 100644 index 0000000000..59bd4e37bd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json new file mode 100644 index 0000000000..f3acb97d68 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json new file mode 100644 index 0000000000..f4fe5d28a6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json new file mode 100644 index 0000000000..4b8ebdd290 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/skyris_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/skyris_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json index cbcb4d66c1..31bd13e86c 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/skyris_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json index 1480fdfb87..b7edc4207a 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_button.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/skyris_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/button.json diff --git a/Common/src/main/resources/data/byg/recipes/skyris_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/skyris_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json index 0704c18c46..b526765bde 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_door.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/skyris_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json index 8399dc6694..a94125f266 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/skyris_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/skyris_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/skyris_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/skyris_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/skyris_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json index f2ceea0e50..c2eab9ca2b 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:skyris_logs" + "tag": "byg:wood/skyris_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/skyris_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/skyris_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json index 3315ad93d8..474ce3ffd7 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/skyris_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json index 4316a35256..40900770f4 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/skyris_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json index c83779b8be..5ada32cde5 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, "result": { - "item": "byg:skyris_stairs", + "item": "byg:skyris_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/skyris_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/skyris_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json index 464c31a2f9..512dd8f131 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/skyris_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/skyris_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json index 085b533f4b..bb867afee5 100644 --- a/Common/src/main/resources/data/byg/recipes/skyris_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:skyris_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json new file mode 100644 index 0000000000..4a763046ba --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:skyris_log", + "byg:skyris_wood", + "byg:stripped_skyris_log", + "byg:stripped_skyris_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json new file mode 100644 index 0000000000..7528cd4f86 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:skyris_log", + "byg:stripped_skyris_log", + "byg:skyris_wood", + "byg:stripped_skyris_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 0120e81be7..e78a383794 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -17,13 +17,13 @@ public static void renderTypes(Consumer> mapConsumer) { for (BYGWoodTypes type : BYGWoodTypes.values()) { final var renderType = switch (type) { - case ASPEN -> RenderType.translucent(); + case ASPEN, SKYRIS -> RenderType.translucent(); default -> RenderType.cutoutMipped(); }; map.put(type.door().get(), renderType); map.put(type.trapdoor().get(), renderType); if (type.growerItem() != null) - map.put(type.growerItem().get(), renderType); + map.put(type.growerItem().get(), RenderType.cutoutMipped()); } map.put(BYGBlocks.WITCH_HAZEL_BLOSSOM.get(), RenderType.cutoutMipped()); @@ -137,13 +137,11 @@ public static void renderTypes(Consumer> mapConsumer) { //Doors map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.SKYRIS_DOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.SKYRIS_TRAPDOOR.get(), RenderType.translucent()); map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); //Grass @@ -180,7 +178,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.RED_OAK_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.RED_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.SILVER_MAPLE_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.SKYRIS_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WHITE_CHERRY_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.YELLOW_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.YELLOW_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index 62b447c663..db62c7bc1c 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -44,7 +44,6 @@ public static void compostablesBYG() { compostibleBlocks(0.6f, BYGItems.RIPE_ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.SILVER_MAPLE_LEAVES.get()); compostibleBlocks(0.6f, BYGItems.SKYRIS_LEAVES_GREEN_APPLE.get()); - compostibleBlocks(0.3f, BYGItems.SKYRIS_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.WHITE_CHERRY_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_LEAVES.get()); @@ -73,7 +72,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.RED_MAPLE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_OAK_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.SILVER_MAPLE_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.SKYRIS_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.WHITE_CHERRY_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 9f15ae7911..10df04f56d 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -47,7 +47,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_SKYRIS_LOG.get(), 5, 5); //Wood flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); @@ -58,32 +57,26 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_SKYRIS_WOOD.get(), 5, 5); //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.SKYRIS_BOOKSHELF.get(), 5, 20); //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.SKYRIS_SLAB.get(), 5, 20); //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.SKYRIS_STAIRS.get(), 5, 20); //Planks flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.SKYRIS_PLANKS.get(), 5, 20); //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); flammableBlock(BYGBlocks.MAPLE_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.SKYRIS_FENCE.get(), 5, 20); //Leaves flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); @@ -106,7 +99,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.MAPLE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.RED_MAPLE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.get(), 30, 60); - flammableBlock(BYGBlocks.SKYRIS_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.WHITE_CHERRY_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.YELLOW_SPRUCE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index dfb797777b..3d8c88c8ee 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -27,7 +27,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); - stripables.put(BYGBlocks.SKYRIS_LOG.get(), BYGBlocks.STRIPPED_SKYRIS_LOG.get()); stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); @@ -35,7 +34,6 @@ public static void strippableLogsBYG() { stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); - stripables.put(BYGBlocks.SKYRIS_WOOD.get(), BYGBlocks.STRIPPED_SKYRIS_WOOD.get()); stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 1e9f6449f4..9b3f43d4cd 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -64,67 +64,54 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); - public static final BlockRegistryObject SKYRIS_PLANKS = createPlanks("skyris_planks"); public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); - public static final BlockRegistryObject SKYRIS_BOOKSHELF = createBookshelf("skyris_bookshelf"); public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); - public static final BlockRegistryObject SKYRIS_DOOR = createDoor("skyris_door"); public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); - public static final BlockRegistryObject SKYRIS_PRESSURE_PLATE = createWoodPressurePlate("skyris_pressure_plate"); public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); - public static final BlockRegistryObject SKYRIS_BUTTON = createWoodButton("skyris_button"); public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); - public static final BlockRegistryObject SKYRIS_TRAPDOOR = createTrapDoor("skyris_trapdoor"); public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); - public static final BlockRegistryObject SKYRIS_CRAFTING_TABLE = createCraftingTable("skyris_crafting_table"); public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); - public static final BlockRegistryObject SKYRIS_FENCE_GATE = createFenceGate("skyris_fence_gate"); public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); - public static final BlockRegistryObject SKYRIS_SLAB = createWoodSlab("skyris_slab"); public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); - public static final BlockRegistryObject SKYRIS_STAIRS = createWoodStairs("skyris_stairs"); public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); - public static final BlockRegistryObject SKYRIS_FENCE = createFence("skyris_fence"); public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject SKYRIS_WALL_SIGN = createWallSign("skyris_wall_sign", BYGWoodType.SKYRIS, SKYRIS_PLANKS); public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -160,7 +147,6 @@ public class BYGBlocks { public static final BlockRegistryObject RED_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_RED_OAK_SAPLING, "red_oak_sapling"); public static final BlockRegistryObject RED_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_RED_SPRUCE_SAPLING, "red_spruce_sapling"); public static final BlockRegistryObject SILVER_MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_SILVER_MAPLE_SAPLING, "silver_maple_sapling"); - public static final BlockRegistryObject SKYRIS_SAPLING = createSapling(BYGBlockTags.GROUND_SKYRIS_SAPLING, "skyris_sapling"); public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); @@ -203,7 +189,6 @@ public class BYGBlocks { public static final BlockRegistryObject RIPE_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ripe_orchard_leaves"); public static final BlockRegistryObject SILVER_MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "silver_maple_leaves"); public static final BlockRegistryObject SKYRIS_LEAVES_GREEN_APPLE = createLeaves(MaterialColor.COLOR_PINK, "green_apple_skyris_leaves"); - public static final BlockRegistryObject SKYRIS_LEAVES = createLeaves(MaterialColor.COLOR_PINK, "skyris_leaves"); public static final BlockRegistryObject WHITE_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "white_cherry_leaves"); public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); @@ -493,7 +478,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); - public static final BlockRegistryObject SKYRIS_LOG = createLog("skyris_log"); public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); @@ -503,7 +487,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); - public static final BlockRegistryObject SKYRIS_WOOD = createWood("skyris_wood"); public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); @@ -635,13 +618,11 @@ public class BYGBlocks { public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); - public static final BlockRegistryObject STRIPPED_SKYRIS_LOG = createStrippedLog("stripped_skyris_log"); public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); - public static final BlockRegistryObject STRIPPED_SKYRIS_WOOD = createWood("stripped_skyris_wood"); public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); public static final BlockRegistryObject TALL_ALLIUM = createTallFlower("tall_allium", BYGBlockTags.GROUND_TALL_ALLIUM); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 3931433af6..27bec8b910 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -133,13 +133,14 @@ public enum BYGWoodTypes { .nether()), NIGHTSHADE("nightshade", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_NIGHTSHADE_SAPLING) - .materialColor(MaterialColor.COLOR_ORANGE)); + .materialColor(MaterialColor.COLOR_ORANGE)), + SKYRIS("skyris", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_SKYRIS_SAPLING) + .materialColor(MaterialColor.COLOR_PINK) + .boatType(BYGBoatEntity.BYGType.SKYRIS)); - public static final Map LOOKUP; - static { - LOOKUP = Arrays.stream(values()) - .collect(Collectors.toUnmodifiableMap(BYGWoodTypes::toString, Function.identity())); - } + public static final Map LOOKUP = Arrays.stream(values()) + .collect(Collectors.toUnmodifiableMap(BYGWoodTypes::toString, Function.identity()));; private final String name; private final WoodType woodType; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 9752dd1320..7c575ef717 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -54,7 +54,6 @@ public Item getDropItem() { default -> BYGWoodTypes.ASPEN.boat().get(); case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); case MAPLE -> BYGItems.MAPLE_BOAT.get(); - case SKYRIS -> BYGItems.SKYRIS_BOAT.get(); }; } @@ -66,7 +65,6 @@ public Block getPlanks() { default -> BYGWoodTypes.ASPEN.planks().get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); - case SKYRIS -> BYGBlocks.SKYRIS_PLANKS.get(); }; } diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index 7cb5844300..db1e8eded5 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -367,38 +367,19 @@ public class BYGItems { public static final RegistryObject IMBUED_NIGHTSHADE_LOG; //Palo Verde Woodtype - public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); - public static final RegistryObject PALO_VERDE_SAPLING = createSaplingItem(BYGBlocks.PALO_VERDE_SAPLING); - public static final RegistryObject PALO_VERDE_LEAVES = createItem(BYGBlocks.PALO_VERDE_LEAVES); - public static final RegistryObject PALO_VERDE_LOG = createItem(BYGBlocks.PALO_VERDE_LOG); - public static final RegistryObject PALO_VERDE_WOOD = createItem(BYGBlocks.PALO_VERDE_WOOD); - public static final RegistryObject STRIPPED_PALO_VERDE_LOG = createItem(BYGBlocks.STRIPPED_PALO_VERDE_LOG); - public static final RegistryObject STRIPPED_PALO_VERDE_WOOD = createItem(BYGBlocks.STRIPPED_PALO_VERDE_WOOD); + public static final RegistryObject FLOWERING_PALO_VERDE_LEAVES; + public static final RegistryObject PALO_VERDE_SAPLING; + public static final RegistryObject PALO_VERDE_LEAVES; + public static final RegistryObject PALO_VERDE_LOG; + public static final RegistryObject PALO_VERDE_WOOD; + public static final RegistryObject STRIPPED_PALO_VERDE_LOG; + public static final RegistryObject STRIPPED_PALO_VERDE_WOOD; //Skyris Woodtype - public static final RegistryObject SKYRIS_LEAVES_GREEN_APPLE = createItem(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE); - public static final RegistryObject GREEN_APPLE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.35f).build())), "green_apple"); - public static final RegistryObject GREEN_APPLE_PIE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.4f).effect(new MobEffectInstance(MobEffects.DIG_SPEED, 200, 0), 1.0F).build())), "green_apple_pie"); - public static final RegistryObject SKYRIS_SAPLING = createSaplingItem(BYGBlocks.SKYRIS_SAPLING); - public static final RegistryObject SKYRIS_VINE = createItem(BYGBlocks.SKYRIS_VINE); - public static final RegistryObject SKYRIS_LEAVES = createItem(BYGBlocks.SKYRIS_LEAVES); - public static final RegistryObject SKYRIS_LOG = createItem(BYGBlocks.SKYRIS_LOG); - public static final RegistryObject SKYRIS_WOOD = createItem(BYGBlocks.SKYRIS_WOOD); - public static final RegistryObject STRIPPED_SKYRIS_LOG = createItem(BYGBlocks.STRIPPED_SKYRIS_LOG); - public static final RegistryObject STRIPPED_SKYRIS_WOOD = createItem(BYGBlocks.STRIPPED_SKYRIS_WOOD); - public static final RegistryObject SKYRIS_PLANKS = createItem(BYGBlocks.SKYRIS_PLANKS); - public static final RegistryObject SKYRIS_BOOKSHELF = createItem(BYGBlocks.SKYRIS_BOOKSHELF); - public static final RegistryObject SKYRIS_CRAFTING_TABLE = createItem(BYGBlocks.SKYRIS_CRAFTING_TABLE); - public static final RegistryObject SKYRIS_STAIRS = createItem(BYGBlocks.SKYRIS_STAIRS); - public static final RegistryObject SKYRIS_SLAB = createItem(BYGBlocks.SKYRIS_SLAB); - public static final RegistryObject SKYRIS_FENCE = createItem(BYGBlocks.SKYRIS_FENCE); - public static final RegistryObject SKYRIS_FENCE_GATE = createItem(BYGBlocks.SKYRIS_FENCE_GATE); - public static final RegistryObject SKYRIS_DOOR = createItem(BYGBlocks.SKYRIS_DOOR); - public static final RegistryObject SKYRIS_TRAPDOOR = createItem(BYGBlocks.SKYRIS_TRAPDOOR); - public static final RegistryObject SKYRIS_PRESSURE_PLATE = createItem(BYGBlocks.SKYRIS_PRESSURE_PLATE); - public static final RegistryObject SKYRIS_BUTTON = createItem(BYGBlocks.SKYRIS_BUTTON); - public static final RegistryObject SKYRIS_SIGN = createSign("skyris_sign", BYGBlocks.SKYRIS_SIGN, BYGBlocks.SKYRIS_WALL_SIGN); - public static final RegistryObject SKYRIS_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.SKYRIS, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "skyris_boat"); + public static final RegistryObject SKYRIS_LEAVES_GREEN_APPLE; + public static final RegistryObject GREEN_APPLE; + public static final RegistryObject GREEN_APPLE_PIE; + public static final RegistryObject SKYRIS_VINE; //Witch-Hazel Woodtype public static final RegistryObject WITCH_HAZEL_BLOSSOM; @@ -406,10 +387,10 @@ public class BYGItems { public static final RegistryObject BLOOMING_WITCH_HAZEL_LEAVES; //Embur Woodtype - public static final RegistryObject EMBUR_GEL_BALL = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), "embur_gel_ball"); - public static final RegistryObject EMBUR_GEL_BLOCK = createItem(BYGBlocks.EMBUR_GEL_BLOCK); - public static final RegistryObject EMBUR_GEL_BRANCH = createItem(BYGBlocks.EMBUR_GEL_BRANCH); - public static final RegistryObject EMBUR_GEL_VINES = createItem(BYGBlocks.EMBUR_GEL_VINES); + public static final RegistryObject EMBUR_GEL_BALL; + public static final RegistryObject EMBUR_GEL_BLOCK; + public static final RegistryObject EMBUR_GEL_BRANCH; + public static final RegistryObject EMBUR_GEL_VINES; static { BYGWoodTypes.ASPEN.init(); @@ -468,11 +449,25 @@ public class BYGItems { BYGWoodTypes.NIGHTSHADE.init(); BYGWoodTypes.PALM.init(); - // TODO palo verde + + FLOWERING_PALO_VERDE_LEAVES = createItem(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES); + PALO_VERDE_SAPLING = createSaplingItem(BYGBlocks.PALO_VERDE_SAPLING); + PALO_VERDE_LEAVES = createItem(BYGBlocks.PALO_VERDE_LEAVES); + PALO_VERDE_LOG = createItem(BYGBlocks.PALO_VERDE_LOG); + PALO_VERDE_WOOD = createItem(BYGBlocks.PALO_VERDE_WOOD); + STRIPPED_PALO_VERDE_LOG = createItem(BYGBlocks.STRIPPED_PALO_VERDE_LOG); + STRIPPED_PALO_VERDE_WOOD = createItem(BYGBlocks.STRIPPED_PALO_VERDE_WOOD); + BYGWoodTypes.PINE.init(); BYGWoodTypes.RAINBOW_EUCALYPTUS.init(); BYGWoodTypes.REDWOOD.init(); - // TODO skyris + + SKYRIS_LEAVES_GREEN_APPLE = createItem(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE); + GREEN_APPLE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(4).saturationMod(0.35f).build())), "green_apple"); + GREEN_APPLE_PIE = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB).food(new FoodProperties.Builder().nutrition(6).saturationMod(0.4f).effect(new MobEffectInstance(MobEffects.DIG_SPEED, 200, 0), 1.0F).build())), "green_apple_pie"); + SKYRIS_VINE = createItem(BYGBlocks.SKYRIS_VINE); + BYGWoodTypes.SKYRIS.init(); + BYGWoodTypes.WILLOW.init(); WITCH_HAZEL_BLOSSOM = createItem(BYGBlocks.WITCH_HAZEL_BLOSSOM); @@ -483,7 +478,12 @@ public class BYGItems { BYGWoodTypes.ZELKOVA.init(); createItem(BYGBlocks.SYTHIAN_SAPLING); BYGWoodTypes.SYTHIAN.init(); + BYGWoodTypes.EMBUR.init(); + EMBUR_GEL_BALL = createItem(() -> new Item(new Properties().tab(BYGCreativeTab.CREATIVE_TAB)), "embur_gel_ball"); + EMBUR_GEL_BLOCK = createItem(BYGBlocks.EMBUR_GEL_BLOCK); + EMBUR_GEL_BRANCH = createItem(BYGBlocks.EMBUR_GEL_BRANCH); + EMBUR_GEL_VINES = createItem(BYGBlocks.EMBUR_GEL_VINES); } //SaplingItems diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 2b0bf37db0..b89606fcaf 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -1467,10 +1467,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> SKYRIS_TREE1 = createConfiguredFeature("skyris_tree1", BYGFeatures.SKYRIS_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.SKYRIS_LOG.get()) + .setTrunkBlock(SKYRIS.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.defaultBlockState(), 1) - .add(BYGBlocks.SKYRIS_LEAVES.defaultBlockState(), 8)) + .add(SKYRIS.leaves().defaultBlockState(), 8)) ) .setMaxHeight(9) .setMinHeight(6) @@ -1479,10 +1479,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> SKYRIS_TREE2 = createConfiguredFeature("skyris_tree2", BYGFeatures.SKYRIS_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.SKYRIS_LOG.get()) + .setTrunkBlock(SKYRIS.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.defaultBlockState(), 1) - .add(BYGBlocks.SKYRIS_LEAVES.defaultBlockState(), 8)) + .add(SKYRIS.leaves().defaultBlockState(), 8)) ) .setMaxHeight(6) .setMinHeight(3) @@ -1491,10 +1491,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> SKYRIS_TREE3 = createConfiguredFeature("skyris_tree3", BYGFeatures.SKYRIS_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.SKYRIS_LOG.get()) + .setTrunkBlock(SKYRIS.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.defaultBlockState(), 1) - .add(BYGBlocks.SKYRIS_LEAVES.defaultBlockState(), 8)) + .add(SKYRIS.leaves().defaultBlockState(), 8)) ) .setMaxHeight(8) .setMinHeight(6) @@ -1503,10 +1503,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> SKYRIS_TREE4 = createConfiguredFeature("skyris_tree4", BYGFeatures.SKYRIS_TREE4, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.SKYRIS_LOG.get()) + .setTrunkBlock(SKYRIS.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.defaultBlockState(), 1) - .add(BYGBlocks.SKYRIS_LEAVES.defaultBlockState(), 8)) + .add(SKYRIS.leaves().defaultBlockState(), 8)) ) .setMaxHeight(8) .setMinHeight(6) @@ -1515,10 +1515,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> SKYRIS_TREE5 = createConfiguredFeature("skyris_tree5", BYGFeatures.SKYRIS_TREE5, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.SKYRIS_LOG.get()) + .setTrunkBlock(SKYRIS.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.defaultBlockState(), 1) - .add(BYGBlocks.SKYRIS_LEAVES.defaultBlockState(), 8)) + .add(SKYRIS.leaves().defaultBlockState(), 8)) ) .setMaxHeight(8) .setMinHeight(6) diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/skyris_bookshelf.json deleted file mode 100644 index 9160fcbf91..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/skyris_crafting_table.json deleted file mode 100644 index 2ca38c0c1e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/skyris_fence_gate.json deleted file mode 100644 index 2b9d3e2fce..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/skyris_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/skyris_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/skyris_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/skyris_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/skyris_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/skyris_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/skyris_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/skyris_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/skyris_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/skyris_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/skyris_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/skyris_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/skyris_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/skyris_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/skyris_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/skyris_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_leaves.json b/Common/src/main/resources/assets/byg/blockstates/skyris_leaves.json deleted file mode 100644 index d1f496f778..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_planks.json b/Common/src/main/resources/assets/byg/blockstates/skyris_planks.json deleted file mode 100644 index b82b15662e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/skyris_pressure_plate.json deleted file mode 100644 index 80e4142341..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/skyris_pressure_plate" - }, - "powered=true": { - "model": "byg:block/skyris_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_sapling.json b/Common/src/main/resources/assets/byg/blockstates/skyris_sapling.json deleted file mode 100644 index 963f93ff65..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_slab.json b/Common/src/main/resources/assets/byg/blockstates/skyris_slab.json deleted file mode 100644 index 8d3a52731b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/skyris_slab" - }, - "type=top": { - "model": "byg:block/skyris_slab_top" - }, - "type=double": { - "model": "byg:block/skyris_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_log.json deleted file mode 100644 index 876f9813b3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_skyris_log" - }, - "axis=z": { - "model": "byg:block/stripped_skyris_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_skyris_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_wood.json deleted file mode 100644 index 56a35bf083..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_skyris_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_skyris_wood" - }, - "axis=z": { - "model": "byg:block/stripped_skyris_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_skyris_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/skyris_bookshelf.json deleted file mode 100644 index 9797c1dd76..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/skyris_planks", - "up": "byg:block/skyris_planks", - "north": "byg:block/skyris_bookshelf", - "east": "byg:block/skyris_bookshelf", - "south": "byg:block/skyris_bookshelf", - "west": "byg:block/skyris_bookshelf", - "particle": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_button.json b/Common/src/main/resources/assets/byg/models/block/skyris_button.json deleted file mode 100644 index 88c6fbe4e5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/skyris_button_inventory.json deleted file mode 100644 index af2f336f7e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/skyris_button_pressed.json deleted file mode 100644 index 1521c722e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/skyris_crafting_table.json deleted file mode 100644 index a0e530ab17..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/skyris_crafting_table_front", - "down": "byg:block/skyris_planks", - "up": "byg:block/skyris_crafting_table_top", - "north": "byg:block/skyris_crafting_table_front", - "east": "byg:block/skyris_crafting_table_side", - "south": "byg:block/skyris_crafting_table_side", - "west": "byg:block/skyris_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom.json deleted file mode 100644 index 51c289c131..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/skyris_door_bottom", - "top": "byg:block/skyris_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom_hinge.json deleted file mode 100644 index c5ffc7fa85..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/skyris_door_bottom", - "top": "byg:block/skyris_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_door_top.json b/Common/src/main/resources/assets/byg/models/block/skyris_door_top.json deleted file mode 100644 index 3328e83015..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/skyris_door_bottom", - "top": "byg:block/skyris_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/skyris_door_top_hinge.json deleted file mode 100644 index aea712db9c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/skyris_door_bottom", - "top": "byg:block/skyris_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence.json deleted file mode 100644 index 0931d904c3..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/skyris_planks", - "particle": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate.json deleted file mode 100644 index 0203bad65d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_open.json deleted file mode 100644 index 6f5eea6810..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall.json deleted file mode 100644 index 5d2609fc56..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall_open.json deleted file mode 100644 index 82a26e7d10..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_inventory.json deleted file mode 100644 index 4e59c5c2b1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/skyris_planks", - "particle": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_fence_post.json b/Common/src/main/resources/assets/byg/models/block/skyris_fence_post.json deleted file mode 100644 index 37e9c37b43..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/skyris_planks", - "particle": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_leaves.json b/Common/src/main/resources/assets/byg/models/block/skyris_leaves.json deleted file mode 100644 index a6846178f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/skyris_leaves", - "particle": "byg:block/skyris_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/skyris_leaves_snowy.json deleted file mode 100644 index f334d84ddb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/skyris_leaves_snowy", - "up": "byg:block/skyris_leaves_snowy", - "north": "byg:block/skyris_leaves_snowy_side", - "east": "byg:block/skyris_leaves_snowy_side", - "south": "byg:block/skyris_leaves_snowy_side", - "west": "byg:block/skyris_leaves_snowy_side", - "particle": "byg:block/skyris_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_log.json b/Common/src/main/resources/assets/byg/models/block/skyris_log.json deleted file mode 100644 index e3c9484b6b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/skyris_log_top", - "side": "byg:block/skyris_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_planks.json b/Common/src/main/resources/assets/byg/models/block/skyris_planks.json deleted file mode 100644 index d7f667768e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/skyris_planks", - "particle": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate.json deleted file mode 100644 index 8fcbe70937..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate_down.json deleted file mode 100644 index 16284ab891..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_sapling.json b/Common/src/main/resources/assets/byg/models/block/skyris_sapling.json deleted file mode 100644 index e8110b50a7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/skyris_sapling", - "particle": "byg:block/skyris_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_slab.json b/Common/src/main/resources/assets/byg/models/block/skyris_slab.json deleted file mode 100644 index 6259a4a43f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/skyris_planks", - "top": "byg:block/skyris_planks", - "side": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_slab_top.json b/Common/src/main/resources/assets/byg/models/block/skyris_slab_top.json deleted file mode 100644 index 2607a36581..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/skyris_planks", - "top": "byg:block/skyris_planks", - "side": "byg:block/skyris_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_stairs.json b/Common/src/main/resources/assets/byg/models/block/skyris_stairs.json deleted file mode 100644 index 8ff7f948d0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/skyris_planks", - "top": "byg:block/skyris_planks", - "side": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/skyris_stairs_inner.json deleted file mode 100644 index 0c6601f96d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/skyris_planks", - "top": "byg:block/skyris_planks", - "side": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/skyris_stairs_outer.json deleted file mode 100644 index 111d90f4fb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/skyris_planks", - "top": "byg:block/skyris_planks", - "side": "byg:block/skyris_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_bottom.json deleted file mode 100644 index b7b5886ea4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/skyris_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_open.json deleted file mode 100644 index b0c4412b47..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/skyris_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_top.json deleted file mode 100644 index 6f0812f954..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/skyris_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/skyris_wood.json b/Common/src/main/resources/assets/byg/models/block/skyris_wood.json deleted file mode 100644 index 0385a76a1c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/skyris_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/skyris_log", - "particle": "byg:block/skyris_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_skyris_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_skyris_log.json deleted file mode 100644 index b848464a55..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_skyris_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_skyris_log_top", - "up": "byg:block/stripped_skyris_log_top", - "north": "byg:block/stripped_skyris_log", - "east": "byg:block/stripped_skyris_log", - "south": "byg:block/stripped_skyris_log", - "west": "byg:block/stripped_skyris_log", - "particle": "byg:block/stripped_skyris_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_skyris_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_skyris_wood.json deleted file mode 100644 index 4597826c8c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_skyris_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_skyris_log", - "particle": "byg:block/stripped_skyris_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_boat.json b/Common/src/main/resources/assets/byg/models/item/skyris_boat.json deleted file mode 100644 index 60ad947047..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/skyris_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/skyris_bookshelf.json deleted file mode 100644 index b2d0f86099..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_button.json b/Common/src/main/resources/assets/byg/models/item/skyris_button.json deleted file mode 100644 index 0fc6630889..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/skyris_crafting_table.json deleted file mode 100644 index 6fec6f931e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_door.json b/Common/src/main/resources/assets/byg/models/item/skyris_door.json deleted file mode 100644 index 3d67cf43d1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/skyris_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_fence.json b/Common/src/main/resources/assets/byg/models/item/skyris_fence.json deleted file mode 100644 index 40be48a622..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/skyris_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/skyris_fence_gate.json deleted file mode 100644 index f8a5e16e30..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_leaves.json b/Common/src/main/resources/assets/byg/models/item/skyris_leaves.json deleted file mode 100644 index c9a12b58a0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_log.json b/Common/src/main/resources/assets/byg/models/item/skyris_log.json deleted file mode 100644 index a6f4f5407d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_planks.json b/Common/src/main/resources/assets/byg/models/item/skyris_planks.json deleted file mode 100644 index 8b6e36ca99..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/skyris_pressure_plate.json deleted file mode 100644 index 4eed61def6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_sapling.json b/Common/src/main/resources/assets/byg/models/item/skyris_sapling.json deleted file mode 100644 index ac2be464a6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/skyris_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_slab.json b/Common/src/main/resources/assets/byg/models/item/skyris_slab.json deleted file mode 100644 index 22c29521b1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_stairs.json b/Common/src/main/resources/assets/byg/models/item/skyris_stairs.json deleted file mode 100644 index fbf77b4efc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/skyris_trapdoor.json deleted file mode 100644 index 94190bdf1a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_wood.json b/Common/src/main/resources/assets/byg/models/item/skyris_wood.json deleted file mode 100644 index 2cf7fa39a8..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/skyris_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_skyris_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_skyris_log.json deleted file mode 100644 index 7c9e615e4f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_skyris_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_skyris_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_skyris_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_skyris_wood.json deleted file mode 100644 index d929e68eba..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_skyris_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_skyris_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/skyris/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/skyris/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_door_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_sapling.png b/Common/src/main/resources/assets/byg/textures/block/skyris/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_leaves.png b/Common/src/main/resources/assets/byg/textures/block/skyris/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_log.png b/Common/src/main/resources/assets/byg/textures/block/skyris/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_log.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_log_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_planks.png b/Common/src/main/resources/assets/byg/textures/block/skyris/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_planks.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_skyris_log.png b/Common/src/main/resources/assets/byg/textures/block/skyris/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_skyris_log.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_skyris_log_top.png b/Common/src/main/resources/assets/byg/textures/block/skyris/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_skyris_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/skyris_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/skyris/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/skyris_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/skyris/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/skyris_boat.png b/Common/src/main/resources/assets/byg/textures/item/skyris/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/skyris_boat.png rename to Common/src/main/resources/assets/byg/textures/item/skyris/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/skyris_door.png b/Common/src/main/resources/assets/byg/textures/item/skyris/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/skyris_door.png rename to Common/src/main/resources/assets/byg/textures/item/skyris/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_skyris_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_skyris_wood.json deleted file mode 100644 index b58a8c37dc..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_skyris_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_skyris_log" - } - }, - "result": { - "item": "byg:stripped_skyris_wood", - "count": 3 - } -} \ No newline at end of file From acb87931431a9a509bb1587faa93d1196c532697 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Fri, 27 May 2022 19:44:30 +0300 Subject: [PATCH 55/90] Maple and lament --- Common/src/generated/resources/.cache/cache | 195 ++++++++++++++++ .../byg/blockstates/lament_bookshelf.json | 7 + .../assets/byg/blockstates/lament_button.json | 118 ++++++++++ .../blockstates/lament_crafting_table.json | 7 + .../assets/byg/blockstates/lament_door.json | 124 ++++++++++ .../assets/byg/blockstates/lament_fence.json | 40 ++-- .../byg/blockstates/lament_fence_gate.json | 80 +++++++ .../assets/byg/blockstates/lament_leaves.json | 7 + .../assets/byg/blockstates/lament_log.json | 16 ++ .../assets/byg/blockstates/lament_planks.json | 7 + .../blockstates/lament_pressure_plate.json | 10 + .../byg/blockstates/lament_sapling.json | 7 + .../assets/byg/blockstates/lament_slab.json | 13 ++ .../assets/byg/blockstates/lament_stairs.json | 209 +++++++++++++++++ .../byg/blockstates/lament_trapdoor.json | 68 ++++++ .../assets/byg/blockstates/lament_wood.json | 16 ++ .../byg/blockstates/maple_bookshelf.json | 7 + .../assets/byg/blockstates/maple_button.json | 156 ++++++------- .../byg/blockstates/maple_crafting_table.json | 7 + .../assets/byg/blockstates/maple_door.json | 142 ++++++------ .../assets/byg/blockstates/maple_fence.json | 10 +- .../byg/blockstates/maple_fence_gate.json | 80 +++++++ .../assets/byg/blockstates/maple_leaves.json | 7 + .../assets/byg/blockstates/maple_log.json | 17 +- .../assets/byg/blockstates/maple_planks.json | 7 + .../byg/blockstates/maple_pressure_plate.json | 10 + .../assets/byg/blockstates/maple_sapling.json | 7 + .../assets/byg/blockstates/maple_slab.json | 13 ++ .../assets/byg/blockstates/maple_stairs.json | 216 +++++++++--------- .../byg/blockstates/maple_trapdoor.json | 79 ++++--- .../assets/byg/blockstates/maple_wood.json | 16 +- .../blockstates/potted_lament_sapling.json | 7 + .../byg/blockstates/potted_maple_sapling.json | 7 + .../byg/blockstates/stripped_lament_log.json | 16 ++ .../byg/blockstates/stripped_lament_wood.json | 16 ++ .../byg/blockstates/stripped_maple_log.json | 16 ++ .../byg/blockstates/stripped_maple_wood.json | 16 ++ .../byg/models/block/lament/bookshelf.json | 12 + .../byg/models/block/lament/button.json} | 2 +- .../block/lament/button_inventory.json} | 2 +- .../models/block/lament/button_pressed.json} | 2 +- .../models/block/lament/crafting_table.json | 12 + .../byg/models/block/lament/door_bottom.json | 7 + .../block/lament/door_bottom_hinge.json | 7 + .../byg/models/block/lament/door_top.json | 7 + .../models/block/lament/door_top_hinge.json | 7 + .../assets/byg/models/block/lament/fence.json | 7 + .../byg/models/block/lament/fence_gate.json} | 2 +- .../models/block/lament/fence_gate_open.json} | 2 +- .../models/block/lament/fence_gate_wall.json} | 2 +- .../block/lament/fence_gate_wall_open.json} | 2 +- .../byg/models/block/lament/fence_inv.json | 7 + .../byg/models/block/lament/fence_post.json | 7 + .../byg/models/block/lament/grower_item.json | 6 + .../byg/models/block/lament/leaves.json | 12 + .../byg/models/block/lament/leaves_snowy.json | 12 + .../assets/byg/models/block/lament/log.json | 7 + .../byg/models/block/lament/planks.json | 12 + .../block/lament/potted_grower_item.json} | 2 +- .../models/block/lament/pressure_plate.json} | 2 +- .../block/lament/pressure_plate_down.json} | 2 +- .../assets/byg/models/block/lament/slab.json | 8 + .../byg/models/block/lament/slab_top.json | 8 + .../byg/models/block/lament/stairs.json | 8 + .../byg/models/block/lament/stairs_inner.json | 8 + .../byg/models/block/lament/stairs_outer.json | 8 + .../byg/models/block/lament/stripped_log.json | 7 + .../models/block/lament/stripped_wood.json | 7 + .../models/block/lament/trapdoor_bottom.json} | 2 +- .../models/block/lament/trapdoor_open.json} | 2 +- .../models/block/lament/trapdoor_top.json} | 2 +- .../assets/byg/models/block/lament/wood.json | 7 + .../byg/models/block/maple/bookshelf.json | 12 + .../assets/byg/models/block/maple/button.json | 6 + .../models/block/maple/button_inventory.json | 6 + .../models/block/maple/button_pressed.json | 6 + .../models/block/maple/crafting_table.json | 12 + .../byg/models/block/maple/door_bottom.json | 7 + .../models/block/maple/door_bottom_hinge.json | 7 + .../byg/models/block/maple/door_top.json | 7 + .../models/block/maple/door_top_hinge.json | 7 + .../assets/byg/models/block/maple/fence.json | 7 + .../byg/models/block/maple/fence_gate.json | 6 + .../models/block/maple/fence_gate_open.json | 6 + .../models/block/maple/fence_gate_wall.json | 6 + .../block/maple/fence_gate_wall_open.json | 6 + .../byg/models/block/maple/fence_inv.json | 7 + .../byg/models/block/maple/fence_post.json | 7 + .../byg/models/block/maple/grower_item.json | 6 + .../assets/byg/models/block/maple/leaves.json | 12 + .../byg/models/block/maple/leaves_snowy.json | 12 + .../assets/byg/models/block/maple/log.json | 7 + .../assets/byg/models/block/maple/planks.json | 12 + .../block/maple/potted_grower_item.json} | 2 +- .../models/block/maple/pressure_plate.json | 6 + .../block/maple/pressure_plate_down.json | 6 + .../assets/byg/models/block/maple/slab.json | 8 + .../byg/models/block/maple/slab_top.json | 8 + .../assets/byg/models/block/maple/stairs.json | 8 + .../byg/models/block/maple/stairs_inner.json | 8 + .../byg/models/block/maple/stairs_outer.json | 8 + .../byg/models/block/maple/stripped_log.json | 7 + .../byg/models/block/maple/stripped_wood.json | 7 + .../models/block/maple/trapdoor_bottom.json | 6 + .../byg/models/block/maple/trapdoor_open.json | 6 + .../byg/models/block/maple/trapdoor_top.json | 6 + .../assets/byg/models/block/maple/wood.json | 7 + .../byg/models/item/lament_bookshelf.json | 39 ++++ .../assets/byg/models/item/lament_button.json | 39 ++++ .../models/item/lament_crafting_table.json | 39 ++++ .../assets/byg/models/item/lament_door.json | 2 +- .../assets/byg/models/item/lament_fence.json | 39 ++++ .../byg/models/item/lament_fence_gate.json | 39 ++++ .../assets/byg/models/item/lament_leaves.json | 39 ++++ .../assets/byg/models/item/lament_log.json | 39 ++++ .../assets/byg/models/item/lament_planks.json | 39 ++++ .../models/item/lament_pressure_plate.json | 39 ++++ .../byg/models/item/lament_sapling.json | 6 + .../assets/byg/models/item/lament_slab.json | 39 ++++ .../assets/byg/models/item/lament_stairs.json | 39 ++++ .../byg/models/item/lament_trapdoor.json | 39 ++++ .../assets/byg/models/item/lament_wood.json | 39 ++++ .../assets/byg/models/item/maple_boat.json | 6 + .../byg/models/item/maple_bookshelf.json | 39 ++++ .../assets/byg/models/item/maple_button.json | 39 ++++ .../byg/models/item/maple_crafting_table.json | 39 ++++ .../assets/byg/models/item/maple_door.json | 6 + .../assets/byg/models/item/maple_fence.json | 39 ++++ .../byg/models/item/maple_fence_gate.json | 39 ++++ .../assets/byg/models/item/maple_leaves.json | 39 ++++ .../assets/byg/models/item/maple_log.json | 39 ++++ .../assets/byg/models/item/maple_planks.json | 39 ++++ .../byg/models/item/maple_pressure_plate.json | 39 ++++ .../assets/byg/models/item/maple_sapling.json | 6 + .../assets/byg/models/item/maple_slab.json | 39 ++++ .../assets/byg/models/item/maple_stairs.json | 39 ++++ .../byg/models/item/maple_trapdoor.json | 39 ++++ .../assets/byg/models/item/maple_wood.json | 39 ++++ .../byg/models/item/stripped_lament_log.json | 39 ++++ .../byg/models/item/stripped_lament_wood.json | 39 ++++ .../byg/models/item/stripped_maple_log.json | 39 ++++ .../byg/models/item/stripped_maple_wood.json | 39 ++++ .../byg.byg/wood/lament/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/lament/button.json | 34 +++ .../byg.byg/wood/lament/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/lament/door.json | 34 +++ .../recipes/byg.byg/wood/lament/fence.json | 34 +++ .../byg.byg/wood/lament/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/lament/planks.json | 32 +++ .../byg.byg/wood/lament/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/lament/slab.json | 34 +++ .../recipes/byg.byg/wood/lament/stairs.json | 34 +++ .../recipes/byg.byg/wood/lament/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/lament/wood.json | 34 +++ .../recipes/byg.byg/wood/maple/boat.json | 34 +++ .../recipes/byg.byg/wood/maple/bookshelf.json | 34 +++ .../recipes/byg.byg/wood/maple/button.json | 34 +++ .../byg.byg/wood/maple/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/maple/door.json | 34 +++ .../recipes/byg.byg/wood/maple/fence.json | 34 +++ .../byg.byg/wood/maple/fence_gate.json | 34 +++ .../recipes/byg.byg/wood/maple/planks.json | 32 +++ .../byg.byg/wood/maple/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/maple/slab.json | 34 +++ .../recipes/byg.byg/wood/maple/stairs.json | 34 +++ .../recipes/byg.byg/wood/maple/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/maple/wood.json | 34 +++ .../byg/recipes/wood/lament/bookshelf.json} | 11 +- .../data/byg/recipes/wood/lament/button.json} | 0 .../recipes/wood/lament/crafting_table.json} | 7 +- .../data/byg/recipes/wood/lament/door.json} | 8 +- .../data/byg/recipes/wood/lament/fence.json} | 0 .../byg/recipes/wood/lament/fence_gate.json} | 0 .../data/byg/recipes/wood/lament/planks.json} | 4 +- .../recipes/wood/lament/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/lament/slab.json} | 4 +- .../data/byg/recipes/wood/lament/stairs.json} | 10 +- .../byg/recipes/wood/lament/trapdoor.json} | 6 +- .../data/byg/recipes/wood/lament/wood.json} | 7 +- .../data/byg/recipes/wood/maple/boat.json} | 6 +- .../byg/recipes/wood/maple/bookshelf.json} | 11 +- .../data/byg/recipes/wood/maple/button.json} | 0 .../recipes/wood/maple/crafting_table.json} | 7 +- .../data/byg/recipes/wood/maple/door.json} | 8 +- .../data/byg/recipes/wood/maple/fence.json} | 0 .../byg/recipes/wood/maple/fence_gate.json} | 0 .../data/byg/recipes/wood/maple/planks.json} | 4 +- .../recipes/wood/maple/pressure_plate.json} | 4 +- .../data/byg/recipes/wood/maple/slab.json} | 4 +- .../data/byg/recipes/wood/maple/stairs.json} | 10 +- .../byg/recipes/wood/maple/trapdoor.json} | 6 +- .../data/byg/recipes/wood/maple/wood.json} | 7 +- .../byg/tags/blocks/wood/lament_logs.json | 9 + .../data/byg/tags/blocks/wood/maple_logs.json | 9 + .../data/byg/tags/items/wood/lament_logs.json | 9 + .../data/byg/tags/items/wood/maple_logs.json | 9 + .../byg/client/textures/ColorManager.java | 4 +- .../textures/renders/BYGRenderTypes.java | 8 +- .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 10 - .../byg/common/BYGStrippables.java | 4 - .../byg/common/block/BYGBlocks.java | 38 --- .../byg/common/block/BYGWoodTypes.java | 9 +- .../byg/common/entity/boat/BYGBoatEntity.java | 2 - .../byg/common/item/BYGItems.java | 62 ++--- .../nether/BYGNetherVegetationFeatures.java | 18 +- .../overworld/BYGOverworldTreeFeatures.java | 9 +- .../byg/blockstates/lament_bookshelf.json | 7 - .../assets/byg/blockstates/lament_button.json | 118 ---------- .../blockstates/lament_crafting_table.json | 7 - .../assets/byg/blockstates/lament_door.json | 124 ---------- .../byg/blockstates/lament_fence_gate.json | 80 ------- .../assets/byg/blockstates/lament_leaves.json | 7 - .../assets/byg/blockstates/lament_log.json | 16 -- .../assets/byg/blockstates/lament_planks.json | 7 - .../blockstates/lament_pressure_plate.json | 10 - .../byg/blockstates/lament_sapling.json | 7 - .../assets/byg/blockstates/lament_slab.json | 13 -- .../assets/byg/blockstates/lament_stairs.json | 209 ----------------- .../byg/blockstates/lament_trapdoor.json | 68 ------ .../assets/byg/blockstates/lament_wood.json | 16 -- .../byg/blockstates/maple_bookshelf.json | 7 - .../byg/blockstates/maple_crafting_table.json | 7 - .../byg/blockstates/maple_fence_gate.json | 80 ------- .../assets/byg/blockstates/maple_leaves.json | 7 - .../assets/byg/blockstates/maple_planks.json | 7 - .../byg/blockstates/maple_pressure_plate.json | 10 - .../assets/byg/blockstates/maple_sapling.json | 7 - .../assets/byg/blockstates/maple_slab.json | 13 -- .../blockstates/potted_lament_sapling.json | 7 - .../byg/blockstates/potted_maple_sapling.json | 7 - .../byg/blockstates/stripped_lament_log.json | 16 -- .../byg/blockstates/stripped_lament_wood.json | 16 -- .../byg/blockstates/stripped_maple_log.json | 16 -- .../byg/blockstates/stripped_maple_wood.json | 16 -- .../byg/models/block/lament_bookshelf.json | 12 - .../models/block/lament_crafting_table.json | 12 - .../byg/models/block/lament_door_bottom.json | 7 - .../block/lament_door_bottom_hinge.json | 7 - .../byg/models/block/lament_door_top.json | 7 - .../models/block/lament_door_top_hinge.json | 7 - .../models/block/lament_fence_inventory.json | 6 - .../byg/models/block/lament_fence_post.json | 6 - .../byg/models/block/lament_leaves.json | 6 - .../assets/byg/models/block/lament_log.json | 7 - .../byg/models/block/lament_planks.json | 6 - .../byg/models/block/lament_sapling.json | 7 - .../assets/byg/models/block/lament_slab.json | 8 - .../byg/models/block/lament_slab_top.json | 8 - .../byg/models/block/lament_stairs.json | 8 - .../byg/models/block/lament_stairs_inner.json | 8 - .../byg/models/block/lament_stairs_outer.json | 8 - .../assets/byg/models/block/lament_wood.json | 7 - .../byg/models/block/maple_bookshelf.json | 12 - .../assets/byg/models/block/maple_button.json | 6 - .../models/block/maple_button_inventory.json | 6 - .../models/block/maple_button_pressed.json | 6 - .../models/block/maple_crafting_table.json | 12 - .../byg/models/block/maple_door_bottom.json | 7 - .../models/block/maple_door_bottom_hinge.json | 7 - .../byg/models/block/maple_door_top.json | 7 - .../models/block/maple_door_top_hinge.json | 7 - .../assets/byg/models/block/maple_fence.json | 7 - .../byg/models/block/maple_fence_gate.json | 6 - .../models/block/maple_fence_gate_open.json | 6 - .../models/block/maple_fence_gate_wall.json | 6 - .../block/maple_fence_gate_wall_open.json | 6 - .../models/block/maple_fence_inventory.json | 7 - .../byg/models/block/maple_fence_post.json | 7 - .../assets/byg/models/block/maple_leaves.json | 156 ------------- .../assets/byg/models/block/maple_log.json | 7 - .../assets/byg/models/block/maple_planks.json | 7 - .../models/block/maple_pressure_plate.json | 6 - .../block/maple_pressure_plate_down.json | 6 - .../byg/models/block/maple_sapling.json | 7 - .../assets/byg/models/block/maple_slab.json | 8 - .../byg/models/block/maple_slab_top.json | 8 - .../assets/byg/models/block/maple_stairs.json | 8 - .../byg/models/block/maple_stairs_inner.json | 8 - .../byg/models/block/maple_stairs_outer.json | 8 - .../models/block/maple_trapdoor_bottom.json | 6 - .../byg/models/block/maple_trapdoor_open.json | 6 - .../byg/models/block/maple_trapdoor_top.json | 6 - .../assets/byg/models/block/maple_wood.json | 7 - .../byg/models/block/stripped_lament_log.json | 7 - .../block/stripped_lament_log_horizontal.json | 7 - .../models/block/stripped_lament_wood.json | 7 - .../stripped_lament_wood_horizontal.json | 7 - .../byg/models/block/stripped_maple_log.json | 12 - .../byg/models/block/stripped_maple_wood.json | 7 - .../byg/models/item/lament_bookshelf.json | 22 -- .../assets/byg/models/item/lament_button.json | 3 - .../models/item/lament_crafting_table.json | 22 -- .../assets/byg/models/item/lament_fence.json | 3 - .../byg/models/item/lament_fence_gate.json | 3 - .../assets/byg/models/item/lament_leaves.json | 3 - .../assets/byg/models/item/lament_log.json | 22 -- .../assets/byg/models/item/lament_planks.json | 3 - .../models/item/lament_pressure_plate.json | 3 - .../byg/models/item/lament_sapling.json | 6 - .../assets/byg/models/item/lament_slab.json | 3 - .../assets/byg/models/item/lament_stairs.json | 3 - .../byg/models/item/lament_trapdoor.json | 3 - .../assets/byg/models/item/lament_wood.json | 22 -- .../assets/byg/models/item/maple_boat.json | 6 - .../byg/models/item/maple_bookshelf.json | 22 -- .../assets/byg/models/item/maple_button.json | 22 -- .../byg/models/item/maple_crafting_table.json | 22 -- .../assets/byg/models/item/maple_door.json | 6 - .../assets/byg/models/item/maple_fence.json | 3 - .../byg/models/item/maple_fence_gate.json | 22 -- .../assets/byg/models/item/maple_leaves.json | 22 -- .../assets/byg/models/item/maple_log.json | 22 -- .../assets/byg/models/item/maple_planks.json | 22 -- .../byg/models/item/maple_pressure_plate.json | 22 -- .../assets/byg/models/item/maple_sapling.json | 6 - .../assets/byg/models/item/maple_slab.json | 22 -- .../assets/byg/models/item/maple_stairs.json | 22 -- .../byg/models/item/maple_trapdoor.json | 22 -- .../assets/byg/models/item/maple_wood.json | 22 -- .../byg/models/item/stripped_lament_log.json | 22 -- .../byg/models/item/stripped_lament_wood.json | 22 -- .../byg/models/item/stripped_maple_log.json | 22 -- .../byg/models/item/stripped_maple_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../{lament_leaves.png => lament/leaves.png} | Bin .../block/{lament_log.png => lament/log.png} | Bin .../log_top.png} | Bin .../{lament_planks.png => lament/planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../{maple_leaves.png => maple/leaves.png} | Bin .../block/{maple_log.png => maple/log.png} | Bin .../{maple_log_top.png => maple/log_top.png} | Bin .../{maple_planks.png => maple/planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../item/{lament_door.png => lament/door.png} | Bin .../item/{maple_boat.png => maple/boat.png} | Bin .../item/{maple_door.png => maple/door.png} | Bin .../byg/recipes/stripped_lament_wood.json | 16 -- .../data/byg/recipes/stripped_maple_wood.json | 16 -- 357 files changed, 4071 insertions(+), 2527 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_button.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_door.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/lament_fence.json (69%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_slab.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_bookshelf.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_button.json (53%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_door.json (60%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_fence.json (72%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_leaves.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_log.json (53%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_slab.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_stairs.json (67%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_trapdoor.json (56%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/maple_wood.json (52%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_lament_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_maple_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_lament_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_lament_wood.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_maple_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_maple_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json rename Common/src/{main/resources/assets/byg/models/block/lament_button.json => generated/resources/assets/byg/models/block/lament/button.json} (59%) rename Common/src/{main/resources/assets/byg/models/block/lament_button_inventory.json => generated/resources/assets/byg/models/block/lament/button_inventory.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/lament_button_pressed.json => generated/resources/assets/byg/models/block/lament/button_pressed.json} (62%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/fence.json rename Common/src/{main/resources/assets/byg/models/block/lament_fence_gate.json => generated/resources/assets/byg/models/block/lament/fence_gate.json} (64%) rename Common/src/{main/resources/assets/byg/models/block/lament_fence_gate_open.json => generated/resources/assets/byg/models/block/lament/fence_gate_open.json} (65%) rename Common/src/{main/resources/assets/byg/models/block/lament_fence_gate_wall.json => generated/resources/assets/byg/models/block/lament/fence_gate_wall.json} (65%) rename Common/src/{main/resources/assets/byg/models/block/lament_fence_gate_wall_open.json => generated/resources/assets/byg/models/block/lament/fence_gate_wall_open.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/planks.json rename Common/src/{main/resources/assets/byg/models/block/potted_maple_sapling.json => generated/resources/assets/byg/models/block/lament/potted_grower_item.json} (61%) rename Common/src/{main/resources/assets/byg/models/block/lament_pressure_plate.json => generated/resources/assets/byg/models/block/lament/pressure_plate.json} (63%) rename Common/src/{main/resources/assets/byg/models/block/lament_pressure_plate_down.json => generated/resources/assets/byg/models/block/lament/pressure_plate_down.json} (64%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/stripped_wood.json rename Common/src/{main/resources/assets/byg/models/block/lament_trapdoor_bottom.json => generated/resources/assets/byg/models/block/lament/trapdoor_bottom.json} (67%) rename Common/src/{main/resources/assets/byg/models/block/lament_trapdoor_open.json => generated/resources/assets/byg/models/block/lament/trapdoor_open.json} (67%) rename Common/src/{main/resources/assets/byg/models/block/lament_trapdoor_top.json => generated/resources/assets/byg/models/block/lament/trapdoor_top.json} (66%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/planks.json rename Common/src/{main/resources/assets/byg/models/block/potted_lament_sapling.json => generated/resources/assets/byg/models/block/maple/potted_grower_item.json} (62%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/models/item/lament_door.json (63%) create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json rename Common/src/{main/resources/data/byg/recipes/lament_bookshelf.json => generated/resources/data/byg/recipes/wood/lament/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/lament_button.json => generated/resources/data/byg/recipes/wood/lament/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/lament_crafting_table.json => generated/resources/data/byg/recipes/wood/lament/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/lament_door.json => generated/resources/data/byg/recipes/wood/lament/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/lament_fence.json => generated/resources/data/byg/recipes/wood/lament/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/lament_fence_gate.json => generated/resources/data/byg/recipes/wood/lament/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/lament_planks.json => generated/resources/data/byg/recipes/wood/lament/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/lament_pressure_plate.json => generated/resources/data/byg/recipes/wood/lament/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/lament_slab.json => generated/resources/data/byg/recipes/wood/lament/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/lament_stairs.json => generated/resources/data/byg/recipes/wood/lament/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/lament_trapdoor.json => generated/resources/data/byg/recipes/wood/lament/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/lament_wood.json => generated/resources/data/byg/recipes/wood/lament/wood.json} (78%) rename Common/src/{main/resources/data/byg/recipes/maple_boat.json => generated/resources/data/byg/recipes/wood/maple/boat.json} (85%) rename Common/src/{main/resources/data/byg/recipes/maple_bookshelf.json => generated/resources/data/byg/recipes/wood/maple/bookshelf.json} (72%) rename Common/src/{main/resources/data/byg/recipes/maple_button.json => generated/resources/data/byg/recipes/wood/maple/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/maple_crafting_table.json => generated/resources/data/byg/recipes/wood/maple/crafting_table.json} (74%) rename Common/src/{main/resources/data/byg/recipes/maple_door.json => generated/resources/data/byg/recipes/wood/maple/door.json} (83%) rename Common/src/{main/resources/data/byg/recipes/maple_fence.json => generated/resources/data/byg/recipes/wood/maple/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/maple_fence_gate.json => generated/resources/data/byg/recipes/wood/maple/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/maple_planks.json => generated/resources/data/byg/recipes/wood/maple/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/maple_pressure_plate.json => generated/resources/data/byg/recipes/wood/maple/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/maple_slab.json => generated/resources/data/byg/recipes/wood/maple/slab.json} (90%) rename Common/src/{main/resources/data/byg/recipes/maple_stairs.json => generated/resources/data/byg/recipes/wood/maple/stairs.json} (70%) rename Common/src/{main/resources/data/byg/recipes/maple_trapdoor.json => generated/resources/data/byg/recipes/wood/maple/trapdoor.json} (86%) rename Common/src/{main/resources/data/byg/recipes/maple_wood.json => generated/resources/data/byg/recipes/wood/maple/wood.json} (78%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_button.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_door.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_lament_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_maple_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_maple_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_maple_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/maple_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_lament_log_horizontal.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_lament_wood_horizontal.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_maple_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_maple_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_lament_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_lament_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_maple_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_maple_wood.json rename Common/src/main/resources/assets/byg/textures/block/{lament_bookshelf.png => lament/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_crafting_table_front.png => lament/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_crafting_table_side.png => lament/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_crafting_table_top.png => lament/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_door_bottom.png => lament/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_door_top.png => lament/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_sapling.png => lament/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_leaves.png => lament/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_log.png => lament/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_log_top.png => lament/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_planks.png => lament/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_lament_log.png => lament/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_lament_log_top.png => lament/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{lament_trapdoor.png => lament/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_bookshelf.png => maple/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_crafting_table_front.png => maple/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_crafting_table_side.png => maple/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_crafting_table_top.png => maple/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_door_bottom.png => maple/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_door_top.png => maple/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_sapling.png => maple/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_leaves.png => maple/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_log.png => maple/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_log_top.png => maple/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_planks.png => maple/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_maple_log.png => maple/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_maple_log_top.png => maple/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{maple_trapdoor.png => maple/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{lament_door.png => lament/door.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{maple_boat.png => maple/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{maple_door.png => maple/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_lament_wood.json delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_maple_wood.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 37facf90bc..99c0f77132 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -203,6 +203,21 @@ c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressur bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json 4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json 5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json +f6e0d7a87643e75508857bc72c746d07f316042a assets/byg/blockstates/lament_bookshelf.json +caa05c4828bed24692853c4b9260c69e4998251f assets/byg/blockstates/lament_button.json +10a39a99c8fd6a0dd496c6aab8be82e62eff9c91 assets/byg/blockstates/lament_crafting_table.json +4f3f1dac6c3697a3e1500bdf0024a160ad7dc66f assets/byg/blockstates/lament_door.json +5d4a15172c044f8bb8d5e6f439b4e749b52c5746 assets/byg/blockstates/lament_fence.json +9212d99b2465d58c9190eae3f2242bd44c688b5a assets/byg/blockstates/lament_fence_gate.json +28f881bbefb38570cb2701e7c42df794ab718e73 assets/byg/blockstates/lament_leaves.json +81dfb5141345deb982a104dc43b184f1577b6315 assets/byg/blockstates/lament_log.json +52c6a6d2e0f317d9f30cb748a10b33c6b058c872 assets/byg/blockstates/lament_planks.json +bb985fb2f9a8d1530a65648040902e87a8f2e8b1 assets/byg/blockstates/lament_pressure_plate.json +06ed38a42cc419a534647531555bc3cff01ff5a6 assets/byg/blockstates/lament_sapling.json +882a9b685f0f8137d8ef7dfee88c2199fe3f06ea assets/byg/blockstates/lament_slab.json +84c408b0e266dc3c8571d47fa62a2627859a15be assets/byg/blockstates/lament_stairs.json +d6abdc6c0bab9b113e4dcaac2e18818692edca76 assets/byg/blockstates/lament_trapdoor.json +6e77caae650e9b1c2ae60439cf51780ea48f8148 assets/byg/blockstates/lament_wood.json 2d64b1e97d9895e66e98faca798866a4ebaee335 assets/byg/blockstates/mahogany_bookshelf.json 718f7b42d87527834f70aa7918447aa98ca7b2a1 assets/byg/blockstates/mahogany_button.json 6f41668ba9e74ca53c6015d50ab82fa974538b89 assets/byg/blockstates/mahogany_crafting_table.json @@ -233,6 +248,21 @@ b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.js 91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json 2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json +bfae166b196aba9ceccf9af2cca32824b97c2a60 assets/byg/blockstates/maple_bookshelf.json +c597a3580215e9b8811f71a57d44377ecb43d83f assets/byg/blockstates/maple_button.json +bad56a0d46fbe147efee8357c7fdd65e542cca14 assets/byg/blockstates/maple_crafting_table.json +deca38cd2f440755be28c418ceb3c3cfc40a927c assets/byg/blockstates/maple_door.json +633b96e55dcc0c619c2de73986d752f63b408b94 assets/byg/blockstates/maple_fence.json +f954e9776589a558344e537cff942e360f97a0db assets/byg/blockstates/maple_fence_gate.json +c3b35776049ce2fd2b71aa137ddcbc338c512963 assets/byg/blockstates/maple_leaves.json +6c488905f1c82c319d40b1502981b5bb8f7e8bd0 assets/byg/blockstates/maple_log.json +aab324e83e940721a756037cfd1ff30f104a962d assets/byg/blockstates/maple_planks.json +0f863550d93d116773107a054f6e03f6931c9846 assets/byg/blockstates/maple_pressure_plate.json +cc26d57d0ebd2685146d15ca9b5cd2f19b2055a9 assets/byg/blockstates/maple_sapling.json +68f4969779462c493e37a2266227bca049cf47d4 assets/byg/blockstates/maple_slab.json +a520d2347347d6afc506223042acb65cd879b219 assets/byg/blockstates/maple_stairs.json +eeb76e6475d6f81224729eafd69d73390c5218b6 assets/byg/blockstates/maple_trapdoor.json +bc0abb64cb9f89b4cbd46a7c8f3b9e3c8363a181 assets/byg/blockstates/maple_wood.json e3c8c0da0697aaebb9f76d2618f106fe69dddf5b assets/byg/blockstates/nightshade_bookshelf.json f980fdf26bf1bacc6e836f8d88c7da0887d25666 assets/byg/blockstates/nightshade_button.json 8ada93135e307c6e47ff8da6c9e0450be6341d67 assets/byg/blockstates/nightshade_crafting_table.json @@ -291,8 +321,10 @@ ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.js 024d35275a5820185399851d4653414c6995081c assets/byg/blockstates/potted_green_enchanted_sapling.json 23a354082c811e55009ce5048816dbb0c5eee31c assets/byg/blockstates/potted_holly_sapling.json e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_mushroom.json +79c243dfa7ea17953f804292905b9c17d95d3dc2 assets/byg/blockstates/potted_lament_sapling.json 4babfb75998f0891db03ae355c52ad54543cdb64 assets/byg/blockstates/potted_mahogany_sapling.json 178fc20190f1d18e808f983c72384c87f6a09275 assets/byg/blockstates/potted_mangrove_sapling.json +08fb36cacef7c295f11ccc06378bbedb0dcfb5c9 assets/byg/blockstates/potted_maple_sapling.json 2fbacfc6c6283a12959359aed883742ed52de14c assets/byg/blockstates/potted_nightshade_sapling.json 7b0d6acfe90488376b38ca79bf1bc812f36316da assets/byg/blockstates/potted_palm_sapling.json ebe08b1ed3a3712b7564b40d5b62213a05691c31 assets/byg/blockstates/potted_pine_sapling.json @@ -374,10 +406,14 @@ edf913aff7aeb91fddd90e245648d7b20a214eb3 assets/byg/blockstates/stripped_embur_h f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_enchanted_wood.json 883ccd05f2b67a6aeee0e6ee57b7a30585538d7b assets/byg/blockstates/stripped_holly_log.json 6239db53e36bf37f2a8d22d02ea135f6594538b0 assets/byg/blockstates/stripped_holly_wood.json +c0a66a6955d48480b6fbffd8e19dfc2f273c9305 assets/byg/blockstates/stripped_lament_log.json +9303ee51cf8c4a2bfc0f4f01e5d22b2cf37c0529 assets/byg/blockstates/stripped_lament_wood.json 28d46328ec91e7650f48375c069a7bc8e814bf53 assets/byg/blockstates/stripped_mahogany_log.json 479abf5122246126d85fbe8affd3afaad3f7c531 assets/byg/blockstates/stripped_mahogany_wood.json 60daa9513ff96eac9272602d4e2afe9635718495 assets/byg/blockstates/stripped_mangrove_log.json 3ad3465364f28027741f566d36acea26900b5956 assets/byg/blockstates/stripped_mangrove_wood.json +06ed62280d35bff6ed18770e016144e0c71c71f9 assets/byg/blockstates/stripped_maple_log.json +53199081dad61fc2dc0c4c6a9281d3a7ebf500e8 assets/byg/blockstates/stripped_maple_wood.json 7304e8a4ad84325ef2ba3e23c432fec3f9647c23 assets/byg/blockstates/stripped_nightshade_log.json 5bc5331bfc5b7baf83ac9cceee5c8c9fd3d957b5 assets/byg/blockstates/stripped_nightshade_wood.json 5d63ae2eafc9d9a3ded5950201a561ab51ea7402 assets/byg/blockstates/stripped_palm_log.json @@ -936,6 +972,41 @@ d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json 1f9b271e1f7e94aa33a491ae563799bd9c16b7b2 assets/byg/models/block/imparius/wood.json +e1d0ed2c387934e8da4fcd5ebede2019df0f25cc assets/byg/models/block/lament/bookshelf.json +c422e3639a840bf08a658265c014a6b3d08328ef assets/byg/models/block/lament/button.json +8788b3c84920581717b1aae9807ba0f19237ad66 assets/byg/models/block/lament/button_inventory.json +e75d1ef70b06e8d06d56e36237ddffdf832aba02 assets/byg/models/block/lament/button_pressed.json +ce0c6d676335eebb61dd0a08c2724d02c9868f5f assets/byg/models/block/lament/crafting_table.json +1fd8053c1d4396d11bcce8a958904d9a4853f701 assets/byg/models/block/lament/door_bottom.json +31f817bf83f15c6c861b6caf383927602633568e assets/byg/models/block/lament/door_bottom_hinge.json +9c434fabe3e14d94df53da12247fd39b991e3a0e assets/byg/models/block/lament/door_top.json +5abcfd499112cf93532843be90c2926acdebd503 assets/byg/models/block/lament/door_top_hinge.json +6df3ce5ff4abae4c2cc13b8fa7b6947928a12bad assets/byg/models/block/lament/fence.json +e218c0e82bcb87dd21a6a408a87d4615f9879185 assets/byg/models/block/lament/fence_gate.json +f2661b99b8317238983fd14818ba5ddf791d77c0 assets/byg/models/block/lament/fence_gate_open.json +86c512171b88ac12d44cffc73d43e488f24853a3 assets/byg/models/block/lament/fence_gate_wall.json +097faa13ca06bfeb82fe6fa8c59e5c7bb98c8e59 assets/byg/models/block/lament/fence_gate_wall_open.json +1366825497cd91fc82e38064796903c0fc4fe23f assets/byg/models/block/lament/fence_inv.json +472fa12b1b33cf0eff893564e86be63683cb4fea assets/byg/models/block/lament/fence_post.json +7c1eee34a9d91fa0f0712f17d3fd5993c166414c assets/byg/models/block/lament/grower_item.json +65c9a302c9227aaba22734e92f9c2d3e54d7f2c6 assets/byg/models/block/lament/leaves.json +605bdb42850b35d94640e7690bc1f0ac859af9e7 assets/byg/models/block/lament/leaves_snowy.json +e7c9f32b6952228883bad79854258bce7ac028eb assets/byg/models/block/lament/log.json +f4ef8ef7e4e18418fb5161bb4cea15dfb6b8e7fb assets/byg/models/block/lament/planks.json +659391a4fe0672feb4c74e2057f77132414905c5 assets/byg/models/block/lament/potted_grower_item.json +d5d657dcf6a34415789c39abeae5bc86d41e4fa4 assets/byg/models/block/lament/pressure_plate.json +9dbd6360730f004afe0501b1652d30ea34c45141 assets/byg/models/block/lament/pressure_plate_down.json +e7a985f1eda2672e0d8d0d0fc21f0fd5a3885ac4 assets/byg/models/block/lament/slab.json +cbcb22662b7384c1e8ac94c5a7517831c521161b assets/byg/models/block/lament/slab_top.json +29d9da05e103136f79c2821bf96f74117cdc118a assets/byg/models/block/lament/stairs.json +52868f5ce2a239bbb0b3c7c9fb69a683f7a66da6 assets/byg/models/block/lament/stairs_inner.json +e599832493e0fa92073c77c60095bf671efb3003 assets/byg/models/block/lament/stairs_outer.json +f07f52e18ae8acbdfde030508d3c6f14e345ad4b assets/byg/models/block/lament/stripped_log.json +5351b28088857f3b231cb0e37a4c245318cdf10b assets/byg/models/block/lament/stripped_wood.json +504c5769f7b98e7b82a2647944f083b67f3adb65 assets/byg/models/block/lament/trapdoor_bottom.json +a492b8d5d7607e0eba22c0730d2c49593386a157 assets/byg/models/block/lament/trapdoor_open.json +902980b8e720802106c04e0e9a3ddd95b43fd4c0 assets/byg/models/block/lament/trapdoor_top.json +70cd750a64ad62c91c88739b765e445a61d91f72 assets/byg/models/block/lament/wood.json 46ddc052ddf8365713e7613550e33d541877bc1c assets/byg/models/block/mahogany/bookshelf.json 1eb51f409ab27de20eb274edf2a0d22761e1e2a1 assets/byg/models/block/mahogany/button.json fc7da464a0ff5aa5b61230223b3e29e0796938ac assets/byg/models/block/mahogany/button_inventory.json @@ -1006,6 +1077,41 @@ b53c1dbed17db433ca0335e71dd4a1cc38c463ad assets/byg/models/block/mangrove/stripp c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json 36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json db85b26584a130734c0c18b1b8e10e3bf071a97f assets/byg/models/block/mangrove/wood.json +ef022fe652504aaa2e0839628225669dcbcf635d assets/byg/models/block/maple/bookshelf.json +c78a8dee25c7ff91c10e3d27d90f9a37e2b1ecc4 assets/byg/models/block/maple/button.json +f5d6391b8d6d0c790b553dfa1c8674d841ef7d7d assets/byg/models/block/maple/button_inventory.json +184ac7de917226f2d569f29483fd895f9990dcef assets/byg/models/block/maple/button_pressed.json +22db487ba17fbebe0d64dbc1531e75afbe238d2e assets/byg/models/block/maple/crafting_table.json +9cbc0618150ff6966489938bcfbec5612c42fb66 assets/byg/models/block/maple/door_bottom.json +e86fc1e596f6c4b7e26718548db60d9cc6b0a6c7 assets/byg/models/block/maple/door_bottom_hinge.json +f7375012dc49bc5e7a7edeaa6b3ceb9633c9e048 assets/byg/models/block/maple/door_top.json +b0582fb8db413fc60740d7cdd3b0eea20ae7341c assets/byg/models/block/maple/door_top_hinge.json +453954e228ea3d7836e189f339b6804453f57d1d assets/byg/models/block/maple/fence.json +96dea851ce1428ff914b8a36e9f92054905dc191 assets/byg/models/block/maple/fence_gate.json +d0b8a4c3fed61d221e7974f6512182f34164be0f assets/byg/models/block/maple/fence_gate_open.json +e120a9497db1bc17c0a3fbbaedbc18c12e59b024 assets/byg/models/block/maple/fence_gate_wall.json +558c7cb83af0a59af4dc6d051f79adbce5f848ce assets/byg/models/block/maple/fence_gate_wall_open.json +7bb3b1ae140922e8938b3ec2b0fca39e45cebb11 assets/byg/models/block/maple/fence_inv.json +99982a9b085ec25ad54a5f8dc985f03bbe69acec assets/byg/models/block/maple/fence_post.json +0461bd09eef6935e23481bd039159d1d3923d942 assets/byg/models/block/maple/grower_item.json +b492ee81b256b8a9a4d032a8c16ae40cbb7a2224 assets/byg/models/block/maple/leaves.json +c4c4e223da10d217662ff594b0fca9baf2a26551 assets/byg/models/block/maple/leaves_snowy.json +8b45273f8b3eea9b38ff07632556508721c462ab assets/byg/models/block/maple/log.json +215961082a4a9a9eca7befadf291bd7d7bb22725 assets/byg/models/block/maple/planks.json +4197bcf5d44803d069212a99a9dd4928ee2e39f1 assets/byg/models/block/maple/potted_grower_item.json +7633afb7645857638cd8ccc415d72a9622ddb92e assets/byg/models/block/maple/pressure_plate.json +e73bff44b2bce2792f4a22e8291c38affe8ed6be assets/byg/models/block/maple/pressure_plate_down.json +fea84a75b119074ee24be1c11df466025d57f4d8 assets/byg/models/block/maple/slab.json +d5ae5a72a2e48f6885aa98ae05e3ec72f0a712a6 assets/byg/models/block/maple/slab_top.json +e5c23cc125b3cb34edec71b8a10daccb824ab38d assets/byg/models/block/maple/stairs.json +92f2cf19bb4bc2608d48ff52d0024838b2a3902a assets/byg/models/block/maple/stairs_inner.json +64c4ea88de55c325dffd6ccfefea302c225aca0a assets/byg/models/block/maple/stairs_outer.json +d964d143ca583b62746f8706aa107f5f7c1f7c07 assets/byg/models/block/maple/stripped_log.json +2ea83e7dfe1345335f5c84b033ea1c46935db2f4 assets/byg/models/block/maple/stripped_wood.json +759611efe388005ee1627668aa1681330090d15e assets/byg/models/block/maple/trapdoor_bottom.json +7931e24d6dee7d30d7cf349f05159e5a94713e0b assets/byg/models/block/maple/trapdoor_open.json +66044be06bc11ce721f98dff8364f738b1ed03c9 assets/byg/models/block/maple/trapdoor_top.json +16aaeaf268f24a4f86bcc3e75c14adc22cb33c6c assets/byg/models/block/maple/wood.json af5e5b064247ae2c2fc4e5f57b9b7296288c6778 assets/byg/models/block/nightshade/bookshelf.json 1612a94a1356b4969df48b8ffb67289bf1a28a92 assets/byg/models/block/nightshade/button.json f95eeef7fcc213d491aab6dabf75d0f660613672 assets/byg/models/block/nightshade/button_inventory.json @@ -1571,6 +1677,21 @@ d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressur 7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json 151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json 81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/item/imparius_trapdoor.json +43108e292ab8d2c28ba23da265ac49bf56729fed assets/byg/models/item/lament_bookshelf.json +598ed4a3fe2c7505497c0e5b2428b312e6732b2c assets/byg/models/item/lament_button.json +88f5f79cb6cf050ecd80977cbbf3cf076ea1c82d assets/byg/models/item/lament_crafting_table.json +2f7b42edc2b22c1262864242b38fb57c76ffa281 assets/byg/models/item/lament_door.json +ac3287839bbdeeb51a9173a4074cf543fdf23efb assets/byg/models/item/lament_fence.json +6e285f6b28abd308771b2759e28e81602b525495 assets/byg/models/item/lament_fence_gate.json +4355ace4dfc8ea66df194773011cf5a579a019aa assets/byg/models/item/lament_leaves.json +949347e264c857529147333367e7cda58946c520 assets/byg/models/item/lament_log.json +b77f8ae1ffe30e5455f6a87868cc7acc9728f70f assets/byg/models/item/lament_planks.json +6da1a2a9534d5b8b8c351e30e5d7ee7433e6a133 assets/byg/models/item/lament_pressure_plate.json +3e85dec796bfb48231ce63c17f149c30bfefbfa2 assets/byg/models/item/lament_sapling.json +2ecebcec270243c5cdb19de5b197b6ce082a5cfa assets/byg/models/item/lament_slab.json +74bb345d7e6ae8fffec74adebb3a4e050be6c7da assets/byg/models/item/lament_stairs.json +3cae05d0760d2dccd3f05f9fc93d51e2264fb18c assets/byg/models/item/lament_trapdoor.json +dffe613c195c22f6e17c256b68156c0a74658dea assets/byg/models/item/lament_wood.json 308fdc52954271202cfea5bc7f66e6beb13dd522 assets/byg/models/item/mahogany_boat.json 4492809fcab159e80ab32cdf5ff1b3908836bcb6 assets/byg/models/item/mahogany_bookshelf.json 3675d5f1aae8ed09bb152beab640fcb5d3a82f38 assets/byg/models/item/mahogany_button.json @@ -1603,6 +1724,22 @@ b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves. 9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/item/mangrove_trapdoor.json b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json +b3360b2c749a47e15403b2849bbd2e76f6bdc62e assets/byg/models/item/maple_boat.json +96cd960b276ac6cce3405ad3bce7f8f72ca64cb5 assets/byg/models/item/maple_bookshelf.json +387a115e9d0dc90376f24bfbb2e3fefe1d4dbb5d assets/byg/models/item/maple_button.json +c173f6996501a5e3d0c47c853274347a737190d1 assets/byg/models/item/maple_crafting_table.json +4c3cd122e6f83a16e44dd8fa51c191d59d400f0b assets/byg/models/item/maple_door.json +de1fb00c2ef5c82a95587827b77f484bb35fcb16 assets/byg/models/item/maple_fence.json +7a5242ab08431a6d00c8f04dc744768cbf086fe5 assets/byg/models/item/maple_fence_gate.json +2580b3db140bed74c28ffa213176e485fdb3ea5f assets/byg/models/item/maple_leaves.json +45213c10d8cf696376ebf82abcc63ad943f20985 assets/byg/models/item/maple_log.json +730755678662904e796b4d44afacb09a842c4ee0 assets/byg/models/item/maple_planks.json +02133c31cf8512d4ccd15d1277f2bf45754484d6 assets/byg/models/item/maple_pressure_plate.json +e7486c85fd736d98c7f06c5a487dab8e2c942a83 assets/byg/models/item/maple_sapling.json +5d86a101ab8baebcb9a683f6d71ef95b3a075fc4 assets/byg/models/item/maple_slab.json +4dc6e718612425205a9afefdf089d4440612a6cc assets/byg/models/item/maple_stairs.json +32d8ea1a4b9a5b95e36d4152e9a221bfd2d29c92 assets/byg/models/item/maple_trapdoor.json +968f1aa353ba79de353264ed58545f2fb2066848 assets/byg/models/item/maple_wood.json d9852a7fff6598719476cf3d0ab8ca823c4d057f assets/byg/models/item/nightshade_bookshelf.json b1fb5becac68091065fd9495073dbedba6a48109 assets/byg/models/item/nightshade_button.json 94aa426bb94a09dcdb4c19ccd90c68420e1400b6 assets/byg/models/item/nightshade_crafting_table.json @@ -1724,10 +1861,14 @@ b0d668ef92fa26d739f0fb38fdd5fce090ce6b49 assets/byg/models/item/stripped_fir_log be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_enchanted_wood.json 700f07776e23d57776aeb0635dcc3b73d16f09db assets/byg/models/item/stripped_holly_log.json 8527fb1522dc86c8fee094163603e6cb39c685a0 assets/byg/models/item/stripped_holly_wood.json +578584d2b4fb3da894b78a8c0c00447fc11b6412 assets/byg/models/item/stripped_lament_log.json +6640a4be3b53ba3a87cd1e41ab25775dd56382aa assets/byg/models/item/stripped_lament_wood.json 8d712c44b14eee5ab993f13a6d92cc925b483716 assets/byg/models/item/stripped_mahogany_log.json 3cb6f573ba8293f70be4617d65d0238ec7b57324 assets/byg/models/item/stripped_mahogany_wood.json 15b7617de1da389e5b34feb74834b5558c69631b assets/byg/models/item/stripped_mangrove_log.json 9db799e21b94bb971d782aa6642ba2f2a5d19d7f assets/byg/models/item/stripped_mangrove_wood.json +31e7479a15aaba2248fa0c037569a8a5edd29715 assets/byg/models/item/stripped_maple_log.json +feef3a493d873d12296f022e763ae2d9f3b05cb0 assets/byg/models/item/stripped_maple_wood.json ecb14641a281653709e15369a027afb36b73bc28 assets/byg/models/item/stripped_nightshade_log.json 89ecc0a3969ef6928bc7f9bcb48c6c86e3a33904 assets/byg/models/item/stripped_nightshade_wood.json 68eb2889df27becb11fe966b959e12d309f72e62 assets/byg/models/item/stripped_palm_log.json @@ -1989,6 +2130,18 @@ e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/w 21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json ae49ef7c283fbe64a3b191ec6edf9b54a573b336 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json +4df2f89704dc8609e4f7756cadcaf3d95a8dc794 data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json +fc5cdeb834d0985ad3bab1b2f59db019fd042b4b data/byg/advancements/recipes/byg.byg/wood/lament/button.json +44a3bb049b373b6a3d4bfdf9070fc43d8d0c2ce2 data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json +4844572bf9699f433b8a28a8d9195c8f8aace1d4 data/byg/advancements/recipes/byg.byg/wood/lament/door.json +2105f6f01a35ae4acb40ae497d7e7044244f64ed data/byg/advancements/recipes/byg.byg/wood/lament/fence.json +d0bca869b44928eb27282f5a4b4afe9a254b74b3 data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json +b61ba3e679c804622eeb07bfd53d694099e83c1c data/byg/advancements/recipes/byg.byg/wood/lament/planks.json +974735c810011ed37ecf7993137390066049c5ed data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json +0f35cac5b1c9806eb1dd8723c92bb5273feb2988 data/byg/advancements/recipes/byg.byg/wood/lament/slab.json +b9c56f373d702e86e512a481a78d2ecbf0100898 data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json +62ecbf2fdc225488e8b44bbb3c54f000055d43bd data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json +b5233e20730415dc4e495a7e5b85b2d92e4ea3d4 data/byg/advancements/recipes/byg.byg/wood/lament/wood.json 95786d1aed14c5652fc8682bb9d7fcf359bf734b data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json 0d446dad280dcbe8707ad2c7a5932caf788acc52 data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json 149437419bb7ad500a7c8b60c54da40d0977d6bd data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json @@ -2015,6 +2168,19 @@ cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/w c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json 80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json 8e68638672aded0392ab42d4d99747032a597867 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json +43faec67909f1522a7285229365a9a74cb0ad37a data/byg/advancements/recipes/byg.byg/wood/maple/boat.json +b467c6707348baef2f15cef04c23ff4a24576de1 data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json +b2883df48e5663f2fb64d4192ff2bcdcad0e81e0 data/byg/advancements/recipes/byg.byg/wood/maple/button.json +edfad60db534edb1922271caf4e9d167898b4d6a data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json +d9a9cda1cda4ccd5094e5bdd47a99729b4f3f6de data/byg/advancements/recipes/byg.byg/wood/maple/door.json +d5afcf929b117947a249d990c7a38c1329602d83 data/byg/advancements/recipes/byg.byg/wood/maple/fence.json +403c513bdfe578de2ea2726773f16770ed3d9f90 data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json +b2b8f0a248822d59d7decf84408e84f067bc4250 data/byg/advancements/recipes/byg.byg/wood/maple/planks.json +02563db07b402d445c35fd495bd615c66aa46517 data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json +b723b3e3ecf3d647499b4afea51157d5be61b830 data/byg/advancements/recipes/byg.byg/wood/maple/slab.json +8f3ed300254a103a0bf9b49eb0a6bc4527f3e2a0 data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json +2462c5675fe9ea34bc455e158b73d28f2b995210 data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json +dbd728616dad0e093ced3413b877a61ac4553ba2 data/byg/advancements/recipes/byg.byg/wood/maple/wood.json ca3828e70ccfd562118f860470807c205294bd08 data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json b0cc3d01f15d0ed8ecbc72784297f5eeee23f2c4 data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json d7cd6788013f6af1288e4ffea4778200b7661e83 data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json @@ -2321,6 +2487,18 @@ fda598130e789b7ae529c1bc27e4bdbe27164238 data/byg/recipes/wood/imparius/fence_ga 7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json 67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json 7868a447edb00b506360fadccf7494ef456a775e data/byg/recipes/wood/imparius/wood.json +4054d9b7c8238fa3adf7e614844603aa119b7310 data/byg/recipes/wood/lament/bookshelf.json +450b8b29ef6d74ee50c8459e1a0baab86b25893b data/byg/recipes/wood/lament/button.json +804b7b6478646d9282f0af35fa3d2d679272b6f3 data/byg/recipes/wood/lament/crafting_table.json +b12fad2e730589d29459831f7b8628f7911b0c29 data/byg/recipes/wood/lament/door.json +4d0b6f95902432f614a4fa02591afa860c01abe7 data/byg/recipes/wood/lament/fence.json +b7d2d12aa998660f5017638cb2fd6d22a6be70ab data/byg/recipes/wood/lament/fence_gate.json +692a2814497aaedfea9746a7ae48eef7981b5c0a data/byg/recipes/wood/lament/planks.json +7f724e794ef82417b257e1c7e598b27f5ca65ede data/byg/recipes/wood/lament/pressure_plate.json +71d034e12ad67752a6dcbe6d673afe255d2ed685 data/byg/recipes/wood/lament/slab.json +2a894b5f0b7a5c2db4cc0c14536b244c263aab85 data/byg/recipes/wood/lament/stairs.json +e6052e40cf349355523ed97c22b58d894b33dfac data/byg/recipes/wood/lament/trapdoor.json +96789af2a774b33fde222f103233578660b81dbc data/byg/recipes/wood/lament/wood.json a0efd20b844663b3dfe5cd5b5861ae78f9b1dd0a data/byg/recipes/wood/mahogany/boat.json bd227ea44f539c1b70089a8faeab074bf9fb0002 data/byg/recipes/wood/mahogany/bookshelf.json 2c4490731c6f1e34847594539b87684359d4d53b data/byg/recipes/wood/mahogany/button.json @@ -2347,6 +2525,19 @@ b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshel 5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json 9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json abd1d968c12a7255a1504388adb8d92700c82692 data/byg/recipes/wood/mangrove/wood.json +96f4d2778247741c4a7ffe60f32e75be1f31ba15 data/byg/recipes/wood/maple/boat.json +d796470649d727ee1e163eaa77375ad1b7193c86 data/byg/recipes/wood/maple/bookshelf.json +75f2707b23ede4528b8d4e76d7bdac4edf39231c data/byg/recipes/wood/maple/button.json +377b35f88e1a85b0c71f467c0100911d0d64c6ce data/byg/recipes/wood/maple/crafting_table.json +bf5cfa798ad7e708dd16afff436ad8bb0c45d40c data/byg/recipes/wood/maple/door.json +9f077e298edf3d7be1dc035cfb668afe2a7061f5 data/byg/recipes/wood/maple/fence.json +468b815ccb741a89849d14bac728ded7635f3276 data/byg/recipes/wood/maple/fence_gate.json +7be46c11bac419d1eac8c00db392a8b3f71c3c88 data/byg/recipes/wood/maple/planks.json +b12a4b910686e06a3176bc93b7628ace019b25b6 data/byg/recipes/wood/maple/pressure_plate.json +f063860c7a1f68d86917c62eb28233956bb9b508 data/byg/recipes/wood/maple/slab.json +b053481f3918d9dbe880b262aa27501676905bac data/byg/recipes/wood/maple/stairs.json +e71c7a2b907d8dc2bcd9d44c9a7f06b757d2d19f data/byg/recipes/wood/maple/trapdoor.json +5b97b63955213b1ab400e6e615898b0429946682 data/byg/recipes/wood/maple/wood.json 40bb384c86428a74cf2149b91ef2a14b02bfb092 data/byg/recipes/wood/nightshade/bookshelf.json fb731632fc441eef65edd773e72759b185c6d866 data/byg/recipes/wood/nightshade/button.json e941f260e96d1c82a0fc2cb9622edd227269733d data/byg/recipes/wood/nightshade/crafting_table.json @@ -2613,8 +2804,10 @@ b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json 47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/blocks/wood/holly_logs.json 60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json +9e22dce46462b6eeabc33cc58ddca514d843c59a data/byg/tags/blocks/wood/lament_logs.json 095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json 5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json +a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/blocks/wood/maple_logs.json 88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/blocks/wood/nightshade_logs.json 701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json @@ -2639,8 +2832,10 @@ cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json 664f79bad1ce2f2fcb9938fb32b5feff7501cb53 data/byg/tags/items/wood/holly_logs.json 265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json +5af2d8f08cb849a0f9bae686b5a9a4404abbc2a0 data/byg/tags/items/wood/lament_logs.json d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json 5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json +5c545bef58cf72828e52865e8593dcfe2924b4cd data/byg/tags/items/wood/maple_logs.json 1f67e3ee3ad89eb98f5135e669b341697aaa8730 data/byg/tags/items/wood/nightshade_logs.json cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/lament_bookshelf.json new file mode 100644 index 0000000000..9bc885baac --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_button.json b/Common/src/generated/resources/assets/byg/blockstates/lament_button.json new file mode 100644 index 0000000000..f51fff0d0e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { + "model": "byg:block/lament/button_inventory" + }, + "face=wall,facing=north,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/lament/button_inventory", + "y": 180 + }, + "face=wall,facing=south,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "byg:block/lament/button_inventory", + "y": 270 + }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "byg:block/lament/button_inventory", + "y": 90 + }, + "face=wall,facing=east,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/lament/button_inventory", + "x": 180, + "y": 270 + }, + "face=floor,facing=north,powered=true": { + "model": "byg:block/lament/button_pressed" + }, + "face=wall,facing=north,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 90, + "uvlock": true + }, + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/lament/button_pressed", + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 90, + "y": 180, + "uvlock": true + }, + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180 + }, + "face=floor,facing=west,powered=true": { + "model": "byg:block/lament/button_pressed", + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "byg:block/lament/button_pressed", + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/lament_crafting_table.json new file mode 100644 index 0000000000..eb02e4a904 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_door.json b/Common/src/generated/resources/assets/byg/blockstates/lament_door.json new file mode 100644 index 0000000000..74c214e577 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door_top", + "y": 270 + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door_top", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door_top", + "y": 180 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door_top" + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door_bottom", + "y": 270 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door_bottom", + "y": 90 + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door_bottom", + "y": 180 + }, + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door_top_hinge", + "y": 270 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door_top_hinge", + "y": 90 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door_top_hinge", + "y": 180 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door_top_hinge" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 270 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 90 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 180 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door_bottom_hinge" + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door_top_hinge" + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door_top_hinge", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door_top_hinge", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door_top_hinge", + "y": 90 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 270 + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door_bottom_hinge", + "y": 90 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door_top", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door_top" + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door_top", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door_top", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door_bottom", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door_bottom", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door_bottom", + "y": 270 + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_fence.json b/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json similarity index 69% rename from Common/src/main/resources/assets/byg/blockstates/lament_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/lament_fence.json index a117ace004..1aef989f2a 100644 --- a/Common/src/main/resources/assets/byg/blockstates/lament_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json @@ -2,46 +2,46 @@ "multipart": [ { "apply": { - "model": "byg:block/lament_fence_post" + "model": "byg:block/lament/fence_post" } }, { - "apply": { - "model": "byg:block/lament_fence_side", - "uvlock": true - }, "when": { "north": "true" - } - }, - { + }, "apply": { - "model": "byg:block/lament_fence_side", - "y": 90, + "model": "byg:block/lament/fence", "uvlock": true - }, - "when": { - "east": "true" } }, { + "when": { + "south": "true" + }, "apply": { - "model": "byg:block/lament_fence_side", + "model": "byg:block/lament/fence", "y": 180, "uvlock": true - }, - "when": { - "south": "true" } }, { + "when": { + "west": "true" + }, "apply": { - "model": "byg:block/lament_fence_side", + "model": "byg:block/lament/fence", "y": 270, "uvlock": true - }, + } + }, + { "when": { - "west": "true" + "east": "true" + }, + "apply": { + "model": "byg:block/lament/fence", + "y": 90, + "uvlock": true } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json new file mode 100644 index 0000000000..5726d16587 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/lament_leaves.json new file mode 100644 index 0000000000..771cab44cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_log.json b/Common/src/generated/resources/assets/byg/blockstates/lament_log.json new file mode 100644 index 0000000000..22011db762 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/lament/log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/lament/log" + }, + "axis=z": { + "model": "byg:block/lament/log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_planks.json b/Common/src/generated/resources/assets/byg/blockstates/lament_planks.json new file mode 100644 index 0000000000..b9d209474f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/lament_pressure_plate.json new file mode 100644 index 0000000000..63d4e9b729 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/lament/pressure_plate" + }, + "powered=true": { + "model": "byg:block/lament/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/lament_sapling.json new file mode 100644 index 0000000000..efe89c9f59 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json b/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json new file mode 100644 index 0000000000..4d23de2701 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/lament/slab_top" + }, + "type=bottom": { + "model": "byg:block/lament/slab" + }, + "type=double": { + "model": "byg:block/lament/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json new file mode 100644 index 0000000000..8cfff7effa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json new file mode 100644 index 0000000000..19ae885cb7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=north,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top" + }, + "facing=south,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top", + "y": 180 + }, + "facing=west,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top", + "y": 270 + }, + "facing=east,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom" + }, + "facing=south,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 270 + }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 90 + }, + "facing=north,half=top,open=true": { + "model": "byg:block/lament/trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "byg:block/lament/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/lament/trapdoor_open", + "x": 180, + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "byg:block/lament/trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_wood.json b/Common/src/generated/resources/assets/byg/blockstates/lament_wood.json new file mode 100644 index 0000000000..8805ea1a61 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/lament/wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/lament/wood" + }, + "axis=z": { + "model": "byg:block/lament/wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/maple_bookshelf.json new file mode 100644 index 0000000000..ff9a07c1f0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_button.json b/Common/src/generated/resources/assets/byg/blockstates/maple_button.json similarity index 53% rename from Common/src/main/resources/assets/byg/blockstates/maple_button.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_button.json index d377e59d01..58b0d12fb4 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_button.json @@ -1,118 +1,118 @@ { "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/maple_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/maple_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/maple_button", - "y": 180 - }, "face=floor,facing=north,powered=false": { - "model": "byg:block/maple_button" + "model": "byg:block/maple/button_inventory" }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/maple_button", - "uvlock": true, + "face=wall,facing=north,powered=false": { + "model": "byg:block/maple/button_inventory", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/maple_button", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/maple/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/maple/button_inventory", + "y": 180 }, "face=wall,facing=south,powered=false": { - "model": "byg:block/maple_button", - "uvlock": true, + "model": "byg:block/maple/button_inventory", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/maple_button", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/maple/button_inventory", + "x": 180 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/maple_button", - "x": 180, + "face=floor,facing=west,powered=false": { + "model": "byg:block/maple/button_inventory", "y": 270 }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/maple/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=false": { - "model": "byg:block/maple_button", + "model": "byg:block/maple/button_inventory", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/maple_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/maple_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/maple_button_pressed", + "face=floor,facing=east,powered=false": { + "model": "byg:block/maple/button_inventory", "y": 90 }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/maple_button_pressed", - "y": 270 + "face=wall,facing=east,powered=false": { + "model": "byg:block/maple/button_inventory", + "x": 90, + "y": 90, + "uvlock": true }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/maple_button_pressed", - "y": 180 + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/maple/button_inventory", + "x": 180, + "y": 270 }, "face=floor,facing=north,powered=true": { - "model": "byg:block/maple_button_pressed" + "model": "byg:block/maple/button_pressed" }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/maple_button_pressed", - "uvlock": true, + "face=wall,facing=north,powered=true": { + "model": "byg:block/maple/button_pressed", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/maple_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/maple/button_pressed", + "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "byg:block/maple_button_pressed", - "uvlock": true, + "model": "byg:block/maple/button_pressed", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/maple_button_pressed", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180 }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/maple_button_pressed", - "x": 180, + "face=floor,facing=west,powered=true": { + "model": "byg:block/maple/button_pressed", "y": 270 }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=true": { - "model": "byg:block/maple_button_pressed", + "model": "byg:block/maple/button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/maple_button_pressed", - "x": 180 + "face=floor,facing=east,powered=true": { + "model": "byg:block/maple/button_pressed", + "y": 90 }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/maple_button_pressed", + "face=wall,facing=east,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/maple/button_pressed", "x": 180, - "y": 180 + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/maple_crafting_table.json new file mode 100644 index 0000000000..3996575b16 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_door.json b/Common/src/generated/resources/assets/byg/blockstates/maple_door.json similarity index 60% rename from Common/src/main/resources/assets/byg/blockstates/maple_door.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_door.json index 06ac1837e6..6a01fa25bd 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/maple_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door_top", + "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/maple_door_bottom", + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door_top", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/maple_door_bottom", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door_top", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door_top" + }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/maple_door_bottom", + "model": "byg:block/maple/door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/maple_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/maple_door_bottom_hinge", + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/maple_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/maple_door_bottom_hinge", + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door_top_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/maple_door_bottom_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door_top_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/maple_door_bottom_hinge", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door_top_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/maple_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/maple_door_bottom_hinge" + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door_top_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/maple_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door_bottom_hinge", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/maple_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/maple_door_bottom", + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door_bottom_hinge", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/maple_door_bottom", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door_bottom_hinge", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/maple_door_top" + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door_bottom_hinge" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/maple_door_top", - "y": 90 + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door_top_hinge" }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/maple_door_top", + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door_top_hinge", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/maple_door_top", + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door_top_hinge", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/maple_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/maple_door_top_hinge", + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door_top_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/maple_door_top_hinge", + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door_bottom_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/maple_door_top_hinge", + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door_bottom_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/maple_door_top_hinge", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door_bottom_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/maple_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door_top", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/maple_door_top_hinge", - "y": 270 + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door_top" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/maple_door_top_hinge" + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door_top", + "y": 90 }, "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/maple_door_top", + "model": "byg:block/maple/door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/maple_door_top" + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door_bottom", + "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/maple_door_top", + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door_bottom", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/maple_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door_bottom", + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_fence.json b/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json similarity index 72% rename from Common/src/main/resources/assets/byg/blockstates/maple_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_fence.json index 7b372a01ba..34795f391d 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "byg:block/maple_fence_post" + "model": "byg:block/maple/fence_post" } }, { @@ -10,7 +10,7 @@ "north": "true" }, "apply": { - "model": "byg:block/maple_fence", + "model": "byg:block/maple/fence", "uvlock": true } }, @@ -19,7 +19,7 @@ "south": "true" }, "apply": { - "model": "byg:block/maple_fence", + "model": "byg:block/maple/fence", "y": 180, "uvlock": true } @@ -29,7 +29,7 @@ "west": "true" }, "apply": { - "model": "byg:block/maple_fence", + "model": "byg:block/maple/fence", "y": 270, "uvlock": true } @@ -39,7 +39,7 @@ "east": "true" }, "apply": { - "model": "byg:block/maple_fence", + "model": "byg:block/maple/fence", "y": 90, "uvlock": true } diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json new file mode 100644 index 0000000000..284adbf9e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/maple_leaves.json new file mode 100644 index 0000000000..0169c729df --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_log.json b/Common/src/generated/resources/assets/byg/blockstates/maple_log.json similarity index 53% rename from Common/src/main/resources/assets/byg/blockstates/maple_log.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_log.json index bd1f02aa71..529604aedf 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_log.json @@ -1,17 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/maple/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/maple_log" + "model": "byg:block/maple/log" }, "axis=z": { - "model": "byg:block/maple_log", + "model": "byg:block/maple/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/maple_log", - "x": 90, - "y": 90 } } -} - +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_planks.json b/Common/src/generated/resources/assets/byg/blockstates/maple_planks.json new file mode 100644 index 0000000000..c07e4455cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/maple_pressure_plate.json new file mode 100644 index 0000000000..ab274ab786 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/maple/pressure_plate" + }, + "powered=true": { + "model": "byg:block/maple/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/maple_sapling.json new file mode 100644 index 0000000000..5067cacd4c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json b/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json new file mode 100644 index 0000000000..890569c2e5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/maple/slab_top" + }, + "type=bottom": { + "model": "byg:block/maple/slab" + }, + "type=double": { + "model": "byg:block/maple/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json similarity index 67% rename from Common/src/main/resources/assets/byg/blockstates/maple_stairs.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json index 90d0900ffc..e417d555c2 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/maple_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/maple_stairs", - "y": 180, + "facing=north,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "x": 180, + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/maple_stairs", + "facing=south,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/maple_stairs", - "y": 270, + "facing=west,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "x": 180, + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/maple_stairs_inner" + "facing=east,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "x": 180, + "uvlock": true }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", - "y": 180, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", - "y": 270, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "x": 180, "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "x": 180, "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/maple_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/maple_stairs", + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/maple_stairs", - "x": 180, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/maple_stairs", - "x": 180, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/maple_stairs", - "x": 180, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", "x": 180, - "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", "x": 180, + "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", "x": 180, + "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", - "x": 180, - "y": 180, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", + "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", - "x": 180, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", "y": 90, "uvlock": true }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner" + }, "facing=north,half=top,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", + "model": "byg:block/maple/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", "x": 180, - "y": 270, + "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/maple_stairs_inner", - "x": 180, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "y": 90, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "y": 270, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", "x": 180, - "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", "x": 180, - "y": 90, + "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/maple_stairs_inner", + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/maple_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", + "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/maple_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", + "model": "byg:block/maple/stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/maple_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/maple_stairs_outer", + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", "y": 180, "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/maple/stairs_outer" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json similarity index 56% rename from Common/src/main/resources/assets/byg/blockstates/maple_trapdoor.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json index 4e2d53f405..2ab5b3c1be 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json @@ -1,69 +1,68 @@ { "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/maple_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/maple_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/maple_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/maple_trapdoor_bottom", - "y": 270 - }, "facing=north,half=top,open=false": { - "model": "byg:block/maple_trapdoor_top" + "model": "byg:block/maple/trapdoor_top" }, "facing=south,half=top,open=false": { - "model": "byg:block/maple_trapdoor_top", + "model": "byg:block/maple/trapdoor_top", "y": 180 }, - "facing=east,half=top,open=false": { - "model": "byg:block/maple_trapdoor_top", - "y": 90 - }, "facing=west,half=top,open=false": { - "model": "byg:block/maple_trapdoor_top", + "model": "byg:block/maple/trapdoor_top", "y": 270 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/maple_trapdoor_open" + "facing=east,half=top,open=false": { + "model": "byg:block/maple/trapdoor_top", + "y": 90 }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/maple_trapdoor_open", - "y": 180 + "facing=north,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom" }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/maple_trapdoor_open", - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", + "y": 180 }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/maple_trapdoor_open", + "facing=west,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", "y": 270 }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", + "y": 90 + }, "facing=north,half=top,open=true": { - "model": "byg:block/maple_trapdoor_open", + "model": "byg:block/maple/trapdoor_open", "x": 180, "y": 180 }, "facing=south,half=top,open=true": { - "model": "byg:block/maple_trapdoor_open", + "model": "byg:block/maple/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/maple/trapdoor_open", "x": 180, - "y": 0 + "y": 90 }, "facing=east,half=top,open=true": { - "model": "byg:block/maple_trapdoor_open", + "model": "byg:block/maple/trapdoor_open", "x": 180, "y": 270 }, - "facing=west,half=top,open=true": { - "model": "byg:block/maple_trapdoor_open", - "x": 180, + "facing=north,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open", "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_wood.json b/Common/src/generated/resources/assets/byg/blockstates/maple_wood.json similarity index 52% rename from Common/src/main/resources/assets/byg/blockstates/maple_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/maple_wood.json index a1e5dab196..6a628d955d 100644 --- a/Common/src/main/resources/assets/byg/blockstates/maple_wood.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_wood.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/maple/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/maple_wood" + "model": "byg:block/maple/wood" }, "axis=z": { - "model": "byg:block/maple_wood", + "model": "byg:block/maple/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/maple_wood", - "x": 90, - "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_lament_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_lament_sapling.json new file mode 100644 index 0000000000..7c21d6d911 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_lament_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_maple_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_maple_sapling.json new file mode 100644 index 0000000000..05e64268e4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_maple_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_log.json new file mode 100644 index 0000000000..402bc6b18a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/lament/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/lament/stripped_log" + }, + "axis=z": { + "model": "byg:block/lament/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_wood.json new file mode 100644 index 0000000000..d586d49f8e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_lament_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/lament/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/lament/stripped_wood" + }, + "axis=z": { + "model": "byg:block/lament/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_log.json new file mode 100644 index 0000000000..a16193c665 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/maple/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/maple/stripped_log" + }, + "axis=z": { + "model": "byg:block/maple/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_wood.json new file mode 100644 index 0000000000..abd9f39a05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_maple_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/maple/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/maple/stripped_wood" + }, + "axis=z": { + "model": "byg:block/maple/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json new file mode 100644 index 0000000000..0cd3513ba4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/lament/planks", + "up": "byg:block/lament/planks", + "north": "byg:block/lament/bookshelf", + "south": "byg:block/lament/bookshelf", + "east": "byg:block/lament/bookshelf", + "west": "byg:block/lament/bookshelf", + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_button.json b/Common/src/generated/resources/assets/byg/models/block/lament/button.json similarity index 59% rename from Common/src/main/resources/assets/byg/models/block/lament_button.json rename to Common/src/generated/resources/assets/byg/models/block/lament/button.json index 0fb4b5af07..3b197582b1 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_button.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/button.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/lament/button_inventory.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/lament_button_inventory.json rename to Common/src/generated/resources/assets/byg/models/block/lament/button_inventory.json index 7fa5a80319..8efc11bef5 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_button_inventory.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/button_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_inventory", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/lament/button_pressed.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/lament_button_pressed.json rename to Common/src/generated/resources/assets/byg/models/block/lament/button_pressed.json index ae7fe57740..8108a28736 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_button_pressed.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/button_pressed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/button_pressed", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json new file mode 100644 index 0000000000..5a54298589 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/lament/planks", + "up": "byg:block/lament/crafting_table_top", + "north": "byg:block/lament/crafting_table_front", + "south": "byg:block/lament/crafting_table_side", + "east": "byg:block/lament/crafting_table_side", + "west": "byg:block/lament/crafting_table_front", + "particle": "byg:block/lament/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json new file mode 100644 index 0000000000..e2125198e5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json new file mode 100644 index 0000000000..e29d6cdbbc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_top.json b/Common/src/generated/resources/assets/byg/models/block/lament/door_top.json new file mode 100644 index 0000000000..31de5e991f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json new file mode 100644 index 0000000000..ee1880caed --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence.json new file mode 100644 index 0000000000..e1746e7d7e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/lament/planks", + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/lament_fence_gate.json rename to Common/src/generated/resources/assets/byg/models/block/lament/fence_gate.json index 276f628ac3..f07b3475e7 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_open.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/lament_fence_gate_open.json rename to Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_open.json index 1ce0508b5c..6dbd9c6f44 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall.json similarity index 65% rename from Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall.json rename to Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall.json index ee4a88c95b..129e45585c 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall_open.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall_open.json rename to Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall_open.json index b703c49be3..b035ed84d9 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_gate_wall_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json new file mode 100644 index 0000000000..0b1d9aff0a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/lament/planks", + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json new file mode 100644 index 0000000000..05eb86d819 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/lament/planks", + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/lament/grower_item.json new file mode 100644 index 0000000000..7366e4f853 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/lament/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json b/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json new file mode 100644 index 0000000000..ad81c2a93f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/lament/leaves", + "up": "byg:block/lament/leaves", + "north": "byg:block/lament/leaves", + "south": "byg:block/lament/leaves", + "east": "byg:block/lament/leaves", + "west": "byg:block/lament/leaves", + "particle": "byg:block/lament/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json new file mode 100644 index 0000000000..98c31b958e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/lament/leaves_snowy", + "up": "byg:block/lament/leaves_snowy", + "north": "byg:block/lament/leaves_snowy_side", + "south": "byg:block/lament/leaves_snowy_side", + "east": "byg:block/lament/leaves_snowy_side", + "west": "byg:block/lament/leaves_snowy_side", + "particle": "byg:block/lament/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/log.json b/Common/src/generated/resources/assets/byg/models/block/lament/log.json new file mode 100644 index 0000000000..75427f58c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/lament/log", + "end": "byg:block/lament/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/planks.json b/Common/src/generated/resources/assets/byg/models/block/lament/planks.json new file mode 100644 index 0000000000..1a8b3824bb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/lament/planks", + "up": "byg:block/lament/planks", + "north": "byg:block/lament/planks", + "south": "byg:block/lament/planks", + "east": "byg:block/lament/planks", + "west": "byg:block/lament/planks", + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_maple_sapling.json b/Common/src/generated/resources/assets/byg/models/block/lament/potted_grower_item.json similarity index 61% rename from Common/src/main/resources/assets/byg/models/block/potted_maple_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/lament/potted_grower_item.json index 9443fd11f1..26756876ba 100644 --- a/Common/src/main/resources/assets/byg/models/block/potted_maple_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/potted_grower_item.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "byg:block/maple_sapling" + "plant": "byg:block/lament/grower_item" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/block/lament_pressure_plate.json rename to Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate.json index a121349acb..9502a5f8fa 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_up", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate_down.json similarity index 64% rename from Common/src/main/resources/assets/byg/models/block/lament_pressure_plate_down.json rename to Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate_down.json index 511cf37e1f..2618c17bbc 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_pressure_plate_down.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/pressure_plate_down.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/pressure_plate_down", "textures": { - "texture": "byg:block/lament_planks" + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/slab.json b/Common/src/generated/resources/assets/byg/models/block/lament/slab.json new file mode 100644 index 0000000000..2e748bf484 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/lament/planks", + "bottom": "byg:block/lament/planks", + "top": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json new file mode 100644 index 0000000000..a691718664 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/lament/planks", + "bottom": "byg:block/lament/planks", + "top": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json new file mode 100644 index 0000000000..3b9ed81935 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/lament/planks", + "bottom": "byg:block/lament/planks", + "top": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json new file mode 100644 index 0000000000..0757397a2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/lament/planks", + "bottom": "byg:block/lament/planks", + "top": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json new file mode 100644 index 0000000000..141ca45fe0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/lament/planks", + "bottom": "byg:block/lament/planks", + "top": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json new file mode 100644 index 0000000000..de79f41bfe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/lament/stripped_log", + "end": "byg:block/lament/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_wood.json new file mode 100644 index 0000000000..78bcfe62ee --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/lament/stripped_log", + "particle": "byg:block/lament/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_bottom.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/lament_trapdoor_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_bottom.json index 63fd67d68f..e46ae41bae 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_bottom.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "byg:block/lament_trapdoor" + "texture": "byg:block/lament/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_open.json similarity index 67% rename from Common/src/main/resources/assets/byg/models/block/lament_trapdoor_open.json rename to Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_open.json index 6c1e49c200..81563bfbb5 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_open.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "byg:block/lament_trapdoor" + "texture": "byg:block/lament/trapdoor" } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_top.json similarity index 66% rename from Common/src/main/resources/assets/byg/models/block/lament_trapdoor_top.json rename to Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_top.json index 4ddcecff19..0459e5d794 100644 --- a/Common/src/main/resources/assets/byg/models/block/lament_trapdoor_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/trapdoor_top.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "byg:block/lament_trapdoor" + "texture": "byg:block/lament/trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/wood.json b/Common/src/generated/resources/assets/byg/models/block/lament/wood.json new file mode 100644 index 0000000000..76ff9cf8c7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/lament/log", + "particle": "byg:block/lament/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json new file mode 100644 index 0000000000..072a8cc7d8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/maple/planks", + "up": "byg:block/maple/planks", + "north": "byg:block/maple/bookshelf", + "south": "byg:block/maple/bookshelf", + "east": "byg:block/maple/bookshelf", + "west": "byg:block/maple/bookshelf", + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/button.json b/Common/src/generated/resources/assets/byg/models/block/maple/button.json new file mode 100644 index 0000000000..ba68984aa4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/maple/button_inventory.json new file mode 100644 index 0000000000..2705e92f1f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/maple/button_pressed.json new file mode 100644 index 0000000000..58d98e5ad0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json new file mode 100644 index 0000000000..1346a0fd91 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/maple/planks", + "up": "byg:block/maple/crafting_table_top", + "north": "byg:block/maple/crafting_table_front", + "south": "byg:block/maple/crafting_table_side", + "east": "byg:block/maple/crafting_table_side", + "west": "byg:block/maple/crafting_table_front", + "particle": "byg:block/maple/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json new file mode 100644 index 0000000000..eaf67843f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json new file mode 100644 index 0000000000..98b4733e55 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_top.json b/Common/src/generated/resources/assets/byg/models/block/maple/door_top.json new file mode 100644 index 0000000000..687681ecc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json new file mode 100644 index 0000000000..957911fac2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence.json new file mode 100644 index 0000000000..edf60144ef --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/maple/planks", + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate.json new file mode 100644 index 0000000000..bacc614f2c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_open.json new file mode 100644 index 0000000000..73a8ca83d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall.json new file mode 100644 index 0000000000..7ba040ac07 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall_open.json new file mode 100644 index 0000000000..32787386fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json new file mode 100644 index 0000000000..e4b4c25e31 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/maple/planks", + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json new file mode 100644 index 0000000000..81827a89c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/maple/planks", + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/maple/grower_item.json new file mode 100644 index 0000000000..c719ede574 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/maple/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json b/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json new file mode 100644 index 0000000000..ebfdf74fe9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/maple/leaves", + "up": "byg:block/maple/leaves", + "north": "byg:block/maple/leaves", + "south": "byg:block/maple/leaves", + "east": "byg:block/maple/leaves", + "west": "byg:block/maple/leaves", + "particle": "byg:block/maple/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json new file mode 100644 index 0000000000..e6162d1fc8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/maple/leaves_snowy", + "up": "byg:block/maple/leaves_snowy", + "north": "byg:block/maple/leaves_snowy_side", + "south": "byg:block/maple/leaves_snowy_side", + "east": "byg:block/maple/leaves_snowy_side", + "west": "byg:block/maple/leaves_snowy_side", + "particle": "byg:block/maple/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/log.json b/Common/src/generated/resources/assets/byg/models/block/maple/log.json new file mode 100644 index 0000000000..5c66eb17e0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/maple/log", + "end": "byg:block/maple/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/planks.json b/Common/src/generated/resources/assets/byg/models/block/maple/planks.json new file mode 100644 index 0000000000..b02c91b093 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/maple/planks", + "up": "byg:block/maple/planks", + "north": "byg:block/maple/planks", + "south": "byg:block/maple/planks", + "east": "byg:block/maple/planks", + "west": "byg:block/maple/planks", + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_lament_sapling.json b/Common/src/generated/resources/assets/byg/models/block/maple/potted_grower_item.json similarity index 62% rename from Common/src/main/resources/assets/byg/models/block/potted_lament_sapling.json rename to Common/src/generated/resources/assets/byg/models/block/maple/potted_grower_item.json index a605f5c39f..798162340e 100644 --- a/Common/src/main/resources/assets/byg/models/block/potted_lament_sapling.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/potted_grower_item.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "byg:block/lament_sapling" + "plant": "byg:block/maple/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate.json new file mode 100644 index 0000000000..7eb4871141 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate_down.json new file mode 100644 index 0000000000..ce032d2ee4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/slab.json b/Common/src/generated/resources/assets/byg/models/block/maple/slab.json new file mode 100644 index 0000000000..5de7a467a5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/maple/planks", + "bottom": "byg:block/maple/planks", + "top": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json new file mode 100644 index 0000000000..39f8534ed5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/maple/planks", + "bottom": "byg:block/maple/planks", + "top": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json new file mode 100644 index 0000000000..6e20289757 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/maple/planks", + "bottom": "byg:block/maple/planks", + "top": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json new file mode 100644 index 0000000000..0a4a44f868 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/maple/planks", + "bottom": "byg:block/maple/planks", + "top": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json new file mode 100644 index 0000000000..7076e0a615 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/maple/planks", + "bottom": "byg:block/maple/planks", + "top": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json new file mode 100644 index 0000000000..2af82cc76a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/maple/stripped_log", + "end": "byg:block/maple/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_wood.json new file mode 100644 index 0000000000..88862f6f77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/maple/stripped_log", + "particle": "byg:block/maple/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_bottom.json new file mode 100644 index 0000000000..0e9af261c3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/maple/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_open.json new file mode 100644 index 0000000000..1fd1d763cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/maple/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_top.json new file mode 100644 index 0000000000..f9c05c82f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/maple/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/wood.json b/Common/src/generated/resources/assets/byg/models/block/maple/wood.json new file mode 100644 index 0000000000..91c11c81bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/maple/log", + "particle": "byg:block/maple/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json new file mode 100644 index 0000000000..a499163a6b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_button.json b/Common/src/generated/resources/assets/byg/models/item/lament_button.json new file mode 100644 index 0000000000..f64deb8e46 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json new file mode 100644 index 0000000000..fc0aba5b69 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_door.json b/Common/src/generated/resources/assets/byg/models/item/lament_door.json similarity index 63% rename from Common/src/main/resources/assets/byg/models/item/lament_door.json rename to Common/src/generated/resources/assets/byg/models/item/lament_door.json index 57794252df..19679d8659 100644 --- a/Common/src/main/resources/assets/byg/models/item/lament_door.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "byg:item/lament_door" + "layer0": "byg:item/lament/door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_fence.json b/Common/src/generated/resources/assets/byg/models/item/lament_fence.json new file mode 100644 index 0000000000..b57b001eeb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/fence_inv", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json new file mode 100644 index 0000000000..0cef1c8a60 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json b/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json new file mode 100644 index 0000000000..35a2eac836 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_log.json b/Common/src/generated/resources/assets/byg/models/item/lament_log.json new file mode 100644 index 0000000000..ffcb2e4325 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_planks.json b/Common/src/generated/resources/assets/byg/models/item/lament_planks.json new file mode 100644 index 0000000000..84c8a95758 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json new file mode 100644 index 0000000000..91263407c1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_sapling.json b/Common/src/generated/resources/assets/byg/models/item/lament_sapling.json new file mode 100644 index 0000000000..55e80a493d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/lament/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_slab.json b/Common/src/generated/resources/assets/byg/models/item/lament_slab.json new file mode 100644 index 0000000000..8db8c789ed --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json b/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json new file mode 100644 index 0000000000..1b6282d08a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json new file mode 100644 index 0000000000..8162089467 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_wood.json b/Common/src/generated/resources/assets/byg/models/item/lament_wood.json new file mode 100644 index 0000000000..04caf44ebb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_boat.json b/Common/src/generated/resources/assets/byg/models/item/maple_boat.json new file mode 100644 index 0000000000..0c76a7bdbf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/maple/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json new file mode 100644 index 0000000000..22c837d4a8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_button.json b/Common/src/generated/resources/assets/byg/models/item/maple_button.json new file mode 100644 index 0000000000..f5d4e17c7d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json new file mode 100644 index 0000000000..e5da8c779b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_door.json b/Common/src/generated/resources/assets/byg/models/item/maple_door.json new file mode 100644 index 0000000000..997dbdd8dd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/maple/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_fence.json b/Common/src/generated/resources/assets/byg/models/item/maple_fence.json new file mode 100644 index 0000000000..b36e065318 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/fence_inv", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json new file mode 100644 index 0000000000..b2e9fabf2a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json b/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json new file mode 100644 index 0000000000..d42d9f005c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_log.json b/Common/src/generated/resources/assets/byg/models/item/maple_log.json new file mode 100644 index 0000000000..363834eeb8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_planks.json b/Common/src/generated/resources/assets/byg/models/item/maple_planks.json new file mode 100644 index 0000000000..31522b3ded --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json new file mode 100644 index 0000000000..810fe996e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_sapling.json b/Common/src/generated/resources/assets/byg/models/item/maple_sapling.json new file mode 100644 index 0000000000..517b513eb1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/maple/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_slab.json b/Common/src/generated/resources/assets/byg/models/item/maple_slab.json new file mode 100644 index 0000000000..854317de18 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json b/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json new file mode 100644 index 0000000000..28132525d7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json new file mode 100644 index 0000000000..a6782bc69f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_wood.json b/Common/src/generated/resources/assets/byg/models/item/maple_wood.json new file mode 100644 index 0000000000..f3aeb67fc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json new file mode 100644 index 0000000000..ff7188eab5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json new file mode 100644 index 0000000000..ef631077ff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/lament/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json new file mode 100644 index 0000000000..b440216898 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json new file mode 100644 index 0000000000..caf3357b97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/maple/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json new file mode 100644 index 0000000000..e1c0d01efd --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json new file mode 100644 index 0000000000..10c19bfe13 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json new file mode 100644 index 0000000000..a6b07cd168 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json new file mode 100644 index 0000000000..e278c57bb0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json new file mode 100644 index 0000000000..23f4fba178 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json new file mode 100644 index 0000000000..dae5d9af93 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json new file mode 100644 index 0000000000..b366d38663 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/lament_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json new file mode 100644 index 0000000000..5b16143e7e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json new file mode 100644 index 0000000000..58fcea9a36 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json new file mode 100644 index 0000000000..991214565b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json new file mode 100644 index 0000000000..dbb0fdfae3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json new file mode 100644 index 0000000000..126550a380 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json new file mode 100644 index 0000000000..e6caf93321 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json new file mode 100644 index 0000000000..f84e799ee2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json new file mode 100644 index 0000000000..2f7be167a4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json new file mode 100644 index 0000000000..eda31c77b0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json new file mode 100644 index 0000000000..a5c3ccbd18 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json new file mode 100644 index 0000000000..5a61003b44 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json new file mode 100644 index 0000000000..4b190ea084 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json new file mode 100644 index 0000000000..baa19c5883 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/maple_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json new file mode 100644 index 0000000000..ec03e64412 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json new file mode 100644 index 0000000000..b27e5a3b20 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json new file mode 100644 index 0000000000..8a5494b310 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json new file mode 100644 index 0000000000..2a5e63b62b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json new file mode 100644 index 0000000000..d71c4cba05 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/lament_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/lament_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json index 2863c58a3b..9d6ff707d2 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_button.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/lament_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/button.json diff --git a/Common/src/main/resources/data/byg/recipes/lament_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/lament_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json index 6dd9eadb60..4111582edb 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_door.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/lament_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/door.json index 55a366947f..93e3b3086e 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/lament_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/lament_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/lament_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/lament_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/lament_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json index 7abc325162..ead5894f9f 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:lament_logs" + "tag": "byg:wood/lament_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/lament_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/lament_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json index 0180c179c0..d9499c77ac 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/lament_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json index dc0107d994..a867eee0fb 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/lament_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json index f9c4388a33..e875a52d18 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, "result": { - "item": "byg:lament_stairs", + "item": "byg:lament_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/lament_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/lament_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json index ac39c32c04..1860c23682 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:lament_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/lament_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/lament_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json index 86da1ee068..9320cbeabc 100644 --- a/Common/src/main/resources/data/byg/recipes/lament_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:lament_log" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/maple_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json index 356e271bb8..b3ad4dba9b 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json similarity index 72% rename from Common/src/main/resources/data/byg/recipes/maple_bookshelf.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json index fe3dc22814..f6052b42ce 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", + "group": "bookshelf", "pattern": [ - "###", - "XXX", - "###" + "PPP", + "BBB", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" }, - "X": { + "B": { "item": "minecraft:book" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_button.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/maple_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/button.json diff --git a/Common/src/main/resources/data/byg/recipes/maple_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json similarity index 74% rename from Common/src/main/resources/data/byg/recipes/maple_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json index ad4e53d052..737004159e 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_door.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json similarity index 83% rename from Common/src/main/resources/data/byg/recipes/maple_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/door.json index 5bdfec60af..b59845ecd4 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/maple_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/maple_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/maple_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/maple_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/maple_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json index c82828b1e4..25ccc0240b 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:maple_logs" + "tag": "byg:wood/maple_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/maple_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/maple_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json index 36c7a0e78c..59e05f09a1 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json similarity index 90% rename from Common/src/main/resources/data/byg/recipes/maple_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json index 2a89a450cd..af65075cf4 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json similarity index 70% rename from Common/src/main/resources/data/byg/recipes/maple_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json index a6888b6493..75264ed9f8 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, "result": { - "item": "byg:maple_stairs", + "item": "byg:maple_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/maple_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/recipes/maple_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json index f7caa2d7f3..eb686017d9 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:maple_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/maple_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json similarity index 78% rename from Common/src/main/resources/data/byg/recipes/maple_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json index fc84ede950..08c06f8e65 100644 --- a/Common/src/main/resources/data/byg/recipes/maple_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:maple_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json new file mode 100644 index 0000000000..1371ffb20c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:lament_log", + "byg:lament_wood", + "byg:stripped_lament_log", + "byg:stripped_lament_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json new file mode 100644 index 0000000000..cfbcc95457 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:maple_log", + "byg:maple_wood", + "byg:stripped_maple_log", + "byg:stripped_maple_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json new file mode 100644 index 0000000000..3ba1cdcc3c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:lament_log", + "byg:stripped_lament_log", + "byg:lament_wood", + "byg:stripped_lament_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json new file mode 100644 index 0000000000..fe8f11a19f --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:maple_log", + "byg:stripped_maple_log", + "byg:maple_wood", + "byg:stripped_maple_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java index cde78eba9b..941222a8d7 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/ColorManager.java @@ -17,7 +17,7 @@ public class ColorManager { public static synchronized void onBlockColorsInit(BlockColors blockColors) { //registers the colors for blocks that changes colors based on biome blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageGrassColor(lightReader, pos) : GrassColor.get(0.5D, 1.0D), BYGBlocks.LUSH_GRASS_BLOCK.get(), BYGBlocks.OVERGROWN_STONE.get(), BYGBlocks.OVERGROWN_NETHERRACK.get(), BYGBlocks.TINY_LILYPADS.get(), BYGBlocks.FLOWERING_TINY_LILY_PADS.get(), BYGBlocks.OVERGROWN_DACITE.get(), BYGBlocks.NETHER_BRISTLE.get()); - blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGWoodTypes.MAHOGANY.leaves().get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGWoodTypes.WILLOW.leaves().get(), BYGBlocks.MAPLE_LEAVES.get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); + blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageFoliageColor(lightReader, pos) : FoliageColor.get(0.5D, 1.0D), BYGWoodTypes.MAHOGANY.leaves().get(), BYGBlocks.POISON_IVY.get(), BYGBlocks.LEAF_PILE.get(), BYGBlocks.ORCHARD_LEAVES.get(), BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), BYGBlocks.RIPE_ORCHARD_LEAVES.get(), BYGWoodTypes.WILLOW.leaves().get(), BYGWoodTypes.MAPLE.leaves().get(), BYGBlocks.JOSHUA_LEAVES.get(), BYGBlocks.RIPE_JOSHUA_LEAVES.get(), BYGWoodTypes.CYPRESS.leaves().get()); blockColors.register((unknown, lightReader, pos, unknown2) -> lightReader != null && pos != null ? BiomeColors.getAverageWaterColor(lightReader, pos) : -1, BYGBlocks.WATER_BARREL_CACTUS.get()); } @@ -34,6 +34,6 @@ public static synchronized void onItemColorsInit(BlockColors blockColors, ItemCo BYGItems.TINY_LILYPADS.get(), BYGItems.FLOWERING_TINY_LILY_PADS.get(), BYGItems.NETHER_BRISTLE.get(), BYGItems.OVERGROWN_DACITE.get(), BYGItems.LEAF_PILE.get(), BYGItems.ORCHARD_LEAVES.get(), BYGItems.FLOWERING_ORCHARD_LEAVES.get(), BYGItems.RIPE_ORCHARD_LEAVES.get(), BYGWoodTypes.WILLOW.leaves(), BYGWoodTypes.CYPRESS.leaves().get(), - BYGItems.MAPLE_LEAVES.get(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); + BYGWoodTypes.MAPLE.leaves(), BYGItems.JOSHUA_LEAVES.get(), BYGItems.RIPE_JOSHUA_LEAVES.get()); } } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index e78a383794..811c687991 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -17,7 +17,7 @@ public static void renderTypes(Consumer> mapConsumer) { for (BYGWoodTypes type : BYGWoodTypes.values()) { final var renderType = switch (type) { - case ASPEN, SKYRIS -> RenderType.translucent(); + case ASPEN, SKYRIS, MAPLE -> RenderType.translucent(); default -> RenderType.cutoutMipped(); }; map.put(type.door().get(), renderType); @@ -136,13 +136,9 @@ public static void renderTypes(Consumer> mapConsumer) { //Doors map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAPLE_DOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.LAMENT_DOOR.get(), RenderType.cutoutMipped()); //Trapdoors map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAPLE_TRAPDOOR.get(), RenderType.translucent()); - map.put(BYGBlocks.LAMENT_TRAPDOOR.get(), RenderType.cutoutMipped()); //Grass map.put(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), RenderType.translucent()); @@ -166,7 +162,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.INDIGO_JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JOSHUA_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.MAPLE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_OAK_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); @@ -183,7 +178,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.YELLOW_SPRUCE_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.BROWN_ZELKOVA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ARAUCARIA_SAPLING.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.LAMENT_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.WITHERING_OAK_SAPLING.get(), RenderType.cutoutMipped()); //Mushrooms diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index db62c7bc1c..b8da7f7658 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -49,7 +49,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.LAMENT_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FIRECRACKER_LEAVES.get()); @@ -77,7 +76,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.YELLOW_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.RED_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_ZELKOVA_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.LAMENT_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.WITHERING_OAK_SAPLING.get()); //Flowers diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 10df04f56d..0aa1b614dc 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -40,43 +40,34 @@ public static void flammablesBYG() { //Logs flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_LOG.get(), 5, 5); //Stripped Logs flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); //Wood flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_WOOD.get(), 5, 5); //Stripped Wood flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); - flammableBlock(BYGBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); //BookShelves flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); - flammableBlock(BYGBlocks.MAPLE_BOOKSHELF.get(), 5, 20); //Slabs flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); - flammableBlock(BYGBlocks.MAPLE_SLAB.get(), 5, 20); //Stairs flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); - flammableBlock(BYGBlocks.MAPLE_STAIRS.get(), 5, 20); //Planks flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); - flammableBlock(BYGBlocks.MAPLE_PLANKS.get(), 5, 20); //Fences flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); - flammableBlock(BYGBlocks.MAPLE_FENCE.get(), 5, 20); //Leaves flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); @@ -96,7 +87,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.RED_OAK_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.RIPE_ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.SILVER_MAPLE_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.MAPLE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.RED_MAPLE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.SKYRIS_LEAVES_GREEN_APPLE.get(), 30, 60); flammableBlock(BYGBlocks.WHITE_CHERRY_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 3d8c88c8ee..13d9ef428d 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -25,16 +25,12 @@ public static void strippableLogsBYG() { } stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); - stripables.put(BYGBlocks.MAPLE_LOG.get(), BYGBlocks.STRIPPED_MAPLE_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); - stripables.put(BYGBlocks.LAMENT_LOG.get(), BYGBlocks.STRIPPED_LAMENT_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); - stripables.put(BYGBlocks.MAPLE_WOOD.get(), BYGBlocks.STRIPPED_MAPLE_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); - stripables.put(BYGBlocks.LAMENT_WOOD.get(), BYGBlocks.STRIPPED_LAMENT_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 9b3f43d4cd..19debc8cb6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -63,56 +63,30 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); - public static final BlockRegistryObject MAPLE_PLANKS = createPlanks("maple_planks"); - public static final BlockRegistryObject LAMENT_PLANKS = createPlanks("lament_planks"); public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); - public static final BlockRegistryObject MAPLE_BOOKSHELF = createBookshelf("maple_bookshelf"); - public static final BlockRegistryObject LAMENT_BOOKSHELF = createBookshelf("lament_bookshelf"); public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); - public static final BlockRegistryObject MAPLE_DOOR = createDoor("maple_door"); - public static final BlockRegistryObject LAMENT_DOOR = createDoor("lament_door"); public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); - public static final BlockRegistryObject MAPLE_PRESSURE_PLATE = createWoodPressurePlate("maple_pressure_plate"); - public static final BlockRegistryObject LAMENT_PRESSURE_PLATE = createWoodPressurePlate("lament_pressure_plate"); public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); - public static final BlockRegistryObject MAPLE_BUTTON = createWoodButton("maple_button"); - public static final BlockRegistryObject LAMENT_BUTTON = createWoodButton("lament_button"); public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); - public static final BlockRegistryObject MAPLE_TRAPDOOR = createTrapDoor("maple_trapdoor"); - public static final BlockRegistryObject LAMENT_TRAPDOOR = createTrapDoor("lament_trapdoor"); public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); - public static final BlockRegistryObject MAPLE_CRAFTING_TABLE = createCraftingTable("maple_crafting_table"); - public static final BlockRegistryObject LAMENT_CRAFTING_TABLE = createCraftingTable("lament_crafting_table"); public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); - public static final BlockRegistryObject MAPLE_FENCE_GATE = createFenceGate("maple_fence_gate"); - public static final BlockRegistryObject LAMENT_FENCE_GATE = createFenceGate("lament_fence_gate"); public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); - public static final BlockRegistryObject MAPLE_SLAB = createWoodSlab("maple_slab"); - public static final BlockRegistryObject LAMENT_SLAB = createWoodSlab("lament_slab"); public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); - public static final BlockRegistryObject MAPLE_STAIRS = createWoodStairs("maple_stairs"); - public static final BlockRegistryObject LAMENT_STAIRS = createWoodStairs("lament_stairs"); public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); - public static final BlockRegistryObject MAPLE_FENCE = createFence("maple_fence"); - public static final BlockRegistryObject LAMENT_FENCE = createFence("lament_fence"); public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MAPLE_SIGN = createSign("maple_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject LAMENT_SIGN = createSign("lament_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject MAPLE_WALL_SIGN = createWallSign("maple_wall_sign", BYGWoodType.MAPLE, MAPLE_PLANKS); - public static final BlockRegistryObject LAMENT_WALL_SIGN = createWallSign("lament_wall_sign", BYGWoodType.LAMENT, LAMENT_PLANKS); public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -135,7 +109,6 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_JACARANDA_SAPLING, "jacaranda_sapling"); public static final BlockRegistryObject INDIGO_JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_INDIGO_JACARANDA_SAPLING, "indigo_jacaranda_sapling"); public static final BlockRegistryObject JOSHUA_SAPLING = createSapling(BYGBlockTags.GROUND_JOSHUA_SAPLING, "joshua_sapling"); - public static final BlockRegistryObject MAPLE_SAPLING = createSapling(BYGBlockTags.GROUND_MAPLE_SAPLING, "maple_sapling"); public static final BlockRegistryObject ORANGE_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_BIRCH_SAPLING, "orange_birch_sapling"); public static final BlockRegistryObject ORANGE_OAK_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_OAK_SAPLING, "orange_oak_sapling"); public static final BlockRegistryObject ORANGE_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_SPRUCE_SAPLING, "orange_spruce_sapling"); @@ -150,7 +123,6 @@ public class BYGBlocks { public static final BlockRegistryObject WHITE_CHERRY_SAPLING = createSapling(BYGBlockTags.GROUND_WHITE_CHERRY_SAPLING, "white_cherry_sapling"); public static final BlockRegistryObject YELLOW_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_BIRCH_SAPLING, "yellow_birch_sapling"); public static final BlockRegistryObject YELLOW_SPRUCE_SAPLING = createSapling(BYGBlockTags.GROUND_YELLOW_SPRUCE_SAPLING, "yellow_spruce_sapling"); - public static final BlockRegistryObject LAMENT_SAPLING = createSapling(BYGBlockTags.GROUND_LAMENT_SAPLING, "lament_sapling"); public static final BlockRegistryObject WITHERING_OAK_SAPLING = createFungus(BYGBlockTags.GROUND_WITHERING_OAK_SAPLING, "withering_oak_sapling"); public static final BlockRegistryObject JACARANDA_BUSH = createJacarandaBush("jacaranda_bush"); @@ -175,7 +147,6 @@ public class BYGBlocks { public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "flowering_indigo_jacaranda_leaves"); public static final BlockRegistryObject JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "joshua_leaves"); public static final BlockRegistryObject RIPE_JOSHUA_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "ripe_joshua_leaves"); - public static final BlockRegistryObject MAPLE_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "maple_leaves"); public static final BlockRegistryObject ORANGE_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_birch_leaves"); public static final BlockRegistryObject ORANGE_OAK_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_oak_leaves"); public static final BlockRegistryObject ORANGE_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_ORANGE, "orange_spruce_leaves"); @@ -192,7 +163,6 @@ public class BYGBlocks { public static final BlockRegistryObject WHITE_CHERRY_LEAVES = createLeaves(MaterialColor.COLOR_LIGHT_GRAY, "white_cherry_leaves"); public static final BlockRegistryObject YELLOW_BIRCH_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_birch_leaves"); public static final BlockRegistryObject YELLOW_SPRUCE_LEAVES = createLeaves(MaterialColor.COLOR_YELLOW, "yellow_spruce_leaves"); - public static final BlockRegistryObject LAMENT_LEAVES = createLeaves(MaterialColor.COLOR_MAGENTA, "lament_leaves"); public static final BlockRegistryObject WITHERING_OAK_LEAVES = createLeaves(MaterialColor.COLOR_GRAY, "withering_oak_leaves"); public static final BlockRegistryObject FLOWERING_NIGHTSHADE_LEAVES = createGlowingLeaves(MaterialColor.COLOR_ORANGE, 15, "flowering_nightshade_leaves"); public static final BlockRegistryObject FIRECRACKER_LEAVES = createFirecrackerLeavesBlock(MaterialColor.COLOR_GREEN, "firecracker_leaves"); @@ -476,18 +446,14 @@ public class BYGBlocks { public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); - public static final BlockRegistryObject MAPLE_LOG = createLog("maple_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); - public static final BlockRegistryObject LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "lament_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); - public static final BlockRegistryObject MAPLE_WOOD = createWood("maple_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); - public static final BlockRegistryObject LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "lament_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); @@ -616,14 +582,10 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); - public static final BlockRegistryObject STRIPPED_MAPLE_LOG = createStrippedLog("stripped_maple_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); - public static final BlockRegistryObject STRIPPED_LAMENT_LOG = createBlock(BYGBlockProperties.BYGNetherLog::new, "stripped_lament_log"); public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); - public static final BlockRegistryObject STRIPPED_MAPLE_WOOD = createWood("stripped_maple_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); - public static final BlockRegistryObject STRIPPED_LAMENT_WOOD = createBlock(BYGBlockProperties.BYGNetherWood::new, "stripped_lament_wood"); public static final BlockRegistryObject TALL_ALLIUM = createTallFlower("tall_allium", BYGBlockTags.GROUND_TALL_ALLIUM); public static final BlockRegistryObject TALL_PINK_ALLIUM = createTallFlower("tall_pink_allium", BYGBlockTags.GROUND_TALL_PINK_ALLIUM); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 27bec8b910..b7f6c19ad2 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -137,7 +137,14 @@ public enum BYGWoodTypes { SKYRIS("skyris", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_SKYRIS_SAPLING) .materialColor(MaterialColor.COLOR_PINK) - .boatType(BYGBoatEntity.BYGType.SKYRIS)); + .boatType(BYGBoatEntity.BYGType.SKYRIS)), + LAMENT("lament", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_LAMENT_SAPLING) + .materialColor(MaterialColor.COLOR_MAGENTA)), + MAPLE("maple", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_MAPLE_SAPLING) + .materialColor(MaterialColor.COLOR_GREEN) + .boatType(BYGBoatEntity.BYGType.MAPLE)); public static final Map LOOKUP = Arrays.stream(values()) .collect(Collectors.toUnmodifiableMap(BYGWoodTypes::toString, Function.identity()));; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 7c575ef717..57f793b817 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -53,7 +53,6 @@ public Item getDropItem() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.boat().get(); case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); - case MAPLE -> BYGItems.MAPLE_BOAT.get(); }; } @@ -64,7 +63,6 @@ public Block getPlanks() { return switch (this.getBYGBoatType()) { default -> BYGWoodTypes.ASPEN.planks().get(); case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); - case MAPLE -> BYGBlocks.MAPLE_PLANKS.get(); }; } diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index db1e8eded5..d5917751e2 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -316,51 +316,14 @@ public class BYGItems { public static final RegistryObject JACARANDA_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.JACARANDA, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "jacaranda_boat"); //Lament Woodtype - public static final RegistryObject LAMENT_SAPLING = createSaplingItem(BYGBlocks.LAMENT_SAPLING); - public static final RegistryObject LAMENT_LEAVES = createItem(BYGBlocks.LAMENT_LEAVES); - public static final RegistryObject LAMENT_VINE = createItem(BYGBlocks.LAMENT_VINE); - public static final RegistryObject LAMENT_SPROUTS = createItem(BYGBlocks.LAMENT_SPROUTS); - public static final RegistryObject LAMENT_LOG = createItem(BYGBlocks.LAMENT_LOG); - public static final RegistryObject LAMENT_WOOD = createItem(BYGBlocks.LAMENT_WOOD); - public static final RegistryObject STRIPPED_LAMENT_LOG = createItem(BYGBlocks.STRIPPED_LAMENT_LOG); - public static final RegistryObject STRIPPED_LAMENT_WOOD = createItem(BYGBlocks.STRIPPED_LAMENT_WOOD); - public static final RegistryObject LAMENT_PLANKS = createItem(BYGBlocks.LAMENT_PLANKS); - public static final RegistryObject LAMENT_BOOKSHELF = createItem(BYGBlocks.LAMENT_BOOKSHELF); - public static final RegistryObject LAMENT_CRAFTING_TABLE = createItem(BYGBlocks.LAMENT_CRAFTING_TABLE); - public static final RegistryObject LAMENT_STAIRS = createItem(BYGBlocks.LAMENT_STAIRS); - public static final RegistryObject LAMENT_SLAB = createItem(BYGBlocks.LAMENT_SLAB); - public static final RegistryObject LAMENT_FENCE = createItem(BYGBlocks.LAMENT_FENCE); - public static final RegistryObject LAMENT_FENCE_GATE = createItem(BYGBlocks.LAMENT_FENCE_GATE); - public static final RegistryObject LAMENT_DOOR = createItem(BYGBlocks.LAMENT_DOOR); - public static final RegistryObject LAMENT_TRAPDOOR = createItem(BYGBlocks.LAMENT_TRAPDOOR); - public static final RegistryObject LAMENT_PRESSURE_PLATE = createItem(BYGBlocks.LAMENT_PRESSURE_PLATE); - public static final RegistryObject LAMENT_BUTTON = createItem(BYGBlocks.LAMENT_BUTTON); - public static final RegistryObject LAMENT_SIGN = createSign("lament_sign", BYGBlocks.LAMENT_SIGN, BYGBlocks.LAMENT_WALL_SIGN); + public static final RegistryObject LAMENT_VINE; + public static final RegistryObject LAMENT_SPROUTS; //Maple Woodtype - public static final RegistryObject MAPLE_SAPLING = createSaplingItem(BYGBlocks.MAPLE_SAPLING); - public static final RegistryObject MAPLE_LEAVES = createItem(BYGBlocks.MAPLE_LEAVES); - public static final RegistryObject RED_MAPLE_SAPLING = createSaplingItem(BYGBlocks.RED_MAPLE_SAPLING); - public static final RegistryObject RED_MAPLE_LEAVES = createItem(BYGBlocks.RED_MAPLE_LEAVES); - public static final RegistryObject SILVER_MAPLE_SAPLING = createSaplingItem(BYGBlocks.SILVER_MAPLE_SAPLING); - public static final RegistryObject SILVER_MAPLE_LEAVES = createItem(BYGBlocks.SILVER_MAPLE_LEAVES); - public static final RegistryObject MAPLE_LOG = createItem(BYGBlocks.MAPLE_LOG); - public static final RegistryObject MAPLE_WOOD = createItem(BYGBlocks.MAPLE_WOOD); - public static final RegistryObject STRIPPED_MAPLE_LOG = createItem(BYGBlocks.STRIPPED_MAPLE_LOG); - public static final RegistryObject STRIPPED_MAPLE_WOOD = createItem(BYGBlocks.STRIPPED_MAPLE_WOOD); - public static final RegistryObject MAPLE_PLANKS = createItem(BYGBlocks.MAPLE_PLANKS); - public static final RegistryObject MAPLE_BOOKSHELF = createItem(BYGBlocks.MAPLE_BOOKSHELF); - public static final RegistryObject MAPLE_CRAFTING_TABLE = createItem(BYGBlocks.MAPLE_CRAFTING_TABLE); - public static final RegistryObject MAPLE_STAIRS = createItem(BYGBlocks.MAPLE_STAIRS); - public static final RegistryObject MAPLE_SLAB = createItem(BYGBlocks.MAPLE_SLAB); - public static final RegistryObject MAPLE_FENCE = createItem(BYGBlocks.MAPLE_FENCE); - public static final RegistryObject MAPLE_FENCE_GATE = createItem(BYGBlocks.MAPLE_FENCE_GATE); - public static final RegistryObject MAPLE_DOOR = createItem(BYGBlocks.MAPLE_DOOR); - public static final RegistryObject MAPLE_TRAPDOOR = createItem(BYGBlocks.MAPLE_TRAPDOOR); - public static final RegistryObject MAPLE_PRESSURE_PLATE = createItem(BYGBlocks.MAPLE_PRESSURE_PLATE); - public static final RegistryObject MAPLE_BUTTON = createItem(BYGBlocks.MAPLE_BUTTON); - public static final RegistryObject MAPLE_SIGN = createSign("maple_sign", BYGBlocks.MAPLE_SIGN, BYGBlocks.MAPLE_WALL_SIGN); - public static final RegistryObject MAPLE_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.MAPLE, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "maple_boat"); + public static final RegistryObject RED_MAPLE_SAPLING; + public static final RegistryObject RED_MAPLE_LEAVES; + public static final RegistryObject SILVER_MAPLE_SAPLING; + public static final RegistryObject SILVER_MAPLE_LEAVES; //Nightshade Woodtype public static final RegistryObject FLOWERING_NIGHTSHADE_LEAVES; @@ -439,10 +402,19 @@ public class BYGItems { FUNGAL_IMPARIUS_HYPHAE = createItem(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE); BYGWoodTypes.IMPARIUS.init(); - // TODO Lamient, Jacaranda + LAMENT_VINE = createItem(BYGBlocks.LAMENT_VINE); + LAMENT_SPROUTS = createItem(BYGBlocks.LAMENT_SPROUTS); + BYGWoodTypes.LAMENT.init(); + + // TODO Jacaranda BYGWoodTypes.MAHOGANY.init(); BYGWoodTypes.MANGROVE.init(); - // TODO Maple + + RED_MAPLE_SAPLING = createSaplingItem(BYGBlocks.RED_MAPLE_SAPLING); + RED_MAPLE_LEAVES = createItem(BYGBlocks.RED_MAPLE_LEAVES); + SILVER_MAPLE_SAPLING = createSaplingItem(BYGBlocks.SILVER_MAPLE_SAPLING); + SILVER_MAPLE_LEAVES = createItem(BYGBlocks.SILVER_MAPLE_LEAVES); + BYGWoodTypes.MAPLE.init(); FLOWERING_NIGHTSHADE_LEAVES = createItem(BYGBlocks.FLOWERING_NIGHTSHADE_LEAVES); IMBUED_NIGHTSHADE_LOG = createItem(BYGBlocks.IMBUED_NIGHTSHADE_LOG); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java index 2877f5c14e..0b57d0eec1 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/nether/BYGNetherVegetationFeatures.java @@ -243,8 +243,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_TWISTY_TREE1 = createConfiguredFeatureSup("lament_twisty_tree1", BYGFeatures.LAMENT_TWISTY_TREE1, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .build() @@ -252,8 +251,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_TWISTY_TREE2 = createConfiguredFeatureSup("lament_twisty_tree2", BYGFeatures.LAMENT_TWISTY_TREE2, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .build() @@ -261,8 +259,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_TWISTY_TREE3 = createConfiguredFeatureSup("lament_twisty_tree3", BYGFeatures.LAMENT_TWISTY_TREE3, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .build() @@ -270,8 +267,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_WEEPING_TREE1 = createConfiguredFeatureSup("lament_weeping_tree1", BYGFeatures.LAMENT_WEEPING_TREE1, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .setWhitelist(ImmutableList.of(Blocks.LAVA)) @@ -280,8 +276,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_WEEPING_TREE2 = createConfiguredFeatureSup("lament_weeping_tree2", BYGFeatures.LAMENT_WEEPING_TREE2, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .setWhitelist(ImmutableList.of(Blocks.LAVA)) @@ -290,8 +285,7 @@ public class BYGNetherVegetationFeatures { public static final Holder> LAMENT_WEEPING_TREE3 = createConfiguredFeatureSup("lament_weeping_tree3", BYGFeatures.LAMENT_WEEPING_TREE3, new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.LAMENT_LOG.get()) - .setLeavesBlock(BYGBlocks.LAMENT_LEAVES.get()) + .fromWoodType(BYGWoodTypes.LAMENT) .setMaxHeight(30) .setMinHeight(22) .setWhitelist(ImmutableList.of(Blocks.LAVA)) diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index b89606fcaf..278af90ad2 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -72,7 +72,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> ANCIENT_TREE3 = createConfiguredFeature("ancient_tree3", BYGFeatures.ANCIENT_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAPLE_LOG.get()) + .setTrunkBlock(MAPLE.log().get()) .setLeavesBlock(BYGBlocks.SILVER_MAPLE_LEAVES.get()) .setMaxHeight(25) .setMinHeight(15) @@ -971,7 +971,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAPLE_RED_TREE1 = createConfiguredFeature("red_maple_tree1", BYGFeatures.MAPLE_TREE2, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAPLE_LOG.get()) + .setTrunkBlock(MAPLE.log().get()) .setLeavesBlock(BYGBlocks.RED_MAPLE_LEAVES.get()) .setMaxHeight(9) .setMinHeight(4) @@ -980,7 +980,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAPLE_RED_TREE2 = createConfiguredFeature("red_maple_tree2", BYGFeatures.MAPLE_TREE3, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAPLE_LOG.get()) + .setTrunkBlock(MAPLE.log().get()) .setLeavesBlock(BYGBlocks.RED_MAPLE_LEAVES.get()) .setMaxHeight(9) .setMinHeight(4) @@ -1003,8 +1003,7 @@ public class BYGOverworldTreeFeatures { public static final Holder> MAPLE_TREE1 = createConfiguredFeature("maple_tree1", BYGFeatures.MAPLE_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.MAPLE_LOG.get()) - .setLeavesBlock(BYGBlocks.MAPLE_LEAVES.get()) + .fromWoodType(MAPLE) .setMaxHeight(10) .setMinHeight(5) .build() diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/lament_bookshelf.json deleted file mode 100644 index 959fdb4c02..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_button.json b/Common/src/main/resources/assets/byg/blockstates/lament_button.json deleted file mode 100644 index d8a43a5959..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=wall,powered=true,facing=north": { - "model": "byg:block/lament_button_pressed", - "x": 90, - "uvlock": true - }, - "face=wall,powered=false,facing=west": { - "model": "byg:block/lament_button", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=ceiling,powered=false,facing=east": { - "model": "byg:block/lament_button", - "x": 180, - "y": 270 - }, - "face=floor,powered=true,facing=north": { - "model": "byg:block/lament_button_pressed" - }, - "face=ceiling,powered=true,facing=east": { - "model": "byg:block/lament_button_pressed", - "x": 180, - "y": 270 - }, - "face=floor,powered=false,facing=west": { - "model": "byg:block/lament_button", - "y": 270 - }, - "face=wall,powered=true,facing=south": { - "model": "byg:block/lament_button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,powered=false,facing=south": { - "model": "byg:block/lament_button", - "x": 180 - }, - "face=floor,powered=false,facing=east": { - "model": "byg:block/lament_button", - "y": 90 - }, - "face=ceiling,powered=true,facing=south": { - "model": "byg:block/lament_button_pressed", - "x": 180 - }, - "face=ceiling,powered=true,facing=north": { - "model": "byg:block/lament_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,powered=false,facing=west": { - "model": "byg:block/lament_button", - "x": 180, - "y": 90 - }, - "face=floor,powered=true,facing=east": { - "model": "byg:block/lament_button_pressed", - "y": 90 - }, - "face=wall,powered=false,facing=north": { - "model": "byg:block/lament_button", - "x": 90, - "uvlock": true - }, - "face=floor,powered=false,facing=south": { - "model": "byg:block/lament_button", - "y": 180 - }, - "face=wall,powered=false,facing=south": { - "model": "byg:block/lament_button", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=floor,powered=false,facing=north": { - "model": "byg:block/lament_button" - }, - "face=wall,powered=true,facing=east": { - "model": "byg:block/lament_button_pressed", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=ceiling,powered=true,facing=west": { - "model": "byg:block/lament_button_pressed", - "x": 180, - "y": 90 - }, - "face=ceiling,powered=false,facing=north": { - "model": "byg:block/lament_button", - "x": 180, - "y": 180 - }, - "face=floor,powered=true,facing=south": { - "model": "byg:block/lament_button_pressed", - "y": 180 - }, - "face=wall,powered=true,facing=west": { - "model": "byg:block/lament_button_pressed", - "x": 90, - "y": 270, - "uvlock": true - }, - "face=wall,powered=false,facing=east": { - "model": "byg:block/lament_button", - "x": 90, - "y": 90, - "uvlock": true - }, - "face=floor,powered=true,facing=west": { - "model": "byg:block/lament_button_pressed", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/lament_crafting_table.json deleted file mode 100644 index 91c4d89587..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_door.json b/Common/src/main/resources/assets/byg/blockstates/lament_door.json deleted file mode 100644 index 26c226159c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "open=false,hinge=right,half=upper,facing=west": { - "model": "byg:block/lament_door_top_hinge", - "y": 180 - }, - "open=true,hinge=right,half=upper,facing=east": { - "model": "byg:block/lament_door_top", - "y": 270 - }, - "open=true,hinge=left,half=lower,facing=west": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 270 - }, - "open=false,hinge=left,half=lower,facing=south": { - "model": "byg:block/lament_door_bottom", - "y": 90 - }, - "open=false,hinge=right,half=lower,facing=south": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=east": { - "model": "byg:block/lament_door_bottom" - }, - "open=false,hinge=right,half=lower,facing=east": { - "model": "byg:block/lament_door_bottom_hinge" - }, - "open=false,hinge=left,half=upper,facing=south": { - "model": "byg:block/lament_door_top", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=south": { - "model": "byg:block/lament_door_top_hinge", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=east": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=south": { - "model": "byg:block/lament_door_top_hinge", - "y": 90 - }, - "open=false,hinge=left,half=lower,facing=west": { - "model": "byg:block/lament_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=north": { - "model": "byg:block/lament_door_bottom_hinge" - }, - "open=true,hinge=right,half=lower,facing=north": { - "model": "byg:block/lament_door_bottom", - "y": 180 - }, - "open=true,hinge=left,half=lower,facing=south": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=east": { - "model": "byg:block/lament_door_bottom", - "y": 270 - }, - "open=true,hinge=right,half=upper,facing=south": { - "model": "byg:block/lament_door_top" - }, - "open=true,hinge=right,half=upper,facing=west": { - "model": "byg:block/lament_door_top", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=north": { - "model": "byg:block/lament_door_top_hinge", - "y": 270 - }, - "open=false,hinge=right,half=lower,facing=north": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=west": { - "model": "byg:block/lament_door_top_hinge", - "y": 270 - }, - "open=true,hinge=left,half=upper,facing=north": { - "model": "byg:block/lament_door_top_hinge" - }, - "open=false,hinge=left,half=upper,facing=north": { - "model": "byg:block/lament_door_top", - "y": 270 - }, - "open=false,hinge=left,half=upper,facing=east": { - "model": "byg:block/lament_door_top" - }, - "open=false,hinge=left,half=upper,facing=west": { - "model": "byg:block/lament_door_top", - "y": 180 - }, - "open=false,hinge=right,half=lower,facing=west": { - "model": "byg:block/lament_door_bottom_hinge", - "y": 180 - }, - "open=true,hinge=right,half=lower,facing=west": { - "model": "byg:block/lament_door_bottom", - "y": 90 - }, - "open=true,hinge=left,half=upper,facing=east": { - "model": "byg:block/lament_door_top_hinge", - "y": 90 - }, - "open=false,hinge=right,half=upper,facing=east": { - "model": "byg:block/lament_door_top_hinge" - }, - "open=true,hinge=right,half=lower,facing=south": { - "model": "byg:block/lament_door_bottom" - }, - "open=true,hinge=right,half=upper,facing=north": { - "model": "byg:block/lament_door_top", - "y": 180 - }, - "open=false,hinge=left,half=lower,facing=north": { - "model": "byg:block/lament_door_bottom", - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/lament_fence_gate.json deleted file mode 100644 index 848dafef82..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "open=false,in_wall=false,facing=east": { - "model": "byg:block/lament_fence_gate", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=true,facing=east": { - "model": "byg:block/lament_fence_gate_wall", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=west": { - "model": "byg:block/lament_fence_gate_wall_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=false,facing=north": { - "model": "byg:block/lament_fence_gate", - "y": 180, - "uvlock": true - }, - "open=false,in_wall=true,facing=north": { - "model": "byg:block/lament_fence_gate_wall", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=true,facing=east": { - "model": "byg:block/lament_fence_gate_wall_open", - "y": 270, - "uvlock": true - }, - "open=true,in_wall=true,facing=north": { - "model": "byg:block/lament_fence_gate_wall_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=north": { - "model": "byg:block/lament_fence_gate_open", - "y": 180, - "uvlock": true - }, - "open=true,in_wall=false,facing=west": { - "model": "byg:block/lament_fence_gate_open", - "y": 90, - "uvlock": true - }, - "open=false,in_wall=true,facing=south": { - "model": "byg:block/lament_fence_gate_wall", - "uvlock": true - }, - "open=true,in_wall=false,facing=south": { - "model": "byg:block/lament_fence_gate_open", - "uvlock": true - }, - "open=false,in_wall=true,facing=west": { - "model": "byg:block/lament_fence_gate_wall", - "y": 90, - "uvlock": true - }, - "open=true,in_wall=true,facing=south": { - "model": "byg:block/lament_fence_gate_wall_open", - "uvlock": true - }, - "open=false,in_wall=false,facing=south": { - "model": "byg:block/lament_fence_gate", - "uvlock": true - }, - "open=true,in_wall=false,facing=east": { - "model": "byg:block/lament_fence_gate_open", - "y": 270, - "uvlock": true - }, - "open=false,in_wall=false,facing=west": { - "model": "byg:block/lament_fence_gate", - "y": 90, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_leaves.json b/Common/src/main/resources/assets/byg/blockstates/lament_leaves.json deleted file mode 100644 index 328397ea31..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_leaves" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_log.json b/Common/src/main/resources/assets/byg/blockstates/lament_log.json deleted file mode 100644 index d97b73dca2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/lament_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/lament_log" - }, - "axis=z": { - "model": "byg:block/lament_log_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_planks.json b/Common/src/main/resources/assets/byg/blockstates/lament_planks.json deleted file mode 100644 index 2244d61446..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/lament_pressure_plate.json deleted file mode 100644 index 0ae4cca72a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/lament_pressure_plate" - }, - "powered=true": { - "model": "byg:block/lament_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_sapling.json b/Common/src/main/resources/assets/byg/blockstates/lament_sapling.json deleted file mode 100644 index 2a0e6c4a9a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_sapling" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_slab.json b/Common/src/main/resources/assets/byg/blockstates/lament_slab.json deleted file mode 100644 index 5c3b76fc1e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/lament_slab" - }, - "type=double": { - "model": "byg:block/lament_planks" - }, - "type=top": { - "model": "byg:block/lament_slab_top" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_stairs.json b/Common/src/main/resources/assets/byg/blockstates/lament_stairs.json deleted file mode 100644 index c9f11b97ee..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "shape=outer_right,half=bottom,facing=east": { - "model": "byg:block/lament_stairs_outer" - }, - "shape=inner_right,half=top,facing=east": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=west": { - "model": "byg:block/lament_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=straight,half=bottom,facing=north": { - "model": "byg:block/lament_stairs", - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=top,facing=south": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=east": { - "model": "byg:block/lament_stairs", - "x": 180, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=south": { - "model": "byg:block/lament_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=north": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=outer_right,half=top,facing=south": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=south": { - "model": "byg:block/lament_stairs_outer" - }, - "shape=straight,half=bottom,facing=west": { - "model": "byg:block/lament_stairs", - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=east": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=north": { - "model": "byg:block/lament_stairs_inner", - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=north": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=straight,half=top,facing=north": { - "model": "byg:block/lament_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=south": { - "model": "byg:block/lament_stairs", - "y": 90, - "uvlock": true - }, - "shape=outer_right,half=bottom,facing=north": { - "model": "byg:block/lament_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=straight,half=bottom,facing=east": { - "model": "byg:block/lament_stairs" - }, - "shape=outer_right,half=top,facing=north": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "uvlock": true - }, - "shape=inner_right,half=top,facing=west": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=north": { - "model": "byg:block/lament_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=south": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=straight,half=top,facing=west": { - "model": "byg:block/lament_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=south": { - "model": "byg:block/lament_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=west": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=outer_right,half=top,facing=west": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_left,half=top,facing=north": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "shape=inner_right,half=bottom,facing=east": { - "model": "byg:block/lament_stairs_inner" - }, - "shape=outer_right,half=bottom,facing=west": { - "model": "byg:block/lament_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=north": { - "model": "byg:block/lament_stairs_outer", - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=east": { - "model": "byg:block/lament_stairs_inner", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=south": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=west": { - "model": "byg:block/lament_stairs_outer", - "y": 90, - "uvlock": true - }, - "shape=inner_left,half=top,facing=east": { - "model": "byg:block/lament_stairs_inner", - "x": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=south": { - "model": "byg:block/lament_stairs_inner" - }, - "shape=straight,half=top,facing=south": { - "model": "byg:block/lament_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=top,facing=west": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "shape=inner_left,half=bottom,facing=west": { - "model": "byg:block/lament_stairs_inner", - "y": 90, - "uvlock": true - }, - "shape=outer_left,half=bottom,facing=east": { - "model": "byg:block/lament_stairs_outer", - "y": 270, - "uvlock": true - }, - "shape=outer_left,half=top,facing=east": { - "model": "byg:block/lament_stairs_outer", - "x": 180, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_trapdoor.json b/Common/src/main/resources/assets/byg/blockstates/lament_trapdoor.json deleted file mode 100644 index 20666fa74a..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_trapdoor.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "open=true,half=bottom,facing=east": { - "model": "byg:block/lament_trapdoor_open", - "y": 90 - }, - "open=false,half=top,facing=east": { - "model": "byg:block/lament_trapdoor_top", - "y": 90 - }, - "open=true,half=top,facing=west": { - "model": "byg:block/lament_trapdoor_open", - "x": 180, - "y": 90 - }, - "open=true,half=top,facing=south": { - "model": "byg:block/lament_trapdoor_open", - "x": 180 - }, - "open=true,half=bottom,facing=south": { - "model": "byg:block/lament_trapdoor_open", - "y": 180 - }, - "open=false,half=top,facing=west": { - "model": "byg:block/lament_trapdoor_top", - "y": 270 - }, - "open=false,half=top,facing=north": { - "model": "byg:block/lament_trapdoor_top" - }, - "open=false,half=bottom,facing=east": { - "model": "byg:block/lament_trapdoor_bottom", - "y": 90 - }, - "open=false,half=bottom,facing=south": { - "model": "byg:block/lament_trapdoor_bottom", - "y": 180 - }, - "open=true,half=top,facing=north": { - "model": "byg:block/lament_trapdoor_open", - "x": 180, - "y": 180 - }, - "open=true,half=bottom,facing=west": { - "model": "byg:block/lament_trapdoor_open", - "y": 270 - }, - "open=true,half=bottom,facing=north": { - "model": "byg:block/lament_trapdoor_open" - }, - "open=true,half=top,facing=east": { - "model": "byg:block/lament_trapdoor_open", - "x": 180, - "y": 270 - }, - "open=false,half=bottom,facing=west": { - "model": "byg:block/lament_trapdoor_bottom", - "y": 270 - }, - "open=false,half=bottom,facing=north": { - "model": "byg:block/lament_trapdoor_bottom" - }, - "open=false,half=top,facing=south": { - "model": "byg:block/lament_trapdoor_top", - "y": 180 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_wood.json b/Common/src/main/resources/assets/byg/blockstates/lament_wood.json deleted file mode 100644 index a744633314..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/lament_wood_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/lament_wood" - }, - "axis=z": { - "model": "byg:block/lament_wood_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/maple_bookshelf.json deleted file mode 100644 index 7bd0eb709d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/maple_crafting_table.json deleted file mode 100644 index 7842bc7feb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/maple_fence_gate.json deleted file mode 100644 index b6c11b1739..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/maple_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/maple_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/maple_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/maple_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/maple_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/maple_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/maple_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/maple_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/maple_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/maple_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/maple_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/maple_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/maple_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/maple_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/maple_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/maple_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_leaves.json b/Common/src/main/resources/assets/byg/blockstates/maple_leaves.json deleted file mode 100644 index f7d5ff04b8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_leaves" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_planks.json b/Common/src/main/resources/assets/byg/blockstates/maple_planks.json deleted file mode 100644 index d5bc85414b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/maple_pressure_plate.json deleted file mode 100644 index dc5484b1d0..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/maple_pressure_plate" - }, - "powered=true": { - "model": "byg:block/maple_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_sapling.json b/Common/src/main/resources/assets/byg/blockstates/maple_sapling.json deleted file mode 100644 index 34d6b37ea2..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_slab.json b/Common/src/main/resources/assets/byg/blockstates/maple_slab.json deleted file mode 100644 index b466001828..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/maple_slab" - }, - "type=top": { - "model": "byg:block/maple_slab_top" - }, - "type=double": { - "model": "byg:block/maple_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_lament_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_lament_sapling.json deleted file mode 100644 index 1b76ca39b1..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_lament_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_lament_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_maple_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_maple_sapling.json deleted file mode 100644 index 62d8809ebc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_maple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_maple_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_lament_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_lament_log.json deleted file mode 100644 index 43b67ae423..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_lament_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/stripped_lament_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/stripped_lament_log" - }, - "axis=z": { - "model": "byg:block/stripped_lament_log_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_lament_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_lament_wood.json deleted file mode 100644 index af102a0f6e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_lament_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "byg:block/stripped_lament_wood_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "byg:block/stripped_lament_wood" - }, - "axis=z": { - "model": "byg:block/stripped_lament_wood_horizontal", - "x": 90 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_maple_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_maple_log.json deleted file mode 100644 index 90a3732843..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_maple_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_maple_log" - }, - "axis=z": { - "model": "byg:block/stripped_maple_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_maple_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_maple_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_maple_wood.json deleted file mode 100644 index b2ce77de0c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_maple_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_maple_wood" - }, - "axis=z": { - "model": "byg:block/stripped_maple_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_maple_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/lament_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/lament_bookshelf.json deleted file mode 100644 index fe4e4c3cdd..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/lament_planks", - "up": "byg:block/lament_planks", - "north": "byg:block/lament_bookshelf", - "east": "byg:block/lament_bookshelf", - "south": "byg:block/lament_bookshelf", - "west": "byg:block/lament_bookshelf", - "particle": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/lament_crafting_table.json deleted file mode 100644 index 4040871023..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/lament_crafting_table_front", - "down": "byg:block/lament_planks", - "up": "byg:block/lament_crafting_table_top", - "north": "byg:block/lament_crafting_table_front", - "east": "byg:block/lament_crafting_table_side", - "south": "byg:block/lament_crafting_table_side", - "west": "byg:block/lament_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/lament_door_bottom.json deleted file mode 100644 index b23a1b19b7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom", - "textures": { - "bottom": "byg:block/lament_door_bottom", - "top": "byg:block/lament_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/lament_door_bottom_hinge.json deleted file mode 100644 index 13b0723bf0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_rh", - "textures": { - "bottom": "byg:block/lament_door_bottom", - "top": "byg:block/lament_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_door_top.json b/Common/src/main/resources/assets/byg/models/block/lament_door_top.json deleted file mode 100644 index ed5f597078..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top", - "textures": { - "bottom": "byg:block/lament_door_bottom", - "top": "byg:block/lament_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/lament_door_top_hinge.json deleted file mode 100644 index 77941d0df8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_rh", - "textures": { - "bottom": "byg:block/lament_door_bottom", - "top": "byg:block/lament_door_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/lament_fence_inventory.json deleted file mode 100644 index b894c146b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_fence_post.json b/Common/src/main/resources/assets/byg/models/block/lament_fence_post.json deleted file mode 100644 index 8ce0ac1090..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_leaves.json b/Common/src/main/resources/assets/byg/models/block/lament_leaves.json deleted file mode 100644 index 0fe2febede..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/lament_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_log.json b/Common/src/main/resources/assets/byg/models/block/lament_log.json deleted file mode 100644 index d9c02ab1e4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/lament_log", - "end": "byg:block/lament_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_planks.json b/Common/src/main/resources/assets/byg/models/block/lament_planks.json deleted file mode 100644 index 1b70f836df..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_sapling.json b/Common/src/main/resources/assets/byg/models/block/lament_sapling.json deleted file mode 100644 index 912a0f291c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/lament_sapling", - "particle": "byg:block/lament_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_slab.json b/Common/src/main/resources/assets/byg/models/block/lament_slab.json deleted file mode 100644 index feabe22d7e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "byg:block/lament_planks", - "top": "byg:block/lament_planks", - "side": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_slab_top.json b/Common/src/main/resources/assets/byg/models/block/lament_slab_top.json deleted file mode 100644 index ceede8a317..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "byg:block/lament_planks", - "top": "byg:block/lament_planks", - "side": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_stairs.json b/Common/src/main/resources/assets/byg/models/block/lament_stairs.json deleted file mode 100644 index f00d1d9258..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "byg:block/lament_planks", - "top": "byg:block/lament_planks", - "side": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/lament_stairs_inner.json deleted file mode 100644 index 20f4d63501..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "byg:block/lament_planks", - "top": "byg:block/lament_planks", - "side": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/lament_stairs_outer.json deleted file mode 100644 index f314b7061c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "byg:block/lament_planks", - "top": "byg:block/lament_planks", - "side": "byg:block/lament_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/lament_wood.json b/Common/src/main/resources/assets/byg/models/block/lament_wood.json deleted file mode 100644 index 4f7ca4477e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/lament_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/lament_log", - "end": "byg:block/lament_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/maple_bookshelf.json deleted file mode 100644 index ace9194b80..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/maple_planks", - "up": "byg:block/maple_planks", - "north": "byg:block/maple_bookshelf", - "east": "byg:block/maple_bookshelf", - "south": "byg:block/maple_bookshelf", - "west": "byg:block/maple_bookshelf", - "particle": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_button.json b/Common/src/main/resources/assets/byg/models/block/maple_button.json deleted file mode 100644 index 98021528c5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/maple_button_inventory.json deleted file mode 100644 index 5eb7cc73c4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/maple_button_pressed.json deleted file mode 100644 index c8fe29a31e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/maple_crafting_table.json deleted file mode 100644 index 9c5080ad66..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/maple_crafting_table_front", - "down": "byg:block/maple_planks", - "up": "byg:block/maple_crafting_table_top", - "north": "byg:block/maple_crafting_table_front", - "east": "byg:block/maple_crafting_table_side", - "south": "byg:block/maple_crafting_table_side", - "west": "byg:block/maple_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/maple_door_bottom.json deleted file mode 100644 index 6746d3857e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/maple_door_bottom", - "top": "byg:block/maple_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/maple_door_bottom_hinge.json deleted file mode 100644 index 83c98dd9ea..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/maple_door_bottom", - "top": "byg:block/maple_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_door_top.json b/Common/src/main/resources/assets/byg/models/block/maple_door_top.json deleted file mode 100644 index af5320768f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/maple_door_bottom", - "top": "byg:block/maple_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/maple_door_top_hinge.json deleted file mode 100644 index 617c66d969..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/maple_door_bottom", - "top": "byg:block/maple_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence.json b/Common/src/main/resources/assets/byg/models/block/maple_fence.json deleted file mode 100644 index a8b5eca2a6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/maple_planks", - "particle": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_gate.json deleted file mode 100644 index 3ebff1308c..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_open.json deleted file mode 100644 index 18c7a6e5df..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall.json deleted file mode 100644 index e21e14a876..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall_open.json deleted file mode 100644 index cf32a31072..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_inventory.json deleted file mode 100644 index 478837d0b5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/maple_planks", - "particle": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_fence_post.json b/Common/src/main/resources/assets/byg/models/block/maple_fence_post.json deleted file mode 100644 index 72fb3292bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/maple_planks", - "particle": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_leaves.json b/Common/src/main/resources/assets/byg/models/block/maple_leaves.json deleted file mode 100644 index f6dc44ecf1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_leaves.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/maple_leaves", - "bottom": "byg:block/maple_leaves", - "top": "byg:block/maple_leaves", - "side": "byg:block/maple_leaves", - "overlay": "byg:block/maple_leaves" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#top", - "cullface": "up", - "tintindex": 1 - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#side", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "east" - }, - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#overlay", - "tintindex": 1, - "cullface": "down" - } - } - } - ] -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_log.json b/Common/src/main/resources/assets/byg/models/block/maple_log.json deleted file mode 100644 index 2b095b1036..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/maple_log_top", - "side": "byg:block/maple_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_planks.json b/Common/src/main/resources/assets/byg/models/block/maple_planks.json deleted file mode 100644 index 47a10d091e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/maple_planks", - "particle": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate.json deleted file mode 100644 index 49179cb840..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate_down.json deleted file mode 100644 index 0f5a920b2d..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_sapling.json b/Common/src/main/resources/assets/byg/models/block/maple_sapling.json deleted file mode 100644 index 9f490f3f82..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/maple_sapling", - "particle": "byg:block/maple_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_slab.json b/Common/src/main/resources/assets/byg/models/block/maple_slab.json deleted file mode 100644 index c6f3dc8f7e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/maple_planks", - "top": "byg:block/maple_planks", - "side": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_slab_top.json b/Common/src/main/resources/assets/byg/models/block/maple_slab_top.json deleted file mode 100644 index 3e261bb289..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/maple_planks", - "top": "byg:block/maple_planks", - "side": "byg:block/maple_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_stairs.json b/Common/src/main/resources/assets/byg/models/block/maple_stairs.json deleted file mode 100644 index 562b228ffc..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/maple_planks", - "top": "byg:block/maple_planks", - "side": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/maple_stairs_inner.json deleted file mode 100644 index 418ffc4319..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/maple_planks", - "top": "byg:block/maple_planks", - "side": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/maple_stairs_outer.json deleted file mode 100644 index 6f9312637b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/maple_planks", - "top": "byg:block/maple_planks", - "side": "byg:block/maple_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_bottom.json deleted file mode 100644 index 124ee556b8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/maple_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_open.json deleted file mode 100644 index 76f2e1c281..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/maple_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_top.json deleted file mode 100644 index 18c075c697..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/maple_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/maple_wood.json b/Common/src/main/resources/assets/byg/models/block/maple_wood.json deleted file mode 100644 index e23bff9d37..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/maple_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/maple_log", - "particle": "byg:block/maple_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_lament_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_lament_log.json deleted file mode 100644 index a67e882beb..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_lament_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/stripped_lament_log", - "end": "byg:block/stripped_lament_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_lament_log_horizontal.json b/Common/src/main/resources/assets/byg/models/block/stripped_lament_log_horizontal.json deleted file mode 100644 index 771d305865..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_lament_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "byg:block/stripped_lament_log_top", - "side": "byg:block/stripped_lament_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood.json deleted file mode 100644 index f16d741404..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "byg:block/stripped_lament_log", - "end": "byg:block/stripped_lament_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood_horizontal.json b/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood_horizontal.json deleted file mode 100644 index 146b6e2d78..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_lament_wood_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "byg:block/stripped_lament_log", - "side": "byg:block/stripped_lament_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_maple_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_maple_log.json deleted file mode 100644 index bdb69319d6..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_maple_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_maple_log_top", - "up": "byg:block/stripped_maple_log_top", - "north": "byg:block/stripped_maple_log", - "east": "byg:block/stripped_maple_log", - "south": "byg:block/stripped_maple_log", - "west": "byg:block/stripped_maple_log", - "particle": "byg:block/stripped_maple_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_maple_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_maple_wood.json deleted file mode 100644 index 520f54b91e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_maple_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_maple_log", - "particle": "byg:block/stripped_maple_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/lament_bookshelf.json deleted file mode 100644 index 9a730c8286..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/lament_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_button.json b/Common/src/main/resources/assets/byg/models/item/lament_button.json deleted file mode 100644 index 2197e6d8e9..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_button_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/lament_crafting_table.json deleted file mode 100644 index 1f6bb7cfbc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/lament_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_fence.json b/Common/src/main/resources/assets/byg/models/item/lament_fence.json deleted file mode 100644 index 921fe9cd74..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/lament_fence_gate.json deleted file mode 100644 index d5d9026c39..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_fence_gate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_leaves.json b/Common/src/main/resources/assets/byg/models/item/lament_leaves.json deleted file mode 100644 index c6e2261286..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_leaves" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_log.json b/Common/src/main/resources/assets/byg/models/item/lament_log.json deleted file mode 100644 index a444c4923f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/lament_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_planks.json b/Common/src/main/resources/assets/byg/models/item/lament_planks.json deleted file mode 100644 index e37923622b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_planks" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/lament_pressure_plate.json deleted file mode 100644 index aa7c4724b4..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_pressure_plate" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_sapling.json b/Common/src/main/resources/assets/byg/models/item/lament_sapling.json deleted file mode 100644 index 5de833bef5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/lament_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_slab.json b/Common/src/main/resources/assets/byg/models/item/lament_slab.json deleted file mode 100644 index a2d129a879..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_slab" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_stairs.json b/Common/src/main/resources/assets/byg/models/item/lament_stairs.json deleted file mode 100644 index 7cc8127dec..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_stairs" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/lament_trapdoor.json deleted file mode 100644 index 33cd146501..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/lament_trapdoor_bottom" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_wood.json b/Common/src/main/resources/assets/byg/models/item/lament_wood.json deleted file mode 100644 index 6499329c6d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/lament_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_boat.json b/Common/src/main/resources/assets/byg/models/item/maple_boat.json deleted file mode 100644 index f327278031..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/maple_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/maple_bookshelf.json deleted file mode 100644 index 9603f8b426..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_button.json b/Common/src/main/resources/assets/byg/models/item/maple_button.json deleted file mode 100644 index d3bd652f82..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/maple_crafting_table.json deleted file mode 100644 index 8d3dda2c36..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_door.json b/Common/src/main/resources/assets/byg/models/item/maple_door.json deleted file mode 100644 index 236070c6a3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/maple_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_fence.json b/Common/src/main/resources/assets/byg/models/item/maple_fence.json deleted file mode 100644 index a1f667e83a..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/maple_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/maple_fence_gate.json deleted file mode 100644 index 81f2f953ae..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_leaves.json b/Common/src/main/resources/assets/byg/models/item/maple_leaves.json deleted file mode 100644 index 397864cb59..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_log.json b/Common/src/main/resources/assets/byg/models/item/maple_log.json deleted file mode 100644 index f2b3ab79c2..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_planks.json b/Common/src/main/resources/assets/byg/models/item/maple_planks.json deleted file mode 100644 index 8f7872abed..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/maple_pressure_plate.json deleted file mode 100644 index e7d6475396..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_sapling.json b/Common/src/main/resources/assets/byg/models/item/maple_sapling.json deleted file mode 100644 index ee8dfbd454..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/maple_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_slab.json b/Common/src/main/resources/assets/byg/models/item/maple_slab.json deleted file mode 100644 index fbf71ef1ef..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_stairs.json b/Common/src/main/resources/assets/byg/models/item/maple_stairs.json deleted file mode 100644 index 00f5dbf62e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/maple_trapdoor.json deleted file mode 100644 index 8219b0f330..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_wood.json b/Common/src/main/resources/assets/byg/models/item/maple_wood.json deleted file mode 100644 index 8a25f5f6e6..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/maple_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_lament_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_lament_log.json deleted file mode 100644 index ebd7d53cdf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_lament_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_lament_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_lament_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_lament_wood.json deleted file mode 100644 index 09098ad134..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_lament_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_lament_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_maple_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_maple_log.json deleted file mode 100644 index ebdaeea448..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_maple_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_maple_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_maple_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_maple_wood.json deleted file mode 100644 index a45bf73aa7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_maple_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_maple_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/lament/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/lament/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/lament/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/lament/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/lament/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_door_top.png b/Common/src/main/resources/assets/byg/textures/block/lament/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/lament/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_sapling.png b/Common/src/main/resources/assets/byg/textures/block/lament/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/lament/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_leaves.png b/Common/src/main/resources/assets/byg/textures/block/lament/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/lament/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_log.png b/Common/src/main/resources/assets/byg/textures/block/lament/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_log.png rename to Common/src/main/resources/assets/byg/textures/block/lament/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_log_top.png b/Common/src/main/resources/assets/byg/textures/block/lament/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/lament/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_planks.png b/Common/src/main/resources/assets/byg/textures/block/lament/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_planks.png rename to Common/src/main/resources/assets/byg/textures/block/lament/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_lament_log.png b/Common/src/main/resources/assets/byg/textures/block/lament/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_lament_log.png rename to Common/src/main/resources/assets/byg/textures/block/lament/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_lament_log_top.png b/Common/src/main/resources/assets/byg/textures/block/lament/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_lament_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/lament/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/lament_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/lament/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/lament_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/lament/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/maple/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/maple/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/maple/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/maple/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/maple/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_door_top.png b/Common/src/main/resources/assets/byg/textures/block/maple/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/maple/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_sapling.png b/Common/src/main/resources/assets/byg/textures/block/maple/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/maple/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_leaves.png b/Common/src/main/resources/assets/byg/textures/block/maple/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/maple/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_log.png b/Common/src/main/resources/assets/byg/textures/block/maple/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_log.png rename to Common/src/main/resources/assets/byg/textures/block/maple/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_log_top.png b/Common/src/main/resources/assets/byg/textures/block/maple/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/maple/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_planks.png b/Common/src/main/resources/assets/byg/textures/block/maple/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_planks.png rename to Common/src/main/resources/assets/byg/textures/block/maple/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_maple_log.png b/Common/src/main/resources/assets/byg/textures/block/maple/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_maple_log.png rename to Common/src/main/resources/assets/byg/textures/block/maple/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_maple_log_top.png b/Common/src/main/resources/assets/byg/textures/block/maple/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_maple_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/maple/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/maple_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/maple/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/maple_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/maple/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/lament_door.png b/Common/src/main/resources/assets/byg/textures/item/lament/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/lament_door.png rename to Common/src/main/resources/assets/byg/textures/item/lament/door.png diff --git a/Common/src/main/resources/assets/byg/textures/item/maple_boat.png b/Common/src/main/resources/assets/byg/textures/item/maple/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/maple_boat.png rename to Common/src/main/resources/assets/byg/textures/item/maple/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/maple_door.png b/Common/src/main/resources/assets/byg/textures/item/maple/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/maple_door.png rename to Common/src/main/resources/assets/byg/textures/item/maple/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_lament_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_lament_wood.json deleted file mode 100644 index cb402a3e5d..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_lament_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_lament_log" - } - }, - "result": { - "item": "byg:stripped_lament_wood", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/stripped_maple_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_maple_wood.json deleted file mode 100644 index 33bce87492..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_maple_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_maple_log" - } - }, - "result": { - "item": "byg:stripped_maple_wood", - "count": 3 - } -} \ No newline at end of file From d0944b1f6571e42e1206abc0fd013a3b64da783d Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Fri, 27 May 2022 19:56:32 +0300 Subject: [PATCH 56/90] Jacaranda --- Common/src/generated/resources/.cache/cache | 99 ++++++++ .../byg/blockstates/jacaranda_bookshelf.json | 7 + .../byg/blockstates/jacaranda_button.json | 156 ++++++------- .../blockstates/jacaranda_crafting_table.json | 7 + .../byg/blockstates/jacaranda_door.json | 142 ++++++------ .../byg/blockstates/jacaranda_fence.json | 10 +- .../byg/blockstates/jacaranda_fence_gate.json | 80 +++++++ .../byg/blockstates/jacaranda_leaves.json | 7 + .../assets/byg/blockstates/jacaranda_log.json | 17 +- .../byg/blockstates/jacaranda_planks.json | 7 + .../blockstates/jacaranda_pressure_plate.json | 10 + .../byg/blockstates/jacaranda_sapling.json | 7 + .../byg/blockstates/jacaranda_slab.json | 13 ++ .../byg/blockstates/jacaranda_stairs.json | 216 +++++++++--------- .../byg/blockstates/jacaranda_trapdoor.json | 79 ++++--- .../byg/blockstates/jacaranda_wood.json | 16 +- .../blockstates/potted_jacaranda_sapling.json | 7 + .../blockstates/stripped_jacaranda_log.json | 16 ++ .../blockstates/stripped_jacaranda_wood.json | 16 ++ .../byg/models/block/jacaranda/bookshelf.json | 12 + .../byg/models/block/jacaranda/button.json | 6 + .../block/jacaranda/button_inventory.json | 6 + .../block/jacaranda/button_pressed.json | 6 + .../block/jacaranda/crafting_table.json | 12 + .../models/block/jacaranda/door_bottom.json | 7 + .../block/jacaranda/door_bottom_hinge.json | 7 + .../byg/models/block/jacaranda/door_top.json | 7 + .../block/jacaranda/door_top_hinge.json | 7 + .../byg/models/block/jacaranda/fence.json | 7 + .../models/block/jacaranda/fence_gate.json | 6 + .../block/jacaranda/fence_gate_open.json | 6 + .../block/jacaranda/fence_gate_wall.json | 6 + .../block/jacaranda/fence_gate_wall_open.json | 6 + .../byg/models/block/jacaranda/fence_inv.json | 7 + .../models/block/jacaranda/fence_post.json | 7 + .../models/block/jacaranda/grower_item.json | 6 + .../byg/models/block/jacaranda/leaves.json | 12 + .../models/block/jacaranda/leaves_snowy.json | 12 + .../byg/models/block/jacaranda/log.json | 7 + .../byg/models/block/jacaranda/planks.json | 12 + .../block/jacaranda/potted_grower_item.json} | 2 +- .../block/jacaranda/pressure_plate.json | 6 + .../block/jacaranda/pressure_plate_down.json | 6 + .../byg/models/block/jacaranda/slab.json | 8 + .../byg/models/block/jacaranda/slab_top.json | 8 + .../byg/models/block/jacaranda/stairs.json | 8 + .../models/block/jacaranda/stairs_inner.json | 8 + .../models/block/jacaranda/stairs_outer.json | 8 + .../models/block/jacaranda/stripped_log.json | 7 + .../models/block/jacaranda/stripped_wood.json | 7 + .../block/jacaranda/trapdoor_bottom.json | 6 + .../models/block/jacaranda/trapdoor_open.json | 6 + .../models/block/jacaranda/trapdoor_top.json | 6 + .../byg/models/block/jacaranda/wood.json | 7 + .../byg/models/item/jacaranda_boat.json | 6 + .../byg/models/item/jacaranda_bookshelf.json | 39 ++++ .../byg/models/item/jacaranda_button.json | 39 ++++ .../models/item/jacaranda_crafting_table.json | 39 ++++ .../byg/models/item/jacaranda_door.json | 6 + .../byg/models/item/jacaranda_fence.json | 39 ++++ .../byg/models/item/jacaranda_fence_gate.json | 39 ++++ .../byg/models/item/jacaranda_leaves.json | 39 ++++ .../assets/byg/models/item/jacaranda_log.json | 39 ++++ .../byg/models/item/jacaranda_planks.json | 39 ++++ .../models/item/jacaranda_pressure_plate.json | 39 ++++ .../byg/models/item/jacaranda_sapling.json | 6 + .../byg/models/item/jacaranda_slab.json | 39 ++++ .../byg/models/item/jacaranda_stairs.json | 39 ++++ .../byg/models/item/jacaranda_trapdoor.json | 39 ++++ .../byg/models/item/jacaranda_wood.json | 39 ++++ .../models/item/stripped_jacaranda_log.json | 39 ++++ .../models/item/stripped_jacaranda_wood.json | 39 ++++ .../recipes/byg.byg/wood/jacaranda/boat.json | 34 +++ .../byg.byg/wood/jacaranda/bookshelf.json | 34 +++ .../byg.byg/wood/jacaranda/button.json | 34 +++ .../wood/jacaranda/crafting_table.json | 34 +++ .../recipes/byg.byg/wood/jacaranda/door.json | 34 +++ .../recipes/byg.byg/wood/jacaranda/fence.json | 34 +++ .../byg.byg/wood/jacaranda/fence_gate.json | 34 +++ .../byg.byg/wood/jacaranda/planks.json | 32 +++ .../wood/jacaranda/pressure_plate.json | 34 +++ .../recipes/byg.byg/wood/jacaranda/slab.json | 34 +++ .../byg.byg/wood/jacaranda/stairs.json | 34 +++ .../byg.byg/wood/jacaranda/trapdoor.json | 34 +++ .../recipes/byg.byg/wood/jacaranda/wood.json | 34 +++ .../byg/recipes/wood/jacaranda/boat.json} | 6 +- .../byg/recipes/wood/jacaranda/bookshelf.json | 20 ++ .../byg/recipes/wood/jacaranda/button.json} | 0 .../wood/jacaranda/crafting_table.json} | 7 +- .../byg/recipes/wood/jacaranda/door.json} | 8 +- .../byg/recipes/wood/jacaranda/fence.json} | 0 .../recipes/wood/jacaranda/fence_gate.json} | 0 .../byg/recipes/wood/jacaranda/planks.json} | 4 +- .../wood/jacaranda/pressure_plate.json} | 4 +- .../byg/recipes/wood/jacaranda/slab.json} | 4 +- .../byg/recipes/wood/jacaranda/stairs.json} | 10 +- .../byg/recipes/wood/jacaranda/trapdoor.json} | 6 +- .../byg/recipes/wood/jacaranda/wood.json} | 7 +- .../byg/tags/blocks/wood/jacaranda_logs.json | 9 + .../byg/tags/items/wood/jacaranda_logs.json | 9 + .../textures/renders/BYGRenderTypes.java | 7 - .../byg/common/BYGCompostables.java | 2 - .../byg/common/BYGFlammables.java | 20 -- .../byg/common/BYGStrippables.java | 2 - .../byg/common/block/BYGBlocks.java | 32 --- .../byg/common/block/BYGWoodType.java | 5 - .../byg/common/block/BYGWoodTypes.java | 6 +- .../byg/common/entity/boat/BYGBoatEntity.java | 13 +- .../byg/common/item/BYGItems.java | 46 ++-- .../overworld/BYGOverworldTreeFeatures.java | 4 +- .../byg/blockstates/jacaranda_bookshelf.json | 7 - .../blockstates/jacaranda_crafting_table.json | 7 - .../byg/blockstates/jacaranda_fence_gate.json | 80 ------- .../byg/blockstates/jacaranda_leaves.json | 7 - .../byg/blockstates/jacaranda_planks.json | 7 - .../blockstates/jacaranda_pressure_plate.json | 10 - .../byg/blockstates/jacaranda_sapling.json | 7 - .../byg/blockstates/jacaranda_slab.json | 13 -- .../blockstates/potted_jacaranda_bush.json | 7 - .../blockstates/potted_jacaranda_sapling.json | 7 - .../blockstates/stripped_jacaranda_log.json | 16 -- .../blockstates/stripped_jacaranda_wood.json | 16 -- .../byg/models/block/jacaranda_bookshelf.json | 12 - .../byg/models/block/jacaranda_button.json | 6 - .../block/jacaranda_button_inventory.json | 6 - .../block/jacaranda_button_pressed.json | 6 - .../block/jacaranda_crafting_table.json | 12 - .../models/block/jacaranda_door_bottom.json | 7 - .../block/jacaranda_door_bottom_hinge.json | 7 - .../byg/models/block/jacaranda_door_top.json | 7 - .../block/jacaranda_door_top_hinge.json | 7 - .../byg/models/block/jacaranda_fence.json | 7 - .../models/block/jacaranda_fence_gate.json | 6 - .../block/jacaranda_fence_gate_open.json | 6 - .../block/jacaranda_fence_gate_wall.json | 6 - .../block/jacaranda_fence_gate_wall_open.json | 6 - .../block/jacaranda_fence_inventory.json | 7 - .../models/block/jacaranda_fence_post.json | 7 - .../byg/models/block/jacaranda_leaves.json | 6 - .../models/block/jacaranda_leaves_snowy.json | 12 - .../byg/models/block/jacaranda_log.json | 7 - .../byg/models/block/jacaranda_planks.json | 7 - .../block/jacaranda_pressure_plate.json | 6 - .../block/jacaranda_pressure_plate_down.json | 6 - .../byg/models/block/jacaranda_sapling.json | 7 - .../byg/models/block/jacaranda_slab.json | 8 - .../byg/models/block/jacaranda_slab_top.json | 8 - .../byg/models/block/jacaranda_stairs.json | 8 - .../models/block/jacaranda_stairs_inner.json | 8 - .../models/block/jacaranda_stairs_outer.json | 8 - .../block/jacaranda_trapdoor_bottom.json | 6 - .../models/block/jacaranda_trapdoor_open.json | 6 - .../models/block/jacaranda_trapdoor_top.json | 6 - .../byg/models/block/jacaranda_wood.json | 7 - .../block/potted_jacaranda_sapling.json | 6 - .../models/block/stripped_jacaranda_log.json | 12 - .../models/block/stripped_jacaranda_wood.json | 7 - .../byg/models/item/jacaranda_boat.json | 6 - .../byg/models/item/jacaranda_bookshelf.json | 22 -- .../byg/models/item/jacaranda_button.json | 22 -- .../models/item/jacaranda_crafting_table.json | 22 -- .../byg/models/item/jacaranda_door.json | 6 - .../byg/models/item/jacaranda_fence.json | 3 - .../byg/models/item/jacaranda_fence_gate.json | 22 -- .../byg/models/item/jacaranda_leaves.json | 22 -- .../assets/byg/models/item/jacaranda_log.json | 22 -- .../byg/models/item/jacaranda_planks.json | 22 -- .../models/item/jacaranda_pressure_plate.json | 22 -- .../byg/models/item/jacaranda_sapling.json | 6 - .../byg/models/item/jacaranda_slab.json | 22 -- .../byg/models/item/jacaranda_stairs.json | 22 -- .../byg/models/item/jacaranda_trapdoor.json | 22 -- .../byg/models/item/jacaranda_wood.json | 22 -- .../models/item/stripped_jacaranda_log.json | 22 -- .../models/item/stripped_jacaranda_wood.json | 22 -- .../bookshelf.png} | Bin .../crafting_table_front.png} | Bin .../crafting_table_side.png} | Bin .../crafting_table_top.png} | Bin .../door_bottom.png} | Bin .../door_top.png} | Bin .../grower_item.png} | Bin .../leaves.png} | Bin .../{jacaranda_log.png => jacaranda/log.png} | Bin .../log_top.png} | Bin .../planks.png} | Bin .../stripped_log.png} | Bin .../stripped_log_top.png} | Bin .../trapdoor.png} | Bin .../boat.png} | Bin .../door.png} | Bin .../byg/recipes/stripped_jacaranda_wood.json | 16 -- 192 files changed, 1988 insertions(+), 1240 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_bookshelf.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_button.json (51%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_crafting_table.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_door.json (58%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_fence.json (70%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_leaves.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_log.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_planks.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_stairs.json (65%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_trapdoor.json (54%) rename Common/src/{main => generated}/resources/assets/byg/blockstates/jacaranda_wood.json (50%) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/potted_jacaranda_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_log.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/button.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/button_inventory.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/button_pressed.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/grower_item.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json rename Common/src/{main/resources/assets/byg/models/block/potted_jacaranda_bush.json => generated/resources/assets/byg/models/block/jacaranda/potted_grower_item.json} (60%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate_down.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_bottom.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_open.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_top.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_boat.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_door.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_sapling.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json rename Common/src/{main/resources/data/byg/recipes/jacaranda_boat.json => generated/resources/data/byg/recipes/wood/jacaranda/boat.json} (85%) create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json rename Common/src/{main/resources/data/byg/recipes/jacaranda_button.json => generated/resources/data/byg/recipes/wood/jacaranda/button.json} (100%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_crafting_table.json => generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json} (75%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_door.json => generated/resources/data/byg/recipes/wood/jacaranda/door.json} (84%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_fence.json => generated/resources/data/byg/recipes/wood/jacaranda/fence.json} (100%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_fence_gate.json => generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json} (100%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_planks.json => generated/resources/data/byg/recipes/wood/jacaranda/planks.json} (69%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_pressure_plate.json => generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json} (91%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_slab.json => generated/resources/data/byg/recipes/wood/jacaranda/slab.json} (91%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_stairs.json => generated/resources/data/byg/recipes/wood/jacaranda/stairs.json} (69%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_trapdoor.json => generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json} (87%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_wood.json => generated/resources/data/byg/recipes/wood/jacaranda/wood.json} (79%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_planks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_slab.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_log.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_button_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_button_pressed.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_door_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_door_top_hinge.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_inventory.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_fence_post.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_leaves_snowy.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate_down.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_slab_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_inner.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_outer.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_bottom.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_open.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_top.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/jacaranda_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/potted_jacaranda_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_boat.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_bookshelf.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_button.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_crafting_table.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_door.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_fence.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_fence_gate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_leaves.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_planks.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_pressure_plate.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_sapling.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_slab.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_stairs.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_trapdoor.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_wood.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_log.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_wood.json rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_bookshelf.png => jacaranda/bookshelf.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_crafting_table_front.png => jacaranda/crafting_table_front.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_crafting_table_side.png => jacaranda/crafting_table_side.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_crafting_table_top.png => jacaranda/crafting_table_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_door_bottom.png => jacaranda/door_bottom.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_door_top.png => jacaranda/door_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_sapling.png => jacaranda/grower_item.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_leaves.png => jacaranda/leaves.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_log.png => jacaranda/log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_log_top.png => jacaranda/log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_planks.png => jacaranda/planks.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_jacaranda_log.png => jacaranda/stripped_log.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{stripped_jacaranda_log_top.png => jacaranda/stripped_log_top.png} (100%) rename Common/src/main/resources/assets/byg/textures/block/{jacaranda_trapdoor.png => jacaranda/trapdoor.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{jacaranda_boat.png => jacaranda/boat.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{jacaranda_door.png => jacaranda/door.png} (100%) delete mode 100644 Common/src/main/resources/data/byg/recipes/stripped_jacaranda_wood.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 99c0f77132..8faab590bd 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -203,6 +203,21 @@ c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressur bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json 4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json 5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json +2698ab6bf7752a084c60ca8b4373cedcb4c4cf52 assets/byg/blockstates/jacaranda_bookshelf.json +e36e83906ab21e33a7eb10159e835321bb8147d8 assets/byg/blockstates/jacaranda_button.json +92fe11ffeb6f855b92717d1e49ca483bd22b06ea assets/byg/blockstates/jacaranda_crafting_table.json +20567f28d3199a8518df9fcd4013a0cb3e8cf3b7 assets/byg/blockstates/jacaranda_door.json +b90a2358ad71914db8a0dddff012822feee9fed8 assets/byg/blockstates/jacaranda_fence.json +5b5e650aaca946a1790daab441d0312b42b9b974 assets/byg/blockstates/jacaranda_fence_gate.json +107b33016b7a7f95712f49914ee1e4389359bdf2 assets/byg/blockstates/jacaranda_leaves.json +052a85aa0ed5b9de3f45d3504be690ab96dc38bf assets/byg/blockstates/jacaranda_log.json +62da5c17355c7cc14a44c3ca60f6ebe488397b46 assets/byg/blockstates/jacaranda_planks.json +b5f013629695fa9d81cf37ce3d7b3aef39223f8d assets/byg/blockstates/jacaranda_pressure_plate.json +42e60d6faf7650b0b01bb40ca2f1ced3e3414608 assets/byg/blockstates/jacaranda_sapling.json +41416df158f3e814f5b4a57b4db8b6c1e7164ea7 assets/byg/blockstates/jacaranda_slab.json +80b6eab6b2fe7b9fabff58228badd698a5950e6b assets/byg/blockstates/jacaranda_stairs.json +10b8837262a81bf6c5c4cab22475a650c605c215 assets/byg/blockstates/jacaranda_trapdoor.json +1bfea42e7470aa0c5bee7a49c9975f51e9b6ab5f assets/byg/blockstates/jacaranda_wood.json f6e0d7a87643e75508857bc72c746d07f316042a assets/byg/blockstates/lament_bookshelf.json caa05c4828bed24692853c4b9260c69e4998251f assets/byg/blockstates/lament_button.json 10a39a99c8fd6a0dd496c6aab8be82e62eff9c91 assets/byg/blockstates/lament_crafting_table.json @@ -321,6 +336,7 @@ ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.js 024d35275a5820185399851d4653414c6995081c assets/byg/blockstates/potted_green_enchanted_sapling.json 23a354082c811e55009ce5048816dbb0c5eee31c assets/byg/blockstates/potted_holly_sapling.json e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_mushroom.json +97c6af45474f9503287ef4813a538cac2cc91c4b assets/byg/blockstates/potted_jacaranda_sapling.json 79c243dfa7ea17953f804292905b9c17d95d3dc2 assets/byg/blockstates/potted_lament_sapling.json 4babfb75998f0891db03ae355c52ad54543cdb64 assets/byg/blockstates/potted_mahogany_sapling.json 178fc20190f1d18e808f983c72384c87f6a09275 assets/byg/blockstates/potted_mangrove_sapling.json @@ -406,6 +422,8 @@ edf913aff7aeb91fddd90e245648d7b20a214eb3 assets/byg/blockstates/stripped_embur_h f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_enchanted_wood.json 883ccd05f2b67a6aeee0e6ee57b7a30585538d7b assets/byg/blockstates/stripped_holly_log.json 6239db53e36bf37f2a8d22d02ea135f6594538b0 assets/byg/blockstates/stripped_holly_wood.json +fa08dba9b4ba2fcdc08e5aed52586732594986f6 assets/byg/blockstates/stripped_jacaranda_log.json +0a87dd9aa49418c936bb461ebe6812f235725510 assets/byg/blockstates/stripped_jacaranda_wood.json c0a66a6955d48480b6fbffd8e19dfc2f273c9305 assets/byg/blockstates/stripped_lament_log.json 9303ee51cf8c4a2bfc0f4f01e5d22b2cf37c0529 assets/byg/blockstates/stripped_lament_wood.json 28d46328ec91e7650f48375c069a7bc8e814bf53 assets/byg/blockstates/stripped_mahogany_log.json @@ -972,6 +990,41 @@ d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json 1f9b271e1f7e94aa33a491ae563799bd9c16b7b2 assets/byg/models/block/imparius/wood.json +39de53a63c7e47dd437aa8adb44649c602f9027c assets/byg/models/block/jacaranda/bookshelf.json +15c34fa4e4a50c222252a1fe0da4e361340523c2 assets/byg/models/block/jacaranda/button.json +0a9a7c458981673182327622531c0c174ff9aaf6 assets/byg/models/block/jacaranda/button_inventory.json +ad154a05f2c8cdbfde56276fa10a9d1455e43f4f assets/byg/models/block/jacaranda/button_pressed.json +92fa025dd3975e61aa2c3c4f22aab0da3a8f5602 assets/byg/models/block/jacaranda/crafting_table.json +4afd38cb356c802a552e1dbefed5f5895ed2d9c8 assets/byg/models/block/jacaranda/door_bottom.json +45c1b737291ad459faf005713fe9e1f953165b5f assets/byg/models/block/jacaranda/door_bottom_hinge.json +155674ecb0201713abf39952729cc2b258dd7a43 assets/byg/models/block/jacaranda/door_top.json +299990a4a9758272d5774c061a20c745b0ea5cb7 assets/byg/models/block/jacaranda/door_top_hinge.json +cae628d166d0ae527ad1d238059b739841a11f9b assets/byg/models/block/jacaranda/fence.json +24149020f47c8bc56cd782337d0dc957ff928ca8 assets/byg/models/block/jacaranda/fence_gate.json +b09b4433c386be6888dc028dbc622d7222019edb assets/byg/models/block/jacaranda/fence_gate_open.json +67b6ea7d8fb1b31d86b4c5b68344c59084a2dfc6 assets/byg/models/block/jacaranda/fence_gate_wall.json +4587d5e1eb096bd157946d72c9c0830b61efebfb assets/byg/models/block/jacaranda/fence_gate_wall_open.json +807c238767de44c0ac9978697d4b5c0255eddbca assets/byg/models/block/jacaranda/fence_inv.json +bee2e372b696a70e270aadfe484a9e343126dc99 assets/byg/models/block/jacaranda/fence_post.json +a7a9c594b02e93e335b4758f9bf001b704af548e assets/byg/models/block/jacaranda/grower_item.json +279e0d97010cc0ba272fe30dbd0eb2c64b529b37 assets/byg/models/block/jacaranda/leaves.json +604953298d30b8d1218a1497d2e5d4c7eb58be2c assets/byg/models/block/jacaranda/leaves_snowy.json +efbc1ec07bc7c38156d309dbf1f167c50aa7ceec assets/byg/models/block/jacaranda/log.json +74de0b19925ced521cd4ee6af965c88010e7ec49 assets/byg/models/block/jacaranda/planks.json +76f90f0e23d14f02c0d23819235c0838779777b0 assets/byg/models/block/jacaranda/potted_grower_item.json +818e8d63dad1cb46429bedf227d7ce87ebb3a1d2 assets/byg/models/block/jacaranda/pressure_plate.json +70c8c7438d5b90c1b75553b014b9c7d1469b2993 assets/byg/models/block/jacaranda/pressure_plate_down.json +2553584974f85b7fe90eb32cfcc5986ebc34f137 assets/byg/models/block/jacaranda/slab.json +6349d34c42e722baf46c21be798035b9e0a27e9d assets/byg/models/block/jacaranda/slab_top.json +4b7cb7567d5ee25e4652825658e80bd5a1a4ef97 assets/byg/models/block/jacaranda/stairs.json +b201729669f46e7adbc5f279650e3f917cb15bc5 assets/byg/models/block/jacaranda/stairs_inner.json +37a0ba63d922a81f1fdc4e1b76b525f4d1fbee79 assets/byg/models/block/jacaranda/stairs_outer.json +b4457b102fba5d8e04a3c8ad00f1c929cd678256 assets/byg/models/block/jacaranda/stripped_log.json +261fcaa47c42f7c3686e206a5406a86cefdebc83 assets/byg/models/block/jacaranda/stripped_wood.json +afcacad0ef8b2f22a55d9422b6184940175e42ef assets/byg/models/block/jacaranda/trapdoor_bottom.json +ee6101896a17762f954960bb0e7f29de8e5bc57b assets/byg/models/block/jacaranda/trapdoor_open.json +f3a97f7037bd98c8543a606b67659188712e0fc9 assets/byg/models/block/jacaranda/trapdoor_top.json +cee2b01ed5050648f812cb4cb66cb723c0613522 assets/byg/models/block/jacaranda/wood.json e1d0ed2c387934e8da4fcd5ebede2019df0f25cc assets/byg/models/block/lament/bookshelf.json c422e3639a840bf08a658265c014a6b3d08328ef assets/byg/models/block/lament/button.json 8788b3c84920581717b1aae9807ba0f19237ad66 assets/byg/models/block/lament/button_inventory.json @@ -1677,6 +1730,22 @@ d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressur 7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json 151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json 81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/item/imparius_trapdoor.json +a7cedcec33fab5c1f7530e8da7b7921b3de02815 assets/byg/models/item/jacaranda_boat.json +d6cbf44f7b44d96986f2cecc3bf7a9222d51d6a9 assets/byg/models/item/jacaranda_bookshelf.json +8f4537e91025f33fa560c91a09f57a79c0f31ce8 assets/byg/models/item/jacaranda_button.json +20fdaf2f06252da62e1ca3af14c8ef5846b3c2b2 assets/byg/models/item/jacaranda_crafting_table.json +82b1bce72528f527e2a4cd7f48c01505757d4b3d assets/byg/models/item/jacaranda_door.json +2b0f96c4331d67309b26899450eb55c04ae0bef3 assets/byg/models/item/jacaranda_fence.json +d27aff17a3e2ce53827f5a62d78cdf2819debcbc assets/byg/models/item/jacaranda_fence_gate.json +7e55025e16aad27d38b049091dd08e0b3272a422 assets/byg/models/item/jacaranda_leaves.json +0af159134c351cd0d03887dedd1ee39498f3b011 assets/byg/models/item/jacaranda_log.json +98793ff287bcfa5b1eea58ba52e6eb2cf89ab42b assets/byg/models/item/jacaranda_planks.json +a4b891eeec337ebbcd0e3cc4e7d6bf1e6a5a0132 assets/byg/models/item/jacaranda_pressure_plate.json +dcdcc07c8cbca3c5ad973cec28db6e9e7555016e assets/byg/models/item/jacaranda_sapling.json +5cc496b7d3ea76fc11fc59b8d877c097ee4882b5 assets/byg/models/item/jacaranda_slab.json +91ae49704d5ad331330689daf0fe162f51c16a36 assets/byg/models/item/jacaranda_stairs.json +28da4bad8d1e77950a9ec786e087baf9b640a13b assets/byg/models/item/jacaranda_trapdoor.json +de48c9f0d085b2f0b6aee5dc9e0d1ac26561aa98 assets/byg/models/item/jacaranda_wood.json 43108e292ab8d2c28ba23da265ac49bf56729fed assets/byg/models/item/lament_bookshelf.json 598ed4a3fe2c7505497c0e5b2428b312e6732b2c assets/byg/models/item/lament_button.json 88f5f79cb6cf050ecd80977cbbf3cf076ea1c82d assets/byg/models/item/lament_crafting_table.json @@ -1861,6 +1930,8 @@ b0d668ef92fa26d739f0fb38fdd5fce090ce6b49 assets/byg/models/item/stripped_fir_log be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_enchanted_wood.json 700f07776e23d57776aeb0635dcc3b73d16f09db assets/byg/models/item/stripped_holly_log.json 8527fb1522dc86c8fee094163603e6cb39c685a0 assets/byg/models/item/stripped_holly_wood.json +fdfdec32df82ed46563a693429dada4bc7e5ef0a assets/byg/models/item/stripped_jacaranda_log.json +c1797a3d58aad68904c12e8885d4642a7f329d52 assets/byg/models/item/stripped_jacaranda_wood.json 578584d2b4fb3da894b78a8c0c00447fc11b6412 assets/byg/models/item/stripped_lament_log.json 6640a4be3b53ba3a87cd1e41ab25775dd56382aa assets/byg/models/item/stripped_lament_wood.json 8d712c44b14eee5ab993f13a6d92cc925b483716 assets/byg/models/item/stripped_mahogany_log.json @@ -2130,6 +2201,19 @@ e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/w 21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json ae49ef7c283fbe64a3b191ec6edf9b54a573b336 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json +9b63fdd65f906dcf1cae46f2d8f58f1ee66ebd81 data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json +7639605898e82c0eb121f6615d86b11a25852070 data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json +6e3c4be62665086fb2f4de795c904775e044e022 data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json +d6db26dc1358ebc8d2b800946cd02a63b269813a data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json +4ff71f71a754f33a1e3072255b6ad8a5efd61b28 data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json +74129cb918b70b9c02b66b5572715220984bd3c7 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json +49a7a3016d146de8c893756a8601ab48d61f9e33 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json +e7086261f7b57af35c174f6338a464c047ee7bb6 data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json +336fc3792690640efe58fa048f1fdeb328773669 data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json +890e6fbbebe86e8c4949fcc5f20e7c15672223ad data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json +5a0f6fffd88be08b587aa7f5bf4e83de18bbdf4e data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json +9d4a8d79a288204acc3b39d70e8d071484c09446 data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json +af340260b341d180e134ba9b75c4af054b9b24bb data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json 4df2f89704dc8609e4f7756cadcaf3d95a8dc794 data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json fc5cdeb834d0985ad3bab1b2f59db019fd042b4b data/byg/advancements/recipes/byg.byg/wood/lament/button.json 44a3bb049b373b6a3d4bfdf9070fc43d8d0c2ce2 data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json @@ -2487,6 +2571,19 @@ fda598130e789b7ae529c1bc27e4bdbe27164238 data/byg/recipes/wood/imparius/fence_ga 7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json 67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json 7868a447edb00b506360fadccf7494ef456a775e data/byg/recipes/wood/imparius/wood.json +6b7e114aef8883cb5fe6d06c97430f2bdf57dbc6 data/byg/recipes/wood/jacaranda/boat.json +f767b1117c2dbd3c215b4d57fe9248255b964e88 data/byg/recipes/wood/jacaranda/bookshelf.json +808323bac21913eaa2fb4ae6f54a91d8ace3fb26 data/byg/recipes/wood/jacaranda/button.json +f8b8eb8a0061854626ffc42feddc02ee1ede5738 data/byg/recipes/wood/jacaranda/crafting_table.json +9920e72996e8e36c711d27b67bc743155460656a data/byg/recipes/wood/jacaranda/door.json +8cda82ff065cbac09c43b41373a88479aa206c24 data/byg/recipes/wood/jacaranda/fence.json +24b886a894133dafcfc5a5a48629c14374f6c8c7 data/byg/recipes/wood/jacaranda/fence_gate.json +2016114072e5c68b6e242061fbba0d742234c9a3 data/byg/recipes/wood/jacaranda/planks.json +24c8ca28e1bd2621ebba7005614126bee27a3ed9 data/byg/recipes/wood/jacaranda/pressure_plate.json +4f6e33e4604db3fda59343a7f5f529f7d640e4f5 data/byg/recipes/wood/jacaranda/slab.json +22f968a1384eff9b0e2dc6f2c2913f19946f0057 data/byg/recipes/wood/jacaranda/stairs.json +fa2f16445640fec9d6f2476fbf9d11636c5742fc data/byg/recipes/wood/jacaranda/trapdoor.json +64935c9ce800657c72f7b5e21f91b8d371137f81 data/byg/recipes/wood/jacaranda/wood.json 4054d9b7c8238fa3adf7e614844603aa119b7310 data/byg/recipes/wood/lament/bookshelf.json 450b8b29ef6d74ee50c8459e1a0baab86b25893b data/byg/recipes/wood/lament/button.json 804b7b6478646d9282f0af35fa3d2d679272b6f3 data/byg/recipes/wood/lament/crafting_table.json @@ -2804,6 +2901,7 @@ b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json 47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/blocks/wood/holly_logs.json 60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json +c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/blocks/wood/jacaranda_logs.json 9e22dce46462b6eeabc33cc58ddca514d843c59a data/byg/tags/blocks/wood/lament_logs.json 095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json 5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json @@ -2832,6 +2930,7 @@ cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json 664f79bad1ce2f2fcb9938fb32b5feff7501cb53 data/byg/tags/items/wood/holly_logs.json 265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json +8fc66ec4f622a20e8b7ca7337f8977ec4fdb5482 data/byg/tags/items/wood/jacaranda_logs.json 5af2d8f08cb849a0f9bae686b5a9a4404abbc2a0 data/byg/tags/items/wood/lament_logs.json d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json 5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_bookshelf.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_bookshelf.json new file mode 100644 index 0000000000..20eab46033 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_bookshelf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/bookshelf" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_button.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json similarity index 51% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_button.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json index d1dce8dbce..418049942b 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json @@ -1,118 +1,118 @@ { "variants": { - "face=floor,facing=east,powered=false": { - "model": "byg:block/jacaranda_button", - "y": 90 - }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/jacaranda_button", - "y": 270 - }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/jacaranda_button", - "y": 180 - }, "face=floor,facing=north,powered=false": { - "model": "byg:block/jacaranda_button" + "model": "byg:block/jacaranda/button_inventory" }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/jacaranda_button", - "uvlock": true, + "face=wall,facing=north,powered=false": { + "model": "byg:block/jacaranda/button_inventory", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/jacaranda_button", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "y": 180 }, "face=wall,facing=south,powered=false": { - "model": "byg:block/jacaranda_button", - "uvlock": true, + "model": "byg:block/jacaranda/button_inventory", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=false": { - "model": "byg:block/jacaranda_button", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "x": 180 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/jacaranda_button", - "x": 180, + "face=floor,facing=west,powered=false": { + "model": "byg:block/jacaranda/button_inventory", "y": 270 }, + "face=wall,facing=west,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=false": { - "model": "byg:block/jacaranda_button", + "model": "byg:block/jacaranda/button_inventory", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=false": { - "model": "byg:block/jacaranda_button", - "x": 180 - }, - "face=ceiling,facing=north,powered=false": { - "model": "byg:block/jacaranda_button", - "x": 180, - "y": 180 - }, - "face=floor,facing=east,powered=true": { - "model": "byg:block/jacaranda_button_pressed", + "face=floor,facing=east,powered=false": { + "model": "byg:block/jacaranda/button_inventory", "y": 90 }, - "face=floor,facing=west,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "y": 270 + "face=wall,facing=east,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "x": 90, + "y": 90, + "uvlock": true }, - "face=floor,facing=south,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "y": 180 + "face=ceiling,facing=east,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "x": 180, + "y": 270 }, "face=floor,facing=north,powered=true": { - "model": "byg:block/jacaranda_button_pressed" + "model": "byg:block/jacaranda/button_pressed" }, - "face=wall,facing=east,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "uvlock": true, + "face=wall,facing=north,powered=true": { + "model": "byg:block/jacaranda/button_pressed", "x": 90, - "y": 90 + "uvlock": true }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180, + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "y": 180 }, "face=wall,facing=south,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "uvlock": true, + "model": "byg:block/jacaranda/button_pressed", "x": 90, - "y": 180 + "y": 180, + "uvlock": true }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "uvlock": true, - "x": 90 + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180 }, - "face=ceiling,facing=east,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "x": 180, + "face=floor,facing=west,powered=true": { + "model": "byg:block/jacaranda/button_pressed", "y": 270 }, + "face=wall,facing=west,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 90, + "y": 270, + "uvlock": true + }, "face=ceiling,facing=west,powered=true": { - "model": "byg:block/jacaranda_button_pressed", + "model": "byg:block/jacaranda/button_pressed", "x": 180, "y": 90 }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/jacaranda_button_pressed", - "x": 180 + "face=floor,facing=east,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "y": 90 }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/jacaranda_button_pressed", + "face=wall,facing=east,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 90, + "y": 90, + "uvlock": true + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/jacaranda/button_pressed", "x": 180, - "y": 180 + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_crafting_table.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_crafting_table.json new file mode 100644 index 0000000000..6a54a0e064 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_crafting_table.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/crafting_table" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_door.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json similarity index 58% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_door.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json index b1f6474399..fd264ab775 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_top", + "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_bottom", + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_top", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_bottom", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_top", "y": 180 }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_top" + }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_bottom", + "model": "byg:block/jacaranda/door_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_bottom_hinge" - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_bottom_hinge", + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_bottom", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_bottom", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_bottom_hinge", + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door_bottom" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_bottom_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_bottom_hinge", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_bottom_hinge", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_bottom_hinge" + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_top_hinge" }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_bottom", + "facing=south,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_bottom", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_top" + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door_bottom_hinge" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_top", - "y": 90 + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_top_hinge" }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_top", + "facing=south,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda_door_top", + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_top_hinge" - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_top_hinge", + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_top_hinge", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_top_hinge", + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_bottom_hinge" + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda_door_top_hinge", + "facing=west,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_top_hinge", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door_bottom_hinge", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_top", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_top_hinge", - "y": 270 + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_top" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda_door_top_hinge" + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_top", + "y": 90 }, "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_top", + "model": "byg:block/jacaranda/door_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_top" + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_bottom", + "y": 180 }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_top", + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_bottom" + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_bottom", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda_door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door_bottom", + "y": 270 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_fence.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json similarity index 70% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_fence.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json index f678740b53..772a6c0e4d 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "byg:block/jacaranda_fence_post" + "model": "byg:block/jacaranda/fence_post" } }, { @@ -10,7 +10,7 @@ "north": "true" }, "apply": { - "model": "byg:block/jacaranda_fence", + "model": "byg:block/jacaranda/fence", "uvlock": true } }, @@ -19,7 +19,7 @@ "south": "true" }, "apply": { - "model": "byg:block/jacaranda_fence", + "model": "byg:block/jacaranda/fence", "y": 180, "uvlock": true } @@ -29,7 +29,7 @@ "west": "true" }, "apply": { - "model": "byg:block/jacaranda_fence", + "model": "byg:block/jacaranda/fence", "y": 270, "uvlock": true } @@ -39,7 +39,7 @@ "east": "true" }, "apply": { - "model": "byg:block/jacaranda_fence", + "model": "byg:block/jacaranda/fence", "y": 90, "uvlock": true } diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json new file mode 100644 index 0000000000..eb4a7fe5cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_leaves.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_leaves.json new file mode 100644 index 0000000000..619623fa90 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/leaves" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_log.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_log.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_log.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_log.json index 804b7413b2..fd0a7d8c7f 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_log.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_log.json @@ -1,17 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/jacaranda/log", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/jacaranda_log" + "model": "byg:block/jacaranda/log" }, "axis=z": { - "model": "byg:block/jacaranda_log", + "model": "byg:block/jacaranda/log", "x": 90 - }, - "axis=x": { - "model": "byg:block/jacaranda_log", - "x": 90, - "y": 90 } } -} - +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_planks.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_planks.json new file mode 100644 index 0000000000..dcf9d73c8c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_pressure_plate.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_pressure_plate.json new file mode 100644 index 0000000000..af63dba4dc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "byg:block/jacaranda/pressure_plate" + }, + "powered=true": { + "model": "byg:block/jacaranda/pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sapling.json new file mode 100644 index 0000000000..d2b98c8cd8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json new file mode 100644 index 0000000000..e8847ea83b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=top": { + "model": "byg:block/jacaranda/slab_top" + }, + "type=bottom": { + "model": "byg:block/jacaranda/slab" + }, + "type=double": { + "model": "byg:block/jacaranda/planks" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json similarity index 65% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_stairs.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json index a3d8d810c7..77bc5986e6 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { - "model": "byg:block/jacaranda_stairs" - }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/jacaranda_stairs", - "y": 180, + "facing=north,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "x": 180, + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/jacaranda_stairs", + "facing=south,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/jacaranda_stairs", - "y": 270, + "facing=west,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "x": 180, + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner" + "facing=east,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "x": 180, + "uvlock": true }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", - "y": 180, + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", - "y": 270, + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=east,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "x": 180, "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "x": 180, "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner" - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/jacaranda_stairs", + "facing=east,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/jacaranda_stairs", - "x": 180, + "facing=north,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/jacaranda_stairs", - "x": 180, + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { - "model": "byg:block/jacaranda_stairs", - "x": 180, + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=north,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", "x": 180, - "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", "x": 180, + "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=east,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", "x": 180, + "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", - "x": 180, - "y": 180, + "facing=north,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", + "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", - "x": 180, + "facing=south,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", "y": 90, "uvlock": true }, + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner" + }, "facing=north,half=top,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", + "model": "byg:block/jacaranda/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=south,half=top,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=west,half=top,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, - "y": 270, + "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/jacaranda_stairs_inner", - "x": 180, + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "y": 90, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "y": 270, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, - "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=south,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, - "y": 90, + "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { - "model": "byg:block/jacaranda_stairs_inner", + "facing=west,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", + "x": 180, "y": 90, "uvlock": true }, "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", + "model": "byg:block/jacaranda/stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=south,half=bottom,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer" - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda_stairs_outer", + "facing=west,half=bottom,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", "y": 180, "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json similarity index 54% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_trapdoor.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json index 9e0da228e8..a882dab888 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json @@ -1,69 +1,68 @@ { "variants": { - "facing=north,half=bottom,open=false": { - "model": "byg:block/jacaranda_trapdoor_bottom" - }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/jacaranda_trapdoor_bottom", - "y": 180 - }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/jacaranda_trapdoor_bottom", - "y": 90 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/jacaranda_trapdoor_bottom", - "y": 270 - }, "facing=north,half=top,open=false": { - "model": "byg:block/jacaranda_trapdoor_top" + "model": "byg:block/jacaranda/trapdoor_top" }, "facing=south,half=top,open=false": { - "model": "byg:block/jacaranda_trapdoor_top", + "model": "byg:block/jacaranda/trapdoor_top", "y": 180 }, - "facing=east,half=top,open=false": { - "model": "byg:block/jacaranda_trapdoor_top", - "y": 90 - }, "facing=west,half=top,open=false": { - "model": "byg:block/jacaranda_trapdoor_top", + "model": "byg:block/jacaranda/trapdoor_top", "y": 270 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/jacaranda_trapdoor_open" + "facing=east,half=top,open=false": { + "model": "byg:block/jacaranda/trapdoor_top", + "y": 90 }, - "facing=south,half=bottom,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", - "y": 180 + "facing=north,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom" }, - "facing=east,half=bottom,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", + "y": 180 }, - "facing=west,half=bottom,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", + "facing=west,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", "y": 270 }, + "facing=east,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", + "y": 90 + }, "facing=north,half=top,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", + "model": "byg:block/jacaranda/trapdoor_open", "x": 180, "y": 180 }, "facing=south,half=top,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", + "model": "byg:block/jacaranda/trapdoor_open", + "x": 180 + }, + "facing=west,half=top,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", "x": 180, - "y": 0 + "y": 90 }, "facing=east,half=top,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", + "model": "byg:block/jacaranda/trapdoor_open", "x": 180, "y": 270 }, - "facing=west,half=top,open=true": { - "model": "byg:block/jacaranda_trapdoor_open", - "x": 180, + "facing=north,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open" + }, + "facing=south,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", + "y": 270 + }, + "facing=east,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_wood.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_wood.json similarity index 50% rename from Common/src/main/resources/assets/byg/blockstates/jacaranda_wood.json rename to Common/src/generated/resources/assets/byg/blockstates/jacaranda_wood.json index 5137162c29..e216bcc26f 100644 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_wood.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_wood.json @@ -1,16 +1,16 @@ { "variants": { + "axis=x": { + "model": "byg:block/jacaranda/wood", + "x": 90, + "y": 90 + }, "axis=y": { - "model": "byg:block/jacaranda_wood" + "model": "byg:block/jacaranda/wood" }, "axis=z": { - "model": "byg:block/jacaranda_wood", + "model": "byg:block/jacaranda/wood", "x": 90 - }, - "axis=x": { - "model": "byg:block/jacaranda_wood", - "x": 90, - "y": 90 } } -} +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/potted_jacaranda_sapling.json b/Common/src/generated/resources/assets/byg/blockstates/potted_jacaranda_sapling.json new file mode 100644 index 0000000000..cc58a60148 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/potted_jacaranda_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/potted_grower_item" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_log.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_log.json new file mode 100644 index 0000000000..bf0d4b6299 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/jacaranda/stripped_log", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/jacaranda/stripped_log" + }, + "axis=z": { + "model": "byg:block/jacaranda/stripped_log", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_wood.json b/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_wood.json new file mode 100644 index 0000000000..1d7bbe90a4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/stripped_jacaranda_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "byg:block/jacaranda/stripped_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "byg:block/jacaranda/stripped_wood" + }, + "axis=z": { + "model": "byg:block/jacaranda/stripped_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json new file mode 100644 index 0000000000..162ec9493f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/jacaranda/planks", + "up": "byg:block/jacaranda/planks", + "north": "byg:block/jacaranda/bookshelf", + "south": "byg:block/jacaranda/bookshelf", + "east": "byg:block/jacaranda/bookshelf", + "west": "byg:block/jacaranda/bookshelf", + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/button.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button.json new file mode 100644 index 0000000000..e7132ac25b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_inventory.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_inventory.json new file mode 100644 index 0000000000..ae1d59f26b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_pressed.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_pressed.json new file mode 100644 index 0000000000..a9963ab2fb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json new file mode 100644 index 0000000000..ce10e3ddfc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/jacaranda/planks", + "up": "byg:block/jacaranda/crafting_table_top", + "north": "byg:block/jacaranda/crafting_table_front", + "south": "byg:block/jacaranda/crafting_table_side", + "east": "byg:block/jacaranda/crafting_table_side", + "west": "byg:block/jacaranda/crafting_table_front", + "particle": "byg:block/jacaranda/crafting_table_front" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json new file mode 100644 index 0000000000..1c5dba3a85 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json new file mode 100644 index 0000000000..da617f618b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_rh", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json new file mode 100644 index 0000000000..9cdba364c0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json new file mode 100644 index 0000000000..667b602e6e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_rh", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json new file mode 100644 index 0000000000..2bc88a11fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "byg:block/jacaranda/planks", + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate.json new file mode 100644 index 0000000000..334dd55ab9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_open.json new file mode 100644 index 0000000000..c5dbdd5803 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall.json new file mode 100644 index 0000000000..060b7c1b2e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall_open.json new file mode 100644 index 0000000000..0fc7f42aa1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json new file mode 100644 index 0000000000..93272bebfd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "byg:block/jacaranda/planks", + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json new file mode 100644 index 0000000000..6bf679023d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "byg:block/jacaranda/planks", + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/grower_item.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/grower_item.json new file mode 100644 index 0000000000..bad4eb7d83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/grower_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "byg:block/jacaranda/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json new file mode 100644 index 0000000000..f820e1cf49 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/jacaranda/leaves", + "up": "byg:block/jacaranda/leaves", + "north": "byg:block/jacaranda/leaves", + "south": "byg:block/jacaranda/leaves", + "east": "byg:block/jacaranda/leaves", + "west": "byg:block/jacaranda/leaves", + "particle": "byg:block/jacaranda/leaves" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json new file mode 100644 index 0000000000..9bcc364af0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/jacaranda/leaves_snowy", + "up": "byg:block/jacaranda/leaves_snowy", + "north": "byg:block/jacaranda/leaves_snowy_side", + "south": "byg:block/jacaranda/leaves_snowy_side", + "east": "byg:block/jacaranda/leaves_snowy_side", + "west": "byg:block/jacaranda/leaves_snowy_side", + "particle": "byg:block/jacaranda/leaves_snowy_side" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json new file mode 100644 index 0000000000..a1d521b20b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/jacaranda/log", + "end": "byg:block/jacaranda/log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json new file mode 100644 index 0000000000..5f6621ebab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "down": "byg:block/jacaranda/planks", + "up": "byg:block/jacaranda/planks", + "north": "byg:block/jacaranda/planks", + "south": "byg:block/jacaranda/planks", + "east": "byg:block/jacaranda/planks", + "west": "byg:block/jacaranda/planks", + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/potted_grower_item.json similarity index 60% rename from Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json rename to Common/src/generated/resources/assets/byg/models/block/jacaranda/potted_grower_item.json index 24d3025da7..c4041c1dd9 100644 --- a/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/potted_grower_item.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "byg:block/jacaranda_bush" + "plant": "byg:block/jacaranda/grower_item" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate.json new file mode 100644 index 0000000000..322a0abf51 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate_down.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate_down.json new file mode 100644 index 0000000000..db0652a0a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json new file mode 100644 index 0000000000..75168ac13d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "side": "byg:block/jacaranda/planks", + "bottom": "byg:block/jacaranda/planks", + "top": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json new file mode 100644 index 0000000000..a57a2c2bf0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "side": "byg:block/jacaranda/planks", + "bottom": "byg:block/jacaranda/planks", + "top": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json new file mode 100644 index 0000000000..f0b2b52233 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "byg:block/jacaranda/planks", + "bottom": "byg:block/jacaranda/planks", + "top": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json new file mode 100644 index 0000000000..4b2107e4a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "byg:block/jacaranda/planks", + "bottom": "byg:block/jacaranda/planks", + "top": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json new file mode 100644 index 0000000000..a6714a0f58 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "byg:block/jacaranda/planks", + "bottom": "byg:block/jacaranda/planks", + "top": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json new file mode 100644 index 0000000000..b7954460fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "byg:block/jacaranda/stripped_log", + "end": "byg:block/jacaranda/stripped_log_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_wood.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_wood.json new file mode 100644 index 0000000000..321daadfa3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/jacaranda/stripped_log", + "particle": "byg:block/jacaranda/stripped_log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_bottom.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_bottom.json new file mode 100644 index 0000000000..6f104e9ddc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "byg:block/jacaranda/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_open.json new file mode 100644 index 0000000000..a6ec5f14e7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_open", + "textures": { + "texture": "byg:block/jacaranda/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_top.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_top.json new file mode 100644 index 0000000000..80ce6285cf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_orientable_trapdoor_top", + "textures": { + "texture": "byg:block/jacaranda/trapdoor" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/wood.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/wood.json new file mode 100644 index 0000000000..5e78f18f2b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "byg:block/jacaranda/log", + "particle": "byg:block/jacaranda/log" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_boat.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_boat.json new file mode 100644 index 0000000000..5b6b28affe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/jacaranda/boat" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json new file mode 100644 index 0000000000..ced652fdaf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/bookshelf", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json new file mode 100644 index 0000000000..cdc9f0c9c1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/button_inventory", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json new file mode 100644 index 0000000000..437246c3e8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/crafting_table", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_door.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_door.json new file mode 100644 index 0000000000..05c2fdf888 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/jacaranda/door" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json new file mode 100644 index 0000000000..38f5c66800 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/fence_inv", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json new file mode 100644 index 0000000000..216e23f6dc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/fence_gate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json new file mode 100644 index 0000000000..a3d7ccd86c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/leaves", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json new file mode 100644 index 0000000000..a2d6c0616a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json new file mode 100644 index 0000000000..5b280e1360 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/planks", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json new file mode 100644 index 0000000000..42a07ee85c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/pressure_plate", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_sapling.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_sapling.json new file mode 100644 index 0000000000..10b9085562 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:block/jacaranda/grower_item" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json new file mode 100644 index 0000000000..4a9d963966 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/slab", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json new file mode 100644 index 0000000000..595bb7eff8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/stairs", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json new file mode 100644 index 0000000000..cfade325c8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/trapdoor_bottom", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json new file mode 100644 index 0000000000..816ec126fd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json new file mode 100644 index 0000000000..6e4a814388 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/stripped_log", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json new file mode 100644 index 0000000000..07987c1bc1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json @@ -0,0 +1,39 @@ +{ + "parent": "byg:block/jacaranda/stripped_wood", + "display": { + "thirdperson_lefthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + }, + "thirdperson_righthand": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json new file mode 100644 index 0000000000..8a513a66d0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/boat" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/boat" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json new file mode 100644 index 0000000000..6dc5d01187 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/bookshelf" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/bookshelf" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json new file mode 100644 index 0000000000..7d6fe56f98 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json new file mode 100644 index 0000000000..5c8fd50310 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/crafting_table" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/crafting_table" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json new file mode 100644 index 0000000000..d67c64e784 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json new file mode 100644 index 0000000000..ecef758b52 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json new file mode 100644 index 0000000000..61632353f8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json new file mode 100644 index 0000000000..fe7b46db5a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "byg:wood/jacaranda_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json new file mode 100644 index 0000000000..4640ae8272 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json new file mode 100644 index 0000000000..06a9000dd6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json new file mode 100644 index 0000000000..9f0c71b6ec --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json new file mode 100644 index 0000000000..74c0979f5e --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json new file mode 100644 index 0000000000..3924f1a4cc --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_boat.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json similarity index 85% rename from Common/src/main/resources/data/byg/recipes/jacaranda_boat.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json index d0820ec81a..de9c588ec5 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "boat", "pattern": [ - "# #", - "###" + "P P", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json new file mode 100644 index 0000000000..e4ea733674 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bookshelf", + "pattern": [ + "PPP", + "BBB", + "PPP" + ], + "key": { + "P": { + "item": "byg:jacaranda_planks" + }, + "B": { + "item": "minecraft:book" + } + }, + "result": { + "item": "byg:jacaranda_bookshelf" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_button.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/button.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/jacaranda_button.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/button.json diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json similarity index 75% rename from Common/src/main/resources/data/byg/recipes/jacaranda_crafting_table.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json index f823c73f08..f428435a2e 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "crafting_table", "pattern": [ - "##", - "##" + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_door.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json similarity index 84% rename from Common/src/main/resources/data/byg/recipes/jacaranda_door.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json index 8a0f295607..5d1f8f3ceb 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "group": "wooden_door", "pattern": [ - "##", - "##", - "##" + "PP", + "PP", + "PP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_fence.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/jacaranda_fence.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/jacaranda_fence_gate.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/jacaranda_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json index 4be37eff89..52a42bc766 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json @@ -1,9 +1,9 @@ { "type": "minecraft:crafting_shapeless", - "group": "planks", + "group": "wooden_planks", "ingredients": [ { - "tag": "byg:jacaranda_logs" + "tag": "byg:wood/jacaranda_logs" } ], "result": { diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/jacaranda_pressure_plate.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json index 1b2139a575..ceb73d2b12 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", "pattern": [ - "##" + "PP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_slab.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json similarity index 91% rename from Common/src/main/resources/data/byg/recipes/jacaranda_slab.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json index 7768c79257..8302ad1b73 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "group": "wooden_slab", "pattern": [ - "###" + "PPP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json similarity index 69% rename from Common/src/main/resources/data/byg/recipes/jacaranda_stairs.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json index a55b931118..c76193446d 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json @@ -2,17 +2,17 @@ "type": "minecraft:crafting_shaped", "group": "wooden_stairs", "pattern": [ - "# ", - "## ", - "###" + "P ", + "PP ", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, "result": { - "item": "byg:jacaranda_stairs", + "item": "byg:jacaranda_slab", "count": 4 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json similarity index 87% rename from Common/src/main/resources/data/byg/recipes/jacaranda_trapdoor.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json index ec5b5335d7..b6a8dd5b61 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json @@ -2,11 +2,11 @@ "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", "pattern": [ - "###", - "###" + "PPP", + "PPP" ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" } }, diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_wood.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json similarity index 79% rename from Common/src/main/resources/data/byg/recipes/jacaranda_wood.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json index 6d43e759a6..8020b00144 100644 --- a/Common/src/main/resources/data/byg/recipes/jacaranda_wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json @@ -1,11 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "wood", "pattern": [ - "##", - "##" + "LL", + "LL" ], "key": { - "#": { + "L": { "item": "byg:jacaranda_log" } }, diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json new file mode 100644 index 0000000000..a5eccfd416 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:jacaranda_log", + "byg:jacaranda_wood", + "byg:stripped_jacaranda_log", + "byg:stripped_jacaranda_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json new file mode 100644 index 0000000000..cd2e652c2a --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:jacaranda_log", + "byg:stripped_jacaranda_log", + "byg:jacaranda_wood", + "byg:stripped_jacaranda_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java index 811c687991..654fa4b63d 100644 --- a/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java +++ b/Common/src/main/java/potionstudios/byg/client/textures/renders/BYGRenderTypes.java @@ -134,12 +134,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.WATER_SILK.get(), RenderType.cutoutMipped()); - //Doors - map.put(BYGBlocks.JACARANDA_DOOR.get(), RenderType.cutoutMipped()); - - //Trapdoors - map.put(BYGBlocks.JACARANDA_TRAPDOOR.get(), RenderType.cutoutMipped()); - //Grass map.put(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), RenderType.translucent()); map.put(BYGBlocks.TALL_PRAIRIE_GRASS.get(), RenderType.cutoutMipped()); @@ -159,7 +153,6 @@ public static void renderTypes(Consumer> mapConsumer) { map.put(BYGBlocks.INDIGO_JACARANDA_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FLOWERING_JACARANDA_BUSH.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH.get(), RenderType.cutoutMipped()); - map.put(BYGBlocks.JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.INDIGO_JACARANDA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.JOSHUA_SAPLING.get(), RenderType.cutoutMipped()); map.put(BYGBlocks.ORANGE_BIRCH_SAPLING.get(), RenderType.cutoutMipped()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java index b8da7f7658..63c84932f5 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGCompostables.java @@ -30,7 +30,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.FLOWERING_ORCHARD_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_PALO_VERDE_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.HOLLY_BERRY_LEAVES.get()); - compostibleBlocks(0.3f, BYGItems.JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_INDIGO_JACARANDA_LEAVES.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_JACARANDA_LEAVES.get()); @@ -56,7 +55,6 @@ public static void compostablesBYG() { compostibleBlocks(0.3f, BYGItems.BLUE_SPRUCE_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_BIRCH_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.BROWN_OAK_SAPLING.get()); - compostibleBlocks(0.3f, BYGItems.JACARANDA_SAPLING.get()); compostibleBlocks(0.3f, BYGItems.JACARANDA_BUSH.get()); compostibleBlocks(0.3f, BYGItems.FLOWERING_JACARANDA_BUSH.get()); compostibleBlocks(0.3f, BYGItems.INDIGO_JACARANDA_SAPLING.get()); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java index 0aa1b614dc..caf0e6cb47 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGFlammables.java @@ -39,36 +39,17 @@ public static void flammablesBYG() { } //Logs - flammableBlock(BYGBlocks.JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_LOG.get(), 5, 5); //Stripped Logs - flammableBlock(BYGBlocks.STRIPPED_JACARANDA_LOG.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_LOG.get(), 5, 5); //Wood - flammableBlock(BYGBlocks.JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.PALO_VERDE_WOOD.get(), 5, 5); //Stripped Wood - flammableBlock(BYGBlocks.STRIPPED_JACARANDA_WOOD.get(), 5, 5); flammableBlock(BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get(), 5, 5); - //BookShelves - flammableBlock(BYGBlocks.JACARANDA_BOOKSHELF.get(), 5, 20); - - //Slabs - flammableBlock(BYGBlocks.JACARANDA_SLAB.get(), 5, 20); - - //Stairs - flammableBlock(BYGBlocks.JACARANDA_STAIRS.get(), 5, 20); - - //Planks - flammableBlock(BYGBlocks.JACARANDA_PLANKS.get(), 5, 20); - - //Fences - flammableBlock(BYGBlocks.JACARANDA_FENCE.get(), 5, 20); - //Leaves flammableBlock(BYGBlocks.BLOOMING_WITCH_HAZEL_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.BLUE_SPRUCE_LEAVES.get(), 30, 60); @@ -77,7 +58,6 @@ public static void flammablesBYG() { flammableBlock(BYGBlocks.FLOWERING_ORCHARD_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.FLOWERING_PALO_VERDE_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.HOLLY_BERRY_LEAVES.get(), 30, 60); - flammableBlock(BYGBlocks.JACARANDA_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_BIRCH_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_OAK_LEAVES.get(), 30, 60); flammableBlock(BYGBlocks.ORANGE_SPRUCE_LEAVES.get(), 30, 60); diff --git a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java index 13d9ef428d..fb6a07ec7c 100644 --- a/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java +++ b/Common/src/main/java/potionstudios/byg/common/BYGStrippables.java @@ -24,12 +24,10 @@ public static void strippableLogsBYG() { stripables.put(type.wood().get(), type.strippedWood().get()); } - stripables.put(BYGBlocks.JACARANDA_LOG.get(), BYGBlocks.STRIPPED_JACARANDA_LOG.get()); stripables.put(BYGBlocks.PALO_VERDE_LOG.get(), BYGBlocks.STRIPPED_PALO_VERDE_LOG.get()); stripables.put(BYGBlocks.WITHERING_OAK_LOG.get(), Blocks.STRIPPED_OAK_LOG); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_STEM.get(), BYGWoodTypes.IMPARIUS.log().get()); - stripables.put(BYGBlocks.JACARANDA_WOOD.get(), BYGBlocks.STRIPPED_JACARANDA_WOOD.get()); stripables.put(BYGBlocks.PALO_VERDE_WOOD.get(), BYGBlocks.STRIPPED_PALO_VERDE_WOOD.get()); stripables.put(BYGBlocks.WITHERING_OAK_WOOD.get(), Blocks.STRIPPED_OAK_WOOD); stripables.put(BYGBlocks.FUNGAL_IMPARIUS_HYPHAE.get(), BYGWoodTypes.IMPARIUS.wood().get()); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 19debc8cb6..7213c3fc1e 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -62,32 +62,6 @@ public class BYGBlocks { public static List> flowerPotBlocks = new ArrayList<>(); - public static final BlockRegistryObject JACARANDA_PLANKS = createPlanks("jacaranda_planks"); - - public static final BlockRegistryObject JACARANDA_BOOKSHELF = createBookshelf("jacaranda_bookshelf"); - - public static final BlockRegistryObject JACARANDA_DOOR = createDoor("jacaranda_door"); - - public static final BlockRegistryObject JACARANDA_PRESSURE_PLATE = createWoodPressurePlate("jacaranda_pressure_plate"); - - public static final BlockRegistryObject JACARANDA_BUTTON = createWoodButton("jacaranda_button"); - - public static final BlockRegistryObject JACARANDA_TRAPDOOR = createTrapDoor("jacaranda_trapdoor"); - - public static final BlockRegistryObject JACARANDA_CRAFTING_TABLE = createCraftingTable("jacaranda_crafting_table"); - - public static final BlockRegistryObject JACARANDA_FENCE_GATE = createFenceGate("jacaranda_fence_gate"); - - public static final BlockRegistryObject JACARANDA_SLAB = createWoodSlab("jacaranda_slab"); - - public static final BlockRegistryObject JACARANDA_STAIRS = createWoodStairs("jacaranda_stairs"); - - public static final BlockRegistryObject JACARANDA_FENCE = createFence("jacaranda_fence"); - - public static final BlockRegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - - public static final BlockRegistryObject JACARANDA_WALL_SIGN = createWallSign("jacaranda_wall_sign", BYGWoodType.JACARANDA, JACARANDA_PLANKS); - public static final BlockRegistryObject FORAGERS_TABLE = createBlock(() -> new Block(BlockBehaviour.Properties.copy(Blocks.FLETCHING_TABLE)), "foragers_table"); @@ -106,7 +80,6 @@ public class BYGBlocks { public static final BlockRegistryObject BROWN_ZELKOVA_SAPLING = createSapling(BYGBlockTags.GROUND_BROWN_ZELKOVA_SAPLING, "brown_zelkova_sapling"); public static final BlockRegistryObject FLOWERING_JACARANDA_BUSH = createFloweringJacarandaBush(1, TreeSpawners.JACARANDA, "flowering_jacaranda_bush"); public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_BUSH = createFloweringIndigoJacarandaBush(1, TreeSpawners.INDIGO_JACARANDA, "flowering_indigo_jacaranda_bush"); - public static final BlockRegistryObject JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_JACARANDA_SAPLING, "jacaranda_sapling"); public static final BlockRegistryObject INDIGO_JACARANDA_SAPLING = createSapling(BYGBlockTags.GROUND_INDIGO_JACARANDA_SAPLING, "indigo_jacaranda_sapling"); public static final BlockRegistryObject JOSHUA_SAPLING = createSapling(BYGBlockTags.GROUND_JOSHUA_SAPLING, "joshua_sapling"); public static final BlockRegistryObject ORANGE_BIRCH_SAPLING = createSapling(BYGBlockTags.GROUND_ORANGE_BIRCH_SAPLING, "orange_birch_sapling"); @@ -141,7 +114,6 @@ public class BYGBlocks { public static final BlockRegistryObject FLOWERING_ORCHARD_LEAVES = createLeaves(MaterialColor.COLOR_GREEN, "flowering_orchard_leaves"); public static final BlockRegistryObject FLOWERING_PALO_VERDE_LEAVES = createFloweringPaloVerdeLeaves(MaterialColor.COLOR_YELLOW, "flowering_palo_verde_leaves"); public static final BlockRegistryObject HOLLY_BERRY_LEAVES = createLeaves(MaterialColor.TERRACOTTA_GREEN, "holly_berry_leaves"); - public static final BlockRegistryObject JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_PURPLE, "jacaranda_leaves"); public static final BlockRegistryObject INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "indigo_jacaranda_leaves"); public static final BlockRegistryObject FLOWERING_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_PURPLE, "flowering_jacaranda_leaves"); public static final BlockRegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES = createLeaves(MaterialColor.TERRACOTTA_BLUE, "flowering_indigo_jacaranda_leaves"); @@ -445,14 +417,12 @@ public class BYGBlocks { public static final BlockRegistryObject WINDSWEPT_SANDSTONE_PILLAR = createSandstonePillar(MaterialColor.TERRACOTTA_PINK, "windswept_sandstone_pillar"); - public static final BlockRegistryObject JACARANDA_LOG = createLog("jacaranda_log"); public static final BlockRegistryObject PALO_VERDE_LOG = createLog("palo_verde_log"); public static final BlockRegistryObject WITHERING_OAK_LOG = createLog("withering_oak_log"); public static final BlockRegistryObject IMBUED_NIGHTSHADE_LOG = createLog("imbued_nightshade_log"); public static final BlockRegistryObject FUNGAL_IMPARIUS_STEM = createBlock(BYGBlockProperties.BYGNetherLog::new, "fungal_imparius_stem"); - public static final BlockRegistryObject JACARANDA_WOOD = createWood("jacaranda_wood"); public static final BlockRegistryObject PALO_VERDE_WOOD = createWood("palo_verde_wood"); public static final BlockRegistryObject WITHERING_OAK_WOOD = createWood("withering_oak_wood"); public static final BlockRegistryObject FUNGAL_IMPARIUS_HYPHAE = createBlock(BYGBlockProperties.BYGNetherWood::new, "fungal_imparius_hyphae"); @@ -581,10 +551,8 @@ public class BYGBlocks { public static final BlockRegistryObject SOAPSTONE_TILE_STAIRS = createBlock(BYGBlockProperties.BYGStoneStairs::new, "soapstone_tile_stairs"); public static final BlockRegistryObject SOAPSTONE_TILE_WALL = createStoneWall("soapstone_tile_wall"); - public static final BlockRegistryObject STRIPPED_JACARANDA_LOG = createStrippedLog("stripped_jacaranda_log"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_LOG = createStrippedLog("stripped_palo_verde_log"); - public static final BlockRegistryObject STRIPPED_JACARANDA_WOOD = createWood("stripped_jacaranda_wood"); public static final BlockRegistryObject STRIPPED_PALO_VERDE_WOOD = createWood("stripped_palo_verde_wood"); public static final BlockRegistryObject TALL_ALLIUM = createTallFlower("tall_allium", BYGBlockTags.GROUND_TALL_ALLIUM); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java index a202d88af7..0f7f8d5aed 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java @@ -9,11 +9,6 @@ public class BYGWoodType { - public static final WoodType JACARANDA = register("jacaranda"); - public static final WoodType MAPLE = register("maple"); - public static final WoodType SKYRIS = register("skyris"); - public static final WoodType LAMENT = register("lament"); - private static WoodType register(String id) { return BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(id).toString().replace(":", "/"))) : null; } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index b7f6c19ad2..d9bbede4b2 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -144,7 +144,11 @@ public enum BYGWoodTypes { MAPLE("maple", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MAPLE_SAPLING) .materialColor(MaterialColor.COLOR_GREEN) - .boatType(BYGBoatEntity.BYGType.MAPLE)); + .boatType(BYGBoatEntity.BYGType.MAPLE)), + JACARANDA("jacaranda", new Builder() + .growerItemGroundTag(BYGBlockTags.GROUND_JACARANDA_SAPLING) + .boatType(BYGBoatEntity.BYGType.JACARANDA) + .materialColor(MaterialColor.TERRACOTTA_PURPLE)); public static final Map LOOKUP = Arrays.stream(values()) .collect(Collectors.toUnmodifiableMap(BYGWoodTypes::toString, Function.identity()));; diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index 57f793b817..e8c28cfed6 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -21,6 +21,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.entity.BYGEntities; @@ -46,24 +47,18 @@ public BYGBoatEntity(EntityType boatEntityType, Level worldType) } @Override - public Item getDropItem() { + public @NotNull Item getDropItem() { final var type = BYGWoodTypes.LOOKUP.get(getBYGBoatType().getName()); if (type != null) return type.boat().get(); - return switch (this.getBYGBoatType()) { - default -> BYGWoodTypes.ASPEN.boat().get(); - case JACARANDA -> BYGItems.JACARANDA_BOAT.get(); - }; + return BYGWoodTypes.ASPEN.boat().get(); } public Block getPlanks() { final var type = BYGWoodTypes.LOOKUP.get(getBYGBoatType().getName()); if (type != null) return type.planks().get(); - return switch (this.getBYGBoatType()) { - default -> BYGWoodTypes.ASPEN.planks().get(); - case JACARANDA -> BYGBlocks.JACARANDA_PLANKS.get(); - }; + return BYGWoodTypes.ASPEN.planks().get(); } public BYGType getBYGBoatType() { diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java index d5917751e2..21e08c755c 100644 --- a/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItems.java @@ -287,33 +287,14 @@ public class BYGItems { public static final RegistryObject FUNGAL_IMPARIUS_HYPHAE; //Jacaranda Woodtype - public static final RegistryObject JACARANDA_BUSH = createItem(BYGBlocks.JACARANDA_BUSH); - public static final RegistryObject FLOWERING_JACARANDA_BUSH = createItem(BYGBlocks.FLOWERING_JACARANDA_BUSH); - public static final RegistryObject JACARANDA_SAPLING = createSaplingItem(BYGBlocks.JACARANDA_SAPLING); - public static final RegistryObject JACARANDA_LEAVES = createItem(BYGBlocks.JACARANDA_LEAVES); - public static final RegistryObject FLOWERING_JACARANDA_LEAVES = createItem(BYGBlocks.FLOWERING_JACARANDA_LEAVES); - public static final RegistryObject INDIGO_JACARANDA_BUSH = createItem(BYGBlocks.INDIGO_JACARANDA_BUSH); - public static final RegistryObject FLOWERING_INDIGO_JACARANDA_BUSH = createItem(BYGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH); - public static final RegistryObject INDIGO_JACARANDA_SAPLING = createSaplingItem(BYGBlocks.INDIGO_JACARANDA_SAPLING); - public static final RegistryObject INDIGO_JACARANDA_LEAVES = createItem(BYGBlocks.INDIGO_JACARANDA_LEAVES); - public static final RegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES = createItem(BYGBlocks.FLOWERING_INDIGO_JACARANDA_LEAVES); - public static final RegistryObject JACARANDA_LOG = createItem(BYGBlocks.JACARANDA_LOG); - public static final RegistryObject JACARANDA_WOOD = createItem(BYGBlocks.JACARANDA_WOOD); - public static final RegistryObject STRIPPED_JACARANDA_LOG = createItem(BYGBlocks.STRIPPED_JACARANDA_LOG); - public static final RegistryObject STRIPPED_JACARANDA_WOOD = createItem(BYGBlocks.STRIPPED_JACARANDA_WOOD); - public static final RegistryObject JACARANDA_PLANKS = createItem(BYGBlocks.JACARANDA_PLANKS); - public static final RegistryObject JACARANDA_BOOKSHELF = createItem(BYGBlocks.JACARANDA_BOOKSHELF); - public static final RegistryObject JACARANDA_CRAFTING_TABLE = createItem(BYGBlocks.JACARANDA_CRAFTING_TABLE); - public static final RegistryObject JACARANDA_STAIRS = createItem(BYGBlocks.JACARANDA_STAIRS); - public static final RegistryObject JACARANDA_SLAB = createItem(BYGBlocks.JACARANDA_SLAB); - public static final RegistryObject JACARANDA_FENCE = createItem(BYGBlocks.JACARANDA_FENCE); - public static final RegistryObject JACARANDA_FENCE_GATE = createItem(BYGBlocks.JACARANDA_FENCE_GATE); - public static final RegistryObject JACARANDA_DOOR = createItem(BYGBlocks.JACARANDA_DOOR); - public static final RegistryObject JACARANDA_TRAPDOOR = createItem(BYGBlocks.JACARANDA_TRAPDOOR); - public static final RegistryObject JACARANDA_PRESSURE_PLATE = createItem(BYGBlocks.JACARANDA_PRESSURE_PLATE); - public static final RegistryObject JACARANDA_BUTTON = createItem(BYGBlocks.JACARANDA_BUTTON); - public static final RegistryObject JACARANDA_SIGN = createSign("jacaranda_sign", BYGBlocks.JACARANDA_SIGN, BYGBlocks.JACARANDA_WALL_SIGN); - public static final RegistryObject JACARANDA_BOAT = createItem(() -> new BYGBoatItem(BYGBoatEntity.BYGType.JACARANDA, new Properties().tab(BYGCreativeTab.CREATIVE_TAB).stacksTo(1)), "jacaranda_boat"); + public static final RegistryObject JACARANDA_BUSH; + public static final RegistryObject FLOWERING_JACARANDA_BUSH; + public static final RegistryObject FLOWERING_JACARANDA_LEAVES; + public static final RegistryObject INDIGO_JACARANDA_BUSH; + public static final RegistryObject FLOWERING_INDIGO_JACARANDA_BUSH; + public static final RegistryObject INDIGO_JACARANDA_SAPLING; + public static final RegistryObject INDIGO_JACARANDA_LEAVES; + public static final RegistryObject FLOWERING_INDIGO_JACARANDA_LEAVES; //Lament Woodtype public static final RegistryObject LAMENT_VINE; @@ -406,7 +387,16 @@ public class BYGItems { LAMENT_SPROUTS = createItem(BYGBlocks.LAMENT_SPROUTS); BYGWoodTypes.LAMENT.init(); - // TODO Jacaranda + JACARANDA_BUSH = createItem(BYGBlocks.JACARANDA_BUSH); + FLOWERING_JACARANDA_BUSH = createItem(BYGBlocks.FLOWERING_JACARANDA_BUSH); + FLOWERING_JACARANDA_LEAVES = createItem(BYGBlocks.FLOWERING_JACARANDA_LEAVES); + INDIGO_JACARANDA_BUSH = createItem(BYGBlocks.INDIGO_JACARANDA_BUSH); + FLOWERING_INDIGO_JACARANDA_BUSH = createItem(BYGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH); + INDIGO_JACARANDA_SAPLING = createSaplingItem(BYGBlocks.INDIGO_JACARANDA_SAPLING); + INDIGO_JACARANDA_LEAVES = createItem(BYGBlocks.INDIGO_JACARANDA_LEAVES); + FLOWERING_INDIGO_JACARANDA_LEAVES = createItem(BYGBlocks.FLOWERING_INDIGO_JACARANDA_LEAVES); + BYGWoodTypes.JACARANDA.init(); + BYGWoodTypes.MAHOGANY.init(); BYGWoodTypes.MANGROVE.init(); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 278af90ad2..50bbb7e816 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -839,10 +839,10 @@ public class BYGOverworldTreeFeatures { public static final Holder> JACARANDA_TREE1 = createConfiguredFeature("jacaranda_tree1", BYGFeatures.JACARANDA_TREE1, () -> new BYGTreeConfig.Builder() - .setTrunkBlock(BYGBlocks.JACARANDA_LOG.get()) + .setTrunkBlock(JACARANDA.log().get()) .setLeavesBlock(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(BYGBlocks.FLOWERING_JACARANDA_LEAVES.defaultBlockState(), 10) - .add(BYGBlocks.JACARANDA_LEAVES.defaultBlockState(), 40) + .add(JACARANDA.leaves().defaultBlockState(), 40) )) .setMaxHeight(15) .setMinHeight(9) diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_bookshelf.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_bookshelf.json deleted file mode 100644 index da72de12dc..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_bookshelf.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_bookshelf" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_crafting_table.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_crafting_table.json deleted file mode 100644 index 2020cabd74..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_crafting_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_crafting_table" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_fence_gate.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_fence_gate.json deleted file mode 100644 index 1653fc2652..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=south,in_wall=false,open=false": { - "model": "byg:block/jacaranda_fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/jacaranda_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=false": { - "model": "byg:block/jacaranda_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=false": { - "model": "byg:block/jacaranda_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/jacaranda_fence_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/jacaranda_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=false,open=true": { - "model": "byg:block/jacaranda_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=false,open=true": { - "model": "byg:block/jacaranda_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=false": { - "model": "byg:block/jacaranda_fence_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/jacaranda_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/jacaranda_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/jacaranda_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=south,in_wall=true,open=true": { - "model": "byg:block/jacaranda_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/jacaranda_fence_gate_wall_open", - "uvlock": true, - "y": 90 - }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/jacaranda_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=east,in_wall=true,open=true": { - "model": "byg:block/jacaranda_fence_gate_wall_open", - "uvlock": true, - "y": 270 - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_leaves.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_leaves.json deleted file mode 100644 index e24c35dcef..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_leaves" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_planks.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_planks.json deleted file mode 100644 index d58dd59e9b..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_planks" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_pressure_plate.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_pressure_plate.json deleted file mode 100644 index 92c953e76d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "byg:block/jacaranda_pressure_plate" - }, - "powered=true": { - "model": "byg:block/jacaranda_pressure_plate_down" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_sapling.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_sapling.json deleted file mode 100644 index 19d2eb5a49..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_slab.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_slab.json deleted file mode 100644 index c5b2b3363d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "byg:block/jacaranda_slab" - }, - "type=top": { - "model": "byg:block/jacaranda_slab_top" - }, - "type=double": { - "model": "byg:block/jacaranda_planks" - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json b/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json deleted file mode 100644 index 2bc3f08dba..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_jacaranda_bush" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_sapling.json b/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_sapling.json deleted file mode 100644 index 92a64ecb02..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/potted_jacaranda_sapling" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_log.json b/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_log.json deleted file mode 100644 index 0391db3853..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_jacaranda_log" - }, - "axis=z": { - "model": "byg:block/stripped_jacaranda_log", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_jacaranda_log", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_wood.json b/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_wood.json deleted file mode 100644 index 800290ae3d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/stripped_jacaranda_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=y": { - "model": "byg:block/stripped_jacaranda_wood" - }, - "axis=z": { - "model": "byg:block/stripped_jacaranda_wood", - "x": 90 - }, - "axis=x": { - "model": "byg:block/stripped_jacaranda_wood", - "x": 90, - "y": 90 - } - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_bookshelf.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_bookshelf.json deleted file mode 100644 index 9082009351..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_bookshelf.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/jacaranda_planks", - "up": "byg:block/jacaranda_planks", - "north": "byg:block/jacaranda_bookshelf", - "east": "byg:block/jacaranda_bookshelf", - "south": "byg:block/jacaranda_bookshelf", - "west": "byg:block/jacaranda_bookshelf", - "particle": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_button.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_button.json deleted file mode 100644 index 3cfc0d1ec9..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_button_inventory.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_button_inventory.json deleted file mode 100644 index ce4c40aa63..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_inventory", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_button_pressed.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_button_pressed.json deleted file mode 100644 index 8352cf8d73..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/button_pressed", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_crafting_table.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_crafting_table.json deleted file mode 100644 index b27a88d430..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_crafting_table.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "byg:block/jacaranda_crafting_table_front", - "down": "byg:block/jacaranda_planks", - "up": "byg:block/jacaranda_crafting_table_top", - "north": "byg:block/jacaranda_crafting_table_front", - "east": "byg:block/jacaranda_crafting_table_side", - "south": "byg:block/jacaranda_crafting_table_side", - "west": "byg:block/jacaranda_crafting_table_front" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom.json deleted file mode 100644 index e1992b65cf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom", - "textures": { - "bottom": "byg:block/jacaranda_door_bottom", - "top": "byg:block/jacaranda_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom_hinge.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom_hinge.json deleted file mode 100644 index 5990e68655..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_bottom_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_bottom_rh", - "textures": { - "bottom": "byg:block/jacaranda_door_bottom", - "top": "byg:block/jacaranda_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top.json deleted file mode 100644 index f32b4b1dcf..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top", - "textures": { - "bottom": "byg:block/jacaranda_door_bottom", - "top": "byg:block/jacaranda_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top_hinge.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top_hinge.json deleted file mode 100644 index 6dac7dc61e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_door_top_hinge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/door_top_rh", - "textures": { - "bottom": "byg:block/jacaranda_door_bottom", - "top": "byg:block/jacaranda_door_top" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence.json deleted file mode 100644 index 16efe61bd5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_side", - "textures": { - "texture": "byg:block/jacaranda_planks", - "particle": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate.json deleted file mode 100644 index 1efb75625a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_open.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_open.json deleted file mode 100644 index 5b064f5c51..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_open", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall.json deleted file mode 100644 index 4ce595c40b..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall_open.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall_open.json deleted file mode 100644 index fa45d0d6ca..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_fence_gate_wall_open", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_inventory.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_inventory.json deleted file mode 100644 index 984d332f8f..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_inventory", - "textures": { - "texture": "byg:block/jacaranda_planks", - "particle": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_post.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_post.json deleted file mode 100644 index 356f67f42e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_fence_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/fence_post", - "textures": { - "texture": "byg:block/jacaranda_planks", - "particle": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves.json deleted file mode 100644 index 69facff50a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "byg:block/jacaranda_leaves" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves_snowy.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves_snowy.json deleted file mode 100644 index 47292ae4e8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_leaves_snowy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/jacaranda_leaves_snowy", - "up": "byg:block/jacaranda_leaves_snowy", - "north": "byg:block/jacaranda_leaves_snowy_side", - "east": "byg:block/jacaranda_leaves_snowy_side", - "south": "byg:block/jacaranda_leaves_snowy_side", - "west": "byg:block/jacaranda_leaves_snowy_side", - "particle": "byg:block/jacaranda_leaves_snowy_side" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_log.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_log.json deleted file mode 100644 index d39cacf013..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "byg:block/jacaranda_log_top", - "side": "byg:block/jacaranda_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_planks.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_planks.json deleted file mode 100644 index 0d86f97185..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/jacaranda_planks", - "particle": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate.json deleted file mode 100644 index acc58aa1f5..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_up", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate_down.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate_down.json deleted file mode 100644 index 086ae4282a..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/pressure_plate_down", - "textures": { - "texture": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_sapling.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_sapling.json deleted file mode 100644 index 068bf7fab1..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "byg:block/jacaranda_sapling", - "particle": "byg:block/jacaranda_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_slab.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_slab.json deleted file mode 100644 index 3914f23511..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab", - "textures": { - "bottom": "byg:block/jacaranda_planks", - "top": "byg:block/jacaranda_planks", - "side": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_slab_top.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_slab_top.json deleted file mode 100644 index b8d18c2eed..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/slab_top", - "textures": { - "bottom": "byg:block/jacaranda_planks", - "top": "byg:block/jacaranda_planks", - "side": "byg:block/jacaranda_planks" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs.json deleted file mode 100644 index 0e4feba452..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/stairs", - "textures": { - "bottom": "byg:block/jacaranda_planks", - "top": "byg:block/jacaranda_planks", - "side": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_inner.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_inner.json deleted file mode 100644 index 2f1b38f317..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/inner_stairs", - "textures": { - "bottom": "byg:block/jacaranda_planks", - "top": "byg:block/jacaranda_planks", - "side": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_outer.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_outer.json deleted file mode 100644 index 0be0373668..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/outer_stairs", - "textures": { - "bottom": "byg:block/jacaranda_planks", - "top": "byg:block/jacaranda_planks", - "side": "byg:block/jacaranda_planks" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_bottom.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_bottom.json deleted file mode 100644 index f36a373fe7..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_bottom", - "textures": { - "texture": "byg:block/jacaranda_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_open.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_open.json deleted file mode 100644 index e0189e4208..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_open", - "textures": { - "texture": "byg:block/jacaranda_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_top.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_top.json deleted file mode 100644 index a60e23858e..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_orientable_trapdoor_top", - "textures": { - "texture": "byg:block/jacaranda_trapdoor" - } -} diff --git a/Common/src/main/resources/assets/byg/models/block/jacaranda_wood.json b/Common/src/main/resources/assets/byg/models/block/jacaranda_wood.json deleted file mode 100644 index 5dd36996b0..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/jacaranda_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/jacaranda_log", - "particle": "byg:block/jacaranda_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_sapling.json b/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_sapling.json deleted file mode 100644 index a9160329d4..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "byg:block/jacaranda_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_log.json b/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_log.json deleted file mode 100644 index 28d1787ece..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_log.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "byg:block/stripped_jacaranda_log_top", - "up": "byg:block/stripped_jacaranda_log_top", - "north": "byg:block/stripped_jacaranda_log", - "east": "byg:block/stripped_jacaranda_log", - "south": "byg:block/stripped_jacaranda_log", - "west": "byg:block/stripped_jacaranda_log", - "particle": "byg:block/stripped_jacaranda_log_top" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_wood.json b/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_wood.json deleted file mode 100644 index 43b72d90f8..0000000000 --- a/Common/src/main/resources/assets/byg/models/block/stripped_jacaranda_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "byg:block/stripped_jacaranda_log", - "particle": "byg:block/stripped_jacaranda_log" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_boat.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_boat.json deleted file mode 100644 index 83321622e3..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/jacaranda_boat" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_bookshelf.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_bookshelf.json deleted file mode 100644 index f6bb461f09..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_bookshelf.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_bookshelf", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_button.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_button.json deleted file mode 100644 index c9c5ec3b35..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_button.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_button_inventory", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_crafting_table.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_crafting_table.json deleted file mode 100644 index 04d2d300bb..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_crafting_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_crafting_table", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_door.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_door.json deleted file mode 100644 index 2be2f2aa35..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:item/jacaranda_door" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_fence.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_fence.json deleted file mode 100644 index 0fd7094a75..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "byg:block/jacaranda_fence_inventory" -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_fence_gate.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_fence_gate.json deleted file mode 100644 index 8c91699632..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_fence_gate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_fence_gate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_leaves.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_leaves.json deleted file mode 100644 index 3391d69e91..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_leaves.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_leaves", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_log.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_log.json deleted file mode 100644 index 4ccca22358..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_planks.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_planks.json deleted file mode 100644 index 07610e495c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_planks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_planks", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_pressure_plate.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_pressure_plate.json deleted file mode 100644 index 45e32c7343..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_pressure_plate.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_pressure_plate", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_sapling.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_sapling.json deleted file mode 100644 index 753d26ae9e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "byg:block/jacaranda_sapling" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_slab.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_slab.json deleted file mode 100644 index 606306f791..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_slab.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_slab", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_stairs.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_stairs.json deleted file mode 100644 index ccc47e51b5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_stairs.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_stairs", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_trapdoor.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_trapdoor.json deleted file mode 100644 index e3b4547844..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_trapdoor.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_trapdoor_bottom", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_wood.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_wood.json deleted file mode 100644 index 192f057a38..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/jacaranda_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_log.json b/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_log.json deleted file mode 100644 index ed7a87789d..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_log.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_jacaranda_log", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_wood.json b/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_wood.json deleted file mode 100644 index b8406492d1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/stripped_jacaranda_wood.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "byg:block/stripped_jacaranda_wood", - "display": { - "thirdperson": { - "rotation": [ - 10, - -45, - 170 - ], - "translation": [ - 0, - 1.5, - -2.75 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ] - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/bookshelf.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_bookshelf.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/bookshelf.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_front.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_front.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_front.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_side.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_side.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_side.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_crafting_table_top.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/crafting_table_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/door_bottom.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_door_bottom.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/door_bottom.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_door_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/door_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_door_top.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/door_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_sapling.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/grower_item.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_sapling.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/grower_item.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_leaves.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/leaves.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_leaves.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/leaves.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_log.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_log.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_log_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_planks.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/planks.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_planks.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/planks.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/stripped_log.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/stripped_log.png diff --git a/Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log_top.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/stripped_log_top.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/stripped_jacaranda_log_top.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/stripped_log_top.png diff --git a/Common/src/main/resources/assets/byg/textures/block/jacaranda_trapdoor.png b/Common/src/main/resources/assets/byg/textures/block/jacaranda/trapdoor.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/jacaranda_trapdoor.png rename to Common/src/main/resources/assets/byg/textures/block/jacaranda/trapdoor.png diff --git a/Common/src/main/resources/assets/byg/textures/item/jacaranda_boat.png b/Common/src/main/resources/assets/byg/textures/item/jacaranda/boat.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/jacaranda_boat.png rename to Common/src/main/resources/assets/byg/textures/item/jacaranda/boat.png diff --git a/Common/src/main/resources/assets/byg/textures/item/jacaranda_door.png b/Common/src/main/resources/assets/byg/textures/item/jacaranda/door.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/jacaranda_door.png rename to Common/src/main/resources/assets/byg/textures/item/jacaranda/door.png diff --git a/Common/src/main/resources/data/byg/recipes/stripped_jacaranda_wood.json b/Common/src/main/resources/data/byg/recipes/stripped_jacaranda_wood.json deleted file mode 100644 index 233bd1d745..0000000000 --- a/Common/src/main/resources/data/byg/recipes/stripped_jacaranda_wood.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "byg:stripped_jacaranda_log" - } - }, - "result": { - "item": "byg:stripped_jacaranda_wood", - "count": 3 - } -} \ No newline at end of file From 357f9166eaf2e6aa849987f2d039354114a8a683 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Fri, 27 May 2022 23:41:06 +0300 Subject: [PATCH 57/90] Datagen! --- Common/src/generated/resources/.cache/cache | 53 ++ .../data/byg/tags/blocks/bookshelves.json | 9 + .../data/byg/tags/blocks/mushrooms.json | 13 + .../byg/tags/blocks/wood/palo_verde_logs.json | 9 + .../tags/blocks/wood/withering_oak_logs.json} | 0 .../data/byg/tags/entity_types/boats.json} | 2 +- .../data/byg/tags/items/bookshelves.json | 34 ++ .../byg/tags/items/wood/palo_verde_logs.json | 9 + .../tags/items/wood/withering_oak_logs.json | 7 + .../byg/tags/worldgen/biome/is_badlands.json | 4 +- .../data/byg/tags/worldgen/biome/is_dead.json | 0 .../data/byg/tags/worldgen/biome/is_icy.json | 0 .../byg/tags/worldgen/biome/is_ocean.json | 0 .../byg/tags/worldgen/biome/is_sandy.json | 0 .../byg/tags/worldgen/biome/is_snowy.json | 7 + .../byg/tags/worldgen/biome/is_spooky.json | 0 .../byg/tags/worldgen/biome/is_swamp.json | 0 .../byg/tags/worldgen/biome/is_wasteland.json | 0 .../data/minecraft/tags/blocks/buttons.json | 18 +- .../data/minecraft/tags/blocks/campfires.json | 0 .../data/minecraft/tags/blocks/ice.json | 0 .../data/minecraft/tags/blocks}/leaves.json | 41 +- .../minecraft/tags/blocks/mineable/axe.json | 458 ++++++++++++++++++ .../data/minecraft/tags/blocks/oak_logs.json | 7 + .../data/minecraft/tags/blocks/planks.json | 63 +++ .../data/minecraft/tags/blocks/sand.json | 11 +- .../data/minecraft/tags/blocks}/saplings.json | 21 +- .../data/minecraft/tags/blocks/stairs.json | 68 +-- .../data/minecraft/tags/blocks/trapdoors.json | 18 +- .../minecraft/tags/blocks/wart_blocks.json | 7 + .../minecraft/tags/blocks/wooden_buttons.json | 18 +- .../minecraft/tags/blocks/wooden_doors.json | 18 +- .../minecraft/tags/blocks}/wooden_fences.json | 18 +- .../tags/blocks/wooden_pressure_plates.json | 18 +- .../minecraft/tags/blocks}/wooden_slabs.json | 18 +- .../minecraft/tags/blocks/wooden_stairs.json | 18 +- .../tags/blocks/wooden_trapdoors.json | 18 +- .../data/minecraft/tags/items/buttons.json | 40 +- .../data/minecraft/tags/items}/leaves.json | 96 ++-- .../data/minecraft/tags/items}/planks.json | 16 +- .../data/minecraft/tags/items/sand.json | 11 +- .../data/minecraft/tags/items}/saplings.json | 36 +- .../data/minecraft/tags/items/slabs.json | 90 ++-- .../data/minecraft/tags/items/stairs.json | 92 ++-- .../data/minecraft/tags/items/trapdoors.json | 16 +- .../minecraft/tags/items/wooden_buttons.json | 16 +- .../minecraft/tags/items/wooden_doors.json | 16 +- .../minecraft/tags/items}/wooden_fences.json | 16 +- .../tags/items/wooden_pressure_plates.json | 16 +- .../minecraft/tags/items}/wooden_slabs.json | 16 +- .../minecraft/tags/items/wooden_stairs.json | 16 +- .../tags/items/wooden_trapdoors.json | 16 +- .../tags/worldgen/biome/is_beach.json | 0 .../tags/worldgen/biome/is_deep_ocean.json | 0 .../byg/common/block/BYGBlockProperties.java | 2 - .../byg/common/block/BYGWoodType.java | 15 - .../byg/common/block/BYGWoodTypes.java | 7 +- .../byg/common/world/biome/BYGBiomeType.java | 49 ++ .../byg/common/world/biome/BYGBiomes.java | 33 +- .../world/feature/config/BYGTreeConfig.java | 1 - .../java/potionstudios/byg/util/MultiTag.java | 36 ++ .../blockstates/potted_jacaranda_bush.json | 7 + .../models/block/imbued_nightshade_log.json | 2 +- .../data/byg/tags/items/mushrooms.json | 10 - .../byg/tags/worldgen/biome/is_mushroom.json | 5 - .../byg/tags/worldgen/biome/is_nether.json | 17 - .../data/byg/tags/worldgen/biome/is_peak.json | 5 - .../byg/tags/worldgen/biome/is_plateau.json | 5 - .../data/byg/tags/worldgen/biome/is_rare.json | 5 - .../byg/tags/worldgen/biome/is_river.json | 5 - .../byg/tags/worldgen/biome/is_savanna.json | 2 +- .../byg/tags/worldgen/biome/is_slope.json | 5 - .../byg/tags/worldgen/biome/is_snowy.json | 7 - .../byg/tags/worldgen/biome/is_sparse.json | 6 - .../byg/tags/worldgen/biome/is_temperate.json | 5 - .../tags/worldgen/biome/is_underground.json | 5 - .../data/byg/tags/worldgen/biome/is_void.json | 5 - .../tags/entity_types/boats.json} | 1 + .../minecraft/tags/blocks/jungle_logs.json | 4 +- .../data/minecraft/tags/blocks/logs.json | 9 - .../minecraft/tags/blocks/logs_that_burn.json | 33 -- .../data/minecraft/tags/blocks/slabs.json | 6 - .../minecraft/tags/blocks/wart_blocks.json | 7 - .../data/minecraft/tags/items/logs.json | 9 - .../minecraft/tags/items/logs_that_burn.json | 32 -- .../data/minecraft/tags/items/planks.json | 34 -- .../tags/worldgen/biome/is_beach.json | 6 - .../tags/worldgen/biome/is_deep_ocean.json | 6 - .../tags/worldgen/biome/is_hill.json | 6 - .../tags/worldgen/biome/is_river.json | 6 - Forge/build.gradle | 13 +- .../potionstudios/byg/datagen/BYGDataGen.java | 8 +- .../datagen/providers/BYGRecipeProviders.java | 4 +- .../providers/BYGWoodAssetsProvider.java | 0 .../providers/tag/BYGBiomeTagsProvider.java | 22 + .../providers/tag/BYGBlockTagsProvider.java | 194 ++++++++ .../providers/tag/BYGEntityTagsProvider.java | 22 + .../providers/tag/BYGItemTagsProvider.java | 110 +++++ .../datagen/util/PredicatedTagProvider.java | 41 ++ .../providers/BYGBlockTagsProvider.java | 143 ------ .../providers/BYGItemTagsProvider.java | 36 -- .../data/forge/tags/entity_types/boats.json | 1 + 102 files changed, 1633 insertions(+), 853 deletions(-) rename Common/src/{main => generated}/resources/data/byg/tags/blocks/bookshelves.json (72%) create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json create mode 100644 Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json rename Common/src/{main/resources/data/minecraft/tags/blocks/oak_logs.json => generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json} (100%) rename Common/src/{main/resources/data/byg/tags/worldgen/biome/is_dense.json => generated/resources/data/byg/tags/entity_types/boats.json} (73%) create mode 100644 Common/src/generated/resources/data/byg/tags/items/bookshelves.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_badlands.json (56%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_dead.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_icy.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_ocean.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_sandy.json (100%) create mode 100644 Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_spooky.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_swamp.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/worldgen/biome/is_wasteland.json (100%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/buttons.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/campfires.json (100%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/ice.json (100%) rename Common/src/{main/resources/data/minecraft/tags/items => generated/resources/data/minecraft/tags/blocks}/leaves.json (81%) create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/planks.json rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/sand.json (55%) rename Common/src/{main/resources/data/minecraft/tags/items => generated/resources/data/minecraft/tags/blocks}/saplings.json (91%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/stairs.json (79%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/trapdoors.json (93%) create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_buttons.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_doors.json (93%) rename Common/src/{main/resources/data/minecraft/tags/items => generated/resources/data/minecraft/tags/blocks}/wooden_fences.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json (93%) rename Common/src/{main/resources/data/minecraft/tags/items => generated/resources/data/minecraft/tags/blocks}/wooden_slabs.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_stairs.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_trapdoors.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/buttons.json (93%) rename Common/src/{main/resources/data/minecraft/tags/blocks => generated/resources/data/minecraft/tags/items}/leaves.json (88%) rename Common/src/{main/resources/data/minecraft/tags/blocks => generated/resources/data/minecraft/tags/items}/planks.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/sand.json (57%) rename Common/src/{main/resources/data/minecraft/tags/blocks => generated/resources/data/minecraft/tags/items}/saplings.json (63%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/slabs.json (79%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/stairs.json (81%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/trapdoors.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/wooden_buttons.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/wooden_doors.json (93%) rename Common/src/{main/resources/data/minecraft/tags/blocks => generated/resources/data/minecraft/tags/items}/wooden_fences.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/wooden_pressure_plates.json (93%) rename Common/src/{main/resources/data/minecraft/tags/blocks => generated/resources/data/minecraft/tags/items}/wooden_slabs.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/wooden_stairs.json (93%) rename Common/src/{main => generated}/resources/data/minecraft/tags/items/wooden_trapdoors.json (93%) rename Common/src/{main/resources/data/byg => generated/resources/data/minecraft}/tags/worldgen/biome/is_beach.json (100%) rename Common/src/{main/resources/data/byg => generated/resources/data/minecraft}/tags/worldgen/biome/is_deep_ocean.json (100%) delete mode 100644 Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java create mode 100644 Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java create mode 100644 Common/src/main/java/potionstudios/byg/util/MultiTag.java create mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/mushrooms.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_snowy.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json delete mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json rename Common/src/main/resources/data/{byg/tags/worldgen/biome/is_hill.json => c/tags/entity_types/boats.json} (70%) delete mode 100644 Common/src/main/resources/data/minecraft/tags/blocks/logs.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/blocks/slabs.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/blocks/wart_blocks.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/items/logs.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/items/logs_that_burn.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/items/planks.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_hill.json delete mode 100644 Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_river.json rename Forge/src/{main => data}/java/potionstudios/byg/datagen/BYGDataGen.java (71%) rename Forge/src/{main => data}/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java (97%) rename Forge/src/{main => data}/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java (100%) create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/util/PredicatedTagProvider.java delete mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java delete mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java rename Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json => Forge/src/main/resources/data/forge/tags/entity_types/boats.json (70%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 8faab590bd..d2dde15c7a 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2763,6 +2763,7 @@ e3a1b871d0ad4c86097b356c06d343b8d96129fd data/byg/recipes/wood/zelkova/boat.json 5cc3d6c5d4ad75828481945934c82b9b4681d1f1 data/byg/recipes/wood/zelkova/stairs.json 7d1bd145500fbeffd22edc9d35239aa995d48815 data/byg/recipes/wood/zelkova/trapdoor.json 514cc64fb5a8f37d6e6520a28705223d917f7478 data/byg/recipes/wood/zelkova/wood.json +fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/blocks/bookshelves.json d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -2886,6 +2887,7 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json +ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/blocks/mushrooms.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json @@ -2908,6 +2910,7 @@ c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/blocks/wood/jacaranda_log a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/blocks/wood/maple_logs.json 88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/blocks/wood/nightshade_logs.json 701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json +d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/blocks/wood/palo_verde_logs.json be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json 9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json @@ -2915,7 +2918,10 @@ c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/blocks/wood/skyris_logs.j 629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/blocks/wood/sythian_logs.json 7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/blocks/wood/willow_logs.json 7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/blocks/wood/witch_hazel_logs.json +3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/blocks/wood/withering_oak_logs.json a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json +b9ab1582ed849d23d78df79d78211ec07ba14d27 data/byg/tags/entity_types/boats.json +0997ae56bb953269c7b30488e45b09d99116d70d data/byg/tags/items/bookshelves.json 7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json 1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json @@ -2937,6 +2943,7 @@ d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs. 5c545bef58cf72828e52865e8593dcfe2924b4cd data/byg/tags/items/wood/maple_logs.json 1f67e3ee3ad89eb98f5135e669b341697aaa8730 data/byg/tags/items/wood/nightshade_logs.json cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json +d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/items/wood/palo_verde_logs.json ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json 52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json 4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json @@ -2944,5 +2951,51 @@ d9a7b8dfd5afa246661a4a4a85c6634ac826b8e5 data/byg/tags/items/wood/skyris_logs.js 1e5d0e7d58c86949b1d2eaa8de318a1f4b13139d data/byg/tags/items/wood/sythian_logs.json 5343112857899942ab8f37d883a572166eba5b13 data/byg/tags/items/wood/willow_logs.json 7832a5cc7d64149d49991f418ffc960adc4ae871 data/byg/tags/items/wood/witch_hazel_logs.json +3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/items/wood/withering_oak_logs.json b488cad37e845f24abd0bc83f7d7e4646e5b668d data/byg/tags/items/wood/zelkova_logs.json +0d7e86adab1894e21be4687f33ac87b87026872d data/byg/tags/worldgen/biome/is_badlands.json +7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_dead.json +8ff0c57a1c566702b71a741cc95bf8e79630285d data/byg/tags/worldgen/biome/is_icy.json +c1c975f6c2fec7b3774985b2a78b3eadb71f35e5 data/byg/tags/worldgen/biome/is_ocean.json +fa6df1ad53cf4f120d1a4bfaea870367f49e161e data/byg/tags/worldgen/biome/is_sandy.json +132807edb33720c9afc9a9694a3d117351aaff3f data/byg/tags/worldgen/biome/is_snowy.json +84f1bfefb5417f440b327fb2e7c2127deb8152da data/byg/tags/worldgen/biome/is_spooky.json +df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.json +7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_wasteland.json +686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/blocks/buttons.json +5f8107eb48f67becbda2b5f7f650f05af5ea63b7 data/minecraft/tags/blocks/campfires.json +3e73ebf1fc5ce9b4b85ffd829772c20e6c68dfc5 data/minecraft/tags/blocks/ice.json +7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/blocks/leaves.json +c0a96fcb646aef01f54061cbb66168d2c6b74d99 data/minecraft/tags/blocks/mineable/axe.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json +3a4b442b0ddecea21abff5d0c7c008162044f778 data/minecraft/tags/blocks/oak_logs.json +d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/blocks/planks.json +3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/blocks/sand.json +73720aba09d3697f9d1c29289a0ab94c080c0410 data/minecraft/tags/blocks/saplings.json +845951c0cb4e770ed156f8605a11d0666de90164 data/minecraft/tags/blocks/stairs.json +b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/trapdoors.json +80d29532a1785f4bc25da05a241660d6f1694447 data/minecraft/tags/blocks/wart_blocks.json +686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/blocks/wooden_buttons.json +de954410ba639f97f3359cbd60af139d96c9a23d data/minecraft/tags/blocks/wooden_doors.json +d9ab9d24f99f65562b07b0df2c4441667016f1d6 data/minecraft/tags/blocks/wooden_fences.json +ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_pressure_plates.json +325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json +2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json +b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json +a65e3d0b0d945bcde27df05748393f5e3a15930c data/minecraft/tags/items/buttons.json +94128ddfad4d48c9d296b54083d50c097814d2e1 data/minecraft/tags/items/leaves.json +63102c7b7730cab6fc0256b2daabbdfa985646ee data/minecraft/tags/items/planks.json +b1c2d261ac2e6cff88a5a8288b2a44955c27aee6 data/minecraft/tags/items/sand.json +1d18ec5f0ccb00ad70f101654ee5aca8212b429e data/minecraft/tags/items/saplings.json +7f3599aa807e99334ab5b8120b231ae3f954613d data/minecraft/tags/items/slabs.json +d2ce8095ce735dc3c3a69752c80eb3211ea6b843 data/minecraft/tags/items/stairs.json +2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/trapdoors.json +8274df19fcba3bc922fb34d382d999b33001c36e data/minecraft/tags/items/wooden_buttons.json +0664ba186292039eabbe1d8da09afdf5519473d8 data/minecraft/tags/items/wooden_doors.json +d66c53b0a5e03c3282b8fc177752c248a1ff788b data/minecraft/tags/items/wooden_fences.json +54af459f697a6415f7bbe7a263745352bd1531f2 data/minecraft/tags/items/wooden_pressure_plates.json +961181d022e13e94d16fe5d257f2fc56e81071e2 data/minecraft/tags/items/wooden_slabs.json +d414849d135b4dd89365ccb93173e2ce2ac5e3de data/minecraft/tags/items/wooden_stairs.json +2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/wooden_trapdoors.json +e267658c8d53318f1183c2fb3a860580be3498dd data/minecraft/tags/worldgen/biome/is_beach.json +c1c975f6c2fec7b3774985b2a78b3eadb71f35e5 data/minecraft/tags/worldgen/biome/is_deep_ocean.json diff --git a/Common/src/main/resources/data/byg/tags/blocks/bookshelves.json b/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json similarity index 72% rename from Common/src/main/resources/data/byg/tags/blocks/bookshelves.json rename to Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json index a6a1cfd383..e2cde0a362 100644 --- a/Common/src/main/resources/data/byg/tags/blocks/bookshelves.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json @@ -1,23 +1,32 @@ { + "replace": false, "values": [ "byg:aspen_bookshelf", "byg:baobab_bookshelf", "byg:blue_enchanted_bookshelf", + "byg:bulbis_bookshelf", "byg:cherry_bookshelf", "byg:cika_bookshelf", "byg:cypress_bookshelf", "byg:ebony_bookshelf", + "byg:embur_bookshelf", + "byg:ether_bookshelf", "byg:fir_bookshelf", "byg:green_enchanted_bookshelf", "byg:holly_bookshelf", + "byg:imparius_bookshelf", "byg:jacaranda_bookshelf", + "byg:lament_bookshelf", "byg:mahogany_bookshelf", "byg:mangrove_bookshelf", "byg:maple_bookshelf", + "byg:nightshade_bookshelf", + "byg:palm_bookshelf", "byg:pine_bookshelf", "byg:rainbow_eucalyptus_bookshelf", "byg:redwood_bookshelf", "byg:skyris_bookshelf", + "byg:sythian_bookshelf", "byg:willow_bookshelf", "byg:witch_hazel_bookshelf", "byg:zelkova_bookshelf" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json b/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json new file mode 100644 index 0000000000..1abb5966cc --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "byg:bulbis_oddity", + "byg:fungal_imparius", + "byg:green_mushroom", + "byg:imparius_mushroom", + "byg:purple_bulbis_oddity", + "byg:shulkren_fungus", + "byg:weeping_milkcap", + "byg:wood_blewit" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json new file mode 100644 index 0000000000..655c0e63f5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:palo_verde_log", + "byg:palo_verde_wood", + "byg:stripped_palo_verde_log", + "byg:stripped_palo_verde_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/oak_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json similarity index 100% rename from Common/src/main/resources/data/minecraft/tags/blocks/oak_logs.json rename to Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json b/Common/src/generated/resources/data/byg/tags/entity_types/boats.json similarity index 73% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json rename to Common/src/generated/resources/data/byg/tags/entity_types/boats.json index e14f1ee731..cf4bf3e20b 100644 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json +++ b/Common/src/generated/resources/data/byg/tags/entity_types/boats.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - + "byg:boat" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/bookshelves.json b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json new file mode 100644 index 0000000000..1624622b8b --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json @@ -0,0 +1,34 @@ +{ + "replace": false, + "values": [ + "byg:aspen_bookshelf", + "byg:baobab_bookshelf", + "byg:blue_enchanted_bookshelf", + "byg:bulbis_bookshelf", + "byg:cherry_bookshelf", + "byg:cika_bookshelf", + "byg:cypress_bookshelf", + "byg:ebony_bookshelf", + "byg:ether_bookshelf", + "byg:fir_bookshelf", + "byg:green_enchanted_bookshelf", + "byg:holly_bookshelf", + "byg:imparius_bookshelf", + "byg:mahogany_bookshelf", + "byg:mangrove_bookshelf", + "byg:palm_bookshelf", + "byg:pine_bookshelf", + "byg:rainbow_eucalyptus_bookshelf", + "byg:redwood_bookshelf", + "byg:willow_bookshelf", + "byg:witch_hazel_bookshelf", + "byg:zelkova_bookshelf", + "byg:sythian_bookshelf", + "byg:embur_bookshelf", + "byg:nightshade_bookshelf", + "byg:skyris_bookshelf", + "byg:lament_bookshelf", + "byg:maple_bookshelf", + "byg:jacaranda_bookshelf" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json new file mode 100644 index 0000000000..655c0e63f5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:palo_verde_log", + "byg:palo_verde_wood", + "byg:stripped_palo_verde_log", + "byg:stripped_palo_verde_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json new file mode 100644 index 0000000000..128286507c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:withering_oak_log", + "byg:withering_oak_wood" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_badlands.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json similarity index 56% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_badlands.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json index 37211d0657..99f41a35e1 100644 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_badlands.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "byg:sierra_badlands", "byg:windswept_dunes", - "byg:red_rock_valley" + "byg:red_rock_valley", + "byg:sierra_badlands" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dead.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_dead.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_icy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_icy.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_ocean.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_ocean.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sandy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_sandy.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json new file mode 100644 index 0000000000..7613ff0550 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:frosted_taiga", + "byg:frosted_coniferous_forest" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_spooky.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_spooky.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_swamp.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_swamp.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_wasteland.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_wasteland.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/buttons.json b/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/buttons.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json index 3852fe292f..b5c38af1e6 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json @@ -4,31 +4,31 @@ "byg:aspen_button", "byg:baobab_button", "byg:blue_enchanted_button", + "byg:bulbis_button", "byg:cherry_button", "byg:cika_button", "byg:cypress_button", "byg:ebony_button", + "byg:embur_button", + "byg:ether_button", "byg:fir_button", "byg:green_enchanted_button", "byg:holly_button", + "byg:imparius_button", "byg:jacaranda_button", + "byg:lament_button", "byg:mahogany_button", "byg:mangrove_button", "byg:maple_button", + "byg:nightshade_button", + "byg:palm_button", "byg:pine_button", "byg:rainbow_eucalyptus_button", "byg:redwood_button", "byg:skyris_button", + "byg:sythian_button", "byg:willow_button", "byg:witch_hazel_button", - "byg:zelkova_button", - "byg:sythian_button", - "byg:embur_button", - "byg:palm_button", - "byg:lament_button", - "byg:ether_button", - "byg:bulbis_button", - "byg:nightshade_button", - "byg:imparius_button" + "byg:zelkova_button" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/campfires.json b/Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json similarity index 100% rename from Common/src/main/resources/data/minecraft/tags/blocks/campfires.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/ice.json b/Common/src/generated/resources/data/minecraft/tags/blocks/ice.json similarity index 100% rename from Common/src/main/resources/data/minecraft/tags/blocks/ice.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/ice.json diff --git a/Common/src/main/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json similarity index 81% rename from Common/src/main/resources/data/minecraft/tags/items/leaves.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json index 56ea52d789..9afa988a5c 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json @@ -1,61 +1,72 @@ { "replace": false, "values": [ + "byg:araucaria_leaves", + "byg:aspen_leaves", "byg:baobab_leaves", "byg:blooming_witch_hazel_leaves", "byg:blue_enchanted_leaves", "byg:blue_spruce_leaves", "byg:brown_birch_leaves", "byg:brown_oak_leaves", + "byg:brown_zelkova_leaves", "byg:cika_leaves", "byg:cypress_leaves", "byg:ebony_leaves", + "byg:embur_gel_vines", + "byg:embur_gel_vines_plant", + "byg:ether_leaves", "byg:fir_leaves", + "byg:firecracker_leaves", + "byg:flowering_indigo_jacaranda_leaves", + "byg:flowering_jacaranda_leaves", + "byg:flowering_nightshade_leaves", "byg:flowering_orchard_leaves", "byg:flowering_palo_verde_leaves", + "byg:green_apple_skyris_leaves", "byg:green_enchanted_leaves", "byg:holly_berry_leaves", "byg:holly_leaves", + "byg:imparius_vine", + "byg:imparius_vine_plant", + "byg:indigo_jacaranda_leaves", "byg:jacaranda_leaves", "byg:joshua_leaves", - "byg:ripe_joshua_leaves", - "byg:indigo_jacaranda_leaves", + "byg:lament_leaves", + "byg:lament_vine", + "byg:lament_vine_plant", "byg:mahogany_leaves", "byg:mangrove_leaves", "byg:maple_leaves", + "byg:nightshade_leaves", "byg:orange_birch_leaves", "byg:orange_oak_leaves", "byg:orange_spruce_leaves", "byg:orchard_leaves", + "byg:palm_leaves", "byg:palo_verde_leaves", "byg:pine_leaves", "byg:pink_cherry_leaves", + "byg:poison_ivy", "byg:rainbow_eucalyptus_leaves", "byg:red_birch_leaves", "byg:red_maple_leaves", "byg:red_oak_leaves", "byg:red_spruce_leaves", "byg:redwood_leaves", + "byg:ripe_joshua_leaves", "byg:ripe_orchard_leaves", + "byg:shulkren_vine", + "byg:shulkren_vine_plant", "byg:silver_maple_leaves", "byg:skyris_leaves", - "byg:green_apple_skyris_leaves", + "byg:skyris_vine", "byg:white_cherry_leaves", "byg:willow_leaves", "byg:witch_hazel_leaves", + "byg:withering_oak_leaves", "byg:yellow_birch_leaves", "byg:yellow_spruce_leaves", - "byg:aspen_leaves", - "byg:zelkova_leaves", - "byg:palm_leaves", - "byg:araucaria_leaves", - "byg:brown_zelkova_leaves", - "byg:lament_leaves", - "byg:withering_oak_leaves", - "byg:ether_leaves", - "byg:nightshade_leaves", - "byg:flowering_nightshade_leaves", - "byg:flowering_jacaranda_leaves", - "byg:flowering_indigo_jacaranda_leaves" + "byg:zelkova_leaves" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000000..ee2b601db0 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,458 @@ +{ + "replace": false, + "values": [ + "byg:aspen_bookshelf", + "byg:aspen_button", + "byg:aspen_crafting_table", + "byg:aspen_door", + "byg:aspen_fence", + "byg:aspen_fence_gate", + "byg:aspen_log", + "byg:aspen_planks", + "byg:aspen_pressure_plate", + "byg:aspen_slab", + "byg:aspen_stairs", + "byg:aspen_trapdoor", + "byg:aspen_wood", + "byg:baobab_bookshelf", + "byg:baobab_button", + "byg:baobab_crafting_table", + "byg:baobab_door", + "byg:baobab_fence", + "byg:baobab_fence_gate", + "byg:baobab_log", + "byg:baobab_planks", + "byg:baobab_pressure_plate", + "byg:baobab_slab", + "byg:baobab_stairs", + "byg:baobab_trapdoor", + "byg:baobab_wood", + "byg:blue_enchanted_bookshelf", + "byg:blue_enchanted_button", + "byg:blue_enchanted_crafting_table", + "byg:blue_enchanted_door", + "byg:blue_enchanted_fence", + "byg:blue_enchanted_fence_gate", + "byg:blue_enchanted_log", + "byg:blue_enchanted_planks", + "byg:blue_enchanted_pressure_plate", + "byg:blue_enchanted_slab", + "byg:blue_enchanted_stairs", + "byg:blue_enchanted_trapdoor", + "byg:blue_enchanted_wood", + "byg:boric_campfire", + "byg:brown_mushroom_stem", + "byg:bulbis_bookshelf", + "byg:bulbis_button", + "byg:bulbis_crafting_table", + "byg:bulbis_door", + "byg:bulbis_fence", + "byg:bulbis_fence_gate", + "byg:bulbis_planks", + "byg:bulbis_pressure_plate", + "byg:bulbis_slab", + "byg:bulbis_stairs", + "byg:bulbis_stem", + "byg:bulbis_trapdoor", + "byg:bulbis_wood", + "byg:cherry_bookshelf", + "byg:cherry_button", + "byg:cherry_crafting_table", + "byg:cherry_door", + "byg:cherry_fence", + "byg:cherry_fence_gate", + "byg:cherry_log", + "byg:cherry_planks", + "byg:cherry_pressure_plate", + "byg:cherry_slab", + "byg:cherry_stairs", + "byg:cherry_trapdoor", + "byg:cherry_wood", + "byg:cika_bookshelf", + "byg:cika_button", + "byg:cika_crafting_table", + "byg:cika_door", + "byg:cika_fence", + "byg:cika_fence_gate", + "byg:cika_log", + "byg:cika_planks", + "byg:cika_pressure_plate", + "byg:cika_slab", + "byg:cika_stairs", + "byg:cika_trapdoor", + "byg:cika_wood", + "byg:cryptic_campfire", + "byg:cypress_bookshelf", + "byg:cypress_button", + "byg:cypress_crafting_table", + "byg:cypress_door", + "byg:cypress_fence", + "byg:cypress_fence_gate", + "byg:cypress_log", + "byg:cypress_planks", + "byg:cypress_pressure_plate", + "byg:cypress_slab", + "byg:cypress_stairs", + "byg:cypress_trapdoor", + "byg:cypress_wood", + "byg:death_cap_mushroom_block", + "byg:ebony_bookshelf", + "byg:ebony_button", + "byg:ebony_crafting_table", + "byg:ebony_door", + "byg:ebony_fence", + "byg:ebony_fence_gate", + "byg:ebony_log", + "byg:ebony_planks", + "byg:ebony_pressure_plate", + "byg:ebony_slab", + "byg:ebony_stairs", + "byg:ebony_trapdoor", + "byg:ebony_wood", + "byg:embur_bookshelf", + "byg:embur_button", + "byg:embur_crafting_table", + "byg:embur_door", + "byg:embur_fence", + "byg:embur_fence_gate", + "byg:embur_hyphae", + "byg:embur_pedu", + "byg:embur_planks", + "byg:embur_pressure_plate", + "byg:embur_slab", + "byg:embur_stairs", + "byg:embur_trapdoor", + "byg:ether_bookshelf", + "byg:ether_button", + "byg:ether_crafting_table", + "byg:ether_door", + "byg:ether_fence", + "byg:ether_fence_gate", + "byg:ether_log", + "byg:ether_planks", + "byg:ether_pressure_plate", + "byg:ether_slab", + "byg:ether_stairs", + "byg:ether_trapdoor", + "byg:ether_wood", + "byg:fir_bookshelf", + "byg:fir_button", + "byg:fir_crafting_table", + "byg:fir_door", + "byg:fir_fence", + "byg:fir_fence_gate", + "byg:fir_log", + "byg:fir_planks", + "byg:fir_pressure_plate", + "byg:fir_slab", + "byg:fir_stairs", + "byg:fir_trapdoor", + "byg:fir_wood", + "byg:fungal_imparius_hyphae", + "byg:fungal_imparius_stem", + "byg:green_enchanted_bookshelf", + "byg:green_enchanted_button", + "byg:green_enchanted_crafting_table", + "byg:green_enchanted_door", + "byg:green_enchanted_fence", + "byg:green_enchanted_fence_gate", + "byg:green_enchanted_log", + "byg:green_enchanted_planks", + "byg:green_enchanted_pressure_plate", + "byg:green_enchanted_slab", + "byg:green_enchanted_stairs", + "byg:green_enchanted_trapdoor", + "byg:green_enchanted_wood", + "byg:green_mushroom_block", + "byg:holly_bookshelf", + "byg:holly_button", + "byg:holly_crafting_table", + "byg:holly_door", + "byg:holly_fence", + "byg:holly_fence_gate", + "byg:holly_log", + "byg:holly_planks", + "byg:holly_pressure_plate", + "byg:holly_slab", + "byg:holly_stairs", + "byg:holly_trapdoor", + "byg:holly_wood", + "byg:imbued_nightshade_log", + "byg:imparius_bookshelf", + "byg:imparius_button", + "byg:imparius_crafting_table", + "byg:imparius_door", + "byg:imparius_fence", + "byg:imparius_fence_gate", + "byg:imparius_hyphae", + "byg:imparius_planks", + "byg:imparius_pressure_plate", + "byg:imparius_slab", + "byg:imparius_stairs", + "byg:imparius_stem", + "byg:imparius_trapdoor", + "byg:jacaranda_bookshelf", + "byg:jacaranda_button", + "byg:jacaranda_crafting_table", + "byg:jacaranda_door", + "byg:jacaranda_fence", + "byg:jacaranda_fence_gate", + "byg:jacaranda_log", + "byg:jacaranda_planks", + "byg:jacaranda_pressure_plate", + "byg:jacaranda_slab", + "byg:jacaranda_stairs", + "byg:jacaranda_trapdoor", + "byg:jacaranda_wood", + "byg:lament_bookshelf", + "byg:lament_button", + "byg:lament_crafting_table", + "byg:lament_door", + "byg:lament_fence", + "byg:lament_fence_gate", + "byg:lament_log", + "byg:lament_planks", + "byg:lament_pressure_plate", + "byg:lament_slab", + "byg:lament_stairs", + "byg:lament_trapdoor", + "byg:lament_wood", + "byg:mahogany_bookshelf", + "byg:mahogany_button", + "byg:mahogany_crafting_table", + "byg:mahogany_door", + "byg:mahogany_fence", + "byg:mahogany_fence_gate", + "byg:mahogany_log", + "byg:mahogany_planks", + "byg:mahogany_pressure_plate", + "byg:mahogany_slab", + "byg:mahogany_stairs", + "byg:mahogany_trapdoor", + "byg:mahogany_wood", + "byg:mangrove_bookshelf", + "byg:mangrove_button", + "byg:mangrove_crafting_table", + "byg:mangrove_door", + "byg:mangrove_fence", + "byg:mangrove_fence_gate", + "byg:mangrove_log", + "byg:mangrove_planks", + "byg:mangrove_pressure_plate", + "byg:mangrove_slab", + "byg:mangrove_stairs", + "byg:mangrove_trapdoor", + "byg:mangrove_wood", + "byg:maple_bookshelf", + "byg:maple_button", + "byg:maple_crafting_table", + "byg:maple_door", + "byg:maple_fence", + "byg:maple_fence_gate", + "byg:maple_log", + "byg:maple_planks", + "byg:maple_pressure_plate", + "byg:maple_slab", + "byg:maple_stairs", + "byg:maple_trapdoor", + "byg:maple_wood", + "byg:nightshade_bookshelf", + "byg:nightshade_button", + "byg:nightshade_crafting_table", + "byg:nightshade_door", + "byg:nightshade_fence", + "byg:nightshade_fence_gate", + "byg:nightshade_log", + "byg:nightshade_planks", + "byg:nightshade_pressure_plate", + "byg:nightshade_slab", + "byg:nightshade_stairs", + "byg:nightshade_trapdoor", + "byg:nightshade_wood", + "byg:palm_bookshelf", + "byg:palm_button", + "byg:palm_crafting_table", + "byg:palm_door", + "byg:palm_fence", + "byg:palm_fence_gate", + "byg:palm_log", + "byg:palm_planks", + "byg:palm_pressure_plate", + "byg:palm_slab", + "byg:palm_stairs", + "byg:palm_trapdoor", + "byg:palm_wood", + "byg:palo_verde_log", + "byg:palo_verde_wood", + "byg:pine_bookshelf", + "byg:pine_button", + "byg:pine_crafting_table", + "byg:pine_door", + "byg:pine_fence", + "byg:pine_fence_gate", + "byg:pine_log", + "byg:pine_planks", + "byg:pine_pressure_plate", + "byg:pine_slab", + "byg:pine_stairs", + "byg:pine_trapdoor", + "byg:pine_wood", + "byg:plant_stem", + "byg:rainbow_eucalyptus_bookshelf", + "byg:rainbow_eucalyptus_button", + "byg:rainbow_eucalyptus_crafting_table", + "byg:rainbow_eucalyptus_door", + "byg:rainbow_eucalyptus_fence", + "byg:rainbow_eucalyptus_fence_gate", + "byg:rainbow_eucalyptus_log", + "byg:rainbow_eucalyptus_planks", + "byg:rainbow_eucalyptus_pressure_plate", + "byg:rainbow_eucalyptus_slab", + "byg:rainbow_eucalyptus_stairs", + "byg:rainbow_eucalyptus_trapdoor", + "byg:rainbow_eucalyptus_wood", + "byg:redwood_bookshelf", + "byg:redwood_button", + "byg:redwood_crafting_table", + "byg:redwood_door", + "byg:redwood_fence", + "byg:redwood_fence_gate", + "byg:redwood_log", + "byg:redwood_planks", + "byg:redwood_pressure_plate", + "byg:redwood_slab", + "byg:redwood_stairs", + "byg:redwood_trapdoor", + "byg:redwood_wood", + "byg:skyris_bookshelf", + "byg:skyris_button", + "byg:skyris_crafting_table", + "byg:skyris_door", + "byg:skyris_fence", + "byg:skyris_fence_gate", + "byg:skyris_log", + "byg:skyris_planks", + "byg:skyris_pressure_plate", + "byg:skyris_slab", + "byg:skyris_stairs", + "byg:skyris_trapdoor", + "byg:skyris_wood", + "byg:soul_shroom_block", + "byg:soul_shroom_stem", + "byg:stripped_aspen_log", + "byg:stripped_aspen_wood", + "byg:stripped_baobab_log", + "byg:stripped_baobab_wood", + "byg:stripped_blue_enchanted_log", + "byg:stripped_blue_enchanted_wood", + "byg:stripped_bulbis_stem", + "byg:stripped_bulbis_wood", + "byg:stripped_cherry_log", + "byg:stripped_cherry_wood", + "byg:stripped_cika_log", + "byg:stripped_cika_wood", + "byg:stripped_cypress_log", + "byg:stripped_cypress_wood", + "byg:stripped_ebony_log", + "byg:stripped_ebony_wood", + "byg:stripped_embur_hyphae", + "byg:stripped_embur_pedu", + "byg:stripped_ether_log", + "byg:stripped_ether_wood", + "byg:stripped_fir_log", + "byg:stripped_fir_wood", + "byg:stripped_green_enchanted_log", + "byg:stripped_green_enchanted_wood", + "byg:stripped_holly_log", + "byg:stripped_holly_wood", + "byg:stripped_jacaranda_log", + "byg:stripped_jacaranda_wood", + "byg:stripped_lament_log", + "byg:stripped_lament_wood", + "byg:stripped_mahogany_log", + "byg:stripped_mahogany_wood", + "byg:stripped_mangrove_log", + "byg:stripped_mangrove_wood", + "byg:stripped_maple_log", + "byg:stripped_maple_wood", + "byg:stripped_nightshade_log", + "byg:stripped_nightshade_wood", + "byg:stripped_palm_log", + "byg:stripped_palm_wood", + "byg:stripped_palo_verde_log", + "byg:stripped_palo_verde_wood", + "byg:stripped_pine_log", + "byg:stripped_pine_wood", + "byg:stripped_rainbow_eucalyptus_log", + "byg:stripped_rainbow_eucalyptus_wood", + "byg:stripped_redwood_log", + "byg:stripped_redwood_wood", + "byg:stripped_skyris_log", + "byg:stripped_skyris_wood", + "byg:stripped_sythian_hyphae", + "byg:stripped_sythian_stem", + "byg:stripped_willow_log", + "byg:stripped_willow_wood", + "byg:stripped_witch_hazel_log", + "byg:stripped_witch_hazel_wood", + "byg:stripped_zelkova_log", + "byg:stripped_zelkova_wood", + "byg:sythian_bookshelf", + "byg:sythian_button", + "byg:sythian_crafting_table", + "byg:sythian_door", + "byg:sythian_fence", + "byg:sythian_fence_gate", + "byg:sythian_hyphae", + "byg:sythian_planks", + "byg:sythian_pressure_plate", + "byg:sythian_slab", + "byg:sythian_stairs", + "byg:sythian_stem", + "byg:sythian_trapdoor", + "byg:weeping_milkcap_mushroom_block", + "byg:white_mushroom_stem", + "byg:willow_bookshelf", + "byg:willow_button", + "byg:willow_crafting_table", + "byg:willow_door", + "byg:willow_fence", + "byg:willow_fence_gate", + "byg:willow_log", + "byg:willow_planks", + "byg:willow_pressure_plate", + "byg:willow_slab", + "byg:willow_stairs", + "byg:willow_trapdoor", + "byg:willow_wood", + "byg:witch_hazel_bookshelf", + "byg:witch_hazel_button", + "byg:witch_hazel_crafting_table", + "byg:witch_hazel_door", + "byg:witch_hazel_fence", + "byg:witch_hazel_fence_gate", + "byg:witch_hazel_log", + "byg:witch_hazel_planks", + "byg:witch_hazel_pressure_plate", + "byg:witch_hazel_slab", + "byg:witch_hazel_stairs", + "byg:witch_hazel_trapdoor", + "byg:witch_hazel_wood", + "byg:withering_oak_log", + "byg:withering_oak_wood", + "byg:wood_blewit_mushroom_block", + "byg:zelkova_bookshelf", + "byg:zelkova_button", + "byg:zelkova_crafting_table", + "byg:zelkova_door", + "byg:zelkova_fence", + "byg:zelkova_fence_gate", + "byg:zelkova_log", + "byg:zelkova_planks", + "byg:zelkova_pressure_plate", + "byg:zelkova_slab", + "byg:zelkova_stairs", + "byg:zelkova_trapdoor", + "byg:zelkova_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json new file mode 100644 index 0000000000..128286507c --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:withering_oak_log", + "byg:withering_oak_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json b/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json new file mode 100644 index 0000000000..cdb7689852 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json @@ -0,0 +1,63 @@ +{ + "replace": false, + "values": [ + "byg:aspen_planks", + "byg:aspen_planks", + "byg:baobab_planks", + "byg:baobab_planks", + "byg:blue_enchanted_planks", + "byg:blue_enchanted_planks", + "byg:bulbis_planks", + "byg:bulbis_planks", + "byg:cherry_planks", + "byg:cherry_planks", + "byg:cika_planks", + "byg:cika_planks", + "byg:cypress_planks", + "byg:cypress_planks", + "byg:ebony_planks", + "byg:ebony_planks", + "byg:embur_planks", + "byg:embur_planks", + "byg:ether_planks", + "byg:ether_planks", + "byg:fir_planks", + "byg:fir_planks", + "byg:green_enchanted_planks", + "byg:green_enchanted_planks", + "byg:holly_planks", + "byg:holly_planks", + "byg:imparius_planks", + "byg:imparius_planks", + "byg:jacaranda_planks", + "byg:jacaranda_planks", + "byg:lament_planks", + "byg:lament_planks", + "byg:mahogany_planks", + "byg:mahogany_planks", + "byg:mangrove_planks", + "byg:mangrove_planks", + "byg:maple_planks", + "byg:maple_planks", + "byg:nightshade_planks", + "byg:nightshade_planks", + "byg:palm_planks", + "byg:palm_planks", + "byg:pine_planks", + "byg:pine_planks", + "byg:rainbow_eucalyptus_planks", + "byg:rainbow_eucalyptus_planks", + "byg:redwood_planks", + "byg:redwood_planks", + "byg:skyris_planks", + "byg:skyris_planks", + "byg:sythian_planks", + "byg:sythian_planks", + "byg:willow_planks", + "byg:willow_planks", + "byg:witch_hazel_planks", + "byg:witch_hazel_planks", + "byg:zelkova_planks", + "byg:zelkova_planks" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/sand.json b/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json similarity index 55% rename from Common/src/main/resources/data/minecraft/tags/blocks/sand.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/sand.json index 36a5a6f876..05124eb859 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json @@ -1,13 +1,16 @@ { "replace": false, "values": [ - "byg:white_sand", "byg:black_sand", "byg:blue_sand", + "byg:cracked_red_sand", + "byg:end_sand", "byg:pink_sand", "byg:purple_sand", - "byg:end_sand", - "byg:windswept_sand", - "byg:cracked_red_sand" + "byg:quartzite_sand", + "byg:warped_soul_sand", + "byg:warped_soul_soil", + "byg:white_sand", + "byg:windswept_sand" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/saplings.json b/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json similarity index 91% rename from Common/src/main/resources/data/minecraft/tags/items/saplings.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json index 157bf8e532..68b58cbf9e 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json @@ -1,27 +1,34 @@ { "replace": false, "values": [ + "byg:araucaria_sapling", "byg:aspen_sapling", "byg:baobab_sapling", "byg:blue_enchanted_sapling", "byg:blue_spruce_sapling", "byg:brown_birch_sapling", "byg:brown_oak_sapling", + "byg:brown_zelkova_sapling", "byg:cika_sapling", "byg:cypress_sapling", "byg:ebony_sapling", + "byg:ether_sapling", "byg:fir_sapling", "byg:green_enchanted_sapling", "byg:holly_sapling", - "byg:jacaranda_sapling", "byg:indigo_jacaranda_sapling", + "byg:jacaranda_sapling", + "byg:joshua_sapling", + "byg:lament_sapling", "byg:mahogany_sapling", "byg:mangrove_sapling", "byg:maple_sapling", + "byg:nightshade_sapling", "byg:orange_birch_sapling", "byg:orange_oak_sapling", "byg:orange_spruce_sapling", "byg:orchard_sapling", + "byg:palm_sapling", "byg:palo_verde_sapling", "byg:pine_sapling", "byg:pink_cherry_sapling", @@ -32,18 +39,12 @@ "byg:red_spruce_sapling", "byg:redwood_sapling", "byg:silver_maple_sapling", + "byg:skyris_sapling", "byg:white_cherry_sapling", "byg:willow_sapling", "byg:witch_hazel_sapling", "byg:yellow_birch_sapling", - "byg:zelkova_sapling", - "byg:skyris_sapling", - "byg:palm_sapling", - "byg:araucaria_sapling", - "byg:brown_zelkova_sapling", - "byg:lament_sapling", - "byg:withering_oak_sapling", - "byg:ether_sapling", - "byg:nightshade_sapling" + "byg:yellow_spruce_sapling", + "byg:zelkova_sapling" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/stairs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json similarity index 79% rename from Common/src/main/resources/data/minecraft/tags/blocks/stairs.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json index ffe04179a3..b89ac49bb4 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -4,55 +4,65 @@ "byg:aspen_stairs", "byg:baobab_stairs", "byg:blue_enchanted_stairs", + "byg:bulbis_stairs", + "byg:carved_ether_stone_stairs", + "byg:cattail_thatch_stairs", "byg:cherry_stairs", + "byg:chiseled_fungal_imparius_stairs", + "byg:chiseled_red_rock_brick_stairs", + "byg:chiseled_therium_stairs", + "byg:chiseled_travertine_stairs", + "byg:chiseled_windswept_sandstone_stairs", "byg:cika_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:cracked_red_rock_brick_stairs", + "byg:cryptic_stone_stairs", + "byg:cut_windswept_sandstone_stairs", "byg:cypress_stairs", + "byg:dacite_brick_stairs", + "byg:dacite_cobblestone_stairs", + "byg:dacite_stairs", + "byg:dacite_tile_stairs", "byg:ebony_stairs", + "byg:embur_stairs", + "byg:ether_stairs", + "byg:ether_stone_stairs", "byg:fir_stairs", "byg:green_enchanted_stairs", "byg:holly_stairs", + "byg:imparius_stairs", "byg:jacaranda_stairs", + "byg:lament_stairs", "byg:mahogany_stairs", "byg:mangrove_stairs", "byg:maple_stairs", + "byg:mossy_red_rock_brick_stairs", + "byg:mossy_stone_stairs", + "byg:nightshade_stairs", + "byg:palm_stairs", "byg:pine_stairs", + "byg:polished_soapstone_stairs", + "byg:polished_travertine_stairs", + "byg:purpur_stone_stairs", "byg:rainbow_eucalyptus_stairs", + "byg:red_rock_brick_stairs", + "byg:red_rock_stairs", "byg:redwood_stairs", - "byg:skyris_stairs", - "byg:willow_stairs", - "byg:witch_hazel_stairs", - "byg:zelkova_stairs", - "byg:dacite_cobblestone_stairs", - "byg:mossy_stone_stairs", "byg:rocky_stone_stairs", - "byg:scoria_stone_stairs", "byg:scoria_cobblestone_stairs", + "byg:scoria_stone_stairs", "byg:scoria_stonebrick_stairs", - "byg:soapstone_stairs", - "byg:polished_soapstone_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:skyris_stairs", + "byg:smooth_windswept_sandstone_stairs", "byg:soapstone_brick_stairs", + "byg:soapstone_stairs", "byg:soapstone_tile_stairs", - "byg:red_rock_stairs", - "byg:red_rock_brick_stairs", - "byg:mossy_red_rock_brick_stairs", - "byg:cracked_red_rock_brick_stairs", - "byg:chiseled_red_rock_brick_stairs", "byg:sythian_stairs", - "byg:embur_stairs", - "byg:palm_stairs", - "byg:lament_stairs", - "byg:ether_stairs", - "byg:bulbis_stairs", - "byg:nightshade_stairs", - "byg:ether_stone_stairs", - "byg:carved_ether_stone_stairs", - "byg:cobbled_ether_stone_stairs", - "byg:purpur_stone_stairs", - "byg:imparius_stairs", - "byg:chiseled_fungal_imparius_stairs", + "byg:travertine_stairs", + "byg:willow_stairs", "byg:windswept_sandstone_stairs", - "byg:cut_windswept_sandstone_stairs", - "byg:chiseled_windswept_sandstone_stairs", - "byg:smooth_windswept_sandstone_stairs" + "byg:witch_hazel_stairs", + "byg:zelkova_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/trapdoors.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json index 5f49a46ea6..ad89b95828 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json @@ -4,31 +4,31 @@ "byg:aspen_trapdoor", "byg:baobab_trapdoor", "byg:blue_enchanted_trapdoor", + "byg:bulbis_trapdoor", "byg:cherry_trapdoor", "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:embur_trapdoor", + "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", + "byg:imparius_trapdoor", "byg:jacaranda_trapdoor", + "byg:lament_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", "byg:maple_trapdoor", + "byg:nightshade_trapdoor", + "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", "byg:skyris_trapdoor", + "byg:sythian_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", - "byg:zelkova_trapdoor", - "byg:sythian_trapdoor", - "byg:embur_trapdoor", - "byg:palm_trapdoor", - "byg:lament_trapdoor", - "byg:ether_trapdoor", - "byg:bulbis_trapdoor", - "byg:nightshade_trapdoor", - "byg:imparius_trapdoor" + "byg:zelkova_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json new file mode 100644 index 0000000000..462eeb7670 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:shulkren_wart_block", + "byg:sythian_wart_block" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json index 3852fe292f..b5c38af1e6 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json @@ -4,31 +4,31 @@ "byg:aspen_button", "byg:baobab_button", "byg:blue_enchanted_button", + "byg:bulbis_button", "byg:cherry_button", "byg:cika_button", "byg:cypress_button", "byg:ebony_button", + "byg:embur_button", + "byg:ether_button", "byg:fir_button", "byg:green_enchanted_button", "byg:holly_button", + "byg:imparius_button", "byg:jacaranda_button", + "byg:lament_button", "byg:mahogany_button", "byg:mangrove_button", "byg:maple_button", + "byg:nightshade_button", + "byg:palm_button", "byg:pine_button", "byg:rainbow_eucalyptus_button", "byg:redwood_button", "byg:skyris_button", + "byg:sythian_button", "byg:willow_button", "byg:witch_hazel_button", - "byg:zelkova_button", - "byg:sythian_button", - "byg:embur_button", - "byg:palm_button", - "byg:lament_button", - "byg:ether_button", - "byg:bulbis_button", - "byg:nightshade_button", - "byg:imparius_button" + "byg:zelkova_button" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json index d4774aa046..ea5faa2ecc 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -4,31 +4,31 @@ "byg:aspen_door", "byg:baobab_door", "byg:blue_enchanted_door", + "byg:bulbis_door", "byg:cherry_door", "byg:cika_door", "byg:cypress_door", "byg:ebony_door", + "byg:embur_door", + "byg:ether_door", "byg:fir_door", "byg:green_enchanted_door", "byg:holly_door", + "byg:imparius_door", "byg:jacaranda_door", + "byg:lament_door", "byg:mahogany_door", "byg:mangrove_door", "byg:maple_door", + "byg:nightshade_door", + "byg:palm_door", "byg:pine_door", "byg:rainbow_eucalyptus_door", "byg:redwood_door", "byg:skyris_door", + "byg:sythian_door", "byg:willow_door", "byg:witch_hazel_door", - "byg:zelkova_door", - "byg:sythian_door", - "byg:embur_door", - "byg:palm_door", - "byg:lament_door", - "byg:ether_door", - "byg:bulbis_door", - "byg:nightshade_door", - "byg:imparius_door" + "byg:zelkova_door" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_fences.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json index 900c826d81..26142fb45f 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_fences.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json @@ -4,31 +4,31 @@ "byg:aspen_fence", "byg:baobab_fence", "byg:blue_enchanted_fence", + "byg:bulbis_fence", "byg:cherry_fence", "byg:cika_fence", "byg:cypress_fence", "byg:ebony_fence", + "byg:embur_fence", + "byg:ether_fence", "byg:fir_fence", "byg:green_enchanted_fence", "byg:holly_fence", + "byg:imparius_fence", "byg:jacaranda_fence", + "byg:lament_fence", "byg:mahogany_fence", "byg:mangrove_fence", "byg:maple_fence", + "byg:nightshade_fence", + "byg:palm_fence", "byg:pine_fence", "byg:rainbow_eucalyptus_fence", "byg:redwood_fence", "byg:skyris_fence", + "byg:sythian_fence", "byg:willow_fence", "byg:witch_hazel_fence", - "byg:zelkova_fence", - "byg:sythian_fence", - "byg:embur_fence", - "byg:palm_fence", - "byg:lament_fence", - "byg:ether_fence", - "byg:bulbis_fence", - "byg:nightshade_fence", - "byg:imparius_fence" + "byg:zelkova_fence" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json index b578920dab..b9432ae88e 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json @@ -4,31 +4,31 @@ "byg:aspen_pressure_plate", "byg:baobab_pressure_plate", "byg:blue_enchanted_pressure_plate", + "byg:bulbis_pressure_plate", "byg:cherry_pressure_plate", "byg:cika_pressure_plate", "byg:cypress_pressure_plate", "byg:ebony_pressure_plate", + "byg:embur_pressure_plate", + "byg:ether_pressure_plate", "byg:fir_pressure_plate", "byg:green_enchanted_pressure_plate", "byg:holly_pressure_plate", + "byg:imparius_pressure_plate", "byg:jacaranda_pressure_plate", + "byg:lament_pressure_plate", "byg:mahogany_pressure_plate", "byg:mangrove_pressure_plate", "byg:maple_pressure_plate", + "byg:nightshade_pressure_plate", + "byg:palm_pressure_plate", "byg:pine_pressure_plate", "byg:rainbow_eucalyptus_pressure_plate", "byg:redwood_pressure_plate", "byg:skyris_pressure_plate", + "byg:sythian_pressure_plate", "byg:willow_pressure_plate", "byg:witch_hazel_pressure_plate", - "byg:zelkova_pressure_plate", - "byg:sythian_pressure_plate", - "byg:embur_pressure_plate", - "byg:palm_pressure_plate", - "byg:lament_pressure_plate", - "byg:ether_pressure_plate", - "byg:bulbis_pressure_plate", - "byg:nightshade_pressure_plate", - "byg:imparius_pressure_plate" + "byg:zelkova_pressure_plate" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json index eeb2becc99..09afb700f7 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -4,31 +4,31 @@ "byg:aspen_slab", "byg:baobab_slab", "byg:blue_enchanted_slab", + "byg:bulbis_slab", "byg:cherry_slab", "byg:cika_slab", "byg:cypress_slab", "byg:ebony_slab", + "byg:embur_slab", + "byg:ether_slab", "byg:fir_slab", "byg:green_enchanted_slab", "byg:holly_slab", + "byg:imparius_slab", "byg:jacaranda_slab", + "byg:lament_slab", "byg:mahogany_slab", "byg:mangrove_slab", "byg:maple_slab", + "byg:nightshade_slab", + "byg:palm_slab", "byg:pine_slab", "byg:rainbow_eucalyptus_slab", "byg:redwood_slab", "byg:skyris_slab", + "byg:sythian_slab", "byg:willow_slab", "byg:witch_hazel_slab", - "byg:zelkova_slab", - "byg:sythian_slab", - "byg:embur_slab", - "byg:palm_slab", - "byg:lament_slab", - "byg:ether_slab", - "byg:bulbis_slab", - "byg:nightshade_slab", - "byg:imparius_slab" + "byg:zelkova_slab" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json index 391e1bf746..7c447d1993 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -4,31 +4,31 @@ "byg:aspen_stairs", "byg:baobab_stairs", "byg:blue_enchanted_stairs", + "byg:bulbis_stairs", "byg:cherry_stairs", "byg:cika_stairs", "byg:cypress_stairs", "byg:ebony_stairs", + "byg:embur_stairs", + "byg:ether_stairs", "byg:fir_stairs", "byg:green_enchanted_stairs", "byg:holly_stairs", + "byg:imparius_stairs", "byg:jacaranda_stairs", + "byg:lament_stairs", "byg:mahogany_stairs", "byg:mangrove_stairs", "byg:maple_stairs", + "byg:nightshade_stairs", + "byg:palm_stairs", "byg:pine_stairs", "byg:rainbow_eucalyptus_stairs", "byg:redwood_stairs", "byg:skyris_stairs", + "byg:sythian_stairs", "byg:willow_stairs", "byg:witch_hazel_stairs", - "byg:zelkova_stairs", - "byg:sythian_stairs", - "byg:embur_stairs", - "byg:palm_stairs", - "byg:lament_stairs", - "byg:ether_stairs", - "byg:bulbis_stairs", - "byg:nightshade_stairs", - "byg:imparius_stairs" + "byg:zelkova_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json rename to Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json index 5f49a46ea6..ad89b95828 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json @@ -4,31 +4,31 @@ "byg:aspen_trapdoor", "byg:baobab_trapdoor", "byg:blue_enchanted_trapdoor", + "byg:bulbis_trapdoor", "byg:cherry_trapdoor", "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:embur_trapdoor", + "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", + "byg:imparius_trapdoor", "byg:jacaranda_trapdoor", + "byg:lament_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", "byg:maple_trapdoor", + "byg:nightshade_trapdoor", + "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", "byg:skyris_trapdoor", + "byg:sythian_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", - "byg:zelkova_trapdoor", - "byg:sythian_trapdoor", - "byg:embur_trapdoor", - "byg:palm_trapdoor", - "byg:lament_trapdoor", - "byg:ether_trapdoor", - "byg:bulbis_trapdoor", - "byg:nightshade_trapdoor", - "byg:imparius_trapdoor" + "byg:zelkova_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/buttons.json rename to Common/src/generated/resources/data/minecraft/tags/items/buttons.json index 3852fe292f..aea71decff 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -1,34 +1,34 @@ { "replace": false, "values": [ - "byg:aspen_button", - "byg:baobab_button", - "byg:blue_enchanted_button", - "byg:cherry_button", + "byg:pine_button", "byg:cika_button", + "byg:mahogany_button", + "byg:bulbis_button", "byg:cypress_button", - "byg:ebony_button", - "byg:fir_button", - "byg:green_enchanted_button", - "byg:holly_button", "byg:jacaranda_button", - "byg:mahogany_button", - "byg:mangrove_button", - "byg:maple_button", - "byg:pine_button", - "byg:rainbow_eucalyptus_button", + "byg:willow_button", "byg:redwood_button", + "byg:palm_button", "byg:skyris_button", - "byg:willow_button", + "byg:imparius_button", + "byg:lament_button", + "byg:nightshade_button", + "byg:rainbow_eucalyptus_button", + "byg:fir_button", "byg:witch_hazel_button", + "byg:blue_enchanted_button", "byg:zelkova_button", + "byg:baobab_button", "byg:sythian_button", - "byg:embur_button", - "byg:palm_button", - "byg:lament_button", + "byg:maple_button", + "byg:holly_button", "byg:ether_button", - "byg:bulbis_button", - "byg:nightshade_button", - "byg:imparius_button" + "byg:embur_button", + "byg:ebony_button", + "byg:mangrove_button", + "byg:aspen_button", + "byg:green_enchanted_button", + "byg:cherry_button" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json similarity index 88% rename from Common/src/main/resources/data/minecraft/tags/blocks/leaves.json rename to Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 9b09627974..e7e0ccf8e4 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,62 +1,68 @@ { "replace": false, "values": [ - "byg:baobab_leaves", - "byg:blooming_witch_hazel_leaves", - "byg:blue_enchanted_leaves", + "byg:white_cherry_leaves", + "byg:yellow_spruce_leaves", + "byg:joshua_leaves", + "byg:green_apple_skyris_leaves", "byg:blue_spruce_leaves", + "byg:willow_leaves", + "byg:flowering_orchard_leaves", + "byg:lament_leaves", "byg:brown_birch_leaves", - "byg:brown_oak_leaves", - "byg:cika_leaves", - "byg:cypress_leaves", - "byg:ebony_leaves", + "byg:orange_birch_leaves", "byg:fir_leaves", - "byg:flowering_orchard_leaves", - "byg:flowering_palo_verde_leaves", - "byg:green_enchanted_leaves", - "byg:holly_berry_leaves", + "byg:rainbow_eucalyptus_leaves", + "byg:poison_ivy", + "byg:blooming_witch_hazel_leaves", + "byg:pink_cherry_leaves", + "byg:brown_zelkova_leaves", + "byg:lament_vine", + "byg:embur_gel_vines", + "byg:skyris_vine", + "byg:imparius_vine", + "byg:palm_leaves", + "byg:yellow_birch_leaves", "byg:holly_leaves", - "byg:jacaranda_leaves", - "byg:joshua_leaves", - "byg:ripe_joshua_leaves", - "byg:indigo_jacaranda_leaves", - "byg:mahogany_leaves", + "byg:redwood_leaves", "byg:mangrove_leaves", + "byg:red_oak_leaves", + "byg:cypress_leaves", + "byg:silver_maple_leaves", "byg:maple_leaves", - "byg:orange_birch_leaves", - "byg:orange_oak_leaves", - "byg:orange_spruce_leaves", - "byg:orchard_leaves", - "byg:palo_verde_leaves", - "byg:pine_leaves", - "byg:pink_cherry_leaves", - "byg:rainbow_eucalyptus_leaves", + "byg:nightshade_leaves", "byg:red_birch_leaves", + "byg:araucaria_leaves", + "byg:aspen_leaves", "byg:red_maple_leaves", - "byg:red_oak_leaves", - "byg:red_spruce_leaves", - "byg:redwood_leaves", "byg:ripe_orchard_leaves", - "byg:silver_maple_leaves", - "byg:skyris_leaves", - "byg:green_apple_skyris_leaves", - "byg:white_cherry_leaves", - "byg:willow_leaves", + "byg:indigo_jacaranda_leaves", + "byg:flowering_nightshade_leaves", + "byg:flowering_palo_verde_leaves", "byg:witch_hazel_leaves", - "byg:yellow_birch_leaves", - "byg:yellow_spruce_leaves", - "byg:aspen_leaves", - "byg:zelkova_leaves", - "byg:palm_leaves", - "byg:araucaria_leaves", - "byg:brown_zelkova_leaves", - "byg:lament_leaves", + "byg:flowering_indigo_jacaranda_leaves", + "byg:orange_spruce_leaves", + "byg:blue_enchanted_leaves", + "byg:flowering_jacaranda_leaves", + "byg:skyris_leaves", "byg:withering_oak_leaves", + "byg:brown_oak_leaves", + "byg:pine_leaves", + "byg:baobab_leaves", + "byg:cika_leaves", + "byg:orchard_leaves", + "byg:mahogany_leaves", + "byg:shulkren_vine", + "byg:holly_berry_leaves", + "byg:orange_oak_leaves", + "byg:jacaranda_leaves", + "byg:ripe_joshua_leaves", "byg:ether_leaves", - "byg:nightshade_leaves", - "byg:flowering_nightshade_leaves", - "byg:flowering_jacaranda_leaves", - "byg:flowering_indigo_jacaranda_leaves", - "byg:firecracker_leaves" + "byg:palo_verde_leaves", + "byg:zelkova_leaves", + "byg:red_spruce_leaves", + "byg:firecracker_leaves", + "byg:ebony_leaves", + "byg:green_enchanted_leaves" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/planks.json b/Common/src/generated/resources/data/minecraft/tags/items/planks.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/planks.json rename to Common/src/generated/resources/data/minecraft/tags/items/planks.json index 278d213c9d..97ce099283 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/planks.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/planks.json @@ -4,31 +4,31 @@ "byg:aspen_planks", "byg:baobab_planks", "byg:blue_enchanted_planks", + "byg:bulbis_planks", "byg:cherry_planks", "byg:cika_planks", "byg:cypress_planks", "byg:ebony_planks", + "byg:ether_planks", "byg:fir_planks", "byg:green_enchanted_planks", "byg:holly_planks", - "byg:jacaranda_planks", + "byg:imparius_planks", "byg:mahogany_planks", "byg:mangrove_planks", - "byg:maple_planks", + "byg:palm_planks", "byg:pine_planks", "byg:rainbow_eucalyptus_planks", "byg:redwood_planks", - "byg:skyris_planks", "byg:willow_planks", "byg:witch_hazel_planks", "byg:zelkova_planks", "byg:sythian_planks", "byg:embur_planks", - "byg:palm_planks", - "byg:lament_planks", - "byg:ether_planks", - "byg:bulbis_planks", "byg:nightshade_planks", - "byg:imparius_planks" + "byg:skyris_planks", + "byg:lament_planks", + "byg:maple_planks", + "byg:jacaranda_planks" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json similarity index 57% rename from Common/src/main/resources/data/minecraft/tags/items/sand.json rename to Common/src/generated/resources/data/minecraft/tags/items/sand.json index 36a5a6f876..ff02114b76 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -2,12 +2,15 @@ "replace": false, "values": [ "byg:white_sand", + "byg:end_sand", + "byg:warped_soul_sand", + "byg:cracked_red_sand", "byg:black_sand", - "byg:blue_sand", "byg:pink_sand", - "byg:purple_sand", - "byg:end_sand", + "byg:warped_soul_soil", + "byg:quartzite_sand", "byg:windswept_sand", - "byg:cracked_red_sand" + "byg:purple_sand", + "byg:blue_sand" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/saplings.json b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json similarity index 63% rename from Common/src/main/resources/data/minecraft/tags/blocks/saplings.json rename to Common/src/generated/resources/data/minecraft/tags/items/saplings.json index 157bf8e532..b4d36f669f 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json @@ -4,46 +4,32 @@ "byg:aspen_sapling", "byg:baobab_sapling", "byg:blue_enchanted_sapling", - "byg:blue_spruce_sapling", - "byg:brown_birch_sapling", - "byg:brown_oak_sapling", + "byg:pink_cherry_sapling", + "byg:white_cherry_sapling", "byg:cika_sapling", "byg:cypress_sapling", "byg:ebony_sapling", + "byg:ether_sapling", "byg:fir_sapling", "byg:green_enchanted_sapling", "byg:holly_sapling", - "byg:jacaranda_sapling", + "byg:lament_sapling", "byg:indigo_jacaranda_sapling", + "byg:jacaranda_sapling", "byg:mahogany_sapling", "byg:mangrove_sapling", + "byg:red_maple_sapling", + "byg:silver_maple_sapling", "byg:maple_sapling", - "byg:orange_birch_sapling", - "byg:orange_oak_sapling", - "byg:orange_spruce_sapling", - "byg:orchard_sapling", + "byg:nightshade_sapling", + "byg:palm_sapling", "byg:palo_verde_sapling", "byg:pine_sapling", - "byg:pink_cherry_sapling", "byg:rainbow_eucalyptus_sapling", - "byg:red_birch_sapling", - "byg:red_maple_sapling", - "byg:red_oak_sapling", - "byg:red_spruce_sapling", "byg:redwood_sapling", - "byg:silver_maple_sapling", - "byg:white_cherry_sapling", + "byg:skyris_sapling", "byg:willow_sapling", "byg:witch_hazel_sapling", - "byg:yellow_birch_sapling", - "byg:zelkova_sapling", - "byg:skyris_sapling", - "byg:palm_sapling", - "byg:araucaria_sapling", - "byg:brown_zelkova_sapling", - "byg:lament_sapling", - "byg:withering_oak_sapling", - "byg:ether_sapling", - "byg:nightshade_sapling" + "byg:zelkova_sapling" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json similarity index 79% rename from Common/src/main/resources/data/minecraft/tags/items/slabs.json rename to Common/src/generated/resources/data/minecraft/tags/items/slabs.json index e5e484999f..6a3ee9c79f 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,58 +1,68 @@ { "replace": false, "values": [ - "byg:aspen_slab", + "byg:chiseled_therium_slab", + "byg:maple_slab", "byg:baobab_slab", + "byg:cryptic_stone_slab", + "byg:palm_slab", "byg:blue_enchanted_slab", - "byg:cherry_slab", + "byg:sythian_slab", + "byg:mossy_red_rock_brick_slab", "byg:cika_slab", - "byg:cypress_slab", + "byg:ether_slab", "byg:ebony_slab", - "byg:fir_slab", - "byg:green_enchanted_slab", - "byg:holly_slab", - "byg:jacaranda_slab", - "byg:mahogany_slab", - "byg:mangrove_slab", - "byg:maple_slab", - "byg:pine_slab", - "byg:rainbow_eucalyptus_slab", - "byg:redwood_slab", + "byg:lament_slab", + "byg:chiseled_travertine_slab", + "byg:chiseled_windswept_sandstone_slab", "byg:skyris_slab", - "byg:willow_slab", - "byg:witch_hazel_slab", - "byg:zelkova_slab", - "byg:dacite_cobblestone_slab", - "byg:mossy_stone_slab", - "byg:rocky_stone_slab", "byg:scoria_stone_slab", - "byg:scoria_cobblestone_slab", + "byg:purpur_stone_slab", + "byg:imparius_slab", "byg:scoria_stonebrick_slab", + "byg:embur_slab", + "byg:bulbis_slab", + "byg:holly_slab", + "byg:dacite_brick_slab", "byg:soapstone_slab", - "byg:polished_soapstone_slab", + "byg:rainbow_eucalyptus_slab", + "byg:windswept_sandstone_slab", + "byg:scoria_cobblestone_slab", + "byg:cattail_thatch_slab", + "byg:chiseled_red_rock_brick_slab", + "byg:carved_ether_stone_slab", + "byg:dacite_tile_slab", + "byg:dacite_cobblestone_slab", + "byg:red_rock_slab", + "byg:travertine_slab", + "byg:cypress_slab", "byg:soapstone_brick_slab", + "byg:witch_hazel_slab", + "byg:rocky_stone_slab", + "byg:fir_slab", + "byg:dacite_slab", + "byg:aspen_slab", "byg:soapstone_tile_slab", - "byg:red_rock_slab", - "byg:red_rock_brick_slab", - "byg:mossy_red_rock_brick_slab", - "byg:cracked_red_rock_brick_slab", - "byg:chiseled_red_rock_brick_slab", - "byg:sythian_slab", - "byg:embur_slab", - "byg:palm_slab", - "byg:lament_slab", - "byg:ether_slab", - "byg:bulbis_slab", - "byg:nightshade_slab", - "byg:ether_stone_slab", "byg:cobbled_ether_stone_slab", - "byg:carved_ether_stone_slab", - "byg:purpur_stone_slab", - "byg:imparius_slab", + "byg:shiny_chiseled_therium_slab", + "byg:pine_slab", + "byg:mangrove_slab", + "byg:zelkova_slab", + "byg:ether_stone_slab", + "byg:smooth_windswept_sandstone_slab", + "byg:polished_soapstone_slab", + "byg:red_rock_brick_slab", + "byg:mahogany_slab", + "byg:polished_travertine_slab", + "byg:green_enchanted_slab", + "byg:redwood_slab", + "byg:mossy_stone_slab", "byg:chiseled_fungal_imparius_slab", - "byg:windswept_sandstone_slab", + "byg:nightshade_slab", + "byg:jacaranda_slab", "byg:cut_windswept_sandstone_slab", - "byg:chiseled_windswept_sandstone_slab", - "byg:smooth_windswept_sandstone_slab" + "byg:cherry_slab", + "byg:willow_slab", + "byg:cracked_red_rock_brick_slab" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json similarity index 81% rename from Common/src/main/resources/data/minecraft/tags/items/stairs.json rename to Common/src/generated/resources/data/minecraft/tags/items/stairs.json index ffe04179a3..74eae0e3ed 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,58 +1,68 @@ { "replace": false, "values": [ + "byg:purpur_stone_stairs", + "byg:maple_stairs", + "byg:scoria_stone_stairs", + "byg:green_enchanted_stairs", + "byg:cut_windswept_sandstone_stairs", + "byg:rocky_stone_stairs", + "byg:travertine_stairs", + "byg:carved_ether_stone_stairs", + "byg:cracked_red_rock_brick_stairs", + "byg:zelkova_stairs", + "byg:dacite_brick_stairs", + "byg:dacite_cobblestone_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:nightshade_stairs", "byg:aspen_stairs", - "byg:baobab_stairs", - "byg:blue_enchanted_stairs", + "byg:red_rock_stairs", "byg:cherry_stairs", - "byg:cika_stairs", - "byg:cypress_stairs", - "byg:ebony_stairs", - "byg:fir_stairs", - "byg:green_enchanted_stairs", - "byg:holly_stairs", - "byg:jacaranda_stairs", - "byg:mahogany_stairs", - "byg:mangrove_stairs", - "byg:maple_stairs", + "byg:cattail_thatch_stairs", "byg:pine_stairs", - "byg:rainbow_eucalyptus_stairs", - "byg:redwood_stairs", - "byg:skyris_stairs", "byg:willow_stairs", - "byg:witch_hazel_stairs", - "byg:zelkova_stairs", - "byg:dacite_cobblestone_stairs", - "byg:mossy_stone_stairs", - "byg:rocky_stone_stairs", - "byg:scoria_stone_stairs", - "byg:scoria_cobblestone_stairs", - "byg:scoria_stonebrick_stairs", - "byg:soapstone_stairs", - "byg:polished_soapstone_stairs", "byg:soapstone_brick_stairs", - "byg:soapstone_tile_stairs", - "byg:red_rock_stairs", - "byg:red_rock_brick_stairs", + "byg:scoria_cobblestone_stairs", + "byg:dacite_stairs", + "byg:chiseled_windswept_sandstone_stairs", + "byg:jacaranda_stairs", + "byg:mossy_stone_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:baobab_stairs", "byg:mossy_red_rock_brick_stairs", - "byg:cracked_red_rock_brick_stairs", + "byg:redwood_stairs", + "byg:bulbis_stairs", + "byg:scoria_stonebrick_stairs", + "byg:holly_stairs", + "byg:cryptic_stone_stairs", "byg:chiseled_red_rock_brick_stairs", - "byg:sythian_stairs", - "byg:embur_stairs", "byg:palm_stairs", - "byg:lament_stairs", + "byg:fir_stairs", "byg:ether_stairs", - "byg:bulbis_stairs", - "byg:nightshade_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:dacite_tile_stairs", + "byg:polished_travertine_stairs", "byg:ether_stone_stairs", - "byg:carved_ether_stone_stairs", - "byg:cobbled_ether_stone_stairs", - "byg:purpur_stone_stairs", + "byg:blue_enchanted_stairs", + "byg:smooth_windswept_sandstone_stairs", + "byg:sythian_stairs", "byg:imparius_stairs", - "byg:chiseled_fungal_imparius_stairs", + "byg:red_rock_brick_stairs", + "byg:chiseled_therium_stairs", + "byg:skyris_stairs", + "byg:witch_hazel_stairs", + "byg:embur_stairs", "byg:windswept_sandstone_stairs", - "byg:cut_windswept_sandstone_stairs", - "byg:chiseled_windswept_sandstone_stairs", - "byg:smooth_windswept_sandstone_stairs" + "byg:ebony_stairs", + "byg:cypress_stairs", + "byg:mangrove_stairs", + "byg:mahogany_stairs", + "byg:soapstone_tile_stairs", + "byg:lament_stairs", + "byg:cika_stairs", + "byg:chiseled_fungal_imparius_stairs", + "byg:soapstone_stairs", + "byg:polished_soapstone_stairs", + "byg:chiseled_travertine_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/trapdoors.json rename to Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json index 5f49a46ea6..8ea4d3dbcd 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json @@ -4,31 +4,31 @@ "byg:aspen_trapdoor", "byg:baobab_trapdoor", "byg:blue_enchanted_trapdoor", + "byg:bulbis_trapdoor", "byg:cherry_trapdoor", "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", - "byg:jacaranda_trapdoor", + "byg:imparius_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", - "byg:maple_trapdoor", + "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", - "byg:skyris_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", "byg:zelkova_trapdoor", "byg:sythian_trapdoor", "byg:embur_trapdoor", - "byg:palm_trapdoor", - "byg:lament_trapdoor", - "byg:ether_trapdoor", - "byg:bulbis_trapdoor", "byg:nightshade_trapdoor", - "byg:imparius_trapdoor" + "byg:skyris_trapdoor", + "byg:lament_trapdoor", + "byg:maple_trapdoor", + "byg:jacaranda_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json index 3852fe292f..a5e7a2094d 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json @@ -4,31 +4,31 @@ "byg:aspen_button", "byg:baobab_button", "byg:blue_enchanted_button", + "byg:bulbis_button", "byg:cherry_button", "byg:cika_button", "byg:cypress_button", "byg:ebony_button", + "byg:ether_button", "byg:fir_button", "byg:green_enchanted_button", "byg:holly_button", - "byg:jacaranda_button", + "byg:imparius_button", "byg:mahogany_button", "byg:mangrove_button", - "byg:maple_button", + "byg:palm_button", "byg:pine_button", "byg:rainbow_eucalyptus_button", "byg:redwood_button", - "byg:skyris_button", "byg:willow_button", "byg:witch_hazel_button", "byg:zelkova_button", "byg:sythian_button", "byg:embur_button", - "byg:palm_button", - "byg:lament_button", - "byg:ether_button", - "byg:bulbis_button", "byg:nightshade_button", - "byg:imparius_button" + "byg:skyris_button", + "byg:lament_button", + "byg:maple_button", + "byg:jacaranda_button" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_doors.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json index d4774aa046..8557526989 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_doors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json @@ -4,31 +4,31 @@ "byg:aspen_door", "byg:baobab_door", "byg:blue_enchanted_door", + "byg:bulbis_door", "byg:cherry_door", "byg:cika_door", "byg:cypress_door", "byg:ebony_door", + "byg:ether_door", "byg:fir_door", "byg:green_enchanted_door", "byg:holly_door", - "byg:jacaranda_door", + "byg:imparius_door", "byg:mahogany_door", "byg:mangrove_door", - "byg:maple_door", + "byg:palm_door", "byg:pine_door", "byg:rainbow_eucalyptus_door", "byg:redwood_door", - "byg:skyris_door", "byg:willow_door", "byg:witch_hazel_door", "byg:zelkova_door", "byg:sythian_door", "byg:embur_door", - "byg:palm_door", - "byg:lament_door", - "byg:ether_door", - "byg:bulbis_door", "byg:nightshade_door", - "byg:imparius_door" + "byg:skyris_door", + "byg:lament_door", + "byg:maple_door", + "byg:jacaranda_door" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json index 900c826d81..9249533c4f 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json @@ -4,31 +4,31 @@ "byg:aspen_fence", "byg:baobab_fence", "byg:blue_enchanted_fence", + "byg:bulbis_fence", "byg:cherry_fence", "byg:cika_fence", "byg:cypress_fence", "byg:ebony_fence", + "byg:ether_fence", "byg:fir_fence", "byg:green_enchanted_fence", "byg:holly_fence", - "byg:jacaranda_fence", + "byg:imparius_fence", "byg:mahogany_fence", "byg:mangrove_fence", - "byg:maple_fence", + "byg:palm_fence", "byg:pine_fence", "byg:rainbow_eucalyptus_fence", "byg:redwood_fence", - "byg:skyris_fence", "byg:willow_fence", "byg:witch_hazel_fence", "byg:zelkova_fence", "byg:sythian_fence", "byg:embur_fence", - "byg:palm_fence", - "byg:lament_fence", - "byg:ether_fence", - "byg:bulbis_fence", "byg:nightshade_fence", - "byg:imparius_fence" + "byg:skyris_fence", + "byg:lament_fence", + "byg:maple_fence", + "byg:jacaranda_fence" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json index b578920dab..d36796e1de 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json @@ -4,31 +4,31 @@ "byg:aspen_pressure_plate", "byg:baobab_pressure_plate", "byg:blue_enchanted_pressure_plate", + "byg:bulbis_pressure_plate", "byg:cherry_pressure_plate", "byg:cika_pressure_plate", "byg:cypress_pressure_plate", "byg:ebony_pressure_plate", + "byg:ether_pressure_plate", "byg:fir_pressure_plate", "byg:green_enchanted_pressure_plate", "byg:holly_pressure_plate", - "byg:jacaranda_pressure_plate", + "byg:imparius_pressure_plate", "byg:mahogany_pressure_plate", "byg:mangrove_pressure_plate", - "byg:maple_pressure_plate", + "byg:palm_pressure_plate", "byg:pine_pressure_plate", "byg:rainbow_eucalyptus_pressure_plate", "byg:redwood_pressure_plate", - "byg:skyris_pressure_plate", "byg:willow_pressure_plate", "byg:witch_hazel_pressure_plate", "byg:zelkova_pressure_plate", "byg:sythian_pressure_plate", "byg:embur_pressure_plate", - "byg:palm_pressure_plate", - "byg:lament_pressure_plate", - "byg:ether_pressure_plate", - "byg:bulbis_pressure_plate", "byg:nightshade_pressure_plate", - "byg:imparius_pressure_plate" + "byg:skyris_pressure_plate", + "byg:lament_pressure_plate", + "byg:maple_pressure_plate", + "byg:jacaranda_pressure_plate" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json index eeb2becc99..ac3cfd07f1 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json @@ -4,31 +4,31 @@ "byg:aspen_slab", "byg:baobab_slab", "byg:blue_enchanted_slab", + "byg:bulbis_slab", "byg:cherry_slab", "byg:cika_slab", "byg:cypress_slab", "byg:ebony_slab", + "byg:ether_slab", "byg:fir_slab", "byg:green_enchanted_slab", "byg:holly_slab", - "byg:jacaranda_slab", + "byg:imparius_slab", "byg:mahogany_slab", "byg:mangrove_slab", - "byg:maple_slab", + "byg:palm_slab", "byg:pine_slab", "byg:rainbow_eucalyptus_slab", "byg:redwood_slab", - "byg:skyris_slab", "byg:willow_slab", "byg:witch_hazel_slab", "byg:zelkova_slab", "byg:sythian_slab", "byg:embur_slab", - "byg:palm_slab", - "byg:lament_slab", - "byg:ether_slab", - "byg:bulbis_slab", "byg:nightshade_slab", - "byg:imparius_slab" + "byg:skyris_slab", + "byg:lament_slab", + "byg:maple_slab", + "byg:jacaranda_slab" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json index 391e1bf746..9bb4a4f65e 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json @@ -4,31 +4,31 @@ "byg:aspen_stairs", "byg:baobab_stairs", "byg:blue_enchanted_stairs", + "byg:bulbis_stairs", "byg:cherry_stairs", "byg:cika_stairs", "byg:cypress_stairs", "byg:ebony_stairs", + "byg:ether_stairs", "byg:fir_stairs", "byg:green_enchanted_stairs", "byg:holly_stairs", - "byg:jacaranda_stairs", + "byg:imparius_stairs", "byg:mahogany_stairs", "byg:mangrove_stairs", - "byg:maple_stairs", + "byg:palm_stairs", "byg:pine_stairs", "byg:rainbow_eucalyptus_stairs", "byg:redwood_stairs", - "byg:skyris_stairs", "byg:willow_stairs", "byg:witch_hazel_stairs", "byg:zelkova_stairs", "byg:sythian_stairs", "byg:embur_stairs", - "byg:palm_stairs", - "byg:lament_stairs", - "byg:ether_stairs", - "byg:bulbis_stairs", "byg:nightshade_stairs", - "byg:imparius_stairs" + "byg:skyris_stairs", + "byg:lament_stairs", + "byg:maple_stairs", + "byg:jacaranda_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json similarity index 93% rename from Common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json rename to Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json index 5f49a46ea6..8ea4d3dbcd 100644 --- a/Common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json @@ -4,31 +4,31 @@ "byg:aspen_trapdoor", "byg:baobab_trapdoor", "byg:blue_enchanted_trapdoor", + "byg:bulbis_trapdoor", "byg:cherry_trapdoor", "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", - "byg:jacaranda_trapdoor", + "byg:imparius_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", - "byg:maple_trapdoor", + "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", - "byg:skyris_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", "byg:zelkova_trapdoor", "byg:sythian_trapdoor", "byg:embur_trapdoor", - "byg:palm_trapdoor", - "byg:lament_trapdoor", - "byg:ether_trapdoor", - "byg:bulbis_trapdoor", "byg:nightshade_trapdoor", - "byg:imparius_trapdoor" + "byg:skyris_trapdoor", + "byg:lament_trapdoor", + "byg:maple_trapdoor", + "byg:jacaranda_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_beach.json b/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_beach.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_beach.json rename to Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_beach.json diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json b/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json rename to Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlockProperties.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlockProperties.java index 15b249c67c..ae02a9a04e 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlockProperties.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlockProperties.java @@ -266,9 +266,7 @@ public BYGWartBlock() { super(BlockBehaviour.Properties.of(Material.GRASS) .sound(SoundType.WART_BLOCK) .strength(1.0F) - ); - } } diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java deleted file mode 100644 index 0f7f8d5aed..0000000000 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodType.java +++ /dev/null @@ -1,15 +0,0 @@ -package potionstudios.byg.common.block; - -import net.minecraft.world.level.block.state.properties.WoodType; -import potionstudios.byg.BYG; -import potionstudios.byg.BYGConstants; - -import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_create; -import static potionstudios.byg.mixin.access.WoodTypeAccess.byg_invokeRegister; - -public class BYGWoodType { - - private static WoodType register(String id) { - return BYGConstants.SIGNS ? byg_invokeRegister(byg_create(BYG.createLocation(id).toString().replace(":", "/"))) : null; - } -} \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index d9bbede4b2..aa2a8951d6 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -16,6 +16,7 @@ import potionstudios.byg.mixin.access.WoodTypeAccess; import potionstudios.byg.reg.BlockRegistryObject; import potionstudios.byg.reg.RegistryObject; +import potionstudios.byg.util.MultiTag; import java.util.Arrays; import java.util.EnumSet; @@ -158,7 +159,7 @@ public enum BYGWoodTypes { private final Builder builder; private boolean initialized; - private final TagKey logTag; + private final MultiTag logTag; private BlockRegistryObject growerItem; private BlockRegistryObject leaves; @@ -194,7 +195,7 @@ public enum BYGWoodTypes { this.builder = builder; this.woodType = WoodTypeAccess.byg_create(name); - logTag = TagKey.create(Registry.ITEM_REGISTRY, BYG.createLocation("wood/" + name + "_logs")); + logTag = MultiTag.create(BYG.createLocation("wood/" + name + "_logs")); } public void init() { @@ -362,7 +363,7 @@ public RegistryObject boat() { return boat; } - public TagKey logTag() { + public MultiTag logTag() { return logTag; } diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java new file mode 100644 index 0000000000..8bf1d26018 --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java @@ -0,0 +1,49 @@ +package potionstudios.byg.common.world.biome; + +import net.minecraft.core.Registry; +import net.minecraft.tags.BiomeTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import potionstudios.byg.BYG; +import potionstudios.byg.reg.RegistryObject; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +public enum BYGBiomeType { + BEACH(BiomeTags.IS_BEACH), + ICY("is_icy"), + SNOWY("is_snowy"), + SANDY("is_sandy"), + DEEP_OCEAN(BiomeTags.IS_DEEP_OCEAN), + OCEAN("is_ocean"), + SPOOKY("is_spooky"), + SWAMP("is_swamp"), + WASTELAND("is_wasteland"), + DEAD("is_dead"), + BADLANDS("is_badlands"); + + private final TagKey tag; + private final List> biomes = new ArrayList<>(); + + BYGBiomeType(TagKey tag) { + this.tag = tag; + } + + BYGBiomeType(String tag) { + this(TagKey.create(Registry.BIOME_REGISTRY, BYG.createLocation(tag))); + } + + public void add(RegistryObject biome) { + this.biomes.add(biome); + } + + public TagKey tag() { + return tag; + } + + public Stream getBiomes() { + return biomes.stream().map(RegistryObject::get); + } +} diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java index a83ec2a49d..3c04aa1888 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java @@ -32,7 +32,7 @@ public class BYGBiomes { public static final ResourceKey ATACAMA_DESERT = createBiome("atacama_desert", BYGOverworldBiomes::atacamaDesert); public static final ResourceKey AUTUMNAL_VALLEY = createBiome("autumnal_valley", BYGOverworldBiomes::autumnalValley); public static final ResourceKey BAOBAB_SAVANNA = createBiome("baobab_savanna", BYGOverworldBiomes::baobabSavanna); - public static final ResourceKey BAYOU = createBiome("bayou", BYGOverworldBiomes::bayou); + public static final ResourceKey BAYOU = createBiome("bayou", BYGOverworldBiomes::bayou, BYGBiomeType.SWAMP); public static final ResourceKey BLACK_FOREST = createBiome("black_forest", BYGOverworldBiomes::blackForest); public static final ResourceKey BOREALIS_GROVE = createBiome("borealis_grove", BYGOverworldBiomes::borealisGrove); public static final ResourceKey CANADIAN_SHIELD = createBiome("canadian_shield", BYGOverworldBiomes::canadianShield); @@ -40,11 +40,11 @@ public class BYGBiomes { public static final ResourceKey CIKA_WOODS = createBiome("cika_woods", BYGOverworldBiomes::cikaWoods); public static final ResourceKey CONIFEROUS_FOREST = createBiome("coniferous_forest", () -> coniferousForest(false)); public static final ResourceKey CRAG_GARDENS = createBiome("crag_gardens", BYGOverworldBiomes::cragGardens); - public static final ResourceKey CYPRESS_SWAMPLANDS = createBiome("cypress_swamplands", BYGOverworldBiomes::cypressSwamplands); - public static final ResourceKey LUSH_STACKS = createBiome("lush_stacks", BYGOverworldBiomes::lushStacks); - public static final ResourceKey DEAD_SEA = createBiome("dead_sea", BYGOverworldBiomes::deadSea); + public static final ResourceKey CYPRESS_SWAMPLANDS = createBiome("cypress_swamplands", BYGOverworldBiomes::cypressSwamplands, BYGBiomeType.SWAMP); + public static final ResourceKey LUSH_STACKS = createBiome("lush_stacks", BYGOverworldBiomes::lushStacks, BYGBiomeType.DEEP_OCEAN, BYGBiomeType.OCEAN); + public static final ResourceKey DEAD_SEA = createBiome("dead_sea", BYGOverworldBiomes::deadSea, BYGBiomeType.DEEP_OCEAN, BYGBiomeType.OCEAN, BYGBiomeType.WASTELAND, BYGBiomeType.DEAD); public static final ResourceKey DACITE_RIDGES = createBiome("dacite_ridges", BYGOverworldBiomes::daciteRidges); - public static final ResourceKey WINDSWEPT_DUNES = createBiome("windswept_dunes", () -> BYGOverworldBiomes.windsweptDesert(true)); + public static final ResourceKey WINDSWEPT_DUNES = createBiome("windswept_dunes", () -> BYGOverworldBiomes.windsweptDesert(true), BYGBiomeType.SANDY, BYGBiomeType.BADLANDS); public static final ResourceKey WINDSWEPT_DESERT = createBiome("windswept_desert", () -> BYGOverworldBiomes.windsweptDesert(false)); public static final ResourceKey EBONY_WOODS = createBiome("ebony_woods", BYGOverworldBiomes::ebonyWoods); public static final ResourceKey FORGOTTEN_FOREST = createBiome("forgotten_forest", BYGOverworldBiomes::forgottenForest); @@ -54,34 +54,34 @@ public class BYGBiomes { public static final ResourceKey JACARANDA_FOREST = createBiome("jacaranda_forest", BYGOverworldBiomes::jacarandaForest); public static final ResourceKey MAPLE_TAIGA = createBiome("maple_taiga", BYGOverworldBiomes::mapleTaiga); public static final ResourceKey COCONINO_MEADOW = createBiome("coconino_meadow", () -> coconinoMeadow(false, false)); - public static final ResourceKey MOJAVE_DESERT = createBiome("mojave_desert", BYGOverworldBiomes::mojaveDesert); + public static final ResourceKey MOJAVE_DESERT = createBiome("mojave_desert", BYGOverworldBiomes::mojaveDesert, BYGBiomeType.SANDY); public static final ResourceKey CARDINAL_TUNDRA = createBiome("cardinal_tundra", BYGOverworldBiomes::cardinalTundra); public static final ResourceKey ORCHARD = createBiome("orchard", BYGOverworldBiomes::orchard); public static final ResourceKey PRAIRIE = createBiome("prairie", BYGOverworldBiomes::prairie); public static final ResourceKey RED_OAK_FOREST = createBiome("red_oak_forest", BYGOverworldBiomes::redOakForest); - public static final ResourceKey RED_ROCK_VALLEY = createBiome("red_rock_valley", BYGOverworldBiomes::redRockValley); + public static final ResourceKey RED_ROCK_VALLEY = createBiome("red_rock_valley", BYGOverworldBiomes::redRockValley, BYGBiomeType.BADLANDS); public static final ResourceKey ROSE_FIELDS = createBiome("rose_fields", BYGOverworldBiomes::roseFields); public static final ResourceKey AUTUMNAL_FOREST = createBiome("autumnal_forest", BYGOverworldBiomes::autumnalForest); public static final ResourceKey AUTUMNAL_TAIGA = createBiome("autumnal_taiga", () -> autumnalTaiga(false)); - public static final ResourceKey SHATTERED_GLACIER = createBiome("shattered_glacier", BYGOverworldBiomes::shatteredGlacier); + public static final ResourceKey SHATTERED_GLACIER = createBiome("shattered_glacier", BYGOverworldBiomes::shatteredGlacier, BYGBiomeType.ICY); public static final ResourceKey FIRECRACKER_SHRUBLAND = createBiome("firecracker_shrubland", BYGOverworldBiomes::firecrackerShrubland); - public static final ResourceKey SIERRA_BADLANDS = createBiome("sierra_badlands", BYGOverworldBiomes::sierraBadlands); + public static final ResourceKey SIERRA_BADLANDS = createBiome("sierra_badlands", BYGOverworldBiomes::sierraBadlands, BYGBiomeType.BADLANDS); public static final ResourceKey SKYRIS_VALE = createBiome("skyris_vale", BYGOverworldBiomes::skyrisVale); public static final ResourceKey REDWOOD_THICKET = createBiome("redwood_thicket", BYGOverworldBiomes::redwoodThicket); - public static final ResourceKey FROSTED_TAIGA = createBiome("frosted_taiga", () -> frostedTaiga(true, false)); - public static final ResourceKey FROSTED_CONIFEROUS_FOREST = createBiome("frosted_coniferous_forest", () -> coniferousForest(true)); + public static final ResourceKey FROSTED_TAIGA = createBiome("frosted_taiga", () -> frostedTaiga(true, false), BYGBiomeType.SNOWY); + public static final ResourceKey FROSTED_CONIFEROUS_FOREST = createBiome("frosted_coniferous_forest", () -> coniferousForest(true), BYGBiomeType.SNOWY); public static final ResourceKey FRAGMENT_FOREST = createBiome("fragment_forest", BYGOverworldBiomes::fragmentForest); // public static final ResourceKey TROPICAL_ISLAND = createBiome("tropical_islands", tropicalRainforest()); public static final ResourceKey TROPICAL_RAINFOREST = createBiome("tropical_rainforest", BYGOverworldBiomes::tropicalRainforest); public static final ResourceKey TWILIGHT_MEADOW = createBiome("twilight_meadow", BYGOverworldBiomes::twilightMeadow); - public static final ResourceKey WEEPING_WITCH_FOREST = createBiome("weeping_witch_forest", BYGOverworldBiomes::weepingWitchForest); + public static final ResourceKey WEEPING_WITCH_FOREST = createBiome("weeping_witch_forest", BYGOverworldBiomes::weepingWitchForest, BYGBiomeType.SPOOKY); public static final ResourceKey WHITE_MANGROVE_MARSHES = createBiome("white_mangrove_marshes", BYGOverworldBiomes::whiteMangroveMarshes); public static final ResourceKey TEMPERATE_RAINFOREST = createBiome("temperate_rainforest", BYGOverworldBiomes::temperateRainForest); public static final ResourceKey ZELKOVA_FOREST = createBiome("zelkova_forest", BYGOverworldBiomes::zelkovaForest); /************Beach Biomes*************/ public static final ResourceKey WINDSWEPT_BEACH = createBiome("windswept_beach", BYGOverworldBiomes::windsweptBeach); - public static final ResourceKey RAINBOW_BEACH = createBiome("rainbow_beach", BYGOverworldBiomes::rainbowBeach); + public static final ResourceKey RAINBOW_BEACH = createBiome("rainbow_beach", BYGOverworldBiomes::rainbowBeach, BYGBiomeType.BEACH); public static final ResourceKey BASALT_BARRERA = createBiome("basalt_barrera", BYGOverworldBiomes::basaltBarrera); public static final ResourceKey DACITE_SHORE = createBiome("dacite_shore", BYGOverworldBiomes::daciteShore); @@ -112,13 +112,16 @@ public class BYGBiomes { public static final ResourceKey IMPARIUS_GROVE = createBiome("imparius_grove", BYGEndBiomes::impariusGrove); - public static ResourceKey createBiome(String id, Supplier biome) { + public static ResourceKey createBiome(String id, Supplier biome, BYGBiomeType... types) { ResourceLocation bygID = BYG.createLocation(id); if (BuiltinRegistries.BIOME.keySet().contains(bygID)) { throw new IllegalStateException("Biome ID: \"" + bygID + "\" already exists in the Biome registry!"); } if (BYGConstants.BIOMES) { - PROVIDER.register(id, biome); + final var reg = PROVIDER.register(id, biome); + for (BYGBiomeType type : types) { + type.add(reg); + } } return ResourceKey.create(Registry.BIOME_REGISTRY, bygID); diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java index 74fd8ffa2b..0218565e4a 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/config/BYGTreeConfig.java @@ -12,7 +12,6 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider; -import potionstudios.byg.common.block.BYGWoodType; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.reg.RegistryObject; diff --git a/Common/src/main/java/potionstudios/byg/util/MultiTag.java b/Common/src/main/java/potionstudios/byg/util/MultiTag.java new file mode 100644 index 0000000000..3d9a5aa7c7 --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/util/MultiTag.java @@ -0,0 +1,36 @@ +package potionstudios.byg.util; + +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; + +import java.util.HashMap; +import java.util.Map; + +public class MultiTag { + private final ResourceLocation name; + private final Map>, TagKey> byRegistry = new HashMap<>(); + + public static MultiTag create(ResourceLocation name) { + return new MultiTag(name); + } + + public MultiTag(ResourceLocation name) { + this.name = name; + } + + @SuppressWarnings("unchecked") + public TagKey get(ResourceKey> type) { + return (TagKey) byRegistry.computeIfAbsent(type, k -> TagKey.create(type, name)); + } + + public TagKey item() { + return get(Registry.ITEM_REGISTRY); + } + public TagKey block() { + return get(Registry.BLOCK_REGISTRY); + } +} diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json b/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json new file mode 100644 index 0000000000..2bc3f08dba --- /dev/null +++ b/Common/src/main/resources/assets/byg/blockstates/potted_jacaranda_bush.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/potted_jacaranda_bush" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/imbued_nightshade_log.json b/Common/src/main/resources/assets/byg/models/block/imbued_nightshade_log.json index b9cb3b1dfe..09b9f6561c 100644 --- a/Common/src/main/resources/assets/byg/models/block/imbued_nightshade_log.json +++ b/Common/src/main/resources/assets/byg/models/block/imbued_nightshade_log.json @@ -1,7 +1,7 @@ { "parent": "block/cube_column", "textures": { - "end": "byg:block/nightshade_log_top", + "end": "byg:block/nightshade/log_top", "side": "byg:block/imbued_nightshade_log" } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/mushrooms.json b/Common/src/main/resources/data/byg/tags/items/mushrooms.json deleted file mode 100644 index 1acb3da23d..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/mushrooms.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:green_mushroom", - "byg:wood_blewit", - "byg:weeping_milkcap", - "byg:white_puffball_cap", - "byg:imparius_mushroom" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json deleted file mode 100644 index 5d0e72f5c1..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:brimstone_caverns", - "byg:crimson_gardens", - "byg:embur_bog", - "byg:glowstone_gardens", - "byg:magma_wastes", - "byg:subzero_hypogeal", - "byg:sythian_torrids", - "byg:warped_desert", - "byg:wailing_garth", - "byg:arisian_undergrowth", - "byg:weeping_mire", - "byg:quartz_desert" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_savanna.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_savanna.json index 8a08fb35df..e034b89ad2 100644 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_savanna.json +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_savanna.json @@ -5,4 +5,4 @@ "byg:baobab_savanna", "byg:firecracker_shrubland" ] -}Z \ No newline at end of file +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_snowy.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_snowy.json deleted file mode 100644 index e3c564203d..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_snowy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:frosted_coniferous_forest", - "byg:frosted_taiga" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json deleted file mode 100644 index e14f1ee731..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json deleted file mode 100644 index a22514f66a..0000000000 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "replace": false, - "values": [ - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json b/Common/src/main/resources/data/c/tags/entity_types/boats.json similarity index 70% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json rename to Common/src/main/resources/data/c/tags/entity_types/boats.json index a22514f66a..4abb011202 100644 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json +++ b/Common/src/main/resources/data/c/tags/entity_types/boats.json @@ -1,5 +1,6 @@ { "replace": false, "values": [ + "#byg:boats" ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/jungle_logs.json b/Common/src/main/resources/data/minecraft/tags/blocks/jungle_logs.json index 9bbfdf33a5..444638abc3 100644 --- a/Common/src/main/resources/data/minecraft/tags/blocks/jungle_logs.json +++ b/Common/src/main/resources/data/minecraft/tags/blocks/jungle_logs.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "#byg:mahogany_logs", - "#byg:palm_logs" + "#byg:wood/mahogany_logs", + "#byg:wood/palm_logs" ] } diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/logs.json b/Common/src/main/resources/data/minecraft/tags/blocks/logs.json deleted file mode 100644 index 896072cc1b..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/blocks/logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:sythian_stems", - "#byg:embur_pedus", - "#byg:lament_logs", - "#byg:withering_oak_logs" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/Common/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json deleted file mode 100644 index bae777a720..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:aspen_logs", - "#byg:baobab_logs", - "#byg:blue_enchanted_logs", - "#byg:cherry_logs", - "#byg:cika_logs", - "#byg:cypress_logs", - "#byg:ebony_logs", - "#byg:fir_logs", - "#byg:green_enchanted_logs", - "#byg:holly_logs", - "#byg:jacaranda_logs", - "#byg:mahogany_logs", - "#byg:mangrove_logs", - "#byg:maple_logs", - "#byg:palo_verde_logs", - "#byg:pine_logs", - "#byg:rainbow_eucalyptus_logs", - "#byg:redwood_logs", - "#byg:skyris_logs", - "#byg:willow_logs", - "#byg:witch_hazel_logs", - "#byg:zelkova_logs", - "#byg:palm_logs", - "#byg:bulbis_stems", - "#byg:ether_logs", - "#byg:nightshade_logs", - "#byg:withering_oak_logs", - "#byg:imparius_stems" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/slabs.json b/Common/src/main/resources/data/minecraft/tags/blocks/slabs.json deleted file mode 100644 index a941228a68..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:slabs" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/wart_blocks.json b/Common/src/main/resources/data/minecraft/tags/blocks/wart_blocks.json deleted file mode 100644 index 281d662af0..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/blocks/wart_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:sythian_wart_block", - "byg:shulkren_wart_block" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/logs.json b/Common/src/main/resources/data/minecraft/tags/items/logs.json deleted file mode 100644 index 896072cc1b..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/items/logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:sythian_stems", - "#byg:embur_pedus", - "#byg:lament_logs", - "#byg:withering_oak_logs" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/Common/src/main/resources/data/minecraft/tags/items/logs_that_burn.json deleted file mode 100644 index 71383f76ac..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/items/logs_that_burn.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:aspen_logs", - "#byg:baobab_logs", - "#byg:blue_enchanted_logs", - "#byg:cherry_logs", - "#byg:cika_logs", - "#byg:cypress_logs", - "#byg:ebony_logs", - "#byg:fir_logs", - "#byg:green_enchanted_logs", - "#byg:holly_logs", - "#byg:jacaranda_logs", - "#byg:mahogany_logs", - "#byg:mangrove_logs", - "#byg:maple_logs", - "#byg:palo_verde_logs", - "#byg:pine_logs", - "#byg:rainbow_eucalyptus_logs", - "#byg:redwood_logs", - "#byg:skyris_logs", - "#byg:willow_logs", - "#byg:witch_hazel_logs", - "#byg:zelkova_logs", - "#byg:palm_logs", - "#byg:bulbis_stems", - "#byg:ether_logs", - "#byg:nightshade_logs", - "#byg:imparius_stems" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/items/planks.json b/Common/src/main/resources/data/minecraft/tags/items/planks.json deleted file mode 100644 index 278d213c9d..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/items/planks.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:aspen_planks", - "byg:baobab_planks", - "byg:blue_enchanted_planks", - "byg:cherry_planks", - "byg:cika_planks", - "byg:cypress_planks", - "byg:ebony_planks", - "byg:fir_planks", - "byg:green_enchanted_planks", - "byg:holly_planks", - "byg:jacaranda_planks", - "byg:mahogany_planks", - "byg:mangrove_planks", - "byg:maple_planks", - "byg:pine_planks", - "byg:rainbow_eucalyptus_planks", - "byg:redwood_planks", - "byg:skyris_planks", - "byg:willow_planks", - "byg:witch_hazel_planks", - "byg:zelkova_planks", - "byg:sythian_planks", - "byg:embur_planks", - "byg:palm_planks", - "byg:lament_planks", - "byg:ether_planks", - "byg:bulbis_planks", - "byg:nightshade_planks", - "byg:imparius_planks" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json b/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json deleted file mode 100644 index 885ec5e9e7..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_beach.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:is_beach" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json b/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json deleted file mode 100644 index 86a1082a28..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:is_deep_ocean" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_hill.json b/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_hill.json deleted file mode 100644 index 42f33dbff8..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_hill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:is_hill" - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_river.json b/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_river.json deleted file mode 100644 index 37e61b46e0..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/worldgen/biome/is_river.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#byg:is_river" - ] -} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index 76bab8cacd..e473549b66 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -29,10 +29,17 @@ tasks.build.dependsOn(tasks.findByName("shadowJar")) configurations { shadow - implementation.extendsFrom(shadow) + implementation.extendsFrom shadow library implementation.extendsFrom library + + dataImplementation.extendsFrom implementation + dataCompileOnly.extendsFrom compileOnly +} + +sourceSets { + data } minecraft.runs.all { @@ -109,11 +116,12 @@ minecraft { taskName 'Data' def output = sourceSets.main.output; def commonOutput = project(":Common").sourceSets.main.output; - environment("MOD_CLASSES", [output.classesDirs.asPath, output.resourcesDir.path, commonOutput.classesDirs.asPath, commonOutput.resourcesDir.path].join(";")) + environment("MOD_CLASSES", [output.classesDirs.asPath, sourceSets.data.output.asPath, output.resourcesDir.path, commonOutput.classesDirs.asPath, commonOutput.resourcesDir.path].join(";")) mods { modDataRun { source sourceSets.main as SourceSet + source sourceSets.data as SourceSet source project(":Common").sourceSets.main as SourceSet } } @@ -127,6 +135,7 @@ dependencies { annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${minecraft_version}-${terrablender_version}") library shadow("blue.endless:jankson:${jankson_version}") + dataImplementation sourceSets.main.output } reg.configureJarTask(shadowJar) diff --git a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java similarity index 71% rename from Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java rename to Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java index 8c49af25d7..bc4468f240 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java @@ -4,9 +4,11 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; +import potionstudios.byg.datagen.providers.tag.BYGBiomeTagsProvider; import potionstudios.byg.datagen.providers.BYGWoodAssetsProvider; -import potionstudios.byg.datagen.providers.BYGBlockTagsProvider; -import potionstudios.byg.datagen.providers.BYGItemTagsProvider; +import potionstudios.byg.datagen.providers.tag.BYGBlockTagsProvider; +import potionstudios.byg.datagen.providers.tag.BYGEntityTagsProvider; +import potionstudios.byg.datagen.providers.tag.BYGItemTagsProvider; import potionstudios.byg.datagen.providers.BYGRecipeProviders; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = BYG.MOD_ID) @@ -21,6 +23,8 @@ static void onDatagen(final GatherDataEvent event) { final var blockTags = new BYGBlockTagsProvider(gen, existingFileHelper); gen.addProvider(blockTags); gen.addProvider(new BYGItemTagsProvider(gen, blockTags, existingFileHelper)); + gen.addProvider(new BYGEntityTagsProvider(gen, existingFileHelper)); + gen.addProvider(new BYGBiomeTagsProvider(gen, existingFileHelper)); gen.addProvider(new BYGRecipeProviders(gen)); } if (event.includeClient()) { diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java similarity index 97% rename from Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java rename to Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index 2c8215d5df..b636e89529 100644 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -78,8 +78,8 @@ protected void buildCraftingRecipes(Consumer consumer) { .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); ShapelessRecipeBuilder.shapeless(type.planks(), 4) .group("wooden_planks") - .unlockedBy("has_logs", has(type.logTag())) - .requires(type.logTag()) + .unlockedBy("has_logs", has(type.logTag().item())) + .requires(type.logTag().item()) .save(consumer, BYG.createLocation("wood/" + type + "/planks")); ShapedRecipeBuilder.shaped(type.pressurePlate()) .group("wooden_pressure_plate") diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java similarity index 100% rename from Forge/src/main/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java rename to Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java new file mode 100644 index 0000000000..5766f9f360 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java @@ -0,0 +1,22 @@ +package potionstudios.byg.datagen.providers.tag; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BiomeTagsProvider; +import net.minecraft.world.level.biome.Biome; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import potionstudios.byg.BYG; +import potionstudios.byg.common.world.biome.BYGBiomeType; + +public class BYGBiomeTagsProvider extends BiomeTagsProvider { + public BYGBiomeTagsProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { + super(gen, BYG.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + for (final BYGBiomeType type : BYGBiomeType.values()) { + tag(type.tag()).add(type.getBiomes().toArray(Biome[]::new)); + } + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java new file mode 100644 index 0000000000..30fcda01ed --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -0,0 +1,194 @@ +package potionstudios.byg.datagen.providers.tag; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.ButtonBlock; +import net.minecraft.world.level.block.CampfireBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.material.Material; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGBlockProperties; +import potionstudios.byg.common.block.BYGBlockTags; +import potionstudios.byg.common.block.BYGMushroomBlock; +import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.common.block.sapling.BYGSaplingBlock; +import potionstudios.byg.datagen.util.PredicatedTagProvider; +import potionstudios.byg.mixin.access.TagBuilderAccess; +import potionstudios.byg.mixin.dev.BlockBehaviorAccess; +import potionstudios.byg.reg.RegistryObject; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import static potionstudios.byg.common.block.BYGBlocks.*; +import static potionstudios.byg.BYG.createLocation; +import static net.minecraft.tags.BlockTags.create; + +@SuppressWarnings("ALL") +public class BYGBlockTagsProvider extends BlockTagsProvider { + private final TagAppender logsThatBurn = tag(BlockTags.LOGS_THAT_BURN); + private final TagAppender logs = tag(BlockTags.LOGS); + + public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { + super(pGenerator, BYG.MOD_ID, existingFileHelper); + } + + // TODO document what gets generated + @Override + protected void addTags() { + tag( + BYGBlockTags.LUSH, + LUSH_GRASS_PATH, LUSH_GRASS_BLOCK, LUSH_FARMLAND + ); + + final Material[] shovelMaterials = { Material.DIRT, Material.GRASS, Material.SAND, Material.CLAY }; + + new PredicatedTagProvider<>(PROVIDER) + .forInstance(SlabBlock.class, BYGBlockTags.SLABS) + .forInstance(StairBlock.class, BlockTags.STAIRS) + .forInstance(ButtonBlock.class, BlockTags.BUTTONS) + .forInstance(BYGSaplingBlock.class, BlockTags.SAPLINGS) + .forInstance(BYGMushroomBlock.class, create(createLocation("mushrooms"))) + .forInstance(BYGBlockProperties.BYGWartBlock.class, BlockTags.WART_BLOCKS) + .forInstance(CampfireBlock.class, BlockTags.CAMPFIRES) + .add(isMaterial(shovelMaterials), BlockTags.MINEABLE_WITH_SHOVEL) + .add(isMaterial(Material.LEAVES), BlockTags.LEAVES) + .add(isMaterial(Material.SAND), BlockTags.SAND) + .add(isMaterial(Material.ICE, Material.ICE_SOLID), BlockTags.ICE) + .run(super::tag); + + tag(BYGBlockTags.GROUND_MANGROVE_TREE).addTags(BlockTags.DIRT, BlockTags.SAND).add(MUD_BLOCK.get(), Blocks.CLAY); + + tag(BYGBlockTags.END_STONE).add(ETHER_STONE.get(), BULBIS_PHYCELIUM.get(), NIGHTSHADE_PHYLIUM.get(), IMPARIUS_PHYLIUM.get(), IVIS_PHYLIUM.get(), SHULKREN_PHYLIUM.get(), Blocks.END_STONE); + + for (TagKey netherPlantTag : BYGBlockTags.END_PLANT_TAGS) { + tag(netherPlantTag).add(Blocks.END_STONE).addTag(BYGBlockTags.END_STONE) + .addOptionalTag(new ResourceLocation("c", "end_stones")) + .addOptionalTag(new ResourceLocation("forge", "end_stones")); + } + + for (TagKey netherPlantTag : BYGBlockTags.NETHER_PLANT_TAGS) { + tag(netherPlantTag).addTag(BlockTags.NYLIUM).add(Blocks.MYCELIUM).add(Blocks.SOUL_SOIL); + } + + for (TagKey plantTag : BYGBlockTags.PLANT_TAGS) { + this.tag(plantTag).addTag(BlockTags.DIRT); + } + for (TagKey plantTag : BYGBlockTags.MUSHROOM_TAGS) { + this.tag(plantTag).addTag(BlockTags.MUSHROOM_GROW_BLOCK).addTag(BlockTags.DIRT).addTags(BlockTags.BASE_STONE_OVERWORLD); + } + + for (TagKey desertPlantTag : BYGBlockTags.SAND_PLANT_TAGS) { + this.tag(desertPlantTag).addTag(BlockTags.SAND); + } + this.tag(BYGBlockTags.GROUND_PALM_SAPLING).addTag(BlockTags.SAND).addTag(BlockTags.DIRT); + this.tag(BYGBlockTags.GROUND_FAIRY_SLIPPER).addTag(BlockTags.LOGS); + + // For now, until we get all wood moved + final var axeMineable = tag(BlockTags.MINEABLE_WITH_AXE); + for (BYGWoodTypes type : BYGWoodTypes.values()) { + add(axeMineable, type.bookshelf(), type.button(), type.craftingTable(), type.door(), type.trapdoor(), type.planks(), type.fence(), type.fenceGate(), type.log(), type.wood(), type.strippedLog(), type.strippedWood(), + type.pressurePlate(), type.sign(), type.wallSign(), type.slab(), type.stairs()); + } + add(axeMineable, + BORIC_CAMPFIRE, SOUL_SHROOM_BLOCK, SOUL_SHROOM_STEM, GREEN_MUSHROOM_BLOCK, IMBUED_NIGHTSHADE_LOG, + PLANT_STEM, WITHERING_OAK_LOG, WITHERING_OAK_WOOD, DEATH_CAP_MUSHROOM_BLOCK, CRYPTIC_CAMPFIRE, + PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD, + MILKCAP_MUSHROOM_BLOCK, BROWN_MUSHROOM_STEM, FUNGAL_IMPARIUS_HYPHAE, FUNGAL_IMPARIUS_STEM, + BLEWIT_MUSHROOM_BLOCK, WHITE_MUSHROOM_STEM + ); + + final var planksTag = tag(BlockTags.PLANKS); + final var bookselvesTag = tag(create(createLocation("bookshelves"))); + final var trapdoorsTag = tag(BlockTags.TRAPDOORS); + final var woodenButtonsTag = tag(BlockTags.WOODEN_BUTTONS); + final var woodenDoorsTag = tag(BlockTags.WOODEN_DOORS); + final var woodenFencesTag = tag(BlockTags.WOODEN_FENCES); + final var woodenPressurePlatesTag = tag(BlockTags.WOODEN_PRESSURE_PLATES); + final var woodenSlabsTag = tag(BlockTags.WOODEN_SLABS); + final var woodenStairsTag = tag(BlockTags.WOODEN_STAIRS); + final var woodenTrapdoorsTag = tag(BlockTags.WOODEN_TRAPDOORS); + for (BYGWoodTypes type : BYGWoodTypes.values()) { + tag(type.logTag().block(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); + logsThatBurn.addTag(type.logTag().block()); + logs.addTag(type.logTag().block()); + planksTag.add(type.planks().get()); + bookselvesTag.add(type.bookshelf().get()); + + planksTag.add(type.planks().get()); + trapdoorsTag.add(type.trapdoor().get()); + woodenButtonsTag.add(type.button().get()); + woodenDoorsTag.add(type.door().get()); + woodenFencesTag.add(type.fence().get()); + woodenPressurePlatesTag.add(type.pressurePlate().get()); + woodenSlabsTag.add(type.slab().get()); + woodenStairsTag.add(type.stairs().get()); + woodenTrapdoorsTag.add(type.trapdoor().get()); + } + + wood("withering_oak_logs", WITHERING_OAK_LOG, WITHERING_OAK_WOOD); + wood("palo_verde_logs", PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD); + + tag(BlockTags.OAK_LOGS, WITHERING_OAK_LOG, WITHERING_OAK_WOOD); + + sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); + } + + private static Predicate isMaterial(Material... materials) { + final var materialsList = List.of(materials); + return bl -> materialsList.contains(((BlockBehaviorAccess) bl).getMaterial()); + } + + @SafeVarargs + private void wood(String name, Supplier... blocks) { + final var tag = create(createLocation("wood/" + name)); + add(tag(tag), blocks); + logsThatBurn.addTag(tag); + logs.addTag(tag); + } + + private void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries() { + for (Tag.Builder value : this.builders.values()) { + List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); + + Set noDuplicates = new HashSet<>(builderEntries); + builderEntries.clear(); + builderEntries.addAll(noDuplicates); + Collections.sort(builderEntries, Comparator.comparing(builderEntry -> builderEntry.entry().toString())); + } + } + + @SafeVarargs + @SuppressWarnings("ALL") + private void tag(TagKey tag, Supplier... blocks) { + this.tag(tag).add(Arrays.stream(blocks).filter(Objects::nonNull).map(Supplier::get).toArray(Block[]::new)); + } + + @SafeVarargs + private void add(TagAppender tag, Supplier... values) { + for (final var sup : values) + if (sup != null) + tag.add(sup.get()); + } + + @Override + public String getName() { + return "BYG Block Tags"; + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java new file mode 100644 index 0000000000..75dcb6b92c --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java @@ -0,0 +1,22 @@ +package potionstudios.byg.datagen.providers.tag; + +import net.minecraft.core.Registry; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.tags.TagKey; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import potionstudios.byg.BYG; +import potionstudios.byg.common.entity.BYGEntities; + +public class BYGEntityTagsProvider extends EntityTypeTagsProvider { + public BYGEntityTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { + super(pGenerator, BYG.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + final var boatTag = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, BYG.createLocation("boats")); + tag(boatTag).add(BYGEntities.BOAT.get()); + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java new file mode 100644 index 0000000000..77f7b919f4 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -0,0 +1,110 @@ +package potionstudios.byg.datagen.providers.tag; + +import static net.minecraft.tags.ItemTags.create; +import static potionstudios.byg.BYG.createLocation; +import static potionstudios.byg.common.block.BYGBlocks.*; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.ButtonBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.material.Material; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.datagen.util.PredicatedTagProvider; +import potionstudios.byg.mixin.dev.BlockBehaviorAccess; +import potionstudios.byg.reg.RegistryObject; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.function.Supplier; + +public class BYGItemTagsProvider extends ItemTagsProvider { + private final TagAppender logsThatBurn = tag(ItemTags.LOGS_THAT_BURN); + private final TagAppender logs = tag(ItemTags.LOGS); + + public BYGItemTagsProvider(DataGenerator p_126530_, BlockTagsProvider p_126531_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_126530_, p_126531_, BYG.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags() { + final var planksTag = tag(ItemTags.PLANKS); + final var bookshelvesTag = tag(create(createLocation("bookshelves"))); + final var trapdoorsTag = tag(ItemTags.TRAPDOORS); + final var woodenButtonsTag = tag(ItemTags.WOODEN_BUTTONS); + final var woodenDoorsTag = tag(ItemTags.WOODEN_DOORS); + final var woodenFencesTag = tag(ItemTags.WOODEN_FENCES); + final var woodenPressurePlatesTag = tag(ItemTags.WOODEN_PRESSURE_PLATES); + final var woodenSlabsTag = tag(ItemTags.WOODEN_SLABS); + final var woodenStairsTag = tag(ItemTags.WOODEN_STAIRS); + final var woodenTrapdoorsTag = tag(ItemTags.WOODEN_TRAPDOORS); + for (BYGWoodTypes type : BYGWoodTypes.values()) { + tag(type.logTag().item(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); + logs.addTag(type.logTag().item()); + logsThatBurn.addTag(type.logTag().item()); + bookshelvesTag.add(type.bookshelf().get().asItem()); + + planksTag.add(type.planks().get().asItem()); + trapdoorsTag.add(type.trapdoor().get().asItem()); + woodenButtonsTag.add(type.button().get().asItem()); + woodenDoorsTag.add(type.door().get().asItem()); + woodenFencesTag.add(type.fence().get().asItem()); + woodenPressurePlatesTag.add(type.pressurePlate().get().asItem()); + woodenSlabsTag.add(type.slab().get().asItem()); + woodenStairsTag.add(type.stairs().get().asItem()); + woodenTrapdoorsTag.add(type.trapdoor().get().asItem()); + } + + new PredicatedTagProvider<>(BYGItems.PROVIDER) + .add(checkBlockItem(StairBlock.class), ItemTags.STAIRS) + .add(checkBlockItem(SlabBlock.class), ItemTags.SLABS) + .add(checkBlockItem(ButtonBlock.class), ItemTags.BUTTONS) + .add(isMaterial(Material.LEAVES), ItemTags.LEAVES) + .add(isMaterial(Material.SAND), ItemTags.SAND) + .run(super::tag); + + final var saplingsTag = tag(ItemTags.SAPLINGS); + BYGItems.SAPLINGS.stream().map(RegistryObject::get).forEach(saplingsTag::add); + + wood("withering_oak_logs", WITHERING_OAK_LOG, WITHERING_OAK_WOOD); + wood("palo_verde_logs", PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD); + } + + @SafeVarargs + private void wood(String name, Supplier... items) { + final var tag = create(createLocation("wood/" + name)); + tag(tag, items); + logsThatBurn.addTag(tag); + logs.addTag(tag); + } + + private static Predicate isMaterial(Material... materials) { + final var materialsList = List.of(materials); + return it -> it instanceof BlockItem bi && materialsList.contains(((BlockBehaviorAccess) bi.getBlock()).getMaterial()); + } + + private static Predicate checkBlockItem(Class blockClazz) { + return item -> item instanceof BlockItem bi && blockClazz.isInstance(bi.getBlock()); + } + + @SafeVarargs + @SuppressWarnings("ALL") + private void tag(TagKey tag, Supplier... items) { + this.tag(tag).add(Arrays.stream(items).filter(Objects::nonNull).map(Supplier::get).map(ItemLike::asItem).toArray(Item[]::new)); + } + +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/util/PredicatedTagProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/util/PredicatedTagProvider.java new file mode 100644 index 0000000000..9848ffafa7 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/util/PredicatedTagProvider.java @@ -0,0 +1,41 @@ +package potionstudios.byg.datagen.util; + +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.tags.TagKey; +import potionstudios.byg.reg.RegistrationProvider; +import potionstudios.byg.reg.RegistryObject; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import java.util.function.Predicate; + +public class PredicatedTagProvider { + private final RegistrationProvider provider; + private final List> predicates = new ArrayList<>(); + + public PredicatedTagProvider(RegistrationProvider provider) { + this.provider = provider; + } + + public PredicatedTagProvider forInstance(Class clazz, TagKey tag) { + this.predicates.add(new Info<>(clazz::isInstance, tag)); + return this; + } + + public PredicatedTagProvider add(Predicate predicate, TagKey tag) { + this.predicates.add(new Info<>(predicate, tag)); + return this; + } + + public void run(Function, TagsProvider.TagAppender> function) { + this.provider.getEntries().stream() + .map(RegistryObject::get) + .forEach(obj -> predicates.forEach(info -> { + if (info.predicate.test(obj)) + function.apply(info.tag()).add(obj); + })); + } + + private record Info(Predicate predicate, TagKey tag) {} +} diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java deleted file mode 100644 index f9fa4a7628..0000000000 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ /dev/null @@ -1,143 +0,0 @@ -package potionstudios.byg.datagen.providers; - -import static potionstudios.byg.common.block.BYGBlocks.BULBIS_PHYCELIUM; -import static potionstudios.byg.common.block.BYGBlocks.ETHER_STONE; -import static potionstudios.byg.common.block.BYGBlocks.IMPARIUS_PHYLIUM; -import static potionstudios.byg.common.block.BYGBlocks.IVIS_PHYLIUM; -import static potionstudios.byg.common.block.BYGBlocks.LUSH_FARMLAND; -import static potionstudios.byg.common.block.BYGBlocks.LUSH_GRASS_BLOCK; -import static potionstudios.byg.common.block.BYGBlocks.LUSH_GRASS_PATH; -import static potionstudios.byg.common.block.BYGBlocks.MUD_BLOCK; -import static potionstudios.byg.common.block.BYGBlocks.NIGHTSHADE_PHYLIUM; -import static potionstudios.byg.common.block.BYGBlocks.PROVIDER; -import static potionstudios.byg.common.block.BYGBlocks.SHULKREN_PHYLIUM; -import net.minecraft.core.Registry; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; -import net.minecraft.data.tags.TagsProvider; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.material.Material; -import net.minecraftforge.common.data.ExistingFileHelper; -import org.jetbrains.annotations.Nullable; -import potionstudios.byg.BYG; -import potionstudios.byg.common.block.BYGBlockTags; -import potionstudios.byg.common.block.BYGWoodType; -import potionstudios.byg.common.block.BYGWoodTypes; -import potionstudios.byg.mixin.access.TagBuilderAccess; -import potionstudios.byg.mixin.dev.BlockBehaviorAccess; -import potionstudios.byg.reg.RegistryObject; - -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; - -@SuppressWarnings("ALL") -public class BYGBlockTagsProvider extends BlockTagsProvider { - - public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { - super(pGenerator, BYG.MOD_ID, existingFileHelper); - } - - // TODO document what gets generated - @Override - protected void addTags() { - tag( - BYGBlockTags.LUSH, - LUSH_GRASS_PATH, LUSH_GRASS_BLOCK, LUSH_FARMLAND - ); - tag(BYGBlockTags.GROUND_MANGROVE_TREE).addTags(BlockTags.DIRT, BlockTags.SAND).add(MUD_BLOCK.get(), Blocks.CLAY); - - final var slabsTag = super.tag(BYGBlockTags.SLABS); - PROVIDER.getEntries() - .stream() - .map(RegistryObject::get) - .filter(SlabBlock.class::isInstance) - .forEach(slabsTag::add); - - tag(BYGBlockTags.END_STONE).add(ETHER_STONE.get(), BULBIS_PHYCELIUM.get(), NIGHTSHADE_PHYLIUM.get(), IMPARIUS_PHYLIUM.get(), IVIS_PHYLIUM.get(), SHULKREN_PHYLIUM.get(), Blocks.END_STONE); - - for (TagKey netherPlantTag : BYGBlockTags.END_PLANT_TAGS) { - tag(netherPlantTag).add(Blocks.END_STONE).addTag(BYGBlockTags.END_STONE) - .addOptionalTag(new ResourceLocation("c", "end_stones")) - .addOptionalTag(new ResourceLocation("forge", "end_stones")); - } - - for (TagKey netherPlantTag : BYGBlockTags.NETHER_PLANT_TAGS) { - tag(netherPlantTag).addTag(BlockTags.NYLIUM).add(Blocks.MYCELIUM).add(Blocks.SOUL_SOIL); - } - - for (TagKey plantTag : BYGBlockTags.PLANT_TAGS) { - this.tag(plantTag).addTag(BlockTags.DIRT); - } - for (TagKey plantTag : BYGBlockTags.MUSHROOM_TAGS) { - this.tag(plantTag).addTag(BlockTags.MUSHROOM_GROW_BLOCK).addTag(BlockTags.DIRT).addTags(BlockTags.BASE_STONE_OVERWORLD); - } - - for (TagKey desertPlantTag : BYGBlockTags.SAND_PLANT_TAGS) { - this.tag(desertPlantTag).addTag(BlockTags.SAND); - } - this.tag(BYGBlockTags.GROUND_PALM_SAPLING).addTag(BlockTags.SAND).addTag(BlockTags.DIRT); - this.tag(BYGBlockTags.GROUND_FAIRY_SLIPPER).addTag(BlockTags.LOGS); - - final var shovelMaterials = List.of(Material.DIRT, Material.GRASS, Material.SAND, Material.CLAY); - final var shovelMinable = tag(BlockTags.MINEABLE_WITH_SHOVEL); - PROVIDER.getEntries() - .stream() - .map(RegistryObject::get) - .filter(bl -> shovelMaterials.contains(((BlockBehaviorAccess) bl).getMaterial())) - .forEach(shovelMinable::add); - -// For now, until we get all wood moved -// final var axeMineable = tag(BlockTags.MINEABLE_WITH_AXE); -// for (BYGWoodTypes type : BYGWoodTypes.values()) { -// add(axeMineable, type.bookshelf(), type.button(), type.craftingTable(), type.door(), type.trapdoor(), type.planks(), type.fence(), type.fenceGate(), type.log(), type.wood(), type.strippedLog(), type.strippedWood(), type.pressurePlate(), type.sign(), type.wallSign(), type -// .slab(), type.stairs()); -// } - - for (BYGWoodTypes type : BYGWoodTypes.values()) { - add(tag(TagKey.create(Registry.BLOCK_REGISTRY, BYG.createLocation("wood/" + type + "_logs"))), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); - } - - sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); - } - - private void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries() { - for (Tag.Builder value : this.builders.values()) { - List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); - - Set noDuplicates = new HashSet<>(builderEntries); - builderEntries.clear(); - builderEntries.addAll(noDuplicates); - Collections.sort(builderEntries, Comparator.comparing(builderEntry -> builderEntry.entry().toString())); - } - } - - @SafeVarargs - @SuppressWarnings("ALL") - private void tag(TagKey tag, Supplier... blocks) { - this.tag(tag).add(Arrays.stream(blocks).filter(Objects::nonNull).map(Supplier::get).toArray(Block[]::new)); - } - - @SafeVarargs - private void add(TagAppender tag, Supplier... values) { - for (final var sup : values) - if (sup != null) - tag.add(sup.get()); - } - - @Override - public String getName() { - return "BYG Block Tags"; - } -} diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java deleted file mode 100644 index 0fcd1a63eb..0000000000 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGItemTagsProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -package potionstudios.byg.datagen.providers; - -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; -import net.minecraft.data.tags.ItemTagsProvider; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; -import org.jetbrains.annotations.Nullable; -import potionstudios.byg.BYG; -import potionstudios.byg.common.block.BYGWoodTypes; - -import java.util.Arrays; -import java.util.Objects; -import java.util.function.Supplier; - -public class BYGItemTagsProvider extends ItemTagsProvider { - public BYGItemTagsProvider(DataGenerator p_126530_, BlockTagsProvider p_126531_, @Nullable ExistingFileHelper existingFileHelper) { - super(p_126530_, p_126531_, BYG.MOD_ID, existingFileHelper); - } - - @Override - protected void addTags() { - for (BYGWoodTypes type : BYGWoodTypes.values()) { - tag(type.logTag(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); - } - } - - @SafeVarargs - @SuppressWarnings("ALL") - private void tag(TagKey tag, Supplier... items) { - this.tag(tag).add(Arrays.stream(items).filter(Objects::nonNull).map(Supplier::get).map(ItemLike::asItem).toArray(Item[]::new)); - } -} diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json b/Forge/src/main/resources/data/forge/tags/entity_types/boats.json similarity index 70% rename from Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json rename to Forge/src/main/resources/data/forge/tags/entity_types/boats.json index a22514f66a..4abb011202 100644 --- a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json +++ b/Forge/src/main/resources/data/forge/tags/entity_types/boats.json @@ -1,5 +1,6 @@ { "replace": false, "values": [ + "#byg:boats" ] } \ No newline at end of file From 0baced16431620ad9a6a08389b28865b283058d8 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Fri, 27 May 2022 23:59:41 +0300 Subject: [PATCH 58/90] Docs --- .../minecraft/tags/blocks/mineable/axe.json | 429 ------------------ Forge/src/data/README.md | 14 + .../providers/tag/BYGBlockTagsProvider.java | 1 - 3 files changed, 14 insertions(+), 430 deletions(-) delete mode 100644 Common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 Forge/src/data/README.md diff --git a/Common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/Common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index 23bd3625f7..0000000000 --- a/Common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,429 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:aspen_planks", - "byg:baobab_planks", - "byg:blue_enchanted_planks", - "byg:cherry_planks", - "byg:cika_planks", - "byg:cypress_planks", - "byg:ebony_planks", - "byg:fir_planks", - "byg:green_enchanted_planks", - "byg:holly_planks", - "byg:jacaranda_planks", - "byg:mahogany_planks", - "byg:mangrove_planks", - "byg:maple_planks", - "byg:pine_planks", - "byg:rainbow_eucalyptus_planks", - "byg:redwood_planks", - "byg:skyris_planks", - "byg:willow_planks", - "byg:witch_hazel_planks", - "byg:zelkova_planks", - "byg:sythian_planks", - "byg:embur_planks", - "byg:palm_planks", - "byg:lament_planks", - "byg:bulbis_planks", - "byg:nightshade_planks", - "byg:ether_planks", - "byg:imparius_planks", - "byg:aspen_bookshelf", - "byg:baobab_bookshelf", - "byg:blue_enchanted_bookshelf", - "byg:cherry_bookshelf", - "byg:cika_bookshelf", - "byg:cypress_bookshelf", - "byg:ebony_bookshelf", - "byg:fir_bookshelf", - "byg:green_enchanted_bookshelf", - "byg:holly_bookshelf", - "byg:jacaranda_bookshelf", - "byg:mahogany_bookshelf", - "byg:mangrove_bookshelf", - "byg:maple_bookshelf", - "byg:pine_bookshelf", - "byg:rainbow_eucalyptus_bookshelf", - "byg:redwood_bookshelf", - "byg:skyris_bookshelf", - "byg:willow_bookshelf", - "byg:witch_hazel_bookshelf", - "byg:zelkova_bookshelf", - "byg:sythian_bookshelf", - "byg:embur_bookshelf", - "byg:palm_bookshelf", - "byg:lament_bookshelf", - "byg:bulbis_bookshelf", - "byg:nightshade_bookshelf", - "byg:ether_bookshelf", - "byg:imparius_bookshelf", - "byg:aspen_door", - "byg:baobab_door", - "byg:blue_enchanted_door", - "byg:cherry_door", - "byg:cika_door", - "byg:cypress_door", - "byg:ebony_door", - "byg:fir_door", - "byg:green_enchanted_door", - "byg:holly_door", - "byg:jacaranda_door", - "byg:mahogany_door", - "byg:mangrove_door", - "byg:maple_door", - "byg:pine_door", - "byg:rainbow_eucalyptus_door", - "byg:redwood_door", - "byg:skyris_door", - "byg:willow_door", - "byg:witch_hazel_door", - "byg:zelkova_door", - "byg:sythian_door", - "byg:embur_door", - "byg:palm_door", - "byg:lament_door", - "byg:bulbis_door", - "byg:nightshade_door", - "byg:ether_door", - "byg:imparius_door", - "byg:aspen_pressure_plate", - "byg:baobab_pressure_plate", - "byg:blue_enchanted_pressure_plate", - "byg:cherry_pressure_plate", - "byg:cika_pressure_plate", - "byg:cypress_pressure_plate", - "byg:ebony_pressure_plate", - "byg:fir_pressure_plate", - "byg:green_enchanted_pressure_plate", - "byg:holly_pressure_plate", - "byg:jacaranda_pressure_plate", - "byg:mahogany_pressure_plate", - "byg:mangrove_pressure_plate", - "byg:maple_pressure_plate", - "byg:pine_pressure_plate", - "byg:rainbow_eucalyptus_pressure_plate", - "byg:redwood_pressure_plate", - "byg:skyris_pressure_plate", - "byg:willow_pressure_plate", - "byg:witch_hazel_pressure_plate", - "byg:zelkova_pressure_plate", - "byg:sythian_pressure_plate", - "byg:embur_pressure_plate", - "byg:palm_pressure_plate", - "byg:lament_pressure_plate", - "byg:bulbis_pressure_plate", - "byg:nightshade_pressure_plate", - "byg:ether_pressure_plate", - "byg:imparius_pressure_plate", - "byg:aspen_trapdoor", - "byg:baobab_trapdoor", - "byg:blue_enchanted_trapdoor", - "byg:cherry_trapdoor", - "byg:cika_trapdoor", - "byg:cypress_trapdoor", - "byg:ebony_trapdoor", - "byg:fir_trapdoor", - "byg:green_enchanted_trapdoor", - "byg:holly_trapdoor", - "byg:jacaranda_trapdoor", - "byg:mahogany_trapdoor", - "byg:mangrove_trapdoor", - "byg:maple_trapdoor", - "byg:pine_trapdoor", - "byg:rainbow_eucalyptus_trapdoor", - "byg:redwood_trapdoor", - "byg:skyris_trapdoor", - "byg:willow_trapdoor", - "byg:witch_hazel_trapdoor", - "byg:zelkova_trapdoor", - "byg:sythian_trapdoor", - "byg:embur_trapdoor", - "byg:palm_trapdoor", - "byg:lament_trapdoor", - "byg:bulbis_trapdoor", - "byg:nightshade_trapdoor", - "byg:ether_trapdoor", - "byg:imparius_trapdoor", - "byg:aspen_crafting_table", - "byg:baobab_crafting_table", - "byg:blue_enchanted_crafting_table", - "byg:cherry_crafting_table", - "byg:cika_crafting_table", - "byg:cypress_crafting_table", - "byg:ebony_crafting_table", - "byg:fir_crafting_table", - "byg:green_enchanted_crafting_table", - "byg:holly_crafting_table", - "byg:jacaranda_crafting_table", - "byg:mahogany_crafting_table", - "byg:mangrove_crafting_table", - "byg:maple_crafting_table", - "byg:pine_crafting_table", - "byg:rainbow_eucalyptus_crafting_table", - "byg:redwood_crafting_table", - "byg:skyris_crafting_table", - "byg:willow_crafting_table", - "byg:witch_hazel_crafting_table", - "byg:zelkova_crafting_table", - "byg:sythian_crafting_table", - "byg:embur_crafting_table", - "byg:palm_crafting_table", - "byg:lament_crafting_table", - "byg:bulbis_crafting_table", - "byg:nightshade_crafting_table", - "byg:ether_crafting_table", - "byg:imparius_crafting_table", - "byg:aspen_fence_gate", - "byg:baobab_fence_gate", - "byg:blue_enchanted_fence_gate", - "byg:cherry_fence_gate", - "byg:cika_fence_gate", - "byg:cypress_fence_gate", - "byg:ebony_fence_gate", - "byg:fir_fence_gate", - "byg:green_enchanted_fence_gate", - "byg:holly_fence_gate", - "byg:jacaranda_fence_gate", - "byg:mahogany_fence_gate", - "byg:mangrove_fence_gate", - "byg:maple_fence_gate", - "byg:pine_fence_gate", - "byg:rainbow_eucalyptus_fence_gate", - "byg:redwood_fence_gate", - "byg:skyris_fence_gate", - "byg:willow_fence_gate", - "byg:witch_hazel_fence_gate", - "byg:zelkova_fence_gate", - "byg:sythian_fence_gate", - "byg:embur_fence_gate", - "byg:palm_fence_gate", - "byg:lament_fence_gate", - "byg:bulbis_fence_gate", - "byg:nightshade_fence_gate", - "byg:ether_fence_gate", - "byg:imparius_fence_gate", - "byg:aspen_slab", - "byg:baobab_slab", - "byg:blue_enchanted_slab", - "byg:cherry_slab", - "byg:cika_slab", - "byg:cypress_slab", - "byg:ebony_slab", - "byg:fir_slab", - "byg:green_enchanted_slab", - "byg:holly_slab", - "byg:jacaranda_slab", - "byg:mahogany_slab", - "byg:mangrove_slab", - "byg:maple_slab", - "byg:pine_slab", - "byg:rainbow_eucalyptus_slab", - "byg:redwood_slab", - "byg:skyris_slab", - "byg:willow_slab", - "byg:witch_hazel_slab", - "byg:zelkova_slab", - "byg:sythian_slab", - "byg:embur_slab", - "byg:palm_slab", - "byg:lament_slab", - "byg:bulbis_slab", - "byg:nightshade_slab", - "byg:ether_slab", - "byg:imparius_slab", - "byg:aspen_stairs", - "byg:baobab_stairs", - "byg:blue_enchanted_stairs", - "byg:cherry_stairs", - "byg:cika_stairs", - "byg:cypress_stairs", - "byg:ebony_stairs", - "byg:fir_stairs", - "byg:green_enchanted_stairs", - "byg:holly_stairs", - "byg:jacaranda_stairs", - "byg:mahogany_stairs", - "byg:mangrove_stairs", - "byg:maple_stairs", - "byg:pine_stairs", - "byg:rainbow_eucalyptus_stairs", - "byg:redwood_stairs", - "byg:skyris_stairs", - "byg:willow_stairs", - "byg:witch_hazel_stairs", - "byg:zelkova_stairs", - "byg:sythian_stairs", - "byg:embur_stairs", - "byg:palm_stairs", - "byg:lament_stairs", - "byg:bulbis_stairs", - "byg:nightshade_stairs", - "byg:ether_stairs", - "byg:imparius_stairs", - "byg:aspen_fence", - "byg:baobab_fence", - "byg:blue_enchanted_fence", - "byg:cherry_fence", - "byg:cika_fence", - "byg:cypress_fence", - "byg:ebony_fence", - "byg:fir_fence", - "byg:green_enchanted_fence", - "byg:holly_fence", - "byg:jacaranda_fence", - "byg:mahogany_fence", - "byg:mangrove_fence", - "byg:maple_fence", - "byg:pine_fence", - "byg:rainbow_eucalyptus_fence", - "byg:redwood_fence", - "byg:skyris_fence", - "byg:willow_fence", - "byg:witch_hazel_fence", - "byg:zelkova_fence", - "byg:sythian_fence", - "byg:embur_fence", - "byg:palm_fence", - "byg:lament_fence", - "byg:bulbis_fence", - "byg:nightshade_fence", - "byg:ether_fence", - "byg:imparius_fence", - "byg:green_mushroom_block", - "byg:weeping_milkcap_mushroom_block", - "byg:wood_blewit_mushroom_block", - "byg:white_mushroom_stem", - "byg:brown_mushroom_stem", - "byg:soul_shroom_stem", - "byg:soul_shroom_block", - "byg:death_cap_mushroom_block", - "byg:boric_campfire", - "byg:cryptic_campfire", - "byg:plant_stem", - "byg:aspen_log", - "byg:baobab_log", - "byg:blue_enchanted_log", - "byg:cherry_log", - "byg:cika_log", - "byg:cypress_log", - "byg:ebony_log", - "byg:fir_log", - "byg:green_enchanted_log", - "byg:holly_log", - "byg:jacaranda_log", - "byg:mahogany_log", - "byg:mangrove_log", - "byg:maple_log", - "byg:palo_verde_log", - "byg:pine_log", - "byg:rainbow_eucalyptus_log", - "byg:redwood_log", - "byg:skyris_log", - "byg:willow_log", - "byg:witch_hazel_log", - "byg:zelkova_log", - "byg:sythian_stem", - "byg:embur_pedu", - "byg:palm_log", - "byg:lament_log", - "byg:withering_oak_log", - "byg:bulbis_stem", - "byg:nightshade_log", - "byg:imbued_nightshade_log", - "byg:ether_log", - "byg:imparius_stem", - "byg:fungal_imparius_stem", - "byg:aspen_wood", - "byg:baobab_wood", - "byg:blue_enchanted_wood", - "byg:cherry_wood", - "byg:cika_wood", - "byg:cypress_wood", - "byg:ebony_wood", - "byg:fir_wood", - "byg:green_enchanted_wood", - "byg:holly_wood", - "byg:jacaranda_wood", - "byg:mahogany_wood", - "byg:mangrove_wood", - "byg:maple_wood", - "byg:palo_verde_wood", - "byg:pine_wood", - "byg:rainbow_eucalyptus_wood", - "byg:redwood_wood", - "byg:skyris_wood", - "byg:willow_wood", - "byg:witch_hazel_wood", - "byg:zelkova_wood", - "byg:sythian_hyphae", - "byg:embur_hyphae", - "byg:palm_wood", - "byg:lament_wood", - "byg:withering_oak_wood", - "byg:bulbis_wood", - "byg:nightshade_wood", - "byg:ether_wood", - "byg:imparius_hyphae", - "byg:fungal_imparius_hyphae", - "byg:stripped_aspen_log", - "byg:stripped_baobab_log", - "byg:stripped_blue_enchanted_log", - "byg:stripped_cherry_log", - "byg:stripped_cika_log", - "byg:stripped_cypress_log", - "byg:stripped_ebony_log", - "byg:stripped_fir_log", - "byg:stripped_green_enchanted_log", - "byg:stripped_holly_log", - "byg:stripped_jacaranda_log", - "byg:stripped_mahogany_log", - "byg:stripped_mangrove_log", - "byg:stripped_maple_log", - "byg:stripped_palo_verde_log", - "byg:stripped_pine_log", - "byg:stripped_rainbow_eucalyptus_log", - "byg:stripped_skyris_log", - "byg:stripped_willow_log", - "byg:stripped_redwood_log", - "byg:stripped_witch_hazel_log", - "byg:stripped_zelkova_log", - "byg:stripped_sythian_stem", - "byg:stripped_embur_pedu", - "byg:stripped_palm_log", - "byg:stripped_lament_log", - "byg:stripped_bulbis_stem", - "byg:stripped_nightshade_log", - "byg:stripped_ether_log", - "byg:stripped_aspen_wood", - "byg:stripped_baobab_wood", - "byg:stripped_blue_enchanted_wood", - "byg:stripped_cherry_wood", - "byg:stripped_cika_wood", - "byg:stripped_cypress_wood", - "byg:stripped_ebony_wood", - "byg:stripped_fir_wood", - "byg:stripped_green_enchanted_wood", - "byg:stripped_holly_wood", - "byg:stripped_jacaranda_wood", - "byg:stripped_mahogany_wood", - "byg:stripped_mangrove_wood", - "byg:stripped_maple_wood", - "byg:stripped_palo_verde_wood", - "byg:stripped_pine_wood", - "byg:stripped_rainbow_eucalyptus_wood", - "byg:stripped_skyris_wood", - "byg:stripped_willow_wood", - "byg:stripped_redwood_wood", - "byg:stripped_witch_hazel_wood", - "byg:stripped_zelkova_wood", - "byg:stripped_sythian_hyphae", - "byg:stripped_embur_hyphae", - "byg:stripped_palm_wood", - "byg:stripped_lament_wood", - "byg:stripped_bulbis_wood", - "byg:stripped_nightshade_wood", - "byg:stripped_ether_wood" - ] -} \ No newline at end of file diff --git a/Forge/src/data/README.md b/Forge/src/data/README.md new file mode 100644 index 0000000000..540cfee52a --- /dev/null +++ b/Forge/src/data/README.md @@ -0,0 +1,14 @@ +This sourceset holds datagen for BYG. +# Files generated: +- Assets, recipes and tags for wood types from BYGWoodTypes. See `Common/src/main/resources/byg/textures/block/aspen`, which contains the textures needed for generating wood textures; +- The `minecraft:mineable/shovel` tag, which contains all BYG blocks that have one of the following materials: + - DIRT + - GRASS + - SAND + - CLAY +- The `minecraft:slabs`, `minecraft:buttons`, `minecraft:stairs`, `byg:mushrooms`, `minecraft:campfire`, `minecraft:wart_blocks` and `minecraft:wart_blocks` tags for both blocks and items, generated using an `block instanceof StairBlock` and `blockItem.getBlock() instanceof StairBlock` respectively; +- The `minecraft:leaves` containing all BYG blocks with the material `LEAVES`; +- The `minecraft:sand` containing all BYG blocks with the material `SAND`; +- Biome tags based on `BYGBiomeTypes`. + +(Note: The above list may not contain all files generated, see the sources for the "entire" list.) \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java index 30fcda01ed..c9f9ae57f1 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -49,7 +49,6 @@ public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelp super(pGenerator, BYG.MOD_ID, existingFileHelper); } - // TODO document what gets generated @Override protected void addTags() { tag( From d8c9b5055bc0bdc859c7e1935cde9eafcf0a512e Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 11:32:15 +0300 Subject: [PATCH 59/90] Datagen loottables --- .../byg/blockstates/bulbis_anomaly.json | 4 +- .../assets/byg/blockstates/ether_grass.json | 2 +- .../blockstates/potted_hydrangea_bush.json | 7 + .../blockstates/purple_bulbis_anomaly.json | 2 +- .../models/block/potted_hydrangea_bush.json | 6 + .../models/block/potted_jacaranda_bush.json | 6 + .../assets/byg/models/item/bulbis_shell.json | 2 +- .../byg/models/item/holly_berry_leaves.json | 2 +- .../loot_tables/blocks/aspen_bookshelf.json | 47 ------- .../byg/loot_tables/blocks/aspen_button.json | 19 --- .../blocks/aspen_crafting_table.json | 19 --- .../byg/loot_tables/blocks/aspen_door.json | 28 ---- .../byg/loot_tables/blocks/aspen_fence.json | 19 --- .../loot_tables/blocks/aspen_fence_gate.json | 19 --- .../byg/loot_tables/blocks/aspen_leaves.json | 128 ------------------ .../byg/loot_tables/blocks/aspen_log.json | 19 --- .../byg/loot_tables/blocks/aspen_planks.json | 19 --- .../blocks/aspen_pressure_plate.json | 19 --- .../byg/loot_tables/blocks/aspen_sapling.json | 19 --- .../byg/loot_tables/blocks/aspen_slab.json | 32 ----- .../byg/loot_tables/blocks/aspen_stairs.json | 19 --- .../loot_tables/blocks/aspen_trapdoor.json | 19 --- .../byg/loot_tables/blocks/aspen_wood.json | 19 --- .../potionstudios/byg/datagen/BYGDataGen.java | 2 + .../providers/loot/BYGBlockLootProvider.java | 51 +++++++ .../providers/loot/BYGLootTablesProvider.java | 29 ++++ 26 files changed, 107 insertions(+), 450 deletions(-) create mode 100644 Common/src/main/resources/assets/byg/blockstates/potted_hydrangea_bush.json create mode 100644 Common/src/main/resources/assets/byg/models/block/potted_hydrangea_bush.json create mode 100644 Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_button.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_door.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_leaves.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_log.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_planks.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_slab.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_stairs.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_wood.json create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json index e9921dc6f6..0a116f7043 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_anomaly.json @@ -1,10 +1,10 @@ { "variants": { "half=lower": { - "model": "byg:block/bulbis/anomaly_bottom" + "model": "byg:block/bulbis_anomaly_bottom" }, "half=upper": { - "model": "byg:block/bulbis/anomaly_top" + "model": "byg:block/bulbis_anomaly_top" } } } diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_grass.json b/Common/src/main/resources/assets/byg/blockstates/ether_grass.json index 9e2a965411..032c9fa8e3 100644 --- a/Common/src/main/resources/assets/byg/blockstates/ether_grass.json +++ b/Common/src/main/resources/assets/byg/blockstates/ether_grass.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/ether/grass" + "model": "byg:block/ether_grass" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/potted_hydrangea_bush.json b/Common/src/main/resources/assets/byg/blockstates/potted_hydrangea_bush.json new file mode 100644 index 0000000000..9f2ebd0a19 --- /dev/null +++ b/Common/src/main/resources/assets/byg/blockstates/potted_hydrangea_bush.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/potted_hydrangea_bush" + } + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json b/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json index 1503047cf1..84ce2df0f4 100644 --- a/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json +++ b/Common/src/main/resources/assets/byg/blockstates/purple_bulbis_anomaly.json @@ -4,7 +4,7 @@ "model": "byg:block/purple_bulbis_anomaly_bottom" }, "half=upper": { - "model": "byg:block/purple_bulbis/anomaly_top" + "model": "byg:block/purple_bulbis_anomaly_top" } } } diff --git a/Common/src/main/resources/assets/byg/models/block/potted_hydrangea_bush.json b/Common/src/main/resources/assets/byg/models/block/potted_hydrangea_bush.json new file mode 100644 index 0000000000..b093a433d0 --- /dev/null +++ b/Common/src/main/resources/assets/byg/models/block/potted_hydrangea_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/hydrangea_bush" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json b/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json new file mode 100644 index 0000000000..24d3025da7 --- /dev/null +++ b/Common/src/main/resources/assets/byg/models/block/potted_jacaranda_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "byg:block/jacaranda_bush" + } +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json b/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json index 9b360f6315..fd51f9638a 100644 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json +++ b/Common/src/main/resources/assets/byg/models/item/bulbis_shell.json @@ -1,3 +1,3 @@ { - "parent": "byg:block/bulbis/shell" + "parent": "byg:block/bulbis_shell" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json b/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json index 774df362dc..928dfec2d6 100644 --- a/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json +++ b/Common/src/main/resources/assets/byg/models/item/holly_berry_leaves.json @@ -1,5 +1,5 @@ { - "parent": "byg:block/holly/berry_leaves", + "parent": "byg:block/holly_berry_leaves", "display": { "thirdperson": { "rotation": [ diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json deleted file mode 100644 index d2685f6fcc..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ], - "name": "byg:aspen_bookshelf" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:book" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_button.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_button.json deleted file mode 100644 index 97f116246e..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_button.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_button" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json deleted file mode 100644 index 16a30b3c57..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_crafting_table" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_door.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_door.json deleted file mode 100644 index c220dfaefd..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_door.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "byg:aspen_door", - "properties": { - "half": "lower" - } - } - ], - "name": "byg:aspen_door" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence.json deleted file mode 100644 index 728ac55240..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_fence" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json deleted file mode 100644 index 4d0cc99e9f..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_fence_gate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_leaves.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_leaves.json deleted file mode 100644 index 8197680347..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_leaves.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": ["minecraft:shears"] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "byg:aspen_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, - 0.05, - 0.05, - 0.05 - ] - } - ], - "name": "byg:aspen_sapling" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": ["minecraft:shears"] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_log.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_log.json deleted file mode 100644 index db00236f9b..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_log.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_planks.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_planks.json deleted file mode 100644 index e9b775bce7..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_planks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_planks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json deleted file mode 100644 index aaf58833d3..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_pressure_plate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sapling.json deleted file mode 100644 index 5cb5e20771..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sapling.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_slab.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_slab.json deleted file mode 100644 index 967f8ef704..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_slab.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "byg:aspen_slab", - "properties": { - "type": "double" - } - } - ], - "count": 2 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "byg:aspen_slab" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_stairs.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_stairs.json deleted file mode 100644 index a9d1fb23b8..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_stairs.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json deleted file mode 100644 index d976a4754c..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_trapdoor" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_wood.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_wood.json deleted file mode 100644 index 9c49e063fc..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_wood.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java index bc4468f240..66926a86cd 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java @@ -4,6 +4,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; +import potionstudios.byg.datagen.providers.loot.BYGLootTablesProvider; import potionstudios.byg.datagen.providers.tag.BYGBiomeTagsProvider; import potionstudios.byg.datagen.providers.BYGWoodAssetsProvider; import potionstudios.byg.datagen.providers.tag.BYGBlockTagsProvider; @@ -20,6 +21,7 @@ static void onDatagen(final GatherDataEvent event) { final var existingFileHelper = event.getExistingFileHelper(); if (event.includeServer()) { + gen.addProvider(new BYGLootTablesProvider(gen)); final var blockTags = new BYGBlockTagsProvider(gen, existingFileHelper); gen.addProvider(blockTags); gen.addProvider(new BYGItemTagsProvider(gen, blockTags, existingFileHelper)); diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java new file mode 100644 index 0000000000..82f520eb7e --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java @@ -0,0 +1,51 @@ +package potionstudios.byg.datagen.providers.loot; + +import net.minecraft.data.loot.BlockLoot; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import potionstudios.byg.common.block.BYGWoodTypes; + +import javax.annotation.Nullable; +import java.util.function.Function; +import java.util.function.Supplier; + +class BYGBlockLootProvider extends BlockLoot { + + private static final float[] NORMAL_LEAVES_SAPLING_CHANCES = new float[]{0.05F, 0.0625F, 0.083333336F, 0.1F}; + + @Override + protected void addTables() { + for (final BYGWoodTypes type : BYGWoodTypes.values()) { + add(type.bookshelf(), shelf -> createSingleItemTableWithSilkTouch(shelf, Items.BOOK, ConstantValue.exactly(3.0F))); + dropSelf(type.button()); + dropSelf(type.craftingTable()); + add(type.door(), BlockLoot::createDoorTable); + dropSelf(type.fence()); + dropSelf(type.fenceGate()); + add(type.leaves(), leaf -> createLeavesDrops(leaf, type.growerItem().get(), NORMAL_LEAVES_SAPLING_CHANCES)); + dropSelf(type.log()); + dropSelf(type.wood()); + dropSelf(type.strippedLog()); + dropSelf(type.strippedWood()); + dropSelf(type.planks()); + dropSelf(type.pressurePlate()); + dropSelf(type.growerItem()); + add(type.slab(), BlockLoot::createSlabItemTable); + dropSelf(type.stairs()); + dropSelf(type.trapdoor()); + } + } + + public void dropSelf(@Nullable Supplier pBlock) { + if (pBlock != null) + super.dropSelf(pBlock.get()); + } + + protected void add(@Nullable Supplier pBlock, Function pFactory) { + if (pBlock != null) + super.add(pBlock.get(), pFactory); + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java new file mode 100644 index 0000000000..c2a343be77 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java @@ -0,0 +1,29 @@ +package potionstudios.byg.datagen.providers.loot; + +import com.mojang.datafixers.util.Pair; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; + +public class BYGLootTablesProvider extends LootTableProvider { + public BYGLootTablesProvider(DataGenerator pGenerator) { + super(pGenerator); + } + + private final List>>, LootContextParamSet>> tables = List.of( + Pair.of(BYGBlockLootProvider::new, LootContextParamSets.BLOCK) + ); + + @Override + protected List>>, LootContextParamSet>> getTables() { + return tables; + } +} From 47e17441b55b94ad3079778635ec64dff5b95c4c Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 12:31:51 +0300 Subject: [PATCH 60/90] Loot tables --- Common/src/generated/resources/.cache/cache | 496 +++++++++++++++++- .../loot_tables/blocks/aspen_bookshelf.json | 49 ++ .../byg/loot_tables/blocks/aspen_button.json | 20 + .../blocks/aspen_crafting_table.json | 20 + .../byg/loot_tables/blocks/aspen_door.json | 29 + .../byg/loot_tables/blocks/aspen_fence.json | 20 + .../loot_tables/blocks/aspen_fence_gate.json | 20 + .../byg/loot_tables/blocks/aspen_leaves.json} | 75 +-- .../byg/loot_tables/blocks/aspen_log.json} | 5 +- .../byg/loot_tables/blocks/aspen_planks.json | 20 + .../blocks/aspen_pressure_plate.json | 20 + .../byg/loot_tables/blocks/aspen_sapling.json | 20 + .../byg/loot_tables/blocks/aspen_slab.json | 34 ++ .../byg/loot_tables/blocks/aspen_stairs.json | 20 + .../loot_tables/blocks/aspen_trapdoor.json | 20 + .../byg/loot_tables/blocks/aspen_wood.json} | 5 +- .../loot_tables/blocks/baobab_bookshelf.json | 6 +- .../byg/loot_tables/blocks/baobab_button.json | 3 +- .../blocks/baobab_crafting_table.json | 3 +- .../byg/loot_tables/blocks/baobab_door.json | 3 +- .../byg/loot_tables/blocks/baobab_fence.json | 3 +- .../loot_tables/blocks/baobab_fence_gate.json | 3 +- .../byg/loot_tables/blocks/baobab_leaves.json | 27 +- .../byg/loot_tables/blocks/baobab_log.json | 3 +- .../byg/loot_tables/blocks/baobab_planks.json | 3 +- .../blocks/baobab_pressure_plate.json | 3 +- .../loot_tables/blocks/baobab_sapling.json | 3 +- .../byg/loot_tables/blocks/baobab_slab.json | 6 +- .../byg/loot_tables/blocks/baobab_stairs.json | 3 +- .../loot_tables/blocks/baobab_trapdoor.json | 3 +- .../byg/loot_tables/blocks/baobab_wood.json | 3 +- .../blocks/blue_enchanted_bookshelf.json | 6 +- .../blocks/blue_enchanted_button.json | 3 +- .../blocks/blue_enchanted_crafting_table.json | 3 +- .../blocks/blue_enchanted_door.json | 3 +- .../blocks/blue_enchanted_fence.json | 3 +- .../blocks/blue_enchanted_fence_gate.json | 3 +- .../blocks/blue_enchanted_leaves.json | 27 +- .../blocks/blue_enchanted_log.json | 3 +- .../blocks/blue_enchanted_planks.json | 3 +- .../blocks/blue_enchanted_pressure_plate.json | 3 +- .../blocks/blue_enchanted_sapling.json | 3 +- .../blocks/blue_enchanted_slab.json | 6 +- .../blocks/blue_enchanted_stairs.json | 3 +- .../blocks/blue_enchanted_trapdoor.json | 3 +- .../blocks/blue_enchanted_wood.json | 3 +- .../loot_tables/blocks/bulbis_bookshelf.json | 6 +- .../byg/loot_tables/blocks/bulbis_button.json | 7 +- .../blocks/bulbis_crafting_table.json | 7 +- .../byg/loot_tables/blocks/bulbis_door.json | 3 +- .../byg/loot_tables/blocks/bulbis_fence.json | 7 +- .../loot_tables/blocks/bulbis_fence_gate.json | 7 +- .../byg/loot_tables/blocks/bulbis_oddity.json | 7 +- .../byg/loot_tables/blocks/bulbis_planks.json | 7 +- .../blocks/bulbis_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/bulbis_slab.json | 24 +- .../byg/loot_tables/blocks/bulbis_stairs.json | 7 +- .../byg/loot_tables/blocks/bulbis_stem.json | 7 +- .../loot_tables/blocks/bulbis_trapdoor.json | 7 +- .../byg/loot_tables/blocks/bulbis_wood.json | 7 +- .../loot_tables/blocks/cherry_bookshelf.json | 6 +- .../byg/loot_tables/blocks/cherry_button.json | 3 +- .../blocks/cherry_crafting_table.json | 3 +- .../byg/loot_tables/blocks/cherry_door.json | 3 +- .../byg/loot_tables/blocks/cherry_fence.json | 3 +- .../loot_tables/blocks/cherry_fence_gate.json | 3 +- .../byg/loot_tables/blocks/cherry_log.json | 3 +- .../byg/loot_tables/blocks/cherry_planks.json | 3 +- .../blocks/cherry_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/cherry_slab.json | 6 +- .../byg/loot_tables/blocks/cherry_stairs.json | 3 +- .../loot_tables/blocks/cherry_trapdoor.json | 3 +- .../byg/loot_tables/blocks/cherry_wood.json | 3 +- .../loot_tables/blocks/cika_bookshelf.json | 6 +- .../byg/loot_tables/blocks/cika_button.json | 3 +- .../blocks/cika_crafting_table.json | 3 +- .../byg/loot_tables/blocks/cika_door.json | 3 +- .../byg/loot_tables/blocks/cika_fence.json | 3 +- .../loot_tables/blocks/cika_fence_gate.json | 3 +- .../byg/loot_tables/blocks/cika_leaves.json | 27 +- .../data/byg/loot_tables/blocks/cika_log.json | 3 +- .../byg/loot_tables/blocks/cika_planks.json | 3 +- .../blocks/cika_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/cika_sapling.json | 3 +- .../byg/loot_tables/blocks/cika_slab.json | 6 +- .../byg/loot_tables/blocks/cika_stairs.json | 3 +- .../byg/loot_tables/blocks/cika_trapdoor.json | 3 +- .../byg/loot_tables/blocks/cika_wood.json | 3 +- .../loot_tables/blocks/cypress_bookshelf.json | 6 +- .../loot_tables/blocks/cypress_button.json | 3 +- .../blocks/cypress_crafting_table.json | 3 +- .../byg/loot_tables/blocks/cypress_door.json | 3 +- .../byg/loot_tables/blocks/cypress_fence.json | 3 +- .../blocks/cypress_fence_gate.json | 3 +- .../loot_tables/blocks/cypress_leaves.json | 27 +- .../byg/loot_tables/blocks/cypress_log.json | 3 +- .../loot_tables/blocks/cypress_planks.json | 3 +- .../blocks/cypress_pressure_plate.json | 3 +- .../loot_tables/blocks/cypress_sapling.json | 3 +- .../byg/loot_tables/blocks/cypress_slab.json | 6 +- .../loot_tables/blocks/cypress_stairs.json | 3 +- .../loot_tables/blocks/cypress_trapdoor.json | 3 +- .../byg/loot_tables/blocks/cypress_wood.json | 3 +- .../loot_tables/blocks/ebony_bookshelf.json | 6 +- .../byg/loot_tables/blocks/ebony_button.json | 3 +- .../blocks/ebony_crafting_table.json | 3 +- .../byg/loot_tables/blocks/ebony_door.json | 3 +- .../byg/loot_tables/blocks/ebony_fence.json | 3 +- .../loot_tables/blocks/ebony_fence_gate.json | 3 +- .../byg/loot_tables/blocks/ebony_leaves.json | 27 +- .../byg/loot_tables/blocks/ebony_log.json | 3 +- .../byg/loot_tables/blocks/ebony_planks.json | 3 +- .../blocks/ebony_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/ebony_sapling.json | 3 +- .../byg/loot_tables/blocks/ebony_slab.json | 6 +- .../byg/loot_tables/blocks/ebony_stairs.json | 3 +- .../loot_tables/blocks/ebony_trapdoor.json | 3 +- .../byg/loot_tables/blocks/ebony_wood.json | 3 +- .../loot_tables/blocks/embur_bookshelf.json | 6 +- .../byg/loot_tables/blocks/embur_button.json | 7 +- .../blocks/embur_crafting_table.json | 3 +- .../byg/loot_tables/blocks/embur_door.json | 3 +- .../byg/loot_tables/blocks/embur_fence.json | 7 +- .../loot_tables/blocks/embur_fence_gate.json | 7 +- .../byg/loot_tables/blocks/embur_hyphae.json | 3 +- .../byg/loot_tables/blocks/embur_pedu.json | 3 +- .../byg/loot_tables/blocks/embur_planks.json | 7 +- .../blocks/embur_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/embur_slab.json | 24 +- .../byg/loot_tables/blocks/embur_stairs.json | 7 +- .../loot_tables/blocks/embur_trapdoor.json | 7 +- .../byg/loot_tables/blocks/embur_wart.json | 20 + .../loot_tables/blocks/ether_bookshelf.json | 6 +- .../byg/loot_tables/blocks/ether_button.json | 7 +- .../blocks/ether_crafting_table.json | 7 +- .../byg/loot_tables/blocks/ether_door.json | 3 +- .../byg/loot_tables/blocks/ether_fence.json | 7 +- .../loot_tables/blocks/ether_fence_gate.json | 7 +- .../byg/loot_tables/blocks/ether_leaves.json | 75 +-- .../byg/loot_tables/blocks/ether_log.json | 7 +- .../byg/loot_tables/blocks/ether_planks.json | 7 +- .../blocks/ether_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/ether_sapling.json | 7 +- .../byg/loot_tables/blocks/ether_slab.json | 24 +- .../byg/loot_tables/blocks/ether_stairs.json | 7 +- .../loot_tables/blocks/ether_trapdoor.json | 7 +- .../byg/loot_tables/blocks/ether_wood.json | 7 +- .../byg/loot_tables/blocks/fir_bookshelf.json | 6 +- .../byg/loot_tables/blocks/fir_button.json | 3 +- .../blocks/fir_crafting_table.json | 3 +- .../data/byg/loot_tables/blocks/fir_door.json | 3 +- .../byg/loot_tables/blocks/fir_fence.json | 3 +- .../loot_tables/blocks/fir_fence_gate.json | 3 +- .../byg/loot_tables/blocks/fir_leaves.json | 27 +- .../data/byg/loot_tables/blocks/fir_log.json | 3 +- .../byg/loot_tables/blocks/fir_planks.json | 3 +- .../blocks/fir_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/fir_sapling.json | 3 +- .../data/byg/loot_tables/blocks/fir_slab.json | 6 +- .../byg/loot_tables/blocks/fir_stairs.json | 3 +- .../byg/loot_tables/blocks/fir_trapdoor.json | 3 +- .../data/byg/loot_tables/blocks/fir_wood.json | 3 +- .../blocks/green_enchanted_bookshelf.json | 6 +- .../blocks/green_enchanted_button.json | 3 +- .../green_enchanted_crafting_table.json | 3 +- .../blocks/green_enchanted_door.json | 3 +- .../blocks/green_enchanted_fence.json | 3 +- .../blocks/green_enchanted_fence_gate.json | 3 +- .../blocks/green_enchanted_leaves.json | 73 +-- .../blocks/green_enchanted_log.json | 3 +- .../blocks/green_enchanted_planks.json | 3 +- .../green_enchanted_pressure_plate.json | 3 +- .../blocks/green_enchanted_sapling.json | 3 +- .../blocks/green_enchanted_slab.json | 6 +- .../blocks/green_enchanted_stairs.json | 3 +- .../blocks/green_enchanted_trapdoor.json | 3 +- .../blocks/green_enchanted_wood.json | 3 +- .../loot_tables/blocks/holly_bookshelf.json | 6 +- .../byg/loot_tables/blocks/holly_button.json | 3 +- .../blocks/holly_crafting_table.json | 3 +- .../byg/loot_tables/blocks/holly_door.json | 3 +- .../byg/loot_tables/blocks/holly_fence.json | 3 +- .../loot_tables/blocks/holly_fence_gate.json | 3 +- .../byg/loot_tables/blocks/holly_leaves.json | 27 +- .../byg/loot_tables/blocks/holly_log.json | 3 +- .../byg/loot_tables/blocks/holly_planks.json | 3 +- .../blocks/holly_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/holly_sapling.json | 3 +- .../byg/loot_tables/blocks/holly_slab.json | 6 +- .../byg/loot_tables/blocks/holly_stairs.json | 3 +- .../loot_tables/blocks/holly_trapdoor.json | 3 +- .../byg/loot_tables/blocks/holly_wood.json | 3 +- .../blocks/imparius_bookshelf.json | 6 +- .../loot_tables/blocks/imparius_button.json | 7 +- .../blocks/imparius_crafting_table.json | 3 +- .../byg/loot_tables/blocks/imparius_door.json | 3 +- .../loot_tables/blocks/imparius_fence.json | 7 +- .../blocks/imparius_fence_gate.json | 7 +- .../loot_tables/blocks/imparius_hyphae.json | 3 +- .../loot_tables/blocks/imparius_mushroom.json | 3 +- .../loot_tables/blocks/imparius_planks.json | 7 +- .../blocks/imparius_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/imparius_slab.json | 24 +- .../loot_tables/blocks/imparius_stairs.json | 7 +- .../byg/loot_tables/blocks/imparius_stem.json | 3 +- .../loot_tables/blocks/imparius_trapdoor.json | 7 +- .../blocks/jacaranda_bookshelf.json | 6 +- .../loot_tables/blocks/jacaranda_button.json | 3 +- .../blocks/jacaranda_crafting_table.json | 3 +- .../loot_tables/blocks/jacaranda_door.json | 3 +- .../loot_tables/blocks/jacaranda_fence.json | 3 +- .../blocks/jacaranda_fence_gate.json | 3 +- .../loot_tables/blocks/jacaranda_leaves.json | 27 +- .../byg/loot_tables/blocks/jacaranda_log.json | 3 +- .../loot_tables/blocks/jacaranda_planks.json | 3 +- .../blocks/jacaranda_pressure_plate.json | 3 +- .../loot_tables/blocks/jacaranda_sapling.json | 3 +- .../loot_tables/blocks/jacaranda_slab.json | 6 +- .../loot_tables/blocks/jacaranda_stairs.json | 3 +- .../blocks/jacaranda_trapdoor.json | 3 +- .../loot_tables/blocks/jacaranda_wood.json | 3 +- .../loot_tables/blocks/lament_bookshelf.json | 6 +- .../byg/loot_tables/blocks/lament_button.json | 7 +- .../blocks/lament_crafting_table.json | 3 +- .../byg/loot_tables/blocks/lament_door.json | 3 +- .../byg/loot_tables/blocks/lament_fence.json | 7 +- .../loot_tables/blocks/lament_fence_gate.json | 7 +- .../byg/loot_tables/blocks/lament_leaves.json | 75 +-- .../byg/loot_tables/blocks/lament_log.json | 3 +- .../byg/loot_tables/blocks/lament_planks.json | 7 +- .../blocks/lament_pressure_plate.json | 7 +- .../loot_tables/blocks/lament_sapling.json | 3 +- .../byg/loot_tables/blocks/lament_slab.json | 24 +- .../byg/loot_tables/blocks/lament_stairs.json | 7 +- .../loot_tables/blocks/lament_trapdoor.json | 7 +- .../byg/loot_tables/blocks/lament_wood.json | 3 +- .../blocks/mahogany_bookshelf.json | 6 +- .../loot_tables/blocks/mahogany_button.json | 3 +- .../blocks/mahogany_crafting_table.json | 3 +- .../byg/loot_tables/blocks/mahogany_door.json | 3 +- .../loot_tables/blocks/mahogany_fence.json | 3 +- .../blocks/mahogany_fence_gate.json | 3 +- .../loot_tables/blocks/mahogany_leaves.json | 21 +- .../byg/loot_tables/blocks/mahogany_log.json | 3 +- .../loot_tables/blocks/mahogany_planks.json | 3 +- .../blocks/mahogany_pressure_plate.json | 3 +- .../loot_tables/blocks/mahogany_sapling.json | 3 +- .../byg/loot_tables/blocks/mahogany_slab.json | 6 +- .../loot_tables/blocks/mahogany_stairs.json | 3 +- .../loot_tables/blocks/mahogany_trapdoor.json | 3 +- .../byg/loot_tables/blocks/mahogany_wood.json | 3 +- .../blocks/mangrove_bookshelf.json | 6 +- .../loot_tables/blocks/mangrove_button.json | 3 +- .../blocks/mangrove_crafting_table.json | 3 +- .../byg/loot_tables/blocks/mangrove_door.json | 3 +- .../loot_tables/blocks/mangrove_fence.json | 3 +- .../blocks/mangrove_fence_gate.json | 3 +- .../loot_tables/blocks/mangrove_leaves.json | 21 +- .../byg/loot_tables/blocks/mangrove_log.json | 3 +- .../loot_tables/blocks/mangrove_planks.json | 3 +- .../blocks/mangrove_pressure_plate.json | 3 +- .../loot_tables/blocks/mangrove_sapling.json | 3 +- .../byg/loot_tables/blocks/mangrove_slab.json | 6 +- .../loot_tables/blocks/mangrove_stairs.json | 3 +- .../loot_tables/blocks/mangrove_trapdoor.json | 3 +- .../byg/loot_tables/blocks/mangrove_wood.json | 3 +- .../loot_tables/blocks/maple_bookshelf.json | 6 +- .../byg/loot_tables/blocks/maple_button.json | 3 +- .../blocks/maple_crafting_table.json | 3 +- .../byg/loot_tables/blocks/maple_door.json | 3 +- .../byg/loot_tables/blocks/maple_fence.json | 3 +- .../loot_tables/blocks/maple_fence_gate.json | 3 +- .../byg/loot_tables/blocks/maple_leaves.json | 21 +- .../byg/loot_tables/blocks/maple_log.json | 3 +- .../byg/loot_tables/blocks/maple_planks.json | 3 +- .../blocks/maple_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/maple_sapling.json | 3 +- .../byg/loot_tables/blocks/maple_slab.json | 6 +- .../byg/loot_tables/blocks/maple_stairs.json | 3 +- .../loot_tables/blocks/maple_trapdoor.json | 3 +- .../byg/loot_tables/blocks/maple_wood.json | 3 +- .../blocks/nightshade_bookshelf.json | 6 +- .../loot_tables/blocks/nightshade_button.json | 7 +- .../blocks/nightshade_crafting_table.json | 7 +- .../loot_tables/blocks/nightshade_door.json | 3 +- .../loot_tables/blocks/nightshade_fence.json | 7 +- .../blocks/nightshade_fence_gate.json | 7 +- .../loot_tables/blocks/nightshade_leaves.json | 135 +++++ .../loot_tables/blocks/nightshade_log.json | 7 +- .../loot_tables/blocks/nightshade_planks.json | 7 +- .../blocks/nightshade_pressure_plate.json | 7 +- .../blocks/nightshade_sapling.json | 7 +- .../loot_tables/blocks/nightshade_slab.json | 24 +- .../loot_tables/blocks/nightshade_stairs.json | 7 +- .../blocks/nightshade_trapdoor.json | 7 +- .../loot_tables/blocks/nightshade_wood.json | 7 +- .../loot_tables/blocks/palm_bookshelf.json | 6 +- .../byg/loot_tables/blocks/palm_button.json | 7 +- .../blocks/palm_crafting_table.json | 3 +- .../byg/loot_tables/blocks/palm_door.json | 3 +- .../byg/loot_tables/blocks/palm_fence.json | 7 +- .../loot_tables/blocks/palm_fence_gate.json | 7 +- .../byg/loot_tables/blocks/palm_leaves.json | 75 +-- .../data/byg/loot_tables/blocks/palm_log.json | 7 +- .../byg/loot_tables/blocks/palm_planks.json | 7 +- .../blocks/palm_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/palm_sapling.json | 3 +- .../byg/loot_tables/blocks/palm_slab.json | 24 +- .../byg/loot_tables/blocks/palm_stairs.json | 7 +- .../byg/loot_tables/blocks/palm_trapdoor.json | 7 +- .../byg/loot_tables/blocks/palm_wood.json | 7 +- .../loot_tables/blocks/pine_bookshelf.json | 6 +- .../byg/loot_tables/blocks/pine_button.json | 3 +- .../blocks/pine_crafting_table.json | 3 +- .../byg/loot_tables/blocks/pine_door.json | 3 +- .../byg/loot_tables/blocks/pine_fence.json | 3 +- .../loot_tables/blocks/pine_fence_gate.json | 3 +- .../byg/loot_tables/blocks/pine_leaves.json | 21 +- .../data/byg/loot_tables/blocks/pine_log.json | 3 +- .../byg/loot_tables/blocks/pine_planks.json | 3 +- .../blocks/pine_pressure_plate.json | 3 +- .../byg/loot_tables/blocks/pine_sapling.json | 3 +- .../byg/loot_tables/blocks/pine_slab.json | 6 +- .../byg/loot_tables/blocks/pine_stairs.json | 3 +- .../byg/loot_tables/blocks/pine_trapdoor.json | 3 +- .../byg/loot_tables/blocks/pine_wood.json | 3 +- .../blocks/rainbow_eucalyptus_bookshelf.json | 6 +- .../blocks/rainbow_eucalyptus_button.json | 3 +- .../rainbow_eucalyptus_crafting_table.json | 3 +- .../blocks/rainbow_eucalyptus_door.json | 3 +- .../blocks/rainbow_eucalyptus_fence.json | 3 +- .../blocks/rainbow_eucalyptus_fence_gate.json | 3 +- .../blocks/rainbow_eucalyptus_leaves.json | 21 +- .../blocks/rainbow_eucalyptus_log.json | 3 +- .../blocks/rainbow_eucalyptus_planks.json | 3 +- .../rainbow_eucalyptus_pressure_plate.json | 3 +- .../blocks/rainbow_eucalyptus_sapling.json | 3 +- .../blocks/rainbow_eucalyptus_slab.json | 8 +- .../blocks/rainbow_eucalyptus_stairs.json | 3 +- .../blocks/rainbow_eucalyptus_trapdoor.json | 3 +- .../blocks/rainbow_eucalyptus_wood.json | 3 +- .../loot_tables/blocks/redwood_bookshelf.json | 6 +- .../loot_tables/blocks/redwood_button.json | 3 +- .../blocks/redwood_crafting_table.json | 3 +- .../byg/loot_tables/blocks/redwood_door.json | 3 +- .../byg/loot_tables/blocks/redwood_fence.json | 3 +- .../blocks/redwood_fence_gate.json | 3 +- .../loot_tables/blocks/redwood_leaves.json | 21 +- .../byg/loot_tables/blocks/redwood_log.json | 3 +- .../loot_tables/blocks/redwood_planks.json | 3 +- .../blocks/redwood_pressure_plate.json | 3 +- .../loot_tables/blocks/redwood_sapling.json | 3 +- .../byg/loot_tables/blocks/redwood_slab.json | 6 +- .../loot_tables/blocks/redwood_stairs.json | 3 +- .../loot_tables/blocks/redwood_trapdoor.json | 3 +- .../byg/loot_tables/blocks/redwood_wood.json | 3 +- .../loot_tables/blocks/skyris_bookshelf.json | 6 +- .../byg/loot_tables/blocks/skyris_button.json | 3 +- .../blocks/skyris_crafting_table.json | 3 +- .../byg/loot_tables/blocks/skyris_door.json | 3 +- .../byg/loot_tables/blocks/skyris_fence.json | 3 +- .../loot_tables/blocks/skyris_fence_gate.json | 3 +- .../byg/loot_tables/blocks/skyris_leaves.json | 73 +-- .../byg/loot_tables/blocks/skyris_log.json | 3 +- .../byg/loot_tables/blocks/skyris_planks.json | 3 +- .../blocks/skyris_pressure_plate.json | 3 +- .../loot_tables/blocks/skyris_sapling.json | 3 +- .../byg/loot_tables/blocks/skyris_slab.json | 6 +- .../byg/loot_tables/blocks/skyris_stairs.json | 3 +- .../loot_tables/blocks/skyris_trapdoor.json | 3 +- .../byg/loot_tables/blocks/skyris_wood.json | 3 +- .../blocks/stripped_aspen_log.json | 3 +- .../blocks/stripped_aspen_wood.json | 3 +- .../blocks/stripped_baobab_log.json | 3 +- .../blocks/stripped_baobab_wood.json | 3 +- .../blocks/stripped_blue_enchanted_log.json | 3 +- .../blocks/stripped_blue_enchanted_wood.json | 3 +- .../blocks/stripped_bulbis_stem.json | 7 +- .../blocks/stripped_bulbis_wood.json | 7 +- .../blocks/stripped_cherry_log.json | 3 +- .../blocks/stripped_cherry_wood.json | 3 +- .../loot_tables/blocks/stripped_cika_log.json | 3 +- .../blocks/stripped_cika_wood.json | 3 +- .../blocks/stripped_cypress_log.json | 3 +- .../blocks/stripped_cypress_wood.json | 3 +- .../blocks/stripped_ebony_log.json | 3 +- .../blocks/stripped_ebony_wood.json | 3 +- .../blocks/stripped_embur_hyphae.json | 3 +- .../blocks/stripped_embur_pedu.json | 3 +- .../blocks/stripped_ether_log.json | 7 +- .../blocks/stripped_ether_wood.json | 7 +- .../loot_tables/blocks/stripped_fir_log.json | 3 +- .../loot_tables/blocks/stripped_fir_wood.json | 3 +- .../blocks/stripped_green_enchanted_log.json | 3 +- .../blocks/stripped_green_enchanted_wood.json | 3 +- .../blocks/stripped_holly_log.json | 3 +- .../blocks/stripped_holly_wood.json | 3 +- .../blocks/stripped_jacaranda_log.json | 3 +- .../blocks/stripped_jacaranda_wood.json | 3 +- .../blocks/stripped_lament_log.json | 3 +- .../blocks/stripped_lament_wood.json | 3 +- .../blocks/stripped_mahogany_log.json | 3 +- .../blocks/stripped_mahogany_wood.json | 3 +- .../blocks/stripped_mangrove_log.json | 3 +- .../blocks/stripped_mangrove_wood.json | 3 +- .../blocks/stripped_maple_log.json | 3 +- .../blocks/stripped_maple_wood.json | 3 +- .../blocks/stripped_nightshade_log.json | 7 +- .../blocks/stripped_nightshade_wood.json | 7 +- .../loot_tables/blocks/stripped_palm_log.json | 7 +- .../blocks/stripped_palm_wood.json | 7 +- .../loot_tables/blocks/stripped_pine_log.json | 3 +- .../blocks/stripped_pine_wood.json | 3 +- .../stripped_rainbow_eucalyptus_log.json | 3 +- .../stripped_rainbow_eucalyptus_wood.json | 3 +- .../blocks/stripped_redwood_log.json | 3 +- .../blocks/stripped_redwood_wood.json | 3 +- .../blocks/stripped_skyris_log.json | 3 +- .../blocks/stripped_skyris_wood.json | 3 +- .../blocks/stripped_sythian_hyphae.json | 3 +- .../blocks/stripped_sythian_stem.json | 3 +- .../blocks/stripped_willow_log.json | 3 +- .../blocks/stripped_willow_wood.json | 3 +- .../blocks/stripped_witch_hazel_log.json | 3 +- .../blocks/stripped_witch_hazel_wood.json | 3 +- .../blocks/stripped_zelkova_log.json | 3 +- .../blocks/stripped_zelkova_wood.json | 3 +- .../loot_tables/blocks/sythian_bookshelf.json | 6 +- .../loot_tables/blocks/sythian_button.json | 7 +- .../blocks/sythian_crafting_table.json | 3 +- .../byg/loot_tables/blocks/sythian_door.json | 3 +- .../byg/loot_tables/blocks/sythian_fence.json | 7 +- .../blocks/sythian_fence_gate.json | 7 +- .../loot_tables/blocks/sythian_fungus.json | 3 +- .../loot_tables/blocks/sythian_hyphae.json | 3 +- .../loot_tables/blocks/sythian_planks.json | 7 +- .../blocks/sythian_pressure_plate.json | 7 +- .../byg/loot_tables/blocks/sythian_slab.json | 24 +- .../loot_tables/blocks/sythian_stairs.json | 7 +- .../byg/loot_tables/blocks/sythian_stem.json | 3 +- .../loot_tables/blocks/sythian_trapdoor.json | 7 +- .../blocks/sythian_wart_block.json | 135 +++++ .../loot_tables/blocks/willow_bookshelf.json | 6 +- .../byg/loot_tables/blocks/willow_button.json | 3 +- .../blocks/willow_crafting_table.json | 3 +- .../byg/loot_tables/blocks/willow_door.json | 3 +- .../byg/loot_tables/blocks/willow_fence.json | 3 +- .../loot_tables/blocks/willow_fence_gate.json | 3 +- .../byg/loot_tables/blocks/willow_leaves.json | 21 +- .../byg/loot_tables/blocks/willow_log.json | 3 +- .../byg/loot_tables/blocks/willow_planks.json | 3 +- .../blocks/willow_pressure_plate.json | 3 +- .../loot_tables/blocks/willow_sapling.json | 3 +- .../byg/loot_tables/blocks/willow_slab.json | 6 +- .../byg/loot_tables/blocks/willow_stairs.json | 3 +- .../loot_tables/blocks/willow_trapdoor.json | 3 +- .../byg/loot_tables/blocks/willow_wood.json | 3 +- .../blocks/witch_hazel_bookshelf.json | 6 +- .../blocks/witch_hazel_button.json | 3 +- .../blocks/witch_hazel_crafting_table.json | 3 +- .../loot_tables/blocks/witch_hazel_door.json | 3 +- .../loot_tables/blocks/witch_hazel_fence.json | 3 +- .../blocks/witch_hazel_fence_gate.json | 3 +- .../blocks/witch_hazel_leaves.json | 21 +- .../loot_tables/blocks/witch_hazel_log.json | 3 +- .../blocks/witch_hazel_planks.json | 3 +- .../blocks/witch_hazel_pressure_plate.json | 3 +- .../blocks/witch_hazel_sapling.json | 3 +- .../loot_tables/blocks/witch_hazel_slab.json | 6 +- .../blocks/witch_hazel_stairs.json | 3 +- .../blocks/witch_hazel_trapdoor.json | 3 +- .../loot_tables/blocks/witch_hazel_wood.json | 3 +- .../loot_tables/blocks/zelkova_bookshelf.json | 6 +- .../loot_tables/blocks/zelkova_button.json | 3 +- .../blocks/zelkova_crafting_table.json | 3 +- .../byg/loot_tables/blocks/zelkova_door.json | 3 +- .../byg/loot_tables/blocks/zelkova_fence.json | 3 +- .../blocks/zelkova_fence_gate.json | 3 +- .../loot_tables/blocks/zelkova_leaves.json | 21 +- .../byg/loot_tables/blocks/zelkova_log.json | 3 +- .../loot_tables/blocks/zelkova_planks.json | 3 +- .../blocks/zelkova_pressure_plate.json | 3 +- .../loot_tables/blocks/zelkova_sapling.json | 3 +- .../byg/loot_tables/blocks/zelkova_slab.json | 6 +- .../loot_tables/blocks/zelkova_stairs.json | 3 +- .../loot_tables/blocks/zelkova_trapdoor.json | 3 +- .../byg/loot_tables/blocks/zelkova_wood.json | 3 +- .../data/minecraft/tags/items/buttons.json | 42 +- .../data/minecraft/tags/items/leaves.json | 100 ++-- .../data/minecraft/tags/items/sand.json | 12 +- .../data/minecraft/tags/items/slabs.json | 100 ++-- .../data/minecraft/tags/items/stairs.json | 100 ++-- .../byg/common/entity/boat/BYGBoatEntity.java | 17 + .../advancement/biomepedia_gift.json | 2 +- .../providers/loot/BYGBlockLootProvider.java | 11 +- .../providers/loot/BYGLootTablesProvider.java | 9 + .../resources/META-INF/accesstransformer.cfg | 5 +- 497 files changed, 2981 insertions(+), 1320 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json rename Common/src/{main/resources/data/byg/loot_tables/blocks/nightshade_leaves.json => generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json} (64%) rename Common/src/{main/resources/data/byg/loot_tables/blocks/sythian_sapling.json => generated/resources/data/byg/loot_tables/blocks/aspen_log.json} (75%) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json rename Common/src/{main/resources/data/byg/loot_tables/blocks/sythian_wart_block.json => generated/resources/data/byg/loot_tables/blocks/aspen_wood.json} (75%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/baobab_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json (91%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json (87%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_oddity.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_stem.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/bulbis_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cherry_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_log.json (85%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cika_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/cypress_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ebony_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_hyphae.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_pedu.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/embur_trapdoor.json (76%) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_crafting_table.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_leaves.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_log.json (75%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_sapling.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/ether_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_door.json (91%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_log.json (85%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/fir_wood.json (85%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json (91%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json (67%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json (87%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/holly_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_hyphae.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_mushroom.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_stem.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/jacaranda_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_leaves.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/lament_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mahogany_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/mangrove_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/maple_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json (77%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json (76%) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_log.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json (77%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_sapling.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/nightshade_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_leaves.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_log.json (75%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_slab.json (65%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_trapdoor.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/palm_wood.json (75%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_log.json (85%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/pine_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json (91%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json (79%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/redwood_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_leaves.json (67%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/skyris_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cika_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_ether_log.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_fir_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_holly_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_lament_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_maple_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json (77%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_palm_log.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_pine_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_willow_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_button.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_fence.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_fungus.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_hyphae.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_planks.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_slab.json (64%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_stairs.json (76%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_stem.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json (76%) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/willow_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json (91%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json (90%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_button.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_door.json (92%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_fence.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_leaves.json (88%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_log.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_planks.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_sapling.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_slab.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_stairs.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json (86%) rename Common/src/{main => generated}/resources/data/byg/loot_tables/blocks/zelkova_wood.json (86%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index d2dde15c7a..4c412a26ac 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2393,6 +2393,492 @@ d7c781e47dc8891cbb9a0c2660c64dca75fcf983 data/byg/advancements/recipes/byg.byg/w b0cbd5fdb61a5c8ccf6a5a58a4bfad85b3acde92 data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json 83eb246f22ed55bd11083437fbf8df5221ef5089 data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json 2e794f722e70ffdda0a17dbf28c0f8716abdf426 data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json +0b07e0f24ecb7068098deca783fe2b64e3585ea9 data/byg/loot_tables/blocks/aspen_bookshelf.json +b95983751ee141014ab4d5da3b7820081af854ec data/byg/loot_tables/blocks/aspen_button.json +662e15ceb338efbaf51aa9d94400503f24cb00be data/byg/loot_tables/blocks/aspen_crafting_table.json +af5f616aa7f9ea8573b9639071b50d0305e4635e data/byg/loot_tables/blocks/aspen_door.json +30a946aa6c8dd39d8dd2d677638dedd8d1f2fa12 data/byg/loot_tables/blocks/aspen_fence.json +21ee1898479133b3688b6e1b5d6b16afab20fdc9 data/byg/loot_tables/blocks/aspen_fence_gate.json +338cd97383cb526387ab2c048cbbda3a515c8e04 data/byg/loot_tables/blocks/aspen_leaves.json +19d887c454d95c68ed77fc444f695c831709b188 data/byg/loot_tables/blocks/aspen_log.json +72a4f570456e6ea341d4837f966b43a1c7f59988 data/byg/loot_tables/blocks/aspen_planks.json +bc3c651912acbb22ea8543e73010d90c410acea5 data/byg/loot_tables/blocks/aspen_pressure_plate.json +cb535913fb27b9190af7a197a5e345f95c083b24 data/byg/loot_tables/blocks/aspen_sapling.json +36661d9bb16a6562aabebdd8940edb4bebc373f0 data/byg/loot_tables/blocks/aspen_slab.json +7d5c98ad0c2c8cfa705fedbcb19a0011a2378222 data/byg/loot_tables/blocks/aspen_stairs.json +14d5ebca01f19097950358c70a62850fdabad3dc data/byg/loot_tables/blocks/aspen_trapdoor.json +33d3b7c1f28c9eeef9fe1975fa994a483a2037cd data/byg/loot_tables/blocks/aspen_wood.json +4206b41d4b82beaf6eee7fa99d23fea74a70536f data/byg/loot_tables/blocks/baobab_bookshelf.json +eca2357a8d6ece9830f0514688e15b66b726043a data/byg/loot_tables/blocks/baobab_button.json +d7027b6283850cfb3d1b0702dafb3a4c9219a825 data/byg/loot_tables/blocks/baobab_crafting_table.json +227c32803507dc07637b36bc8d5781c6dbde293d data/byg/loot_tables/blocks/baobab_door.json +6ae8dd6731cb4ecc83daf58a85622264eee5cd80 data/byg/loot_tables/blocks/baobab_fence.json +652d8af51a71e270a09c81e60616897cc1c70aeb data/byg/loot_tables/blocks/baobab_fence_gate.json +7139f955046b4e9a108de43ccf9f47c30bd4be11 data/byg/loot_tables/blocks/baobab_leaves.json +08dc448e135f6b6e0027a81a9f2593c4cff33da5 data/byg/loot_tables/blocks/baobab_log.json +982d0fd10518afaabaa0bdde22d45da5ed5fe67c data/byg/loot_tables/blocks/baobab_planks.json +5c9de6c0fa0c689c06d9412660c9dbde44d7d2e7 data/byg/loot_tables/blocks/baobab_pressure_plate.json +392c1803655bfa041bdd488fefad7f7dc925262e data/byg/loot_tables/blocks/baobab_sapling.json +b7cf8dc8435b21b62e40a89c8ee95df10e3bc45f data/byg/loot_tables/blocks/baobab_slab.json +f301cf55de793df46dc3825ec481de7fbb85c190 data/byg/loot_tables/blocks/baobab_stairs.json +1c091e05557eb61d63a0056f3a4ce526ae650e9b data/byg/loot_tables/blocks/baobab_trapdoor.json +fe6db0c642a7597326d61d09a4a9020094ed5d1f data/byg/loot_tables/blocks/baobab_wood.json +a5f1874cc92c98366cbd1097a715cd7ea75cc74f data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json +4d0e5d661f4a39a78b604a91c821fa114b13557f data/byg/loot_tables/blocks/blue_enchanted_button.json +65485e0e55fdb1d6c1443a01ef1bbf4c726526dd data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json +c6da00ffc357a998b19006e678f0425a667b01cf data/byg/loot_tables/blocks/blue_enchanted_door.json +e21bc026e43d1646d3eb86e17717e583c40f6bc3 data/byg/loot_tables/blocks/blue_enchanted_fence.json +59354e27a4750867fda03dd9feaebc822fb236ee data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json +a79a06bfee5670dc52d09f97978a2f56f2183b77 data/byg/loot_tables/blocks/blue_enchanted_leaves.json +752b7605b02933faf0fc9098134c468082bb4a39 data/byg/loot_tables/blocks/blue_enchanted_log.json +a640b504a8890f3fd94e9322119918aebc8ac1de data/byg/loot_tables/blocks/blue_enchanted_planks.json +fae23599b47dc89793294be20b55c37fd15650b7 data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json +06442c880a0b922e24291c50238e20081777d6db data/byg/loot_tables/blocks/blue_enchanted_sapling.json +b1b9466559f2be5df34098b73ce509d482053367 data/byg/loot_tables/blocks/blue_enchanted_slab.json +79451c11891e56c348e1274be7b91040b27fcaa7 data/byg/loot_tables/blocks/blue_enchanted_stairs.json +8dc1ed2cac3ed834df9ca9c5321c94cd2308ee0e data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json +6de2d11e5858e6f3a0c8bba9954fe56fa279ad05 data/byg/loot_tables/blocks/blue_enchanted_wood.json +3f6cf056307c66a280b1aff970db53f2ae1224ff data/byg/loot_tables/blocks/bulbis_bookshelf.json +b1af433ab8cc9ce7326c33467b0ad8c67710dc26 data/byg/loot_tables/blocks/bulbis_button.json +703e1bde2d184279daed49bd8f9db32ff7a040e1 data/byg/loot_tables/blocks/bulbis_crafting_table.json +65bed264f2f82a664524234750c7018e7aad9d4a data/byg/loot_tables/blocks/bulbis_door.json +64b926492434675de16b8cec2c466bcb07fea5d5 data/byg/loot_tables/blocks/bulbis_fence.json +0fac0c532ae951e142f77d6c90e160a20bfcc454 data/byg/loot_tables/blocks/bulbis_fence_gate.json +4c0eb782a74bcb2a98ce447a26d1edc80879655e data/byg/loot_tables/blocks/bulbis_oddity.json +5d9aaa8aa2b977180288229a3e0ce8a825d3b0cc data/byg/loot_tables/blocks/bulbis_planks.json +60c9a35a289f69ded442f44a39470bc8f8a6434f data/byg/loot_tables/blocks/bulbis_pressure_plate.json +03490d0f7d61049458affa07a2201c3581d1f382 data/byg/loot_tables/blocks/bulbis_slab.json +71645d8e9808ae02c137ef808c06c1966ba01c5d data/byg/loot_tables/blocks/bulbis_stairs.json +b44c2fba3b513ac7e603dd32016a6f3034e29bbf data/byg/loot_tables/blocks/bulbis_stem.json +fded613a2178b64350464203c2518bbd11607278 data/byg/loot_tables/blocks/bulbis_trapdoor.json +ea8377aa3bf6024ac93ba553f1e02c4fb52d4f88 data/byg/loot_tables/blocks/bulbis_wood.json +2b8804a5b5b657d35355d531169e05c424751a07 data/byg/loot_tables/blocks/cherry_bookshelf.json +e2878b43b2e19bdd871be95a845ded82906c1ece data/byg/loot_tables/blocks/cherry_button.json +c49587169299d75ad0100091e452dadf474a88a4 data/byg/loot_tables/blocks/cherry_crafting_table.json +6ec4768046dd343159034fdd1576041ac2abd85c data/byg/loot_tables/blocks/cherry_door.json +8701b082baaea79e81d7ea9132ae59d981953de9 data/byg/loot_tables/blocks/cherry_fence.json +c326165e4c573ce89cdd28377dd5b74d4f7d52bf data/byg/loot_tables/blocks/cherry_fence_gate.json +5d0b722797fa28822bc9f5ffb7c26b834f15ca1d data/byg/loot_tables/blocks/cherry_log.json +28301e9d562bbe8d909c45cfff5f5d13d9341b88 data/byg/loot_tables/blocks/cherry_planks.json +ca80674bc1eb79c1aa7aea0d93f8485f9d2f5927 data/byg/loot_tables/blocks/cherry_pressure_plate.json +f8ff03d7566e10dcacbc83d28a5bfbe5d84ca546 data/byg/loot_tables/blocks/cherry_slab.json +c1c9d9ddf407512eb0ba487e9dc69d720e9e6833 data/byg/loot_tables/blocks/cherry_stairs.json +cacda2362ff78a98a84e6b13a07314702f8d74b2 data/byg/loot_tables/blocks/cherry_trapdoor.json +5327af26d404e8e5c660474d07c677180614b55b data/byg/loot_tables/blocks/cherry_wood.json +3b57e5bd631bdfe6423074c30b564ff5e30d4944 data/byg/loot_tables/blocks/cika_bookshelf.json +bc5be024ad487e73247855c71c22dbca9cb56ac7 data/byg/loot_tables/blocks/cika_button.json +314d0b660831571f776fa2a778fba2a69bd35fdc data/byg/loot_tables/blocks/cika_crafting_table.json +9946fb00be45aabe159ca347a18abf2bd7e7bd6c data/byg/loot_tables/blocks/cika_door.json +11671280f281de854b04f624db9a74cf1099d14c data/byg/loot_tables/blocks/cika_fence.json +32008353f7ed7cfeff005b32970f77b69f91ea33 data/byg/loot_tables/blocks/cika_fence_gate.json +3357c7cf462c60807b9897c650e058a22df1a844 data/byg/loot_tables/blocks/cika_leaves.json +c38905528f4e8f4ed69e4c9e7264dedd1f0209b2 data/byg/loot_tables/blocks/cika_log.json +4734f29e2d9ebd4f8c4622769d239729cc78e912 data/byg/loot_tables/blocks/cika_planks.json +8953a3fd62c3c3255de7d96f95a972b146cad8e2 data/byg/loot_tables/blocks/cika_pressure_plate.json +a735c30655c5dc36796e43ce854009662e7addb0 data/byg/loot_tables/blocks/cika_sapling.json +34101344ea1dc71e88ec28f43d84356f755f7999 data/byg/loot_tables/blocks/cika_slab.json +1a8c607cbceef4bddc7adcb5f03ba77730b7841c data/byg/loot_tables/blocks/cika_stairs.json +20e02bbe50b60d345bf800bb0975f5f84b479386 data/byg/loot_tables/blocks/cika_trapdoor.json +77ce5e84a6faee2eef4380525a74d1d65556f60d data/byg/loot_tables/blocks/cika_wood.json +27f58d530b420003d34a72c7cacd9de64263add3 data/byg/loot_tables/blocks/cypress_bookshelf.json +af22c3f2cfba04cb6b9cdfa3821241e476b74210 data/byg/loot_tables/blocks/cypress_button.json +81515f4f11fd368f5a7604b2a1cd6ab0e1dbde68 data/byg/loot_tables/blocks/cypress_crafting_table.json +84cd53fe0bdecdfe3475147f7982082d3f390492 data/byg/loot_tables/blocks/cypress_door.json +b5b7b8207a3d17bea6c8707247b082d6a00e5f9c data/byg/loot_tables/blocks/cypress_fence.json +bb34c2617f63b091aba14e9195475a80eec662ca data/byg/loot_tables/blocks/cypress_fence_gate.json +d03c3e10d2e573d1dd930a52fbc899c1f94e48b1 data/byg/loot_tables/blocks/cypress_leaves.json +369a36ea1de7d9b9f357a49544bd7e370550e961 data/byg/loot_tables/blocks/cypress_log.json +e1a5d5a54d4b14ee9982c6425a06b5efa1649d65 data/byg/loot_tables/blocks/cypress_planks.json +3fdc753ebb1c84c21f2ab9f77e87293c2a0ee5a8 data/byg/loot_tables/blocks/cypress_pressure_plate.json +e26bb6c61c1d9f981c95c5836766fbc2a7abc7f9 data/byg/loot_tables/blocks/cypress_sapling.json +9b8d675c8db24946f09cfa31a35983ca4029240a data/byg/loot_tables/blocks/cypress_slab.json +c3e11ce37f30094bce856f06809293a985ed1fca data/byg/loot_tables/blocks/cypress_stairs.json +15135f4d2e7c93418010f97e7d29990ac1202dc7 data/byg/loot_tables/blocks/cypress_trapdoor.json +31eab5bae670a11780104cb75b2f7ce1577a3eec data/byg/loot_tables/blocks/cypress_wood.json +86a97f6c979905406977b7cd5c5839ddf3bcae91 data/byg/loot_tables/blocks/ebony_bookshelf.json +ac092a19856b84a17f47109ab9d530629adc3b31 data/byg/loot_tables/blocks/ebony_button.json +64568a12d9216d9eabbeb8a52df00fe993c72366 data/byg/loot_tables/blocks/ebony_crafting_table.json +2934da86e844aae53806fbf1216d0db9ec065a36 data/byg/loot_tables/blocks/ebony_door.json +75315c927b6a29da4935700a83bd29c3cc3ceaee data/byg/loot_tables/blocks/ebony_fence.json +c8114d5a8d721b438a2c67f120526ecf9ae5e5a2 data/byg/loot_tables/blocks/ebony_fence_gate.json +16d2cd09299de5112805816f994f8d2586782cb4 data/byg/loot_tables/blocks/ebony_leaves.json +f028142aec62da97824b7268ba60cffc797daeec data/byg/loot_tables/blocks/ebony_log.json +7916dd819b3daeb5f66dfa191d8bc92c19488092 data/byg/loot_tables/blocks/ebony_planks.json +666c8b5d0345249311620c4239419eee84358c97 data/byg/loot_tables/blocks/ebony_pressure_plate.json +75baaf6d65cdf78c0661fb3169740e0b970cfb65 data/byg/loot_tables/blocks/ebony_sapling.json +121b3bdb6d3fb501abefc428286c589bb73683f4 data/byg/loot_tables/blocks/ebony_slab.json +67e33650222524c6f81b67da6d0ab7c6f643222b data/byg/loot_tables/blocks/ebony_stairs.json +51fd339251c32e2d0eb0f8c97cd64051984ccbab data/byg/loot_tables/blocks/ebony_trapdoor.json +da6dc9ef66a7ba179c8e2862783913344887530c data/byg/loot_tables/blocks/ebony_wood.json +c58d44f6601404fd83926f6416f7fa14ea69b472 data/byg/loot_tables/blocks/embur_bookshelf.json +1fced081bc8673a2763b8cd2ba13fb5439c05e36 data/byg/loot_tables/blocks/embur_button.json +1f345c505e0b9dd243ef89ff2ba6bac53c3da9c8 data/byg/loot_tables/blocks/embur_crafting_table.json +e8085a5d474fa62b0ff685e669ae6f3040edc3f3 data/byg/loot_tables/blocks/embur_door.json +1db55d0bc304f48fa689fc21c239d1de69bd57cf data/byg/loot_tables/blocks/embur_fence.json +41d68376e6e947867621fb5619a9f419c892b48a data/byg/loot_tables/blocks/embur_fence_gate.json +8907786637746a8cc10eb14eefae43e91b772c08 data/byg/loot_tables/blocks/embur_hyphae.json +2b5fe9da810badb614d8b0dc59e9fb5d3a4d37be data/byg/loot_tables/blocks/embur_pedu.json +ff41398d1e169f0b9fa5f978b15659a302d75bda data/byg/loot_tables/blocks/embur_planks.json +47f0468fe2b90fab3e6dd7d642d82ee43499f444 data/byg/loot_tables/blocks/embur_pressure_plate.json +fbd42fdc4106ecfcc9b72e9488a155fe00d3e397 data/byg/loot_tables/blocks/embur_slab.json +16d99e9aff0cdadd33e81881af97dba1f93d1e6a data/byg/loot_tables/blocks/embur_stairs.json +aae59db4b06a2eb6c8cb9c97f3dd71d83f78b3eb data/byg/loot_tables/blocks/embur_trapdoor.json +05cc992603c03a862cc8bac30ab3f477d8edcc24 data/byg/loot_tables/blocks/embur_wart.json +a7b9e7d984f17a67f8c81cd3982af2e89eb0191a data/byg/loot_tables/blocks/ether_bookshelf.json +c96944e8b0e59dd2c6bcc3ed6d65d44190b8b57a data/byg/loot_tables/blocks/ether_button.json +bcc9c6ebfa396f82c8cb2a0e13c0c190ca8716de data/byg/loot_tables/blocks/ether_crafting_table.json +1e306af8ab8a5b38c10539deed00468f7e0152af data/byg/loot_tables/blocks/ether_door.json +9e284c3bf55a1a10b7580ff320255f6ae7d75cf5 data/byg/loot_tables/blocks/ether_fence.json +9bc6daad4cc923978110adbbad7036e1f2815b8f data/byg/loot_tables/blocks/ether_fence_gate.json +ad6a63db380b49cc5badedfd4cb06244004ec6a0 data/byg/loot_tables/blocks/ether_leaves.json +0115e84d961a5feeebed2a8bbfa03b68ab203492 data/byg/loot_tables/blocks/ether_log.json +3de26ec684d8f939600c4c1c3a11a669b1eba73a data/byg/loot_tables/blocks/ether_planks.json +8c8f883f9b45307ec49b02302878a5d420311a06 data/byg/loot_tables/blocks/ether_pressure_plate.json +e161bb580cd8ef6eb2908e07accd0ac52b1e7fda data/byg/loot_tables/blocks/ether_sapling.json +fbd6f5bd03a2a635d1420c62f9a391964cbe5bfb data/byg/loot_tables/blocks/ether_slab.json +0695606ed0b53636f0f14f13f61c2c3af1c20ec1 data/byg/loot_tables/blocks/ether_stairs.json +118323ce7bf34cf1186c3822ab007965eb3003a8 data/byg/loot_tables/blocks/ether_trapdoor.json +b33c35edd119f169518a9058c41fbec5605b1e58 data/byg/loot_tables/blocks/ether_wood.json +0daff7051014f873d38df9086ccf93fb703b716d data/byg/loot_tables/blocks/fir_bookshelf.json +7a5d5265f2cdb9dbac91afc71804148496fa7461 data/byg/loot_tables/blocks/fir_button.json +8e7bcc75bb0bd10fe9309efa9278d02e02cc91bf data/byg/loot_tables/blocks/fir_crafting_table.json +d7337044143e7f6195e6e47d845b3963acc7ecc8 data/byg/loot_tables/blocks/fir_door.json +8e139527dd25c93a4cbdcec7d05875c15ce7bcd6 data/byg/loot_tables/blocks/fir_fence.json +83770eaa84df8f34f4a59159a81b29765999cbba data/byg/loot_tables/blocks/fir_fence_gate.json +ffb0a30e5fa09b7352b937438762bc75b5bc31e9 data/byg/loot_tables/blocks/fir_leaves.json +b5efec5ac3a7d060de56206154777b991e0575bd data/byg/loot_tables/blocks/fir_log.json +d13ec6203800992a6fd515d62d672b632157cd29 data/byg/loot_tables/blocks/fir_planks.json +a338779558a66fe18918fb95eb7e14693cb53591 data/byg/loot_tables/blocks/fir_pressure_plate.json +f95ff7bec8df583ed0e3549aa19629709cfc1670 data/byg/loot_tables/blocks/fir_sapling.json +1ca421fedcaa795f4069108e2676e6ff0b83d576 data/byg/loot_tables/blocks/fir_slab.json +23aa64d28acc7ee6b388c7b1dcda4bf8116271dc data/byg/loot_tables/blocks/fir_stairs.json +d358f89ab615ded7e4951788315b78f2e0527e58 data/byg/loot_tables/blocks/fir_trapdoor.json +a0335a6e6e3af10f36e34b492ec814bb82eb4020 data/byg/loot_tables/blocks/fir_wood.json +b85a39b8448fd6f1776263a0b829f498d16d445e data/byg/loot_tables/blocks/green_enchanted_bookshelf.json +3ed3a7d4d278bfba4b205f8f68e2455cd3be85fa data/byg/loot_tables/blocks/green_enchanted_button.json +276154e78973b604e97ec4f95e3c9df4b48b0f92 data/byg/loot_tables/blocks/green_enchanted_crafting_table.json +3382d03c3358196fc1d5d1d843c58c0ae2f6b8ba data/byg/loot_tables/blocks/green_enchanted_door.json +e8ecd7b363abd3e21c30a8a9ba7b8c00db3163b0 data/byg/loot_tables/blocks/green_enchanted_fence.json +eb5ca6d6605b68dd14397ced1f9a52743b83af64 data/byg/loot_tables/blocks/green_enchanted_fence_gate.json +342065120f5cb2cf1a39f450eace7affcee41386 data/byg/loot_tables/blocks/green_enchanted_leaves.json +a3ee2f2889c5a1c21f100a8bb95a8565f3527d5a data/byg/loot_tables/blocks/green_enchanted_log.json +7ebcfb1eff1630db1b22fd063044d0227f362da9 data/byg/loot_tables/blocks/green_enchanted_planks.json +c0b8c919fb298929b7750fc85d79049dda97eeb8 data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json +a94f96a5a606d0d16c0de9804f33fb6e7dfef249 data/byg/loot_tables/blocks/green_enchanted_sapling.json +428c3f3d1949976d76381ea8effc71aa644aa9e2 data/byg/loot_tables/blocks/green_enchanted_slab.json +682af6470c2c7f943c5d1bc0dfd76d7c7bcd08e4 data/byg/loot_tables/blocks/green_enchanted_stairs.json +d2565d8758262679b33115d0f15b531e9ca3f589 data/byg/loot_tables/blocks/green_enchanted_trapdoor.json +06819a59828310a03616213d86ef43b49505f7bf data/byg/loot_tables/blocks/green_enchanted_wood.json +f17aa36ff3887324d909cebd4137d1607728b67d data/byg/loot_tables/blocks/holly_bookshelf.json +ef6a60f38ed07626b80a06f94e3eb022c7426df3 data/byg/loot_tables/blocks/holly_button.json +d20b04b9f7fb9c387b6439a6a863c46fadf7fffe data/byg/loot_tables/blocks/holly_crafting_table.json +866bef04ee6549732da86c4e76107937c6895afa data/byg/loot_tables/blocks/holly_door.json +5b657f84fbd921f423b723d08e57ab572f3fa15a data/byg/loot_tables/blocks/holly_fence.json +ea949079f62370ccb76c7edde0353453f459bf43 data/byg/loot_tables/blocks/holly_fence_gate.json +8f17bd3900d5ff469263a9e758bc963bf147fb9b data/byg/loot_tables/blocks/holly_leaves.json +9f39abeb58f96207d9da919c1a50b214c07648b7 data/byg/loot_tables/blocks/holly_log.json +4b54a247279c00691501eb65ebffc752777f4d2d data/byg/loot_tables/blocks/holly_planks.json +b4def8b29dccd71683084287c244da9f839a6ea3 data/byg/loot_tables/blocks/holly_pressure_plate.json +269bff7d19dc9a2cabc96079686f8304d14f797f data/byg/loot_tables/blocks/holly_sapling.json +75e7b6e8b039bb1438063b0dc6fd8bce9f300b0e data/byg/loot_tables/blocks/holly_slab.json +849571d9a9f29d2e3a2c048469f7056e7c89bdb7 data/byg/loot_tables/blocks/holly_stairs.json +edee1c31489bf36cea8f929d4878493d3e8589bb data/byg/loot_tables/blocks/holly_trapdoor.json +79d8d2cab48084c0d17b49a2259897c1a98b3604 data/byg/loot_tables/blocks/holly_wood.json +ebf8f815a6f6b2f249d221bc2400af59e768f3aa data/byg/loot_tables/blocks/imparius_bookshelf.json +7950949e701661559e30b5030f593229b51ea37b data/byg/loot_tables/blocks/imparius_button.json +77f4507928937af499ff1ea766ec19b660f3fed2 data/byg/loot_tables/blocks/imparius_crafting_table.json +e9cc50a2d0ad301c961458b2ef7055f2d55d5976 data/byg/loot_tables/blocks/imparius_door.json +fc2a7d626071145a42a0386656ff6d584e862f9c data/byg/loot_tables/blocks/imparius_fence.json +1da8952cf9c247439db3e333a0fe81c140b2165e data/byg/loot_tables/blocks/imparius_fence_gate.json +5bf5aecb0c17f77f43db8d23641d346d5b77306b data/byg/loot_tables/blocks/imparius_hyphae.json +241b5c3b79acc99ef8861e9a9faf9283cdfc6dec data/byg/loot_tables/blocks/imparius_mushroom.json +136c1bbc57999a3d02296dd2407b55ff020b638f data/byg/loot_tables/blocks/imparius_planks.json +532082c639e9e66e8b2475c0a1ed0ae867a3b99a data/byg/loot_tables/blocks/imparius_pressure_plate.json +70c90dac660fe61ee556750284b2dabe9e666371 data/byg/loot_tables/blocks/imparius_slab.json +36c9c862e04b27ef62f4ae3a53bd94eae96fc2f3 data/byg/loot_tables/blocks/imparius_stairs.json +3d36172be374f58f30fe3a00cc5a730935d85c54 data/byg/loot_tables/blocks/imparius_stem.json +9c0568917407b5286ef4a7f8da3423d89563b975 data/byg/loot_tables/blocks/imparius_trapdoor.json +0ceec5e3cc6eda6a767d58b57ee8174718a490e1 data/byg/loot_tables/blocks/jacaranda_bookshelf.json +0ca80df93af8ac7f4eaf1f8fa1b277aae0b773ef data/byg/loot_tables/blocks/jacaranda_button.json +1a28ed35384438b27b83a3952380bb87b490501f data/byg/loot_tables/blocks/jacaranda_crafting_table.json +6848c67497f792555a10da3f3853d350ceaef312 data/byg/loot_tables/blocks/jacaranda_door.json +b6661279d199d94e281ee3977bdc8664b5805aac data/byg/loot_tables/blocks/jacaranda_fence.json +ad53834ab8e2526cde5101930e463ddae1e1e9f6 data/byg/loot_tables/blocks/jacaranda_fence_gate.json +143d6d5bcec985db959e6d32fc1d3b866e115283 data/byg/loot_tables/blocks/jacaranda_leaves.json +05e2faff93825d25b97497cbb219b7ca19fc5d1c data/byg/loot_tables/blocks/jacaranda_log.json +5f6f4355961c76f5c989e9d88e92049f4ae2cba2 data/byg/loot_tables/blocks/jacaranda_planks.json +8e4b71f27e99356ce93717c87674467c8db7358d data/byg/loot_tables/blocks/jacaranda_pressure_plate.json +1139c74e917034b1281960e0ca28ac1d88e57096 data/byg/loot_tables/blocks/jacaranda_sapling.json +6911bfe176770c4a0dfcf854f8c2864ef578f0bf data/byg/loot_tables/blocks/jacaranda_slab.json +0bd018ef3c769002b130d6b24f28a24f4ec7b37e data/byg/loot_tables/blocks/jacaranda_stairs.json +ab27f287e25d20b0a4611ff392ce22380a4223f5 data/byg/loot_tables/blocks/jacaranda_trapdoor.json +af14e7d2e14b57eb8ced83d1cc15fef550626032 data/byg/loot_tables/blocks/jacaranda_wood.json +f43805d8428f560b9d6769fe8225fb01faf75661 data/byg/loot_tables/blocks/lament_bookshelf.json +4d57a3d0e7d70a71187990656acd9b0be6a3abe1 data/byg/loot_tables/blocks/lament_button.json +d348ba543d6054932946e1fddf8b7ad06b137e32 data/byg/loot_tables/blocks/lament_crafting_table.json +ccc6c55e944eb7b992cf6e6f743a1f0121a26f90 data/byg/loot_tables/blocks/lament_door.json +b4dac1d2e406a42dddb4cd40296990094f8f4a3f data/byg/loot_tables/blocks/lament_fence.json +9232f874078b1a0411014d26559e70bf1cc21bec data/byg/loot_tables/blocks/lament_fence_gate.json +0bc626ae4086d4b92888d06d1394a6711320e517 data/byg/loot_tables/blocks/lament_leaves.json +3883b1767e021272c6fe7fe669124d5e0f6eb79f data/byg/loot_tables/blocks/lament_log.json +e126dad5e35224de08a7b558c7503f381da2b32a data/byg/loot_tables/blocks/lament_planks.json +14b9073a5dbe7705c932adc6594dcbe935edaea6 data/byg/loot_tables/blocks/lament_pressure_plate.json +abf4374f97c63c84c1ddca0bcb57d6208404a382 data/byg/loot_tables/blocks/lament_sapling.json +e535eec166ba82498cfeb98e0596db8b84a3c635 data/byg/loot_tables/blocks/lament_slab.json +ac67d8a344ed7abc98c55fcc299421aed5fcfe41 data/byg/loot_tables/blocks/lament_stairs.json +0c5cc01363ec61b45e9b00ab84c66bc392df48a1 data/byg/loot_tables/blocks/lament_trapdoor.json +c8a741720ca64ad7a1fcf9f9fd2e7dc1b327680f data/byg/loot_tables/blocks/lament_wood.json +93a87fe184c6c4247aa870092af80766c3e5da75 data/byg/loot_tables/blocks/mahogany_bookshelf.json +13ca364d14e638b723303c3e1730a0feac95f3e7 data/byg/loot_tables/blocks/mahogany_button.json +d25c27914da93622cddcaf0af79ea4e1267f3b3b data/byg/loot_tables/blocks/mahogany_crafting_table.json +6ed99a58b0dc5c9dbe186913297707bc14d2605a data/byg/loot_tables/blocks/mahogany_door.json +79e1a12370543521827617bd1f39b77243f95082 data/byg/loot_tables/blocks/mahogany_fence.json +9298cbe91ce8d512a72b1e94d958901bf53a4d69 data/byg/loot_tables/blocks/mahogany_fence_gate.json +1b4d022486a9b98c5bfcdeae1de9e16dddbce833 data/byg/loot_tables/blocks/mahogany_leaves.json +da526b5cc199d5d9de35cd3c7608fba35ee98918 data/byg/loot_tables/blocks/mahogany_log.json +b075b0714593d53f9dfab80a85453b70b676021d data/byg/loot_tables/blocks/mahogany_planks.json +bede3adce3a1d3cd47d92d5e0b5e7cd0c8e7135f data/byg/loot_tables/blocks/mahogany_pressure_plate.json +729663427e10d094a9ecc8b6af2d6f1bc0c73a4e data/byg/loot_tables/blocks/mahogany_sapling.json +9f2552de57b885c8aaeae30b5b3265664d349aa6 data/byg/loot_tables/blocks/mahogany_slab.json +6a986caf4fa73189647e6a0d825cc7b28399c816 data/byg/loot_tables/blocks/mahogany_stairs.json +1b3fa755c297261101dde8f9f0b52635dd439b25 data/byg/loot_tables/blocks/mahogany_trapdoor.json +96080e9f1cee2f83c01aab28c5c1ecb48e0c2f5d data/byg/loot_tables/blocks/mahogany_wood.json +d730b4638d73fbf7385469320f48f63bfd9d6341 data/byg/loot_tables/blocks/mangrove_bookshelf.json +2c3b8be32153750bc34305195293176812878316 data/byg/loot_tables/blocks/mangrove_button.json +c0bb774e93fcdd5f97c7e2a52caa9f596e9bdbda data/byg/loot_tables/blocks/mangrove_crafting_table.json +26f591ab971134e9ea2e79b8ab6f0e52cb7513f1 data/byg/loot_tables/blocks/mangrove_door.json +b224d315a16d924f852f942a576f2ca803c556f3 data/byg/loot_tables/blocks/mangrove_fence.json +c6acf18645559df21af8f86f533dc55a11e355ec data/byg/loot_tables/blocks/mangrove_fence_gate.json +d6f9867d25584168ca53ce4932463b02ed02d481 data/byg/loot_tables/blocks/mangrove_leaves.json +106d6611f64658a7bcc35dfceeb419913e46cf97 data/byg/loot_tables/blocks/mangrove_log.json +ab9640aebd5b7051becb8330b3b3ca4a2c8e69e3 data/byg/loot_tables/blocks/mangrove_planks.json +cf7afd2bda0e77f0908580420b207df3364133ea data/byg/loot_tables/blocks/mangrove_pressure_plate.json +e0ca13cf682dc596004b95d01579177251a9d020 data/byg/loot_tables/blocks/mangrove_sapling.json +613e5728b8a65d7523176969313e2e9abe1e464e data/byg/loot_tables/blocks/mangrove_slab.json +8240221971f809efad5b37bf10bed010f22ed82a data/byg/loot_tables/blocks/mangrove_stairs.json +18845dd277a8a2df7c4eb27ce4ffb36e8a83b4d6 data/byg/loot_tables/blocks/mangrove_trapdoor.json +3a01f5c689caa9c5aac60c7c1e00ac6b99b73e1a data/byg/loot_tables/blocks/mangrove_wood.json +71f45b3e43e7b4267b5f58c4b4f07546dabc7503 data/byg/loot_tables/blocks/maple_bookshelf.json +deabed93799a3d04b60fd7c1b4f3d896aa44c0a7 data/byg/loot_tables/blocks/maple_button.json +d7a6ea9e02ab40c6a5393a17107824914bd10d93 data/byg/loot_tables/blocks/maple_crafting_table.json +f6f0a77d04e0e79362240eab358c992583e4bffc data/byg/loot_tables/blocks/maple_door.json +fa7a980bde5e91cf5a187f89c7a662f95adfa902 data/byg/loot_tables/blocks/maple_fence.json +7703da7a6672c4fe5b0d9a7c2f657d89c790681f data/byg/loot_tables/blocks/maple_fence_gate.json +ea09e4fd26fc6921d4aebbf18eedd9a62e1f5420 data/byg/loot_tables/blocks/maple_leaves.json +dcf4c978d3ef9af781d23b39ed1cf71fcf3f3ec6 data/byg/loot_tables/blocks/maple_log.json +5769a0932e5d7d8b3cfe69408bc1e3b78c2f2600 data/byg/loot_tables/blocks/maple_planks.json +26aacfbccdfe3f216e266da48fdd79a6cb70445e data/byg/loot_tables/blocks/maple_pressure_plate.json +98252b21bcff2f5164076c8b784b875c37623e05 data/byg/loot_tables/blocks/maple_sapling.json +6a2a86d26780cd384a47bf71c0800417019f4ab3 data/byg/loot_tables/blocks/maple_slab.json +00cbb21eb48df7c6c44068d3be42468825647aec data/byg/loot_tables/blocks/maple_stairs.json +d658f0a526928e209575b3a492c0b6aef5b786bc data/byg/loot_tables/blocks/maple_trapdoor.json +331c51c5d073d6af3b86cd4aa279a693f84bc166 data/byg/loot_tables/blocks/maple_wood.json +87e220679c53be065780357b7d77529bf06567d9 data/byg/loot_tables/blocks/nightshade_bookshelf.json +f229ae5f063941b76f20cf4409d1ad11c132e5fc data/byg/loot_tables/blocks/nightshade_button.json +743ba512d026791637bb531865d660996616892d data/byg/loot_tables/blocks/nightshade_crafting_table.json +e42f6cf52971638bd23b62647d15490b5ad6a942 data/byg/loot_tables/blocks/nightshade_door.json +67942b1c959805fb4e7ee1d94701193829a114b0 data/byg/loot_tables/blocks/nightshade_fence.json +aba8cacfdafb05d9e35f803c2b3a382dcb2c5ecd data/byg/loot_tables/blocks/nightshade_fence_gate.json +979b06d46c41b9249b6267c45f460ef8c4b0ef0e data/byg/loot_tables/blocks/nightshade_leaves.json +fe72d175883a5aa16a31af42087a8aa8b2a1a454 data/byg/loot_tables/blocks/nightshade_log.json +e30aca37414a4d43586ea65ddca320c88cc18ac2 data/byg/loot_tables/blocks/nightshade_planks.json +364607ffd1f2d819cfe96703e68e801792a518a3 data/byg/loot_tables/blocks/nightshade_pressure_plate.json +67c0c5601d82968b54791c8aadfa153b92031ea0 data/byg/loot_tables/blocks/nightshade_sapling.json +785e38bb4f0e1d858102052d2dc56b1d5b82e423 data/byg/loot_tables/blocks/nightshade_slab.json +fbbcb5affc50dc9abd82d7304180ac9f09df487b data/byg/loot_tables/blocks/nightshade_stairs.json +0aaabc0b78d63d2b7c99c91c0919130498f74aa2 data/byg/loot_tables/blocks/nightshade_trapdoor.json +067c3d4db68e91cde9cd56f7cc4fc49d11799c59 data/byg/loot_tables/blocks/nightshade_wood.json +80f616568386bed8d37dd3f53acad4883cb11dfe data/byg/loot_tables/blocks/palm_bookshelf.json +71cafb051c4aa9ead37442e7cd6809a0e395c7ec data/byg/loot_tables/blocks/palm_button.json +06f76e8bbd1e9ba952dde47461e2a76dec2c3f06 data/byg/loot_tables/blocks/palm_crafting_table.json +7d5b39538bc9d2291e8d3dcadbf5b320e993b642 data/byg/loot_tables/blocks/palm_door.json +2fb710286cff2bcb2d40cfaa6a5c9da49a0a1edf data/byg/loot_tables/blocks/palm_fence.json +6ff7e8aaf052ee23b2bc1570b7975729895f1206 data/byg/loot_tables/blocks/palm_fence_gate.json +b8358b9c867da230bf0483d551e52366618cded4 data/byg/loot_tables/blocks/palm_leaves.json +05016a6f4a8635eb026246c210de06a5b57f60c0 data/byg/loot_tables/blocks/palm_log.json +58384d14852400bb7791acebc5bf0d5fa6cf6422 data/byg/loot_tables/blocks/palm_planks.json +5a4badfc830f778596a964ff88b9775fb4799d85 data/byg/loot_tables/blocks/palm_pressure_plate.json +b27aea3350f52e86cdbf0994efd204257ca276e9 data/byg/loot_tables/blocks/palm_sapling.json +8cf3450048c9c5f2372ea23a9b28c618874fd5d1 data/byg/loot_tables/blocks/palm_slab.json +648dfa24f653a034faa1691f17cb22a33c409036 data/byg/loot_tables/blocks/palm_stairs.json +81eaa1c8f3bb399f64bea1260e80e81871c001dc data/byg/loot_tables/blocks/palm_trapdoor.json +67b3f790fc11c6e4b03731265bb8c3a16a4b2e5b data/byg/loot_tables/blocks/palm_wood.json +bd37436617828b78c49c5d24065aaac8a932319d data/byg/loot_tables/blocks/pine_bookshelf.json +899ebf1140e7c1fe768fe74b204cee165b5ea175 data/byg/loot_tables/blocks/pine_button.json +2a2227520448b248069b7307139cb66b9dc1a506 data/byg/loot_tables/blocks/pine_crafting_table.json +2757a1e9a4609acae4c976cf3d44760b956b4650 data/byg/loot_tables/blocks/pine_door.json +f5eadb34ba92cfeee05663cd069d1eacaedd4a37 data/byg/loot_tables/blocks/pine_fence.json +1e0f61178071365f2a45186ceed71978d6eb06fe data/byg/loot_tables/blocks/pine_fence_gate.json +b5a1ceb6e374630b9880870c142fe9328ebe1adc data/byg/loot_tables/blocks/pine_leaves.json +1208fb898484a7a8f64bfd137e33c4c09c1f2d00 data/byg/loot_tables/blocks/pine_log.json +02077776920a661414aa886422346aefbe407c3c data/byg/loot_tables/blocks/pine_planks.json +183362b783e3eec4eb2b37f365ec621daac17856 data/byg/loot_tables/blocks/pine_pressure_plate.json +be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/pine_sapling.json +60e6ded8e5bdc569d641a8ef03f6b77e9d50af96 data/byg/loot_tables/blocks/pine_slab.json +860beef877197883976c86ec033f813b36e0034d data/byg/loot_tables/blocks/pine_stairs.json +e57c157b678cbcc65bccfeaff51cf9a9a245bb49 data/byg/loot_tables/blocks/pine_trapdoor.json +02043c8d0cef3c0a6a6bdb8c04aa8a83a6660e84 data/byg/loot_tables/blocks/pine_wood.json +5119f2f7f79bc753e66beb6a82d09e19fee77889 data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json +bde0a0722e9fee015e715db6e58211ebaa994405 data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json +98e88c37a09dbdb096155609c252931d24fdccdb data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json +c90013aecad10e82a01ae301970a2ddd300f6863 data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json +656ecc05a02c85936dca036de616130a60f3326c data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json +99f56cc9aedacb95b6ec909d804f8c6b1e684c58 data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json +dbee9dac52d9c0c996c93eb1a37a2de1e74d0f2a data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json +99412f8013fd4fba54a7f2e674c5f313b01bccc8 data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json +c11fefe42ac9d194ee58d385951989c118a3f8d9 data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json +20b751754bb9703f1715d9e36625efcdba20502c data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json +4277deb0748dead9ffa5db13043047b101e7bf15 data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json +42bd507cd8067a41b65bb7a8027219b7207907ce data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json +fb4671036519c5b43d27e15696802263a5bc6f1f data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json +cbe1f86effc6c5f4fe1e84d8bfbc76bcce98e020 data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json +580cfbf732c5649886e0e74dfab7aec696d2f190 data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json +7d79e5553725cb5711761e0be3b63cbe3d53794d data/byg/loot_tables/blocks/redwood_bookshelf.json +31451519b905fc6c111266f0ed6d9ee3673f4bb0 data/byg/loot_tables/blocks/redwood_button.json +91c73bfec94d59fb93418faaddaf0a0e194f2f89 data/byg/loot_tables/blocks/redwood_crafting_table.json +46ef8a70566018e8ef8e08649063315f8dabd027 data/byg/loot_tables/blocks/redwood_door.json +41a1a11eabddfefbfddd8d78d27cb6094ba703db data/byg/loot_tables/blocks/redwood_fence.json +93f7cec420a227819a12fc32e002790ae19f169d data/byg/loot_tables/blocks/redwood_fence_gate.json +54b5a209379daa5547a9a2429213254c7ff94a2f data/byg/loot_tables/blocks/redwood_leaves.json +b3067290862e9112f91f28ceb7429174b2d184e4 data/byg/loot_tables/blocks/redwood_log.json +97adbff5f7a483946f3d62c562ed7becdea2e0a2 data/byg/loot_tables/blocks/redwood_planks.json +ac75f7713715f4e601870f42c65c4ef08bf5d8ad data/byg/loot_tables/blocks/redwood_pressure_plate.json +d0d173ed0bad14836e55ea13af684503e5d9eafa data/byg/loot_tables/blocks/redwood_sapling.json +5550654e653ac56bb36183d66dc858a6c868bdf6 data/byg/loot_tables/blocks/redwood_slab.json +93f2892f1a504592b71721654241b3e9db230061 data/byg/loot_tables/blocks/redwood_stairs.json +19eb6314f23e1c4edfd12f46a8444e3b087b3516 data/byg/loot_tables/blocks/redwood_trapdoor.json +2f915291c83aea0f3de332e7d181261eea586207 data/byg/loot_tables/blocks/redwood_wood.json +74fc9c2586cd683e745a3ea8c4c1a63e68e32cd9 data/byg/loot_tables/blocks/skyris_bookshelf.json +fa33e9f7fcadb90d21cf4cbf6086e350c6c21d1b data/byg/loot_tables/blocks/skyris_button.json +70e96fec13b44fdc9868fe808c992fefcb1d645f data/byg/loot_tables/blocks/skyris_crafting_table.json +32457caf9cf9af966b4dbd4ee5ebe45fb3ec7952 data/byg/loot_tables/blocks/skyris_door.json +6b4d599ff802c427d3f8e24d66a9096aa2ff91e3 data/byg/loot_tables/blocks/skyris_fence.json +c4fa7d63702f0d56f18503580ce997fbbf4e5719 data/byg/loot_tables/blocks/skyris_fence_gate.json +c0c43509d7dbc48662c3b3a5532a8d080200cc7f data/byg/loot_tables/blocks/skyris_leaves.json +bf9e1251a504a965a7f128d66448e724fa0fed08 data/byg/loot_tables/blocks/skyris_log.json +a4e7fe64e838a52cc9572d412760c0dd065e5a64 data/byg/loot_tables/blocks/skyris_planks.json +7fdcdcafd57309a610d2a97134ba70067d8ad285 data/byg/loot_tables/blocks/skyris_pressure_plate.json +36ff436ff3fc00540de1a467d561633c09c469dd data/byg/loot_tables/blocks/skyris_sapling.json +ffea3eb1e308904cf7bbd0eebd3c6563755466ff data/byg/loot_tables/blocks/skyris_slab.json +8a98f8316e0adb8059e45a3b6a10ade3a62a16a0 data/byg/loot_tables/blocks/skyris_stairs.json +378c3104e8b2c03cd58b749f589f6b6bf42b366b data/byg/loot_tables/blocks/skyris_trapdoor.json +ac68190a1d7ca795972361bb6c4f10ccd82b71b0 data/byg/loot_tables/blocks/skyris_wood.json +50bb062ab000ccc9f5b9519b0e4299f80be5bc79 data/byg/loot_tables/blocks/stripped_aspen_log.json +251ed82b833721fbba301f71bacd681785e63ad2 data/byg/loot_tables/blocks/stripped_aspen_wood.json +68d559511398a89630963f9cff3a555702f0e106 data/byg/loot_tables/blocks/stripped_baobab_log.json +bd4e0910575a27de5b8d04a3a7c6e69dcba23fa5 data/byg/loot_tables/blocks/stripped_baobab_wood.json +2511dfdb6d68da7ec452b8ddab7856f12eb8d5d8 data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json +c062d461e29ea67d6b636b97e2cc6f8959721bc6 data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json +7f2f0b5b041f6ea94d8c1387b7f30fb36616b1c2 data/byg/loot_tables/blocks/stripped_bulbis_stem.json +0276f2f9b984c8d614badee24e169ebbd40e6b99 data/byg/loot_tables/blocks/stripped_bulbis_wood.json +2102897bec75a67bbf1038111a6c950921f0be37 data/byg/loot_tables/blocks/stripped_cherry_log.json +2bf4abe31416d9499ed8e25956f8049b4318158d data/byg/loot_tables/blocks/stripped_cherry_wood.json +dce9a7bc67442afe6f28120cc3acd541cefb9d7a data/byg/loot_tables/blocks/stripped_cika_log.json +776659ab112cbcb7f533f647e24d5dfd43894fe6 data/byg/loot_tables/blocks/stripped_cika_wood.json +11c8ac878636c904c5d2f1ab1814e115512eed13 data/byg/loot_tables/blocks/stripped_cypress_log.json +4118c3c81805cb96585212a5be183e34816626e0 data/byg/loot_tables/blocks/stripped_cypress_wood.json +5147dd970e050768e5aaf07e2c1f0444da6643c7 data/byg/loot_tables/blocks/stripped_ebony_log.json +6f5bfb35c35d05dbed1841f44c0ad117410a7944 data/byg/loot_tables/blocks/stripped_ebony_wood.json +377ad766d79414eb49dfec453d56e88fb5fd8111 data/byg/loot_tables/blocks/stripped_embur_hyphae.json +ed08ff2ef355f291ca82652c5a213377f7cb4ffe data/byg/loot_tables/blocks/stripped_embur_pedu.json +61aedff13721411bec487e3ca373790d37472a32 data/byg/loot_tables/blocks/stripped_ether_log.json +1fb440eccfa83ae9148b9b892a7c8e2e9f58b562 data/byg/loot_tables/blocks/stripped_ether_wood.json +714455a288c4ec9b09e314eb6f5f4d0f47e9994e data/byg/loot_tables/blocks/stripped_fir_log.json +3ad3504d88b7d398f1fc993e4db86663af317101 data/byg/loot_tables/blocks/stripped_fir_wood.json +189a43d41111d19e212b00100e84a4c7c35038a0 data/byg/loot_tables/blocks/stripped_green_enchanted_log.json +35df2273d2359309c33dbdc9574044493892c34a data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json +7794b993569d8eaabef2fc7dc8c1757b6b0bdbcb data/byg/loot_tables/blocks/stripped_holly_log.json +b96fa879b4c28bf34ae3344cc0da19465a4e322e data/byg/loot_tables/blocks/stripped_holly_wood.json +7b66fea60e5dc31d4fcb2e6b67298d3e1fcf26bc data/byg/loot_tables/blocks/stripped_jacaranda_log.json +989cf88c69c107faddefcbdc4960c04399dd1c6f data/byg/loot_tables/blocks/stripped_jacaranda_wood.json +7760ea74ab21ccab09d9f418e63d9268ff19f36f data/byg/loot_tables/blocks/stripped_lament_log.json +fcc1ea94ecf8a4ef8eee4a70ed57bba57e5b7968 data/byg/loot_tables/blocks/stripped_lament_wood.json +cc976777af32fbdc114170dc34330cf960db0af8 data/byg/loot_tables/blocks/stripped_mahogany_log.json +092e52bc8c5921b4ac918cafe989c5b2fcff3ab6 data/byg/loot_tables/blocks/stripped_mahogany_wood.json +5d2afbbcb16b871d2f5c16cc051e7e35caa932bd data/byg/loot_tables/blocks/stripped_mangrove_log.json +c99fa734b8cbc7e1c1ff59b60f46dc014e8ff474 data/byg/loot_tables/blocks/stripped_mangrove_wood.json +96a0acea6361090da9f255aaced345936d9b60eb data/byg/loot_tables/blocks/stripped_maple_log.json +92c3f6cca515bec10304ecf54b1d11d77674b7b5 data/byg/loot_tables/blocks/stripped_maple_wood.json +d3819bc66b519381c98fef6e1ab1d613a141e75e data/byg/loot_tables/blocks/stripped_nightshade_log.json +dda4ac5eee6c6573d8fab3a8def214c9dc4dda28 data/byg/loot_tables/blocks/stripped_nightshade_wood.json +a412aa220506c9e2f200cbe5825e17fcd97bdc88 data/byg/loot_tables/blocks/stripped_palm_log.json +3f3f7a5faaf83a4635ea94bd2167596d3f9fe6ba data/byg/loot_tables/blocks/stripped_palm_wood.json +64f77953c7cd8317c42761d2cf96cb058fe207cd data/byg/loot_tables/blocks/stripped_pine_log.json +5e8a7d936527bf5bcf6a34ac115591c7ba598950 data/byg/loot_tables/blocks/stripped_pine_wood.json +2fcb4b0f19b7efb84e605a6954f4fb813bc44b33 data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json +6c3aa44918312b6991045f7bf1956883df424d97 data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json +66be6fa5facb9b7e9f988979aed4a8244bf09918 data/byg/loot_tables/blocks/stripped_redwood_log.json +1a68ef530830481c221e71e5dc64ac296332c161 data/byg/loot_tables/blocks/stripped_redwood_wood.json +649968ac991ad2bcfe079b0ae020e3ad10112d6d data/byg/loot_tables/blocks/stripped_skyris_log.json +c1f486ac3e06c0359275c50900b9257bc29a5965 data/byg/loot_tables/blocks/stripped_skyris_wood.json +99819558464daaf4ad9f28e98aa9abd5064df038 data/byg/loot_tables/blocks/stripped_sythian_hyphae.json +6353d19c4a9b07e31775fb0af3e3438829f5d88a data/byg/loot_tables/blocks/stripped_sythian_stem.json +73fdb3dabb050e5512c40fceab03478ca7fa76b1 data/byg/loot_tables/blocks/stripped_willow_log.json +3f478e168254ebef744fd0bd9736de6df57ca460 data/byg/loot_tables/blocks/stripped_willow_wood.json +56c807a3607dbb2cdee1c10bd85a1637de6c6c87 data/byg/loot_tables/blocks/stripped_witch_hazel_log.json +f33b70b38fa3c70f997292d154182827174db146 data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json +e0afbb906e7cac0cf96707c5a1424150c07181f0 data/byg/loot_tables/blocks/stripped_zelkova_log.json +66cddb22b97449bbdc5266c6f150fe15c699eb55 data/byg/loot_tables/blocks/stripped_zelkova_wood.json +871283ac3300a469b6ad2f3a013dc88bc6fb3941 data/byg/loot_tables/blocks/sythian_bookshelf.json +d3503287ffb3d65d6a30d44b547c32abc046eeb0 data/byg/loot_tables/blocks/sythian_button.json +7cac1cc3a347b0f79d6295e668b83c5a74159843 data/byg/loot_tables/blocks/sythian_crafting_table.json +3477eee7d82bc1f36957ec4a224a26e753839b74 data/byg/loot_tables/blocks/sythian_door.json +2d206672da4371fcf2202ca6eb589971df073a40 data/byg/loot_tables/blocks/sythian_fence.json +5b66670a74e3fb50629ed16d7a8e0ffef45aeddd data/byg/loot_tables/blocks/sythian_fence_gate.json +78ec7dda56281a026011ac5457d3fe6cbd3f2980 data/byg/loot_tables/blocks/sythian_fungus.json +28be92a0ef940ced2c4561d1924aa4dc89a8ff0b data/byg/loot_tables/blocks/sythian_hyphae.json +8e6f41a44442da7c6767a0bb5d51905d7dcfa662 data/byg/loot_tables/blocks/sythian_planks.json +924a02a61f12020ad3954755a6f02c5a49ddbadf data/byg/loot_tables/blocks/sythian_pressure_plate.json +6ed0afc80d0b609ee7b7d5ef653fb8627fa4a4ae data/byg/loot_tables/blocks/sythian_slab.json +b7bdd6076a894bdf8700de7a75081ac707598d6a data/byg/loot_tables/blocks/sythian_stairs.json +bad0da7de372efddb7c82859e4f7c158c82487a0 data/byg/loot_tables/blocks/sythian_stem.json +d1b64f7bbea4eb042cab71a5334ec7049db7bf0b data/byg/loot_tables/blocks/sythian_trapdoor.json +60e6a26686f583d03eaea0eaee702652d24e4719 data/byg/loot_tables/blocks/sythian_wart_block.json +d2ac2565bc7687e98e4f3ce1cbc8d29ad829247e data/byg/loot_tables/blocks/willow_bookshelf.json +69de4fbb323c49eb27d1e4c00802702c00012fa9 data/byg/loot_tables/blocks/willow_button.json +2611bb1794cdf753d935629b033dd8fd54b4bdcd data/byg/loot_tables/blocks/willow_crafting_table.json +b889851a2853d156d1a74d36929afaa38865ce62 data/byg/loot_tables/blocks/willow_door.json +8cdf184825f577c657237b37b7315ccb47e98b82 data/byg/loot_tables/blocks/willow_fence.json +0649cb7cb89df6d767d1a67dcdf86f2b71a4d282 data/byg/loot_tables/blocks/willow_fence_gate.json +f98fd3d9fd1693de652d96f568eb82a1e3bbe182 data/byg/loot_tables/blocks/willow_leaves.json +2419212330208d07a4e8083944bc4c6359980d77 data/byg/loot_tables/blocks/willow_log.json +88d9922070b764920b2017ca34a4e1c3b89bfc17 data/byg/loot_tables/blocks/willow_planks.json +d16feca097f761a74490d5a5ce8096b220215c25 data/byg/loot_tables/blocks/willow_pressure_plate.json +d1f77c5d4586e93e383c4368a9a9e71c1e33744e data/byg/loot_tables/blocks/willow_sapling.json +99bbb214e2a52b0f9c83d0c1ff8fa82001834eb2 data/byg/loot_tables/blocks/willow_slab.json +e62edf561486a0e9559217a4e3a20d320abeb6e3 data/byg/loot_tables/blocks/willow_stairs.json +c9a3210632d12d1a4e64c40c65928295f1f37a41 data/byg/loot_tables/blocks/willow_trapdoor.json +c47b7c919fd17367e7572028aeb559f8de376567 data/byg/loot_tables/blocks/willow_wood.json +1b3ca8930d80d351669ca9c26eaf86621b69abd4 data/byg/loot_tables/blocks/witch_hazel_bookshelf.json +b07998686b02752346733bba051c7af1ed0b68ab data/byg/loot_tables/blocks/witch_hazel_button.json +15b3640c73e65bf7b65cca4c0c45f2f359e98a10 data/byg/loot_tables/blocks/witch_hazel_crafting_table.json +ae1a6b8b3c922a505645e6b06e827f8c9b51aae0 data/byg/loot_tables/blocks/witch_hazel_door.json +0e6076d76ba688dfe954d4262e931139abead6db data/byg/loot_tables/blocks/witch_hazel_fence.json +11c2f6ba78e1b4aa6b363a1b530ba558cd737cd9 data/byg/loot_tables/blocks/witch_hazel_fence_gate.json +fe760ae22644ff1ef18e525a83d2106dd0f87274 data/byg/loot_tables/blocks/witch_hazel_leaves.json +837bedf6428df9579cddbc335a9c8e2a01b59a50 data/byg/loot_tables/blocks/witch_hazel_log.json +c94799611bfd5ba96b1c3130d60069ee0dbe9f08 data/byg/loot_tables/blocks/witch_hazel_planks.json +a4232c2a72f0006fcce7cb341871536499238904 data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json +6598eadb6c1f8c9e77a717af9ae9add6e99db838 data/byg/loot_tables/blocks/witch_hazel_sapling.json +31413b8b215f4f6283ac95796abc27064530b77e data/byg/loot_tables/blocks/witch_hazel_slab.json +a9131abc8187e62ca476e3fb1e04f8b5982f85f1 data/byg/loot_tables/blocks/witch_hazel_stairs.json +fc322b84ce46a8b8fd1237a7ed49d571682c28ca data/byg/loot_tables/blocks/witch_hazel_trapdoor.json +5b813eee43120ab99b94a3189b85ef2a96bc566d data/byg/loot_tables/blocks/witch_hazel_wood.json +4971435da8bfd3e97008de63447a430a1bcf62cb data/byg/loot_tables/blocks/zelkova_bookshelf.json +7ddb7491227d8e2a73447507d58876af86809daa data/byg/loot_tables/blocks/zelkova_button.json +ad0ff2ed32e278a184747a181ecc282ed89c4cfc data/byg/loot_tables/blocks/zelkova_crafting_table.json +8fa91216147c96c1d8cd43674da34a577e25f082 data/byg/loot_tables/blocks/zelkova_door.json +f2b110cfeebd29bd0af39ff53df40e076b0fc470 data/byg/loot_tables/blocks/zelkova_fence.json +2524d16feb3ce6523e76e065495078fd6e1a5ebf data/byg/loot_tables/blocks/zelkova_fence_gate.json +3d8d6e7a35f16f13ef5a74505f595a5d4a1c2c70 data/byg/loot_tables/blocks/zelkova_leaves.json +d600547a5788f7083e0549f1ecf6f15525c82ce5 data/byg/loot_tables/blocks/zelkova_log.json +c074de11fe36eecba5c79e04419f117f5b48fd5a data/byg/loot_tables/blocks/zelkova_planks.json +5d1bace0bf6297f57d55ddf1fdf47d6896cc1ae3 data/byg/loot_tables/blocks/zelkova_pressure_plate.json +5bf789893e95ce60b66b8b48cc6fcf5ced5bef0a data/byg/loot_tables/blocks/zelkova_sapling.json +6d30fc27d8fa94dbfc0c51033207d36b01a390c7 data/byg/loot_tables/blocks/zelkova_slab.json +42f9e0310af3102984e3765efafbfc69753d865a data/byg/loot_tables/blocks/zelkova_stairs.json +744d023c8c56788532ee8fe06225e7ba6314faac data/byg/loot_tables/blocks/zelkova_trapdoor.json +d446b9231022f457d5191efba7722210419376db data/byg/loot_tables/blocks/zelkova_wood.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -2982,13 +3468,13 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press 325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json -a65e3d0b0d945bcde27df05748393f5e3a15930c data/minecraft/tags/items/buttons.json -94128ddfad4d48c9d296b54083d50c097814d2e1 data/minecraft/tags/items/leaves.json +5b589eb2db28a1fec4dfb121144942120b1fcf2a data/minecraft/tags/items/buttons.json +276995f080377c06cfeee9929e5545627eb1e990 data/minecraft/tags/items/leaves.json 63102c7b7730cab6fc0256b2daabbdfa985646ee data/minecraft/tags/items/planks.json -b1c2d261ac2e6cff88a5a8288b2a44955c27aee6 data/minecraft/tags/items/sand.json +2d9ef8549b06d032eac0645d79b9310168748ae8 data/minecraft/tags/items/sand.json 1d18ec5f0ccb00ad70f101654ee5aca8212b429e data/minecraft/tags/items/saplings.json -7f3599aa807e99334ab5b8120b231ae3f954613d data/minecraft/tags/items/slabs.json -d2ce8095ce735dc3c3a69752c80eb3211ea6b843 data/minecraft/tags/items/stairs.json +c2fce5e77d03f8770e644305bf76510b597ba575 data/minecraft/tags/items/slabs.json +0cd7c8aaeece1a54f94ac01b82ee78330e42ee8a data/minecraft/tags/items/stairs.json 2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/trapdoors.json 8274df19fcba3bc922fb34d382d999b33001c36e data/minecraft/tags/items/wooden_buttons.json 0664ba186292039eabbe1d8da09afdf5519473d8 data/minecraft/tags/items/wooden_doors.json diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json new file mode 100644 index 0000000000..39ec743e0a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "byg:aspen_bookshelf" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": 3.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:book" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json new file mode 100644 index 0000000000..e7d8f935a9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_button" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json new file mode 100644 index 0000000000..ee6f66a854 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_crafting_table" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json new file mode 100644 index 0000000000..c319e89504 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "byg:aspen_door", + "properties": { + "half": "lower" + } + } + ], + "name": "byg:aspen_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json new file mode 100644 index 0000000000..1007b140c5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_fence" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json new file mode 100644 index 0000000000..dc6f56d15d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_fence_gate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json index e95e25bc6f..4b69cf68ac 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json @@ -1,24 +1,29 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:item", - "name": "byg:nightshade_leaves", "conditions": [ { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -28,45 +33,45 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" + ] } - ] + ], + "name": "byg:aspen_leaves" }, { "type": "minecraft:item", - "name": "byg:nightshade_sapling", "conditions": [ { "condition": "minecraft:survives_explosion" }, { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, - 0.83333336, + 0.083333336, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } - ] + ], + "name": "byg:aspen_sapling" } ] } ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:stick", "conditions": [ { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.02, @@ -74,36 +79,42 @@ 0.025, 0.033333335, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } ], "functions": [ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" } - ] + ], + "name": "minecraft:stick" } ], "conditions": [ { + "condition": "minecraft:inverted", "term": { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -113,16 +124,12 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" - }, - "condition": "minecraft:inverted" + ] + } } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json similarity index 75% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json index 6721c25548..1b41e505af 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json @@ -2,11 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:sythian_stalk_block" + "name": "byg:aspen_log" } ], "conditions": [ diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json new file mode 100644 index 0000000000..5306707569 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_planks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json new file mode 100644 index 0000000000..dd3aeb6507 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_pressure_plate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json new file mode 100644 index 0000000000..e6519d1ed7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json new file mode 100644 index 0000000000..24ac18c5e9 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "byg:aspen_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "byg:aspen_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json new file mode 100644 index 0000000000..386e54df78 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json new file mode 100644 index 0000000000..36ec3c0a6a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_trapdoor" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_wart_block.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json similarity index 75% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_wart_block.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json index 781a27bad8..4c9639b6b2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_wart_block.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json @@ -2,11 +2,12 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:sythian_wart_block" + "name": "byg:aspen_wood" } ], "conditions": [ diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json index 0827854b79..174254c446 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json index 276e5a8ab2..9eb36b6170 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json index 09696c6404..f50193aa95 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json index 9e64daf1da..5952fbe375 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json index a732e5a5d3..132c366fda 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json index 3932f875cc..94bde00019 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json index b7af8cccc6..e1d78ed2ac 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json index 3c3dbbecec..404d16190f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json index c596ac6bec..f33ec73516 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json index db1590b25d..24daa28716 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json index 58edba9f72..fd01e1be94 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json index 255bdda090..68ee0c1596 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json index b903cd13fe..844cf1a1b8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json index b26a741483..5df84d8636 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/baobab_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json index bf9616d318..89971c514b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json similarity index 91% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json index fca4732237..56a9e3bb23 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json index 57196f9625..54d83bc4b5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json index 6b77ca450d..2e13e55ece 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json index 0c4754fffd..0585b0ce7c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json index fbffc1d3ff..b25ec19b06 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json index 0bef64d1a6..0b365ffa5f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json index 4aa2b66271..5c4c45604c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json index c8d9f13506..37325e225c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json index a38fda509d..2bc7c05cf7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json index 55548de442..fc44b7cc0d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json index 7cebbc31e4..65ab2a28fa 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json similarity index 87% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json index efb99befb2..d788eb77b3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json index bdccc7b0db..c983bb5f86 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json index 0b02648e17..c0d7d5db1c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json index e8e3083864..7647054fad 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json index fc8d490a78..aad70603d0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json index 9ef1673e03..d667d2b942 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json index fbe886ba37..8e9225ba2d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json index 1380c95301..91a5a10b99 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json index a56ed17cf8..b5a8fe24c2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json index a9f8c1ef98..f158620932 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_oddity.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_oddity.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json index f21794384c..11f625be42 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json index c405f73b23..d33a4f6bdd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json index 09e82b0ff3..151fc8502d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json index ed5ca0e3c4..fcf3d75564 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:bulbis_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:bulbis_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:bulbis_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json index 7d0c0c2284..6579ce0c7e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stem.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json index 326151e785..a0b8d89820 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json index 11a2705c5f..6cf7d6112c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json index 476d82ddd6..75d33ba32b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json index e7d733e83b..7029db9db2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json index b1b27c71e9..45125306ce 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json index 837e8837ca..0007c5b698 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json index f61b5ab634..88c3702d79 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json index 9bb127acba..9b0347dac3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json index aa856fef3f..9559f72227 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json index 6e923e7de6..107d0af7a3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json index a20b893e3f..c3aaf0944d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json index 461c84a6b5..96b05ece3f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json index afdc683642..c89f62e582 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json index 37f82dfb26..b4edfc20a5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json index 1a530fcd21..683777a15a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cherry_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json index 9c5b527926..b6ccb6a3a9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json index 7a07cf2483..e2785087ad 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json index 2558454bbc..f41faf9b49 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json index b463562937..ac57180b16 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json index 1021033117..1f5b4b880d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json index 910bcb3523..a17cbd7203 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json index 56245b8dbc..8075ce9956 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json index 33da6e9e42..6536d5df5a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json similarity index 85% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json index 912c3ca958..00cddd98f7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json index 98be628d87..22f9d9c6e7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json index 234c0286f3..26fd489a0b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json index 906286ce85..733c36087d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json index 27698f7ee2..8557d6d2cd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json index 6b40fa7195..24944b665d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json index c77d317ae2..03efa85a4f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cika_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json index 0008608ca6..afd56ba03a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json index 0a96480838..cda9218a8b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json index 9f6918d036..0a7a6e2216 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json index e25a705fa8..d5c342064b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json index ab6e7204f4..498f59f01b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json index 763b47b65e..a178c4e644 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json index d1516f61ff..a13da631fd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json index cfc14bf93f..0d9599fbc5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json index d653f337c1..035ddb7eef 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json index b5a9559f0d..1447f7a03d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json index 958e9ddd3f..72d68d4799 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json index eeb4efaeb7..36e1c97c80 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json index 93c1bd04cf..007bd6cb40 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json index a22bb2e934..e76d324aac 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json index 3bc0022ae9..71804ccca2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/cypress_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json index 296ca5dd7b..adfa2fd201 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json index 839d71de4c..5207e7a16f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json index 9a54f57aad..41db11b774 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json index 1eb35e0c7e..d71188bebf 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json index 0b7990cb0e..dc9729e72d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json index b394e73e63..6be7762899 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json index 2f6a3c63bd..3b64683af8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json index 97687d297f..fe14a0d8fe 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json index bfb6ea96a9..69a5ec24bd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json index e477fe3925..6a6144e290 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json index de5e829eda..7ac105e286 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json index 4a88a1bab2..eca2d5f92d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json index e2ce30b29e..624d176eac 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json index c53672ba9e..985bb36908 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json index 55e4e2304f..b72c85c3d2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ebony_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json index 9da824c326..0a144ee608 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json index b1c06b5e94..2813c60e49 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json index fd1e0f1953..e2bfba4535 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json index a399bdf6d9..ab4531bfd0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json index 2fbe9eb356..dc8af257fe 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json index 2f477fb83e..75c799f0d3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json index c631928b1e..b40aa08e78 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_hyphae.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json index 4d227f5636..683fdca611 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_pedu.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_pedu.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json index 2a698e337e..77d2ddc638 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_pedu.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json index 94c6a119c9..f4c81da917 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json index 9e6c7cf23c..88394e090e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json index f6a0f8303d..c8905ee47b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:embur_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:embur_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:embur_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json index b5bbe035a7..48d4923d2f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/embur_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json index cbc73250b5..0a914e4e93 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json new file mode 100644 index 0000000000..9704c258ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:embur_wart" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json index f2508d7b42..29c2fba5c5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json index a4fadefc57..74bc2161a2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json index c59457e9bb..db72bb7926 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json index 1f1ac31c00..faec67a7fd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json index b4d6333e83..0fec745633 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json index d87342e001..3d6ed1369e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json index dbb32b2c7b..bb33b01da5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json @@ -1,24 +1,29 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:item", - "name": "byg:ether_leaves", "conditions": [ { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -28,45 +33,45 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" + ] } - ] + ], + "name": "byg:ether_leaves" }, { "type": "minecraft:item", - "name": "byg:ether_sapling", "conditions": [ { "condition": "minecraft:survives_explosion" }, { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, - 0.83333336, + 0.083333336, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } - ] + ], + "name": "byg:ether_sapling" } ] } ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:stick", "conditions": [ { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.02, @@ -74,36 +79,42 @@ 0.025, 0.033333335, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } ], "functions": [ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" } - ] + ], + "name": "minecraft:stick" } ], "conditions": [ { + "condition": "minecraft:inverted", "term": { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -113,16 +124,12 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" - }, - "condition": "minecraft:inverted" + ] + } } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json similarity index 75% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json index 6cda45e6a6..cf7777000f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json index 1d3c73aa7d..cada090612 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json index 9c6fafbd8e..0dd9e651a1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json index 59e85ee07d..8349cfd79d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json index 42d28310af..a629859a20 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:ether_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:ether_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:ether_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json index 3b31a375ea..0eeb9cc4e7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json index a0d336207a..84b915e649 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/ether_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json index 79f29934b4..51549f2e3c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json index a6fcc9a11d..4e63ef2ee5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json index 030f0af1ab..7dae51a76d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json index d0abb8dbd8..b7d9ed28c7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json similarity index 91% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json index 4273a95407..c2ecab2fdb 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json index 17fc973aff..fac2653670 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json index d5c139668e..92452d0b63 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json index afac09f9b0..4267352ded 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json similarity index 85% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json index 6d944ffcd6..a0e898bf5a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json index 26cdb4709a..69990da37b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json index a1bb682eca..f4c5c08ba1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json index 76c36f2af0..863e53dbc2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json index 64d59542ad..6b88d76278 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json index 0a83b14536..c5e1a737e1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json index 2d1df2b136..3f3bd637d1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json similarity index 85% rename from Common/src/main/resources/data/byg/loot_tables/blocks/fir_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json index 6f8718fc83..bc67eaf6cc 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json similarity index 91% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json index 98ba6c1128..7107f4eb36 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json index cc7086e950..548f64270a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json index b3baeef843..9a5ceb4830 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json index 03773b721f..07c890f871 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json index 2bdb511d64..f555a68e40 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json index a34165e547..c11a44c378 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json similarity index 67% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json index d4bc0251db..63b44fdb40 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,62 +108,10 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } + "items": [ + "minecraft:shears" ] } - } - ] - } - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.005, - 0.0055555557, - 0.00625, - 0.008333334, - 0.025 - ] - } - ], - "name": "minecraft:apple" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": ["minecraft:shears"] - } }, { "condition": "minecraft:match_tool", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json index de5b22307d..3e6241aa3e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json index 47f1f0ecfe..69a841f4df 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json index cbdfab1462..676c4a6362 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json index c77a8f4b5d..aa3f852269 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json similarity index 87% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json index d09abe3076..680c9282de 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json index 0042f21c1d..077e1161c4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json index 569fcbc658..d1fc8c5134 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json index bbdb751d1a..569f78a82f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json index 884dde9c76..5d500c8f15 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json index a287761f44..3f328f6917 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json index 37ea7b4b00..3438f03394 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json index 37b2ab8d31..2208983e26 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json index 460448c976..f02d941899 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json index 71dd93ec14..1665448f78 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json index dd27ff2c27..6fc07467ce 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json index f957b53983..3374ed31a2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json index 94aacb75eb..867adcf5ed 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json index 159a8b6d8b..fa3185e68f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json index b469d19ba7..f8b99b8c8f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json index 94a058ae2b..3e7e087908 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json index ee3ebd4552..d87e579d06 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json index 5a85d5a51a..0443eec111 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/holly_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json index 814d9b2721..560a818004 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json index 2846658658..da7704eab9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json index 449a508ef1..1eb0fff9e6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json index 498589e01a..b80886484d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json index 4b1aeb30ee..5db9e307e9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json index b4a3053c90..dc41e5ea1d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json index eeb20fd715..1332eb6933 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_hyphae.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json index bc863ab83e..591d6c9b19 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_mushroom.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_mushroom.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json index 4adc731f33..c82de50d0d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_mushroom.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json index 32a4bdd235..4b2e380780 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json index 6cbcd1cdcb..1a5e210f72 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json index 077227e14b..90fb2714cd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:imparius_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:imparius_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:imparius_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json index 8a3034f529..d09cbe7f4f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stem.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json index 25219dbc5c..6756c25b53 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json index d245c219a0..729616efe2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json index 2a453ddad2..9c316fdc1d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json index a57dae5fae..98616bd948 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json index c3cf8715cb..45e25dfe2b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json index dafc89f2f2..cea329e3e9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json index bed44fd1ad..6646d55439 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json index 4de460b5f9..32bf40d76d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json index 657fae370b..280fd26250 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -48,9 +51,9 @@ "enchantment": "minecraft:fortune", "chances": [ 0.05, - 0.05, - 0.05, - 0.05 + 0.0625, + 0.083333336, + 0.1 ] } ], @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json index 3ce02b84e1..0865005846 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json index d646fc5191..699046849f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json index 1bed765b0b..bfa56c54b1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json index 86d193b3a3..8a3ac1eb62 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json index 62a3847ad8..b1b1efed9b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json index 8b1fe36983..95f542d67d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json index d749dd0be2..dbb32b1515 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json index 50cd49eaa3..de881b8359 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json index 76d94b1eba..13c718997e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json index 93d9312d1b..37dc504861 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json index a3868b7cb0..e7a0011c1e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json index dad2b28d0c..389652d5a9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json index 94dd9fa8d0..c4ee0c4cb1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json index 200779b5ae..efefcd3c71 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json index 2e87a15116..c27d067663 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json @@ -1,24 +1,29 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:item", - "name": "byg:lament_leaves", "conditions": [ { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -28,45 +33,45 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" + ] } - ] + ], + "name": "byg:lament_leaves" }, { "type": "minecraft:item", - "name": "byg:lament_sapling", "conditions": [ { "condition": "minecraft:survives_explosion" }, { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, - 0.83333336, + 0.083333336, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } - ] + ], + "name": "byg:lament_sapling" } ] } ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:stick", "conditions": [ { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.02, @@ -74,36 +79,42 @@ 0.025, 0.033333335, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } ], "functions": [ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" } - ] + ], + "name": "minecraft:stick" } ], "conditions": [ { + "condition": "minecraft:inverted", "term": { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -113,16 +124,12 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" - }, - "condition": "minecraft:inverted" + ] + } } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json index b2e02634b3..6e6e56dbf8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json index 1f9795f2f7..257996f109 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json index b2de4311ef..d24166b8e0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json index 5226a289f9..e6a84344d2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json index 2e2adbb825..08c2917710 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:lament_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:lament_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:lament_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json index 6ac7063f9b..a35fed9d75 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json index 97ac8725ef..ae7871cb6d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/lament_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json index db0d8efb92..2ef237e7a0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json index fff3b18315..d6a981af4c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json index a523d9e59d..cfc419586f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json index 3cf8840e6b..a3d77cb5b2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json index 5074ab7638..1eb26d61a7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json index 1ceed47444..47be00d7d1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json index f8f79ce3dc..3d169e2685 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json index 83caeae906..6786503c49 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json index b0bcef013f..3e38c392fd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json index 7104d2376b..cb4dfff0ff 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json index 916fb01c7e..88a1f95a7e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json index ce02686c84..bebf2c27f5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json index 7afb47222e..f6aa8c03ce 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json index ba929359d4..74d8f732d6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json index 4602e7e191..672dac06ed 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json index 9b4da8e1e0..faf510f791 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json index cb58fa5303..8b0d7087bc 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json index 7e002f52b2..f7f2c4ff5a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json index 067c405210..52f0c6bdab 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json index 989bae48a9..6cc4dbd3c2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json index 0f36f0c311..5f2c79af7c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json index 43700e3cab..4d1f4ebc08 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json index b5de33c796..bdbe0f00e2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json index d301b25baa..0fe530fae7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json index c2d6036ded..c9b3311230 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json index c13515daa5..8b30d3aa59 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json index 9b86fc5637..aec6e5e59d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json index 0be1b1bf9b..d72007ece9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json index 276cd279cc..2faad0c39c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json index 8b19def6b4..f26478ffbe 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json index b8043292eb..4bb874e168 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json index 6c19822050..f377b1a79f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json index a732f0ab9f..cf9070d2c4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json index 2663538b6f..112bb0e8c1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json index 3e541c0e52..9bb82727a2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json index 6a012a59a9..8e020478e5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json index f01f6bea41..6d279dfcb3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json index d6c41d7f31..aa7bb1c258 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json index 542b70b3d8..705758dd5d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json index 00f267ea6b..da4618ff14 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json index bfabed1762..2ccff804aa 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json index fe279543b6..c0b5268073 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json index bd28f167bb..9cd618cfbc 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json index de5e6aba4d..1ee26c5001 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json index 074895efbe..4be07bfe5c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/maple_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json index 4d4865595e..e981b442ca 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json index 10f7d04af7..ec3b7c5975 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json index e0d92a7af6..42dac6d57a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json similarity index 77% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json index 379f158e2e..224c65d392 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json index c9cb76fa1d..a9b6cd160a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json index 72254db795..ad1a5cb9e9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json index b9a0392a88..c82ed42bd2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json new file mode 100644 index 0000000000..094a8706f4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json @@ -0,0 +1,135 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ], + "name": "byg:nightshade_leaves" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.05, + 0.0625, + 0.083333336, + 0.1 + ] + } + ], + "name": "byg:nightshade_sapling" + } + ] + } + ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json index 33d86bf2eb..c954b8ef33 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json index 6413f0c02f..c5a7a02ccf 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json similarity index 77% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json index 6527f6f905..d48e80ec8d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json index e8861b0a53..8052a4865b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json index 6c73bdbc18..8a20a157d9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:nightshade_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:nightshade_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:nightshade_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json index f8e6841903..4c1730c8e1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json index 6c419d7d8a..a314d883ca 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json index b397a9d29f..a62dba5f24 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json index 647c3535f4..5da41af356 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json index 2daac57f22..6c73257090 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json index 0eb22ee58f..7aeafc8815 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json index 5b270544ff..8eaf7ebd5a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json index 206e675b20..fea31bb891 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json index f14f37d282..4206ae0c08 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json index dc3afa0d35..9e7c674c4e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json @@ -1,24 +1,29 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", "children": [ { "type": "minecraft:item", - "name": "byg:palm_leaves", "conditions": [ { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -28,45 +33,45 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" + ] } - ] + ], + "name": "byg:palm_leaves" }, { "type": "minecraft:item", - "name": "byg:palm_sapling", "conditions": [ { "condition": "minecraft:survives_explosion" }, { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, - 0.83333336, + 0.083333336, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } - ] + ], + "name": "byg:palm_sapling" } ] } ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:stick", "conditions": [ { + "condition": "minecraft:table_bonus", "enchantment": "minecraft:fortune", "chances": [ 0.02, @@ -74,36 +79,42 @@ 0.025, 0.033333335, 0.1 - ], - "condition": "minecraft:table_bonus" + ] } ], "functions": [ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" } - ] + ], + "name": "minecraft:stick" } ], "conditions": [ { + "condition": "minecraft:inverted", "term": { + "condition": "minecraft:alternative", "terms": [ { + "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - }, - "condition": "minecraft:match_tool" + "items": [ + "minecraft:shears" + ] + } }, { + "condition": "minecraft:match_tool", "predicate": { "enchantments": [ { @@ -113,16 +124,12 @@ } } ] - }, - "condition": "minecraft:match_tool" + } } - ], - "condition": "minecraft:alternative" - }, - "condition": "minecraft:inverted" + ] + } } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json similarity index 75% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json index e141d32957..6332117412 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json index ce86aac095..9b47bf4d88 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json index 70ed2705de..cd198b91d5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json index 31853c480d..37a918823a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json similarity index 65% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json index 55a7ef7ab8..fbd987f20f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:palm_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:palm_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:palm_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json index 72bfcbc8e1..ca2067b391 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json index 20521cf14e..cdb7c6f0cd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json similarity index 75% rename from Common/src/main/resources/data/byg/loot_tables/blocks/palm_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json index 2e90f5a267..94fc02223f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json index cadee6919e..16d168b587 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json index a1084cf1e1..ab0e759713 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json index 7abe396257..2d9d04c265 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json index 405391ef6c..321fd1a997 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json index dbf2248b60..51826f67e0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json index 258c75e993..ddef46cb85 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json index 5e836cafbb..a977792101 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json similarity index 85% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json index a9d474415f..73c45b0e39 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json index 3e190b5250..8f118e1b9f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json index 141020334b..ae326f012f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json index 69bb71b16b..6371ad2a67 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json index 8b5d73cb00..57a620a126 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json index b0f16eb061..ac409f5c03 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json index 5ce1c8234d..114d3d6ff0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/pine_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json index 2c161cd27d..4d677c86ba 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json similarity index 91% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json index bc45ad161c..98f7c2dcba 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json index d2b633ffaa..759c4e2449 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json index 7c74d176be..4a0558f424 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json index 805a6778b2..4670dd31b4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json index 64a630d9af..a159971516 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json index d399d3be25..9bb7d726cc 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json index 0ebef82ecb..a4eecbe40a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json index fbb2a0e089..87bb81855b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json index 4baad7a033..a49eee0092 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json index 6b342f6afe..7eb9e9230a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json index 10958f5719..8e262c8133 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json similarity index 79% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json index 22be8d3d00..73c88177d7 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -12,13 +13,14 @@ "conditions": [ { "condition": "minecraft:block_state_property", - "block": "byg:pine_slab", + "block": "byg:rainbow_eucalyptus_slab", "properties": { "type": "double" } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json index b6da70f019..e20a554d1e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json index 327f577303..d614a8098e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json index 9717a985cb..45a36b3e17 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json index b2353139a4..97e6e5cb88 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json index f2106a3936..ddcb7f9b43 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json index 70a449415f..d8fe969cc4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json index dd28e54f56..bd454869e9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json index fc90c7295f..a259965fe2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json index 3d3020e337..8432d4d03b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json index ab5cbc7fbb..e4f9be8aa6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json index f1735c8ead..264014f29e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json index aea0802baa..a67bd075b3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json index 14a61cd737..cc0e41fef2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json index 64066208fc..c66a085348 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json index c30f68714a..d41c935082 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json index e99e61c830..60c2d2dda1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json index 1f53df6e61..e1d70ddc98 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/redwood_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json index ef5825738b..a7540997a4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json index bae84314a2..8f79244356 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json index a9a3243d06..c6e5f1601e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json index 6f48eddf1f..75308c893a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json index 6bc3ccb883..3bfe033975 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json index 3442414906..29eee3c4a0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json index 0547fcf8ab..282e6ebb97 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json similarity index 67% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json index cb2d7bbe2a..88767a76e6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,62 +108,10 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } + "items": [ + "minecraft:shears" ] } - } - ] - } - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.005, - 0.0055555557, - 0.00625, - 0.008333334, - 0.025 - ] - } - ], - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": ["minecraft:shears"] - } }, { "condition": "minecraft:match_tool", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json index aa96149d45..6295c21eb3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json index 3b1086f484..0412dd4800 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json index 349a921596..3269dbc769 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json index 5a506f1272..e3c43375b4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json index 5d40c4e217..16aefbd123 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json index 816ff63e6b..024eed7843 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json index 289e2e6d2f..22496c9389 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/skyris_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json index 0773894f23..b9028f9e66 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json index 28a2dd8371..dfeb8b6484 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json index 1cbb2d2144..e8ba83c7c1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json index 448ec5b66e..7965f598ab 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json index 14708165c8..deb81ddbb4 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json index 26cd38bb03..0a33e3d30a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json index a582a9a020..f1392d9376 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json index 66ff85d2bc..4b0332ca9e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json index 81d8e159f8..fecadbe855 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json index 3b500e6471..6cdec0f524 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json index 1aa71d0adf..78fedeea07 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json index 70c737a550..c768fad8dd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json index 63fc4e1b26..dcdb77f6f1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json index 08ce274144..d803764257 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json index 2c222e3691..dee38abcd0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json index 9008d5ea92..563b0a1c70 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json index 4efd72cd3c..70d75aac32 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json index f37733b63e..dda7c135e8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json index bb2845c30e..5cd0c3cee2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json index c9bc3c4c2a..ad1d199ab5 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json index 5d943e4f08..a604abda6c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json index 8f9a6a0160..d38a68011e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json index c1f44c6d7b..d3a563ea4f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json index de797fc8fc..1cdbbbf50d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json index 4ea9b071cc..c7dded76b0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json index 63cc9566b1..f90cd3ebd2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json index 9fd916b9fa..a96198b2cb 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json index 4f5e9b3b3c..abe5fe6093 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json index cc87d3a688..44db28b55d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json index 637d53658d..301f33d637 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json index ada44945a7..7437a2912e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json index 7f8cb535ff..c62419ba4d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json index 13254cd94d..c3a3d9e936 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json index 3da5e3ef5c..af925ee1b6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json index 3cfc81a3d6..8ab69821c6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json index 2949c58721..65a756814f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json index ee685f3ec3..bef2a9f421 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json index 80235412eb..78a6e5b4fd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json similarity index 77% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json index b221b46830..56d42ac1fd 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json index 061d926bf4..e4d10f90d8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json index a4bf3c948b..b91076aad6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json index b9ba0105e0..9eddd67b8a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json index d26c88e767..3276972605 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json index 6624983aa5..3979db4a3b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json index 1debb99630..24d584e7d6 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json index fec4493e60..26332631b3 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json index 4169d01f3a..c664ab1a01 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json index f09d23c064..c144131713 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json index 8e42cbf9c8..298a44a773 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json index bf65794c76..90c855f65f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json index 44483ac111..0b8d44a8b0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json index 9a635f33a4..49c96e4e00 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json index f81d7d91fe..14803e6f3e 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json index 754762566b..a6fa10a5d0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json index d8431232f1..1bc41e80ec 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json index de071fc264..c745d310e2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json index 5377cd147e..37555b2cb2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json index 35849aa39f..e1ea2e9cb2 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json index 4ed114f88a..4c71a41328 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json index ea098be56d..a812171cac 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json index e11f481646..1b20db3577 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json index bf4a5976b7..542dab9e6c 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json index 23fb509460..afd05c114d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fungus.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fungus.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json index c9c1baa45c..b33f3634d0 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_fungus.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_hyphae.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json index 5132226180..7a15e2b250 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json index 374ae0318a..898c346358 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json index 65c541cdb8..22f78de967 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json similarity index 64% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json index 38ee0d2ce8..9947aa894a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json @@ -1,32 +1,34 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "byg:sythian_slab", "functions": [ - { - "function": "minecraft:explosion_decay" - }, { "function": "minecraft:set_count", "conditions": [ { + "condition": "minecraft:block_state_property", "block": "byg:sythian_slab", "properties": { "type": "double" - }, - "condition": "minecraft:block_state_property" + } } ], - "count": 2 + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" } - ] + ], + "name": "byg:sythian_slab" } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json index a08826ef8a..98b5b61a7b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stem.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json index b5fe4a7c2b..1ca4a3368f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json similarity index 76% rename from Common/src/main/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json index b4e4a9632f..2e8d0618df 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json @@ -1,7 +1,9 @@ { + "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -14,6 +16,5 @@ } ] } - ], - "type": "minecraft:block" + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json new file mode 100644 index 0000000000..e0bf36ee1b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json @@ -0,0 +1,135 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ], + "name": "byg:sythian_wart_block" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.05, + 0.0625, + 0.083333336, + 0.1 + ] + } + ], + "name": "byg:sythian_fungus" + } + ] + } + ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune", + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ] + } + ], + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 1.0, + "max": 2.0 + }, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": [ + "minecraft:shears" + ] + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json index dde1df6dd0..fdcb4ccd77 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json index cd0c66098e..c4a23fad50 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json index 92ff17ca78..2a3a1a130b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json index a75bc0fc0f..b1a53c42b9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json index ffd7735160..e80fc07d86 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json index 0d91b9cd10..558bb02d7b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json index ac3b110e00..814a90c9c1 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json index ca9863e310..34e019481b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json index 9e6412d592..6dab7c0e52 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json index 7aa41d5eb5..ee4d03f5ad 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json index c19d194156..dc2c76370a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json index e9034afac0..97de486403 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json index 6a89e3e845..3503313845 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json index 32e1005612..76c4dc3183 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/willow_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json index d32c76fd0f..fc92165782 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json similarity index 91% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json index abdfc76a5f..fdd6359e65 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json index aaaa0a5303..8449b2ef6a 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json index a6d8a6b384..662b9ec798 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json index 4729ae343a..4854b31d1b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json index 40b3624a6b..4ecd5c4126 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json index f9291364e8..1122a9b706 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json index a6112bdbda..035b089105 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json index 0b9329f3ae..4ff747e460 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json index 5a2e35d1b3..87ab742daa 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json index f7d647179d..7d1f1a311f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json index c72debc8c7..d4169e0053 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json index aa6f28e592..644cb20385 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json index e3990efb8a..94c019b339 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json index 7f11d752b2..d4eae99ce8 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json index a91964af19..4b3fb5547d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json similarity index 90% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json index 16b8f0585b..0c3ccd22da 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -31,7 +32,8 @@ "functions": [ { "function": "minecraft:set_count", - "count": 3 + "count": 3.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_button.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json index a93a15da60..0dd0a3a2ab 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json index 5c62742d82..1cd283ff91 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json similarity index 92% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_door.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json index b97d3fbe55..deeea34cf9 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json index fc4150c570..2727385136 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json index b5e879db8d..f0704e8adb 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json similarity index 88% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_leaves.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json index 3352b25984..45aa8ccd27 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:alternatives", @@ -16,7 +17,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { @@ -61,7 +64,8 @@ ] }, { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -82,10 +86,11 @@ { "function": "minecraft:set_count", "count": { + "type": "minecraft:uniform", "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } + "max": 2.0 + }, + "add": false }, { "function": "minecraft:explosion_decay" @@ -103,7 +108,9 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": ["minecraft:shears"] + "items": [ + "minecraft:shears" + ] } }, { diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_log.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json index 9d9ab3a0a0..fe175980ec 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_planks.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json index a9dea52f6f..916bf62386 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json index 9fed0192d2..ad0eebdb18 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sapling.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json index 589e5fb1a3..8c301c740f 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_slab.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json index dab4793240..ee1ab78c90 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", @@ -18,7 +19,8 @@ } } ], - "count": 2 + "count": 2.0, + "add": false }, { "function": "minecraft:explosion_decay" diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_stairs.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json index 7b1dde3771..5b79ebc6af 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json index 287155299a..780e1d620b 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json similarity index 86% rename from Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_wood.json rename to Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json index 74b7e66ec3..9f9748e727 100644 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json index aea71decff..af89dae560 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -2,33 +2,33 @@ "replace": false, "values": [ "byg:pine_button", - "byg:cika_button", + "byg:skyris_button", "byg:mahogany_button", - "byg:bulbis_button", - "byg:cypress_button", - "byg:jacaranda_button", + "byg:baobab_button", + "byg:fir_button", "byg:willow_button", - "byg:redwood_button", - "byg:palm_button", - "byg:skyris_button", + "byg:embur_button", + "byg:jacaranda_button", + "byg:mangrove_button", + "byg:bulbis_button", + "byg:sythian_button", + "byg:blue_enchanted_button", "byg:imparius_button", - "byg:lament_button", - "byg:nightshade_button", "byg:rainbow_eucalyptus_button", - "byg:fir_button", - "byg:witch_hazel_button", - "byg:blue_enchanted_button", - "byg:zelkova_button", - "byg:baobab_button", - "byg:sythian_button", - "byg:maple_button", - "byg:holly_button", - "byg:ether_button", - "byg:embur_button", "byg:ebony_button", - "byg:mangrove_button", + "byg:lament_button", "byg:aspen_button", + "byg:cika_button", + "byg:cherry_button", + "byg:ether_button", + "byg:nightshade_button", "byg:green_enchanted_button", - "byg:cherry_button" + "byg:palm_button", + "byg:holly_button", + "byg:cypress_button", + "byg:witch_hazel_button", + "byg:maple_button", + "byg:zelkova_button", + "byg:redwood_button" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index e7e0ccf8e4..09c649a713 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:white_cherry_leaves", - "byg:yellow_spruce_leaves", - "byg:joshua_leaves", - "byg:green_apple_skyris_leaves", - "byg:blue_spruce_leaves", - "byg:willow_leaves", - "byg:flowering_orchard_leaves", - "byg:lament_leaves", + "byg:flowering_palo_verde_leaves", "byg:brown_birch_leaves", - "byg:orange_birch_leaves", - "byg:fir_leaves", - "byg:rainbow_eucalyptus_leaves", - "byg:poison_ivy", - "byg:blooming_witch_hazel_leaves", + "byg:aspen_leaves", + "byg:witch_hazel_leaves", + "byg:jacaranda_leaves", + "byg:indigo_jacaranda_leaves", + "byg:skyris_vine", + "byg:green_enchanted_leaves", "byg:pink_cherry_leaves", + "byg:orange_birch_leaves", "byg:brown_zelkova_leaves", - "byg:lament_vine", - "byg:embur_gel_vines", - "byg:skyris_vine", - "byg:imparius_vine", - "byg:palm_leaves", - "byg:yellow_birch_leaves", - "byg:holly_leaves", - "byg:redwood_leaves", - "byg:mangrove_leaves", "byg:red_oak_leaves", - "byg:cypress_leaves", - "byg:silver_maple_leaves", - "byg:maple_leaves", + "byg:ebony_leaves", + "byg:green_apple_skyris_leaves", + "byg:pine_leaves", "byg:nightshade_leaves", "byg:red_birch_leaves", - "byg:araucaria_leaves", - "byg:aspen_leaves", + "byg:lament_leaves", "byg:red_maple_leaves", - "byg:ripe_orchard_leaves", - "byg:indigo_jacaranda_leaves", - "byg:flowering_nightshade_leaves", - "byg:flowering_palo_verde_leaves", - "byg:witch_hazel_leaves", - "byg:flowering_indigo_jacaranda_leaves", + "byg:araucaria_leaves", + "byg:shulkren_vine", + "byg:ether_leaves", + "byg:brown_oak_leaves", + "byg:red_spruce_leaves", + "byg:poison_ivy", + "byg:flowering_jacaranda_leaves", + "byg:holly_berry_leaves", + "byg:holly_leaves", + "byg:maple_leaves", + "byg:firecracker_leaves", "byg:orange_spruce_leaves", + "byg:flowering_indigo_jacaranda_leaves", + "byg:orange_oak_leaves", "byg:blue_enchanted_leaves", - "byg:flowering_jacaranda_leaves", + "byg:palm_leaves", + "byg:blooming_witch_hazel_leaves", + "byg:willow_leaves", + "byg:embur_gel_vines", + "byg:mangrove_leaves", + "byg:flowering_orchard_leaves", + "byg:yellow_spruce_leaves", + "byg:cypress_leaves", + "byg:joshua_leaves", + "byg:lament_vine", + "byg:yellow_birch_leaves", "byg:skyris_leaves", - "byg:withering_oak_leaves", - "byg:brown_oak_leaves", - "byg:pine_leaves", - "byg:baobab_leaves", - "byg:cika_leaves", + "byg:zelkova_leaves", + "byg:imparius_vine", + "byg:silver_maple_leaves", + "byg:palo_verde_leaves", + "byg:redwood_leaves", + "byg:fir_leaves", + "byg:flowering_nightshade_leaves", + "byg:rainbow_eucalyptus_leaves", "byg:orchard_leaves", + "byg:blue_spruce_leaves", + "byg:white_cherry_leaves", + "byg:baobab_leaves", "byg:mahogany_leaves", - "byg:shulkren_vine", - "byg:holly_berry_leaves", - "byg:orange_oak_leaves", - "byg:jacaranda_leaves", + "byg:cika_leaves", + "byg:ripe_orchard_leaves", "byg:ripe_joshua_leaves", - "byg:ether_leaves", - "byg:palo_verde_leaves", - "byg:zelkova_leaves", - "byg:red_spruce_leaves", - "byg:firecracker_leaves", - "byg:ebony_leaves", - "byg:green_enchanted_leaves" + "byg:withering_oak_leaves" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json index ff02114b76..a3fff869e4 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "byg:white_sand", "byg:end_sand", "byg:warped_soul_sand", - "byg:cracked_red_sand", + "byg:white_sand", + "byg:blue_sand", + "byg:windswept_sand", "byg:black_sand", - "byg:pink_sand", - "byg:warped_soul_soil", + "byg:cracked_red_sand", "byg:quartzite_sand", - "byg:windswept_sand", "byg:purple_sand", - "byg:blue_sand" + "byg:pink_sand", + "byg:warped_soul_soil" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json index 6a3ee9c79f..b46377c144 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:chiseled_therium_slab", - "byg:maple_slab", - "byg:baobab_slab", - "byg:cryptic_stone_slab", - "byg:palm_slab", + "byg:cattail_thatch_slab", + "byg:green_enchanted_slab", + "byg:willow_slab", + "byg:mahogany_slab", + "byg:imparius_slab", + "byg:smooth_windswept_sandstone_slab", + "byg:rocky_stone_slab", "byg:blue_enchanted_slab", - "byg:sythian_slab", - "byg:mossy_red_rock_brick_slab", + "byg:pine_slab", + "byg:holly_slab", + "byg:palm_slab", + "byg:scoria_stone_slab", + "byg:cut_windswept_sandstone_slab", + "byg:ebony_slab", "byg:cika_slab", + "byg:dacite_tile_slab", + "byg:mangrove_slab", + "byg:aspen_slab", + "byg:chiseled_therium_slab", + "byg:red_rock_slab", + "byg:scoria_cobblestone_slab", + "byg:polished_travertine_slab", + "byg:cracked_red_rock_brick_slab", "byg:ether_slab", - "byg:ebony_slab", + "byg:jacaranda_slab", + "byg:cypress_slab", + "byg:windswept_sandstone_slab", + "byg:chiseled_red_rock_brick_slab", + "byg:dacite_cobblestone_slab", + "byg:soapstone_slab", + "byg:redwood_slab", "byg:lament_slab", - "byg:chiseled_travertine_slab", + "byg:carved_ether_stone_slab", "byg:chiseled_windswept_sandstone_slab", - "byg:skyris_slab", - "byg:scoria_stone_slab", - "byg:purpur_stone_slab", - "byg:imparius_slab", - "byg:scoria_stonebrick_slab", "byg:embur_slab", "byg:bulbis_slab", - "byg:holly_slab", - "byg:dacite_brick_slab", - "byg:soapstone_slab", - "byg:rainbow_eucalyptus_slab", - "byg:windswept_sandstone_slab", - "byg:scoria_cobblestone_slab", - "byg:cattail_thatch_slab", - "byg:chiseled_red_rock_brick_slab", - "byg:carved_ether_stone_slab", - "byg:dacite_tile_slab", - "byg:dacite_cobblestone_slab", - "byg:red_rock_slab", + "byg:polished_soapstone_slab", + "byg:purpur_stone_slab", + "byg:cryptic_stone_slab", "byg:travertine_slab", - "byg:cypress_slab", - "byg:soapstone_brick_slab", + "byg:mossy_stone_slab", + "byg:mossy_red_rock_brick_slab", + "byg:red_rock_brick_slab", + "byg:nightshade_slab", + "byg:chiseled_fungal_imparius_slab", "byg:witch_hazel_slab", - "byg:rocky_stone_slab", - "byg:fir_slab", "byg:dacite_slab", - "byg:aspen_slab", + "byg:chiseled_travertine_slab", + "byg:rainbow_eucalyptus_slab", + "byg:skyris_slab", + "byg:fir_slab", + "byg:ether_stone_slab", + "byg:soapstone_brick_slab", + "byg:maple_slab", "byg:soapstone_tile_slab", - "byg:cobbled_ether_stone_slab", - "byg:shiny_chiseled_therium_slab", - "byg:pine_slab", - "byg:mangrove_slab", "byg:zelkova_slab", - "byg:ether_stone_slab", - "byg:smooth_windswept_sandstone_slab", - "byg:polished_soapstone_slab", - "byg:red_rock_brick_slab", - "byg:mahogany_slab", - "byg:polished_travertine_slab", - "byg:green_enchanted_slab", - "byg:redwood_slab", - "byg:mossy_stone_slab", - "byg:chiseled_fungal_imparius_slab", - "byg:nightshade_slab", - "byg:jacaranda_slab", - "byg:cut_windswept_sandstone_slab", + "byg:scoria_stonebrick_slab", + "byg:shiny_chiseled_therium_slab", "byg:cherry_slab", - "byg:willow_slab", - "byg:cracked_red_rock_brick_slab" + "byg:dacite_brick_slab", + "byg:sythian_slab", + "byg:cobbled_ether_stone_slab", + "byg:baobab_slab" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json index 74eae0e3ed..79ede6de53 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:purpur_stone_stairs", - "byg:maple_stairs", - "byg:scoria_stone_stairs", - "byg:green_enchanted_stairs", - "byg:cut_windswept_sandstone_stairs", - "byg:rocky_stone_stairs", - "byg:travertine_stairs", - "byg:carved_ether_stone_stairs", - "byg:cracked_red_rock_brick_stairs", - "byg:zelkova_stairs", - "byg:dacite_brick_stairs", - "byg:dacite_cobblestone_stairs", - "byg:rainbow_eucalyptus_stairs", - "byg:nightshade_stairs", - "byg:aspen_stairs", - "byg:red_rock_stairs", + "byg:polished_soapstone_stairs", "byg:cherry_stairs", - "byg:cattail_thatch_stairs", - "byg:pine_stairs", - "byg:willow_stairs", - "byg:soapstone_brick_stairs", - "byg:scoria_cobblestone_stairs", - "byg:dacite_stairs", - "byg:chiseled_windswept_sandstone_stairs", - "byg:jacaranda_stairs", - "byg:mossy_stone_stairs", - "byg:cobbled_ether_stone_stairs", - "byg:baobab_stairs", - "byg:mossy_red_rock_brick_stairs", - "byg:redwood_stairs", - "byg:bulbis_stairs", - "byg:scoria_stonebrick_stairs", - "byg:holly_stairs", - "byg:cryptic_stone_stairs", + "byg:red_rock_brick_stairs", "byg:chiseled_red_rock_brick_stairs", - "byg:palm_stairs", - "byg:fir_stairs", "byg:ether_stairs", - "byg:shiny_chiseled_therium_stairs", + "byg:cryptic_stone_stairs", + "byg:soapstone_tile_stairs", + "byg:scoria_stone_stairs", + "byg:purpur_stone_stairs", + "byg:fir_stairs", + "byg:windswept_sandstone_stairs", + "byg:dacite_cobblestone_stairs", "byg:dacite_tile_stairs", - "byg:polished_travertine_stairs", - "byg:ether_stone_stairs", - "byg:blue_enchanted_stairs", - "byg:smooth_windswept_sandstone_stairs", - "byg:sythian_stairs", "byg:imparius_stairs", - "byg:red_rock_brick_stairs", + "byg:red_rock_stairs", + "byg:nightshade_stairs", + "byg:pine_stairs", "byg:chiseled_therium_stairs", + "byg:rocky_stone_stairs", + "byg:mossy_red_rock_brick_stairs", "byg:skyris_stairs", - "byg:witch_hazel_stairs", + "byg:ether_stone_stairs", + "byg:mangrove_stairs", + "byg:chiseled_windswept_sandstone_stairs", + "byg:blue_enchanted_stairs", + "byg:soapstone_stairs", + "byg:soapstone_brick_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:cut_windswept_sandstone_stairs", "byg:embur_stairs", - "byg:windswept_sandstone_stairs", - "byg:ebony_stairs", "byg:cypress_stairs", - "byg:mangrove_stairs", + "byg:holly_stairs", + "byg:scoria_stonebrick_stairs", + "byg:cattail_thatch_stairs", + "byg:aspen_stairs", "byg:mahogany_stairs", - "byg:soapstone_tile_stairs", + "byg:ebony_stairs", + "byg:smooth_windswept_sandstone_stairs", + "byg:mossy_stone_stairs", + "byg:witch_hazel_stairs", + "byg:maple_stairs", + "byg:cracked_red_rock_brick_stairs", + "byg:green_enchanted_stairs", + "byg:polished_travertine_stairs", + "byg:palm_stairs", "byg:lament_stairs", + "byg:scoria_cobblestone_stairs", + "byg:dacite_stairs", + "byg:bulbis_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:travertine_stairs", + "byg:carved_ether_stone_stairs", + "byg:chiseled_travertine_stairs", + "byg:willow_stairs", + "byg:zelkova_stairs", + "byg:dacite_brick_stairs", "byg:cika_stairs", "byg:chiseled_fungal_imparius_stairs", - "byg:soapstone_stairs", - "byg:polished_soapstone_stairs", - "byg:chiseled_travertine_stairs" + "byg:redwood_stairs", + "byg:sythian_stairs", + "byg:jacaranda_stairs", + "byg:baobab_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index e8c28cfed6..fe456fecc9 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -7,6 +7,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.FluidTags; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.IndirectEntityDamageSource; @@ -14,12 +15,17 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.vehicle.Boat; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.NotNull; import potionstudios.byg.common.block.BYGBlocks; @@ -28,6 +34,8 @@ import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.mixin.access.BoatEntityAccess; +import java.util.List; + @SuppressWarnings("EntityConstructor") public class BYGBoatEntity extends Boat { private static final EntityDataAccessor BYG_BOAT_TYPE = SynchedEntityData.defineId(BYGBoatEntity.class, EntityDataSerializers.INT); @@ -46,6 +54,15 @@ public BYGBoatEntity(EntityType boatEntityType, Level worldType) super(boatEntityType, worldType); } + public List getDrops() { +// if (level instanceof ServerLevel serverLevel) { +// LootContext lootContext = new LootContext.Builder(serverLevel).withParameter(LootContextParams.BLOCK_STATE, state).create(LootContextParamSets.BLOCK); +// LootTable lootTable = serverLevel.getServer().getLootTables().get(resourceLocation); +// return lootTable.getRandomItems(lootContext); +// } + return List.of(); + } + @Override public @NotNull Item getDropItem() { final var type = BYGWoodTypes.LOOKUP.get(getBYGBoatType().getName()); diff --git a/Common/src/main/resources/data/byg/loot_tables/advancement/biomepedia_gift.json b/Common/src/main/resources/data/byg/loot_tables/advancement/biomepedia_gift.json index 0a02bc19b2..997c85191d 100644 --- a/Common/src/main/resources/data/byg/loot_tables/advancement/biomepedia_gift.json +++ b/Common/src/main/resources/data/byg/loot_tables/advancement/biomepedia_gift.json @@ -2,7 +2,7 @@ "type": "minecraft:gift", "pools": [ { - "rolls": 1.0, + "rolls": 1, "bonus_rolls": 0.0, "entries": [ { diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java index 82f520eb7e..52e6bde884 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java @@ -1,20 +1,21 @@ package potionstudios.byg.datagen.providers.loot; import net.minecraft.data.loot.BlockLoot; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import potionstudios.byg.common.block.BYGWoodTypes; import javax.annotation.Nullable; +import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Supplier; class BYGBlockLootProvider extends BlockLoot { - private static final float[] NORMAL_LEAVES_SAPLING_CHANCES = new float[]{0.05F, 0.0625F, 0.083333336F, 0.1F}; + private static final float[] NORMAL_LEAVES_SAPLING_CHANCES = { 0.05F, 0.0625F, 0.083333336F, 0.1F }; @Override protected void addTables() { @@ -39,6 +40,12 @@ protected void addTables() { } } + @Override + public void accept(BiConsumer p_124179_) { + addTables(); + map.forEach(p_124179_); + } + public void dropSelf(@Nullable Supplier pBlock) { if (pBlock != null) super.dropSelf(pBlock.get()); diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java index c2a343be77..52569058c1 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java @@ -5,10 +5,14 @@ import net.minecraft.data.loot.LootTableProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.LootTables; +import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import org.jetbrains.annotations.NotNull; import java.util.List; +import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; @@ -26,4 +30,9 @@ public BYGLootTablesProvider(DataGenerator pGenerator) { protected List>>, LootContextParamSet>> getTables() { return tables; } + + @Override + protected void validate(Map map, @NotNull ValidationContext validationtracker) { + map.forEach((p_218436_2_, p_218436_3_) -> LootTables.validate(validationtracker, p_218436_2_, p_218436_3_)); + } } diff --git a/Forge/src/main/resources/META-INF/accesstransformer.cfg b/Forge/src/main/resources/META-INF/accesstransformer.cfg index 5b6b04d496..78a2523ef3 100644 --- a/Forge/src/main/resources/META-INF/accesstransformer.cfg +++ b/Forge/src/main/resources/META-INF/accesstransformer.cfg @@ -21,4 +21,7 @@ public-f net.minecraft.world.level.biome.OverworldBiomeBuilder public net.minecraft.world.level.biome.OverworldBiomeBuilder m_187160_(II)Lnet/minecraft/resources/ResourceKey; # pickBeachBiome public net.minecraft.world.level.biome.OverworldBiomeBuilder m_187240_(IILnet/minecraft/world/level/biome/Climate$Parameter;)Lnet/minecraft/resources/ResourceKey; # pickPeakBiome -public net.minecraft.world.level.biome.OverworldBiomeBuilder m_187244_(IILnet/minecraft/world/level/biome/Climate$Parameter;)Lnet/minecraft/resources/ResourceKey; # pickSlopeBiome \ No newline at end of file +public net.minecraft.world.level.biome.OverworldBiomeBuilder m_187244_(IILnet/minecraft/world/level/biome/Climate$Parameter;)Lnet/minecraft/resources/ResourceKey; # pickSlopeBiome + +# Datagen +public net.minecraft.data.loot.BlockLoot f_124070_ # map \ No newline at end of file From 45235f0969310aa3830134936527d4865adbc151 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 13:19:29 +0300 Subject: [PATCH 61/90] Make boats drop a table --- Common/src/generated/resources/.cache/cache | 54 +++++++++- .../data/byg/loot_tables/boats/aspen.json | 15 +++ .../byg/loot_tables/boats/aspen_fall.json | 25 +++++ .../data/byg/loot_tables/boats/baobab.json | 15 +++ .../byg/loot_tables/boats/baobab_fall.json | 25 +++++ .../byg/loot_tables/boats/blue_enchanted.json | 15 +++ .../boats/blue_enchanted_fall.json | 25 +++++ .../data/byg/loot_tables/boats/cherry.json | 15 +++ .../byg/loot_tables/boats/cherry_fall.json | 25 +++++ .../data/byg/loot_tables/boats/cika.json | 15 +++ .../data/byg/loot_tables/boats/cika_fall.json | 25 +++++ .../data/byg/loot_tables/boats/cypress.json | 15 +++ .../byg/loot_tables/boats/cypress_fall.json | 25 +++++ .../data/byg/loot_tables/boats/ebony.json | 15 +++ .../byg/loot_tables/boats/ebony_fall.json | 25 +++++ .../data/byg/loot_tables/boats/fir.json | 15 +++ .../data/byg/loot_tables/boats/fir_fall.json | 25 +++++ .../loot_tables/boats/green_enchanted.json | 15 +++ .../boats/green_enchanted_fall.json | 25 +++++ .../data/byg/loot_tables/boats/holly.json | 15 +++ .../byg/loot_tables/boats/holly_fall.json | 25 +++++ .../data/byg/loot_tables/boats/jacaranda.json | 15 +++ .../byg/loot_tables/boats/jacaranda_fall.json | 25 +++++ .../data/byg/loot_tables/boats/mahogony.json | 15 +++ .../byg/loot_tables/boats/mahogony_fall.json | 25 +++++ .../data/byg/loot_tables/boats/mangrove.json | 15 +++ .../byg/loot_tables/boats/mangrove_fall.json | 25 +++++ .../data/byg/loot_tables/boats/maple.json | 15 +++ .../byg/loot_tables/boats/maple_fall.json | 25 +++++ .../data/byg/loot_tables/boats/palm.json | 15 +++ .../data/byg/loot_tables/boats/palm_fall.json | 25 +++++ .../data/byg/loot_tables/boats/pine.json | 15 +++ .../data/byg/loot_tables/boats/pine_fall.json | 25 +++++ .../loot_tables/boats/rainbow_eucalyptus.json | 15 +++ .../boats/rainbow_eucalyptus_fall.json | 25 +++++ .../data/byg/loot_tables/boats/redwood.json | 15 +++ .../byg/loot_tables/boats/redwood_fall.json | 25 +++++ .../data/byg/loot_tables/boats/skyris.json | 15 +++ .../byg/loot_tables/boats/skyris_fall.json | 25 +++++ .../data/byg/loot_tables/boats/willow.json | 15 +++ .../byg/loot_tables/boats/willow_fall.json | 25 +++++ .../byg/loot_tables/boats/witch_hazel.json | 15 +++ .../loot_tables/boats/witch_hazel_fall.json | 25 +++++ .../data/byg/loot_tables/boats/zelkova.json | 15 +++ .../byg/loot_tables/boats/zelkova_fall.json | 25 +++++ .../data/minecraft/tags/items/buttons.json | 42 ++++---- .../data/minecraft/tags/items/leaves.json | 100 +++++++++--------- .../data/minecraft/tags/items/sand.json | 14 +-- .../data/minecraft/tags/items/slabs.json | 100 +++++++++--------- .../data/minecraft/tags/items/stairs.json | 100 +++++++++--------- .../byg/common/block/BYGWoodTypes.java | 8 +- .../byg/common/entity/boat/BYGBoatEntity.java | 66 +++++++----- .../byg/common/loot/BYGLootContextParams.java | 14 +++ .../byg/loot_tables/blocks/embur_wart.json | 19 ---- .../providers/loot/BYGEntityLootProvider.java | 49 +++++++++ .../providers/loot/BYGLootTablesProvider.java | 7 +- .../providers/tag/BYGBiomeTagsProvider.java | 3 + .../providers/tag/BYGBlockTagsProvider.java | 14 +-- .../providers/tag/BYGEntityTagsProvider.java | 3 + .../providers/tag/BYGItemTagsProvider.java | 9 ++ .../byg/datagen/util/DatagenUtils.java | 25 +++++ 61 files changed, 1265 insertions(+), 242 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cika.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/fir.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/holly.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/maple.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/palm.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/pine.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/willow.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json create mode 100644 Common/src/main/java/potionstudios/byg/common/loot/BYGLootContextParams.java delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/embur_wart.json create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGEntityLootProvider.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 4c412a26ac..0d472b410c 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2879,6 +2879,50 @@ c074de11fe36eecba5c79e04419f117f5b48fd5a data/byg/loot_tables/blocks/zelkova_pla 42f9e0310af3102984e3765efafbfc69753d865a data/byg/loot_tables/blocks/zelkova_stairs.json 744d023c8c56788532ee8fe06225e7ba6314faac data/byg/loot_tables/blocks/zelkova_trapdoor.json d446b9231022f457d5191efba7722210419376db data/byg/loot_tables/blocks/zelkova_wood.json +7795f7198f4f974ffd7b3c7ba6d28246312c3237 data/byg/loot_tables/boats/aspen.json +1dea9498fe72a5719d91ddfe2ba0362bb6b687fb data/byg/loot_tables/boats/aspen_fall.json +0ad52e583462ca1e6a7bb29902bdbd97f2f3670d data/byg/loot_tables/boats/baobab.json +6cb5af47ce6bb4a0fa5c9a03243efc7b3abe9094 data/byg/loot_tables/boats/baobab_fall.json +90d279dc12d2ce7ee2129a2e5131c506f8a1fda2 data/byg/loot_tables/boats/blue_enchanted.json +917b89b03281005ce32635fa82e6a80900cc0054 data/byg/loot_tables/boats/blue_enchanted_fall.json +eb3e14915058dd57b40e3aa818b5696e2fc9f309 data/byg/loot_tables/boats/cherry.json +9eb0e2c03a97e42846050deb93151d24380dc809 data/byg/loot_tables/boats/cherry_fall.json +789a66ccfe2d2c06373573aabc0578a48ed92323 data/byg/loot_tables/boats/cika.json +5a1fbfa64947370c4aaa5d7fbb40d2cc187e5c48 data/byg/loot_tables/boats/cika_fall.json +8179d939014ca5c3d9ea5f5bac9efa3d14067e22 data/byg/loot_tables/boats/cypress.json +2a18fe46aff825cb0e45361687b6b7d50151783e data/byg/loot_tables/boats/cypress_fall.json +dba4f9ce69144f23dcd517fb7f4a39d9ada795ad data/byg/loot_tables/boats/ebony.json +8f7db3a9c330de726cdd4887f3a32e7ecf04ebe1 data/byg/loot_tables/boats/ebony_fall.json +564433034869072144ece0805ac00b61c82148a0 data/byg/loot_tables/boats/fir.json +acc904fddb88f497523a5c48aee5b225fb9e1d32 data/byg/loot_tables/boats/fir_fall.json +d943e0a94a6cffb570f1678f3049239d0878f9a5 data/byg/loot_tables/boats/green_enchanted.json +08fc132596921b3ccdbf104fd290665eb8ecf588 data/byg/loot_tables/boats/green_enchanted_fall.json +bb9aa72f7bd8112b6c554c9b0cd45b9803c3ba97 data/byg/loot_tables/boats/holly.json +3ec3c7f651ca25f79e15d00ecd96541a7e261a03 data/byg/loot_tables/boats/holly_fall.json +a28b90ff41ab5761076d1ff04d90f4ba0888d76f data/byg/loot_tables/boats/jacaranda.json +6f83fe1293ee4d708fd02dd122e15fcb2f5765d0 data/byg/loot_tables/boats/jacaranda_fall.json +2631023aa07b4b400cc3c88ec4b5877eda83ec06 data/byg/loot_tables/boats/mahogony.json +762f2b941bca08d2cf2935ab5ebe8e947ee66312 data/byg/loot_tables/boats/mahogony_fall.json +3fb704a6972f2290ab99b1c58930f04a93602778 data/byg/loot_tables/boats/mangrove.json +96398e69b9d697ef13f334b2759dbd6a9feb44ba data/byg/loot_tables/boats/mangrove_fall.json +42168783cf94b5a3c9a5ad941e74c6e22f5427c5 data/byg/loot_tables/boats/maple.json +df307e2a0f38b35615394a6156bcba07ad00464a data/byg/loot_tables/boats/maple_fall.json +1e9bee9f65df503f3e02bf82ee399594d7efed64 data/byg/loot_tables/boats/palm.json +78258f61d554f9fd5ce9323fb8a9f7aa91286e8e data/byg/loot_tables/boats/palm_fall.json +68dd36df6033005fdb4e5b552bd8b90db01ad37d data/byg/loot_tables/boats/pine.json +7b47e02811f5257a9207c3c24ee2c4742df4b423 data/byg/loot_tables/boats/pine_fall.json +163e4d5fe6fd4fd83488fc01c4043e6947b8d957 data/byg/loot_tables/boats/rainbow_eucalyptus.json +98de8a29aa5fdc4d716e3ea336b1bc27b80f5fa4 data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json +0e9a7864e80276e862b0c741203e9314bcd263a5 data/byg/loot_tables/boats/redwood.json +55cf5b60bf53bfca96198a17ef9d5355594b2f82 data/byg/loot_tables/boats/redwood_fall.json +6fc4608ec80d6f08c4e84d958d0161b456f73677 data/byg/loot_tables/boats/skyris.json +a48cf0c8caa95dbb302fb015bfdf05e9f1ebb708 data/byg/loot_tables/boats/skyris_fall.json +f3253f1e14798d091c0b300aa63bbb98d423ba09 data/byg/loot_tables/boats/willow.json +a0198827a9c0c7785b5b106778f779c7dbfd2322 data/byg/loot_tables/boats/willow_fall.json +caf921528f3b92b7d77ddac5072f2ad52c96f0d4 data/byg/loot_tables/boats/witch_hazel.json +5aad88a32a241a0a5918563608d1f1ce7dfe77d0 data/byg/loot_tables/boats/witch_hazel_fall.json +2e6ed906f34f3455ad8f41531ba67895c42b9cc1 data/byg/loot_tables/boats/zelkova.json +3f8e4e1adb2215043d07e8b292592329394eafed data/byg/loot_tables/boats/zelkova_fall.json a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json @@ -3468,13 +3512,13 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press 325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json -5b589eb2db28a1fec4dfb121144942120b1fcf2a data/minecraft/tags/items/buttons.json -276995f080377c06cfeee9929e5545627eb1e990 data/minecraft/tags/items/leaves.json +353ce646818ffcbeecbff5c27d3fdb6bacaa12fc data/minecraft/tags/items/buttons.json +4a2e954a2f375da12ddd5baa803b0bd4834ba703 data/minecraft/tags/items/leaves.json 63102c7b7730cab6fc0256b2daabbdfa985646ee data/minecraft/tags/items/planks.json -2d9ef8549b06d032eac0645d79b9310168748ae8 data/minecraft/tags/items/sand.json +f894df8189665458ebfb7d3d6521aae8efd3e2e5 data/minecraft/tags/items/sand.json 1d18ec5f0ccb00ad70f101654ee5aca8212b429e data/minecraft/tags/items/saplings.json -c2fce5e77d03f8770e644305bf76510b597ba575 data/minecraft/tags/items/slabs.json -0cd7c8aaeece1a54f94ac01b82ee78330e42ee8a data/minecraft/tags/items/stairs.json +7299da85b02355b85ae45bfe903cb37b0f00df45 data/minecraft/tags/items/slabs.json +2388fe24d3818b59b81555eb9fc9b9cc155b5c17 data/minecraft/tags/items/stairs.json 2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/trapdoors.json 8274df19fcba3bc922fb34d382d999b33001c36e data/minecraft/tags/items/wooden_buttons.json 0664ba186292039eabbe1d8da09afdf5519473d8 data/minecraft/tags/items/wooden_doors.json diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json new file mode 100644 index 0000000000..386e32e2d5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json new file mode 100644 index 0000000000..1d02ce45aa --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json new file mode 100644 index 0000000000..8bd90bf3a1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:baobab_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json new file mode 100644 index 0000000000..3a14725f41 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:baobab_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json new file mode 100644 index 0000000000..8eebf625f8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:blue_enchanted_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json new file mode 100644 index 0000000000..4ff3980f4a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:blue_enchanted_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json new file mode 100644 index 0000000000..f52b00fd24 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cherry_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json new file mode 100644 index 0000000000..6d5c60c3e3 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cherry_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json new file mode 100644 index 0000000000..9a95f5cda8 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cika_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json new file mode 100644 index 0000000000..0dbc769253 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cika_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json new file mode 100644 index 0000000000..bc3136d073 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cypress_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json new file mode 100644 index 0000000000..aca7c548ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cypress_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json new file mode 100644 index 0000000000..aa6c974555 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ebony_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json new file mode 100644 index 0000000000..ebcc567315 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ebony_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json b/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json new file mode 100644 index 0000000000..619009f06b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:fir_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json new file mode 100644 index 0000000000..a9c75669c2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:fir_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json new file mode 100644 index 0000000000..34041a9a9e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:green_enchanted_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json new file mode 100644 index 0000000000..6dadc2662f --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:green_enchanted_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json b/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json new file mode 100644 index 0000000000..26e143a32e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:holly_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json new file mode 100644 index 0000000000..507ff2269a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:holly_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json new file mode 100644 index 0000000000..bbb3694a05 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:jacaranda_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json new file mode 100644 index 0000000000..14c4c70f6f --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:jacaranda_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json new file mode 100644 index 0000000000..16885232ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mahogany_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json new file mode 100644 index 0000000000..ad6076eff1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mahogany_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json new file mode 100644 index 0000000000..5a2a283950 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mangrove_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json new file mode 100644 index 0000000000..8c20064b01 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mangrove_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json b/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json new file mode 100644 index 0000000000..67fb717c34 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:maple_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json new file mode 100644 index 0000000000..3a50613197 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:maple_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json b/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json new file mode 100644 index 0000000000..0ea1b411cb --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:palm_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json new file mode 100644 index 0000000000..83077b5711 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:palm_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json b/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json new file mode 100644 index 0000000000..8bb61e5401 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:pine_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json new file mode 100644 index 0000000000..84be8e598c --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:pine_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json new file mode 100644 index 0000000000..04fb72a644 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:rainbow_eucalyptus_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json new file mode 100644 index 0000000000..6745bd011e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:rainbow_eucalyptus_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json new file mode 100644 index 0000000000..ab21dde9c7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:redwood_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json new file mode 100644 index 0000000000..09b77b069c --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:redwood_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json new file mode 100644 index 0000000000..a3c2058ca0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:skyris_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json new file mode 100644 index 0000000000..5147a8019e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:skyris_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json b/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json new file mode 100644 index 0000000000..1060478b68 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:willow_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json new file mode 100644 index 0000000000..b65865f303 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:willow_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json new file mode 100644 index 0000000000..af315aab1a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:witch_hazel_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json new file mode 100644 index 0000000000..6d51d9332b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:witch_hazel_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json new file mode 100644 index 0000000000..14a482aec6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:zelkova_boat" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json new file mode 100644 index 0000000000..9ca156292e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 2.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick" + } + ] + }, + { + "rolls": 3.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:zelkova_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json index af89dae560..1e32a28c66 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -1,34 +1,34 @@ { "replace": false, "values": [ - "byg:pine_button", - "byg:skyris_button", + "byg:holly_button", "byg:mahogany_button", - "byg:baobab_button", - "byg:fir_button", - "byg:willow_button", + "byg:aspen_button", + "byg:maple_button", "byg:embur_button", - "byg:jacaranda_button", + "byg:ether_button", + "byg:fir_button", + "byg:redwood_button", "byg:mangrove_button", - "byg:bulbis_button", "byg:sythian_button", + "byg:zelkova_button", + "byg:cypress_button", "byg:blue_enchanted_button", - "byg:imparius_button", + "byg:bulbis_button", "byg:rainbow_eucalyptus_button", - "byg:ebony_button", - "byg:lament_button", - "byg:aspen_button", - "byg:cika_button", - "byg:cherry_button", - "byg:ether_button", + "byg:witch_hazel_button", + "byg:jacaranda_button", "byg:nightshade_button", - "byg:green_enchanted_button", "byg:palm_button", - "byg:holly_button", - "byg:cypress_button", - "byg:witch_hazel_button", - "byg:maple_button", - "byg:zelkova_button", - "byg:redwood_button" + "byg:baobab_button", + "byg:green_enchanted_button", + "byg:ebony_button", + "byg:skyris_button", + "byg:willow_button", + "byg:pine_button", + "byg:imparius_button", + "byg:cherry_button", + "byg:cika_button", + "byg:lament_button" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 09c649a713..500fee1987 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:flowering_palo_verde_leaves", - "byg:brown_birch_leaves", - "byg:aspen_leaves", - "byg:witch_hazel_leaves", - "byg:jacaranda_leaves", - "byg:indigo_jacaranda_leaves", - "byg:skyris_vine", - "byg:green_enchanted_leaves", - "byg:pink_cherry_leaves", - "byg:orange_birch_leaves", - "byg:brown_zelkova_leaves", - "byg:red_oak_leaves", - "byg:ebony_leaves", - "byg:green_apple_skyris_leaves", - "byg:pine_leaves", + "byg:mangrove_leaves", "byg:nightshade_leaves", + "byg:red_oak_leaves", "byg:red_birch_leaves", "byg:lament_leaves", - "byg:red_maple_leaves", - "byg:araucaria_leaves", + "byg:skyris_vine", "byg:shulkren_vine", - "byg:ether_leaves", + "byg:withering_oak_leaves", + "byg:blue_spruce_leaves", + "byg:indigo_jacaranda_leaves", + "byg:flowering_palo_verde_leaves", + "byg:pink_cherry_leaves", + "byg:ebony_leaves", + "byg:palm_leaves", + "byg:flowering_nightshade_leaves", + "byg:yellow_birch_leaves", "byg:brown_oak_leaves", - "byg:red_spruce_leaves", - "byg:poison_ivy", + "byg:ripe_orchard_leaves", + "byg:zelkova_leaves", + "byg:skyris_leaves", + "byg:brown_zelkova_leaves", "byg:flowering_jacaranda_leaves", + "byg:palo_verde_leaves", + "byg:ripe_joshua_leaves", + "byg:orange_spruce_leaves", + "byg:rainbow_eucalyptus_leaves", + "byg:orange_birch_leaves", + "byg:firecracker_leaves", + "byg:blooming_witch_hazel_leaves", + "byg:aspen_leaves", "byg:holly_berry_leaves", - "byg:holly_leaves", + "byg:white_cherry_leaves", + "byg:jacaranda_leaves", + "byg:brown_birch_leaves", + "byg:green_enchanted_leaves", + "byg:green_apple_skyris_leaves", + "byg:lament_vine", + "byg:silver_maple_leaves", + "byg:poison_ivy", + "byg:orchard_leaves", + "byg:pine_leaves", "byg:maple_leaves", - "byg:firecracker_leaves", - "byg:orange_spruce_leaves", - "byg:flowering_indigo_jacaranda_leaves", "byg:orange_oak_leaves", - "byg:blue_enchanted_leaves", - "byg:palm_leaves", - "byg:blooming_witch_hazel_leaves", - "byg:willow_leaves", + "byg:imparius_vine", + "byg:red_maple_leaves", "byg:embur_gel_vines", - "byg:mangrove_leaves", - "byg:flowering_orchard_leaves", - "byg:yellow_spruce_leaves", + "byg:cika_leaves", + "byg:fir_leaves", + "byg:witch_hazel_leaves", + "byg:redwood_leaves", "byg:cypress_leaves", "byg:joshua_leaves", - "byg:lament_vine", - "byg:yellow_birch_leaves", - "byg:skyris_leaves", - "byg:zelkova_leaves", - "byg:imparius_vine", - "byg:silver_maple_leaves", - "byg:palo_verde_leaves", - "byg:redwood_leaves", - "byg:fir_leaves", - "byg:flowering_nightshade_leaves", - "byg:rainbow_eucalyptus_leaves", - "byg:orchard_leaves", - "byg:blue_spruce_leaves", - "byg:white_cherry_leaves", - "byg:baobab_leaves", + "byg:holly_leaves", + "byg:flowering_orchard_leaves", + "byg:red_spruce_leaves", "byg:mahogany_leaves", - "byg:cika_leaves", - "byg:ripe_orchard_leaves", - "byg:ripe_joshua_leaves", - "byg:withering_oak_leaves" + "byg:willow_leaves", + "byg:blue_enchanted_leaves", + "byg:ether_leaves", + "byg:flowering_indigo_jacaranda_leaves", + "byg:yellow_spruce_leaves", + "byg:araucaria_leaves", + "byg:baobab_leaves" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json index a3fff869e4..0e70797020 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "byg:end_sand", + "byg:quartzite_sand", + "byg:warped_soul_soil", + "byg:cracked_red_sand", + "byg:black_sand", "byg:warped_soul_sand", "byg:white_sand", - "byg:blue_sand", "byg:windswept_sand", - "byg:black_sand", - "byg:cracked_red_sand", - "byg:quartzite_sand", - "byg:purple_sand", "byg:pink_sand", - "byg:warped_soul_soil" + "byg:purple_sand", + "byg:blue_sand", + "byg:end_sand" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json index b46377c144..4e887deffe 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:cattail_thatch_slab", - "byg:green_enchanted_slab", - "byg:willow_slab", - "byg:mahogany_slab", + "byg:chiseled_travertine_slab", + "byg:fir_slab", + "byg:windswept_sandstone_slab", + "byg:red_rock_slab", + "byg:mangrove_slab", + "byg:rainbow_eucalyptus_slab", + "byg:soapstone_slab", + "byg:embur_slab", + "byg:cut_windswept_sandstone_slab", "byg:imparius_slab", - "byg:smooth_windswept_sandstone_slab", - "byg:rocky_stone_slab", + "byg:soapstone_tile_slab", "byg:blue_enchanted_slab", + "byg:ether_stone_slab", + "byg:jacaranda_slab", + "byg:red_rock_brick_slab", + "byg:baobab_slab", "byg:pine_slab", - "byg:holly_slab", - "byg:palm_slab", - "byg:scoria_stone_slab", - "byg:cut_windswept_sandstone_slab", + "byg:carved_ether_stone_slab", "byg:ebony_slab", + "byg:nightshade_slab", + "byg:palm_slab", "byg:cika_slab", - "byg:dacite_tile_slab", - "byg:mangrove_slab", - "byg:aspen_slab", - "byg:chiseled_therium_slab", - "byg:red_rock_slab", - "byg:scoria_cobblestone_slab", - "byg:polished_travertine_slab", - "byg:cracked_red_rock_brick_slab", - "byg:ether_slab", - "byg:jacaranda_slab", - "byg:cypress_slab", - "byg:windswept_sandstone_slab", - "byg:chiseled_red_rock_brick_slab", - "byg:dacite_cobblestone_slab", - "byg:soapstone_slab", + "byg:maple_slab", + "byg:sythian_slab", + "byg:cobbled_ether_stone_slab", "byg:redwood_slab", - "byg:lament_slab", - "byg:carved_ether_stone_slab", "byg:chiseled_windswept_sandstone_slab", - "byg:embur_slab", - "byg:bulbis_slab", + "byg:cracked_red_rock_brick_slab", + "byg:dacite_brick_slab", + "byg:lament_slab", + "byg:scoria_stonebrick_slab", + "byg:green_enchanted_slab", + "byg:dacite_cobblestone_slab", + "byg:skyris_slab", + "byg:scoria_cobblestone_slab", + "byg:aspen_slab", + "byg:dacite_tile_slab", + "byg:soapstone_brick_slab", "byg:polished_soapstone_slab", - "byg:purpur_stone_slab", + "byg:willow_slab", + "byg:ether_slab", "byg:cryptic_stone_slab", - "byg:travertine_slab", + "byg:chiseled_therium_slab", + "byg:smooth_windswept_sandstone_slab", + "byg:witch_hazel_slab", + "byg:chiseled_red_rock_brick_slab", "byg:mossy_stone_slab", - "byg:mossy_red_rock_brick_slab", - "byg:red_rock_brick_slab", - "byg:nightshade_slab", + "byg:cattail_thatch_slab", + "byg:rocky_stone_slab", + "byg:cypress_slab", "byg:chiseled_fungal_imparius_slab", - "byg:witch_hazel_slab", "byg:dacite_slab", - "byg:chiseled_travertine_slab", - "byg:rainbow_eucalyptus_slab", - "byg:skyris_slab", - "byg:fir_slab", - "byg:ether_stone_slab", - "byg:soapstone_brick_slab", - "byg:maple_slab", - "byg:soapstone_tile_slab", - "byg:zelkova_slab", - "byg:scoria_stonebrick_slab", - "byg:shiny_chiseled_therium_slab", "byg:cherry_slab", - "byg:dacite_brick_slab", - "byg:sythian_slab", - "byg:cobbled_ether_stone_slab", - "byg:baobab_slab" + "byg:shiny_chiseled_therium_slab", + "byg:travertine_slab", + "byg:scoria_stone_slab", + "byg:mossy_red_rock_brick_slab", + "byg:polished_travertine_slab", + "byg:zelkova_slab", + "byg:mahogany_slab", + "byg:holly_slab", + "byg:purpur_stone_slab", + "byg:bulbis_slab" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json index 79ede6de53..1c18312c53 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -2,67 +2,67 @@ "replace": false, "values": [ "byg:polished_soapstone_stairs", - "byg:cherry_stairs", - "byg:red_rock_brick_stairs", - "byg:chiseled_red_rock_brick_stairs", - "byg:ether_stairs", - "byg:cryptic_stone_stairs", - "byg:soapstone_tile_stairs", - "byg:scoria_stone_stairs", - "byg:purpur_stone_stairs", - "byg:fir_stairs", - "byg:windswept_sandstone_stairs", - "byg:dacite_cobblestone_stairs", - "byg:dacite_tile_stairs", - "byg:imparius_stairs", + "byg:willow_stairs", "byg:red_rock_stairs", - "byg:nightshade_stairs", "byg:pine_stairs", - "byg:chiseled_therium_stairs", - "byg:rocky_stone_stairs", - "byg:mossy_red_rock_brick_stairs", + "byg:maple_stairs", + "byg:palm_stairs", "byg:skyris_stairs", + "byg:ebony_stairs", + "byg:chiseled_fungal_imparius_stairs", + "byg:mossy_red_rock_brick_stairs", "byg:ether_stone_stairs", - "byg:mangrove_stairs", - "byg:chiseled_windswept_sandstone_stairs", - "byg:blue_enchanted_stairs", - "byg:soapstone_stairs", - "byg:soapstone_brick_stairs", - "byg:cobbled_ether_stone_stairs", - "byg:rainbow_eucalyptus_stairs", + "byg:sythian_stairs", + "byg:chiseled_therium_stairs", + "byg:dacite_stairs", "byg:cut_windswept_sandstone_stairs", - "byg:embur_stairs", - "byg:cypress_stairs", - "byg:holly_stairs", - "byg:scoria_stonebrick_stairs", - "byg:cattail_thatch_stairs", - "byg:aspen_stairs", - "byg:mahogany_stairs", - "byg:ebony_stairs", - "byg:smooth_windswept_sandstone_stairs", - "byg:mossy_stone_stairs", - "byg:witch_hazel_stairs", - "byg:maple_stairs", - "byg:cracked_red_rock_brick_stairs", + "byg:red_rock_brick_stairs", "byg:green_enchanted_stairs", - "byg:polished_travertine_stairs", - "byg:palm_stairs", + "byg:aspen_stairs", "byg:lament_stairs", + "byg:smooth_windswept_sandstone_stairs", "byg:scoria_cobblestone_stairs", - "byg:dacite_stairs", - "byg:bulbis_stairs", - "byg:shiny_chiseled_therium_stairs", + "byg:embur_stairs", + "byg:soapstone_stairs", + "byg:redwood_stairs", + "byg:cryptic_stone_stairs", + "byg:soapstone_brick_stairs", + "byg:polished_travertine_stairs", + "byg:purpur_stone_stairs", "byg:travertine_stairs", - "byg:carved_ether_stone_stairs", - "byg:chiseled_travertine_stairs", - "byg:willow_stairs", + "byg:cherry_stairs", + "byg:dacite_cobblestone_stairs", + "byg:dacite_tile_stairs", + "byg:witch_hazel_stairs", + "byg:windswept_sandstone_stairs", + "byg:baobab_stairs", + "byg:soapstone_tile_stairs", + "byg:chiseled_red_rock_brick_stairs", + "byg:rocky_stone_stairs", + "byg:cattail_thatch_stairs", "byg:zelkova_stairs", - "byg:dacite_brick_stairs", + "byg:blue_enchanted_stairs", + "byg:ether_stairs", + "byg:mossy_stone_stairs", + "byg:scoria_stone_stairs", + "byg:cracked_red_rock_brick_stairs", "byg:cika_stairs", - "byg:chiseled_fungal_imparius_stairs", - "byg:redwood_stairs", - "byg:sythian_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:scoria_stonebrick_stairs", + "byg:nightshade_stairs", + "byg:imparius_stairs", + "byg:dacite_brick_stairs", "byg:jacaranda_stairs", - "byg:baobab_stairs" + "byg:cypress_stairs", + "byg:bulbis_stairs", + "byg:mangrove_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:fir_stairs", + "byg:holly_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:carved_ether_stone_stairs", + "byg:chiseled_windswept_sandstone_stairs", + "byg:mahogany_stairs", + "byg:chiseled_travertine_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index aa2a8951d6..149dda65f1 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -188,7 +188,7 @@ public enum BYGWoodTypes { private BlockRegistryObject wallSign; private RegistryObject signItem; - private RegistryObject boat; + private RegistryObject boat; BYGWoodTypes(String name, Builder builder) { this.name = name; @@ -359,7 +359,7 @@ public RegistryObject signItem() { return signItem; } - public RegistryObject boat() { + public RegistryObject boat() { return boat; } @@ -367,6 +367,10 @@ public MultiTag logTag() { return logTag; } + public BYGBoatEntity.BYGType boatType() { + return builder.boatType; + } + public enum GrowerItemType { SAPLING, ODDITY, diff --git a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java index fe456fecc9..4c745a473f 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/boat/BYGBoatEntity.java @@ -1,12 +1,14 @@ package potionstudios.byg.common.entity.boat; import net.minecraft.core.BlockPos; +import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.FluidTags; import net.minecraft.world.damagesource.DamageSource; @@ -24,22 +26,25 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.NotNull; -import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.entity.BYGEntities; -import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.common.loot.BYGLootContextParams; import potionstudios.byg.mixin.access.BoatEntityAccess; import java.util.List; -@SuppressWarnings("EntityConstructor") public class BYGBoatEntity extends Boat { private static final EntityDataAccessor BYG_BOAT_TYPE = SynchedEntityData.defineId(BYGBoatEntity.class, EntityDataSerializers.INT); - + private static final LootContextParamSet LOOT_CONTEXT_PARAM_SETS = LootContextParamSet.builder() + .required(BYGLootContextParams.BOAT_TYPE) + .required(LootContextParams.THIS_ENTITY) + .required(LootContextParams.ORIGIN) + .required(LootContextParams.DAMAGE_SOURCE) + .build(); public BYGBoatEntity(Level worldIn, double x, double y, double z) { this(BYGEntities.BOAT.get(), worldIn); @@ -54,12 +59,28 @@ public BYGBoatEntity(EntityType boatEntityType, Level worldType) super(boatEntityType, worldType); } - public List getDrops() { -// if (level instanceof ServerLevel serverLevel) { -// LootContext lootContext = new LootContext.Builder(serverLevel).withParameter(LootContextParams.BLOCK_STATE, state).create(LootContextParamSets.BLOCK); -// LootTable lootTable = serverLevel.getServer().getLootTables().get(resourceLocation); -// return lootTable.getRandomItems(lootContext); -// } + public static ResourceLocation getLootLocation(BYGType type, boolean isFall) { + final var regName = BYGEntities.BOAT.getId(); + return isFall ? new ResourceLocation(regName.getNamespace(), "boats/" + type + "_fall") : new ResourceLocation(regName.getNamespace(), "boats/" + type); + } + + public List getDrops(DamageSource damageSource, boolean isFall) { + if (level instanceof ServerLevel serverLevel) { + LootContext lootContext = new LootContext.Builder(serverLevel) + .withParameter(BYGLootContextParams.BOAT_TYPE, getBYGBoatType()) + .withParameter(LootContextParams.THIS_ENTITY, this) + .withParameter(LootContextParams.ORIGIN, position()) + .withParameter(LootContextParams.DAMAGE_SOURCE, damageSource) + .create(LOOT_CONTEXT_PARAM_SETS); + final var regName = Registry.ENTITY_TYPE.getKey(this.getType()); + final var defaultLocation = this.getType().getDefaultLootTable(); + final var any = serverLevel.getServer().getLootTables().get(isFall ? new ResourceLocation(defaultLocation.getNamespace(), defaultLocation.getPath() + "_fall") : defaultLocation); + if (any != LootTable.EMPTY) + return any.getRandomItems(lootContext); + + final var lootTable = serverLevel.getServer().getLootTables().get(getLootLocation(getBYGBoatType(), isFall)); + return lootTable.getRandomItems(lootContext); + } return List.of(); } @@ -112,9 +133,13 @@ public void animateHurt() { this.setDamage(this.getDamage() * 11.0F); } + @Override + public ItemStack getPickResult() { + return new ItemStack(getDropItem()); + } @Override - protected void checkFallDamage(double y, boolean onGroundIn, BlockState state, BlockPos pos) { + protected void checkFallDamage(double y, boolean onGroundIn, @NotNull BlockState state, @NotNull BlockPos pos) { ((BoatEntityAccess) this).byg_setLastYd(this.getDeltaMovement().y); if (!this.isPassenger()) { if (onGroundIn) { @@ -128,15 +153,7 @@ protected void checkFallDamage(double y, boolean onGroundIn, BlockState state, B if (!this.level.isClientSide && !this.isRemoved()) { this.kill(); if (this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) { - for (int i = 0; i < 3; ++i) { - this.spawnAtLocation(this.getPlanks()); - } - - for (int j = 0; j < 2; ++j) { - this.spawnAtLocation(Items.STICK); - } - - this.spawnAtLocation(Blocks.AIR); + getDrops(DamageSource.FALL, true).forEach(this::spawnAtLocation); } } } @@ -150,7 +167,7 @@ protected void checkFallDamage(double y, boolean onGroundIn, BlockState state, B } @Override - public boolean hurt(DamageSource source, float amount) { + public boolean hurt(@NotNull DamageSource source, float amount) { if (this.isInvulnerableTo(source)) { return false; } else if (!this.level.isClientSide && !this.isRemoved()) { @@ -164,7 +181,7 @@ public boolean hurt(DamageSource source, float amount) { boolean flag = source.getEntity() instanceof Player && ((Player) source.getEntity()).getAbilities().instabuild; if (flag || this.getDamage() > 40.0F) { if (!flag && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) { - this.spawnAtLocation(this.getDropItem()); + getDrops(source, false).forEach(this::spawnAtLocation); } this.discard(); @@ -178,7 +195,7 @@ public boolean hurt(DamageSource source, float amount) { } @Override - public Packet getAddEntityPacket() { + public @NotNull Packet getAddEntityPacket() { //TODO: Is this right? return new ClientboundAddEntityPacket(this); } @@ -242,6 +259,7 @@ public String getName() { return this.name; } + @Override public String toString() { return this.name; } diff --git a/Common/src/main/java/potionstudios/byg/common/loot/BYGLootContextParams.java b/Common/src/main/java/potionstudios/byg/common/loot/BYGLootContextParams.java new file mode 100644 index 0000000000..9fa54ea37d --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/common/loot/BYGLootContextParams.java @@ -0,0 +1,14 @@ +package potionstudios.byg.common.loot; + +import net.minecraft.world.level.storage.loot.parameters.LootContextParam; +import potionstudios.byg.BYG; +import potionstudios.byg.common.entity.boat.BYGBoatEntity; + +public class BYGLootContextParams { + + public static final LootContextParam BOAT_TYPE = create("boat_type"); + + private static LootContextParam create(String name) { + return new LootContextParam<>(BYG.createLocation(name)); + } +} diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_wart.json b/Common/src/main/resources/data/byg/loot_tables/blocks/embur_wart.json deleted file mode 100644 index 20377be14c..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_wart.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:embur_wart" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGEntityLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGEntityLootProvider.java new file mode 100644 index 0000000000..914abc79cc --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGEntityLootProvider.java @@ -0,0 +1,49 @@ +package potionstudios.byg.datagen.providers.loot; + +import net.minecraft.data.loot.EntityLoot; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import org.jetbrains.annotations.NotNull; +import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.common.entity.boat.BYGBoatEntity; + +import java.util.List; +import java.util.function.BiConsumer; + +import static net.minecraft.world.level.storage.loot.entries.LootItem.*; +import static net.minecraft.world.level.storage.loot.providers.number.ConstantValue.*; + +public class BYGEntityLootProvider extends EntityLoot { + + @Override + public void accept(@NotNull BiConsumer cons) { + super.accept(cons); + } + + @Override + protected void addTables() { + for (final BYGWoodTypes type : BYGWoodTypes.values()) { + if (type.boatType() == null) + continue; + add(BYGBoatEntity.getLootLocation(type.boatType(), false), LootTable.lootTable() + .withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)) + .add(LootItem.lootTableItem(type.boat().get())))); + + add(BYGBoatEntity.getLootLocation(type.boatType(), true), LootTable.lootTable() + .withPool(LootPool.lootPool().setRolls(exactly(2)) + .add(lootTableItem(Items.STICK))) + .withPool(LootPool.lootPool().setRolls(exactly(3)) + .add(lootTableItem(type.planks().get())))); + } + } + + @Override + protected @NotNull Iterable> getKnownEntities() { + return List.of(); + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java index 52569058c1..d2402fbb7b 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGLootTablesProvider.java @@ -1,6 +1,7 @@ package potionstudios.byg.datagen.providers.loot; import com.mojang.datafixers.util.Pair; +import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.data.DataGenerator; import net.minecraft.data.loot.LootTableProvider; import net.minecraft.resources.ResourceLocation; @@ -17,13 +18,15 @@ import java.util.function.Consumer; import java.util.function.Supplier; +@MethodsReturnNonnullByDefault public class BYGLootTablesProvider extends LootTableProvider { public BYGLootTablesProvider(DataGenerator pGenerator) { super(pGenerator); } private final List>>, LootContextParamSet>> tables = List.of( - Pair.of(BYGBlockLootProvider::new, LootContextParamSets.BLOCK) + Pair.of(BYGBlockLootProvider::new, LootContextParamSets.BLOCK), + Pair.of(BYGEntityLootProvider::new, LootContextParamSets.ENTITY) ); @Override @@ -33,6 +36,6 @@ protected List map, @NotNull ValidationContext validationtracker) { - map.forEach((p_218436_2_, p_218436_3_) -> LootTables.validate(validationtracker, p_218436_2_, p_218436_3_)); + map.forEach((id, table) -> LootTables.validate(validationtracker, id, table)); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java index 5766f9f360..1b0f3f911b 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.world.biome.BYGBiomeType; +import potionstudios.byg.datagen.util.DatagenUtils; public class BYGBiomeTagsProvider extends BiomeTagsProvider { public BYGBiomeTagsProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { @@ -18,5 +19,7 @@ protected void addTags() { for (final BYGBiomeType type : BYGBiomeType.values()) { tag(type.tag()).add(type.getBiomes().toArray(Biome[]::new)); } + + DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java index c9f9ae57f1..d92cada465 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -21,6 +21,7 @@ import potionstudios.byg.common.block.BYGMushroomBlock; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.block.sapling.BYGSaplingBlock; +import potionstudios.byg.datagen.util.DatagenUtils; import potionstudios.byg.datagen.util.PredicatedTagProvider; import potionstudios.byg.mixin.access.TagBuilderAccess; import potionstudios.byg.mixin.dev.BlockBehaviorAccess; @@ -146,7 +147,7 @@ protected void addTags() { tag(BlockTags.OAK_LOGS, WITHERING_OAK_LOG, WITHERING_OAK_WOOD); - sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); + DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } private static Predicate isMaterial(Material... materials) { @@ -162,17 +163,6 @@ private void wood(String name, Supplier... blocks) { logs.addTag(tag); } - private void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries() { - for (Tag.Builder value : this.builders.values()) { - List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); - - Set noDuplicates = new HashSet<>(builderEntries); - builderEntries.clear(); - builderEntries.addAll(noDuplicates); - Collections.sort(builderEntries, Comparator.comparing(builderEntry -> builderEntry.entry().toString())); - } - } - @SafeVarargs @SuppressWarnings("ALL") private void tag(TagKey tag, Supplier... blocks) { diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java index 75dcb6b92c..9acd8d5c8f 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGEntityTagsProvider.java @@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.entity.BYGEntities; +import potionstudios.byg.datagen.util.DatagenUtils; public class BYGEntityTagsProvider extends EntityTypeTagsProvider { public BYGEntityTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { @@ -18,5 +19,7 @@ public BYGEntityTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHel protected void addTags() { final var boatTag = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, BYG.createLocation("boats")); tag(boatTag).add(BYGEntities.BOAT.get()); + + DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java index 77f7b919f4..98a83563a7 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -8,6 +8,7 @@ import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; @@ -22,13 +23,19 @@ import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.datagen.util.DatagenUtils; import potionstudios.byg.datagen.util.PredicatedTagProvider; +import potionstudios.byg.mixin.access.TagBuilderAccess; import potionstudios.byg.mixin.dev.BlockBehaviorAccess; import potionstudios.byg.reg.RegistryObject; import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; @@ -82,6 +89,8 @@ protected void addTags() { wood("withering_oak_logs", WITHERING_OAK_LOG, WITHERING_OAK_WOOD); wood("palo_verde_logs", PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD); + + DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } @SafeVarargs diff --git a/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java b/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java new file mode 100644 index 0000000000..46fe6aa330 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java @@ -0,0 +1,25 @@ +package potionstudios.byg.datagen.util; + +import net.minecraft.tags.Tag; +import potionstudios.byg.mixin.access.TagBuilderAccess; + +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class DatagenUtils { + + public static void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(Map tags) { + for (Tag.Builder value : tags.values()) { + List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); + + Set noDuplicates = new HashSet<>(builderEntries); + builderEntries.clear(); + builderEntries.addAll(noDuplicates); + builderEntries.sort(Comparator.comparing(builderEntry -> builderEntry.entry().toString())); + } + } + +} From 3b867f7f340f0b773853ba6d5dc755dbcd07af12 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 13:45:52 +0300 Subject: [PATCH 62/90] Copy datagen'd tags --- Common/src/generated/resources/.cache/cache | 10 +- .../data/minecraft/tags/items/buttons.json | 42 ++++---- .../data/minecraft/tags/items/leaves.json | 102 +++++++++--------- .../data/minecraft/tags/items/sand.json | 16 +-- .../data/minecraft/tags/items/slabs.json | 102 +++++++++--------- .../data/minecraft/tags/items/stairs.json | 100 ++++++++--------- .../assets/byg/blockstates/bulbis_shell.json | 2 +- .../byg/blockstates/bulbis_sprouts.json | 2 +- .../providers/tag/BYGItemTagsProvider.java | 89 ++++----------- 9 files changed, 207 insertions(+), 258 deletions(-) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 0d472b410c..20bb584371 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -3512,13 +3512,13 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press 325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json -353ce646818ffcbeecbff5c27d3fdb6bacaa12fc data/minecraft/tags/items/buttons.json -4a2e954a2f375da12ddd5baa803b0bd4834ba703 data/minecraft/tags/items/leaves.json +3b6c06d868f35c1e0a13b968cadad5e1d8be9ce4 data/minecraft/tags/items/buttons.json +70ef7ad0968a2c466ea5851967bc94427b25d3d2 data/minecraft/tags/items/leaves.json 63102c7b7730cab6fc0256b2daabbdfa985646ee data/minecraft/tags/items/planks.json -f894df8189665458ebfb7d3d6521aae8efd3e2e5 data/minecraft/tags/items/sand.json +e3c2a01a64d2c62fe64663720059db531595765c data/minecraft/tags/items/sand.json 1d18ec5f0ccb00ad70f101654ee5aca8212b429e data/minecraft/tags/items/saplings.json -7299da85b02355b85ae45bfe903cb37b0f00df45 data/minecraft/tags/items/slabs.json -2388fe24d3818b59b81555eb9fc9b9cc155b5c17 data/minecraft/tags/items/stairs.json +f7e860ad39e21020b3817717ceab524c63a190ae data/minecraft/tags/items/slabs.json +4ab5b25fca35aadb9ceb7fd5b53e032814953fc8 data/minecraft/tags/items/stairs.json 2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/trapdoors.json 8274df19fcba3bc922fb34d382d999b33001c36e data/minecraft/tags/items/wooden_buttons.json 0664ba186292039eabbe1d8da09afdf5519473d8 data/minecraft/tags/items/wooden_doors.json diff --git a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json index 1e32a28c66..6cc216469c 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -1,34 +1,34 @@ { "replace": false, "values": [ - "byg:holly_button", - "byg:mahogany_button", - "byg:aspen_button", - "byg:maple_button", - "byg:embur_button", - "byg:ether_button", - "byg:fir_button", + "byg:ebony_button", "byg:redwood_button", - "byg:mangrove_button", - "byg:sythian_button", - "byg:zelkova_button", - "byg:cypress_button", - "byg:blue_enchanted_button", - "byg:bulbis_button", - "byg:rainbow_eucalyptus_button", - "byg:witch_hazel_button", "byg:jacaranda_button", + "byg:maple_button", "byg:nightshade_button", - "byg:palm_button", "byg:baobab_button", - "byg:green_enchanted_button", - "byg:ebony_button", - "byg:skyris_button", "byg:willow_button", "byg:pine_button", - "byg:imparius_button", + "byg:witch_hazel_button", + "byg:holly_button", "byg:cherry_button", + "byg:green_enchanted_button", + "byg:cypress_button", + "byg:fir_button", + "byg:bulbis_button", + "byg:aspen_button", + "byg:mangrove_button", + "byg:zelkova_button", + "byg:lament_button", + "byg:palm_button", "byg:cika_button", - "byg:lament_button" + "byg:mahogany_button", + "byg:ether_button", + "byg:embur_button", + "byg:rainbow_eucalyptus_button", + "byg:sythian_button", + "byg:blue_enchanted_button", + "byg:skyris_button", + "byg:imparius_button" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 500fee1987..7f6e6aad84 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:mangrove_leaves", - "byg:nightshade_leaves", - "byg:red_oak_leaves", - "byg:red_birch_leaves", - "byg:lament_leaves", - "byg:skyris_vine", - "byg:shulkren_vine", - "byg:withering_oak_leaves", + "byg:blue_enchanted_leaves", + "byg:silver_maple_leaves", "byg:blue_spruce_leaves", - "byg:indigo_jacaranda_leaves", - "byg:flowering_palo_verde_leaves", - "byg:pink_cherry_leaves", - "byg:ebony_leaves", - "byg:palm_leaves", + "byg:orchard_leaves", + "byg:poison_ivy", + "byg:redwood_leaves", + "byg:pine_leaves", + "byg:aspen_leaves", + "byg:orange_oak_leaves", "byg:flowering_nightshade_leaves", - "byg:yellow_birch_leaves", - "byg:brown_oak_leaves", - "byg:ripe_orchard_leaves", - "byg:zelkova_leaves", + "byg:white_cherry_leaves", + "byg:red_oak_leaves", + "byg:red_birch_leaves", + "byg:orange_birch_leaves", + "byg:imparius_vine", "byg:skyris_leaves", + "byg:green_enchanted_leaves", + "byg:lament_vine", + "byg:zelkova_leaves", + "byg:cika_leaves", + "byg:flowering_palo_verde_leaves", + "byg:orange_spruce_leaves", + "byg:indigo_jacaranda_leaves", + "byg:witch_hazel_leaves", + "byg:araucaria_leaves", "byg:brown_zelkova_leaves", - "byg:flowering_jacaranda_leaves", + "byg:brown_birch_leaves", + "byg:ripe_orchard_leaves", "byg:palo_verde_leaves", - "byg:ripe_joshua_leaves", - "byg:orange_spruce_leaves", - "byg:rainbow_eucalyptus_leaves", - "byg:orange_birch_leaves", - "byg:firecracker_leaves", - "byg:blooming_witch_hazel_leaves", - "byg:aspen_leaves", - "byg:holly_berry_leaves", - "byg:white_cherry_leaves", + "byg:skyris_vine", + "byg:shulkren_vine", "byg:jacaranda_leaves", - "byg:brown_birch_leaves", - "byg:green_enchanted_leaves", - "byg:green_apple_skyris_leaves", - "byg:lament_vine", - "byg:silver_maple_leaves", - "byg:poison_ivy", - "byg:orchard_leaves", - "byg:pine_leaves", - "byg:maple_leaves", - "byg:orange_oak_leaves", - "byg:imparius_vine", - "byg:red_maple_leaves", + "byg:blooming_witch_hazel_leaves", + "byg:mahogany_leaves", + "byg:ripe_joshua_leaves", "byg:embur_gel_vines", - "byg:cika_leaves", + "byg:pink_cherry_leaves", + "byg:brown_oak_leaves", + "byg:red_maple_leaves", + "byg:nightshade_leaves", + "byg:yellow_spruce_leaves", + "byg:withering_oak_leaves", "byg:fir_leaves", - "byg:witch_hazel_leaves", - "byg:redwood_leaves", + "byg:lament_leaves", + "byg:baobab_leaves", + "byg:ether_leaves", + "byg:flowering_orchard_leaves", + "byg:firecracker_leaves", + "byg:ebony_leaves", "byg:cypress_leaves", - "byg:joshua_leaves", + "byg:flowering_jacaranda_leaves", + "byg:green_apple_skyris_leaves", + "byg:palm_leaves", "byg:holly_leaves", - "byg:flowering_orchard_leaves", - "byg:red_spruce_leaves", - "byg:mahogany_leaves", + "byg:joshua_leaves", + "byg:yellow_birch_leaves", + "byg:mangrove_leaves", + "byg:holly_berry_leaves", + "byg:rainbow_eucalyptus_leaves", "byg:willow_leaves", - "byg:blue_enchanted_leaves", - "byg:ether_leaves", + "byg:maple_leaves", "byg:flowering_indigo_jacaranda_leaves", - "byg:yellow_spruce_leaves", - "byg:araucaria_leaves", - "byg:baobab_leaves" + "byg:red_spruce_leaves" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json index 0e70797020..5c0f684ca1 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "byg:quartzite_sand", - "byg:warped_soul_soil", - "byg:cracked_red_sand", - "byg:black_sand", - "byg:warped_soul_sand", "byg:white_sand", - "byg:windswept_sand", - "byg:pink_sand", "byg:purple_sand", + "byg:warped_soul_soil", + "byg:quartzite_sand", + "byg:pink_sand", + "byg:end_sand", + "byg:windswept_sand", "byg:blue_sand", - "byg:end_sand" + "byg:black_sand", + "byg:warped_soul_sand", + "byg:cracked_red_sand" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json index 4e887deffe..1d3abf8a5b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:chiseled_travertine_slab", - "byg:fir_slab", - "byg:windswept_sandstone_slab", - "byg:red_rock_slab", "byg:mangrove_slab", - "byg:rainbow_eucalyptus_slab", - "byg:soapstone_slab", - "byg:embur_slab", - "byg:cut_windswept_sandstone_slab", - "byg:imparius_slab", - "byg:soapstone_tile_slab", + "byg:chiseled_fungal_imparius_slab", + "byg:cryptic_stone_slab", + "byg:fir_slab", + "byg:purpur_stone_slab", + "byg:bulbis_slab", "byg:blue_enchanted_slab", - "byg:ether_stone_slab", "byg:jacaranda_slab", - "byg:red_rock_brick_slab", - "byg:baobab_slab", - "byg:pine_slab", - "byg:carved_ether_stone_slab", - "byg:ebony_slab", - "byg:nightshade_slab", - "byg:palm_slab", - "byg:cika_slab", - "byg:maple_slab", - "byg:sythian_slab", + "byg:mahogany_slab", + "byg:soapstone_tile_slab", + "byg:mossy_stone_slab", "byg:cobbled_ether_stone_slab", - "byg:redwood_slab", + "byg:holly_slab", + "byg:red_rock_brick_slab", "byg:chiseled_windswept_sandstone_slab", - "byg:cracked_red_rock_brick_slab", - "byg:dacite_brick_slab", - "byg:lament_slab", - "byg:scoria_stonebrick_slab", + "byg:cherry_slab", "byg:green_enchanted_slab", + "byg:cracked_red_rock_brick_slab", + "byg:nightshade_slab", + "byg:rocky_stone_slab", + "byg:chiseled_therium_slab", "byg:dacite_cobblestone_slab", - "byg:skyris_slab", - "byg:scoria_cobblestone_slab", - "byg:aspen_slab", - "byg:dacite_tile_slab", - "byg:soapstone_brick_slab", + "byg:cika_slab", "byg:polished_soapstone_slab", - "byg:willow_slab", - "byg:ether_slab", - "byg:cryptic_stone_slab", - "byg:chiseled_therium_slab", + "byg:lament_slab", "byg:smooth_windswept_sandstone_slab", + "byg:polished_travertine_slab", + "byg:chiseled_travertine_slab", + "byg:cut_windswept_sandstone_slab", + "byg:travertine_slab", + "byg:imparius_slab", + "byg:cypress_slab", + "byg:embur_slab", + "byg:soapstone_slab", + "byg:dacite_tile_slab", "byg:witch_hazel_slab", - "byg:chiseled_red_rock_brick_slab", - "byg:mossy_stone_slab", + "byg:palm_slab", + "byg:redwood_slab", + "byg:pine_slab", + "byg:baobab_slab", + "byg:maple_slab", + "byg:scoria_cobblestone_slab", + "byg:zelkova_slab", + "byg:ebony_slab", "byg:cattail_thatch_slab", - "byg:rocky_stone_slab", - "byg:cypress_slab", - "byg:chiseled_fungal_imparius_slab", - "byg:dacite_slab", - "byg:cherry_slab", - "byg:shiny_chiseled_therium_slab", - "byg:travertine_slab", - "byg:scoria_stone_slab", + "byg:dacite_brick_slab", + "byg:willow_slab", + "byg:soapstone_brick_slab", + "byg:chiseled_red_rock_brick_slab", + "byg:aspen_slab", "byg:mossy_red_rock_brick_slab", - "byg:polished_travertine_slab", - "byg:zelkova_slab", - "byg:mahogany_slab", - "byg:holly_slab", - "byg:purpur_stone_slab", - "byg:bulbis_slab" + "byg:ether_slab", + "byg:rainbow_eucalyptus_slab", + "byg:sythian_slab", + "byg:carved_ether_stone_slab", + "byg:scoria_stone_slab", + "byg:ether_stone_slab", + "byg:dacite_slab", + "byg:skyris_slab", + "byg:red_rock_slab", + "byg:scoria_stonebrick_slab", + "byg:windswept_sandstone_slab", + "byg:shiny_chiseled_therium_slab" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json index 1c18312c53..e2ecc8bad7 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:polished_soapstone_stairs", - "byg:willow_stairs", - "byg:red_rock_stairs", + "byg:cherry_stairs", + "byg:imparius_stairs", + "byg:smooth_windswept_sandstone_stairs", + "byg:fir_stairs", "byg:pine_stairs", - "byg:maple_stairs", - "byg:palm_stairs", - "byg:skyris_stairs", - "byg:ebony_stairs", - "byg:chiseled_fungal_imparius_stairs", + "byg:embur_stairs", + "byg:mossy_stone_stairs", + "byg:carved_ether_stone_stairs", + "byg:holly_stairs", + "byg:cut_windswept_sandstone_stairs", "byg:mossy_red_rock_brick_stairs", - "byg:ether_stone_stairs", - "byg:sythian_stairs", - "byg:chiseled_therium_stairs", + "byg:purpur_stone_stairs", + "byg:maple_stairs", + "byg:aspen_stairs", + "byg:blue_enchanted_stairs", + "byg:willow_stairs", + "byg:ether_stairs", + "byg:polished_soapstone_stairs", + "byg:rocky_stone_stairs", "byg:dacite_stairs", - "byg:cut_windswept_sandstone_stairs", + "byg:dacite_cobblestone_stairs", + "byg:travertine_stairs", "byg:red_rock_brick_stairs", - "byg:green_enchanted_stairs", - "byg:aspen_stairs", + "byg:cattail_thatch_stairs", "byg:lament_stairs", - "byg:smooth_windswept_sandstone_stairs", - "byg:scoria_cobblestone_stairs", - "byg:embur_stairs", - "byg:soapstone_stairs", - "byg:redwood_stairs", + "byg:chiseled_travertine_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:witch_hazel_stairs", + "byg:chiseled_windswept_sandstone_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:chiseled_therium_stairs", "byg:cryptic_stone_stairs", - "byg:soapstone_brick_stairs", - "byg:polished_travertine_stairs", - "byg:purpur_stone_stairs", - "byg:travertine_stairs", - "byg:cherry_stairs", - "byg:dacite_cobblestone_stairs", "byg:dacite_tile_stairs", - "byg:witch_hazel_stairs", - "byg:windswept_sandstone_stairs", - "byg:baobab_stairs", - "byg:soapstone_tile_stairs", "byg:chiseled_red_rock_brick_stairs", - "byg:rocky_stone_stairs", - "byg:cattail_thatch_stairs", - "byg:zelkova_stairs", - "byg:blue_enchanted_stairs", - "byg:ether_stairs", - "byg:mossy_stone_stairs", - "byg:scoria_stone_stairs", - "byg:cracked_red_rock_brick_stairs", + "byg:sythian_stairs", + "byg:bulbis_stairs", + "byg:mangrove_stairs", + "byg:skyris_stairs", + "byg:soapstone_stairs", + "byg:soapstone_brick_stairs", + "byg:palm_stairs", + "byg:redwood_stairs", + "byg:ebony_stairs", + "byg:nightshade_stairs", + "byg:soapstone_tile_stairs", "byg:cika_stairs", - "byg:cobbled_ether_stone_stairs", + "byg:polished_travertine_stairs", + "byg:green_enchanted_stairs", "byg:scoria_stonebrick_stairs", - "byg:nightshade_stairs", - "byg:imparius_stairs", - "byg:dacite_brick_stairs", "byg:jacaranda_stairs", + "byg:dacite_brick_stairs", + "byg:red_rock_stairs", "byg:cypress_stairs", - "byg:bulbis_stairs", - "byg:mangrove_stairs", - "byg:shiny_chiseled_therium_stairs", - "byg:fir_stairs", - "byg:holly_stairs", - "byg:rainbow_eucalyptus_stairs", - "byg:carved_ether_stone_stairs", - "byg:chiseled_windswept_sandstone_stairs", + "byg:windswept_sandstone_stairs", + "byg:cracked_red_rock_brick_stairs", + "byg:scoria_cobblestone_stairs", + "byg:zelkova_stairs", + "byg:scoria_stone_stairs", "byg:mahogany_stairs", - "byg:chiseled_travertine_stairs" + "byg:ether_stone_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:baobab_stairs", + "byg:chiseled_fungal_imparius_stairs" ] } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json index 39ffde4e4a..12e4d5da38 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_shell.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/bulbis/shell" + "model": "byg:block/bulbis_shell" } } } \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json index aca29c45cf..bf4082bec8 100644 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json +++ b/Common/src/main/resources/assets/byg/blockstates/bulbis_sprouts.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "byg:block/bulbis/sprouts" + "model": "byg:block/bulbis_sprouts" } } } \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java index 98a83563a7..18cbee3adb 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -2,114 +2,63 @@ import static net.minecraft.tags.ItemTags.create; import static potionstudios.byg.BYG.createLocation; -import static potionstudios.byg.common.block.BYGBlocks.*; import net.minecraft.data.DataGenerator; import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ButtonBlock; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.material.Material; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.datagen.util.DatagenUtils; -import potionstudios.byg.datagen.util.PredicatedTagProvider; -import potionstudios.byg.mixin.access.TagBuilderAccess; -import potionstudios.byg.mixin.dev.BlockBehaviorAccess; import potionstudios.byg.reg.RegistryObject; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; import java.util.function.Supplier; public class BYGItemTagsProvider extends ItemTagsProvider { - private final TagAppender logsThatBurn = tag(ItemTags.LOGS_THAT_BURN); - private final TagAppender logs = tag(ItemTags.LOGS); - public BYGItemTagsProvider(DataGenerator p_126530_, BlockTagsProvider p_126531_, @Nullable ExistingFileHelper existingFileHelper) { super(p_126530_, p_126531_, BYG.MOD_ID, existingFileHelper); } @Override protected void addTags() { - final var planksTag = tag(ItemTags.PLANKS); - final var bookshelvesTag = tag(create(createLocation("bookshelves"))); - final var trapdoorsTag = tag(ItemTags.TRAPDOORS); - final var woodenButtonsTag = tag(ItemTags.WOODEN_BUTTONS); - final var woodenDoorsTag = tag(ItemTags.WOODEN_DOORS); - final var woodenFencesTag = tag(ItemTags.WOODEN_FENCES); - final var woodenPressurePlatesTag = tag(ItemTags.WOODEN_PRESSURE_PLATES); - final var woodenSlabsTag = tag(ItemTags.WOODEN_SLABS); - final var woodenStairsTag = tag(ItemTags.WOODEN_STAIRS); - final var woodenTrapdoorsTag = tag(ItemTags.WOODEN_TRAPDOORS); for (BYGWoodTypes type : BYGWoodTypes.values()) { tag(type.logTag().item(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); - logs.addTag(type.logTag().item()); - logsThatBurn.addTag(type.logTag().item()); - bookshelvesTag.add(type.bookshelf().get().asItem()); - - planksTag.add(type.planks().get().asItem()); - trapdoorsTag.add(type.trapdoor().get().asItem()); - woodenButtonsTag.add(type.button().get().asItem()); - woodenDoorsTag.add(type.door().get().asItem()); - woodenFencesTag.add(type.fence().get().asItem()); - woodenPressurePlatesTag.add(type.pressurePlate().get().asItem()); - woodenSlabsTag.add(type.slab().get().asItem()); - woodenStairsTag.add(type.stairs().get().asItem()); - woodenTrapdoorsTag.add(type.trapdoor().get().asItem()); } - new PredicatedTagProvider<>(BYGItems.PROVIDER) - .add(checkBlockItem(StairBlock.class), ItemTags.STAIRS) - .add(checkBlockItem(SlabBlock.class), ItemTags.SLABS) - .add(checkBlockItem(ButtonBlock.class), ItemTags.BUTTONS) - .add(isMaterial(Material.LEAVES), ItemTags.LEAVES) - .add(isMaterial(Material.SAND), ItemTags.SAND) - .run(super::tag); - final var saplingsTag = tag(ItemTags.SAPLINGS); BYGItems.SAPLINGS.stream().map(RegistryObject::get).forEach(saplingsTag::add); - wood("withering_oak_logs", WITHERING_OAK_LOG, WITHERING_OAK_WOOD); - wood("palo_verde_logs", PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD); + copy(BlockTags.LOGS, ItemTags.LOGS); + copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); + copy(BlockTags.PLANKS, ItemTags.PLANKS); + copy(BlockTags.create(createLocation("bookshelves")), create(createLocation("bookshelves"))); + 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.STAIRS, ItemTags.STAIRS); + copy(BlockTags.SLABS, ItemTags.SLABS); + copy(BlockTags.BUTTONS, ItemTags.BUTTONS); + copy(BlockTags.LEAVES, ItemTags.LEAVES); + copy(BlockTags.SAND, ItemTags.SAND); DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } - @SafeVarargs - private void wood(String name, Supplier... items) { - final var tag = create(createLocation("wood/" + name)); - tag(tag, items); - logsThatBurn.addTag(tag); - logs.addTag(tag); - } - - private static Predicate isMaterial(Material... materials) { - final var materialsList = List.of(materials); - return it -> it instanceof BlockItem bi && materialsList.contains(((BlockBehaviorAccess) bi.getBlock()).getMaterial()); - } - - private static Predicate checkBlockItem(Class blockClazz) { - return item -> item instanceof BlockItem bi && blockClazz.isInstance(bi.getBlock()); - } - @SafeVarargs @SuppressWarnings("ALL") private void tag(TagKey tag, Supplier... items) { From c311fdf9d75f345a16b6ef4ec249c14121706af4 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 14:37:33 +0300 Subject: [PATCH 63/90] Fix fetch moving files --- .../criterion/PlacedBlockNearBlockTrigger.java | 6 +++--- .../assets/byg/textures/block/bulbis/planks.png | Bin 219 -> 259 bytes .../assets/byg/textures/block/bulbis_planks.png | Bin 259 -> 0 bytes .../assets/byg/textures/block/mangrove/log.png | Bin 197 -> 235 bytes .../byg/textures/block/mangrove/log_top.png | Bin 257 -> 296 bytes .../assets/byg/textures/block/mangrove_log.png | Bin 235 -> 0 bytes .../byg/textures/block/mangrove_log_top.png | Bin 296 -> 0 bytes .../byg/textures/block/nightshade/planks.png | Bin 215 -> 257 bytes .../byg/textures/block/nightshade_planks.png | Bin 257 -> 0 bytes .../byg/textures/block/sythian/planks.png | Bin 215 -> 258 bytes .../byg/textures/block/sythian_planks.png | Bin 258 -> 0 bytes .../data/c/tags/blocks/scaffoldings.json | 6 ++++++ Forge/build.gradle | 6 +++--- Forge/src/data/README.md | 7 ++++--- .../providers/tag/BYGBlockTagsProvider.java | 6 +++++- .../data/forge/tags/blocks/scaffoldings.json | 6 ++++++ 16 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/textures/block/bulbis_planks.png delete mode 100644 Common/src/main/resources/assets/byg/textures/block/mangrove_log.png delete mode 100644 Common/src/main/resources/assets/byg/textures/block/mangrove_log_top.png delete mode 100644 Common/src/main/resources/assets/byg/textures/block/nightshade_planks.png delete mode 100644 Common/src/main/resources/assets/byg/textures/block/sythian_planks.png create mode 100644 Common/src/main/resources/data/c/tags/blocks/scaffoldings.json create mode 100644 Forge/src/main/resources/data/forge/tags/blocks/scaffoldings.json diff --git a/Common/src/main/java/potionstudios/byg/advancements/criterion/PlacedBlockNearBlockTrigger.java b/Common/src/main/java/potionstudios/byg/advancements/criterion/PlacedBlockNearBlockTrigger.java index aff7e21a08..558b342ed4 100644 --- a/Common/src/main/java/potionstudios/byg/advancements/criterion/PlacedBlockNearBlockTrigger.java +++ b/Common/src/main/java/potionstudios/byg/advancements/criterion/PlacedBlockNearBlockTrigger.java @@ -5,13 +5,13 @@ import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.SerializationContext; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; import potionstudios.byg.BYG; public class PlacedBlockNearBlockTrigger { static final ResourceLocation ID = BYG.createLocation("placed_block_near"); - public static class TriggerInstance extends AbstractCriterionTriggerInstance { public TriggerInstance(ResourceLocation $$0, EntityPredicate.Composite $$1) { @@ -19,8 +19,8 @@ public TriggerInstance(ResourceLocation $$0, EntityPredicate.Composite $$1) { } @Override - public JsonObject serializeToJson(SerializationContext $$0) { - return super.serializeToJson($$0); + public @NotNull JsonObject serializeToJson(@NotNull SerializationContext ctx) { + return super.serializeToJson(ctx); } } } diff --git a/Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png b/Common/src/main/resources/assets/byg/textures/block/bulbis/planks.png index ce7530d547afeb7c5e05e4eb38440f133d52eead..18fa2bf04a95848c0852c18a12994723fd7eb445 100644 GIT binary patch delta 218 zcmV<0044w10fPdNF@FSSK}|sb0I`n?{9y$E000$GOjJdQKeUTXvr#x@ayOTIIj37b zbV@Z_#?dY400009a7bBm000id000id0mpBsWB>pFcS%G+R2b70jLQwfAP@x~fdWhm zk>G6cJEQE%1%NjNAjSQckVWs^W;8JVFy0?8ls=hGYRK#;b5m{zafv=)bCnFN%&RK| zSQ6K}Z-ld;kCd delta 178 zcmV;j08Rgc0^0$QF@F_MOjJdkUd5D3zkoihaWfa5wrdkQ5N^tN^J%(tio=5(yE)gOa=GTTiNNTBV+hxoj>Q zKzKxm?ABjdtB}MFX;(Z??8z5puVEbxddW?-)QDCIfXiaUMrur(HtvRGu|wR%^3F2wmU(_-~8gF`?3J&xGFihNfi-yj#&K z^eAFidifo9Ylr2(bi=wn*{Ed~{8^Ni^n-ckEJ>MvEP4DuCop)r`njxgN@xNAw1-?; diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/log.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/log.png index 6a807856522b0a9de514153ed33af6cf5ef39a27..1b556258244c3c32cdf7f69557a599606b45aa75 100644 GIT binary patch delta 194 zcmV;z06qW30qX&fF@FSSK}|sb0I`n?{9y$E000kAOjJdSi;JC|ow2d8a&mHEU0oDr zT}=Q0010qNS#tmY4#NNd4#NS*Z>VGd003o4L_t&-(bz@^=Pft%sJw1V7Q)2)C0Axu-K~#9!1;GIk zLooC7WFXz1gK?kOx>@uB`<_8+Uom3ZEk>8p zoKi1h@}r$l$1O&Q9^7h#^dt5v>b$kpK`2cLXscuLMI|Gh^%Vz*T@#uBNBY750000< KMNUMnLSTaHaY9c3 diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove/log_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove/log_top.png index 709f4800d763bb639ffd88833ded3abb3f44ef19..1fd264f96f10d7041ef8a81b1d1d71fb249029f0 100644 GIT binary patch delta 255 zcmVpFkV!;AR2b7^ zU{q8RW;SwCU{DQ9PY*8(O<-{An6+}%s+mCyZmnTy>1mls40!6(%7GxOh(T>x<*Jp_ zGm99+r&pAhPp?W~5MNeVwS0M20RuabF&!kuzO=Hue0e2M&D6>nvz7yOu`dH@&ny6H zPftrr1*&0PxoYOBl`~Tq*wV_=OT*I=7#I{-gcS{36aa`tGuOW{;Ftga002ovPDHLk FV1iwyXD|Q& delta 216 zcmV;}04M*b0)YaMF@GUYOjJeI*4Dzp!mX{XpP8A9iHU`Ug>`jxdv9-JV`EQGPe?sI zH5$2H0001vNkl63T4*hK>xQzcEi7yvF SV7z(&00004s0s<6r!hOuy&TJyAwOd=dNB`35u8 aRO)=Ma@SmWsZ|QJkipZ{&t;ucLK6T%j8r=S diff --git a/Common/src/main/resources/assets/byg/textures/block/mangrove_log_top.png b/Common/src/main/resources/assets/byg/textures/block/mangrove_log_top.png deleted file mode 100644 index 1fd264f96f10d7041ef8a81b1d1d71fb249029f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF)EQQ#=#OdE}gpU mefYAFgoH>$izsi52t$Xf@%8pFbxA})R2b70jlm7WFbo4JCj&^R z22h1=(E11WAqX&7qw#@y*HIiRC;aO#H^0EtdSeiR zoe5|H2Aaje)_*8*z@ZKr{}OgDTA{***sqC6(4={cw$bmN&&ml0 zZwe<($2FQL(d;AYK|Ve6xhJ(41$I=_!~LRIgjqOw_gsA@r6-o1R{@joQ`GRGmv{tg cu5VwNe~JLQqSiu(1ns?!s{PkN38_YL+lV7NJK)m0gsq6PS z#uM#|90n1KKQ>lfm(f=L^IG40|A8x2$pTGJ8812X&9Z#gnY2m0E^kNmRldm_69b-n xTVo|0_U6m-pa0$TCpbu#X0Tj~dB4l3KJ~At@!RLU>OcoDc)I$ztaD0e0suN+TtNT; diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian/planks.png b/Common/src/main/resources/assets/byg/textures/block/sythian/planks.png index 8494f4c868fa47e656e129fcce144076ee61ffd8..5c0b46f7f348783139d346e384ccf2ab0cd77842 100644 GIT binary patch delta 217 zcmV;~04D#}0fGXMF@FSSK}|sb0I`n?{9y$E000$GOjJd`q(ZWnHO#V6nQ$JZiYbg_ z6@OR^@_i@N00009a7bBm000id000id0mpBsWB>pFc1c7*R2b6@jlm59F$@IPf&1IS z1sIDCApZ+76`Ya|;{Hn@()@O`11j#D8z3Ks;0Fe4G(J$Tno?usMEUy5O-?Yi-WY^n zd4M#Kqh^k4J0@=K#~z`f+F=qQ(iFLWR-FkecK4_G&V-&Ifi~(}53IS~b!GkmQpyzq TIq+Lp00000NkvXXu0mjfC#O|V delta 174 zcmV;f08#&f0@neMF@F_MOjJd?rVXr=36_Bcduaq`Q~*{&07W$b6#+Nr0001RNkl;M1& diff --git a/Common/src/main/resources/assets/byg/textures/block/sythian_planks.png b/Common/src/main/resources/assets/byg/textures/block/sythian_planks.png deleted file mode 100644 index 5c0b46f7f348783139d346e384ccf2ab0cd77842..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF858k1Y){}_W#i85J!h>ifdfWgz%&t;ucLK6UoKU_2b diff --git a/Common/src/main/resources/data/c/tags/blocks/scaffoldings.json b/Common/src/main/resources/data/c/tags/blocks/scaffoldings.json new file mode 100644 index 0000000000..f4c25218fb --- /dev/null +++ b/Common/src/main/resources/data/c/tags/blocks/scaffoldings.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#byg:scaffolding" + ] +} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle index e473549b66..ee5809b94f 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -53,7 +53,7 @@ archivesBaseName = "${mod_name}-forge-${minecraft_version}" shadowJar { configurations = [project.configurations.shadow] relocate 'blue.endless.jankson', "${project.group}.shadow.blue.endless.jankson" - archiveClassifier = '' + archiveClassifier.set('') } reobf { shadowJar { @@ -71,7 +71,7 @@ minecraft { } runs { - def runArgs = ["-DbygDev=true", "-DbygGenerateData=true"] + def runArgs = ["-DbygDev=true"] client { jvmArgs runArgs workingDirectory project.file('run') @@ -163,7 +163,7 @@ jar.finalizedBy('reobfJar') jar { - archiveClassifier = 'slim' + archiveClassifier.set('slim') } task forge_checkForRefmap() { diff --git a/Forge/src/data/README.md b/Forge/src/data/README.md index 540cfee52a..cb5041fbe3 100644 --- a/Forge/src/data/README.md +++ b/Forge/src/data/README.md @@ -1,14 +1,15 @@ This sourceset holds datagen for BYG. # Files generated: -- Assets, recipes and tags for wood types from BYGWoodTypes. See `Common/src/main/resources/byg/textures/block/aspen`, which contains the textures needed for generating wood textures; +- Assets, recipes, loot tables and tags for wood types from BYGWoodTypes. See `Common/src/main/resources/byg/textures/block/aspen`, which contains the textures needed for generating wood textures; - The `minecraft:mineable/shovel` tag, which contains all BYG blocks that have one of the following materials: - DIRT - GRASS - SAND - CLAY - The `minecraft:slabs`, `minecraft:buttons`, `minecraft:stairs`, `byg:mushrooms`, `minecraft:campfire`, `minecraft:wart_blocks` and `minecraft:wart_blocks` tags for both blocks and items, generated using an `block instanceof StairBlock` and `blockItem.getBlock() instanceof StairBlock` respectively; -- The `minecraft:leaves` containing all BYG blocks with the material `LEAVES`; -- The `minecraft:sand` containing all BYG blocks with the material `SAND`; +- The `minecraft:leaves` tag containing all BYG blocks with the material `LEAVES`; +- The `minecraft:sand` tag containing all BYG blocks with the material `SAND`; +- The `byg:scaffolding` tag containing all BYG blocks which are an instance of `BYGScaffoldingBlock` - Biome tags based on `BYGBiomeTypes`. (Note: The above list may not contain all files generated, see the sources for the "entire" list.) \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java index d92cada465..13265cf4f3 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -19,6 +19,7 @@ import potionstudios.byg.common.block.BYGBlockProperties; import potionstudios.byg.common.block.BYGBlockTags; import potionstudios.byg.common.block.BYGMushroomBlock; +import potionstudios.byg.common.block.BYGScaffoldingBlock; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.block.sapling.BYGSaplingBlock; import potionstudios.byg.datagen.util.DatagenUtils; @@ -67,12 +68,15 @@ protected void addTags() { .forInstance(BYGMushroomBlock.class, create(createLocation("mushrooms"))) .forInstance(BYGBlockProperties.BYGWartBlock.class, BlockTags.WART_BLOCKS) .forInstance(CampfireBlock.class, BlockTags.CAMPFIRES) + .forInstance(BYGScaffoldingBlock.class, BYGBlockTags.SCAFFOLDING) .add(isMaterial(shovelMaterials), BlockTags.MINEABLE_WITH_SHOVEL) .add(isMaterial(Material.LEAVES), BlockTags.LEAVES) .add(isMaterial(Material.SAND), BlockTags.SAND) .add(isMaterial(Material.ICE, Material.ICE_SOLID), BlockTags.ICE) .run(super::tag); + tag(BYGBlockTags.SCAFFOLDING).add(Blocks.SCAFFOLDING); + tag(BYGBlockTags.GROUND_MANGROVE_TREE).addTags(BlockTags.DIRT, BlockTags.SAND).add(MUD_BLOCK.get(), Blocks.CLAY); tag(BYGBlockTags.END_STONE).add(ETHER_STONE.get(), BULBIS_PHYCELIUM.get(), NIGHTSHADE_PHYLIUM.get(), IMPARIUS_PHYLIUM.get(), IVIS_PHYLIUM.get(), SHULKREN_PHYLIUM.get(), Blocks.END_STONE); @@ -111,7 +115,7 @@ protected void addTags() { PLANT_STEM, WITHERING_OAK_LOG, WITHERING_OAK_WOOD, DEATH_CAP_MUSHROOM_BLOCK, CRYPTIC_CAMPFIRE, PALO_VERDE_LOG, PALO_VERDE_WOOD, STRIPPED_PALO_VERDE_LOG, STRIPPED_PALO_VERDE_WOOD, MILKCAP_MUSHROOM_BLOCK, BROWN_MUSHROOM_STEM, FUNGAL_IMPARIUS_HYPHAE, FUNGAL_IMPARIUS_STEM, - BLEWIT_MUSHROOM_BLOCK, WHITE_MUSHROOM_STEM + BLEWIT_MUSHROOM_BLOCK, WHITE_MUSHROOM_STEM, SYTHIAN_SCAFFOLDING ); final var planksTag = tag(BlockTags.PLANKS); diff --git a/Forge/src/main/resources/data/forge/tags/blocks/scaffoldings.json b/Forge/src/main/resources/data/forge/tags/blocks/scaffoldings.json new file mode 100644 index 0000000000..f4c25218fb --- /dev/null +++ b/Forge/src/main/resources/data/forge/tags/blocks/scaffoldings.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#byg:scaffolding" + ] +} \ No newline at end of file From 0c7250748497524c556acc4a1775b48a3e7fb929 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 16:19:16 +0300 Subject: [PATCH 64/90] Move advancments and lang gen --- Common/src/generated/resources/.cache/cache | 117 +-- .../resources/assets/byg/lang/en_us.json | 1 + .../adventure/oh_the_biomes_youll_go.json | 850 ++++++++++++++++++ .../byg/advancements/biomepedia_gift.json | 0 .../advancements/husbandry/berrily_alive.json | 0 .../byg/advancements/husbandry/forager.json | 0 .../advancements/husbandry/granny_smith.json | 0 .../husbandry/hot_diggity_not_dog.json | 0 .../husbandry/just_like_grandmas.json | 0 .../data/byg/advancements/husbandry/root.json | 0 .../resources/data/byg/advancements/root.json | 0 .../data/byg/tags/blocks/scaffolding.json | 0 .../data/byg/tags/items/bookshelves.json | 16 +- .../data/byg/tags/items/wood/aspen_logs.json | 2 +- .../data/byg/tags/items/wood/baobab_logs.json | 2 +- .../tags/items/wood/blue_enchanted_logs.json | 2 +- .../data/byg/tags/items/wood/bulbis_logs.json | 2 +- .../data/byg/tags/items/wood/cherry_logs.json | 2 +- .../data/byg/tags/items/wood/cika_logs.json | 2 +- .../byg/tags/items/wood/cypress_logs.json | 2 +- .../data/byg/tags/items/wood/ebony_logs.json | 2 +- .../data/byg/tags/items/wood/embur_logs.json | 6 +- .../data/byg/tags/items/wood/ether_logs.json | 2 +- .../data/byg/tags/items/wood/fir_logs.json | 2 +- .../tags/items/wood/green_enchanted_logs.json | 2 +- .../data/byg/tags/items/wood/holly_logs.json | 2 +- .../byg/tags/items/wood/imparius_logs.json | 4 +- .../byg/tags/items/wood/jacaranda_logs.json | 2 +- .../data/byg/tags/items/wood/lament_logs.json | 2 +- .../byg/tags/items/wood/mahogany_logs.json | 2 +- .../byg/tags/items/wood/mangrove_logs.json | 2 +- .../data/byg/tags/items/wood/maple_logs.json | 2 +- .../byg/tags/items/wood/nightshade_logs.json | 2 +- .../data/byg/tags/items/wood/palm_logs.json | 2 +- .../byg/tags/items/wood/palo_verde_logs.json | 9 - .../data/byg/tags/items/wood/pine_logs.json | 2 +- .../items/wood/rainbow_eucalyptus_logs.json | 2 +- .../byg/tags/items/wood/redwood_logs.json | 2 +- .../data/byg/tags/items/wood/skyris_logs.json | 2 +- .../byg/tags/items/wood/sythian_logs.json | 4 +- .../data/byg/tags/items/wood/willow_logs.json | 6 +- .../byg/tags/items/wood/witch_hazel_logs.json | 6 +- .../tags/items/wood/withering_oak_logs.json | 7 - .../byg/tags/items/wood/zelkova_logs.json | 6 +- .../byg/tags/worldgen/biome/is_badlands.json | 4 +- .../byg/tags/worldgen/biome/is_ocean.json | 4 +- .../byg/tags/worldgen/biome/is_sandy.json | 4 +- .../byg/tags/worldgen/biome/is_snowy.json | 4 +- .../minecraft/tags/blocks/mineable/axe.json | 459 ++++++++++ .../data/minecraft/tags/items/buttons.json | 42 +- .../data/minecraft/tags/items/leaves.json | 104 +-- .../data/minecraft/tags/items/logs.json | 4 + .../minecraft/tags/items/logs_that_burn.json | 4 + .../data/minecraft/tags/items/planks.json | 43 +- .../data/minecraft/tags/items/sand.json | 16 +- .../data/minecraft/tags/items/saplings.json | 10 +- .../data/minecraft/tags/items/slabs.json | 66 +- .../data/minecraft/tags/items/stairs.json | 100 +-- .../data/minecraft/tags/items/trapdoors.json | 16 +- .../minecraft/tags/items/wooden_buttons.json | 16 +- .../minecraft/tags/items/wooden_doors.json | 16 +- .../minecraft/tags/items/wooden_fences.json | 16 +- .../tags/items/wooden_pressure_plates.json | 16 +- .../minecraft/tags/items/wooden_slabs.json | 16 +- .../minecraft/tags/items/wooden_stairs.json | 16 +- .../tags/items/wooden_trapdoors.json | 16 +- .../tags/worldgen/biome/is_deep_ocean.json | 4 +- .../src/main/java/potionstudios/byg/BYG.java | 5 - .../java/potionstudios/byg/BYGConstants.java | 2 - .../potionstudios/byg/client/BYGClient.java | 6 - .../byg/common/block/BYGBlocks.java | 6 +- .../byg/common/entity/BYGEntities.java | 2 +- .../byg/data/BYGDataProviders.java | 22 - .../advancements/BYGAdvancementConsumer.java | 8 - .../advancements/BYGAdvancementProvider.java | 73 -- .../byg/util/LangFileGenerator.java | 75 -- Forge/build.gradle | 4 +- .../potionstudios/byg/datagen/BYGDataGen.java | 5 + .../providers/BYGWoodAssetsProvider.java | 8 + .../advancements/BYGAdvancementConsumer.java | 10 + .../advancements/BYGAdvancementProvider.java | 51 ++ .../BYGAdventureAdvancements.java | 6 +- .../BYGHusbandryAdvancements.java | 4 +- .../providers/lang/EnUsLanguageProvider.java | 47 + 84 files changed, 1811 insertions(+), 597 deletions(-) rename Common/src/{main => generated}/resources/assets/byg/lang/en_us.json (99%) create mode 100644 Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json rename Common/src/{main => generated}/resources/data/byg/advancements/biomepedia_gift.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/berrily_alive.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/forager.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/granny_smith.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/just_like_grandmas.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/husbandry/root.json (100%) rename Common/src/{main => generated}/resources/data/byg/advancements/root.json (100%) rename Common/src/{main => generated}/resources/data/byg/tags/blocks/scaffolding.json (100%) delete mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json delete mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/items/logs.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json delete mode 100644 Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java delete mode 100644 Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementConsumer.java delete mode 100644 Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java delete mode 100644 Common/src/main/java/potionstudios/byg/util/LangFileGenerator.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementConsumer.java create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java rename {Common/src/main/java/potionstudios/byg/data => Forge/src/data/java/potionstudios/byg/datagen/providers}/advancements/BYGAdventureAdvancements.java (93%) rename {Common/src/main/java/potionstudios/byg/data => Forge/src/data/java/potionstudios/byg/datagen/providers}/advancements/BYGHusbandryAdvancements.java (98%) create mode 100644 Forge/src/data/java/potionstudios/byg/datagen/providers/lang/EnUsLanguageProvider.java diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 20bb584371..aa02c70346 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -512,6 +512,7 @@ c647568c770c350b9b87be7aece3cdd2117c2bb8 assets/byg/blockstates/zelkova_fence_ga 16b0cf6c437d96d9f67f8b52bfd18bb3052b8774 assets/byg/blockstates/zelkova_stairs.json b8531f52886d3c3d253a11ec632b055756bcdbed assets/byg/blockstates/zelkova_trapdoor.json e6d361ed053df5b3512c7c74713f504e4a7143d6 assets/byg/blockstates/zelkova_wood.json +74f4757034d9d10755c585b624b00d3935f8493c assets/byg/lang/en_us.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -2023,6 +2024,14 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json +55535d1514c427537932322ff12e57022a53cdd9 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json +b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json +ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json +bd8b08acafe6385adb99ad9c22c3e3682691b8b3 data/byg/advancements/husbandry/granny_smith.json +0df73ca37bdbbbd96cab4ab8cc78a117ce585291 data/byg/advancements/husbandry/hot_diggity_not_dog.json +6b9be9a81ec520c16aa698e3121b61dd99a57373 data/byg/advancements/husbandry/just_like_grandmas.json +45a8e36e3b6e14910467378be403e52411436ae8 data/byg/advancements/husbandry/root.json 7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json 0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -2393,6 +2402,7 @@ d7c781e47dc8891cbb9a0c2660c64dca75fcf983 data/byg/advancements/recipes/byg.byg/w b0cbd5fdb61a5c8ccf6a5a58a4bfad85b3acde92 data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json 83eb246f22ed55bd11083437fbf8df5221ef5089 data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json 2e794f722e70ffdda0a17dbf28c0f8716abdf426 data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json +cb3a3db82ae7cf7e9ccd64506839fb01b1c9ff88 data/byg/advancements/root.json 0b07e0f24ecb7068098deca783fe2b64e3585ea9 data/byg/loot_tables/blocks/aspen_bookshelf.json b95983751ee141014ab4d5da3b7820081af854ec data/byg/loot_tables/blocks/aspen_button.json 662e15ceb338efbaf51aa9d94400503f24cb00be data/byg/loot_tables/blocks/aspen_crafting_table.json @@ -3418,6 +3428,7 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/blocks/mushrooms.json +6e54f0683d236d69c5cce2c20bd86a6634245578 data/byg/tags/blocks/scaffolding.json 7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json @@ -3451,44 +3462,42 @@ c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/blocks/wood/skyris_logs.j 3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/blocks/wood/withering_oak_logs.json a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json b9ab1582ed849d23d78df79d78211ec07ba14d27 data/byg/tags/entity_types/boats.json -0997ae56bb953269c7b30488e45b09d99116d70d data/byg/tags/items/bookshelves.json -7b35a14085d646c0ddc0788cedff0f9018f03106 data/byg/tags/items/wood/aspen_logs.json -1d139ace7d528027bc3a740259b1a57f93bdc07c data/byg/tags/items/wood/baobab_logs.json -a2d128f8fa5da93d3a7a003ad486261a19e7c5ae data/byg/tags/items/wood/blue_enchanted_logs.json -b2b82b3c0b71053cb3f09d7b4bf3fab281489c41 data/byg/tags/items/wood/bulbis_logs.json -f4980e01bf3950c5b70a5182e932662a5f325afb data/byg/tags/items/wood/cherry_logs.json -068be598420fe871d6b5781c38676dd17f7a0344 data/byg/tags/items/wood/cika_logs.json -29435ee175355151440dccbe35ded08bbcd4bc9c data/byg/tags/items/wood/cypress_logs.json -6a3b0f6dba944ecfc136698dc07826d5493e7507 data/byg/tags/items/wood/ebony_logs.json -a6613f4ac0ee9f2975b0e7c9833e642ed73e734a data/byg/tags/items/wood/embur_logs.json -f444a358d341fa5f9b75871baf92c032a9a5f0b1 data/byg/tags/items/wood/ether_logs.json -cfa6453c09f624227eff5c3384f0a1cac070882e data/byg/tags/items/wood/fir_logs.json -be55452b0570d28e7d9ddda966802be8530157d1 data/byg/tags/items/wood/green_enchanted_logs.json -664f79bad1ce2f2fcb9938fb32b5feff7501cb53 data/byg/tags/items/wood/holly_logs.json -265f4820486d420df8fd329fa12c9519b8b782ae data/byg/tags/items/wood/imparius_logs.json -8fc66ec4f622a20e8b7ca7337f8977ec4fdb5482 data/byg/tags/items/wood/jacaranda_logs.json -5af2d8f08cb849a0f9bae686b5a9a4404abbc2a0 data/byg/tags/items/wood/lament_logs.json -d35560e40b18e1f55e00f05595649fc83166c3a7 data/byg/tags/items/wood/mahogany_logs.json -5783f0cad342681d222abcfb57af0578d9c18a2d data/byg/tags/items/wood/mangrove_logs.json -5c545bef58cf72828e52865e8593dcfe2924b4cd data/byg/tags/items/wood/maple_logs.json -1f67e3ee3ad89eb98f5135e669b341697aaa8730 data/byg/tags/items/wood/nightshade_logs.json -cc9a7c5d63b9e6755c1bd4e2458e3fbcd2ade408 data/byg/tags/items/wood/palm_logs.json -d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/items/wood/palo_verde_logs.json -ea302ba827992602b9af6e65a6d236f5e7f35612 data/byg/tags/items/wood/pine_logs.json -52ca3df6cf6e57dea8ba9d50ca3656bf7374fee3 data/byg/tags/items/wood/rainbow_eucalyptus_logs.json -4fe286fa260d5d494318b202e5944c7331020a80 data/byg/tags/items/wood/redwood_logs.json -d9a7b8dfd5afa246661a4a4a85c6634ac826b8e5 data/byg/tags/items/wood/skyris_logs.json -1e5d0e7d58c86949b1d2eaa8de318a1f4b13139d data/byg/tags/items/wood/sythian_logs.json -5343112857899942ab8f37d883a572166eba5b13 data/byg/tags/items/wood/willow_logs.json -7832a5cc7d64149d49991f418ffc960adc4ae871 data/byg/tags/items/wood/witch_hazel_logs.json -3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/items/wood/withering_oak_logs.json -b488cad37e845f24abd0bc83f7d7e4646e5b668d data/byg/tags/items/wood/zelkova_logs.json -0d7e86adab1894e21be4687f33ac87b87026872d data/byg/tags/worldgen/biome/is_badlands.json +fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/items/bookshelves.json +05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/items/wood/aspen_logs.json +fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/items/wood/baobab_logs.json +5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/items/wood/blue_enchanted_logs.json +6ba54ede001aeb5d407035a8d9ed38fd9c6b6b85 data/byg/tags/items/wood/bulbis_logs.json +92bb19e703dea870b6efd348f6216eb791b07f94 data/byg/tags/items/wood/cherry_logs.json +5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/items/wood/cika_logs.json +7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/items/wood/cypress_logs.json +9b0b2d4870545894723344872062d9317ab188bc data/byg/tags/items/wood/ebony_logs.json +088b5d14f042e63b6bcbff1f8487ba3a4f3b3182 data/byg/tags/items/wood/embur_logs.json +80e1953df48855e29d5b55070afdefe2697acade data/byg/tags/items/wood/ether_logs.json +b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/items/wood/fir_logs.json +c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/items/wood/green_enchanted_logs.json +47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/items/wood/holly_logs.json +60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/items/wood/imparius_logs.json +c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/items/wood/jacaranda_logs.json +9e22dce46462b6eeabc33cc58ddca514d843c59a data/byg/tags/items/wood/lament_logs.json +095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/items/wood/mahogany_logs.json +5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/items/wood/mangrove_logs.json +a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/items/wood/maple_logs.json +88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/items/wood/nightshade_logs.json +701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/items/wood/palm_logs.json +be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/items/wood/pine_logs.json +a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/items/wood/rainbow_eucalyptus_logs.json +9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/items/wood/redwood_logs.json +c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/items/wood/skyris_logs.json +629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/items/wood/sythian_logs.json +7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/items/wood/willow_logs.json +7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/items/wood/witch_hazel_logs.json +a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/items/wood/zelkova_logs.json +417da7430aeb414baa78ea7c68077f9e964396ef data/byg/tags/worldgen/biome/is_badlands.json 7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_dead.json 8ff0c57a1c566702b71a741cc95bf8e79630285d data/byg/tags/worldgen/biome/is_icy.json -c1c975f6c2fec7b3774985b2a78b3eadb71f35e5 data/byg/tags/worldgen/biome/is_ocean.json -fa6df1ad53cf4f120d1a4bfaea870367f49e161e data/byg/tags/worldgen/biome/is_sandy.json -132807edb33720c9afc9a9694a3d117351aaff3f data/byg/tags/worldgen/biome/is_snowy.json +a58f5d6e58216b07697b39682647820c0f23779c data/byg/tags/worldgen/biome/is_ocean.json +6c5591da8888cfd1a3c6b7f2be4818277dd1154f data/byg/tags/worldgen/biome/is_sandy.json +ca812f2ce872a3cc2ae76961b501b55673f789b3 data/byg/tags/worldgen/biome/is_snowy.json 84f1bfefb5417f440b327fb2e7c2127deb8152da data/byg/tags/worldgen/biome/is_spooky.json df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.json 7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_wasteland.json @@ -3496,7 +3505,7 @@ df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.j 5f8107eb48f67becbda2b5f7f650f05af5ea63b7 data/minecraft/tags/blocks/campfires.json 3e73ebf1fc5ce9b4b85ffd829772c20e6c68dfc5 data/minecraft/tags/blocks/ice.json 7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/blocks/leaves.json -c0a96fcb646aef01f54061cbb66168d2c6b74d99 data/minecraft/tags/blocks/mineable/axe.json +7366c20405ff779073d36b21bf1257de3e8162cb data/minecraft/tags/blocks/mineable/axe.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json 3a4b442b0ddecea21abff5d0c7c008162044f778 data/minecraft/tags/blocks/oak_logs.json d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/blocks/planks.json @@ -3512,20 +3521,22 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press 325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json -3b6c06d868f35c1e0a13b968cadad5e1d8be9ce4 data/minecraft/tags/items/buttons.json -70ef7ad0968a2c466ea5851967bc94427b25d3d2 data/minecraft/tags/items/leaves.json -63102c7b7730cab6fc0256b2daabbdfa985646ee data/minecraft/tags/items/planks.json -e3c2a01a64d2c62fe64663720059db531595765c data/minecraft/tags/items/sand.json -1d18ec5f0ccb00ad70f101654ee5aca8212b429e data/minecraft/tags/items/saplings.json -f7e860ad39e21020b3817717ceab524c63a190ae data/minecraft/tags/items/slabs.json -4ab5b25fca35aadb9ceb7fd5b53e032814953fc8 data/minecraft/tags/items/stairs.json -2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/trapdoors.json -8274df19fcba3bc922fb34d382d999b33001c36e data/minecraft/tags/items/wooden_buttons.json -0664ba186292039eabbe1d8da09afdf5519473d8 data/minecraft/tags/items/wooden_doors.json -d66c53b0a5e03c3282b8fc177752c248a1ff788b data/minecraft/tags/items/wooden_fences.json -54af459f697a6415f7bbe7a263745352bd1531f2 data/minecraft/tags/items/wooden_pressure_plates.json -961181d022e13e94d16fe5d257f2fc56e81071e2 data/minecraft/tags/items/wooden_slabs.json -d414849d135b4dd89365ccb93173e2ce2ac5e3de data/minecraft/tags/items/wooden_stairs.json -2c64c281d66d9d6e34eaf5602615bfdddb9fae15 data/minecraft/tags/items/wooden_trapdoors.json +686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/buttons.json +7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/items/leaves.json +74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs.json +74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs_that_burn.json +d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/items/planks.json +3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/items/sand.json +04231e89508f9dd7e245342879b8df4679ed337f data/minecraft/tags/items/saplings.json +74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/slabs.json +845951c0cb4e770ed156f8605a11d0666de90164 data/minecraft/tags/items/stairs.json +b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/trapdoors.json +686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/wooden_buttons.json +de954410ba639f97f3359cbd60af139d96c9a23d data/minecraft/tags/items/wooden_doors.json +d9ab9d24f99f65562b07b0df2c4441667016f1d6 data/minecraft/tags/items/wooden_fences.json +ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/items/wooden_pressure_plates.json +325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/items/wooden_slabs.json +2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/items/wooden_stairs.json +b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/wooden_trapdoors.json e267658c8d53318f1183c2fb3a860580be3498dd data/minecraft/tags/worldgen/biome/is_beach.json -c1c975f6c2fec7b3774985b2a78b3eadb71f35e5 data/minecraft/tags/worldgen/biome/is_deep_ocean.json +a58f5d6e58216b07697b39682647820c0f23779c data/minecraft/tags/worldgen/biome/is_deep_ocean.json diff --git a/Common/src/main/resources/assets/byg/lang/en_us.json b/Common/src/generated/resources/assets/byg/lang/en_us.json similarity index 99% rename from Common/src/main/resources/assets/byg/lang/en_us.json rename to Common/src/generated/resources/assets/byg/lang/en_us.json index 72f5402158..872e4f8f80 100644 --- a/Common/src/main/resources/assets/byg/lang/en_us.json +++ b/Common/src/generated/resources/assets/byg/lang/en_us.json @@ -2154,6 +2154,7 @@ "item.byg.sythian_planks": "Sythian Planks", "item.byg.sythian_pressure_plate": "Sythian Pressure Plate", "item.byg.sythian_roots": "Sythian Roots", + "item.byg.sythian_sapling": "Sythian Sapling", "item.byg.sythian_scaffolding": "Sythian Scaffolding", "item.byg.sythian_slab": "Sythian Slab", "item.byg.sythian_sprout": "Sythian Sprout", diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json new file mode 100644 index 0000000000..bb059f34cb --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -0,0 +1,850 @@ +{ + "parent": "byg:root", + "display": { + "icon": { + "item": "byg:byg_logo" + }, + "title": { + "translate": "byg.advancements.adventure.explore_biomes.title" + }, + "description": { + "translate": "byg.advancements.adventure.explore_biomes.description" + }, + "frame": "challenge", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "rewards": { + "experience": 1000 + }, + "criteria": { + "byg:autumnal_valley": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:autumnal_valley" + } + } + }, + "byg:prairie": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:prairie" + } + } + }, + "byg:autumnal_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:autumnal_forest" + } + } + }, + "byg:baobab_savanna": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:baobab_savanna" + } + } + }, + "byg:sierra_badlands": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:sierra_badlands" + } + } + }, + "byg:windswept_desert": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:windswept_desert" + } + } + }, + "byg:tropical_rainforest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:tropical_rainforest" + } + } + }, + "byg:brimstone_caverns": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:brimstone_caverns" + } + } + }, + "byg:imparius_grove": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:imparius_grove" + } + } + }, + "byg:coconino_meadow": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:coconino_meadow" + } + } + }, + "byg:fragment_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:fragment_forest" + } + } + }, + "byg:frosted_taiga": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:frosted_taiga" + } + } + }, + "byg:redwood_thicket": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:redwood_thicket" + } + } + }, + "byg:temperate_rainforest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:temperate_rainforest" + } + } + }, + "byg:rainbow_beach": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:rainbow_beach" + } + } + }, + "byg:glowstone_gardens": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:glowstone_gardens" + } + } + }, + "byg:guiana_shield": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:guiana_shield" + } + } + }, + "byg:quartz_desert": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:quartz_desert" + } + } + }, + "byg:araucaria_savanna": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:araucaria_savanna" + } + } + }, + "byg:lush_stacks": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:lush_stacks" + } + } + }, + "byg:zelkova_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:zelkova_forest" + } + } + }, + "byg:aspen_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:aspen_forest" + } + } + }, + "byg:cika_woods": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:cika_woods" + } + } + }, + "byg:magma_wastes": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:magma_wastes" + } + } + }, + "byg:skyris_vale": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:skyris_vale" + } + } + }, + "byg:nightshade_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:nightshade_forest" + } + } + }, + "byg:maple_taiga": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:maple_taiga" + } + } + }, + "byg:dacite_ridges": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:dacite_ridges" + } + } + }, + "byg:autumnal_taiga": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:autumnal_taiga" + } + } + }, + "byg:warped_desert": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:warped_desert" + } + } + }, + "byg:ebony_woods": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:ebony_woods" + } + } + }, + "byg:weeping_mire": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:weeping_mire" + } + } + }, + "byg:viscal_isles": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:viscal_isles" + } + } + }, + "byg:cypress_swamplands": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:cypress_swamplands" + } + } + }, + "byg:jacaranda_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:jacaranda_forest" + } + } + }, + "byg:shattered_glacier": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:shattered_glacier" + } + } + }, + "byg:canadian_shield": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:canadian_shield" + } + } + }, + "byg:bulbis_gardens": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:bulbis_gardens" + } + } + }, + "byg:howling_peaks": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:howling_peaks" + } + } + }, + "byg:windswept_beach": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:windswept_beach" + } + } + }, + "byg:coniferous_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:coniferous_forest" + } + } + }, + "byg:allium_fields": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:allium_fields" + } + } + }, + "byg:shulkren_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:shulkren_forest" + } + } + }, + "byg:basalt_barrera": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:basalt_barrera" + } + } + }, + "byg:rose_fields": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:rose_fields" + } + } + }, + "byg:twilight_meadow": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:twilight_meadow" + } + } + }, + "byg:mojave_desert": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:mojave_desert" + } + } + }, + "byg:ivis_fields": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:ivis_fields" + } + } + }, + "byg:white_mangrove_marshes": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:white_mangrove_marshes" + } + } + }, + "byg:cardinal_tundra": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:cardinal_tundra" + } + } + }, + "byg:amaranth_fields": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:amaranth_fields" + } + } + }, + "byg:crimson_gardens": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:crimson_gardens" + } + } + }, + "byg:sythian_torrids": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:sythian_torrids" + } + } + }, + "byg:weeping_witch_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:weeping_witch_forest" + } + } + }, + "byg:dacite_shore": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:dacite_shore" + } + } + }, + "byg:red_rock_valley": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:red_rock_valley" + } + } + }, + "byg:borealis_grove": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:borealis_grove" + } + } + }, + "byg:black_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:black_forest" + } + } + }, + "byg:arisian_undergrowth": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:arisian_undergrowth" + } + } + }, + "byg:atacama_desert": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:atacama_desert" + } + } + }, + "byg:firecracker_shrubland": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:firecracker_shrubland" + } + } + }, + "byg:red_oak_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:red_oak_forest" + } + } + }, + "byg:cherry_blossom_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:cherry_blossom_forest" + } + } + }, + "byg:embur_bog": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:embur_bog" + } + } + }, + "byg:ethereal_islands": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:ethereal_islands" + } + } + }, + "byg:cryptic_wastes": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:cryptic_wastes" + } + } + }, + "byg:bayou": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:bayou" + } + } + }, + "byg:temperate_grove": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:temperate_grove" + } + } + }, + "byg:wailing_garth": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:wailing_garth" + } + } + }, + "byg:forgotten_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:forgotten_forest" + } + } + }, + "byg:orchard": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:orchard" + } + } + }, + "byg:frosted_coniferous_forest": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:frosted_coniferous_forest" + } + } + }, + "byg:crag_gardens": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:crag_gardens" + } + } + }, + "byg:dead_sea": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:dead_sea" + } + } + }, + "byg:subzero_hypogeal": { + "trigger": "minecraft:location", + "conditions": { + "location": { + "biome": "byg:subzero_hypogeal" + } + } + } + }, + "requirements": [ + [ + "byg:autumnal_valley" + ], + [ + "byg:prairie" + ], + [ + "byg:autumnal_forest" + ], + [ + "byg:baobab_savanna" + ], + [ + "byg:sierra_badlands" + ], + [ + "byg:windswept_desert" + ], + [ + "byg:tropical_rainforest" + ], + [ + "byg:brimstone_caverns" + ], + [ + "byg:imparius_grove" + ], + [ + "byg:coconino_meadow" + ], + [ + "byg:fragment_forest" + ], + [ + "byg:frosted_taiga" + ], + [ + "byg:redwood_thicket" + ], + [ + "byg:temperate_rainforest" + ], + [ + "byg:rainbow_beach" + ], + [ + "byg:glowstone_gardens" + ], + [ + "byg:guiana_shield" + ], + [ + "byg:quartz_desert" + ], + [ + "byg:araucaria_savanna" + ], + [ + "byg:lush_stacks" + ], + [ + "byg:zelkova_forest" + ], + [ + "byg:aspen_forest" + ], + [ + "byg:cika_woods" + ], + [ + "byg:magma_wastes" + ], + [ + "byg:skyris_vale" + ], + [ + "byg:nightshade_forest" + ], + [ + "byg:maple_taiga" + ], + [ + "byg:dacite_ridges" + ], + [ + "byg:autumnal_taiga" + ], + [ + "byg:warped_desert" + ], + [ + "byg:ebony_woods" + ], + [ + "byg:weeping_mire" + ], + [ + "byg:viscal_isles" + ], + [ + "byg:cypress_swamplands" + ], + [ + "byg:jacaranda_forest" + ], + [ + "byg:shattered_glacier" + ], + [ + "byg:canadian_shield" + ], + [ + "byg:bulbis_gardens" + ], + [ + "byg:howling_peaks" + ], + [ + "byg:windswept_beach" + ], + [ + "byg:coniferous_forest" + ], + [ + "byg:allium_fields" + ], + [ + "byg:shulkren_forest" + ], + [ + "byg:basalt_barrera" + ], + [ + "byg:rose_fields" + ], + [ + "byg:twilight_meadow" + ], + [ + "byg:mojave_desert" + ], + [ + "byg:ivis_fields" + ], + [ + "byg:white_mangrove_marshes" + ], + [ + "byg:cardinal_tundra" + ], + [ + "byg:amaranth_fields" + ], + [ + "byg:crimson_gardens" + ], + [ + "byg:sythian_torrids" + ], + [ + "byg:weeping_witch_forest" + ], + [ + "byg:dacite_shore" + ], + [ + "byg:red_rock_valley" + ], + [ + "byg:borealis_grove" + ], + [ + "byg:black_forest" + ], + [ + "byg:arisian_undergrowth" + ], + [ + "byg:atacama_desert" + ], + [ + "byg:firecracker_shrubland" + ], + [ + "byg:red_oak_forest" + ], + [ + "byg:cherry_blossom_forest" + ], + [ + "byg:embur_bog" + ], + [ + "byg:ethereal_islands" + ], + [ + "byg:cryptic_wastes" + ], + [ + "byg:bayou" + ], + [ + "byg:temperate_grove" + ], + [ + "byg:wailing_garth" + ], + [ + "byg:forgotten_forest" + ], + [ + "byg:orchard" + ], + [ + "byg:frosted_coniferous_forest" + ], + [ + "byg:crag_gardens" + ], + [ + "byg:dead_sea" + ], + [ + "byg:subzero_hypogeal" + ] + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/advancements/biomepedia_gift.json b/Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/biomepedia_gift.json rename to Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/berrily_alive.json b/Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/berrily_alive.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/forager.json b/Common/src/generated/resources/data/byg/advancements/husbandry/forager.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/forager.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/forager.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/granny_smith.json b/Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/granny_smith.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json b/Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/just_like_grandmas.json b/Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/just_like_grandmas.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json diff --git a/Common/src/main/resources/data/byg/advancements/husbandry/root.json b/Common/src/generated/resources/data/byg/advancements/husbandry/root.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/husbandry/root.json rename to Common/src/generated/resources/data/byg/advancements/husbandry/root.json diff --git a/Common/src/main/resources/data/byg/advancements/root.json b/Common/src/generated/resources/data/byg/advancements/root.json similarity index 100% rename from Common/src/main/resources/data/byg/advancements/root.json rename to Common/src/generated/resources/data/byg/advancements/root.json diff --git a/Common/src/main/resources/data/byg/tags/blocks/scaffolding.json b/Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json similarity index 100% rename from Common/src/main/resources/data/byg/tags/blocks/scaffolding.json rename to Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json diff --git a/Common/src/generated/resources/data/byg/tags/items/bookshelves.json b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json index 1624622b8b..e2cde0a362 100644 --- a/Common/src/generated/resources/data/byg/tags/items/bookshelves.json +++ b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json @@ -9,26 +9,26 @@ "byg:cika_bookshelf", "byg:cypress_bookshelf", "byg:ebony_bookshelf", + "byg:embur_bookshelf", "byg:ether_bookshelf", "byg:fir_bookshelf", "byg:green_enchanted_bookshelf", "byg:holly_bookshelf", "byg:imparius_bookshelf", + "byg:jacaranda_bookshelf", + "byg:lament_bookshelf", "byg:mahogany_bookshelf", "byg:mangrove_bookshelf", + "byg:maple_bookshelf", + "byg:nightshade_bookshelf", "byg:palm_bookshelf", "byg:pine_bookshelf", "byg:rainbow_eucalyptus_bookshelf", "byg:redwood_bookshelf", + "byg:skyris_bookshelf", + "byg:sythian_bookshelf", "byg:willow_bookshelf", "byg:witch_hazel_bookshelf", - "byg:zelkova_bookshelf", - "byg:sythian_bookshelf", - "byg:embur_bookshelf", - "byg:nightshade_bookshelf", - "byg:skyris_bookshelf", - "byg:lament_bookshelf", - "byg:maple_bookshelf", - "byg:jacaranda_bookshelf" + "byg:zelkova_bookshelf" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json index f4cf3ba6f4..77f4029245 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:aspen_log", - "byg:stripped_aspen_log", "byg:aspen_wood", + "byg:stripped_aspen_log", "byg:stripped_aspen_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json index 8879c428aa..945a192dd4 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:baobab_log", - "byg:stripped_baobab_log", "byg:baobab_wood", + "byg:stripped_baobab_log", "byg:stripped_baobab_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json index b0701df5c1..694ad5bad2 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:blue_enchanted_log", - "byg:stripped_blue_enchanted_log", "byg:blue_enchanted_wood", + "byg:stripped_blue_enchanted_log", "byg:stripped_blue_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json index 5d5515c23d..2a1e6751db 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:bulbis_stem", - "byg:stripped_bulbis_stem", "byg:bulbis_wood", + "byg:stripped_bulbis_stem", "byg:stripped_bulbis_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json index 7c44d6658e..777ae0f22d 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:cherry_log", - "byg:stripped_cherry_log", "byg:cherry_wood", + "byg:stripped_cherry_log", "byg:stripped_cherry_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json index 612eeddba8..828a9932e9 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:cika_log", - "byg:stripped_cika_log", "byg:cika_wood", + "byg:stripped_cika_log", "byg:stripped_cika_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json index 1eab679012..07264a2e36 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:cypress_log", - "byg:stripped_cypress_log", "byg:cypress_wood", + "byg:stripped_cypress_log", "byg:stripped_cypress_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json index d1ba8fb0e0..7892cf80c4 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:ebony_log", - "byg:stripped_ebony_log", "byg:ebony_wood", + "byg:stripped_ebony_log", "byg:stripped_ebony_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json index ddc29c759a..73f0ef2813 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:embur_pedu", - "byg:stripped_embur_pedu", "byg:embur_hyphae", - "byg:stripped_embur_hyphae" + "byg:embur_pedu", + "byg:stripped_embur_hyphae", + "byg:stripped_embur_pedu" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json index 33f4deb198..7a3e09702d 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:ether_log", - "byg:stripped_ether_log", "byg:ether_wood", + "byg:stripped_ether_log", "byg:stripped_ether_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json index ade94a87e3..a047ac594d 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:fir_log", - "byg:stripped_fir_log", "byg:fir_wood", + "byg:stripped_fir_log", "byg:stripped_fir_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json index 831c74a3d3..51c0ddfd61 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:green_enchanted_log", - "byg:stripped_green_enchanted_log", "byg:green_enchanted_wood", + "byg:stripped_green_enchanted_log", "byg:stripped_green_enchanted_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json index d1b5db6086..1152c46235 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:holly_log", - "byg:stripped_holly_log", "byg:holly_wood", + "byg:stripped_holly_log", "byg:stripped_holly_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json index 9228a48f45..87dd26fd15 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "byg:imparius_stem", - "byg:imparius_hyphae" + "byg:imparius_hyphae", + "byg:imparius_stem" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json index cd2e652c2a..a5eccfd416 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:jacaranda_log", - "byg:stripped_jacaranda_log", "byg:jacaranda_wood", + "byg:stripped_jacaranda_log", "byg:stripped_jacaranda_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json index 3ba1cdcc3c..1371ffb20c 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:lament_log", - "byg:stripped_lament_log", "byg:lament_wood", + "byg:stripped_lament_log", "byg:stripped_lament_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json index 8931afef85..64556c0991 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:mahogany_log", - "byg:stripped_mahogany_log", "byg:mahogany_wood", + "byg:stripped_mahogany_log", "byg:stripped_mahogany_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json index 9b67402577..cfb588ada2 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:mangrove_log", - "byg:stripped_mangrove_log", "byg:mangrove_wood", + "byg:stripped_mangrove_log", "byg:stripped_mangrove_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json index fe8f11a19f..cfbcc95457 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:maple_log", - "byg:stripped_maple_log", "byg:maple_wood", + "byg:stripped_maple_log", "byg:stripped_maple_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json index d5b90f8e91..6bff75fa77 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:nightshade_log", - "byg:stripped_nightshade_log", "byg:nightshade_wood", + "byg:stripped_nightshade_log", "byg:stripped_nightshade_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json index c736a8bda8..e479ac2263 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:palm_log", - "byg:stripped_palm_log", "byg:palm_wood", + "byg:stripped_palm_log", "byg:stripped_palm_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json deleted file mode 100644 index 655c0e63f5..0000000000 --- a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:palo_verde_log", - "byg:palo_verde_wood", - "byg:stripped_palo_verde_log", - "byg:stripped_palo_verde_wood" - ] -} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json index 2afbd875e5..0b1fdebcf7 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:pine_log", - "byg:stripped_pine_log", "byg:pine_wood", + "byg:stripped_pine_log", "byg:stripped_pine_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json index 1faa27f3a3..698520ab0c 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:rainbow_eucalyptus_log", - "byg:stripped_rainbow_eucalyptus_log", "byg:rainbow_eucalyptus_wood", + "byg:stripped_rainbow_eucalyptus_log", "byg:stripped_rainbow_eucalyptus_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json index c85ade522e..7027988498 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:redwood_log", - "byg:stripped_redwood_log", "byg:redwood_wood", + "byg:stripped_redwood_log", "byg:stripped_redwood_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json index 7528cd4f86..4a763046ba 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "byg:skyris_log", - "byg:stripped_skyris_log", "byg:skyris_wood", + "byg:stripped_skyris_log", "byg:stripped_skyris_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json index 2ae61d6aa6..00ce3fdb37 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:sythian_stem", + "byg:stripped_sythian_hyphae", "byg:stripped_sythian_stem", "byg:sythian_hyphae", - "byg:stripped_sythian_hyphae" + "byg:sythian_stem" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json index eaae03d6b1..e8903dcfb6 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:willow_log", "byg:stripped_willow_log", - "byg:willow_wood", - "byg:stripped_willow_wood" + "byg:stripped_willow_wood", + "byg:willow_log", + "byg:willow_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json index af500fae70..75dadab27a 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:witch_hazel_log", "byg:stripped_witch_hazel_log", - "byg:witch_hazel_wood", - "byg:stripped_witch_hazel_wood" + "byg:stripped_witch_hazel_wood", + "byg:witch_hazel_log", + "byg:witch_hazel_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json deleted file mode 100644 index 128286507c..0000000000 --- a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "byg:withering_oak_log", - "byg:withering_oak_wood" - ] -} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json index cdd7204f2d..5e4ee869e3 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "byg:zelkova_log", "byg:stripped_zelkova_log", - "byg:zelkova_wood", - "byg:stripped_zelkova_wood" + "byg:stripped_zelkova_wood", + "byg:zelkova_log", + "byg:zelkova_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json index 99f41a35e1..88e6babf5d 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "byg:windswept_dunes", "byg:red_rock_valley", - "byg:sierra_badlands" + "byg:sierra_badlands", + "byg:windswept_dunes" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json index 7ac62b7ffe..97041cdf90 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "byg:lush_stacks", - "byg:dead_sea" + "byg:dead_sea", + "byg:lush_stacks" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json index 66875bc1bb..15001f56a4 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "byg:windswept_dunes", - "byg:mojave_desert" + "byg:mojave_desert", + "byg:windswept_dunes" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json index 7613ff0550..e3c564203d 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "byg:frosted_taiga", - "byg:frosted_coniferous_forest" + "byg:frosted_coniferous_forest", + "byg:frosted_taiga" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json new file mode 100644 index 0000000000..49d436a56e --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -0,0 +1,459 @@ +{ + "replace": false, + "values": [ + "byg:aspen_bookshelf", + "byg:aspen_button", + "byg:aspen_crafting_table", + "byg:aspen_door", + "byg:aspen_fence", + "byg:aspen_fence_gate", + "byg:aspen_log", + "byg:aspen_planks", + "byg:aspen_pressure_plate", + "byg:aspen_slab", + "byg:aspen_stairs", + "byg:aspen_trapdoor", + "byg:aspen_wood", + "byg:baobab_bookshelf", + "byg:baobab_button", + "byg:baobab_crafting_table", + "byg:baobab_door", + "byg:baobab_fence", + "byg:baobab_fence_gate", + "byg:baobab_log", + "byg:baobab_planks", + "byg:baobab_pressure_plate", + "byg:baobab_slab", + "byg:baobab_stairs", + "byg:baobab_trapdoor", + "byg:baobab_wood", + "byg:blue_enchanted_bookshelf", + "byg:blue_enchanted_button", + "byg:blue_enchanted_crafting_table", + "byg:blue_enchanted_door", + "byg:blue_enchanted_fence", + "byg:blue_enchanted_fence_gate", + "byg:blue_enchanted_log", + "byg:blue_enchanted_planks", + "byg:blue_enchanted_pressure_plate", + "byg:blue_enchanted_slab", + "byg:blue_enchanted_stairs", + "byg:blue_enchanted_trapdoor", + "byg:blue_enchanted_wood", + "byg:boric_campfire", + "byg:brown_mushroom_stem", + "byg:bulbis_bookshelf", + "byg:bulbis_button", + "byg:bulbis_crafting_table", + "byg:bulbis_door", + "byg:bulbis_fence", + "byg:bulbis_fence_gate", + "byg:bulbis_planks", + "byg:bulbis_pressure_plate", + "byg:bulbis_slab", + "byg:bulbis_stairs", + "byg:bulbis_stem", + "byg:bulbis_trapdoor", + "byg:bulbis_wood", + "byg:cherry_bookshelf", + "byg:cherry_button", + "byg:cherry_crafting_table", + "byg:cherry_door", + "byg:cherry_fence", + "byg:cherry_fence_gate", + "byg:cherry_log", + "byg:cherry_planks", + "byg:cherry_pressure_plate", + "byg:cherry_slab", + "byg:cherry_stairs", + "byg:cherry_trapdoor", + "byg:cherry_wood", + "byg:cika_bookshelf", + "byg:cika_button", + "byg:cika_crafting_table", + "byg:cika_door", + "byg:cika_fence", + "byg:cika_fence_gate", + "byg:cika_log", + "byg:cika_planks", + "byg:cika_pressure_plate", + "byg:cika_slab", + "byg:cika_stairs", + "byg:cika_trapdoor", + "byg:cika_wood", + "byg:cryptic_campfire", + "byg:cypress_bookshelf", + "byg:cypress_button", + "byg:cypress_crafting_table", + "byg:cypress_door", + "byg:cypress_fence", + "byg:cypress_fence_gate", + "byg:cypress_log", + "byg:cypress_planks", + "byg:cypress_pressure_plate", + "byg:cypress_slab", + "byg:cypress_stairs", + "byg:cypress_trapdoor", + "byg:cypress_wood", + "byg:death_cap_mushroom_block", + "byg:ebony_bookshelf", + "byg:ebony_button", + "byg:ebony_crafting_table", + "byg:ebony_door", + "byg:ebony_fence", + "byg:ebony_fence_gate", + "byg:ebony_log", + "byg:ebony_planks", + "byg:ebony_pressure_plate", + "byg:ebony_slab", + "byg:ebony_stairs", + "byg:ebony_trapdoor", + "byg:ebony_wood", + "byg:embur_bookshelf", + "byg:embur_button", + "byg:embur_crafting_table", + "byg:embur_door", + "byg:embur_fence", + "byg:embur_fence_gate", + "byg:embur_hyphae", + "byg:embur_pedu", + "byg:embur_planks", + "byg:embur_pressure_plate", + "byg:embur_slab", + "byg:embur_stairs", + "byg:embur_trapdoor", + "byg:ether_bookshelf", + "byg:ether_button", + "byg:ether_crafting_table", + "byg:ether_door", + "byg:ether_fence", + "byg:ether_fence_gate", + "byg:ether_log", + "byg:ether_planks", + "byg:ether_pressure_plate", + "byg:ether_slab", + "byg:ether_stairs", + "byg:ether_trapdoor", + "byg:ether_wood", + "byg:fir_bookshelf", + "byg:fir_button", + "byg:fir_crafting_table", + "byg:fir_door", + "byg:fir_fence", + "byg:fir_fence_gate", + "byg:fir_log", + "byg:fir_planks", + "byg:fir_pressure_plate", + "byg:fir_slab", + "byg:fir_stairs", + "byg:fir_trapdoor", + "byg:fir_wood", + "byg:fungal_imparius_hyphae", + "byg:fungal_imparius_stem", + "byg:green_enchanted_bookshelf", + "byg:green_enchanted_button", + "byg:green_enchanted_crafting_table", + "byg:green_enchanted_door", + "byg:green_enchanted_fence", + "byg:green_enchanted_fence_gate", + "byg:green_enchanted_log", + "byg:green_enchanted_planks", + "byg:green_enchanted_pressure_plate", + "byg:green_enchanted_slab", + "byg:green_enchanted_stairs", + "byg:green_enchanted_trapdoor", + "byg:green_enchanted_wood", + "byg:green_mushroom_block", + "byg:holly_bookshelf", + "byg:holly_button", + "byg:holly_crafting_table", + "byg:holly_door", + "byg:holly_fence", + "byg:holly_fence_gate", + "byg:holly_log", + "byg:holly_planks", + "byg:holly_pressure_plate", + "byg:holly_slab", + "byg:holly_stairs", + "byg:holly_trapdoor", + "byg:holly_wood", + "byg:imbued_nightshade_log", + "byg:imparius_bookshelf", + "byg:imparius_button", + "byg:imparius_crafting_table", + "byg:imparius_door", + "byg:imparius_fence", + "byg:imparius_fence_gate", + "byg:imparius_hyphae", + "byg:imparius_planks", + "byg:imparius_pressure_plate", + "byg:imparius_slab", + "byg:imparius_stairs", + "byg:imparius_stem", + "byg:imparius_trapdoor", + "byg:jacaranda_bookshelf", + "byg:jacaranda_button", + "byg:jacaranda_crafting_table", + "byg:jacaranda_door", + "byg:jacaranda_fence", + "byg:jacaranda_fence_gate", + "byg:jacaranda_log", + "byg:jacaranda_planks", + "byg:jacaranda_pressure_plate", + "byg:jacaranda_slab", + "byg:jacaranda_stairs", + "byg:jacaranda_trapdoor", + "byg:jacaranda_wood", + "byg:lament_bookshelf", + "byg:lament_button", + "byg:lament_crafting_table", + "byg:lament_door", + "byg:lament_fence", + "byg:lament_fence_gate", + "byg:lament_log", + "byg:lament_planks", + "byg:lament_pressure_plate", + "byg:lament_slab", + "byg:lament_stairs", + "byg:lament_trapdoor", + "byg:lament_wood", + "byg:mahogany_bookshelf", + "byg:mahogany_button", + "byg:mahogany_crafting_table", + "byg:mahogany_door", + "byg:mahogany_fence", + "byg:mahogany_fence_gate", + "byg:mahogany_log", + "byg:mahogany_planks", + "byg:mahogany_pressure_plate", + "byg:mahogany_slab", + "byg:mahogany_stairs", + "byg:mahogany_trapdoor", + "byg:mahogany_wood", + "byg:mangrove_bookshelf", + "byg:mangrove_button", + "byg:mangrove_crafting_table", + "byg:mangrove_door", + "byg:mangrove_fence", + "byg:mangrove_fence_gate", + "byg:mangrove_log", + "byg:mangrove_planks", + "byg:mangrove_pressure_plate", + "byg:mangrove_slab", + "byg:mangrove_stairs", + "byg:mangrove_trapdoor", + "byg:mangrove_wood", + "byg:maple_bookshelf", + "byg:maple_button", + "byg:maple_crafting_table", + "byg:maple_door", + "byg:maple_fence", + "byg:maple_fence_gate", + "byg:maple_log", + "byg:maple_planks", + "byg:maple_pressure_plate", + "byg:maple_slab", + "byg:maple_stairs", + "byg:maple_trapdoor", + "byg:maple_wood", + "byg:nightshade_bookshelf", + "byg:nightshade_button", + "byg:nightshade_crafting_table", + "byg:nightshade_door", + "byg:nightshade_fence", + "byg:nightshade_fence_gate", + "byg:nightshade_log", + "byg:nightshade_planks", + "byg:nightshade_pressure_plate", + "byg:nightshade_slab", + "byg:nightshade_stairs", + "byg:nightshade_trapdoor", + "byg:nightshade_wood", + "byg:palm_bookshelf", + "byg:palm_button", + "byg:palm_crafting_table", + "byg:palm_door", + "byg:palm_fence", + "byg:palm_fence_gate", + "byg:palm_log", + "byg:palm_planks", + "byg:palm_pressure_plate", + "byg:palm_slab", + "byg:palm_stairs", + "byg:palm_trapdoor", + "byg:palm_wood", + "byg:palo_verde_log", + "byg:palo_verde_wood", + "byg:pine_bookshelf", + "byg:pine_button", + "byg:pine_crafting_table", + "byg:pine_door", + "byg:pine_fence", + "byg:pine_fence_gate", + "byg:pine_log", + "byg:pine_planks", + "byg:pine_pressure_plate", + "byg:pine_slab", + "byg:pine_stairs", + "byg:pine_trapdoor", + "byg:pine_wood", + "byg:plant_stem", + "byg:rainbow_eucalyptus_bookshelf", + "byg:rainbow_eucalyptus_button", + "byg:rainbow_eucalyptus_crafting_table", + "byg:rainbow_eucalyptus_door", + "byg:rainbow_eucalyptus_fence", + "byg:rainbow_eucalyptus_fence_gate", + "byg:rainbow_eucalyptus_log", + "byg:rainbow_eucalyptus_planks", + "byg:rainbow_eucalyptus_pressure_plate", + "byg:rainbow_eucalyptus_slab", + "byg:rainbow_eucalyptus_stairs", + "byg:rainbow_eucalyptus_trapdoor", + "byg:rainbow_eucalyptus_wood", + "byg:redwood_bookshelf", + "byg:redwood_button", + "byg:redwood_crafting_table", + "byg:redwood_door", + "byg:redwood_fence", + "byg:redwood_fence_gate", + "byg:redwood_log", + "byg:redwood_planks", + "byg:redwood_pressure_plate", + "byg:redwood_slab", + "byg:redwood_stairs", + "byg:redwood_trapdoor", + "byg:redwood_wood", + "byg:skyris_bookshelf", + "byg:skyris_button", + "byg:skyris_crafting_table", + "byg:skyris_door", + "byg:skyris_fence", + "byg:skyris_fence_gate", + "byg:skyris_log", + "byg:skyris_planks", + "byg:skyris_pressure_plate", + "byg:skyris_slab", + "byg:skyris_stairs", + "byg:skyris_trapdoor", + "byg:skyris_wood", + "byg:soul_shroom_block", + "byg:soul_shroom_stem", + "byg:stripped_aspen_log", + "byg:stripped_aspen_wood", + "byg:stripped_baobab_log", + "byg:stripped_baobab_wood", + "byg:stripped_blue_enchanted_log", + "byg:stripped_blue_enchanted_wood", + "byg:stripped_bulbis_stem", + "byg:stripped_bulbis_wood", + "byg:stripped_cherry_log", + "byg:stripped_cherry_wood", + "byg:stripped_cika_log", + "byg:stripped_cika_wood", + "byg:stripped_cypress_log", + "byg:stripped_cypress_wood", + "byg:stripped_ebony_log", + "byg:stripped_ebony_wood", + "byg:stripped_embur_hyphae", + "byg:stripped_embur_pedu", + "byg:stripped_ether_log", + "byg:stripped_ether_wood", + "byg:stripped_fir_log", + "byg:stripped_fir_wood", + "byg:stripped_green_enchanted_log", + "byg:stripped_green_enchanted_wood", + "byg:stripped_holly_log", + "byg:stripped_holly_wood", + "byg:stripped_jacaranda_log", + "byg:stripped_jacaranda_wood", + "byg:stripped_lament_log", + "byg:stripped_lament_wood", + "byg:stripped_mahogany_log", + "byg:stripped_mahogany_wood", + "byg:stripped_mangrove_log", + "byg:stripped_mangrove_wood", + "byg:stripped_maple_log", + "byg:stripped_maple_wood", + "byg:stripped_nightshade_log", + "byg:stripped_nightshade_wood", + "byg:stripped_palm_log", + "byg:stripped_palm_wood", + "byg:stripped_palo_verde_log", + "byg:stripped_palo_verde_wood", + "byg:stripped_pine_log", + "byg:stripped_pine_wood", + "byg:stripped_rainbow_eucalyptus_log", + "byg:stripped_rainbow_eucalyptus_wood", + "byg:stripped_redwood_log", + "byg:stripped_redwood_wood", + "byg:stripped_skyris_log", + "byg:stripped_skyris_wood", + "byg:stripped_sythian_hyphae", + "byg:stripped_sythian_stem", + "byg:stripped_willow_log", + "byg:stripped_willow_wood", + "byg:stripped_witch_hazel_log", + "byg:stripped_witch_hazel_wood", + "byg:stripped_zelkova_log", + "byg:stripped_zelkova_wood", + "byg:sythian_bookshelf", + "byg:sythian_button", + "byg:sythian_crafting_table", + "byg:sythian_door", + "byg:sythian_fence", + "byg:sythian_fence_gate", + "byg:sythian_hyphae", + "byg:sythian_planks", + "byg:sythian_pressure_plate", + "byg:sythian_scaffolding", + "byg:sythian_slab", + "byg:sythian_stairs", + "byg:sythian_stem", + "byg:sythian_trapdoor", + "byg:weeping_milkcap_mushroom_block", + "byg:white_mushroom_stem", + "byg:willow_bookshelf", + "byg:willow_button", + "byg:willow_crafting_table", + "byg:willow_door", + "byg:willow_fence", + "byg:willow_fence_gate", + "byg:willow_log", + "byg:willow_planks", + "byg:willow_pressure_plate", + "byg:willow_slab", + "byg:willow_stairs", + "byg:willow_trapdoor", + "byg:willow_wood", + "byg:witch_hazel_bookshelf", + "byg:witch_hazel_button", + "byg:witch_hazel_crafting_table", + "byg:witch_hazel_door", + "byg:witch_hazel_fence", + "byg:witch_hazel_fence_gate", + "byg:witch_hazel_log", + "byg:witch_hazel_planks", + "byg:witch_hazel_pressure_plate", + "byg:witch_hazel_slab", + "byg:witch_hazel_stairs", + "byg:witch_hazel_trapdoor", + "byg:witch_hazel_wood", + "byg:withering_oak_log", + "byg:withering_oak_wood", + "byg:wood_blewit_mushroom_block", + "byg:zelkova_bookshelf", + "byg:zelkova_button", + "byg:zelkova_crafting_table", + "byg:zelkova_door", + "byg:zelkova_fence", + "byg:zelkova_fence_gate", + "byg:zelkova_log", + "byg:zelkova_planks", + "byg:zelkova_pressure_plate", + "byg:zelkova_slab", + "byg:zelkova_stairs", + "byg:zelkova_trapdoor", + "byg:zelkova_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json index 6cc216469c..b5c38af1e6 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -1,34 +1,34 @@ { "replace": false, "values": [ - "byg:ebony_button", - "byg:redwood_button", - "byg:jacaranda_button", - "byg:maple_button", - "byg:nightshade_button", + "byg:aspen_button", "byg:baobab_button", - "byg:willow_button", - "byg:pine_button", - "byg:witch_hazel_button", - "byg:holly_button", + "byg:blue_enchanted_button", + "byg:bulbis_button", "byg:cherry_button", - "byg:green_enchanted_button", + "byg:cika_button", "byg:cypress_button", + "byg:ebony_button", + "byg:embur_button", + "byg:ether_button", "byg:fir_button", - "byg:bulbis_button", - "byg:aspen_button", - "byg:mangrove_button", - "byg:zelkova_button", + "byg:green_enchanted_button", + "byg:holly_button", + "byg:imparius_button", + "byg:jacaranda_button", "byg:lament_button", - "byg:palm_button", - "byg:cika_button", "byg:mahogany_button", - "byg:ether_button", - "byg:embur_button", + "byg:mangrove_button", + "byg:maple_button", + "byg:nightshade_button", + "byg:palm_button", + "byg:pine_button", "byg:rainbow_eucalyptus_button", - "byg:sythian_button", - "byg:blue_enchanted_button", + "byg:redwood_button", "byg:skyris_button", - "byg:imparius_button" + "byg:sythian_button", + "byg:willow_button", + "byg:witch_hazel_button", + "byg:zelkova_button" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 7f6e6aad84..9afa988a5c 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,68 +1,72 @@ { "replace": false, "values": [ + "byg:araucaria_leaves", + "byg:aspen_leaves", + "byg:baobab_leaves", + "byg:blooming_witch_hazel_leaves", "byg:blue_enchanted_leaves", - "byg:silver_maple_leaves", "byg:blue_spruce_leaves", - "byg:orchard_leaves", - "byg:poison_ivy", - "byg:redwood_leaves", - "byg:pine_leaves", - "byg:aspen_leaves", - "byg:orange_oak_leaves", - "byg:flowering_nightshade_leaves", - "byg:white_cherry_leaves", - "byg:red_oak_leaves", - "byg:red_birch_leaves", - "byg:orange_birch_leaves", - "byg:imparius_vine", - "byg:skyris_leaves", - "byg:green_enchanted_leaves", - "byg:lament_vine", - "byg:zelkova_leaves", - "byg:cika_leaves", - "byg:flowering_palo_verde_leaves", - "byg:orange_spruce_leaves", - "byg:indigo_jacaranda_leaves", - "byg:witch_hazel_leaves", - "byg:araucaria_leaves", - "byg:brown_zelkova_leaves", "byg:brown_birch_leaves", - "byg:ripe_orchard_leaves", - "byg:palo_verde_leaves", - "byg:skyris_vine", - "byg:shulkren_vine", - "byg:jacaranda_leaves", - "byg:blooming_witch_hazel_leaves", - "byg:mahogany_leaves", - "byg:ripe_joshua_leaves", - "byg:embur_gel_vines", - "byg:pink_cherry_leaves", "byg:brown_oak_leaves", - "byg:red_maple_leaves", - "byg:nightshade_leaves", - "byg:yellow_spruce_leaves", - "byg:withering_oak_leaves", - "byg:fir_leaves", - "byg:lament_leaves", - "byg:baobab_leaves", + "byg:brown_zelkova_leaves", + "byg:cika_leaves", + "byg:cypress_leaves", + "byg:ebony_leaves", + "byg:embur_gel_vines", + "byg:embur_gel_vines_plant", "byg:ether_leaves", - "byg:flowering_orchard_leaves", + "byg:fir_leaves", "byg:firecracker_leaves", - "byg:ebony_leaves", - "byg:cypress_leaves", + "byg:flowering_indigo_jacaranda_leaves", "byg:flowering_jacaranda_leaves", + "byg:flowering_nightshade_leaves", + "byg:flowering_orchard_leaves", + "byg:flowering_palo_verde_leaves", "byg:green_apple_skyris_leaves", - "byg:palm_leaves", + "byg:green_enchanted_leaves", + "byg:holly_berry_leaves", "byg:holly_leaves", + "byg:imparius_vine", + "byg:imparius_vine_plant", + "byg:indigo_jacaranda_leaves", + "byg:jacaranda_leaves", "byg:joshua_leaves", - "byg:yellow_birch_leaves", + "byg:lament_leaves", + "byg:lament_vine", + "byg:lament_vine_plant", + "byg:mahogany_leaves", "byg:mangrove_leaves", - "byg:holly_berry_leaves", + "byg:maple_leaves", + "byg:nightshade_leaves", + "byg:orange_birch_leaves", + "byg:orange_oak_leaves", + "byg:orange_spruce_leaves", + "byg:orchard_leaves", + "byg:palm_leaves", + "byg:palo_verde_leaves", + "byg:pine_leaves", + "byg:pink_cherry_leaves", + "byg:poison_ivy", "byg:rainbow_eucalyptus_leaves", + "byg:red_birch_leaves", + "byg:red_maple_leaves", + "byg:red_oak_leaves", + "byg:red_spruce_leaves", + "byg:redwood_leaves", + "byg:ripe_joshua_leaves", + "byg:ripe_orchard_leaves", + "byg:shulkren_vine", + "byg:shulkren_vine_plant", + "byg:silver_maple_leaves", + "byg:skyris_leaves", + "byg:skyris_vine", + "byg:white_cherry_leaves", "byg:willow_leaves", - "byg:maple_leaves", - "byg:flowering_indigo_jacaranda_leaves", - "byg:red_spruce_leaves" + "byg:witch_hazel_leaves", + "byg:withering_oak_leaves", + "byg:yellow_birch_leaves", + "byg:yellow_spruce_leaves", + "byg:zelkova_leaves" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs.json b/Common/src/generated/resources/data/minecraft/tags/items/logs.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json new file mode 100644 index 0000000000..5e8aecc986 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": [] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/planks.json b/Common/src/generated/resources/data/minecraft/tags/items/planks.json index 97ce099283..cdb7689852 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/planks.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/planks.json @@ -2,33 +2,62 @@ "replace": false, "values": [ "byg:aspen_planks", + "byg:aspen_planks", + "byg:baobab_planks", "byg:baobab_planks", "byg:blue_enchanted_planks", + "byg:blue_enchanted_planks", "byg:bulbis_planks", + "byg:bulbis_planks", + "byg:cherry_planks", "byg:cherry_planks", "byg:cika_planks", + "byg:cika_planks", + "byg:cypress_planks", "byg:cypress_planks", "byg:ebony_planks", + "byg:ebony_planks", + "byg:embur_planks", + "byg:embur_planks", "byg:ether_planks", + "byg:ether_planks", + "byg:fir_planks", "byg:fir_planks", "byg:green_enchanted_planks", + "byg:green_enchanted_planks", "byg:holly_planks", + "byg:holly_planks", + "byg:imparius_planks", "byg:imparius_planks", + "byg:jacaranda_planks", + "byg:jacaranda_planks", + "byg:lament_planks", + "byg:lament_planks", + "byg:mahogany_planks", "byg:mahogany_planks", "byg:mangrove_planks", + "byg:mangrove_planks", + "byg:maple_planks", + "byg:maple_planks", + "byg:nightshade_planks", + "byg:nightshade_planks", "byg:palm_planks", + "byg:palm_planks", + "byg:pine_planks", "byg:pine_planks", "byg:rainbow_eucalyptus_planks", + "byg:rainbow_eucalyptus_planks", + "byg:redwood_planks", "byg:redwood_planks", + "byg:skyris_planks", + "byg:skyris_planks", + "byg:sythian_planks", + "byg:sythian_planks", + "byg:willow_planks", "byg:willow_planks", "byg:witch_hazel_planks", + "byg:witch_hazel_planks", "byg:zelkova_planks", - "byg:sythian_planks", - "byg:embur_planks", - "byg:nightshade_planks", - "byg:skyris_planks", - "byg:lament_planks", - "byg:maple_planks", - "byg:jacaranda_planks" + "byg:zelkova_planks" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json index 5c0f684ca1..05124eb859 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -1,16 +1,16 @@ { "replace": false, "values": [ - "byg:white_sand", + "byg:black_sand", + "byg:blue_sand", + "byg:cracked_red_sand", + "byg:end_sand", + "byg:pink_sand", "byg:purple_sand", - "byg:warped_soul_soil", "byg:quartzite_sand", - "byg:pink_sand", - "byg:end_sand", - "byg:windswept_sand", - "byg:blue_sand", - "byg:black_sand", "byg:warped_soul_sand", - "byg:cracked_red_sand" + "byg:warped_soul_soil", + "byg:white_sand", + "byg:windswept_sand" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json index b4d36f669f..2ef4daebe5 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json @@ -4,8 +4,6 @@ "byg:aspen_sapling", "byg:baobab_sapling", "byg:blue_enchanted_sapling", - "byg:pink_cherry_sapling", - "byg:white_cherry_sapling", "byg:cika_sapling", "byg:cypress_sapling", "byg:ebony_sapling", @@ -13,21 +11,23 @@ "byg:fir_sapling", "byg:green_enchanted_sapling", "byg:holly_sapling", - "byg:lament_sapling", "byg:indigo_jacaranda_sapling", "byg:jacaranda_sapling", + "byg:lament_sapling", "byg:mahogany_sapling", "byg:mangrove_sapling", - "byg:red_maple_sapling", - "byg:silver_maple_sapling", "byg:maple_sapling", "byg:nightshade_sapling", "byg:palm_sapling", "byg:palo_verde_sapling", "byg:pine_sapling", + "byg:pink_cherry_sapling", "byg:rainbow_eucalyptus_sapling", + "byg:red_maple_sapling", "byg:redwood_sapling", + "byg:silver_maple_sapling", "byg:skyris_sapling", + "byg:white_cherry_sapling", "byg:willow_sapling", "byg:witch_hazel_sapling", "byg:zelkova_sapling" diff --git a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json index 1d3abf8a5b..5e8aecc986 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,68 +1,4 @@ { "replace": false, - "values": [ - "byg:mangrove_slab", - "byg:chiseled_fungal_imparius_slab", - "byg:cryptic_stone_slab", - "byg:fir_slab", - "byg:purpur_stone_slab", - "byg:bulbis_slab", - "byg:blue_enchanted_slab", - "byg:jacaranda_slab", - "byg:mahogany_slab", - "byg:soapstone_tile_slab", - "byg:mossy_stone_slab", - "byg:cobbled_ether_stone_slab", - "byg:holly_slab", - "byg:red_rock_brick_slab", - "byg:chiseled_windswept_sandstone_slab", - "byg:cherry_slab", - "byg:green_enchanted_slab", - "byg:cracked_red_rock_brick_slab", - "byg:nightshade_slab", - "byg:rocky_stone_slab", - "byg:chiseled_therium_slab", - "byg:dacite_cobblestone_slab", - "byg:cika_slab", - "byg:polished_soapstone_slab", - "byg:lament_slab", - "byg:smooth_windswept_sandstone_slab", - "byg:polished_travertine_slab", - "byg:chiseled_travertine_slab", - "byg:cut_windswept_sandstone_slab", - "byg:travertine_slab", - "byg:imparius_slab", - "byg:cypress_slab", - "byg:embur_slab", - "byg:soapstone_slab", - "byg:dacite_tile_slab", - "byg:witch_hazel_slab", - "byg:palm_slab", - "byg:redwood_slab", - "byg:pine_slab", - "byg:baobab_slab", - "byg:maple_slab", - "byg:scoria_cobblestone_slab", - "byg:zelkova_slab", - "byg:ebony_slab", - "byg:cattail_thatch_slab", - "byg:dacite_brick_slab", - "byg:willow_slab", - "byg:soapstone_brick_slab", - "byg:chiseled_red_rock_brick_slab", - "byg:aspen_slab", - "byg:mossy_red_rock_brick_slab", - "byg:ether_slab", - "byg:rainbow_eucalyptus_slab", - "byg:sythian_slab", - "byg:carved_ether_stone_slab", - "byg:scoria_stone_slab", - "byg:ether_stone_slab", - "byg:dacite_slab", - "byg:skyris_slab", - "byg:red_rock_slab", - "byg:scoria_stonebrick_slab", - "byg:windswept_sandstone_slab", - "byg:shiny_chiseled_therium_slab" - ] + "values": [] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json index e2ecc8bad7..b89ac49bb4 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,68 +1,68 @@ { "replace": false, "values": [ - "byg:cherry_stairs", - "byg:imparius_stairs", - "byg:smooth_windswept_sandstone_stairs", - "byg:fir_stairs", - "byg:pine_stairs", - "byg:embur_stairs", - "byg:mossy_stone_stairs", - "byg:carved_ether_stone_stairs", - "byg:holly_stairs", - "byg:cut_windswept_sandstone_stairs", - "byg:mossy_red_rock_brick_stairs", - "byg:purpur_stone_stairs", - "byg:maple_stairs", "byg:aspen_stairs", + "byg:baobab_stairs", "byg:blue_enchanted_stairs", - "byg:willow_stairs", - "byg:ether_stairs", - "byg:polished_soapstone_stairs", - "byg:rocky_stone_stairs", - "byg:dacite_stairs", - "byg:dacite_cobblestone_stairs", - "byg:travertine_stairs", - "byg:red_rock_brick_stairs", + "byg:bulbis_stairs", + "byg:carved_ether_stone_stairs", "byg:cattail_thatch_stairs", - "byg:lament_stairs", + "byg:cherry_stairs", + "byg:chiseled_fungal_imparius_stairs", + "byg:chiseled_red_rock_brick_stairs", + "byg:chiseled_therium_stairs", "byg:chiseled_travertine_stairs", - "byg:shiny_chiseled_therium_stairs", - "byg:witch_hazel_stairs", "byg:chiseled_windswept_sandstone_stairs", - "byg:rainbow_eucalyptus_stairs", - "byg:chiseled_therium_stairs", + "byg:cika_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:cracked_red_rock_brick_stairs", "byg:cryptic_stone_stairs", + "byg:cut_windswept_sandstone_stairs", + "byg:cypress_stairs", + "byg:dacite_brick_stairs", + "byg:dacite_cobblestone_stairs", + "byg:dacite_stairs", "byg:dacite_tile_stairs", - "byg:chiseled_red_rock_brick_stairs", - "byg:sythian_stairs", - "byg:bulbis_stairs", - "byg:mangrove_stairs", - "byg:skyris_stairs", - "byg:soapstone_stairs", - "byg:soapstone_brick_stairs", - "byg:palm_stairs", - "byg:redwood_stairs", "byg:ebony_stairs", - "byg:nightshade_stairs", - "byg:soapstone_tile_stairs", - "byg:cika_stairs", - "byg:polished_travertine_stairs", + "byg:embur_stairs", + "byg:ether_stairs", + "byg:ether_stone_stairs", + "byg:fir_stairs", "byg:green_enchanted_stairs", - "byg:scoria_stonebrick_stairs", + "byg:holly_stairs", + "byg:imparius_stairs", "byg:jacaranda_stairs", - "byg:dacite_brick_stairs", + "byg:lament_stairs", + "byg:mahogany_stairs", + "byg:mangrove_stairs", + "byg:maple_stairs", + "byg:mossy_red_rock_brick_stairs", + "byg:mossy_stone_stairs", + "byg:nightshade_stairs", + "byg:palm_stairs", + "byg:pine_stairs", + "byg:polished_soapstone_stairs", + "byg:polished_travertine_stairs", + "byg:purpur_stone_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:red_rock_brick_stairs", "byg:red_rock_stairs", - "byg:cypress_stairs", - "byg:windswept_sandstone_stairs", - "byg:cracked_red_rock_brick_stairs", + "byg:redwood_stairs", + "byg:rocky_stone_stairs", "byg:scoria_cobblestone_stairs", - "byg:zelkova_stairs", "byg:scoria_stone_stairs", - "byg:mahogany_stairs", - "byg:ether_stone_stairs", - "byg:cobbled_ether_stone_stairs", - "byg:baobab_stairs", - "byg:chiseled_fungal_imparius_stairs" + "byg:scoria_stonebrick_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:skyris_stairs", + "byg:smooth_windswept_sandstone_stairs", + "byg:soapstone_brick_stairs", + "byg:soapstone_stairs", + "byg:soapstone_tile_stairs", + "byg:sythian_stairs", + "byg:travertine_stairs", + "byg:willow_stairs", + "byg:windswept_sandstone_stairs", + "byg:witch_hazel_stairs", + "byg:zelkova_stairs" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json index 8ea4d3dbcd..ad89b95828 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json @@ -9,26 +9,26 @@ "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:embur_trapdoor", "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", "byg:imparius_trapdoor", + "byg:jacaranda_trapdoor", + "byg:lament_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", + "byg:maple_trapdoor", + "byg:nightshade_trapdoor", "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", + "byg:skyris_trapdoor", + "byg:sythian_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", - "byg:zelkova_trapdoor", - "byg:sythian_trapdoor", - "byg:embur_trapdoor", - "byg:nightshade_trapdoor", - "byg:skyris_trapdoor", - "byg:lament_trapdoor", - "byg:maple_trapdoor", - "byg:jacaranda_trapdoor" + "byg:zelkova_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json index a5e7a2094d..b5c38af1e6 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json @@ -9,26 +9,26 @@ "byg:cika_button", "byg:cypress_button", "byg:ebony_button", + "byg:embur_button", "byg:ether_button", "byg:fir_button", "byg:green_enchanted_button", "byg:holly_button", "byg:imparius_button", + "byg:jacaranda_button", + "byg:lament_button", "byg:mahogany_button", "byg:mangrove_button", + "byg:maple_button", + "byg:nightshade_button", "byg:palm_button", "byg:pine_button", "byg:rainbow_eucalyptus_button", "byg:redwood_button", + "byg:skyris_button", + "byg:sythian_button", "byg:willow_button", "byg:witch_hazel_button", - "byg:zelkova_button", - "byg:sythian_button", - "byg:embur_button", - "byg:nightshade_button", - "byg:skyris_button", - "byg:lament_button", - "byg:maple_button", - "byg:jacaranda_button" + "byg:zelkova_button" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json index 8557526989..ea5faa2ecc 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json @@ -9,26 +9,26 @@ "byg:cika_door", "byg:cypress_door", "byg:ebony_door", + "byg:embur_door", "byg:ether_door", "byg:fir_door", "byg:green_enchanted_door", "byg:holly_door", "byg:imparius_door", + "byg:jacaranda_door", + "byg:lament_door", "byg:mahogany_door", "byg:mangrove_door", + "byg:maple_door", + "byg:nightshade_door", "byg:palm_door", "byg:pine_door", "byg:rainbow_eucalyptus_door", "byg:redwood_door", + "byg:skyris_door", + "byg:sythian_door", "byg:willow_door", "byg:witch_hazel_door", - "byg:zelkova_door", - "byg:sythian_door", - "byg:embur_door", - "byg:nightshade_door", - "byg:skyris_door", - "byg:lament_door", - "byg:maple_door", - "byg:jacaranda_door" + "byg:zelkova_door" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json index 9249533c4f..26142fb45f 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json @@ -9,26 +9,26 @@ "byg:cika_fence", "byg:cypress_fence", "byg:ebony_fence", + "byg:embur_fence", "byg:ether_fence", "byg:fir_fence", "byg:green_enchanted_fence", "byg:holly_fence", "byg:imparius_fence", + "byg:jacaranda_fence", + "byg:lament_fence", "byg:mahogany_fence", "byg:mangrove_fence", + "byg:maple_fence", + "byg:nightshade_fence", "byg:palm_fence", "byg:pine_fence", "byg:rainbow_eucalyptus_fence", "byg:redwood_fence", + "byg:skyris_fence", + "byg:sythian_fence", "byg:willow_fence", "byg:witch_hazel_fence", - "byg:zelkova_fence", - "byg:sythian_fence", - "byg:embur_fence", - "byg:nightshade_fence", - "byg:skyris_fence", - "byg:lament_fence", - "byg:maple_fence", - "byg:jacaranda_fence" + "byg:zelkova_fence" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json index d36796e1de..b9432ae88e 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json @@ -9,26 +9,26 @@ "byg:cika_pressure_plate", "byg:cypress_pressure_plate", "byg:ebony_pressure_plate", + "byg:embur_pressure_plate", "byg:ether_pressure_plate", "byg:fir_pressure_plate", "byg:green_enchanted_pressure_plate", "byg:holly_pressure_plate", "byg:imparius_pressure_plate", + "byg:jacaranda_pressure_plate", + "byg:lament_pressure_plate", "byg:mahogany_pressure_plate", "byg:mangrove_pressure_plate", + "byg:maple_pressure_plate", + "byg:nightshade_pressure_plate", "byg:palm_pressure_plate", "byg:pine_pressure_plate", "byg:rainbow_eucalyptus_pressure_plate", "byg:redwood_pressure_plate", + "byg:skyris_pressure_plate", + "byg:sythian_pressure_plate", "byg:willow_pressure_plate", "byg:witch_hazel_pressure_plate", - "byg:zelkova_pressure_plate", - "byg:sythian_pressure_plate", - "byg:embur_pressure_plate", - "byg:nightshade_pressure_plate", - "byg:skyris_pressure_plate", - "byg:lament_pressure_plate", - "byg:maple_pressure_plate", - "byg:jacaranda_pressure_plate" + "byg:zelkova_pressure_plate" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json index ac3cfd07f1..09afb700f7 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json @@ -9,26 +9,26 @@ "byg:cika_slab", "byg:cypress_slab", "byg:ebony_slab", + "byg:embur_slab", "byg:ether_slab", "byg:fir_slab", "byg:green_enchanted_slab", "byg:holly_slab", "byg:imparius_slab", + "byg:jacaranda_slab", + "byg:lament_slab", "byg:mahogany_slab", "byg:mangrove_slab", + "byg:maple_slab", + "byg:nightshade_slab", "byg:palm_slab", "byg:pine_slab", "byg:rainbow_eucalyptus_slab", "byg:redwood_slab", + "byg:skyris_slab", + "byg:sythian_slab", "byg:willow_slab", "byg:witch_hazel_slab", - "byg:zelkova_slab", - "byg:sythian_slab", - "byg:embur_slab", - "byg:nightshade_slab", - "byg:skyris_slab", - "byg:lament_slab", - "byg:maple_slab", - "byg:jacaranda_slab" + "byg:zelkova_slab" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json index 9bb4a4f65e..7c447d1993 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json @@ -9,26 +9,26 @@ "byg:cika_stairs", "byg:cypress_stairs", "byg:ebony_stairs", + "byg:embur_stairs", "byg:ether_stairs", "byg:fir_stairs", "byg:green_enchanted_stairs", "byg:holly_stairs", "byg:imparius_stairs", + "byg:jacaranda_stairs", + "byg:lament_stairs", "byg:mahogany_stairs", "byg:mangrove_stairs", + "byg:maple_stairs", + "byg:nightshade_stairs", "byg:palm_stairs", "byg:pine_stairs", "byg:rainbow_eucalyptus_stairs", "byg:redwood_stairs", + "byg:skyris_stairs", + "byg:sythian_stairs", "byg:willow_stairs", "byg:witch_hazel_stairs", - "byg:zelkova_stairs", - "byg:sythian_stairs", - "byg:embur_stairs", - "byg:nightshade_stairs", - "byg:skyris_stairs", - "byg:lament_stairs", - "byg:maple_stairs", - "byg:jacaranda_stairs" + "byg:zelkova_stairs" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json index 8ea4d3dbcd..ad89b95828 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json @@ -9,26 +9,26 @@ "byg:cika_trapdoor", "byg:cypress_trapdoor", "byg:ebony_trapdoor", + "byg:embur_trapdoor", "byg:ether_trapdoor", "byg:fir_trapdoor", "byg:green_enchanted_trapdoor", "byg:holly_trapdoor", "byg:imparius_trapdoor", + "byg:jacaranda_trapdoor", + "byg:lament_trapdoor", "byg:mahogany_trapdoor", "byg:mangrove_trapdoor", + "byg:maple_trapdoor", + "byg:nightshade_trapdoor", "byg:palm_trapdoor", "byg:pine_trapdoor", "byg:rainbow_eucalyptus_trapdoor", "byg:redwood_trapdoor", + "byg:skyris_trapdoor", + "byg:sythian_trapdoor", "byg:willow_trapdoor", "byg:witch_hazel_trapdoor", - "byg:zelkova_trapdoor", - "byg:sythian_trapdoor", - "byg:embur_trapdoor", - "byg:nightshade_trapdoor", - "byg:skyris_trapdoor", - "byg:lament_trapdoor", - "byg:maple_trapdoor", - "byg:jacaranda_trapdoor" + "byg:zelkova_trapdoor" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json b/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json index 7ac62b7ffe..97041cdf90 100644 --- a/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json +++ b/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "byg:lush_stacks", - "byg:dead_sea" + "byg:dead_sea", + "byg:lush_stacks" ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/BYG.java b/Common/src/main/java/potionstudios/byg/BYG.java index 2d2f414309..4f69c94b2d 100644 --- a/Common/src/main/java/potionstudios/byg/BYG.java +++ b/Common/src/main/java/potionstudios/byg/BYG.java @@ -1,6 +1,5 @@ package potionstudios.byg; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.mojang.brigadier.CommandDispatcher; @@ -36,7 +35,6 @@ import potionstudios.byg.config.SettingsConfig; import potionstudios.byg.config.json.BiomeDictionaryConfig; import potionstudios.byg.config.json.OverworldBiomeConfig; -import potionstudios.byg.data.BYGDataProviders; import potionstudios.byg.mixin.access.*; import potionstudios.byg.reg.RegistryObject; import potionstudios.byg.server.command.ReloadConfigsCommand; @@ -105,9 +103,6 @@ private static void makeREADME() { } public static void threadSafeCommonLoad() { - if (BYGConstants.GENERATE_DATA) { - BYGDataProviders.generateProviders(); - } BYGVillagerType.setVillagerForBYGBiomes(); BlockEntityTypeAccess builderAccess = (BlockEntityTypeAccess) BlockEntityType.CAMPFIRE; Set validBlocks = new ObjectOpenHashSet<>(builderAccess.byg_getValidBlocks()); diff --git a/Common/src/main/java/potionstudios/byg/BYGConstants.java b/Common/src/main/java/potionstudios/byg/BYGConstants.java index c0d176e0c7..ff4d9f5459 100644 --- a/Common/src/main/java/potionstudios/byg/BYGConstants.java +++ b/Common/src/main/java/potionstudios/byg/BYGConstants.java @@ -7,8 +7,6 @@ public class BYGConstants { public static final int CONFIG_VERSION = 3; public static final boolean BIOMEPEDIA = true; public static final boolean SIGNS = false; - public static final boolean DEV_ENVIRONMENT = Boolean.parseBoolean(System.getProperty("bygDev", "false")); - public static final boolean GENERATE_DATA = Boolean.parseBoolean(System.getProperty("bygGenerateData", "false")); public static boolean ENABLE_OVERWORLD_TREES = true; public static boolean ENABLE_CACTI = true; } diff --git a/Common/src/main/java/potionstudios/byg/client/BYGClient.java b/Common/src/main/java/potionstudios/byg/client/BYGClient.java index 9f1d5d02f3..2189206177 100644 --- a/Common/src/main/java/potionstudios/byg/client/BYGClient.java +++ b/Common/src/main/java/potionstudios/byg/client/BYGClient.java @@ -7,7 +7,6 @@ import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; import potionstudios.byg.BYG; -import potionstudios.byg.BYGConstants; import potionstudios.byg.client.gui.screen.HypogealImperiumScreen; import potionstudios.byg.client.textures.renders.BYGParticleTypes; import potionstudios.byg.common.container.BYGMenuTypes; @@ -16,9 +15,7 @@ import potionstudios.byg.common.particles.FallingLeafParticle; import potionstudios.byg.common.particles.TheriumGlint; import potionstudios.byg.mixin.access.client.MenuScreensAccess; -import potionstudios.byg.util.LangFileGenerator; -import java.nio.file.Paths; import java.util.function.BiConsumer; import java.util.function.Supplier; @@ -27,9 +24,6 @@ public class BYGClient { public static void load() { BYG.LOGGER.debug("BYG: \"Client Setup\" Event Starting..."); BiomepediaClientData.getConfig(true); - if (BYGConstants.GENERATE_DATA) { - LangFileGenerator.createLangFile(Paths.get("generated/en_us.json")); - } // EntityRendererRegistry.register(BYGEntities.MAN_O_WAR, ManOWarRenderer::new); BYG.LOGGER.info("BYG: \"Client Setup\" Event Complete!"); diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java index 515ca55e2b..28daf67573 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlocks.java @@ -1273,15 +1273,15 @@ private static BlockRegistryObject createNetherStoneSpreadable(Block bloc return createBlock(() -> new BYGNylium(BlockBehaviour.Properties.of(Material.STONE, color).sound(SoundType.NYLIUM).strength(0.4f).randomTicks().requiresCorrectToolForDrops(), feature, blockToSpreadToo), id); } - private static BlockRegistryObject createSign(String id, WoodType type, BlockRegistryObject color) { + static BlockRegistryObject createSign(String id, WoodType type, BlockRegistryObject color) { return createSign(id, type, () -> color.get().defaultMaterialColor()); } - private static BlockRegistryObject createSign(String id, WoodType type, Supplier color) { + static BlockRegistryObject createSign(String id, WoodType type, Supplier color) { return BYGConstants.SIGNS ? createBlock(() -> new StandingSignBlock(BlockBehaviour.Properties.copy(Blocks.OAK_SIGN).color(color.get()), type), id) : null; } - private static BlockRegistryObject createWallSign(String id, WoodType type, BlockRegistryObject color) { + static BlockRegistryObject createWallSign(String id, WoodType type, BlockRegistryObject color) { return createWallSign(id, type, () -> color.get().defaultMaterialColor()); } diff --git a/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java b/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java index e437bcb70d..21836acbec 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/BYGEntities.java @@ -10,7 +10,7 @@ import potionstudios.byg.reg.RegistryObject; public class BYGEntities { - private static final RegistrationProvider> PROVIDER = RegistrationProvider.get(Registry.ENTITY_TYPE_REGISTRY, BYG.MOD_ID); + public static final RegistrationProvider> PROVIDER = RegistrationProvider.get(Registry.ENTITY_TYPE_REGISTRY, BYG.MOD_ID); public static final RegistryObject> BOAT = createEntity("boat", EntityType.Builder.of(BYGBoatEntity::new, MobCategory.MISC).sized(1.375F, 0.5625F)); diff --git a/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java b/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java deleted file mode 100644 index ea2f048795..0000000000 --- a/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java +++ /dev/null @@ -1,22 +0,0 @@ -package potionstudios.byg.data; - -import net.minecraft.data.HashCache; -import potionstudios.byg.data.advancements.BYGAdvancementProvider; - -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; - -public class BYGDataProviders { - - public static void generateProviders() { - Path exportPath = Paths.get("generated"); - try { - HashCache cache = new HashCache(exportPath, "cache"); - BYGAdvancementProvider bygAdvancementProvider = new BYGAdvancementProvider(exportPath); - bygAdvancementProvider.run(cache); - } catch (IOException e) { - e.printStackTrace(); - } - } -} diff --git a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementConsumer.java b/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementConsumer.java deleted file mode 100644 index f8e7783e5a..0000000000 --- a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementConsumer.java +++ /dev/null @@ -1,8 +0,0 @@ -package potionstudios.byg.data.advancements; - -import java.util.function.Consumer; - -public interface BYGAdvancementConsumer { - - void accept(Consumer consumer, T root); -} diff --git a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java b/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java deleted file mode 100644 index 237c7d8bba..0000000000 --- a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java +++ /dev/null @@ -1,73 +0,0 @@ -package potionstudios.byg.data.advancements; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementRewards; -import net.minecraft.advancements.FrameType; -import net.minecraft.advancements.critereon.EntityPredicate; -import net.minecraft.advancements.critereon.TickTrigger; -import net.minecraft.data.DataProvider; -import net.minecraft.data.HashCache; -import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.resources.ResourceLocation; -import potionstudios.byg.BYG; -import potionstudios.byg.common.item.BYGItems; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.List; -import java.util.Set; -import java.util.function.Consumer; - -public class BYGAdvancementProvider implements DataProvider { - private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create(); - private final Path outputFolder; - - private static final List> ADVANCEMENTS = ImmutableList.of(new BYGHusbandryAdvancements()); - - public BYGAdvancementProvider(Path outputFolder) { - this.outputFolder = outputFolder; - } - - @Override - public void run(HashCache cache) { - Path path = this.outputFolder; - Set set = Sets.newHashSet(); - Consumer consumer = (advancement) -> { - if (!set.add(advancement.getId())) { - throw new IllegalStateException("Duplicate advancement " + advancement.getId()); - } else { - Path path2 = createPath(path, advancement); - - try { - DataProvider.save(GSON, cache, advancement.deconstruct().serializeToJson(), path2); - } catch (IOException var6) { - BYG.LOGGER.error("Couldn't save advancement {}", path2, var6); - } - - } - }; - - - - Advancement root = Advancement.Builder.advancement().display(BYGItems.BYG_LOGO.get(), new TranslatableComponent("byg.advancements.root.title"), new TranslatableComponent("byg.advancements.root.description"), BYG.createLocation("textures/block/lush_dirt.png"), FrameType.TASK, false, false, false).addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).save(consumer, "byg:root"); - Advancement.Builder.advancement().parent(root).display(BYGItems.BIOMEPEDIA.get(), new TranslatableComponent("byg.advancements.biomepediagift.title"), new TranslatableComponent("byg.advancements.biomepediagift.description"), null, FrameType.TASK, false, false, true).addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).rewards(new AdvancementRewards.Builder().addLootTable(BYG.createLocation("advancement/biomepedia_gift"))).save(consumer, "byg:biomepedia_gift"); - - for (BYGAdvancementConsumer advancement : ADVANCEMENTS) { - advancement.accept(consumer, root); - } - } - - private static Path createPath(Path path, Advancement advancement) { - String nameSpace = advancement.getId().getNamespace(); - return path.resolve("data/" + nameSpace + "/advancements/" + advancement.getId().getPath() + ".json"); - } - - @Override - public String getName() { - return "BYG Advancements"; - } -} diff --git a/Common/src/main/java/potionstudios/byg/util/LangFileGenerator.java b/Common/src/main/java/potionstudios/byg/util/LangFileGenerator.java deleted file mode 100644 index ebffe5cf7f..0000000000 --- a/Common/src/main/java/potionstudios/byg/util/LangFileGenerator.java +++ /dev/null @@ -1,75 +0,0 @@ -package potionstudios.byg.util; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.Util; -import net.minecraft.core.Registry; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.locale.Language; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.block.Block; -import org.apache.commons.lang3.text.WordUtils; -import potionstudios.byg.BYG; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; - -public class LangFileGenerator { - - public static final Map, String> TYPE_ID = Util.make(new HashMap<>(), map -> { - map.put(EntityType.class, "entity"); - map.put(Biome.class, "biome"); - map.put(Block.class, "block"); - map.put(Item.class, "item"); - map.put(MobEffect.class, "effect"); - }); - - public static final Map MISC_LANG_ENTRIES = Util.make(new TreeMap<>(), map -> { - // TODO: Why is this not found when running forge? - InputStream resourceAsStream = Language.class.getResourceAsStream("/assets/byg/lang/en_us_misc.json"); - if (resourceAsStream != null) { - map.putAll(new Gson().fromJson(new InputStreamReader(resourceAsStream), TreeMap.class)); - } - }); - - public static void createLangFile(Path path) { - Map lang = new TreeMap<>(MISC_LANG_ENTRIES); - for (Registry registry : Registry.REGISTRY) { - yes(registry, lang); - } - for (Registry registry : BuiltinRegistries.REGISTRY) { - yes(registry, lang); - } - - try { - Files.createDirectories(path.getParent()); - Files.write(path, new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create().toJson(lang).getBytes()); - } catch (IOException e) { - BYG.LOGGER.error(e.toString()); - } - } - - private static void yes(Registry registry, Map map) { - for (T value : registry) { - ResourceLocation key = registry.getKey(value); - if (key.getNamespace().equals(BYG.MOD_ID)) { - TYPE_ID.forEach((aClass, s) -> { - if (aClass.isAssignableFrom(value.getClass())) { - String id = Util.makeDescriptionId(s, key); - map.put(id, WordUtils.capitalize(key.getPath().replace("_", " "))); - } - }); - } - } - } -} diff --git a/Forge/build.gradle b/Forge/build.gradle index ee5809b94f..f46763e3a7 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -1,3 +1,5 @@ +import net.darkhax.curseforgegradle.TaskPublishCurseForge + import java.util.stream.Collectors buildscript { @@ -186,7 +188,7 @@ task forge_checkForRefmap() { } } -task forge_publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { +task forge_publishCurseForge(type: TaskPublishCurseForge) { apiToken = "$System.env.CURSEFORGE_KEY" int projectId = 247560 String changelogText = projectDir.toPath().getParent().resolve("CHANGELOG.md").getText('UTF-8') diff --git a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java index 66926a86cd..b44c1484b0 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java @@ -4,6 +4,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import potionstudios.byg.BYG; +import potionstudios.byg.datagen.providers.advancements.BYGAdvancementProvider; +import potionstudios.byg.datagen.providers.lang.EnUsLanguageProvider; import potionstudios.byg.datagen.providers.loot.BYGLootTablesProvider; import potionstudios.byg.datagen.providers.tag.BYGBiomeTagsProvider; import potionstudios.byg.datagen.providers.BYGWoodAssetsProvider; @@ -28,9 +30,12 @@ static void onDatagen(final GatherDataEvent event) { gen.addProvider(new BYGEntityTagsProvider(gen, existingFileHelper)); gen.addProvider(new BYGBiomeTagsProvider(gen, existingFileHelper)); gen.addProvider(new BYGRecipeProviders(gen)); + + gen.addProvider(new BYGAdvancementProvider(gen, existingFileHelper)); } if (event.includeClient()) { gen.addProvider(new BYGWoodAssetsProvider(gen, existingFileHelper)); + gen.addProvider(new EnUsLanguageProvider(gen)); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 0a6e5bd0c6..6cb9a0f3c0 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -19,6 +19,7 @@ import net.minecraftforge.client.model.generators.ModelBuilder; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.NotNull; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.mixin.dev.ModelProviderAccess; @@ -249,6 +250,12 @@ public void run(HashCache cache) throws IOException { item.generateAll(cache); } + @NotNull + @Override + public String getName() { + return "Wood Asset Providers"; + } + private static final class ItemProvider extends ItemModelProvider { public ItemProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { @@ -264,5 +271,6 @@ protected void registerModels() { public void generateAll(HashCache cache) { super.generateAll(cache); } + } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementConsumer.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementConsumer.java new file mode 100644 index 0000000000..7730b94932 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementConsumer.java @@ -0,0 +1,10 @@ +package potionstudios.byg.datagen.providers.advancements; + +import net.minecraft.advancements.Advancement; + +import java.util.function.Consumer; + +public interface BYGAdvancementConsumer { + + void accept(Consumer consumer, Advancement root); +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java new file mode 100644 index 0000000000..e7652ced38 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java @@ -0,0 +1,51 @@ +package potionstudios.byg.datagen.providers.advancements; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.FrameType; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.TickTrigger; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.advancements.AdvancementProvider; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraftforge.common.data.ExistingFileHelper; +import potionstudios.byg.common.item.BYGItems; + +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; + +import static potionstudios.byg.BYG.createLocation; + +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +public class BYGAdvancementProvider extends AdvancementProvider { + + private final List> advancements = List.of( + BYGAdventureAdvancements::new, BYGHusbandryAdvancements::new + ); + + public BYGAdvancementProvider(DataGenerator generatorIn, ExistingFileHelper fileHelperIn) { + super(generatorIn, fileHelperIn); + } + + @Override + protected void registerAdvancements(Consumer consumer, ExistingFileHelper fileHelper) { + final Advancement root = Advancement.Builder.advancement() + .display(BYGItems.BYG_LOGO.get(), new TranslatableComponent("byg.advancements.root.title"), new TranslatableComponent("byg.advancements.root.description"), createLocation("textures/block/lush_dirt.png"), FrameType.TASK, false, false, false) + .addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).save(consumer, "byg:root"); + Advancement.Builder.advancement() + .parent(root).display(BYGItems.BIOMEPEDIA.get(), new TranslatableComponent("byg.advancements.biomepediagift.title"), new TranslatableComponent("byg.advancements.biomepediagift.description"), null, FrameType.TASK, false, false, true) + .addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).rewards(new AdvancementRewards.Builder().addLootTable(createLocation("advancement/biomepedia_gift"))).save(consumer, "byg:biomepedia_gift"); + + advancements.stream().map(Supplier::get).forEach(cons -> cons.accept(consumer, root)); + } + + @Override + public String getName() { + return "BYG Advancements"; + } +} diff --git a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdventureAdvancements.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdventureAdvancements.java similarity index 93% rename from Common/src/main/java/potionstudios/byg/data/advancements/BYGAdventureAdvancements.java rename to Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdventureAdvancements.java index c565f49963..d4c3e172db 100644 --- a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdventureAdvancements.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdventureAdvancements.java @@ -1,4 +1,4 @@ -package potionstudios.byg.data.advancements; +package potionstudios.byg.datagen.providers.advancements; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRewards; @@ -16,7 +16,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -public class BYGAdventureAdvancements implements BYGAdvancementConsumer { +public class BYGAdventureAdvancements implements BYGAdvancementConsumer { @Override public void accept(Consumer advancementConsumer, Advancement root) { @@ -25,7 +25,7 @@ public void accept(Consumer advancementConsumer, Advancement root) .map(RegistryObject::getId) .map(key -> ResourceKey.create(Registry.BIOME_REGISTRY, key)) .filter(biomeResourceKey -> biomeResourceKey != BYGBiomes.WINDSWEPT_DUNES) - .collect(Collectors.toList()); + .toList(); AdventureAdvancementsAccess.byg_invokeAddBiomes(Advancement.Builder.advancement(), biomes).parent(root) .display(BYGItems.BYG_LOGO.get(), new TranslatableComponent("byg.advancements.adventure.explore_biomes.title"), new TranslatableComponent("byg.advancements.adventure.explore_biomes.description"), null, FrameType.CHALLENGE, true, true, false) diff --git a/Common/src/main/java/potionstudios/byg/data/advancements/BYGHusbandryAdvancements.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGHusbandryAdvancements.java similarity index 98% rename from Common/src/main/java/potionstudios/byg/data/advancements/BYGHusbandryAdvancements.java rename to Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGHusbandryAdvancements.java index e1cee4f6ed..b8f7557df0 100644 --- a/Common/src/main/java/potionstudios/byg/data/advancements/BYGHusbandryAdvancements.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGHusbandryAdvancements.java @@ -1,4 +1,4 @@ -package potionstudios.byg.data.advancements; +package potionstudios.byg.datagen.providers.advancements; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.FrameType; @@ -10,7 +10,7 @@ import java.util.function.Consumer; -public class BYGHusbandryAdvancements implements BYGAdvancementConsumer { +public class BYGHusbandryAdvancements implements BYGAdvancementConsumer { @Override diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/lang/EnUsLanguageProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/lang/EnUsLanguageProvider.java new file mode 100644 index 0000000000..1358beed93 --- /dev/null +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/lang/EnUsLanguageProvider.java @@ -0,0 +1,47 @@ +package potionstudios.byg.datagen.providers.lang; + +import net.minecraft.Util; +import net.minecraft.data.DataGenerator; +import net.minecraft.locale.Language; +import net.minecraftforge.common.data.LanguageProvider; +import org.apache.commons.lang3.text.WordUtils; +import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGBlocks; +import potionstudios.byg.common.entity.BYGEntities; +import potionstudios.byg.common.item.BYGItems; +import potionstudios.byg.common.world.biome.BYGBiomes; +import potionstudios.byg.reg.RegistrationProvider; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +public class EnUsLanguageProvider extends LanguageProvider { + + public static final Map, String> PROVIDER_TO_ID = Util.make(new HashMap<>(), map -> { + map.put(BYGEntities.PROVIDER, "entity"); + map.put(BYGBiomes.PROVIDER, "biome"); + map.put(BYGBlocks.PROVIDER, "block"); + map.put(BYGItems.PROVIDER, "item"); + }); + + public EnUsLanguageProvider(DataGenerator gen) { + super(gen, BYG.MOD_ID, "en_us"); + } + + @Override + protected void addTranslations() { + PROVIDER_TO_ID.forEach((provider, id) -> { + provider.getEntries().forEach(entry -> { + final var descId = Util.makeDescriptionId(id, entry.getId()); + add(descId, WordUtils.capitalize(entry.getId().getPath().replace("_", " "))); + }); + }); + + final InputStream resourceAsStream = BYG.class.getResourceAsStream("/assets/byg/lang/en_us_misc.json"); + if (resourceAsStream != null) { + Language.loadFromJson(resourceAsStream, this::add); + } + } + +} From 7b72015b7e0a490297ad63f0e1a5c9a56581b347 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sat, 28 May 2022 16:26:38 +0300 Subject: [PATCH 65/90] Add ourselves into the credits --- Fabric/src/main/resources/fabric.mod.json | 8 ++++++++ Forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index a90a217556..5b0bb63ee9 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -9,6 +9,14 @@ "AOCAWOL", "YaBoiChips" ], + "contributors": [ + { + "name": "TheModdingInquisition", + "contact": { + "homepage": "https://github.com/TheModdingInquisition" + } + } + ], "contact": { "homepage": "https://bygmc.weebly.com/", "sources": "https://github.com/CorgiTaco/BYG", diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index ec30cf4dc6..7e612106a5 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -8,7 +8,7 @@ version = "1.4" displayName = "Oh The Biomes You'll Go" displayURL = "https://oh-the-biomes-youll-go.fandom.com/wiki/Oh_The_Biomes_You%27ll_Go_Wiki" logoFile = "logo_text.png" -credits = "Some Artwork: CupOfJoe, SaltySeaDoggo, Spare, Paul; Some Code: TelepathicGrunt, Paul, HauntedPasta" +credits = "Some Artwork: CupOfJoe, SaltySeaDoggo, Spare, Paul; Some Code: TelepathicGrunt, Paul, HauntedPasta, TheModdingInquisition" authors = "AOCAWOL, Corgi Taco, YaBoiChips" description = ''' An Adventure and Exploration mod with over 80 new biomes! diff --git a/gradle.properties b/gradle.properties index 6f52617553..e77cdfb7b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,6 +34,6 @@ mod_description= org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -#Dependencies +# Dependencies nightconfig_version = 3.6.2 jankson_version = 1.2.1 \ No newline at end of file From dda85bdea03f17c2b7cc8440446b9b5d22b0dc29 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 31 May 2022 21:24:03 +0300 Subject: [PATCH 66/90] Fixes --- Common/src/generated/resources/.cache/cache | 9 +- .../adventure/oh_the_biomes_youll_go.json | 450 +++++++++--------- .../data/byg/tags/items/mushrooms.json | 13 + .../tags/worldgen/biome/is_beach.json | 0 .../tags/worldgen/biome/is_deep_ocean.json | 0 .../data/minecraft/tags/items/leaves.json | 4 - .../byg/common/block/BYGBlockTags.java | 1 + .../byg/common/world/biome/BYGBiomeTags.java | 11 + .../byg/common/world/biome/BYGBiomeType.java | 49 -- .../byg/common/world/biome/BYGBiomes.java | 42 +- .../byg/tags/worldgen/biome/is_dense.json | 6 + .../data/byg/tags/worldgen/biome/is_hill.json | 5 + .../byg/tags/worldgen/biome/is_modified.json | 5 + .../byg/tags/worldgen/biome/is_mushroom.json | 5 + .../byg/tags/worldgen/biome/is_nether.json | 17 + .../data/byg/tags/worldgen/biome/is_peak.json | 5 + .../byg/tags/worldgen/biome/is_plateau.json | 5 + .../data/byg/tags/worldgen/biome/is_rare.json | 5 + .../byg/tags/worldgen/biome/is_river.json | 5 + .../byg/tags/worldgen/biome/is_slope.json | 5 + .../byg/tags/worldgen/biome/is_sparse.json | 6 + .../byg/tags/worldgen/biome/is_temperate.json | 5 + .../tags/worldgen/biome/is_underground.json | 5 + .../data/byg/tags/worldgen/biome/is_void.json | 5 + .../providers/tag/BYGBiomeTagsProvider.java | 8 +- .../providers/tag/BYGBlockTagsProvider.java | 2 +- .../providers/tag/BYGItemTagsProvider.java | 22 +- 27 files changed, 390 insertions(+), 305 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/tags/items/mushrooms.json rename Common/src/generated/resources/data/{minecraft => byg}/tags/worldgen/biome/is_beach.json (100%) rename Common/src/generated/resources/data/{minecraft => byg}/tags/worldgen/biome/is_deep_ocean.json (100%) delete mode 100644 Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json create mode 100644 Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index aa02c70346..60da65b579 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2024,7 +2024,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -55535d1514c427537932322ff12e57022a53cdd9 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +e8ee05951214e5ce2bbe2863a2db30ce32f04a5f data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json @@ -3463,6 +3463,7 @@ c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/blocks/wood/skyris_logs.j a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json b9ab1582ed849d23d78df79d78211ec07ba14d27 data/byg/tags/entity_types/boats.json fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/items/bookshelves.json +ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/items/mushrooms.json 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/items/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/items/wood/baobab_logs.json 5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/items/wood/blue_enchanted_logs.json @@ -3493,7 +3494,9 @@ c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/items/wood/skyris_logs.js 7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/items/wood/witch_hazel_logs.json a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/items/wood/zelkova_logs.json 417da7430aeb414baa78ea7c68077f9e964396ef data/byg/tags/worldgen/biome/is_badlands.json +e267658c8d53318f1183c2fb3a860580be3498dd data/byg/tags/worldgen/biome/is_beach.json 7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_dead.json +a58f5d6e58216b07697b39682647820c0f23779c data/byg/tags/worldgen/biome/is_deep_ocean.json 8ff0c57a1c566702b71a741cc95bf8e79630285d data/byg/tags/worldgen/biome/is_icy.json a58f5d6e58216b07697b39682647820c0f23779c data/byg/tags/worldgen/biome/is_ocean.json 6c5591da8888cfd1a3c6b7f2be4818277dd1154f data/byg/tags/worldgen/biome/is_sandy.json @@ -3522,7 +3525,7 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json 686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/buttons.json -7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/items/leaves.json +1a425684393db180e3cde0048031ec3959749966 data/minecraft/tags/items/leaves.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs_that_burn.json d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/items/planks.json @@ -3538,5 +3541,3 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/items/wooden_pressu 325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/items/wooden_slabs.json 2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/items/wooden_stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/wooden_trapdoors.json -e267658c8d53318f1183c2fb3a860580be3498dd data/minecraft/tags/worldgen/biome/is_beach.json -a58f5d6e58216b07697b39682647820c0f23779c data/minecraft/tags/worldgen/biome/is_deep_ocean.json diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index bb059f34cb..ae5f4d7b8b 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,832 +19,832 @@ "experience": 1000 }, "criteria": { - "byg:autumnal_valley": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:red_rock_valley" } } }, - "byg:prairie": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:quartz_desert" } } }, - "byg:autumnal_forest": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:arisian_undergrowth" } } }, - "byg:baobab_savanna": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:dacite_shore" } } }, - "byg:sierra_badlands": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:coconino_meadow" } } }, - "byg:windswept_desert": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:fragment_forest" } } }, - "byg:tropical_rainforest": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:cardinal_tundra" } } }, - "byg:brimstone_caverns": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:cika_woods" } } }, - "byg:imparius_grove": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:atacama_desert" } } }, - "byg:coconino_meadow": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:maple_taiga" } } }, - "byg:fragment_forest": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:sierra_badlands" } } }, - "byg:frosted_taiga": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:black_forest" } } }, - "byg:redwood_thicket": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:orchard" } } }, - "byg:temperate_rainforest": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:rose_fields" } } }, - "byg:rainbow_beach": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:skyris_vale" } } }, - "byg:glowstone_gardens": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:wailing_garth" } } }, - "byg:guiana_shield": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:bayou" } } }, - "byg:quartz_desert": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:lush_stacks" } } }, - "byg:araucaria_savanna": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:dead_sea" } } }, - "byg:lush_stacks": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:viscal_isles" } } }, - "byg:zelkova_forest": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:imparius_grove" } } }, - "byg:aspen_forest": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:allium_fields" } } }, - "byg:cika_woods": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:mojave_desert" } } }, - "byg:magma_wastes": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:crag_gardens" } } }, - "byg:skyris_vale": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:embur_bog" } } }, - "byg:nightshade_forest": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:aspen_forest" } } }, - "byg:maple_taiga": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:subzero_hypogeal" } } }, - "byg:dacite_ridges": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:cypress_swamplands" } } }, - "byg:autumnal_taiga": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:weeping_witch_forest" } } }, - "byg:warped_desert": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:nightshade_forest" } } }, - "byg:ebony_woods": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:windswept_desert" } } }, - "byg:weeping_mire": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:ivis_fields" } } }, - "byg:viscal_isles": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:rainbow_beach" } } }, - "byg:cypress_swamplands": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:glowstone_gardens" } } }, - "byg:jacaranda_forest": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:howling_peaks" } } }, - "byg:shattered_glacier": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:borealis_grove" } } }, - "byg:canadian_shield": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:tropical_rainforest" } } }, - "byg:bulbis_gardens": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:jacaranda_forest" } } }, - "byg:howling_peaks": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:windswept_beach": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:shattered_glacier" } } }, - "byg:coniferous_forest": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:frosted_taiga" } } }, - "byg:allium_fields": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:sythian_torrids" } } }, - "byg:shulkren_forest": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:temperate_rainforest" } } }, - "byg:basalt_barrera": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:prairie" } } }, - "byg:rose_fields": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:twilight_meadow": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:guiana_shield" } } }, - "byg:mojave_desert": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:windswept_beach" } } }, - "byg:ivis_fields": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:magma_wastes" } } }, - "byg:white_mangrove_marshes": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:cardinal_tundra": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:autumnal_forest" } } }, - "byg:amaranth_fields": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:bulbis_gardens" } } }, - "byg:crimson_gardens": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:brimstone_caverns" } } }, - "byg:sythian_torrids": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:coniferous_forest" } } }, - "byg:weeping_witch_forest": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:autumnal_valley" } } }, - "byg:dacite_shore": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:zelkova_forest" } } }, - "byg:red_rock_valley": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:araucaria_savanna" } } }, - "byg:borealis_grove": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:ebony_woods" } } }, - "byg:black_forest": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:twilight_meadow" } } }, - "byg:arisian_undergrowth": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:ethereal_islands" } } }, - "byg:atacama_desert": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:autumnal_taiga" } } }, - "byg:firecracker_shrubland": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:amaranth_fields" } } }, - "byg:red_oak_forest": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:forgotten_forest" } } }, - "byg:cherry_blossom_forest": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:red_oak_forest" } } }, - "byg:embur_bog": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:redwood_thicket" } } }, - "byg:ethereal_islands": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:temperate_grove" } } }, - "byg:cryptic_wastes": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:crimson_gardens" } } }, - "byg:bayou": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:warped_desert" } } }, - "byg:temperate_grove": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:weeping_mire" } } }, - "byg:wailing_garth": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:dacite_ridges" } } }, - "byg:forgotten_forest": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:firecracker_shrubland" } } }, - "byg:orchard": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:baobab_savanna" } } }, - "byg:frosted_coniferous_forest": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:shulkren_forest" } } }, - "byg:crag_gardens": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:canadian_shield" } } }, - "byg:dead_sea": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:basalt_barrera" } } }, - "byg:subzero_hypogeal": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:cryptic_wastes" } } } }, "requirements": [ [ - "byg:autumnal_valley" + "byg:red_rock_valley" ], [ - "byg:prairie" + "byg:quartz_desert" ], [ - "byg:autumnal_forest" + "byg:arisian_undergrowth" ], [ - "byg:baobab_savanna" + "byg:dacite_shore" ], [ - "byg:sierra_badlands" + "byg:coconino_meadow" ], [ - "byg:windswept_desert" + "byg:fragment_forest" ], [ - "byg:tropical_rainforest" + "byg:cardinal_tundra" ], [ - "byg:brimstone_caverns" + "byg:cika_woods" ], [ - "byg:imparius_grove" + "byg:atacama_desert" ], [ - "byg:coconino_meadow" + "byg:maple_taiga" ], [ - "byg:fragment_forest" + "byg:sierra_badlands" ], [ - "byg:frosted_taiga" + "byg:black_forest" ], [ - "byg:redwood_thicket" + "byg:orchard" ], [ - "byg:temperate_rainforest" + "byg:rose_fields" ], [ - "byg:rainbow_beach" + "byg:skyris_vale" ], [ - "byg:glowstone_gardens" + "byg:wailing_garth" ], [ - "byg:guiana_shield" + "byg:bayou" ], [ - "byg:quartz_desert" + "byg:lush_stacks" ], [ - "byg:araucaria_savanna" + "byg:dead_sea" ], [ - "byg:lush_stacks" + "byg:viscal_isles" ], [ - "byg:zelkova_forest" + "byg:imparius_grove" ], [ - "byg:aspen_forest" + "byg:allium_fields" ], [ - "byg:cika_woods" + "byg:mojave_desert" ], [ - "byg:magma_wastes" + "byg:crag_gardens" ], [ - "byg:skyris_vale" + "byg:embur_bog" ], [ - "byg:nightshade_forest" + "byg:aspen_forest" ], [ - "byg:maple_taiga" + "byg:subzero_hypogeal" ], [ - "byg:dacite_ridges" + "byg:cypress_swamplands" ], [ - "byg:autumnal_taiga" + "byg:weeping_witch_forest" ], [ - "byg:warped_desert" + "byg:nightshade_forest" ], [ - "byg:ebony_woods" + "byg:windswept_desert" ], [ - "byg:weeping_mire" + "byg:ivis_fields" ], [ - "byg:viscal_isles" + "byg:rainbow_beach" ], [ - "byg:cypress_swamplands" + "byg:glowstone_gardens" ], [ - "byg:jacaranda_forest" + "byg:howling_peaks" ], [ - "byg:shattered_glacier" + "byg:borealis_grove" ], [ - "byg:canadian_shield" + "byg:tropical_rainforest" ], [ - "byg:bulbis_gardens" + "byg:jacaranda_forest" ], [ - "byg:howling_peaks" + "byg:frosted_coniferous_forest" ], [ - "byg:windswept_beach" + "byg:shattered_glacier" ], [ - "byg:coniferous_forest" + "byg:frosted_taiga" ], [ - "byg:allium_fields" + "byg:sythian_torrids" ], [ - "byg:shulkren_forest" + "byg:temperate_rainforest" ], [ - "byg:basalt_barrera" + "byg:prairie" ], [ - "byg:rose_fields" + "byg:white_mangrove_marshes" ], [ - "byg:twilight_meadow" + "byg:guiana_shield" ], [ - "byg:mojave_desert" + "byg:windswept_beach" ], [ - "byg:ivis_fields" + "byg:magma_wastes" ], [ - "byg:white_mangrove_marshes" + "byg:cherry_blossom_forest" ], [ - "byg:cardinal_tundra" + "byg:autumnal_forest" ], [ - "byg:amaranth_fields" + "byg:bulbis_gardens" ], [ - "byg:crimson_gardens" + "byg:brimstone_caverns" ], [ - "byg:sythian_torrids" + "byg:coniferous_forest" ], [ - "byg:weeping_witch_forest" + "byg:autumnal_valley" ], [ - "byg:dacite_shore" + "byg:zelkova_forest" ], [ - "byg:red_rock_valley" + "byg:araucaria_savanna" ], [ - "byg:borealis_grove" + "byg:ebony_woods" ], [ - "byg:black_forest" + "byg:twilight_meadow" ], [ - "byg:arisian_undergrowth" + "byg:ethereal_islands" ], [ - "byg:atacama_desert" + "byg:autumnal_taiga" ], [ - "byg:firecracker_shrubland" + "byg:amaranth_fields" ], [ - "byg:red_oak_forest" + "byg:forgotten_forest" ], [ - "byg:cherry_blossom_forest" + "byg:red_oak_forest" ], [ - "byg:embur_bog" + "byg:redwood_thicket" ], [ - "byg:ethereal_islands" + "byg:temperate_grove" ], [ - "byg:cryptic_wastes" + "byg:crimson_gardens" ], [ - "byg:bayou" + "byg:warped_desert" ], [ - "byg:temperate_grove" + "byg:weeping_mire" ], [ - "byg:wailing_garth" + "byg:dacite_ridges" ], [ - "byg:forgotten_forest" + "byg:firecracker_shrubland" ], [ - "byg:orchard" + "byg:baobab_savanna" ], [ - "byg:frosted_coniferous_forest" + "byg:shulkren_forest" ], [ - "byg:crag_gardens" + "byg:canadian_shield" ], [ - "byg:dead_sea" + "byg:basalt_barrera" ], [ - "byg:subzero_hypogeal" + "byg:cryptic_wastes" ] ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/mushrooms.json b/Common/src/generated/resources/data/byg/tags/items/mushrooms.json new file mode 100644 index 0000000000..1abb5966cc --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/mushrooms.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "byg:bulbis_oddity", + "byg:fungal_imparius", + "byg:green_mushroom", + "byg:imparius_mushroom", + "byg:purple_bulbis_oddity", + "byg:shulkren_fungus", + "byg:weeping_milkcap", + "byg:wood_blewit" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_beach.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json similarity index 100% rename from Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_beach.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json diff --git a/Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json similarity index 100% rename from Common/src/generated/resources/data/minecraft/tags/worldgen/biome/is_deep_ocean.json rename to Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 9afa988a5c..2876805537 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -14,7 +14,6 @@ "byg:cypress_leaves", "byg:ebony_leaves", "byg:embur_gel_vines", - "byg:embur_gel_vines_plant", "byg:ether_leaves", "byg:fir_leaves", "byg:firecracker_leaves", @@ -28,13 +27,11 @@ "byg:holly_berry_leaves", "byg:holly_leaves", "byg:imparius_vine", - "byg:imparius_vine_plant", "byg:indigo_jacaranda_leaves", "byg:jacaranda_leaves", "byg:joshua_leaves", "byg:lament_leaves", "byg:lament_vine", - "byg:lament_vine_plant", "byg:mahogany_leaves", "byg:mangrove_leaves", "byg:maple_leaves", @@ -57,7 +54,6 @@ "byg:ripe_joshua_leaves", "byg:ripe_orchard_leaves", "byg:shulkren_vine", - "byg:shulkren_vine_plant", "byg:silver_maple_leaves", "byg:skyris_leaves", "byg:skyris_vine", diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGBlockTags.java b/Common/src/main/java/potionstudios/byg/common/block/BYGBlockTags.java index 4f847139a0..ac254c2453 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGBlockTags.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGBlockTags.java @@ -146,6 +146,7 @@ public class BYGBlockTags { public static final TagKey END_STONE = createTag("end_stone"); public static final TagKey SPREADS_TO_NETHERRACK = createTag("spreads_to_netherrack"); public static final TagKey SCAFFOLDING = createTag("scaffolding"); + public static final TagKey MUSHROOMS = createTag("mushrooms"); public static final TagKey LUSH = createTag("lush"); public static final TagKey SLABS = createTag("slabs"); diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeTags.java b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeTags.java index fa9a126c74..074bba941f 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeTags.java +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeTags.java @@ -17,6 +17,17 @@ public class BYGBiomeTags { public static final TagKey HAS_PALM_TREES = create("has_feature/palm_trees"); + public static final TagKey IS_BEACH = create("is_beach"); + public static final TagKey IS_ICY = create("is_icy"); + public static final TagKey IS_SNOWY = create("is_snowy"); + public static final TagKey IS_SANDY = create("is_sandy"); + public static final TagKey IS_DEEP_OCEAN = create("is_deep_ocean"); + public static final TagKey IS_OCEAN = create("is_ocean"); + public static final TagKey IS_SPOOKY = create("is_spooky"); + public static final TagKey IS_SWAMP = create("is_swamp"); + public static final TagKey IS_WASTELAND = create("is_wasteland"); + public static final TagKey IS_DEAD = create("is_dead"); + public static final TagKey IS_BADLANDS = create("is_badlands"); private static TagKey create(String id) { return TagKey.create(Registry.BIOME_REGISTRY, BYG.createLocation(id)); diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java deleted file mode 100644 index 8bf1d26018..0000000000 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomeType.java +++ /dev/null @@ -1,49 +0,0 @@ -package potionstudios.byg.common.world.biome; - -import net.minecraft.core.Registry; -import net.minecraft.tags.BiomeTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.biome.Biome; -import potionstudios.byg.BYG; -import potionstudios.byg.reg.RegistryObject; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - -public enum BYGBiomeType { - BEACH(BiomeTags.IS_BEACH), - ICY("is_icy"), - SNOWY("is_snowy"), - SANDY("is_sandy"), - DEEP_OCEAN(BiomeTags.IS_DEEP_OCEAN), - OCEAN("is_ocean"), - SPOOKY("is_spooky"), - SWAMP("is_swamp"), - WASTELAND("is_wasteland"), - DEAD("is_dead"), - BADLANDS("is_badlands"); - - private final TagKey tag; - private final List> biomes = new ArrayList<>(); - - BYGBiomeType(TagKey tag) { - this.tag = tag; - } - - BYGBiomeType(String tag) { - this(TagKey.create(Registry.BIOME_REGISTRY, BYG.createLocation(tag))); - } - - public void add(RegistryObject biome) { - this.biomes.add(biome); - } - - public TagKey tag() { - return tag; - } - - public Stream getBiomes() { - return biomes.stream().map(RegistryObject::get); - } -} diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java index 3c04aa1888..c800bc0cf4 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/BYGBiomes.java @@ -1,9 +1,12 @@ package potionstudios.byg.common.world.biome; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import net.minecraft.core.Registry; import net.minecraft.data.BuiltinRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; import potionstudios.byg.BYG; import potionstudios.byg.BYGConstants; @@ -14,15 +17,20 @@ import potionstudios.byg.common.world.structure.BYGStructureSets; import potionstudios.byg.common.world.surfacerules.rulesource.BYGRuleSources; import potionstudios.byg.reg.RegistrationProvider; +import potionstudios.byg.reg.RegistryObject; import potionstudios.byg.util.blendingfunction.BlendingFunction; +import java.util.HashMap; +import java.util.HashSet; import java.util.function.Supplier; import static potionstudios.byg.common.world.biome.BYGOverworldBiomes.*; +import static potionstudios.byg.common.world.biome.BYGBiomeTags.*; public class BYGBiomes { public static final RegistrationProvider PROVIDER = RegistrationProvider.get(BuiltinRegistries.BIOME, BYG.MOD_ID); + public static final Multimap, RegistryObject> BIOMES_BY_TAG = Multimaps.newSetMultimap(new HashMap<>(), HashSet::new); /************Primary Biomes************/ public static final ResourceKey ALLIUM_FIELDS = createBiome("allium_fields", BYGOverworldBiomes::alliumFields); @@ -32,7 +40,7 @@ public class BYGBiomes { public static final ResourceKey ATACAMA_DESERT = createBiome("atacama_desert", BYGOverworldBiomes::atacamaDesert); public static final ResourceKey AUTUMNAL_VALLEY = createBiome("autumnal_valley", BYGOverworldBiomes::autumnalValley); public static final ResourceKey BAOBAB_SAVANNA = createBiome("baobab_savanna", BYGOverworldBiomes::baobabSavanna); - public static final ResourceKey BAYOU = createBiome("bayou", BYGOverworldBiomes::bayou, BYGBiomeType.SWAMP); + public static final ResourceKey BAYOU = createBiome("bayou", BYGOverworldBiomes::bayou, IS_SWAMP); public static final ResourceKey BLACK_FOREST = createBiome("black_forest", BYGOverworldBiomes::blackForest); public static final ResourceKey BOREALIS_GROVE = createBiome("borealis_grove", BYGOverworldBiomes::borealisGrove); public static final ResourceKey CANADIAN_SHIELD = createBiome("canadian_shield", BYGOverworldBiomes::canadianShield); @@ -40,11 +48,11 @@ public class BYGBiomes { public static final ResourceKey CIKA_WOODS = createBiome("cika_woods", BYGOverworldBiomes::cikaWoods); public static final ResourceKey CONIFEROUS_FOREST = createBiome("coniferous_forest", () -> coniferousForest(false)); public static final ResourceKey CRAG_GARDENS = createBiome("crag_gardens", BYGOverworldBiomes::cragGardens); - public static final ResourceKey CYPRESS_SWAMPLANDS = createBiome("cypress_swamplands", BYGOverworldBiomes::cypressSwamplands, BYGBiomeType.SWAMP); - public static final ResourceKey LUSH_STACKS = createBiome("lush_stacks", BYGOverworldBiomes::lushStacks, BYGBiomeType.DEEP_OCEAN, BYGBiomeType.OCEAN); - public static final ResourceKey DEAD_SEA = createBiome("dead_sea", BYGOverworldBiomes::deadSea, BYGBiomeType.DEEP_OCEAN, BYGBiomeType.OCEAN, BYGBiomeType.WASTELAND, BYGBiomeType.DEAD); + public static final ResourceKey CYPRESS_SWAMPLANDS = createBiome("cypress_swamplands", BYGOverworldBiomes::cypressSwamplands, IS_SWAMP); + public static final ResourceKey LUSH_STACKS = createBiome("lush_stacks", BYGOverworldBiomes::lushStacks, IS_DEEP_OCEAN, IS_OCEAN); + public static final ResourceKey DEAD_SEA = createBiome("dead_sea", BYGOverworldBiomes::deadSea, IS_DEEP_OCEAN, IS_OCEAN, IS_WASTELAND, IS_DEAD); public static final ResourceKey DACITE_RIDGES = createBiome("dacite_ridges", BYGOverworldBiomes::daciteRidges); - public static final ResourceKey WINDSWEPT_DUNES = createBiome("windswept_dunes", () -> BYGOverworldBiomes.windsweptDesert(true), BYGBiomeType.SANDY, BYGBiomeType.BADLANDS); + public static final ResourceKey WINDSWEPT_DUNES = createBiome("windswept_dunes", () -> BYGOverworldBiomes.windsweptDesert(true), IS_SANDY, IS_BADLANDS); public static final ResourceKey WINDSWEPT_DESERT = createBiome("windswept_desert", () -> BYGOverworldBiomes.windsweptDesert(false)); public static final ResourceKey EBONY_WOODS = createBiome("ebony_woods", BYGOverworldBiomes::ebonyWoods); public static final ResourceKey FORGOTTEN_FOREST = createBiome("forgotten_forest", BYGOverworldBiomes::forgottenForest); @@ -54,34 +62,34 @@ public class BYGBiomes { public static final ResourceKey JACARANDA_FOREST = createBiome("jacaranda_forest", BYGOverworldBiomes::jacarandaForest); public static final ResourceKey MAPLE_TAIGA = createBiome("maple_taiga", BYGOverworldBiomes::mapleTaiga); public static final ResourceKey COCONINO_MEADOW = createBiome("coconino_meadow", () -> coconinoMeadow(false, false)); - public static final ResourceKey MOJAVE_DESERT = createBiome("mojave_desert", BYGOverworldBiomes::mojaveDesert, BYGBiomeType.SANDY); + public static final ResourceKey MOJAVE_DESERT = createBiome("mojave_desert", BYGOverworldBiomes::mojaveDesert, IS_SANDY); public static final ResourceKey CARDINAL_TUNDRA = createBiome("cardinal_tundra", BYGOverworldBiomes::cardinalTundra); public static final ResourceKey ORCHARD = createBiome("orchard", BYGOverworldBiomes::orchard); public static final ResourceKey PRAIRIE = createBiome("prairie", BYGOverworldBiomes::prairie); public static final ResourceKey RED_OAK_FOREST = createBiome("red_oak_forest", BYGOverworldBiomes::redOakForest); - public static final ResourceKey RED_ROCK_VALLEY = createBiome("red_rock_valley", BYGOverworldBiomes::redRockValley, BYGBiomeType.BADLANDS); + public static final ResourceKey RED_ROCK_VALLEY = createBiome("red_rock_valley", BYGOverworldBiomes::redRockValley, IS_BADLANDS); public static final ResourceKey ROSE_FIELDS = createBiome("rose_fields", BYGOverworldBiomes::roseFields); public static final ResourceKey AUTUMNAL_FOREST = createBiome("autumnal_forest", BYGOverworldBiomes::autumnalForest); public static final ResourceKey AUTUMNAL_TAIGA = createBiome("autumnal_taiga", () -> autumnalTaiga(false)); - public static final ResourceKey SHATTERED_GLACIER = createBiome("shattered_glacier", BYGOverworldBiomes::shatteredGlacier, BYGBiomeType.ICY); + public static final ResourceKey SHATTERED_GLACIER = createBiome("shattered_glacier", BYGOverworldBiomes::shatteredGlacier, IS_ICY); public static final ResourceKey FIRECRACKER_SHRUBLAND = createBiome("firecracker_shrubland", BYGOverworldBiomes::firecrackerShrubland); - public static final ResourceKey SIERRA_BADLANDS = createBiome("sierra_badlands", BYGOverworldBiomes::sierraBadlands, BYGBiomeType.BADLANDS); + public static final ResourceKey SIERRA_BADLANDS = createBiome("sierra_badlands", BYGOverworldBiomes::sierraBadlands, IS_BADLANDS); public static final ResourceKey SKYRIS_VALE = createBiome("skyris_vale", BYGOverworldBiomes::skyrisVale); public static final ResourceKey REDWOOD_THICKET = createBiome("redwood_thicket", BYGOverworldBiomes::redwoodThicket); - public static final ResourceKey FROSTED_TAIGA = createBiome("frosted_taiga", () -> frostedTaiga(true, false), BYGBiomeType.SNOWY); - public static final ResourceKey FROSTED_CONIFEROUS_FOREST = createBiome("frosted_coniferous_forest", () -> coniferousForest(true), BYGBiomeType.SNOWY); + public static final ResourceKey FROSTED_TAIGA = createBiome("frosted_taiga", () -> frostedTaiga(true, false), IS_SNOWY); + public static final ResourceKey FROSTED_CONIFEROUS_FOREST = createBiome("frosted_coniferous_forest", () -> coniferousForest(true), IS_SNOWY); public static final ResourceKey FRAGMENT_FOREST = createBiome("fragment_forest", BYGOverworldBiomes::fragmentForest); // public static final ResourceKey TROPICAL_ISLAND = createBiome("tropical_islands", tropicalRainforest()); public static final ResourceKey TROPICAL_RAINFOREST = createBiome("tropical_rainforest", BYGOverworldBiomes::tropicalRainforest); public static final ResourceKey TWILIGHT_MEADOW = createBiome("twilight_meadow", BYGOverworldBiomes::twilightMeadow); - public static final ResourceKey WEEPING_WITCH_FOREST = createBiome("weeping_witch_forest", BYGOverworldBiomes::weepingWitchForest, BYGBiomeType.SPOOKY); + public static final ResourceKey WEEPING_WITCH_FOREST = createBiome("weeping_witch_forest", BYGOverworldBiomes::weepingWitchForest, IS_SPOOKY); public static final ResourceKey WHITE_MANGROVE_MARSHES = createBiome("white_mangrove_marshes", BYGOverworldBiomes::whiteMangroveMarshes); public static final ResourceKey TEMPERATE_RAINFOREST = createBiome("temperate_rainforest", BYGOverworldBiomes::temperateRainForest); public static final ResourceKey ZELKOVA_FOREST = createBiome("zelkova_forest", BYGOverworldBiomes::zelkovaForest); /************Beach Biomes*************/ public static final ResourceKey WINDSWEPT_BEACH = createBiome("windswept_beach", BYGOverworldBiomes::windsweptBeach); - public static final ResourceKey RAINBOW_BEACH = createBiome("rainbow_beach", BYGOverworldBiomes::rainbowBeach, BYGBiomeType.BEACH); + public static final ResourceKey RAINBOW_BEACH = createBiome("rainbow_beach", BYGOverworldBiomes::rainbowBeach, IS_BEACH); public static final ResourceKey BASALT_BARRERA = createBiome("basalt_barrera", BYGOverworldBiomes::basaltBarrera); public static final ResourceKey DACITE_SHORE = createBiome("dacite_shore", BYGOverworldBiomes::daciteShore); @@ -111,16 +119,16 @@ public class BYGBiomes { public static final ResourceKey CRYPTIC_WASTES = createBiome("cryptic_wastes", BYGEndBiomes::crypticWastes); public static final ResourceKey IMPARIUS_GROVE = createBiome("imparius_grove", BYGEndBiomes::impariusGrove); - - public static ResourceKey createBiome(String id, Supplier biome, BYGBiomeType... types) { + @SafeVarargs + public static ResourceKey createBiome(String id, Supplier biome, TagKey... tags) { ResourceLocation bygID = BYG.createLocation(id); if (BuiltinRegistries.BIOME.keySet().contains(bygID)) { throw new IllegalStateException("Biome ID: \"" + bygID + "\" already exists in the Biome registry!"); } if (BYGConstants.BIOMES) { final var reg = PROVIDER.register(id, biome); - for (BYGBiomeType type : types) { - type.add(reg); + for (TagKey tag : tags) { + BIOMES_BY_TAG.put(tag, reg); } } diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json new file mode 100644 index 0000000000..e14f1ee731 --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_dense.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_hill.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_modified.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_mushroom.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json new file mode 100644 index 0000000000..5d0e72f5c1 --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_nether.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "byg:brimstone_caverns", + "byg:crimson_gardens", + "byg:embur_bog", + "byg:glowstone_gardens", + "byg:magma_wastes", + "byg:subzero_hypogeal", + "byg:sythian_torrids", + "byg:warped_desert", + "byg:wailing_garth", + "byg:arisian_undergrowth", + "byg:weeping_mire", + "byg:quartz_desert" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_peak.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_plateau.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_rare.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_river.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_slope.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json new file mode 100644 index 0000000000..e14f1ee731 --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_sparse.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_temperate.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_underground.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json new file mode 100644 index 0000000000..a22514f66a --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/worldgen/biome/is_void.json @@ -0,0 +1,5 @@ +{ + "replace": false, + "values": [ + ] +} \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java index 1b0f3f911b..841be48fef 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBiomeTagsProvider.java @@ -6,8 +6,9 @@ import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; -import potionstudios.byg.common.world.biome.BYGBiomeType; +import potionstudios.byg.common.world.biome.BYGBiomes; import potionstudios.byg.datagen.util.DatagenUtils; +import potionstudios.byg.reg.RegistryObject; public class BYGBiomeTagsProvider extends BiomeTagsProvider { public BYGBiomeTagsProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { @@ -16,9 +17,8 @@ public BYGBiomeTagsProvider(DataGenerator gen, @Nullable ExistingFileHelper exis @Override protected void addTags() { - for (final BYGBiomeType type : BYGBiomeType.values()) { - tag(type.tag()).add(type.getBiomes().toArray(Biome[]::new)); - } + BYGBiomes.BIOMES_BY_TAG.asMap() + .forEach((tag, ros) -> this.tag(tag).add(ros.stream().map(RegistryObject::get).toArray(Biome[]::new))); DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java index 13265cf4f3..3097cb6592 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -65,7 +65,7 @@ protected void addTags() { .forInstance(StairBlock.class, BlockTags.STAIRS) .forInstance(ButtonBlock.class, BlockTags.BUTTONS) .forInstance(BYGSaplingBlock.class, BlockTags.SAPLINGS) - .forInstance(BYGMushroomBlock.class, create(createLocation("mushrooms"))) + .forInstance(BYGMushroomBlock.class, BYGBlockTags.MUSHROOMS) .forInstance(BYGBlockProperties.BYGWartBlock.class, BlockTags.WART_BLOCKS) .forInstance(CampfireBlock.class, BlockTags.CAMPFIRES) .forInstance(BYGScaffoldingBlock.class, BYGBlockTags.SCAFFOLDING) diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java index 18cbee3adb..6994dccfdb 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -9,18 +9,26 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Material; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; +import potionstudios.byg.common.block.BYGBlockTags; +import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.datagen.util.DatagenUtils; +import potionstudios.byg.datagen.util.PredicatedTagProvider; +import potionstudios.byg.mixin.dev.BlockBehaviorAccess; import potionstudios.byg.reg.RegistryObject; import java.util.Arrays; import java.util.Objects; +import java.util.function.Predicate; import java.util.function.Supplier; public class BYGItemTagsProvider extends ItemTagsProvider { @@ -53,12 +61,24 @@ protected void addTags() { copy(BlockTags.STAIRS, ItemTags.STAIRS); copy(BlockTags.SLABS, ItemTags.SLABS); copy(BlockTags.BUTTONS, ItemTags.BUTTONS); - copy(BlockTags.LEAVES, ItemTags.LEAVES); copy(BlockTags.SAND, ItemTags.SAND); + copy(BYGBlockTags.MUSHROOMS, bygTag("mushrooms")); + + new PredicatedTagProvider<>(BYGItems.PROVIDER) + .add(isBlockMaterial(Material.LEAVES), ItemTags.LEAVES) // Can't copy this one due to slight differences + .run(this::tag); DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } + private static TagKey bygTag(String path) { + return create(createLocation(path)); + } + + private static Predicate isBlockMaterial(Material material) { + return item -> item instanceof BlockItem bi && ((BlockBehaviorAccess) bi.getBlock()).getMaterial() == material; + } + @SafeVarargs @SuppressWarnings("ALL") private void tag(TagKey tag, Supplier... items) { From c4a9a45d669445537f2a666e4f6603847619a0d6 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Thu, 2 Jun 2022 15:45:42 +0300 Subject: [PATCH 67/90] Fix logs tag --- Common/src/generated/resources/.cache/cache | 10 +- .../adventure/oh_the_biomes_youll_go.json | 438 +++++++++--------- .../byg/tags/items/wood/palo_verde_logs.json | 9 + .../tags/items/wood/withering_oak_logs.json | 7 + .../data/minecraft/tags/blocks/logs.json | 36 ++ .../minecraft/tags/blocks/logs_that_burn.json | 32 ++ .../data/minecraft/tags/items/logs.json | 34 +- .../minecraft/tags/items/logs_that_burn.json | 30 +- .../byg/common/block/BYGWoodTypes.java | 4 + .../providers/tag/BYGBlockTagsProvider.java | 27 +- .../providers/tag/BYGItemTagsProvider.java | 2 + 11 files changed, 391 insertions(+), 238 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json create mode 100644 Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/logs.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 60da65b579..bab8b9a8f3 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2024,7 +2024,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -e8ee05951214e5ce2bbe2863a2db30ce32f04a5f data/byg/advancements/adventure/oh_the_biomes_youll_go.json +e93be2957640b163555fd1a73e71f891b54c132d data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json @@ -3485,6 +3485,7 @@ c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/items/wood/jacaranda_logs a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/items/wood/maple_logs.json 88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/items/wood/nightshade_logs.json 701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/items/wood/palm_logs.json +d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/items/wood/palo_verde_logs.json be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/items/wood/pine_logs.json a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/items/wood/rainbow_eucalyptus_logs.json 9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/items/wood/redwood_logs.json @@ -3492,6 +3493,7 @@ c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/items/wood/skyris_logs.js 629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/items/wood/sythian_logs.json 7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/items/wood/willow_logs.json 7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/items/wood/witch_hazel_logs.json +3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/items/wood/withering_oak_logs.json a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/items/wood/zelkova_logs.json 417da7430aeb414baa78ea7c68077f9e964396ef data/byg/tags/worldgen/biome/is_badlands.json e267658c8d53318f1183c2fb3a860580be3498dd data/byg/tags/worldgen/biome/is_beach.json @@ -3508,6 +3510,8 @@ df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.j 5f8107eb48f67becbda2b5f7f650f05af5ea63b7 data/minecraft/tags/blocks/campfires.json 3e73ebf1fc5ce9b4b85ffd829772c20e6c68dfc5 data/minecraft/tags/blocks/ice.json 7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/blocks/leaves.json +337c5359dbf08062360d240e40db3c0544084292 data/minecraft/tags/blocks/logs.json +cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/blocks/logs_that_burn.json 7366c20405ff779073d36b21bf1257de3e8162cb data/minecraft/tags/blocks/mineable/axe.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json 3a4b442b0ddecea21abff5d0c7c008162044f778 data/minecraft/tags/blocks/oak_logs.json @@ -3526,8 +3530,8 @@ ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_press b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json 686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/buttons.json 1a425684393db180e3cde0048031ec3959749966 data/minecraft/tags/items/leaves.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/logs_that_burn.json +337c5359dbf08062360d240e40db3c0544084292 data/minecraft/tags/items/logs.json +cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/items/logs_that_burn.json d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/items/planks.json 3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/items/sand.json 04231e89508f9dd7e245342879b8df4679ed337f data/minecraft/tags/items/saplings.json diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index ae5f4d7b8b..d4d50471e0 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,211 +19,211 @@ "experience": 1000 }, "criteria": { - "byg:red_rock_valley": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:cryptic_wastes" } } }, - "byg:quartz_desert": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:brimstone_caverns" } } }, - "byg:arisian_undergrowth": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:cika_woods" } } }, - "byg:dacite_shore": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:sierra_badlands" } } }, - "byg:coconino_meadow": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:magma_wastes" } } }, - "byg:fragment_forest": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:cardinal_tundra": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:coconino_meadow" } } }, - "byg:cika_woods": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:glowstone_gardens" } } }, - "byg:atacama_desert": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:crimson_gardens" } } }, - "byg:maple_taiga": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:borealis_grove" } } }, - "byg:sierra_badlands": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:dacite_shore" } } }, - "byg:black_forest": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:aspen_forest" } } }, - "byg:orchard": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:rose_fields": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:sythian_torrids" } } }, - "byg:skyris_vale": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:coniferous_forest" } } }, - "byg:wailing_garth": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:imparius_grove" } } }, - "byg:bayou": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:howling_peaks" } } }, - "byg:lush_stacks": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:ivis_fields" } } }, - "byg:dead_sea": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:araucaria_savanna" } } }, - "byg:viscal_isles": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:nightshade_forest" } } }, - "byg:imparius_grove": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:prairie" } } }, - "byg:allium_fields": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:black_forest" } } }, - "byg:mojave_desert": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:crag_gardens": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:cypress_swamplands" } } }, - "byg:embur_bog": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:wailing_garth" } } }, - "byg:aspen_forest": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:weeping_witch_forest" } } }, @@ -235,339 +235,339 @@ } } }, - "byg:cypress_swamplands": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:allium_fields" } } }, - "byg:weeping_witch_forest": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:jacaranda_forest" } } }, - "byg:nightshade_forest": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:bayou" } } }, - "byg:windswept_desert": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:lush_stacks" } } }, - "byg:ivis_fields": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:rose_fields" } } }, - "byg:rainbow_beach": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:autumnal_forest" } } }, - "byg:glowstone_gardens": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:amaranth_fields" } } }, - "byg:howling_peaks": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:baobab_savanna" } } }, - "byg:borealis_grove": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:autumnal_taiga" } } }, - "byg:tropical_rainforest": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:canadian_shield" } } }, - "byg:jacaranda_forest": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:atacama_desert" } } }, - "byg:frosted_coniferous_forest": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:cardinal_tundra" } } }, - "byg:shattered_glacier": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:red_rock_valley" } } }, - "byg:frosted_taiga": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:mojave_desert" } } }, - "byg:sythian_torrids": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:guiana_shield" } } }, - "byg:temperate_rainforest": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:shulkren_forest" } } }, - "byg:prairie": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:skyris_vale" } } }, - "byg:white_mangrove_marshes": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:tropical_rainforest" } } }, - "byg:guiana_shield": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:basalt_barrera" } } }, - "byg:windswept_beach": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:embur_bog" } } }, - "byg:magma_wastes": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:frosted_taiga" } } }, - "byg:cherry_blossom_forest": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:fragment_forest" } } }, - "byg:autumnal_forest": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:windswept_beach" } } }, - "byg:bulbis_gardens": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:zelkova_forest" } } }, - "byg:brimstone_caverns": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:rainbow_beach" } } }, - "byg:coniferous_forest": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:weeping_mire" } } }, - "byg:autumnal_valley": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:quartz_desert" } } }, - "byg:zelkova_forest": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:maple_taiga" } } }, - "byg:araucaria_savanna": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:red_oak_forest" } } }, - "byg:ebony_woods": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:autumnal_valley" } } }, - "byg:twilight_meadow": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:ethereal_islands" } } }, - "byg:ethereal_islands": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:temperate_grove" } } }, - "byg:autumnal_taiga": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:forgotten_forest" } } }, - "byg:amaranth_fields": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:redwood_thicket" } } }, - "byg:forgotten_forest": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:windswept_desert" } } }, - "byg:red_oak_forest": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:shattered_glacier" } } }, - "byg:redwood_thicket": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:dacite_ridges" } } }, - "byg:temperate_grove": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:ebony_woods" } } }, - "byg:crimson_gardens": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:crag_gardens" } } }, - "byg:warped_desert": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:viscal_isles" } } }, - "byg:weeping_mire": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:orchard" } } }, - "byg:dacite_ridges": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:arisian_undergrowth" } } }, @@ -579,272 +579,272 @@ } } }, - "byg:baobab_savanna": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:temperate_rainforest" } } }, - "byg:shulkren_forest": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:warped_desert" } } }, - "byg:canadian_shield": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:bulbis_gardens" } } }, - "byg:basalt_barrera": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:twilight_meadow" } } }, - "byg:cryptic_wastes": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:dead_sea" } } } }, "requirements": [ [ - "byg:red_rock_valley" + "byg:cryptic_wastes" ], [ - "byg:quartz_desert" + "byg:brimstone_caverns" ], [ - "byg:arisian_undergrowth" + "byg:cika_woods" ], [ - "byg:dacite_shore" + "byg:sierra_badlands" ], [ - "byg:coconino_meadow" + "byg:magma_wastes" ], [ - "byg:fragment_forest" + "byg:white_mangrove_marshes" ], [ - "byg:cardinal_tundra" + "byg:coconino_meadow" ], [ - "byg:cika_woods" + "byg:glowstone_gardens" ], [ - "byg:atacama_desert" + "byg:crimson_gardens" ], [ - "byg:maple_taiga" + "byg:borealis_grove" ], [ - "byg:sierra_badlands" + "byg:dacite_shore" ], [ - "byg:black_forest" + "byg:aspen_forest" ], [ - "byg:orchard" + "byg:cherry_blossom_forest" ], [ - "byg:rose_fields" + "byg:sythian_torrids" ], [ - "byg:skyris_vale" + "byg:coniferous_forest" ], [ - "byg:wailing_garth" + "byg:imparius_grove" ], [ - "byg:bayou" + "byg:howling_peaks" ], [ - "byg:lush_stacks" + "byg:ivis_fields" ], [ - "byg:dead_sea" + "byg:araucaria_savanna" ], [ - "byg:viscal_isles" + "byg:nightshade_forest" ], [ - "byg:imparius_grove" + "byg:prairie" ], [ - "byg:allium_fields" + "byg:black_forest" ], [ - "byg:mojave_desert" + "byg:frosted_coniferous_forest" ], [ - "byg:crag_gardens" + "byg:cypress_swamplands" ], [ - "byg:embur_bog" + "byg:wailing_garth" ], [ - "byg:aspen_forest" + "byg:weeping_witch_forest" ], [ "byg:subzero_hypogeal" ], [ - "byg:cypress_swamplands" + "byg:allium_fields" ], [ - "byg:weeping_witch_forest" + "byg:jacaranda_forest" ], [ - "byg:nightshade_forest" + "byg:bayou" ], [ - "byg:windswept_desert" + "byg:lush_stacks" ], [ - "byg:ivis_fields" + "byg:rose_fields" ], [ - "byg:rainbow_beach" + "byg:autumnal_forest" ], [ - "byg:glowstone_gardens" + "byg:amaranth_fields" ], [ - "byg:howling_peaks" + "byg:baobab_savanna" ], [ - "byg:borealis_grove" + "byg:autumnal_taiga" ], [ - "byg:tropical_rainforest" + "byg:canadian_shield" ], [ - "byg:jacaranda_forest" + "byg:atacama_desert" ], [ - "byg:frosted_coniferous_forest" + "byg:cardinal_tundra" ], [ - "byg:shattered_glacier" + "byg:red_rock_valley" ], [ - "byg:frosted_taiga" + "byg:mojave_desert" ], [ - "byg:sythian_torrids" + "byg:guiana_shield" ], [ - "byg:temperate_rainforest" + "byg:shulkren_forest" ], [ - "byg:prairie" + "byg:skyris_vale" ], [ - "byg:white_mangrove_marshes" + "byg:tropical_rainforest" ], [ - "byg:guiana_shield" + "byg:basalt_barrera" ], [ - "byg:windswept_beach" + "byg:embur_bog" ], [ - "byg:magma_wastes" + "byg:frosted_taiga" ], [ - "byg:cherry_blossom_forest" + "byg:fragment_forest" ], [ - "byg:autumnal_forest" + "byg:windswept_beach" ], [ - "byg:bulbis_gardens" + "byg:zelkova_forest" ], [ - "byg:brimstone_caverns" + "byg:rainbow_beach" ], [ - "byg:coniferous_forest" + "byg:weeping_mire" ], [ - "byg:autumnal_valley" + "byg:quartz_desert" ], [ - "byg:zelkova_forest" + "byg:maple_taiga" ], [ - "byg:araucaria_savanna" + "byg:red_oak_forest" ], [ - "byg:ebony_woods" + "byg:autumnal_valley" ], [ - "byg:twilight_meadow" + "byg:ethereal_islands" ], [ - "byg:ethereal_islands" + "byg:temperate_grove" ], [ - "byg:autumnal_taiga" + "byg:forgotten_forest" ], [ - "byg:amaranth_fields" + "byg:redwood_thicket" ], [ - "byg:forgotten_forest" + "byg:windswept_desert" ], [ - "byg:red_oak_forest" + "byg:shattered_glacier" ], [ - "byg:redwood_thicket" + "byg:dacite_ridges" ], [ - "byg:temperate_grove" + "byg:ebony_woods" ], [ - "byg:crimson_gardens" + "byg:crag_gardens" ], [ - "byg:warped_desert" + "byg:viscal_isles" ], [ - "byg:weeping_mire" + "byg:orchard" ], [ - "byg:dacite_ridges" + "byg:arisian_undergrowth" ], [ "byg:firecracker_shrubland" ], [ - "byg:baobab_savanna" + "byg:temperate_rainforest" ], [ - "byg:shulkren_forest" + "byg:warped_desert" ], [ - "byg:canadian_shield" + "byg:bulbis_gardens" ], [ - "byg:basalt_barrera" + "byg:twilight_meadow" ], [ - "byg:cryptic_wastes" + "byg:dead_sea" ] ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json new file mode 100644 index 0000000000..655c0e63f5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "byg:palo_verde_log", + "byg:palo_verde_wood", + "byg:stripped_palo_verde_log", + "byg:stripped_palo_verde_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json new file mode 100644 index 0000000000..128286507c --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "byg:withering_oak_log", + "byg:withering_oak_wood" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json new file mode 100644 index 0000000000..18a5e30824 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json @@ -0,0 +1,36 @@ +{ + "replace": false, + "values": [ + "#byg:wood/aspen_logs", + "#byg:wood/baobab_logs", + "#byg:wood/blue_enchanted_logs", + "#byg:wood/bulbis_logs", + "#byg:wood/cherry_logs", + "#byg:wood/cika_logs", + "#byg:wood/cypress_logs", + "#byg:wood/ebony_logs", + "#byg:wood/embur_logs", + "#byg:wood/ether_logs", + "#byg:wood/fir_logs", + "#byg:wood/green_enchanted_logs", + "#byg:wood/holly_logs", + "#byg:wood/imparius_logs", + "#byg:wood/jacaranda_logs", + "#byg:wood/lament_logs", + "#byg:wood/mahogany_logs", + "#byg:wood/mangrove_logs", + "#byg:wood/maple_logs", + "#byg:wood/nightshade_logs", + "#byg:wood/palm_logs", + "#byg:wood/palo_verde_logs", + "#byg:wood/pine_logs", + "#byg:wood/rainbow_eucalyptus_logs", + "#byg:wood/redwood_logs", + "#byg:wood/skyris_logs", + "#byg:wood/sythian_logs", + "#byg:wood/willow_logs", + "#byg:wood/witch_hazel_logs", + "#byg:wood/withering_oak_logs", + "#byg:wood/zelkova_logs" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json b/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json new file mode 100644 index 0000000000..ddec62fdde --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -0,0 +1,32 @@ +{ + "replace": false, + "values": [ + "#byg:wood/aspen_logs", + "#byg:wood/baobab_logs", + "#byg:wood/blue_enchanted_logs", + "#byg:wood/cherry_logs", + "#byg:wood/cika_logs", + "#byg:wood/cypress_logs", + "#byg:wood/ebony_logs", + "#byg:wood/ether_logs", + "#byg:wood/fir_logs", + "#byg:wood/green_enchanted_logs", + "#byg:wood/holly_logs", + "#byg:wood/jacaranda_logs", + "#byg:wood/lament_logs", + "#byg:wood/mahogany_logs", + "#byg:wood/mangrove_logs", + "#byg:wood/maple_logs", + "#byg:wood/nightshade_logs", + "#byg:wood/palm_logs", + "#byg:wood/palo_verde_logs", + "#byg:wood/pine_logs", + "#byg:wood/rainbow_eucalyptus_logs", + "#byg:wood/redwood_logs", + "#byg:wood/skyris_logs", + "#byg:wood/willow_logs", + "#byg:wood/witch_hazel_logs", + "#byg:wood/withering_oak_logs", + "#byg:wood/zelkova_logs" + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs.json b/Common/src/generated/resources/data/minecraft/tags/items/logs.json index 5e8aecc986..18a5e30824 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/logs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs.json @@ -1,4 +1,36 @@ { "replace": false, - "values": [] + "values": [ + "#byg:wood/aspen_logs", + "#byg:wood/baobab_logs", + "#byg:wood/blue_enchanted_logs", + "#byg:wood/bulbis_logs", + "#byg:wood/cherry_logs", + "#byg:wood/cika_logs", + "#byg:wood/cypress_logs", + "#byg:wood/ebony_logs", + "#byg:wood/embur_logs", + "#byg:wood/ether_logs", + "#byg:wood/fir_logs", + "#byg:wood/green_enchanted_logs", + "#byg:wood/holly_logs", + "#byg:wood/imparius_logs", + "#byg:wood/jacaranda_logs", + "#byg:wood/lament_logs", + "#byg:wood/mahogany_logs", + "#byg:wood/mangrove_logs", + "#byg:wood/maple_logs", + "#byg:wood/nightshade_logs", + "#byg:wood/palm_logs", + "#byg:wood/palo_verde_logs", + "#byg:wood/pine_logs", + "#byg:wood/rainbow_eucalyptus_logs", + "#byg:wood/redwood_logs", + "#byg:wood/skyris_logs", + "#byg:wood/sythian_logs", + "#byg:wood/willow_logs", + "#byg:wood/witch_hazel_logs", + "#byg:wood/withering_oak_logs", + "#byg:wood/zelkova_logs" + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json index 5e8aecc986..ddec62fdde 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json @@ -1,4 +1,32 @@ { "replace": false, - "values": [] + "values": [ + "#byg:wood/aspen_logs", + "#byg:wood/baobab_logs", + "#byg:wood/blue_enchanted_logs", + "#byg:wood/cherry_logs", + "#byg:wood/cika_logs", + "#byg:wood/cypress_logs", + "#byg:wood/ebony_logs", + "#byg:wood/ether_logs", + "#byg:wood/fir_logs", + "#byg:wood/green_enchanted_logs", + "#byg:wood/holly_logs", + "#byg:wood/jacaranda_logs", + "#byg:wood/lament_logs", + "#byg:wood/mahogany_logs", + "#byg:wood/mangrove_logs", + "#byg:wood/maple_logs", + "#byg:wood/nightshade_logs", + "#byg:wood/palm_logs", + "#byg:wood/palo_verde_logs", + "#byg:wood/pine_logs", + "#byg:wood/rainbow_eucalyptus_logs", + "#byg:wood/redwood_logs", + "#byg:wood/skyris_logs", + "#byg:wood/willow_logs", + "#byg:wood/witch_hazel_logs", + "#byg:wood/withering_oak_logs", + "#byg:wood/zelkova_logs" + ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 149dda65f1..24972535b9 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -371,6 +371,10 @@ public BYGBoatEntity.BYGType boatType() { return builder.boatType; } + public boolean isNether() { + return builder.isNether; + } + public enum GrowerItemType { SAPLING, ODDITY, diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java index 3097cb6592..14d72378bd 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGBlockTagsProvider.java @@ -4,7 +4,6 @@ import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -24,17 +23,12 @@ import potionstudios.byg.common.block.sapling.BYGSaplingBlock; import potionstudios.byg.datagen.util.DatagenUtils; import potionstudios.byg.datagen.util.PredicatedTagProvider; -import potionstudios.byg.mixin.access.TagBuilderAccess; import potionstudios.byg.mixin.dev.BlockBehaviorAccess; -import potionstudios.byg.reg.RegistryObject; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Objects; -import java.util.Set; import java.util.function.Predicate; import java.util.function.Supplier; @@ -44,8 +38,7 @@ @SuppressWarnings("ALL") public class BYGBlockTagsProvider extends BlockTagsProvider { - private final TagAppender logsThatBurn = tag(BlockTags.LOGS_THAT_BURN); - private final TagAppender logs = tag(BlockTags.LOGS); + static final List EXTRA_WOOD_TYPES = new ArrayList<>(); public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { super(pGenerator, BYG.MOD_ID, existingFileHelper); @@ -53,6 +46,8 @@ public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelp @Override protected void addTags() { + final var logs = tag(BlockTags.LOGS); + final var logsThatBurn = tag(BlockTags.LOGS_THAT_BURN); tag( BYGBlockTags.LUSH, LUSH_GRASS_PATH, LUSH_GRASS_BLOCK, LUSH_FARMLAND @@ -130,8 +125,10 @@ protected void addTags() { final var woodenTrapdoorsTag = tag(BlockTags.WOODEN_TRAPDOORS); for (BYGWoodTypes type : BYGWoodTypes.values()) { tag(type.logTag().block(), type.log(), type.strippedLog(), type.wood(), type.strippedWood()); - logsThatBurn.addTag(type.logTag().block()); logs.addTag(type.logTag().block()); + if (!type.isNether()) + logsThatBurn.addTag(type.logTag().block()); + planksTag.add(type.planks().get()); bookselvesTag.add(type.bookshelf().get()); @@ -161,10 +158,12 @@ private static Predicate isMaterial(Material... materials) { @SafeVarargs private void wood(String name, Supplier... blocks) { - final var tag = create(createLocation("wood/" + name)); - add(tag(tag), blocks); - logsThatBurn.addTag(tag); - logs.addTag(tag); + final var loc = createLocation("wood/" + name); + final var tag = create(loc); + tag(tag, blocks); + tag(BlockTags.LOGS).addTag(tag); + tag(BlockTags.LOGS_THAT_BURN).addTag(tag); + EXTRA_WOOD_TYPES.add(loc); } @SafeVarargs diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java index 6994dccfdb..a00ce2ff5c 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -45,6 +45,8 @@ protected void addTags() { final var saplingsTag = tag(ItemTags.SAPLINGS); BYGItems.SAPLINGS.stream().map(RegistryObject::get).forEach(saplingsTag::add); + BYGBlockTagsProvider.EXTRA_WOOD_TYPES.forEach(type -> copy(BlockTags.create(type), create(type))); + copy(BlockTags.LOGS, ItemTags.LOGS); copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); copy(BlockTags.PLANKS, ItemTags.PLANKS); From b985f2d58ec1f1cff0a98ca434b66ce8ad88f5e8 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Thu, 2 Jun 2022 16:15:03 +0300 Subject: [PATCH 68/90] Rerun generators --- Common/build.gradle | 9 +- Common/src/generated/resources/.cache/cache | 4 +- .../adventure/oh_the_biomes_youll_go.json | 444 +++++++++--------- .../BYGContainerObjectSelectionList.java | 2 +- 4 files changed, 230 insertions(+), 229 deletions(-) diff --git a/Common/build.gradle b/Common/build.gradle index b78ae9b7b6..e345a5c2a6 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -1,14 +1,15 @@ plugins { id('java') id('org.spongepowered.gradle.vanilla') version '0.2.1-SNAPSHOT' - // id('com.matyrobbrt.pngoptimiser') version '0.1.0' + id('com.matyrobbrt.pngoptimiser') version '0.1.0' } archivesBaseName = "${mod_name}-common-${minecraft_version}" -//tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) { -// file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png'])) -// } +tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) { + file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png'])) + option 'i', 0 +} minecraft { accessWideners(project.file("src/main/resources/byg.aw")) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index bab8b9a8f3..04fea56fcb 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -512,7 +512,7 @@ c647568c770c350b9b87be7aece3cdd2117c2bb8 assets/byg/blockstates/zelkova_fence_ga 16b0cf6c437d96d9f67f8b52bfd18bb3052b8774 assets/byg/blockstates/zelkova_stairs.json b8531f52886d3c3d253a11ec632b055756bcdbed assets/byg/blockstates/zelkova_trapdoor.json e6d361ed053df5b3512c7c74713f504e4a7143d6 assets/byg/blockstates/zelkova_wood.json -74f4757034d9d10755c585b624b00d3935f8493c assets/byg/lang/en_us.json +ec09cfbedfcb2786edbeee4155d31cacae87d2fb assets/byg/lang/en_us.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -2024,7 +2024,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -e93be2957640b163555fd1a73e71f891b54c132d data/byg/advancements/adventure/oh_the_biomes_youll_go.json +ae380d76855bfdb2826967d87ba1d7dac0213f16 data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index d4d50471e0..1cbee6aac1 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,243 +19,243 @@ "experience": 1000 }, "criteria": { - "byg:cryptic_wastes": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:baobab_savanna" } } }, - "byg:brimstone_caverns": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:dacite_shore" } } }, - "byg:cika_woods": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:magma_wastes" } } }, - "byg:sierra_badlands": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:magma_wastes": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:rainbow_beach" } } }, - "byg:white_mangrove_marshes": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:jacaranda_forest" } } }, - "byg:coconino_meadow": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:glowstone_gardens" } } }, - "byg:glowstone_gardens": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:amaranth_fields" } } }, - "byg:crimson_gardens": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:cika_woods" } } }, - "byg:borealis_grove": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:zelkova_forest" } } }, - "byg:dacite_shore": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:warped_desert" } } }, - "byg:aspen_forest": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:coniferous_forest" } } }, - "byg:cherry_blossom_forest": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:prairie" } } }, - "byg:sythian_torrids": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:twilight_meadow" } } }, - "byg:coniferous_forest": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:mojave_desert" } } }, - "byg:imparius_grove": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:bayou" } } }, - "byg:howling_peaks": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:redwood_thicket" } } }, - "byg:ivis_fields": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:coconino_meadow" } } }, - "byg:araucaria_savanna": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:weeping_witch_forest" } } }, - "byg:nightshade_forest": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:imparius_grove" } } }, - "byg:prairie": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:orchard" } } }, - "byg:black_forest": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:cypress_swamplands" } } }, - "byg:frosted_coniferous_forest": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:basalt_barrera" } } }, - "byg:cypress_swamplands": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:crimson_gardens" } } }, - "byg:wailing_garth": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:temperate_grove" } } }, - "byg:weeping_witch_forest": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:forgotten_forest" } } }, - "byg:subzero_hypogeal": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:red_rock_valley" } } }, - "byg:allium_fields": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:temperate_rainforest" } } }, - "byg:jacaranda_forest": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:windswept_beach" } } }, - "byg:bayou": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:borealis_grove" } } }, @@ -267,584 +267,584 @@ } } }, - "byg:rose_fields": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:black_forest" } } }, - "byg:autumnal_forest": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:fragment_forest" } } }, - "byg:amaranth_fields": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:bulbis_gardens" } } }, - "byg:baobab_savanna": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:allium_fields" } } }, - "byg:autumnal_taiga": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:sythian_torrids" } } }, - "byg:canadian_shield": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:nightshade_forest" } } }, - "byg:atacama_desert": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:dacite_ridges" } } }, - "byg:cardinal_tundra": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:arisian_undergrowth" } } }, - "byg:red_rock_valley": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:araucaria_savanna" } } }, - "byg:mojave_desert": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:firecracker_shrubland" } } }, - "byg:guiana_shield": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:quartz_desert" } } }, - "byg:shulkren_forest": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:red_oak_forest" } } }, - "byg:skyris_vale": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:aspen_forest" } } }, - "byg:tropical_rainforest": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:ethereal_islands" } } }, - "byg:basalt_barrera": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:subzero_hypogeal" } } }, - "byg:embur_bog": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:ivis_fields" } } }, - "byg:frosted_taiga": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:crag_gardens" } } }, - "byg:fragment_forest": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:howling_peaks" } } }, - "byg:windswept_beach": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:embur_bog" } } }, - "byg:zelkova_forest": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:maple_taiga" } } }, - "byg:rainbow_beach": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:brimstone_caverns" } } }, - "byg:weeping_mire": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:atacama_desert" } } }, - "byg:quartz_desert": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:wailing_garth" } } }, - "byg:maple_taiga": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:canadian_shield" } } }, - "byg:red_oak_forest": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:windswept_desert" } } }, - "byg:autumnal_valley": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:viscal_isles" } } }, - "byg:ethereal_islands": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:autumnal_taiga" } } }, - "byg:temperate_grove": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:frosted_taiga" } } }, - "byg:forgotten_forest": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:shulkren_forest" } } }, - "byg:redwood_thicket": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:guiana_shield" } } }, - "byg:windswept_desert": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:autumnal_forest" } } }, - "byg:shattered_glacier": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:autumnal_valley" } } }, - "byg:dacite_ridges": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:skyris_vale" } } }, - "byg:ebony_woods": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:crag_gardens": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:cardinal_tundra" } } }, - "byg:viscal_isles": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:shattered_glacier" } } }, - "byg:orchard": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:arisian_undergrowth": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:rose_fields" } } }, - "byg:firecracker_shrubland": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:sierra_badlands" } } }, - "byg:temperate_rainforest": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:dead_sea" } } }, - "byg:warped_desert": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:ebony_woods" } } }, - "byg:bulbis_gardens": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:cryptic_wastes" } } }, - "byg:twilight_meadow": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:tropical_rainforest" } } }, - "byg:dead_sea": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:weeping_mire" } } } }, "requirements": [ [ - "byg:cryptic_wastes" + "byg:baobab_savanna" ], [ - "byg:brimstone_caverns" + "byg:dacite_shore" ], [ - "byg:cika_woods" + "byg:magma_wastes" ], [ - "byg:sierra_badlands" + "byg:white_mangrove_marshes" ], [ - "byg:magma_wastes" + "byg:rainbow_beach" ], [ - "byg:white_mangrove_marshes" + "byg:jacaranda_forest" ], [ - "byg:coconino_meadow" + "byg:glowstone_gardens" ], [ - "byg:glowstone_gardens" + "byg:amaranth_fields" ], [ - "byg:crimson_gardens" + "byg:cika_woods" ], [ - "byg:borealis_grove" + "byg:zelkova_forest" ], [ - "byg:dacite_shore" + "byg:warped_desert" ], [ - "byg:aspen_forest" + "byg:coniferous_forest" ], [ - "byg:cherry_blossom_forest" + "byg:prairie" ], [ - "byg:sythian_torrids" + "byg:twilight_meadow" ], [ - "byg:coniferous_forest" + "byg:mojave_desert" ], [ - "byg:imparius_grove" + "byg:bayou" ], [ - "byg:howling_peaks" + "byg:redwood_thicket" ], [ - "byg:ivis_fields" + "byg:coconino_meadow" ], [ - "byg:araucaria_savanna" + "byg:weeping_witch_forest" ], [ - "byg:nightshade_forest" + "byg:imparius_grove" ], [ - "byg:prairie" + "byg:orchard" ], [ - "byg:black_forest" + "byg:cypress_swamplands" ], [ - "byg:frosted_coniferous_forest" + "byg:basalt_barrera" ], [ - "byg:cypress_swamplands" + "byg:crimson_gardens" ], [ - "byg:wailing_garth" + "byg:temperate_grove" ], [ - "byg:weeping_witch_forest" + "byg:forgotten_forest" ], [ - "byg:subzero_hypogeal" + "byg:red_rock_valley" ], [ - "byg:allium_fields" + "byg:temperate_rainforest" ], [ - "byg:jacaranda_forest" + "byg:windswept_beach" ], [ - "byg:bayou" + "byg:borealis_grove" ], [ "byg:lush_stacks" ], [ - "byg:rose_fields" + "byg:black_forest" ], [ - "byg:autumnal_forest" + "byg:fragment_forest" ], [ - "byg:amaranth_fields" + "byg:bulbis_gardens" ], [ - "byg:baobab_savanna" + "byg:allium_fields" ], [ - "byg:autumnal_taiga" + "byg:sythian_torrids" ], [ - "byg:canadian_shield" + "byg:nightshade_forest" ], [ - "byg:atacama_desert" + "byg:dacite_ridges" ], [ - "byg:cardinal_tundra" + "byg:arisian_undergrowth" ], [ - "byg:red_rock_valley" + "byg:araucaria_savanna" ], [ - "byg:mojave_desert" + "byg:firecracker_shrubland" ], [ - "byg:guiana_shield" + "byg:quartz_desert" ], [ - "byg:shulkren_forest" + "byg:red_oak_forest" ], [ - "byg:skyris_vale" + "byg:aspen_forest" ], [ - "byg:tropical_rainforest" + "byg:ethereal_islands" ], [ - "byg:basalt_barrera" + "byg:subzero_hypogeal" ], [ - "byg:embur_bog" + "byg:ivis_fields" ], [ - "byg:frosted_taiga" + "byg:crag_gardens" ], [ - "byg:fragment_forest" + "byg:howling_peaks" ], [ - "byg:windswept_beach" + "byg:embur_bog" ], [ - "byg:zelkova_forest" + "byg:maple_taiga" ], [ - "byg:rainbow_beach" + "byg:brimstone_caverns" ], [ - "byg:weeping_mire" + "byg:atacama_desert" ], [ - "byg:quartz_desert" + "byg:wailing_garth" ], [ - "byg:maple_taiga" + "byg:canadian_shield" ], [ - "byg:red_oak_forest" + "byg:windswept_desert" ], [ - "byg:autumnal_valley" + "byg:viscal_isles" ], [ - "byg:ethereal_islands" + "byg:autumnal_taiga" ], [ - "byg:temperate_grove" + "byg:frosted_taiga" ], [ - "byg:forgotten_forest" + "byg:shulkren_forest" ], [ - "byg:redwood_thicket" + "byg:guiana_shield" ], [ - "byg:windswept_desert" + "byg:autumnal_forest" ], [ - "byg:shattered_glacier" + "byg:autumnal_valley" ], [ - "byg:dacite_ridges" + "byg:skyris_vale" ], [ - "byg:ebony_woods" + "byg:cherry_blossom_forest" ], [ - "byg:crag_gardens" + "byg:cardinal_tundra" ], [ - "byg:viscal_isles" + "byg:shattered_glacier" ], [ - "byg:orchard" + "byg:frosted_coniferous_forest" ], [ - "byg:arisian_undergrowth" + "byg:rose_fields" ], [ - "byg:firecracker_shrubland" + "byg:sierra_badlands" ], [ - "byg:temperate_rainforest" + "byg:dead_sea" ], [ - "byg:warped_desert" + "byg:ebony_woods" ], [ - "byg:bulbis_gardens" + "byg:cryptic_wastes" ], [ - "byg:twilight_meadow" + "byg:tropical_rainforest" ], [ - "byg:dead_sea" + "byg:weeping_mire" ] ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/client/gui/screen/BYGContainerObjectSelectionList.java b/Common/src/main/java/potionstudios/byg/client/gui/screen/BYGContainerObjectSelectionList.java index e7abc69875..d645c8b3e0 100644 --- a/Common/src/main/java/potionstudios/byg/client/gui/screen/BYGContainerObjectSelectionList.java +++ b/Common/src/main/java/potionstudios/byg/client/gui/screen/BYGContainerObjectSelectionList.java @@ -30,7 +30,7 @@ protected int getRowTop(int index) { // Fixes an issue in vanilla lists where entries would render below their bounds. @Override - protected int getRowBottom(int index) { + public int getRowBottom(int index) { int rowBottom = super.getRowBottom(index); if (rowBottom > this.y1) { return Integer.MIN_VALUE; From 27b551e920cea41c4e9397f03660be0746ab6309 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:01:07 +0300 Subject: [PATCH 69/90] Fixed leaves overlay textures --- Common/src/generated/resources/.cache/cache | 6 +- .../byg/models/block/mahogany/leaves.json | 31 +- .../byg/models/block/willow/leaves.json | 31 +- .../adventure/oh_the_biomes_youll_go.json | 450 +++++++++--------- .../byg/common/block/BYGWoodTypes.java | 15 +- .../leaves_overlay.png} | Bin .../providers/BYGWoodAssetsProvider.java | 139 ++++-- 7 files changed, 389 insertions(+), 283 deletions(-) rename Common/src/main/resources/assets/byg/textures/block/{mahogany_leaves_overlay.png => mahogany/leaves_overlay.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 04fea56fcb..ae0adbb0e5 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -1078,7 +1078,7 @@ d3e7af8e886b2bbeddba4341cb599090889c901d assets/byg/models/block/mahogany/fence_ 4b738d591c85fc237166262b07a8a0b07250da1f assets/byg/models/block/mahogany/fence_inv.json 6e79c75c084cd44d3b633d21b98900bd4640c184 assets/byg/models/block/mahogany/fence_post.json 2a734dbc733ebd65667011c9b3f6acbf1b1289c2 assets/byg/models/block/mahogany/grower_item.json -1e9d03ea459738cfa51790e0ff11edad58ec5b83 assets/byg/models/block/mahogany/leaves.json +a8237b007f8735710657378bd07186ef0e7c6f18 assets/byg/models/block/mahogany/leaves.json a3481313f634ce373eddbe96090cc1ffff96ae37 assets/byg/models/block/mahogany/leaves_snowy.json edfd496ebaa9c5f80edcbc104b1ea54c84cbd411 assets/byg/models/block/mahogany/log.json 47789678c316d2b0d5654ad13f4dfb0be1c1918a assets/byg/models/block/mahogany/planks.json @@ -1428,7 +1428,7 @@ ab254ed8b8ee500ea9a643152e9437864274dc08 assets/byg/models/block/willow/fence.js 10bf9b4a419147e792d4156dcd285111e8935048 assets/byg/models/block/willow/fence_inv.json 8799c88ebdb1f508f86f62b77a244e01e87a6b46 assets/byg/models/block/willow/fence_post.json 5e5afb7a3890d8f48d5e23a2c87b1188619506c8 assets/byg/models/block/willow/grower_item.json -e084f73a142b28074820921a4efeb33fa8d23abd assets/byg/models/block/willow/leaves.json +165e84056fd00ee7b13c5227326174e28258eb19 assets/byg/models/block/willow/leaves.json 1301c5e2999f537a044d5111e5e8a7cd7722173b assets/byg/models/block/willow/leaves_snowy.json feac0b2ff67fbfc5a7e6db13829acf57fec39f5a assets/byg/models/block/willow/log.json 9ec37312d1e64d6921417500edc74171330e4253 assets/byg/models/block/willow/planks.json @@ -2024,7 +2024,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -ae380d76855bfdb2826967d87ba1d7dac0213f16 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +c608c1e8f9da0906f1e80cfa8f711c0dea6a5051 data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json index 2eddfbccd9..88bd911066 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json @@ -7,6 +7,33 @@ "south": "byg:block/mahogany/leaves", "east": "byg:block/mahogany/leaves", "west": "byg:block/mahogany/leaves", - "particle": "byg:block/mahogany/leaves" - } + "particle": "byg:block/mahogany/leaves", + "overlay": "byg:block/mahogany/leaves_overlay" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json index b1de7a9e68..14f0f13e4c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json @@ -7,6 +7,33 @@ "south": "byg:block/willow/leaves", "east": "byg:block/willow/leaves", "west": "byg:block/willow/leaves", - "particle": "byg:block/willow/leaves" - } + "particle": "byg:block/willow/leaves", + "overlay": "byg:block/willow/leaves" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] + } + ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index 1cbee6aac1..f511d1d85e 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,832 +19,832 @@ "experience": 1000 }, "criteria": { - "byg:baobab_savanna": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:magma_wastes" } } }, - "byg:dacite_shore": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:mojave_desert" } } }, - "byg:magma_wastes": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:jacaranda_forest" } } }, - "byg:white_mangrove_marshes": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:ethereal_islands" } } }, - "byg:rainbow_beach": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:imparius_grove" } } }, - "byg:jacaranda_forest": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:frosted_taiga" } } }, - "byg:glowstone_gardens": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:red_rock_valley" } } }, - "byg:amaranth_fields": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:fragment_forest" } } }, - "byg:cika_woods": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:ivis_fields" } } }, - "byg:zelkova_forest": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:dead_sea" } } }, - "byg:warped_desert": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:shattered_glacier" } } }, - "byg:coniferous_forest": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:cypress_swamplands" } } }, - "byg:prairie": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:autumnal_forest" } } }, - "byg:twilight_meadow": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:subzero_hypogeal" } } }, - "byg:mojave_desert": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:dacite_shore" } } }, - "byg:bayou": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:guiana_shield" } } }, - "byg:redwood_thicket": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:lush_stacks" } } }, - "byg:coconino_meadow": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:cryptic_wastes" } } }, - "byg:weeping_witch_forest": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:cika_woods" } } }, - "byg:imparius_grove": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:sythian_torrids" } } }, - "byg:orchard": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:maple_taiga" } } }, - "byg:cypress_swamplands": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:sierra_badlands" } } }, - "byg:basalt_barrera": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:windswept_desert" } } }, - "byg:crimson_gardens": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:allium_fields" } } }, - "byg:temperate_grove": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:coniferous_forest" } } }, - "byg:forgotten_forest": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:basalt_barrera" } } }, - "byg:red_rock_valley": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:wailing_garth" } } }, - "byg:temperate_rainforest": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:nightshade_forest" } } }, - "byg:windswept_beach": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:rainbow_beach" } } }, - "byg:borealis_grove": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:skyris_vale" } } }, - "byg:lush_stacks": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:embur_bog" } } }, - "byg:black_forest": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:viscal_isles" } } }, - "byg:fragment_forest": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:bulbis_gardens" } } }, - "byg:bulbis_gardens": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:bayou" } } }, - "byg:allium_fields": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:black_forest" } } }, - "byg:sythian_torrids": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:borealis_grove" } } }, - "byg:nightshade_forest": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:warped_desert" } } }, - "byg:dacite_ridges": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:quartz_desert" } } }, - "byg:arisian_undergrowth": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:crag_gardens" } } }, - "byg:araucaria_savanna": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:firecracker_shrubland": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:temperate_rainforest" } } }, - "byg:quartz_desert": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:autumnal_taiga" } } }, - "byg:red_oak_forest": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:weeping_witch_forest" } } }, - "byg:aspen_forest": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:arisian_undergrowth" } } }, - "byg:ethereal_islands": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:autumnal_valley" } } }, - "byg:subzero_hypogeal": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:prairie" } } }, - "byg:ivis_fields": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:canadian_shield" } } }, - "byg:crag_gardens": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:tropical_rainforest" } } }, - "byg:howling_peaks": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:shulkren_forest" } } }, - "byg:embur_bog": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:aspen_forest" } } }, - "byg:maple_taiga": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:dacite_ridges" } } }, - "byg:brimstone_caverns": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:cardinal_tundra" } } }, - "byg:atacama_desert": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:forgotten_forest" } } }, - "byg:wailing_garth": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:twilight_meadow" } } }, - "byg:canadian_shield": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:ebony_woods" } } }, - "byg:windswept_desert": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:firecracker_shrubland" } } }, - "byg:viscal_isles": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:red_oak_forest" } } }, - "byg:autumnal_taiga": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:brimstone_caverns" } } }, - "byg:frosted_taiga": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:zelkova_forest" } } }, - "byg:shulkren_forest": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:howling_peaks" } } }, - "byg:guiana_shield": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:orchard" } } }, - "byg:autumnal_forest": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:coconino_meadow" } } }, - "byg:autumnal_valley": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:crimson_gardens" } } }, - "byg:skyris_vale": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:araucaria_savanna" } } }, - "byg:cherry_blossom_forest": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:temperate_grove" } } }, - "byg:cardinal_tundra": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:glowstone_gardens" } } }, - "byg:shattered_glacier": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:windswept_beach" } } }, - "byg:frosted_coniferous_forest": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:redwood_thicket" } } }, - "byg:rose_fields": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:atacama_desert" } } }, - "byg:sierra_badlands": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:baobab_savanna" } } }, - "byg:dead_sea": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:weeping_mire" } } }, - "byg:ebony_woods": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:amaranth_fields" } } }, - "byg:cryptic_wastes": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:tropical_rainforest": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:rose_fields" } } }, - "byg:weeping_mire": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:cherry_blossom_forest" } } } }, "requirements": [ [ - "byg:baobab_savanna" + "byg:magma_wastes" ], [ - "byg:dacite_shore" + "byg:mojave_desert" ], [ - "byg:magma_wastes" + "byg:jacaranda_forest" ], [ - "byg:white_mangrove_marshes" + "byg:ethereal_islands" ], [ - "byg:rainbow_beach" + "byg:imparius_grove" ], [ - "byg:jacaranda_forest" + "byg:frosted_taiga" ], [ - "byg:glowstone_gardens" + "byg:red_rock_valley" ], [ - "byg:amaranth_fields" + "byg:fragment_forest" ], [ - "byg:cika_woods" + "byg:ivis_fields" ], [ - "byg:zelkova_forest" + "byg:dead_sea" ], [ - "byg:warped_desert" + "byg:shattered_glacier" ], [ - "byg:coniferous_forest" + "byg:cypress_swamplands" ], [ - "byg:prairie" + "byg:autumnal_forest" ], [ - "byg:twilight_meadow" + "byg:subzero_hypogeal" ], [ - "byg:mojave_desert" + "byg:dacite_shore" ], [ - "byg:bayou" + "byg:guiana_shield" ], [ - "byg:redwood_thicket" + "byg:lush_stacks" ], [ - "byg:coconino_meadow" + "byg:cryptic_wastes" ], [ - "byg:weeping_witch_forest" + "byg:cika_woods" ], [ - "byg:imparius_grove" + "byg:sythian_torrids" ], [ - "byg:orchard" + "byg:maple_taiga" ], [ - "byg:cypress_swamplands" + "byg:sierra_badlands" ], [ - "byg:basalt_barrera" + "byg:windswept_desert" ], [ - "byg:crimson_gardens" + "byg:allium_fields" ], [ - "byg:temperate_grove" + "byg:coniferous_forest" ], [ - "byg:forgotten_forest" + "byg:basalt_barrera" ], [ - "byg:red_rock_valley" + "byg:wailing_garth" ], [ - "byg:temperate_rainforest" + "byg:nightshade_forest" ], [ - "byg:windswept_beach" + "byg:rainbow_beach" ], [ - "byg:borealis_grove" + "byg:skyris_vale" ], [ - "byg:lush_stacks" + "byg:embur_bog" ], [ - "byg:black_forest" + "byg:viscal_isles" ], [ - "byg:fragment_forest" + "byg:bulbis_gardens" ], [ - "byg:bulbis_gardens" + "byg:bayou" ], [ - "byg:allium_fields" + "byg:black_forest" ], [ - "byg:sythian_torrids" + "byg:borealis_grove" ], [ - "byg:nightshade_forest" + "byg:warped_desert" ], [ - "byg:dacite_ridges" + "byg:quartz_desert" ], [ - "byg:arisian_undergrowth" + "byg:crag_gardens" ], [ - "byg:araucaria_savanna" + "byg:frosted_coniferous_forest" ], [ - "byg:firecracker_shrubland" + "byg:temperate_rainforest" ], [ - "byg:quartz_desert" + "byg:autumnal_taiga" ], [ - "byg:red_oak_forest" + "byg:weeping_witch_forest" ], [ - "byg:aspen_forest" + "byg:arisian_undergrowth" ], [ - "byg:ethereal_islands" + "byg:autumnal_valley" ], [ - "byg:subzero_hypogeal" + "byg:prairie" ], [ - "byg:ivis_fields" + "byg:canadian_shield" ], [ - "byg:crag_gardens" + "byg:tropical_rainforest" ], [ - "byg:howling_peaks" + "byg:shulkren_forest" ], [ - "byg:embur_bog" + "byg:aspen_forest" ], [ - "byg:maple_taiga" + "byg:dacite_ridges" ], [ - "byg:brimstone_caverns" + "byg:cardinal_tundra" ], [ - "byg:atacama_desert" + "byg:forgotten_forest" ], [ - "byg:wailing_garth" + "byg:twilight_meadow" ], [ - "byg:canadian_shield" + "byg:ebony_woods" ], [ - "byg:windswept_desert" + "byg:firecracker_shrubland" ], [ - "byg:viscal_isles" + "byg:red_oak_forest" ], [ - "byg:autumnal_taiga" + "byg:brimstone_caverns" ], [ - "byg:frosted_taiga" + "byg:zelkova_forest" ], [ - "byg:shulkren_forest" + "byg:howling_peaks" ], [ - "byg:guiana_shield" + "byg:orchard" ], [ - "byg:autumnal_forest" + "byg:coconino_meadow" ], [ - "byg:autumnal_valley" + "byg:crimson_gardens" ], [ - "byg:skyris_vale" + "byg:araucaria_savanna" ], [ - "byg:cherry_blossom_forest" + "byg:temperate_grove" ], [ - "byg:cardinal_tundra" + "byg:glowstone_gardens" ], [ - "byg:shattered_glacier" + "byg:windswept_beach" ], [ - "byg:frosted_coniferous_forest" + "byg:redwood_thicket" ], [ - "byg:rose_fields" + "byg:atacama_desert" ], [ - "byg:sierra_badlands" + "byg:baobab_savanna" ], [ - "byg:dead_sea" + "byg:weeping_mire" ], [ - "byg:ebony_woods" + "byg:amaranth_fields" ], [ - "byg:cryptic_wastes" + "byg:white_mangrove_marshes" ], [ - "byg:tropical_rainforest" + "byg:rose_fields" ], [ - "byg:weeping_mire" + "byg:cherry_blossom_forest" ] ] } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java index 24972535b9..8b4d81861a 100644 --- a/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/block/BYGWoodTypes.java @@ -88,7 +88,8 @@ public enum BYGWoodTypes { MAHOGANY("mahogany", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MAHOGANY) - .materialColor(MaterialColor.COLOR_GREEN)), + .materialColor(MaterialColor.COLOR_GREEN) + .leavesHaveOverlay()), MANGROVE("mangrove", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_MANGROVE_SAPLING) .boatType(BYGBoatEntity.BYGType.MANGROVE) @@ -112,7 +113,8 @@ public enum BYGWoodTypes { WILLOW("willow", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_WILLOW_SAPLING) .boatType(BYGBoatEntity.BYGType.WILLOW) - .materialColor(MaterialColor.TERRACOTTA_GREEN)), + .materialColor(MaterialColor.TERRACOTTA_GREEN) + .leavesHaveOverlay()), WITCH_HAZEL("witch_hazel", new Builder() .growerItemGroundTag(BYGBlockTags.GROUND_WITCH_HAZEL_SAPLING) .boatType(BYGBoatEntity.BYGType.WITCH_HAZEL) @@ -375,6 +377,10 @@ public boolean isNether() { return builder.isNether; } + public boolean leavesHaveOverlay() { + return builder.leavesHaveOverlay; + } + public enum GrowerItemType { SAPLING, ODDITY, @@ -401,6 +407,7 @@ public static final class Builder { private MaterialColor materialColor; private Integer leavesLightLevel; private boolean isNether; + private boolean leavesHaveOverlay; public Builder growerItem(GrowerItemType type) { this.growerItemType = type; @@ -434,5 +441,9 @@ public Builder registryName(BlockType blockType, String name) { this.registryName.put(blockType, name); return this; } + public Builder leavesHaveOverlay() { + this.leavesHaveOverlay = true; + return this; + } } } diff --git a/Common/src/main/resources/assets/byg/textures/block/mahogany_leaves_overlay.png b/Common/src/main/resources/assets/byg/textures/block/mahogany/leaves_overlay.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/block/mahogany_leaves_overlay.png rename to Common/src/main/resources/assets/byg/textures/block/mahogany/leaves_overlay.png diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 6cb9a0f3c0..d5ccc19f5d 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -1,5 +1,6 @@ package potionstudios.byg.datagen.providers; +import net.minecraft.core.Direction; import net.minecraft.core.Registry; import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; @@ -13,6 +14,7 @@ import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.TrapDoorBlock; +import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; @@ -28,6 +30,7 @@ public class BYGWoodAssetsProvider extends BlockStateProvider { private final ItemProvider item; + public BYGWoodAssetsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { super(generator, BYG.MOD_ID, existingFileHelper); this.item = new ItemProvider(generator, existingFileHelper); @@ -57,13 +60,13 @@ protected void registerStatesAndModels() { .texture("layer0", rl(typeLocItem + "boat")); final var bookshelf = models().cube( - typeName + "/bookshelf", - rl(typeLoc + "planks"), - rl(typeLoc + "planks"), - rl(typeLoc + "bookshelf"), - rl(typeLoc + "bookshelf"), - rl(typeLoc + "bookshelf"), - rl(typeLoc + "bookshelf") + typeName + "/bookshelf", + rl(typeLoc + "planks"), + rl(typeLoc + "planks"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf"), + rl(typeLoc + "bookshelf") ).texture("particle", typeLoc + "planks"); configureTransform(item.withExistingParent(type.bookshelf().getId().getPath(), bookshelf.getLocation())); simpleBlock(type.bookshelf().get(), bookshelf); @@ -75,47 +78,47 @@ protected void registerStatesAndModels() { buttonBlock((ButtonBlock) type.button().get(), button, buttonPressed); final var craftingTable = models().cube( - typeName + "/crafting_table", - rl(typeLoc + "planks"), - rl(typeLoc + "crafting_table_top"), - rl(typeLoc + "crafting_table_front"), - rl(typeLoc + "crafting_table_side"), - rl(typeLoc + "crafting_table_side"), - rl(typeLoc + "crafting_table_front") + typeName + "/crafting_table", + rl(typeLoc + "planks"), + rl(typeLoc + "crafting_table_top"), + rl(typeLoc + "crafting_table_front"), + rl(typeLoc + "crafting_table_side"), + rl(typeLoc + "crafting_table_side"), + rl(typeLoc + "crafting_table_front") ).texture("particle", typeLoc + "crafting_table_front"); configureTransform(item.withExistingParent(type.craftingTable().getId().getPath(), craftingTable.getLocation())); simpleBlock(type.craftingTable().get(), craftingTable); final var doorBottomLeft = models().doorBottomLeft( - typeName + "/door_bottom", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") + typeName + "/door_bottom", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") ); final var doorBottomRight = models().doorBottomRight( - typeName + "/door_bottom_hinge", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") + typeName + "/door_bottom_hinge", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") ); final var doorTopLeft = models().doorTopLeft( - typeName + "/door_top", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") + typeName + "/door_top", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") ); final var doorTopRight = models().doorTopRight( - typeName + "/door_top_hinge", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") + typeName + "/door_top_hinge", + rl(typeLoc + "door_bottom"), + rl(typeLoc + "door_top") ); doorBlock((DoorBlock) type.door().get(), doorBottomLeft, doorBottomRight, doorTopLeft, doorTopRight); item.withExistingParent(type.door().getId().getPath(), generatedParent) - .texture("layer0", rl(typeLocItem + "door")); + .texture("layer0", rl(typeLocItem + "door")); final var fencePost = models().fencePost(typeName + "/fence_post", rl(typeLoc + "planks")) .texture("particle", rl(typeLoc + "planks")); final var fenceSide = models().fenceSide(typeName + "/fence", rl(typeLoc + "planks")) - .texture("particle", rl(typeLoc + "planks")); + .texture("particle", rl(typeLoc + "planks")); final var fenceInv = models().fenceInventory(typeName + "/fence_inv", rl(typeLoc + "planks")) - .texture("particle", rl(typeLoc + "planks")); + .texture("particle", rl(typeLoc + "planks")); configureTransform(item.withExistingParent(type.fence().getId().getPath(), fenceInv.getLocation())); fourWayBlock((CrossCollisionBlock) type.fence().get(), fencePost, fenceSide); @@ -127,32 +130,40 @@ protected void registerStatesAndModels() { fenceGateBlock((FenceGateBlock) type.fenceGate().get(), fenceGate, fenceGateOpen, fenceGateWall, fenceGateWallOpen); if (type.leaves() != null) { + // So.. leaves are fun. final var leavesLoc = rl(typeLoc + "leaves"); - final var leaves = models().cube( - typeName + "/leaves", - leavesLoc, leavesLoc, leavesLoc, - leavesLoc, leavesLoc, leavesLoc - ).texture("particle", leavesLoc); + final BlockModelBuilder leaves; + if (type.leavesHaveOverlay()) { + final var overlaySupposedLoc = rl(typeLoc + "leaves_overlay"); + final var overlayLoc = models().existingFileHelper.exists(overlaySupposedLoc, ModelProviderAccess.getTexture()) ? overlaySupposedLoc : leavesLoc; + leaves = leaves(typeName + "/leaves", leavesLoc, overlayLoc); + } else { + leaves = models().cube( + typeName + "/leaves", + leavesLoc, leavesLoc, leavesLoc, + leavesLoc, leavesLoc, leavesLoc + ).texture("particle", leavesLoc); + } configureTransform(item.withExistingParent(type.leaves().getId().getPath(), leaves.getLocation())); models().cube( - typeName + "/leaves_snowy", - rl(typeLoc + "leaves_snowy"), - rl(typeLoc + "leaves_snowy"), - rl(typeLoc + "leaves_snowy_side"), - rl(typeLoc + "leaves_snowy_side"), - rl(typeLoc + "leaves_snowy_side"), - rl(typeLoc + "leaves_snowy_side") + typeName + "/leaves_snowy", + rl(typeLoc + "leaves_snowy"), + rl(typeLoc + "leaves_snowy"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side"), + rl(typeLoc + "leaves_snowy_side") ).texture("particle", rl(typeLoc + "leaves_snowy_side")); simpleBlock(type.leaves().get(), leaves); // TODO leaves should be snowy as well } final var planksLoc = rl(typeLoc + "planks"); final var planks = models().cube(typeName + "/planks", - topPlanks ? topPlanksLoc : planksLoc, - topPlanks ? topPlanksLoc : planksLoc, - planksLoc, - planksLoc, - planksLoc, - planksLoc + topPlanks ? topPlanksLoc : planksLoc, + topPlanks ? topPlanksLoc : planksLoc, + planksLoc, + planksLoc, + planksLoc, + planksLoc ).texture("particle", topPlanks ? topPlanksLoc : planksLoc); configureTransform(item.withExistingParent(type.planks().getId().getPath(), planks.getLocation())); simpleBlock(type.planks().get(), planks); @@ -174,12 +185,12 @@ protected void registerStatesAndModels() { final var textureLoc = rl(typeLoc + "grower_item"); final var growerItem = models().cross(typeName + "/grower_item", textureLoc); item.withExistingParent(type.growerItem().getId().getPath(), generatedParent) - .texture("layer0", textureLoc); + .texture("layer0", textureLoc); simpleBlock(type.growerItem().get(), growerItem); final var pottedBlock = ForgeRegistries.BLOCKS.getValue(BYG.createLocation("potted_" + type.growerItem().getId().getPath())); final var potted = models().withExistingParent(typeLoc + "potted_grower_item", mcLoc("block/flower_pot_cross")) - .texture("plant", growerItem.getLocation()); + .texture("plant", growerItem.getLocation()); simpleBlock(pottedBlock, potted); } final var pressurePlate = models().pressurePlate(typeName + "/pressure_plate", rl(typeLoc + "planks")); @@ -219,6 +230,36 @@ protected void registerStatesAndModels() { } } + private BlockModelBuilder leaves(String name, ResourceLocation texture, ResourceLocation overlay) { + return models().cube(name, + texture, texture, texture, + texture, texture, texture + ).texture("particle", texture).texture("overlay", overlay) + .element() + .from(0, 0, 0) + .to(16, 16, 16) + .faces((dir, builder) -> { + builder + .uvs(0, 0, 16, 16) + .texture("#" + dir.getName()) + .cullface(dir) + .end(); + }) + .end() + .element() + .from(0, 0, 0) + .to(16, 16, 16) + .faces((dir, builder) -> { + builder + .uvs(0, 0, 16, 16) + .texture("#" + dir.getName()) + .cullface(dir) + .tintindex(1) + .end(); + }) + .end(); + } + private static ResourceLocation rl(String path) { return BYG.createLocation(path); } From b4565f5004c33f6fc5e4dd8c0091b99611656dbc Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:03:51 +0300 Subject: [PATCH 70/90] Fix datagen leaves code --- .../byg/datagen/providers/BYGWoodAssetsProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index d5ccc19f5d..f727dcfd99 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -238,7 +238,7 @@ private BlockModelBuilder leaves(String name, ResourceLocation texture, Resource .element() .from(0, 0, 0) .to(16, 16, 16) - .faces((dir, builder) -> { + .allFaces((dir, builder) -> { builder .uvs(0, 0, 16, 16) .texture("#" + dir.getName()) @@ -249,7 +249,7 @@ private BlockModelBuilder leaves(String name, ResourceLocation texture, Resource .element() .from(0, 0, 0) .to(16, 16, 16) - .faces((dir, builder) -> { + .allFaces((dir, builder) -> { builder .uvs(0, 0, 16, 16) .texture("#" + dir.getName()) From 718dafd1e281c1b31e2510afe9ae8cf191f08343 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:21:42 +0300 Subject: [PATCH 71/90] Merge --- .../byg/datagen/providers/BYGWoodAssetsProvider.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 2b7864babb..aeebaa8fd8 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -13,7 +13,9 @@ import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.block.SlabBlock; import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.StandingSignBlock; import net.minecraft.world.level.block.TrapDoorBlock; +import net.minecraft.world.level.block.WallSignBlock; import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ItemModelBuilder; @@ -216,6 +218,11 @@ protected void registerStatesAndModels() { configureTransform(item.withExistingParent(type.trapdoor().getId().getPath(), trapdoor.getLocation())); trapdoorBlock((TrapDoorBlock) type.trapdoor().get(), trapdoor, trapdoorTop, trapdoorOpen, true); + if (type.sign() != null) { + final var model = models().sign(typeName + "/sign", planksLoc); + signBlock((StandingSignBlock) type.sign().get(), (WallSignBlock) type.wallSign().get(), model); + } + // No wood walls for now // final var logLocation = rl(typeLoc + "log"); // final var wallInv = models().wallInventory(typeName + "/wall_inventory", logLocation) From 23641c6f097a6444acef8a682fb428677373069e Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:21:56 +0300 Subject: [PATCH 72/90] Merge --- .../main/resources/assets/byg/blockstates/aspen_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/baobab_sign.json | 7 ------- .../assets/byg/blockstates/blue_enchanted_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/bulbis_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/cherry_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/cika_sign.json | 7 ------- .../resources/assets/byg/blockstates/cypress_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/ebony_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/embur_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/ether_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/fir_sign.json | 7 ------- .../assets/byg/blockstates/green_enchanted_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/holly_sign.json | 7 ------- .../resources/assets/byg/blockstates/imparius_sign.json | 7 ------- .../resources/assets/byg/blockstates/jacaranda_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/lament_sign.json | 7 ------- .../resources/assets/byg/blockstates/mahogany_sign.json | 7 ------- .../resources/assets/byg/blockstates/mangrove_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/maple_sign.json | 7 ------- .../resources/assets/byg/blockstates/nightshade_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/palm_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/pine_sign.json | 7 ------- .../assets/byg/blockstates/rainbow_eucalyptus_sign.json | 7 ------- .../resources/assets/byg/blockstates/redwood_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/skyris_sign.json | 7 ------- .../resources/assets/byg/blockstates/sythian_sign.json | 7 ------- .../main/resources/assets/byg/blockstates/willow_sign.json | 7 ------- .../resources/assets/byg/blockstates/witch_hazel_sign.json | 7 ------- .../resources/assets/byg/blockstates/zelkova_sign.json | 7 ------- 29 files changed, 203 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_sign.json diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_sign.json b/Common/src/main/resources/assets/byg/blockstates/aspen_sign.json deleted file mode 100644 index cf3a406557..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_sign.json b/Common/src/main/resources/assets/byg/blockstates/baobab_sign.json deleted file mode 100644 index 372c85deba..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sign.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sign.json deleted file mode 100644 index 961aee2ca8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_sign.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_sign.json deleted file mode 100644 index 955b552855..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_sign.json b/Common/src/main/resources/assets/byg/blockstates/cherry_sign.json deleted file mode 100644 index b34a8112da..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cherry_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_sign.json b/Common/src/main/resources/assets/byg/blockstates/cika_sign.json deleted file mode 100644 index ba435fa509..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_sign.json b/Common/src/main/resources/assets/byg/blockstates/cypress_sign.json deleted file mode 100644 index a8ad044ad7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_sign.json b/Common/src/main/resources/assets/byg/blockstates/ebony_sign.json deleted file mode 100644 index af97b0f997..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_sign.json b/Common/src/main/resources/assets/byg/blockstates/embur_sign.json deleted file mode 100644 index fcab2628fb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_sign.json b/Common/src/main/resources/assets/byg/blockstates/ether_sign.json deleted file mode 100644 index d60f9b8ad3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_sign.json b/Common/src/main/resources/assets/byg/blockstates/fir_sign.json deleted file mode 100644 index a45293910d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/fir_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sign.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sign.json deleted file mode 100644 index 3eb0680c18..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_sign.json b/Common/src/main/resources/assets/byg/blockstates/holly_sign.json deleted file mode 100644 index baa7cc90d5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_sign.json b/Common/src/main/resources/assets/byg/blockstates/imparius_sign.json deleted file mode 100644 index 58bfac9201..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/imparius_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_sign.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_sign.json deleted file mode 100644 index f048f93437..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_sign.json b/Common/src/main/resources/assets/byg/blockstates/lament_sign.json deleted file mode 100644 index 7df71f11d4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_sign.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_sign.json deleted file mode 100644 index ea44cb52f5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_sign.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_sign.json deleted file mode 100644 index 2c930a613f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_sign.json b/Common/src/main/resources/assets/byg/blockstates/maple_sign.json deleted file mode 100644 index 025be0637e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_sign.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_sign.json deleted file mode 100644 index 8e68ba61bf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_sign.json b/Common/src/main/resources/assets/byg/blockstates/palm_sign.json deleted file mode 100644 index 3192397c88..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/palm_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_sign.json b/Common/src/main/resources/assets/byg/blockstates/pine_sign.json deleted file mode 100644 index 3733bf9691..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json deleted file mode 100644 index 0797077c1d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_sign.json b/Common/src/main/resources/assets/byg/blockstates/redwood_sign.json deleted file mode 100644 index c2262b8961..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_sign.json b/Common/src/main/resources/assets/byg/blockstates/skyris_sign.json deleted file mode 100644 index e53e86826d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_sign.json b/Common/src/main/resources/assets/byg/blockstates/sythian_sign.json deleted file mode 100644 index bd60a3cb8c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_sign.json b/Common/src/main/resources/assets/byg/blockstates/willow_sign.json deleted file mode 100644 index 44fb26cdcb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sign.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sign.json deleted file mode 100644 index 4304531e88..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_sign.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_sign.json deleted file mode 100644 index 33f9785142..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_sign" - } - } -} \ No newline at end of file From d448d9084683a8595a555f9ac2c776ddbf469d3a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:22:19 +0300 Subject: [PATCH 73/90] Remove manual assets --- .../main/resources/assets/byg/models/item/aspen_sign.json | 6 ------ .../main/resources/assets/byg/models/item/baobab_sign.json | 6 ------ .../assets/byg/models/item/blue_enchanted_sign.json | 6 ------ .../main/resources/assets/byg/models/item/bulbis_sign.json | 6 ------ .../main/resources/assets/byg/models/item/cherry_sign.json | 6 ------ .../main/resources/assets/byg/models/item/cika_sign.json | 6 ------ .../main/resources/assets/byg/models/item/cypress_sign.json | 6 ------ .../main/resources/assets/byg/models/item/ebony_sign.json | 6 ------ .../main/resources/assets/byg/models/item/embur_sign.json | 6 ------ .../main/resources/assets/byg/models/item/ether_sign.json | 6 ------ .../src/main/resources/assets/byg/models/item/fir_sign.json | 6 ------ .../assets/byg/models/item/green_enchanted_sign.json | 6 ------ .../main/resources/assets/byg/models/item/holly_sign.json | 6 ------ .../resources/assets/byg/models/item/imparius_sign.json | 6 ------ .../resources/assets/byg/models/item/jacaranda_sign.json | 6 ------ .../main/resources/assets/byg/models/item/lament_sign.json | 6 ------ .../resources/assets/byg/models/item/mahogany_sign.json | 6 ------ .../resources/assets/byg/models/item/mangrove_sign.json | 6 ------ .../main/resources/assets/byg/models/item/maple_sign.json | 6 ------ .../resources/assets/byg/models/item/nightshade_sign.json | 6 ------ .../main/resources/assets/byg/models/item/palm_sign.json | 6 ------ .../main/resources/assets/byg/models/item/pine_sign.json | 6 ------ .../assets/byg/models/item/rainbow_eucalyptus_sign.json | 6 ------ .../main/resources/assets/byg/models/item/redwood_sign.json | 6 ------ .../main/resources/assets/byg/models/item/skyris_sign.json | 6 ------ .../main/resources/assets/byg/models/item/sythian_sign.json | 6 ------ .../main/resources/assets/byg/models/item/willow_sign.json | 6 ------ .../resources/assets/byg/models/item/witch_hazel_sign.json | 6 ------ .../main/resources/assets/byg/models/item/zelkova_sign.json | 6 ------ 29 files changed, 174 deletions(-) delete mode 100644 Common/src/main/resources/assets/byg/models/item/aspen_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/baobab_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/blue_enchanted_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/bulbis_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cherry_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cika_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/cypress_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ebony_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/embur_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/ether_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/fir_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/green_enchanted_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/holly_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/imparius_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/jacaranda_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/lament_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mahogany_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/mangrove_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/maple_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/nightshade_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/palm_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/pine_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/redwood_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/skyris_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/sythian_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/willow_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/witch_hazel_sign.json delete mode 100644 Common/src/main/resources/assets/byg/models/item/zelkova_sign.json diff --git a/Common/src/main/resources/assets/byg/models/item/aspen_sign.json b/Common/src/main/resources/assets/byg/models/item/aspen_sign.json deleted file mode 100644 index 870fbc095f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/aspen_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/aspen_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/baobab_sign.json b/Common/src/main/resources/assets/byg/models/item/baobab_sign.json deleted file mode 100644 index c90558aaf0..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/baobab_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/baobab_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sign.json b/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sign.json deleted file mode 100644 index 925749b812..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/blue_enchanted_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/blue_enchanted_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/bulbis_sign.json b/Common/src/main/resources/assets/byg/models/item/bulbis_sign.json deleted file mode 100644 index c9c9c0885e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/bulbis_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/bulbis_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cherry_sign.json b/Common/src/main/resources/assets/byg/models/item/cherry_sign.json deleted file mode 100644 index bf191d4cc1..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cherry_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/cherry_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cika_sign.json b/Common/src/main/resources/assets/byg/models/item/cika_sign.json deleted file mode 100644 index 817f86fc9f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cika_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/cika_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/cypress_sign.json b/Common/src/main/resources/assets/byg/models/item/cypress_sign.json deleted file mode 100644 index 2bf89fae8f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/cypress_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/cypress_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ebony_sign.json b/Common/src/main/resources/assets/byg/models/item/ebony_sign.json deleted file mode 100644 index e61ceca0bc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ebony_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/ebony_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/embur_sign.json b/Common/src/main/resources/assets/byg/models/item/embur_sign.json deleted file mode 100644 index 947d3617cc..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/embur_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/embur_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/ether_sign.json b/Common/src/main/resources/assets/byg/models/item/ether_sign.json deleted file mode 100644 index 2826181d85..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/ether_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/ether_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/fir_sign.json b/Common/src/main/resources/assets/byg/models/item/fir_sign.json deleted file mode 100644 index 7525788b98..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/fir_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/fir_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/green_enchanted_sign.json b/Common/src/main/resources/assets/byg/models/item/green_enchanted_sign.json deleted file mode 100644 index edc186281f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/green_enchanted_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/green_enchanted_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/holly_sign.json b/Common/src/main/resources/assets/byg/models/item/holly_sign.json deleted file mode 100644 index aaeaa98d3e..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/holly_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/holly_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/imparius_sign.json b/Common/src/main/resources/assets/byg/models/item/imparius_sign.json deleted file mode 100644 index 46e6d05a45..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/imparius_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/imparius_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/jacaranda_sign.json b/Common/src/main/resources/assets/byg/models/item/jacaranda_sign.json deleted file mode 100644 index 76307db4bd..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/jacaranda_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/jacaranda_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/lament_sign.json b/Common/src/main/resources/assets/byg/models/item/lament_sign.json deleted file mode 100644 index 1d0ef72b5b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/lament_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/lament_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mahogany_sign.json b/Common/src/main/resources/assets/byg/models/item/mahogany_sign.json deleted file mode 100644 index a52e0a1c83..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mahogany_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/mahogany_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/mangrove_sign.json b/Common/src/main/resources/assets/byg/models/item/mangrove_sign.json deleted file mode 100644 index d3b4bec23c..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/mangrove_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/mangrove_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/maple_sign.json b/Common/src/main/resources/assets/byg/models/item/maple_sign.json deleted file mode 100644 index c1459e6f62..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/maple_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/maple_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/nightshade_sign.json b/Common/src/main/resources/assets/byg/models/item/nightshade_sign.json deleted file mode 100644 index 03b373325b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/nightshade_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/nightshade_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/palm_sign.json b/Common/src/main/resources/assets/byg/models/item/palm_sign.json deleted file mode 100644 index ea4338c066..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/palm_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/palm_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/pine_sign.json b/Common/src/main/resources/assets/byg/models/item/pine_sign.json deleted file mode 100644 index 73ede147e5..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/pine_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/pine_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json b/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json deleted file mode 100644 index a6581d7815..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/rainbow_eucalyptus_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/redwood_sign.json b/Common/src/main/resources/assets/byg/models/item/redwood_sign.json deleted file mode 100644 index 4fccf6bf1f..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/redwood_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/redwood_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/skyris_sign.json b/Common/src/main/resources/assets/byg/models/item/skyris_sign.json deleted file mode 100644 index 7747974b9b..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/skyris_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/skyris_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/sythian_sign.json b/Common/src/main/resources/assets/byg/models/item/sythian_sign.json deleted file mode 100644 index d9dd28e1d7..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/sythian_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/sythian_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/willow_sign.json b/Common/src/main/resources/assets/byg/models/item/willow_sign.json deleted file mode 100644 index fdc980b788..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/willow_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/willow_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/witch_hazel_sign.json b/Common/src/main/resources/assets/byg/models/item/witch_hazel_sign.json deleted file mode 100644 index 8e13b00c76..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/witch_hazel_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/witch_hazel_sign" - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/models/item/zelkova_sign.json b/Common/src/main/resources/assets/byg/models/item/zelkova_sign.json deleted file mode 100644 index 2ec2610abf..0000000000 --- a/Common/src/main/resources/assets/byg/models/item/zelkova_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "byg:item/zelkova_sign" - } -} \ No newline at end of file From 6d8c1e8ebee5ab93df0b18f70e4fd298d773a82a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:25:13 +0300 Subject: [PATCH 74/90] Move sign textures --- .../item/{aspen_sign.png => aspen/sign.png} | Bin .../item/{baobab_sign.png => baobab/sign.png} | Bin .../sign.png} | Bin .../item/{bulbis_sign.png => bulbis/sign.png} | Bin .../item/{cherry_sign.png => cherry/sign.png} | Bin .../textures/item/{cika_sign.png => cika/sign.png} | Bin .../item/{cypress_sign.png => cypress/sign.png} | Bin .../item/{ebony_sign.png => ebony/sign.png} | Bin .../item/{embur_sign.png => embur/sign.png} | Bin .../item/{ether_sign.png => ether/sign.png} | Bin .../sign.png} | Bin .../item/{holly_sign.png => holly/sign.png} | Bin .../item/{imparius_sign.png => imparius/sign.png} | Bin .../item/{jacaranda_sign.png => jacaranda/sign.png} | Bin .../item/{lament_sign.png => lament/sign.png} | Bin .../item/{mahogany_sign.png => mahogany/sign.png} | Bin .../item/{mangrove_sign.png => mangrove/sign.png} | Bin .../item/{maple_sign.png => maple/sign.png} | Bin .../{nightshade_sign.png => nightshade/sign.png} | Bin .../textures/item/{palm_sign.png => palm/sign.png} | Bin .../textures/item/{pine_sign.png => pine/sign.png} | Bin .../sign.png} | Bin .../item/{redwood_sign.png => redwood/sign.png} | Bin .../item/{skyris_sign.png => skyris/sign.png} | Bin .../item/{sythian_sign.png => sythian/sign.png} | Bin .../item/{willow_sign.png => willow/sign.png} | Bin .../{witch_hazel_sign.png => witch_hazel/sign.png} | Bin .../item/{zelkova_sign.png => zelkova/sign.png} | Bin 28 files changed, 0 insertions(+), 0 deletions(-) rename Common/src/main/resources/assets/byg/textures/item/{aspen_sign.png => aspen/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{baobab_sign.png => baobab/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{blue_enchanted_sign.png => blue_enchanted/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{bulbis_sign.png => bulbis/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cherry_sign.png => cherry/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cika_sign.png => cika/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{cypress_sign.png => cypress/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ebony_sign.png => ebony/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{embur_sign.png => embur/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{ether_sign.png => ether/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{green_enchanted_sign.png => green_enchanted/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{holly_sign.png => holly/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{imparius_sign.png => imparius/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{jacaranda_sign.png => jacaranda/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{lament_sign.png => lament/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mahogany_sign.png => mahogany/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{mangrove_sign.png => mangrove/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{maple_sign.png => maple/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{nightshade_sign.png => nightshade/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{palm_sign.png => palm/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{pine_sign.png => pine/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{rainbow_eucalyptus_sign.png => rainbow_eucalyptus/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{redwood_sign.png => redwood/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{skyris_sign.png => skyris/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{sythian_sign.png => sythian/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{willow_sign.png => willow/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{witch_hazel_sign.png => witch_hazel/sign.png} (100%) rename Common/src/main/resources/assets/byg/textures/item/{zelkova_sign.png => zelkova/sign.png} (100%) diff --git a/Common/src/main/resources/assets/byg/textures/item/aspen_sign.png b/Common/src/main/resources/assets/byg/textures/item/aspen/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/aspen_sign.png rename to Common/src/main/resources/assets/byg/textures/item/aspen/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/baobab_sign.png b/Common/src/main/resources/assets/byg/textures/item/baobab/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/baobab_sign.png rename to Common/src/main/resources/assets/byg/textures/item/baobab/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/blue_enchanted_sign.png b/Common/src/main/resources/assets/byg/textures/item/blue_enchanted/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/blue_enchanted_sign.png rename to Common/src/main/resources/assets/byg/textures/item/blue_enchanted/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/bulbis_sign.png b/Common/src/main/resources/assets/byg/textures/item/bulbis/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/bulbis_sign.png rename to Common/src/main/resources/assets/byg/textures/item/bulbis/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cherry_sign.png b/Common/src/main/resources/assets/byg/textures/item/cherry/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cherry_sign.png rename to Common/src/main/resources/assets/byg/textures/item/cherry/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cika_sign.png b/Common/src/main/resources/assets/byg/textures/item/cika/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cika_sign.png rename to Common/src/main/resources/assets/byg/textures/item/cika/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/cypress_sign.png b/Common/src/main/resources/assets/byg/textures/item/cypress/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/cypress_sign.png rename to Common/src/main/resources/assets/byg/textures/item/cypress/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ebony_sign.png b/Common/src/main/resources/assets/byg/textures/item/ebony/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ebony_sign.png rename to Common/src/main/resources/assets/byg/textures/item/ebony/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/embur_sign.png b/Common/src/main/resources/assets/byg/textures/item/embur/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/embur_sign.png rename to Common/src/main/resources/assets/byg/textures/item/embur/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/ether_sign.png b/Common/src/main/resources/assets/byg/textures/item/ether/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/ether_sign.png rename to Common/src/main/resources/assets/byg/textures/item/ether/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/green_enchanted_sign.png b/Common/src/main/resources/assets/byg/textures/item/green_enchanted/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/green_enchanted_sign.png rename to Common/src/main/resources/assets/byg/textures/item/green_enchanted/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/holly_sign.png b/Common/src/main/resources/assets/byg/textures/item/holly/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/holly_sign.png rename to Common/src/main/resources/assets/byg/textures/item/holly/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/imparius_sign.png b/Common/src/main/resources/assets/byg/textures/item/imparius/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/imparius_sign.png rename to Common/src/main/resources/assets/byg/textures/item/imparius/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/jacaranda_sign.png b/Common/src/main/resources/assets/byg/textures/item/jacaranda/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/jacaranda_sign.png rename to Common/src/main/resources/assets/byg/textures/item/jacaranda/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/lament_sign.png b/Common/src/main/resources/assets/byg/textures/item/lament/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/lament_sign.png rename to Common/src/main/resources/assets/byg/textures/item/lament/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mahogany_sign.png b/Common/src/main/resources/assets/byg/textures/item/mahogany/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mahogany_sign.png rename to Common/src/main/resources/assets/byg/textures/item/mahogany/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/mangrove_sign.png b/Common/src/main/resources/assets/byg/textures/item/mangrove/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/mangrove_sign.png rename to Common/src/main/resources/assets/byg/textures/item/mangrove/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/maple_sign.png b/Common/src/main/resources/assets/byg/textures/item/maple/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/maple_sign.png rename to Common/src/main/resources/assets/byg/textures/item/maple/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/nightshade_sign.png b/Common/src/main/resources/assets/byg/textures/item/nightshade/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/nightshade_sign.png rename to Common/src/main/resources/assets/byg/textures/item/nightshade/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/palm_sign.png b/Common/src/main/resources/assets/byg/textures/item/palm/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/palm_sign.png rename to Common/src/main/resources/assets/byg/textures/item/palm/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/pine_sign.png b/Common/src/main/resources/assets/byg/textures/item/pine/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/pine_sign.png rename to Common/src/main/resources/assets/byg/textures/item/pine/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_sign.png b/Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus_sign.png rename to Common/src/main/resources/assets/byg/textures/item/rainbow_eucalyptus/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/redwood_sign.png b/Common/src/main/resources/assets/byg/textures/item/redwood/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/redwood_sign.png rename to Common/src/main/resources/assets/byg/textures/item/redwood/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/skyris_sign.png b/Common/src/main/resources/assets/byg/textures/item/skyris/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/skyris_sign.png rename to Common/src/main/resources/assets/byg/textures/item/skyris/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/sythian_sign.png b/Common/src/main/resources/assets/byg/textures/item/sythian/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/sythian_sign.png rename to Common/src/main/resources/assets/byg/textures/item/sythian/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/willow_sign.png b/Common/src/main/resources/assets/byg/textures/item/willow/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/willow_sign.png rename to Common/src/main/resources/assets/byg/textures/item/willow/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/witch_hazel_sign.png b/Common/src/main/resources/assets/byg/textures/item/witch_hazel/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/witch_hazel_sign.png rename to Common/src/main/resources/assets/byg/textures/item/witch_hazel/sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/zelkova_sign.png b/Common/src/main/resources/assets/byg/textures/item/zelkova/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/zelkova_sign.png rename to Common/src/main/resources/assets/byg/textures/item/zelkova/sign.png From 6f3e23145e4870f856b4cdc01ff482265d93d4b0 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:50:19 +0300 Subject: [PATCH 75/90] Datagen signs --- Common/src/generated/resources/.cache/cache | 180 +- .../assets/byg/blockstates/aspen_sign.json | 7 + .../byg/blockstates/aspen_wall_sign.json | 7 + .../assets/byg/blockstates/baobab_sign.json | 7 + .../byg/blockstates/baobab_wall_sign.json | 7 + .../byg/blockstates/blue_enchanted_sign.json | 7 + .../blockstates/blue_enchanted_wall_sign.json | 7 + .../assets/byg/blockstates/bulbis_sign.json | 7 + .../byg/blockstates/bulbis_wall_sign.json | 7 + .../assets/byg/blockstates/cherry_sign.json | 7 + .../byg/blockstates/cherry_wall_sign.json | 7 + .../assets/byg/blockstates/cika_sign.json | 7 + .../byg/blockstates/cika_wall_sign.json | 7 + .../assets/byg/blockstates/cypress_sign.json | 7 + .../byg/blockstates/cypress_wall_sign.json | 7 + .../assets/byg/blockstates/ebony_sign.json | 7 + .../byg/blockstates/ebony_wall_sign.json | 7 + .../assets/byg/blockstates/embur_sign.json | 7 + .../byg/blockstates/embur_wall_sign.json | 7 + .../assets/byg/blockstates/ether_sign.json | 7 + .../byg/blockstates/ether_wall_sign.json | 7 + .../assets/byg/blockstates/fir_sign.json | 7 + .../assets/byg/blockstates/fir_wall_sign.json | 7 + .../byg/blockstates/green_enchanted_sign.json | 7 + .../green_enchanted_wall_sign.json | 7 + .../assets/byg/blockstates/holly_sign.json | 7 + .../byg/blockstates/holly_wall_sign.json | 7 + .../assets/byg/blockstates/imparius_sign.json | 7 + .../byg/blockstates/imparius_wall_sign.json | 7 + .../byg/blockstates/jacaranda_sign.json | 7 + .../byg/blockstates/jacaranda_wall_sign.json | 7 + .../assets/byg/blockstates/lament_sign.json | 7 + .../byg/blockstates/lament_wall_sign.json | 7 + .../assets/byg/blockstates/mahogany_sign.json | 7 + .../byg/blockstates/mahogany_wall_sign.json | 7 + .../assets/byg/blockstates/mangrove_sign.json | 7 + .../byg/blockstates/mangrove_wall_sign.json | 7 + .../assets/byg/blockstates/maple_sign.json | 7 + .../byg/blockstates/maple_wall_sign.json | 7 + .../byg/blockstates/nightshade_sign.json | 7 + .../byg/blockstates/nightshade_wall_sign.json | 7 + .../assets/byg/blockstates/palm_sign.json | 7 + .../byg/blockstates/palm_wall_sign.json | 7 + .../assets/byg/blockstates/pine_sign.json | 7 + .../byg/blockstates/pine_wall_sign.json | 7 + .../blockstates/rainbow_eucalyptus_sign.json | 7 + .../rainbow_eucalyptus_wall_sign.json | 7 + .../assets/byg/blockstates/redwood_sign.json | 7 + .../byg/blockstates/redwood_wall_sign.json | 7 + .../assets/byg/blockstates/skyris_sign.json | 7 + .../byg/blockstates/skyris_wall_sign.json | 7 + .../assets/byg/blockstates/sythian_sign.json | 7 + .../byg/blockstates/sythian_wall_sign.json | 7 + .../assets/byg/blockstates/willow_sign.json | 7 + .../byg/blockstates/willow_wall_sign.json | 7 + .../byg/blockstates/witch_hazel_sign.json | 7 + .../blockstates/witch_hazel_wall_sign.json | 7 + .../assets/byg/blockstates/zelkova_sign.json | 7 + .../byg/blockstates/zelkova_wall_sign.json | 7 + .../resources/assets/byg/lang/en_us.json | 2432 +++++++++++++++++ .../assets/byg/models/block/aspen/leaves.json | 9 +- .../assets/byg/models/block/aspen/sign.json | 5 + .../byg/models/block/baobab/leaves.json | 9 +- .../assets/byg/models/block/baobab/sign.json | 5 + .../models/block/blue_enchanted/leaves.json | 9 +- .../byg/models/block/blue_enchanted/sign.json | 5 + .../assets/byg/models/block/bulbis/sign.json | 5 + .../assets/byg/models/block/cherry/sign.json | 5 + .../assets/byg/models/block/cika/leaves.json | 9 +- .../assets/byg/models/block/cika/sign.json | 5 + .../byg/models/block/cypress/leaves.json | 9 +- .../assets/byg/models/block/cypress/sign.json | 5 + .../assets/byg/models/block/ebony/leaves.json | 9 +- .../assets/byg/models/block/ebony/sign.json | 5 + .../assets/byg/models/block/embur/sign.json | 5 + .../assets/byg/models/block/ether/leaves.json | 9 +- .../assets/byg/models/block/ether/sign.json | 5 + .../assets/byg/models/block/fir/leaves.json | 9 +- .../assets/byg/models/block/fir/sign.json | 5 + .../models/block/green_enchanted/leaves.json | 9 +- .../models/block/green_enchanted/sign.json | 5 + .../assets/byg/models/block/holly/leaves.json | 9 +- .../assets/byg/models/block/holly/sign.json | 5 + .../byg/models/block/imparius/sign.json | 5 + .../byg/models/block/jacaranda/leaves.json | 9 +- .../byg/models/block/jacaranda/sign.json | 5 + .../byg/models/block/lament/leaves.json | 9 +- .../assets/byg/models/block/lament/sign.json | 5 + .../byg/models/block/mahogany/leaves.json | 62 +- .../byg/models/block/mahogany/sign.json | 5 + .../byg/models/block/mangrove/leaves.json | 9 +- .../byg/models/block/mangrove/sign.json | 5 + .../assets/byg/models/block/maple/leaves.json | 9 +- .../assets/byg/models/block/maple/sign.json | 5 + .../byg/models/block/nightshade/leaves.json | 9 +- .../byg/models/block/nightshade/sign.json | 5 + .../assets/byg/models/block/palm/leaves.json | 9 +- .../assets/byg/models/block/palm/sign.json | 5 + .../assets/byg/models/block/pine/leaves.json | 9 +- .../assets/byg/models/block/pine/sign.json | 5 + .../block/rainbow_eucalyptus/leaves.json | 9 +- .../models/block/rainbow_eucalyptus/sign.json | 5 + .../byg/models/block/redwood/leaves.json | 9 +- .../assets/byg/models/block/redwood/sign.json | 5 + .../byg/models/block/skyris/leaves.json | 9 +- .../assets/byg/models/block/skyris/sign.json | 5 + .../byg/models/block/sythian/leaves.json | 9 +- .../assets/byg/models/block/sythian/sign.json | 5 + .../byg/models/block/willow/leaves.json | 62 +- .../assets/byg/models/block/willow/sign.json | 5 + .../byg/models/block/witch_hazel/leaves.json | 9 +- .../byg/models/block/witch_hazel/sign.json | 5 + .../byg/models/block/zelkova/leaves.json | 9 +- .../assets/byg/models/block/zelkova/sign.json | 5 + .../assets/byg/models/item/aspen_sign.json | 6 + .../assets/byg/models/item/baobab_sign.json | 6 + .../byg/models/item/blue_enchanted_sign.json | 6 + .../assets/byg/models/item/bulbis_sign.json | 6 + .../assets/byg/models/item/cherry_sign.json | 6 + .../assets/byg/models/item/cika_sign.json | 6 + .../assets/byg/models/item/cypress_sign.json | 6 + .../assets/byg/models/item/ebony_sign.json | 6 + .../assets/byg/models/item/embur_sign.json | 6 + .../assets/byg/models/item/ether_sign.json | 6 + .../assets/byg/models/item/fir_sign.json | 6 + .../byg/models/item/green_enchanted_sign.json | 6 + .../assets/byg/models/item/holly_sign.json | 6 + .../assets/byg/models/item/imparius_sign.json | 6 + .../byg/models/item/jacaranda_sign.json | 6 + .../assets/byg/models/item/lament_sign.json | 6 + .../assets/byg/models/item/mahogany_sign.json | 6 + .../assets/byg/models/item/mangrove_sign.json | 6 + .../assets/byg/models/item/maple_sign.json | 6 + .../byg/models/item/nightshade_sign.json | 6 + .../assets/byg/models/item/palm_sign.json | 6 + .../assets/byg/models/item/pine_sign.json | 6 + .../models/item/rainbow_eucalyptus_sign.json | 6 + .../assets/byg/models/item/redwood_sign.json | 6 + .../assets/byg/models/item/skyris_sign.json | 6 + .../assets/byg/models/item/sythian_sign.json | 6 + .../assets/byg/models/item/willow_sign.json | 6 + .../byg/models/item/witch_hazel_sign.json | 6 + .../assets/byg/models/item/zelkova_sign.json | 6 + .../adventure/oh_the_biomes_youll_go.json | 444 +-- .../resources/data/byg/tags/blocks/slabs.json | 6 +- .../minecraft/tags/blocks/mineable/axe.json | 58 + .../data/minecraft/tags/blocks/stairs.json | 2 + .../data/minecraft/tags/items/saplings.json | 16 + .../data/minecraft/tags/items/stairs.json | 70 + .../item/{fir_planks.png => fir/sign.png} | Bin .../providers/BYGWoodAssetsProvider.java | 3 + 151 files changed, 3845 insertions(+), 422 deletions(-) create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/aspen_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/baobab_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/bulbis_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cherry_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cika_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/cypress_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ebony_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/embur_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/ether_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/fir_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/holly_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/imparius_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/jacaranda_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/lament_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mahogany_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/mangrove_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/maple_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/nightshade_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/palm_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/pine_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/redwood_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/skyris_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/sythian_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/willow_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_sign.json create mode 100644 Common/src/generated/resources/assets/byg/blockstates/zelkova_wall_sign.json create mode 100644 Common/src/generated/resources/assets/byg/lang/en_us.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/aspen_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/baobab_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/bulbis_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cherry_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cika_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/cypress_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ebony_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/embur_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/ether_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/fir_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/green_enchanted_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/holly_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/imparius_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/jacaranda_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/lament_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mahogany_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/mangrove_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/maple_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/nightshade_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/palm_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/pine_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/redwood_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/skyris_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/sythian_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/willow_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/witch_hazel_sign.json create mode 100644 Common/src/generated/resources/assets/byg/models/item/zelkova_sign.json create mode 100644 Common/src/generated/resources/data/minecraft/tags/items/stairs.json rename Common/src/main/resources/assets/byg/textures/item/{fir_planks.png => fir/sign.png} (100%) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index ae0adbb0e5..0488d8119e 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -9,9 +9,11 @@ fd3329c171e82f85a18f706ba33da293d70445c8 assets/byg/blockstates/aspen_crafting_t 48cdfbae2ce7ca6707f724911272fe81f9d8ddf1 assets/byg/blockstates/aspen_planks.json cdc7e6b1223736a93f84dceb1576768bb9e48230 assets/byg/blockstates/aspen_pressure_plate.json ad4ce10bc6c38899edd4bfec7d1a51b40e564f16 assets/byg/blockstates/aspen_sapling.json +d768f4b91cf938390d5f98a19f96af1925f93184 assets/byg/blockstates/aspen_sign.json 5df218daa64d454008ee4627af709c02f76e1fc5 assets/byg/blockstates/aspen_slab.json ebc382c911294f10130ea6accdd3bbe6d04fa01e assets/byg/blockstates/aspen_stairs.json a1cf8cc2fd4e08745aaedb95ca8d8aa565c532b9 assets/byg/blockstates/aspen_trapdoor.json +d768f4b91cf938390d5f98a19f96af1925f93184 assets/byg/blockstates/aspen_wall_sign.json 9ed8e80457466b15e98e82b2d6c9811ac8cdc009 assets/byg/blockstates/aspen_wood.json 9b530553a60965f2c1d6df95e793ca5d5df668e7 assets/byg/blockstates/baobab_bookshelf.json 9494e776824d175009ab0c64293294a955c2b1d6 assets/byg/blockstates/baobab_button.json @@ -24,9 +26,11 @@ cb8e0c689ba19dc671b9fbb7810e2f1bc3c2ece4 assets/byg/blockstates/baobab_leaves.js 71b82ac2d1698b5da5848e78d364b140f6ae696f assets/byg/blockstates/baobab_planks.json 8b556ed43bcfaddb28ddb4dad0724c2489c9e1e4 assets/byg/blockstates/baobab_pressure_plate.json 9a7979c28f981ba020325dafa75220ebc62a016d assets/byg/blockstates/baobab_sapling.json +4e91b8cd5a76ed73dbfdc4951092e7d92b52e2e7 assets/byg/blockstates/baobab_sign.json 5a90e48e6353dd15f5a1c9f676049550965a1599 assets/byg/blockstates/baobab_slab.json 46bc1593dab72984f0f50b93879ff5e72529b25a assets/byg/blockstates/baobab_stairs.json 9d16692195b2262dc3f385ff20dc0441d69498ae assets/byg/blockstates/baobab_trapdoor.json +4e91b8cd5a76ed73dbfdc4951092e7d92b52e2e7 assets/byg/blockstates/baobab_wall_sign.json a407a88762140e840178fe0cc1a9f2fa6fdd7782 assets/byg/blockstates/baobab_wood.json 456c6bb8f7cced890ba8c4bc49319b70d2e9fb97 assets/byg/blockstates/blue_enchanted_bookshelf.json 22ab3ec5237ade7b7763133ce7c0ed28bb28576a assets/byg/blockstates/blue_enchanted_button.json @@ -39,9 +43,11 @@ beda7164cea919a803a0860ca97834050fda4120 assets/byg/blockstates/blue_enchanted_l b1446b58b1422b8fa6fe2c743db666a5f3912d73 assets/byg/blockstates/blue_enchanted_planks.json 77e5d35fe49fc200e0c5ae18acb24645fcef1610 assets/byg/blockstates/blue_enchanted_pressure_plate.json 64e13153b23b1bd0b36e3921911497736cc30fe1 assets/byg/blockstates/blue_enchanted_sapling.json +cf17ce200fab89d820ef551d517af3714c9eff5a assets/byg/blockstates/blue_enchanted_sign.json 845c52c88cea1f36eec88599489d6bd6da3d3dc0 assets/byg/blockstates/blue_enchanted_slab.json b663397ca131c3809a264273db49bb3cbaa804f6 assets/byg/blockstates/blue_enchanted_stairs.json ca04d4d0c482f697ac997c18cd672872d6d5574b assets/byg/blockstates/blue_enchanted_trapdoor.json +cf17ce200fab89d820ef551d517af3714c9eff5a assets/byg/blockstates/blue_enchanted_wall_sign.json 84b6d65765fdd81c70b72b26aaacf8356b43de40 assets/byg/blockstates/blue_enchanted_wood.json 11d9fdb3f3fb28605dc1813efddbc0769c7376e7 assets/byg/blockstates/bulbis_bookshelf.json cdc4bb75ce5f65a4105e76f022b24c022329daaa assets/byg/blockstates/bulbis_button.json @@ -52,10 +58,12 @@ d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_ aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json 650dfec098bab994309a39150c03ba8bb96103cf assets/byg/blockstates/bulbis_planks.json 93cd0d54e1ed8a0ed2fb7846904e437aa050cf7b assets/byg/blockstates/bulbis_pressure_plate.json +1a25674ee9800d2233a6a2aa76aa83930b7d3b2b assets/byg/blockstates/bulbis_sign.json 5421ac9b41c223ebab50565824a59307cc9d2662 assets/byg/blockstates/bulbis_slab.json cd66b534707514f920646728e836d22ba63aba3e assets/byg/blockstates/bulbis_stairs.json f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json 403946f133711ef34624713f7cb037cc9d4bd29a assets/byg/blockstates/bulbis_trapdoor.json +1a25674ee9800d2233a6a2aa76aa83930b7d3b2b assets/byg/blockstates/bulbis_wall_sign.json 34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_wood.json 2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json 9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json @@ -66,9 +74,11 @@ c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_ cac2a6bdf27098f538aad8afa1ef7a4e197d36e6 assets/byg/blockstates/cherry_log.json b358d54ecbc20cd095b8a3190ecd0b6e5e92d8a1 assets/byg/blockstates/cherry_planks.json 18a4e50ded54706438caa3fdbab555de8b887375 assets/byg/blockstates/cherry_pressure_plate.json +feb5af5c0292b50ae7e087baaf51afabece5071e assets/byg/blockstates/cherry_sign.json 13b503f19ea9f6b51671fbd47d4222676aab3a9d assets/byg/blockstates/cherry_slab.json 030349e42e73bbffc5fbdc60e2fb86c923a78355 assets/byg/blockstates/cherry_stairs.json 751ced15dcb317710bc594b5345beeef56e1615b assets/byg/blockstates/cherry_trapdoor.json +feb5af5c0292b50ae7e087baaf51afabece5071e assets/byg/blockstates/cherry_wall_sign.json 8093ed1c2a68e88868b09c31773f388295496eff assets/byg/blockstates/cherry_wood.json 4a3ba90f77e5b20c00636a9fddbdcdaa95556993 assets/byg/blockstates/cika_bookshelf.json 51eb709f9dd4702a5060327b3508fff7aeffd7ed assets/byg/blockstates/cika_button.json @@ -81,9 +91,11 @@ d46011fcb0eb1a993ba87cf2b70058331e5ba961 assets/byg/blockstates/cika_fence_gate. 233e151eb926da2ca9c1bf144ee815fc55c043ed assets/byg/blockstates/cika_planks.json bc03f8c8b0e1bf4d2b3887e06ba7d7cb0701454b assets/byg/blockstates/cika_pressure_plate.json 1faa7bd9a8275098243926345e4b17a5d6041a45 assets/byg/blockstates/cika_sapling.json +8045860071e013ddfcfad74e8891f47b1afadf01 assets/byg/blockstates/cika_sign.json 34f068c89083814a3829f44ef7721bce9776971b assets/byg/blockstates/cika_slab.json 2c4e481c519b39c19fef8943c401c33447bba0fc assets/byg/blockstates/cika_stairs.json 51180b1bd9b44f829879c95433794894f904ea66 assets/byg/blockstates/cika_trapdoor.json +8045860071e013ddfcfad74e8891f47b1afadf01 assets/byg/blockstates/cika_wall_sign.json e44b08dca8032672db8b041d632dbcd3be644817 assets/byg/blockstates/cika_wood.json 2f90dccadf676a68cc434d058f16c1745f436fc2 assets/byg/blockstates/cypress_bookshelf.json 7f11b23b79d4ad7decd6a688a1de3b9cc6dfdf40 assets/byg/blockstates/cypress_button.json @@ -96,9 +108,11 @@ b68b8479abbd2fcb55d41803b00a7c86dc98107f assets/byg/blockstates/cypress_leaves.j 05846aded161d6f08b10912c0d5bec70ba657cfb assets/byg/blockstates/cypress_planks.json 0434a174a2be6e8bc6aa359c67a1fc07979c50f8 assets/byg/blockstates/cypress_pressure_plate.json 030b18e58869eb145cca6b43d0a269fcd1c0f459 assets/byg/blockstates/cypress_sapling.json +7aae5fba81e44a5834172b09de267ec6ca6e9234 assets/byg/blockstates/cypress_sign.json 18cbd38b265803125299f381d554825cf576e8e9 assets/byg/blockstates/cypress_slab.json 9cc116b20eb50e84ac9b35ba9261fa40d90c990a assets/byg/blockstates/cypress_stairs.json fe5812f696dfecd2386017c2e904d584d651918b assets/byg/blockstates/cypress_trapdoor.json +7aae5fba81e44a5834172b09de267ec6ca6e9234 assets/byg/blockstates/cypress_wall_sign.json 5be9d15a21ae48ba0049c936da8eeddb83209941 assets/byg/blockstates/cypress_wood.json 0b58b77abeede946897bbe25202bee8368c9d22f assets/byg/blockstates/ebony_bookshelf.json 114efca25fa48660b167082279d1e00a1acd4860 assets/byg/blockstates/ebony_button.json @@ -111,9 +125,11 @@ d74089c995e6affbc74a457cff279aaa1ac02a46 assets/byg/blockstates/ebony_leaves.jso 8b3aaf18e34e22e4f13e124a3b28aed80666de91 assets/byg/blockstates/ebony_planks.json 34f5626530e0f3a2a677cef41c1735d250e643ee assets/byg/blockstates/ebony_pressure_plate.json 1d6db1f12bffcadbba4b578c13e1aed3210760a7 assets/byg/blockstates/ebony_sapling.json +382de3b3080da62d15f36234386f0614c8bcb739 assets/byg/blockstates/ebony_sign.json d698358e14d5b800a34701c887b3c102420d37db assets/byg/blockstates/ebony_slab.json 159597001403dce617cec0b09015229f82a692fa assets/byg/blockstates/ebony_stairs.json 7093b45027148af44c5a09e2dd072b01d4cc0dd0 assets/byg/blockstates/ebony_trapdoor.json +382de3b3080da62d15f36234386f0614c8bcb739 assets/byg/blockstates/ebony_wall_sign.json e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json 200459a4e3443e80749671ca91140e98546574ac assets/byg/blockstates/embur_bookshelf.json bbec1f7607f6b94ca03945848b01f04561b2c323 assets/byg/blockstates/embur_button.json @@ -125,9 +141,11 @@ f8cff1e012779ef2568929c38ea45d880efce0dc assets/byg/blockstates/embur_fence_gate b6d9488386debda019aece59c0634c2c24258736 assets/byg/blockstates/embur_pedu.json 8b239412b7b13874dd0a12acd09dce1a10cbc851 assets/byg/blockstates/embur_planks.json 8c5ddd130c78b32e4e39a821d24119707d76040c assets/byg/blockstates/embur_pressure_plate.json +beaebacfa6deeb4a29e7f88bdd14720fc078916c assets/byg/blockstates/embur_sign.json cacd2f9cf0ff0c18fcda66fce0eb2624d46a80d8 assets/byg/blockstates/embur_slab.json 94999f2516a5f601dd7dd9370b5689d4f0b917f4 assets/byg/blockstates/embur_stairs.json 3c2e6d1f27880ebfd5c437976e3e23c8a0c85998 assets/byg/blockstates/embur_trapdoor.json +beaebacfa6deeb4a29e7f88bdd14720fc078916c assets/byg/blockstates/embur_wall_sign.json bbfdcfa6e93d2a9e423eb19f06880fa3c644c8c9 assets/byg/blockstates/embur_wart.json 75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json 9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json @@ -140,9 +158,11 @@ f9700f487572abb2236c67b992bbbbbf4ad26f0e assets/byg/blockstates/ether_fence_gate b5a493a4bd9575237f481905be4881c84339bf48 assets/byg/blockstates/ether_planks.json 37133b061949020bea2906138e83bb1df54e1031 assets/byg/blockstates/ether_pressure_plate.json 3e292be23042770314b45bfb2bffecf994ff4fed assets/byg/blockstates/ether_sapling.json +32114613835bd8e9f408927f04155d9cc9f485f9 assets/byg/blockstates/ether_sign.json 3079fa76d05999a8c0c0e531f6de4a84d12e8824 assets/byg/blockstates/ether_slab.json 3747906a8ae92fb238b2519cfa6fc46a8c55de04 assets/byg/blockstates/ether_stairs.json 80082439073ab19d72bb92807b6cef3bf7f2882a assets/byg/blockstates/ether_trapdoor.json +32114613835bd8e9f408927f04155d9cc9f485f9 assets/byg/blockstates/ether_wall_sign.json e3e77c7b000f51269b5f67ecddc512ec96ea05ae assets/byg/blockstates/ether_wood.json f664d6bc826b44c0d13d33f27f57a59e7560edf0 assets/byg/blockstates/fir_bookshelf.json 156771fc3a906babe8931d717fb39aceef675330 assets/byg/blockstates/fir_button.json @@ -155,9 +175,11 @@ f664d6bc826b44c0d13d33f27f57a59e7560edf0 assets/byg/blockstates/fir_bookshelf.js 26a3185d0554c29d7513d597f0484b1ec4c4dabe assets/byg/blockstates/fir_planks.json a542a26d6211372337d75f448ffcb1064df92d3a assets/byg/blockstates/fir_pressure_plate.json d3f83cdcf37f10a09f81aaa8f906aeeb56aedfbf assets/byg/blockstates/fir_sapling.json +d1ba1f62bd8514d6dfcd0207f67db947ff634674 assets/byg/blockstates/fir_sign.json aeca1210198d02e88eaa523732a4b57cd048a947 assets/byg/blockstates/fir_slab.json ec0a00c28a345cd8e7651bf0d04ccdf9eed4a44a assets/byg/blockstates/fir_stairs.json 483d7c57d329f15846ba349f1e230bce57682388 assets/byg/blockstates/fir_trapdoor.json +d1ba1f62bd8514d6dfcd0207f67db947ff634674 assets/byg/blockstates/fir_wall_sign.json 491c543c8068f56f78c7a819a2037d1d7e07eed2 assets/byg/blockstates/fir_wood.json 9943f7e2bc7314068fe2d79f4c84b924cb7a0c59 assets/byg/blockstates/green_enchanted_bookshelf.json 04b2a6e84f0c0a930d5d119e5a23f44821f3544d assets/byg/blockstates/green_enchanted_button.json @@ -170,9 +192,11 @@ be960e54effc1b98eade1fb85034e63178f87090 assets/byg/blockstates/green_enchanted_ db16b4281215de072da9fcdfa8a2e2d4f1c59e26 assets/byg/blockstates/green_enchanted_planks.json 29a1710526195079af4cdb764472b3467878855d assets/byg/blockstates/green_enchanted_pressure_plate.json b8897b9101242e862efad4ff38bba82e3cf41f9d assets/byg/blockstates/green_enchanted_sapling.json +7c66b207ec549557bf26f693d948985e8e5968d3 assets/byg/blockstates/green_enchanted_sign.json f7bb14615da3a0ea429d490f10cae1afb5845ab4 assets/byg/blockstates/green_enchanted_slab.json e5e737a8dd8245a48d5a7ee0e959371e97c74ab1 assets/byg/blockstates/green_enchanted_stairs.json 4c28fe14767bd0b394d50f8cfc4324b2af6e895a assets/byg/blockstates/green_enchanted_trapdoor.json +7c66b207ec549557bf26f693d948985e8e5968d3 assets/byg/blockstates/green_enchanted_wall_sign.json f983f31f409c8107060d6869689d426cef3aacc1 assets/byg/blockstates/green_enchanted_wood.json b32d0d43ebd88a4bfe468169f24c16d42579f0d7 assets/byg/blockstates/holly_bookshelf.json 198f588b7cb0580ad5ffa48eb728be5a77d7a737 assets/byg/blockstates/holly_button.json @@ -185,9 +209,11 @@ acbd15065101f8af93ae367afe071f77b20a8a2e assets/byg/blockstates/holly_log.json 0780b1088202c3522489e6ef57c9b998dcffd05f assets/byg/blockstates/holly_planks.json d61b3d8e97c943b200e94e10360a2991cd34a96d assets/byg/blockstates/holly_pressure_plate.json a6d91c6966dcd3f969e18ea0b9261280e5f42053 assets/byg/blockstates/holly_sapling.json +1f91718ee98b8e0dd766b60cbde946d9a5f9941c assets/byg/blockstates/holly_sign.json 3bd67e3d60b1f435af6e6f2acba3d70cea8b2174 assets/byg/blockstates/holly_slab.json 771a50f13aef7502407cf2700b527d00262600d7 assets/byg/blockstates/holly_stairs.json 9d50a7d25751f6827b7f95531c2d8e6945dc8619 assets/byg/blockstates/holly_trapdoor.json +1f91718ee98b8e0dd766b60cbde946d9a5f9941c assets/byg/blockstates/holly_wall_sign.json 4f6f2c53fc3e2eabed9d63477e8acb35645fb696 assets/byg/blockstates/holly_wood.json 9cbc47409067352e5896d895c7abce4bcae0ffa8 assets/byg/blockstates/imparius_bookshelf.json 15c7dbe3e482190440242b2f2c76c013556e9605 assets/byg/blockstates/imparius_button.json @@ -199,10 +225,12 @@ a53e3318418c7549ac4fac5826fff3fc149fc4fe assets/byg/blockstates/imparius_hyphae. 9cd32a084fec1d5cb33d62ef4b9b80ee22370827 assets/byg/blockstates/imparius_mushroom.json a4fe9c5cd4d85b0e6510cd4ebd369cd96d94e5bc assets/byg/blockstates/imparius_planks.json c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressure_plate.json +6b9e1bac882dca8f69daa12849242e0352d44709 assets/byg/blockstates/imparius_sign.json 5ee8423214cb57c829d3a3ae3d4bd35312c293e6 assets/byg/blockstates/imparius_slab.json bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json 4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json 5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json +6b9e1bac882dca8f69daa12849242e0352d44709 assets/byg/blockstates/imparius_wall_sign.json 2698ab6bf7752a084c60ca8b4373cedcb4c4cf52 assets/byg/blockstates/jacaranda_bookshelf.json e36e83906ab21e33a7eb10159e835321bb8147d8 assets/byg/blockstates/jacaranda_button.json 92fe11ffeb6f855b92717d1e49ca483bd22b06ea assets/byg/blockstates/jacaranda_crafting_table.json @@ -214,9 +242,11 @@ b90a2358ad71914db8a0dddff012822feee9fed8 assets/byg/blockstates/jacaranda_fence. 62da5c17355c7cc14a44c3ca60f6ebe488397b46 assets/byg/blockstates/jacaranda_planks.json b5f013629695fa9d81cf37ce3d7b3aef39223f8d assets/byg/blockstates/jacaranda_pressure_plate.json 42e60d6faf7650b0b01bb40ca2f1ced3e3414608 assets/byg/blockstates/jacaranda_sapling.json +1676a8c9c77db5371489a72dc5a2b857338c33f5 assets/byg/blockstates/jacaranda_sign.json 41416df158f3e814f5b4a57b4db8b6c1e7164ea7 assets/byg/blockstates/jacaranda_slab.json 80b6eab6b2fe7b9fabff58228badd698a5950e6b assets/byg/blockstates/jacaranda_stairs.json 10b8837262a81bf6c5c4cab22475a650c605c215 assets/byg/blockstates/jacaranda_trapdoor.json +1676a8c9c77db5371489a72dc5a2b857338c33f5 assets/byg/blockstates/jacaranda_wall_sign.json 1bfea42e7470aa0c5bee7a49c9975f51e9b6ab5f assets/byg/blockstates/jacaranda_wood.json f6e0d7a87643e75508857bc72c746d07f316042a assets/byg/blockstates/lament_bookshelf.json caa05c4828bed24692853c4b9260c69e4998251f assets/byg/blockstates/lament_button.json @@ -229,9 +259,11 @@ caa05c4828bed24692853c4b9260c69e4998251f assets/byg/blockstates/lament_button.js 52c6a6d2e0f317d9f30cb748a10b33c6b058c872 assets/byg/blockstates/lament_planks.json bb985fb2f9a8d1530a65648040902e87a8f2e8b1 assets/byg/blockstates/lament_pressure_plate.json 06ed38a42cc419a534647531555bc3cff01ff5a6 assets/byg/blockstates/lament_sapling.json +5b827e7cf1215e64844017aac998b645abcdbee2 assets/byg/blockstates/lament_sign.json 882a9b685f0f8137d8ef7dfee88c2199fe3f06ea assets/byg/blockstates/lament_slab.json 84c408b0e266dc3c8571d47fa62a2627859a15be assets/byg/blockstates/lament_stairs.json d6abdc6c0bab9b113e4dcaac2e18818692edca76 assets/byg/blockstates/lament_trapdoor.json +5b827e7cf1215e64844017aac998b645abcdbee2 assets/byg/blockstates/lament_wall_sign.json 6e77caae650e9b1c2ae60439cf51780ea48f8148 assets/byg/blockstates/lament_wood.json 2d64b1e97d9895e66e98faca798866a4ebaee335 assets/byg/blockstates/mahogany_bookshelf.json 718f7b42d87527834f70aa7918447aa98ca7b2a1 assets/byg/blockstates/mahogany_button.json @@ -244,9 +276,11 @@ e4d5c8d1f36b4a2a2db3a5f46f44e5d641f68d0f assets/byg/blockstates/mahogany_log.jso b98b6eaea45f5d641cbf8b9371aa4f81ff7f4f07 assets/byg/blockstates/mahogany_planks.json eb8047b6ffe533f77ea8804aed51564ba69d7b85 assets/byg/blockstates/mahogany_pressure_plate.json a5a996bdf644ffa4075527c9beaff965d19dce71 assets/byg/blockstates/mahogany_sapling.json +a16db3449dd497dd4e3f5151940b4af0bbd2c8b9 assets/byg/blockstates/mahogany_sign.json 986dfe68d719cc2529ad0d029769ab172f2c9adf assets/byg/blockstates/mahogany_slab.json 19c1800a72a941de5e8348d2badfab0d994fb74d assets/byg/blockstates/mahogany_stairs.json 0b44391beb743408a6adc0dec3e8295b67b1cf7e assets/byg/blockstates/mahogany_trapdoor.json +a16db3449dd497dd4e3f5151940b4af0bbd2c8b9 assets/byg/blockstates/mahogany_wall_sign.json 968339c9821aa2fb276e8b8939fb2358ed4d1120 assets/byg/blockstates/mahogany_wood.json 803d7b6e47598ac0b27596620c4c7a18b149b045 assets/byg/blockstates/mangrove_bookshelf.json fb877e5603e8bf1df87634856397c7253bfe3c7d assets/byg/blockstates/mangrove_button.json @@ -259,9 +293,11 @@ e315b86163ca8ebc6d226e87591d7d0347ec8144 assets/byg/blockstates/mangrove_log.jso 76007e43389833ec5a4f3d8bdd6e61aeec5f7d4c assets/byg/blockstates/mangrove_planks.json b11bb0f54a42d1e98910783e570b3bedf82a0477 assets/byg/blockstates/mangrove_pressure_plate.json a40ff5007072afce4cf01e007b8b248c64ca2b0e assets/byg/blockstates/mangrove_sapling.json +69529951e48e9ef87deda9b72b4b85c3a9ab8d98 assets/byg/blockstates/mangrove_sign.json b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.json 91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json 2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json +69529951e48e9ef87deda9b72b4b85c3a9ab8d98 assets/byg/blockstates/mangrove_wall_sign.json ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json bfae166b196aba9ceccf9af2cca32824b97c2a60 assets/byg/blockstates/maple_bookshelf.json c597a3580215e9b8811f71a57d44377ecb43d83f assets/byg/blockstates/maple_button.json @@ -274,9 +310,11 @@ c3b35776049ce2fd2b71aa137ddcbc338c512963 assets/byg/blockstates/maple_leaves.jso aab324e83e940721a756037cfd1ff30f104a962d assets/byg/blockstates/maple_planks.json 0f863550d93d116773107a054f6e03f6931c9846 assets/byg/blockstates/maple_pressure_plate.json cc26d57d0ebd2685146d15ca9b5cd2f19b2055a9 assets/byg/blockstates/maple_sapling.json +2031c6fc8d816cfae216c3d4ebeb6a15876097f2 assets/byg/blockstates/maple_sign.json 68f4969779462c493e37a2266227bca049cf47d4 assets/byg/blockstates/maple_slab.json a520d2347347d6afc506223042acb65cd879b219 assets/byg/blockstates/maple_stairs.json eeb76e6475d6f81224729eafd69d73390c5218b6 assets/byg/blockstates/maple_trapdoor.json +2031c6fc8d816cfae216c3d4ebeb6a15876097f2 assets/byg/blockstates/maple_wall_sign.json bc0abb64cb9f89b4cbd46a7c8f3b9e3c8363a181 assets/byg/blockstates/maple_wood.json e3c8c0da0697aaebb9f76d2618f106fe69dddf5b assets/byg/blockstates/nightshade_bookshelf.json f980fdf26bf1bacc6e836f8d88c7da0887d25666 assets/byg/blockstates/nightshade_button.json @@ -289,9 +327,11 @@ fbf2ee152cf1a40dbfffefb8e676548844926035 assets/byg/blockstates/nightshade_fence f72d36bbef65070cb6c98c4581ffe71fb6cc594c assets/byg/blockstates/nightshade_planks.json edee3a910e024b1e32df182a6e9e8a7524fd19bf assets/byg/blockstates/nightshade_pressure_plate.json 8c538dc83d44a1a26e181c80770aa785284b8cc5 assets/byg/blockstates/nightshade_sapling.json +96d9c67c2dbfec4947e5f9e69ee4caa4b046ae61 assets/byg/blockstates/nightshade_sign.json b9fd1936b96d5fbae7648f89780c3a15b5bee37a assets/byg/blockstates/nightshade_slab.json 375d07dc3e9003cbd2d120852273f5a3195d859b assets/byg/blockstates/nightshade_stairs.json 9e49ef504ee4f33a01be932dd3b4018e2351dfbc assets/byg/blockstates/nightshade_trapdoor.json +96d9c67c2dbfec4947e5f9e69ee4caa4b046ae61 assets/byg/blockstates/nightshade_wall_sign.json 24a7287b9b433eb0474fc44c2f83c33855c36202 assets/byg/blockstates/nightshade_wood.json f0a003b2821eb17ac9cf27388185f531cefe7653 assets/byg/blockstates/palm_bookshelf.json 3466ff62b97c684f6d8ff7abe5a8a3d96b429a90 assets/byg/blockstates/palm_button.json @@ -304,9 +344,11 @@ d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json 298d4def743ce4e5ce7c003a7b49c0f7330303ea assets/byg/blockstates/palm_planks.json 45478de6055e297c3e7c48cea64ed01c7d467bda assets/byg/blockstates/palm_pressure_plate.json 41da9cc7e22e224aad2c6e70289dcc24cd118dc6 assets/byg/blockstates/palm_sapling.json +ec93fdf2a59b225ba0aad8d99e264559a594aa17 assets/byg/blockstates/palm_sign.json 924d7256dc908c9220adb0dccb093c6139706005 assets/byg/blockstates/palm_slab.json 7ea376d4c1145b038ecc0ca79323c3f058b761a6 assets/byg/blockstates/palm_stairs.json 6b58b359208df4fcf6bca915b553ff5651edcf74 assets/byg/blockstates/palm_trapdoor.json +ec93fdf2a59b225ba0aad8d99e264559a594aa17 assets/byg/blockstates/palm_wall_sign.json c457911d73a2555da1376d374044c87d794f090c assets/byg/blockstates/palm_wood.json 8842cf1eb81bdc4638df8c043ddc03a9f58fec74 assets/byg/blockstates/pine_bookshelf.json 94f66dd2c294da9bf5b9ba4887501310cef618fd assets/byg/blockstates/pine_button.json @@ -319,9 +361,11 @@ bb6d184c956d8c07badb71813d6f932b7708f04c assets/byg/blockstates/pine_fence_gate. 36fda5cab1cf57cdbacd3a6bd5600737423406d2 assets/byg/blockstates/pine_planks.json cd69f0063fff124a2c723fe08c3c43503189f5ae assets/byg/blockstates/pine_pressure_plate.json 449927b5a2fd20b5de00ba9e0f539b2765efba7f assets/byg/blockstates/pine_sapling.json +0c3027e34e74fcbbb1d15dc1bce7eec82be1bba5 assets/byg/blockstates/pine_sign.json dea74144da93023c2b52f18f04904bf25bcd9a56 assets/byg/blockstates/pine_slab.json ccf77c708569ce44463425705f001bef06ea6306 assets/byg/blockstates/pine_stairs.json ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.json +0c3027e34e74fcbbb1d15dc1bce7eec82be1bba5 assets/byg/blockstates/pine_wall_sign.json 5cb8488fa26b7fe8a2bec41747add021dc4153e1 assets/byg/blockstates/pine_wood.json 6d44086ea85724b1f3b307509568cebfba0b2040 assets/byg/blockstates/potted_aspen_sapling.json 0608c01318344276c9d61e98f34cac6069ec0652 assets/byg/blockstates/potted_baobab_sapling.json @@ -362,9 +406,11 @@ f111f72f65a41f1219579ccb1dcea215699d58c3 assets/byg/blockstates/rainbow_eucalypt e9688fc58b13569be30059f78d95e589b9151816 assets/byg/blockstates/rainbow_eucalyptus_planks.json ac5373ec55bd933e36e266efbb58e02ed3583b67 assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json 9c697302648e720e473bc3b1b766552e311dfda8 assets/byg/blockstates/rainbow_eucalyptus_sapling.json +daa4d39fa206f5ec3b21ae53357ad966b52796bd assets/byg/blockstates/rainbow_eucalyptus_sign.json bf9934aef9c14b76e2f73375c9735e0011a7013c assets/byg/blockstates/rainbow_eucalyptus_slab.json c98058ed16baf212aeb74011e71b3cef0eaeeee9 assets/byg/blockstates/rainbow_eucalyptus_stairs.json 647930adaef9dbf7ef55d592cc201a282788c3f4 assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json +daa4d39fa206f5ec3b21ae53357ad966b52796bd assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json 899c56bb15a21a98c1aa2ae7abcc97c0caa1bcff assets/byg/blockstates/rainbow_eucalyptus_wood.json aba79cac4c0de1e15ae9e6bbbbf9fd0cdd240e5d assets/byg/blockstates/redwood_bookshelf.json 4d4d22dc817363aad9a26dff8e6a2c02ef18fe0d assets/byg/blockstates/redwood_button.json @@ -377,9 +423,11 @@ d6e5a8a76f5276b9441e00abb8abff6e46d1801e assets/byg/blockstates/redwood_log.json 2c6bd5b2389f7251549833beca587abc49b48806 assets/byg/blockstates/redwood_planks.json 1397d911f77fbcde93d184699828162ab5944e06 assets/byg/blockstates/redwood_pressure_plate.json a99e0b739010290bb7c3d10e39ae0a0768a8b357 assets/byg/blockstates/redwood_sapling.json +6f9b80767adcb82c055d7503b156617a5b21ac79 assets/byg/blockstates/redwood_sign.json 5b3c32baab17ce65c6788c558176ee12f5e0c6a3 assets/byg/blockstates/redwood_slab.json aa37e62134eeb2ec5ddd1e6d1d11a7d45c9f2ebe assets/byg/blockstates/redwood_stairs.json 4a93cd3f90e44278c2e51d38cc981b76c33e6fa8 assets/byg/blockstates/redwood_trapdoor.json +6f9b80767adcb82c055d7503b156617a5b21ac79 assets/byg/blockstates/redwood_wall_sign.json 08db9f7765cc53b997727d649f366dc944063c7f assets/byg/blockstates/redwood_wood.json 30713b51911af7f67076436fdd6eaa8bbece276d assets/byg/blockstates/skyris_bookshelf.json 41aa2aafd48099b387e57c16c883d62c1f2daf00 assets/byg/blockstates/skyris_button.json @@ -392,9 +440,11 @@ f050210d50e92bc9811effa4462ddbd172c25271 assets/byg/blockstates/skyris_leaves.js 5eb0fe99714ea86fa7978eaeddb7e114c882e3a5 assets/byg/blockstates/skyris_planks.json ecd63b24ebd68cb6863a041706cf7a4bad2aa05a assets/byg/blockstates/skyris_pressure_plate.json 2d1ef6f38249d92c85b8fa742278d8ea10fe7745 assets/byg/blockstates/skyris_sapling.json +167996801f5018cfb14e6e81f058d6d95b7c0388 assets/byg/blockstates/skyris_sign.json d411e2607812059c5eb953d63350964b2d801ee9 assets/byg/blockstates/skyris_slab.json cda48ff780127d33e6f01361dfeaca39f9327c1c assets/byg/blockstates/skyris_stairs.json 8338eb33a93eb376972c6ac3f2724c31557f9642 assets/byg/blockstates/skyris_trapdoor.json +167996801f5018cfb14e6e81f058d6d95b7c0388 assets/byg/blockstates/skyris_wall_sign.json 8d06785c16fdd81cc415980ca7310391c0d50ac3 assets/byg/blockstates/skyris_wood.json 6566cf7f92aadb61d379dbcaef0473851bf3909e assets/byg/blockstates/stripped_aspen_log.json b7cef1857889d35956251b732f6dc286b30b7259 assets/byg/blockstates/stripped_aspen_wood.json @@ -462,10 +512,12 @@ b4364d5ed940dc2ccc356e1753798e6542571df2 assets/byg/blockstates/sythian_door.jso de4dd8b35a7d719f20a31186435ceca02e3dd985 assets/byg/blockstates/sythian_hyphae.json b6de4593dc9024b5729953b6f36e409b173e7160 assets/byg/blockstates/sythian_planks.json bddf7dc4d22f2f0b62a92f4c63615968304235fa assets/byg/blockstates/sythian_pressure_plate.json +539feaf1f39f058dbb0c3e364aca3a47651e7b77 assets/byg/blockstates/sythian_sign.json 4f74b31c3cdc195042788613e580a99c6b17c8f6 assets/byg/blockstates/sythian_slab.json 00e5d541748d124159bba40363aa2ffe5a28c69b assets/byg/blockstates/sythian_stairs.json 890058f1798aff0661b951fdc29caba6ab6ce770 assets/byg/blockstates/sythian_stem.json 2ecd05f365d0eb361931753cc3ab3e563fef9029 assets/byg/blockstates/sythian_trapdoor.json +539feaf1f39f058dbb0c3e364aca3a47651e7b77 assets/byg/blockstates/sythian_wall_sign.json 9459f29313e8a25885dd915b223e14356b4fa1c2 assets/byg/blockstates/sythian_wart_block.json cfabafc13af51dd19cbb65e84db364d9f4784baa assets/byg/blockstates/willow_bookshelf.json 5c55fa6f5f1a648ceed10158984177b3cbfa5c58 assets/byg/blockstates/willow_button.json @@ -478,9 +530,11 @@ f4db1abd6f31aef65b621d8353ed382bb0cc240c assets/byg/blockstates/willow_log.json 83b169d650b6222eb942543fe1140e309a6a08c2 assets/byg/blockstates/willow_planks.json f10243db6a3ed19ef8791f010ad836735c28daac assets/byg/blockstates/willow_pressure_plate.json 2e58bfb5cca5b81c82875592e3778fc715b25546 assets/byg/blockstates/willow_sapling.json +c89812d4f86cabae7509a383161a6126c36dd6dc assets/byg/blockstates/willow_sign.json 979ec1504964051252f99e14fcab62c19bcd3db0 assets/byg/blockstates/willow_slab.json dfe04810897e0afdb5c84f07c5dbad37fbec7141 assets/byg/blockstates/willow_stairs.json 378999d9ab09119c17126bf03907cbc361c87fc8 assets/byg/blockstates/willow_trapdoor.json +c89812d4f86cabae7509a383161a6126c36dd6dc assets/byg/blockstates/willow_wall_sign.json 13fc391fbc63c88a79d83d37b06348c8fcec9e69 assets/byg/blockstates/willow_wood.json d219633b047d88b81c11fd0bf76ca92aa89a9936 assets/byg/blockstates/witch_hazel_bookshelf.json 54ea91ad393144ad0f4a79fb39de301d2462ac90 assets/byg/blockstates/witch_hazel_button.json @@ -493,9 +547,11 @@ aed2ce6d2c25fda5c82aadb93b9574053eb874fc assets/byg/blockstates/witch_hazel_fenc c7d6b38c5e613ec2936a6ccd51f1f81d6693ad69 assets/byg/blockstates/witch_hazel_planks.json 37205d5de01417cbbeceb6e3364ee14d143267df assets/byg/blockstates/witch_hazel_pressure_plate.json 651f517493b10ec2e796303f99abb2ecdef9c4d0 assets/byg/blockstates/witch_hazel_sapling.json +9258db47ea549f48335c74b505f97d6c1b5f1417 assets/byg/blockstates/witch_hazel_sign.json 265e86b316bfea772301ea174c7e3cd253674bd3 assets/byg/blockstates/witch_hazel_slab.json 949b1d15d430b84552aae30bc6ec1ae800220eb0 assets/byg/blockstates/witch_hazel_stairs.json 70cb0a4b54d7fe54052466a0fea2cf50f9016888 assets/byg/blockstates/witch_hazel_trapdoor.json +9258db47ea549f48335c74b505f97d6c1b5f1417 assets/byg/blockstates/witch_hazel_wall_sign.json 815d1018df138deb48666990fef1f246f1dfd982 assets/byg/blockstates/witch_hazel_wood.json 1ba4b9692641d0f04cfe61192c49a03bc9163007 assets/byg/blockstates/zelkova_bookshelf.json c91e56660a8d88a0eb5047e7eb7ac7d0a04bf8ec assets/byg/blockstates/zelkova_button.json @@ -508,11 +564,13 @@ c647568c770c350b9b87be7aece3cdd2117c2bb8 assets/byg/blockstates/zelkova_fence_ga 289b98bffc2185a5e2928394722ba95c9c3e4bb1 assets/byg/blockstates/zelkova_planks.json 85b2f81280239d4da5798b0449ea92512b4ae72e assets/byg/blockstates/zelkova_pressure_plate.json 5666a379ce4aaff7b94b148430676c3ae6833bac assets/byg/blockstates/zelkova_sapling.json +45164705009ca89bf035db9b095fe29dd81baaa4 assets/byg/blockstates/zelkova_sign.json 4e31b34369aec5063a3feb692205a40df794d494 assets/byg/blockstates/zelkova_slab.json 16b0cf6c437d96d9f67f8b52bfd18bb3052b8774 assets/byg/blockstates/zelkova_stairs.json b8531f52886d3c3d253a11ec632b055756bcdbed assets/byg/blockstates/zelkova_trapdoor.json +45164705009ca89bf035db9b095fe29dd81baaa4 assets/byg/blockstates/zelkova_wall_sign.json e6d361ed053df5b3512c7c74713f504e4a7143d6 assets/byg/blockstates/zelkova_wood.json -ec09cfbedfcb2786edbeee4155d31cacae87d2fb assets/byg/lang/en_us.json +dd11b7a4c7529c04b4f35d8c4701c236fb3dbbdd assets/byg/lang/en_us.json cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json 473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json @@ -530,13 +588,14 @@ b400d8113db2ef9fe9b7c918b964da9607fbffd5 assets/byg/models/block/aspen/door_bott daf50a260453b66485cc77994c2bb6812d7e1e0f assets/byg/models/block/aspen/fence_inv.json 69dc1fbecb1981deb8e3780ddf4f7f802176340d assets/byg/models/block/aspen/fence_post.json 6bcb97531d915bed45b5232f401ef2d106b05c57 assets/byg/models/block/aspen/grower_item.json -ee08f30cf4c4531f14782e40f3923425e6ca7933 assets/byg/models/block/aspen/leaves.json +58ff0d74f86f7a9ec892702d7d90844f65bb9914 assets/byg/models/block/aspen/leaves.json a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen/leaves_snowy.json 7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen/log.json 09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen/planks.json dadfe8c4f130588035bf982d0529b720a3666785 assets/byg/models/block/aspen/potted_grower_item.json 5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen/pressure_plate.json 1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen/pressure_plate_down.json +ab495d559843fb488806c6ab21a958a8b0e0eaeb assets/byg/models/block/aspen/sign.json c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen/slab.json 8b9b48288da793a220e7cf839a7e0af136c92b16 assets/byg/models/block/aspen/slab_top.json ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen/stairs.json @@ -565,13 +624,14 @@ f29f2504f0dd6d6cdcf0c4a660ea2943cba748b3 assets/byg/models/block/baobab/fence_ga 34529c51b201e26a237210ee7dfe86902b7c3b60 assets/byg/models/block/baobab/fence_inv.json df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab/fence_post.json 09c4fb1513ee3f51064da761c3706a1bc7f54c65 assets/byg/models/block/baobab/grower_item.json -4c154d63eb511ab0da68ce19bbc88bc0a82808f8 assets/byg/models/block/baobab/leaves.json +6baf7b52a3a7edea00f4a9a5c029774395ad3e5d assets/byg/models/block/baobab/leaves.json 224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab/leaves_snowy.json 3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab/log.json 1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab/planks.json 25c7e85de91eedf28df42c98b94058db872fe431 assets/byg/models/block/baobab/potted_grower_item.json 548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab/pressure_plate.json f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure_plate_down.json +e11147a329200d4fdbc7991a421e5470658f9082 assets/byg/models/block/baobab/sign.json 84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab/slab.json 095d0b898c8418b3fd79da96cd9a60aef7b72234 assets/byg/models/block/baobab/slab_top.json 17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab/stairs.json @@ -600,13 +660,14 @@ add286acac4cd6e672144ca2bc0053b65226e980 assets/byg/models/block/blue_enchanted/ de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted/fence_inv.json 77b409997fe27d49c4942575e6a751dd1b15c17f assets/byg/models/block/blue_enchanted/fence_post.json 6690be3be333d7427f15a4124d2a9020118ab5d7 assets/byg/models/block/blue_enchanted/grower_item.json -6f20986996d0fd8e995a1895e0d95303f967c29f assets/byg/models/block/blue_enchanted/leaves.json +d3e6b9fc58a7562b8862fd464ef8bc30b2eb5c9d assets/byg/models/block/blue_enchanted/leaves.json 30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted/leaves_snowy.json fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted/log.json 39bc57ba19dd532abe0120d034cada631a59fd16 assets/byg/models/block/blue_enchanted/planks.json 73ff477c320ba07ae01907fc1e8996b8b9837fd0 assets/byg/models/block/blue_enchanted/potted_grower_item.json f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted/pressure_plate.json ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted/pressure_plate_down.json +4ad560b13aa5fa011328fde8fbaee57d6366c2cd assets/byg/models/block/blue_enchanted/sign.json 35e14c8e67a4d0722c5fec599160118c768fd6a0 assets/byg/models/block/blue_enchanted/slab.json bb861cc6424f39c44f08c291dce0119836f8a514 assets/byg/models/block/blue_enchanted/slab_top.json eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/stairs.json @@ -640,6 +701,7 @@ d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis/planks.j 095b3bbaa99b23f250277bc8163deaf08e986073 assets/byg/models/block/bulbis/potted_grower_item.json 25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis/pressure_plate.json eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis/pressure_plate_down.json +f93e6bb75898c5ed8d05e2b663226dafc839ba28 assets/byg/models/block/bulbis/sign.json 6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis/slab.json 3c49ab33b91ebcfaa455a5e479c1e79c3cdea16e assets/byg/models/block/bulbis/slab_top.json fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis/stairs.json @@ -671,6 +733,7 @@ d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry/fence_po bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry/planks.json c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry/pressure_plate.json f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry/pressure_plate_down.json +3b1cc1a88ebcf3671485ca04a7708df0fed714a0 assets/byg/models/block/cherry/sign.json e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry/slab.json 1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry/slab_top.json fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry/stairs.json @@ -699,13 +762,14 @@ b6db2e0e1e73401133becbab9a099746eb06a770 assets/byg/models/block/cika/fence_gate 86560ee5e158e108cd114e82aa3073740cf248e0 assets/byg/models/block/cika/fence_inv.json 5c50c602c71dd100a41b371b4a0190e3ad6bed88 assets/byg/models/block/cika/fence_post.json d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika/grower_item.json -8273bf0ac526eaeb06f93fa20811b5b0f9b8d40c assets/byg/models/block/cika/leaves.json +2a5ef0bdbea43de8c39fda420472c3b2bb441acd assets/byg/models/block/cika/leaves.json 7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika/leaves_snowy.json 96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika/log.json c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika/planks.json f9969b50b902b83f217c26cc6d598a9be6fa3f1e assets/byg/models/block/cika/potted_grower_item.json f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika/pressure_plate.json 2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika/pressure_plate_down.json +70843d0315b04bc53509cf1542ade6a75f243bdd assets/byg/models/block/cika/sign.json ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json 667387df6f1056509f112ba271b9d014d10c29b4 assets/byg/models/block/cika/slab_top.json 869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika/stairs.json @@ -734,13 +798,14 @@ e6d14fb5066fed64c9541963dd7b70f66d784a59 assets/byg/models/block/cypress/fence_g 8faa1548a6315cf7c78f80e4e741dfa12c3969fd assets/byg/models/block/cypress/fence_inv.json 75e33321d34e2e787c45200c9bd38feaefe66618 assets/byg/models/block/cypress/fence_post.json a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress/grower_item.json -90deed53c54c2be689e626becf9e83283acc806f assets/byg/models/block/cypress/leaves.json +2098b8c2c22c987ff3c412ff686ade37794f58c4 assets/byg/models/block/cypress/leaves.json 8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress/leaves_snowy.json dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress/log.json c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress/planks.json 6e3933af5cf41f1f4a952255223870166955611d assets/byg/models/block/cypress/potted_grower_item.json c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress/pressure_plate.json 9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress/pressure_plate_down.json +74eb38e0002c14a550aa5598f136a498540aa38b assets/byg/models/block/cypress/sign.json 0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress/slab.json 55a7d16cc6ce2440632aba1f5c6d49c35e9a4da5 assets/byg/models/block/cypress/slab_top.json b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress/stairs.json @@ -769,13 +834,14 @@ ebb92b99029121c1a7b6228088d7aec2c0e9ab5b assets/byg/models/block/ebony/door_top. 2aa0fd88c46608d1892fd02d8cc2a15eafb0a54c assets/byg/models/block/ebony/fence_inv.json b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony/fence_post.json 60ec91c07896435780b7cd33fd6da69670198f8d assets/byg/models/block/ebony/grower_item.json -2bc5e8035e080a279e7169b2d7f293f61c727841 assets/byg/models/block/ebony/leaves.json +40f74d77bce5d7a83bb9e2dc3c410c2e0df425fc assets/byg/models/block/ebony/leaves.json 5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony/leaves_snowy.json 9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony/log.json 2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony/planks.json 771c45b117070ef0ad06fe85cc1d7fff42dafd0d assets/byg/models/block/ebony/potted_grower_item.json 0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony/pressure_plate.json a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_plate_down.json +c66713495ba79ba44365f4f325c7dc16c8fc8bf7 assets/byg/models/block/ebony/sign.json 607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony/slab.json 871149a9d367aa279b5bc4f44fe9dccb20d51c06 assets/byg/models/block/ebony/slab_top.json 9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony/stairs.json @@ -809,6 +875,7 @@ a321195a5cab309c682469d5345cda230e1e52dc assets/byg/models/block/embur/planks.js 027caaea2c48b4f92d84a9bf64e0a61aa24ddde3 assets/byg/models/block/embur/potted_grower_item.json 0ecfebb6a60ddec2417b671dcec162b7f57b2b07 assets/byg/models/block/embur/pressure_plate.json e0c9a248f41c021407657c2be36ff0179e4b4b9a assets/byg/models/block/embur/pressure_plate_down.json +181e010a9d6b013f18dea2a4131b77bf2afd9492 assets/byg/models/block/embur/sign.json 4dd00cdbfe34d61a74070a1f488f6db897e77c2b assets/byg/models/block/embur/slab.json 84b5d1beee1d2e9bcc4f55ade9bb061297b1994a assets/byg/models/block/embur/slab_top.json 9c2c2b2d0e43407e9d0d87a1a6ec74ca2a6b60bb assets/byg/models/block/embur/stairs.json @@ -837,13 +904,14 @@ d7c54d30e4e5f228fda2ddeaa1838168efdc62af assets/byg/models/block/ether/fence_gat 62123d87b9413e6d74a6ee0f21c23d17e9ae8d3a assets/byg/models/block/ether/fence_inv.json 5236d278388cdfba1dbd51103d1f55b06237ff45 assets/byg/models/block/ether/fence_post.json d43d280f877072e7d0de89b4323db0f02f9d8de6 assets/byg/models/block/ether/grower_item.json -49d19b54b900aa4bf5626d78e8462e73187d3573 assets/byg/models/block/ether/leaves.json +391b9427289c98a335721472192b0b0b69891589 assets/byg/models/block/ether/leaves.json 3def3de859e8d73aeb8e38cf17614f1d9b9ed8c8 assets/byg/models/block/ether/leaves_snowy.json 333f0cac0b8fd9f6e1f2157bad1ad1188bb27906 assets/byg/models/block/ether/log.json 236e28fced889460da9920b94396337ee98a61e2 assets/byg/models/block/ether/planks.json bd3fc47a8311ed0fe1f7ac373f87065a7cb85eda assets/byg/models/block/ether/potted_grower_item.json ebc12a0a9686c90e3739bd23d96c05fe4a906eae assets/byg/models/block/ether/pressure_plate.json b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_plate_down.json +66958ef20c8b76748e5b39a014cd682091505999 assets/byg/models/block/ether/sign.json 4dea4efd0c474f8d542ff0e97d7e74455e9ed0fe assets/byg/models/block/ether/slab.json 4bcb19b6c5b3b28f3ae1cf2ef4727c5d76b904f6 assets/byg/models/block/ether/slab_top.json 3b042a717fb7d7d77fcf6aaef5995f32eff724e1 assets/byg/models/block/ether/stairs.json @@ -872,13 +940,14 @@ b9170c724f5f0572b4e33bbe0fc9feea87dd3ec6 assets/byg/models/block/fir/fence_gate_ 13fdf8f8762038e8ee7e55e80a9c2dd5c1154e31 assets/byg/models/block/fir/fence_inv.json 3ca339e31fcc65647a22848e138086c4b3b2b1d0 assets/byg/models/block/fir/fence_post.json b2a3d94c89f75f7424bd07e98d268239d03341c8 assets/byg/models/block/fir/grower_item.json -c4c6d480cfc95341506916c3f4835bfb01ba25f5 assets/byg/models/block/fir/leaves.json +dde3c6590778f6320a16229fae9181d2fdb84132 assets/byg/models/block/fir/leaves.json 9288d58312649629be6a87adf22d9774d5460cef assets/byg/models/block/fir/leaves_snowy.json 033464821424a67f8ee0621159616df389d343be assets/byg/models/block/fir/log.json 43840c4c9e7dd4430d9a7af358826b7fd01d1748 assets/byg/models/block/fir/planks.json 672b3fbbfd03d4e7005af4658fc10c89037b8979 assets/byg/models/block/fir/potted_grower_item.json 3d19719c8bf30a354941f8913542ea943bb712a3 assets/byg/models/block/fir/pressure_plate.json 047484e298e9f14ba276fae5dbe602d0333c29df assets/byg/models/block/fir/pressure_plate_down.json +14b8b6c85774cb61e96c738f6fe61179a29f14c4 assets/byg/models/block/fir/sign.json abed894765b64afc6e9139c64a4f9c938350e8a1 assets/byg/models/block/fir/slab.json 934ae08917776b8c02af61846307a6ea5cb5b34e assets/byg/models/block/fir/slab_top.json 69d1df741a76c57d97eff7c77d333bcbf4a872ad assets/byg/models/block/fir/stairs.json @@ -907,13 +976,14 @@ dd7e8b14a8dce40381305730bd2ad57adbdb1a84 assets/byg/models/block/green_enchanted 0db91ff3da46fc1c44f1ca0541fb77cd30c52f8e assets/byg/models/block/green_enchanted/fence_inv.json c83a741fa92ce99e49e11568f3d4b687f01d48d2 assets/byg/models/block/green_enchanted/fence_post.json 25d66c39f80e8b9aa30c632e14907bb4ca859bac assets/byg/models/block/green_enchanted/grower_item.json -ea1a5f701b6700c4b09ea0eb117d15968a8997b6 assets/byg/models/block/green_enchanted/leaves.json +146ee796dfa5c7c0e514fbad16e46fa23dcaa1b8 assets/byg/models/block/green_enchanted/leaves.json eeb54b895bd56056a8560a853c7fd2b8ddedfa97 assets/byg/models/block/green_enchanted/leaves_snowy.json eea2c5a58d034a68c04ab97323f15265dd1a26a0 assets/byg/models/block/green_enchanted/log.json a08a63cf2eb65db51a67bcb4697845789876d9be assets/byg/models/block/green_enchanted/planks.json 10ec4f71065a0497784e7b68a6c280574a4b4334 assets/byg/models/block/green_enchanted/potted_grower_item.json 19e1280be2ea5be08fd4e2eaa1edb094428d0e5b assets/byg/models/block/green_enchanted/pressure_plate.json 1acc016884ce274e82fa55ef2a4ba713648c51f0 assets/byg/models/block/green_enchanted/pressure_plate_down.json +d8103f421b60c9cf489183590e17ffe56f5d93f0 assets/byg/models/block/green_enchanted/sign.json 88134b54294516c1f9d108d22da8d63e9776304b assets/byg/models/block/green_enchanted/slab.json f2343edc3dc92d2d0101eb709c877e190128588e assets/byg/models/block/green_enchanted/slab_top.json 09003ed5b44621cb46ceede1b10cdcd74e037391 assets/byg/models/block/green_enchanted/stairs.json @@ -942,13 +1012,14 @@ b8eb8293ff29d6064bbc9c9a9e523bfd80b91eed assets/byg/models/block/holly/fence_gat 96d2e210c6216c92ac87b256bad74d459961da29 assets/byg/models/block/holly/fence_inv.json d8ade96134e0921470b4618d76fea2173d31298e assets/byg/models/block/holly/fence_post.json 99894c65f6fd2fc263ac67690a9c9f84b53435ed assets/byg/models/block/holly/grower_item.json -98d4fa4cbf9039fd02fd17ef2253a55749c8d35c assets/byg/models/block/holly/leaves.json +e51a12821cfd585ad2e6fe537e10c84c26433b68 assets/byg/models/block/holly/leaves.json 04c1b89a1a709a4dce455f5a0048a6b6e3cc7473 assets/byg/models/block/holly/leaves_snowy.json 563ef1dc3e7db69a8b854d0dcafe8c5b34518433 assets/byg/models/block/holly/log.json 6d5b9268a25046565765e78d1d9f322954a2b30f assets/byg/models/block/holly/planks.json 106a3a9c35fe2ffe06e2b92238102e3e80f50eba assets/byg/models/block/holly/potted_grower_item.json e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_plate.json 628a888a542382f0145454de9575b9395ad7b366 assets/byg/models/block/holly/pressure_plate_down.json +31aacaabf2ad81a1e8f2ba1834ebcbc785cec55a assets/byg/models/block/holly/sign.json 4980db3734e72d9ece421d5e4d4ce7941a1b9d3f assets/byg/models/block/holly/slab.json 6851b00bf067998abfcc173790774c7704fbd34d assets/byg/models/block/holly/slab_top.json 28dbba88f7fb307616f27bb4565e0f6c24702b2f assets/byg/models/block/holly/stairs.json @@ -982,6 +1053,7 @@ a695ee39ab9820e6ff3503fac4b51d120b067503 assets/byg/models/block/imparius/fence_ 89bb2a44d08c971b1e394909fd6863e63404c4e0 assets/byg/models/block/imparius/potted_grower_item.json dd857606a752b8aa6e41c50db7d4fb586c68df10 assets/byg/models/block/imparius/pressure_plate.json 1d20c1378d4491976471b0461a9decdaca735247 assets/byg/models/block/imparius/pressure_plate_down.json +1fe2e98943275613e99226018225c2cb50d0b91f assets/byg/models/block/imparius/sign.json 76f46acdb37fb5adb52b17346fa6924218347f7b assets/byg/models/block/imparius/slab.json ff9d3bbe597ebc750b74eb91d259907e02fd6bfc assets/byg/models/block/imparius/slab_top.json 4973077d48e40ccf9bd945c9aa9177d11081ea03 assets/byg/models/block/imparius/stairs.json @@ -1008,13 +1080,14 @@ b09b4433c386be6888dc028dbc622d7222019edb assets/byg/models/block/jacaranda/fence 807c238767de44c0ac9978697d4b5c0255eddbca assets/byg/models/block/jacaranda/fence_inv.json bee2e372b696a70e270aadfe484a9e343126dc99 assets/byg/models/block/jacaranda/fence_post.json a7a9c594b02e93e335b4758f9bf001b704af548e assets/byg/models/block/jacaranda/grower_item.json -279e0d97010cc0ba272fe30dbd0eb2c64b529b37 assets/byg/models/block/jacaranda/leaves.json +983166aeaf8ef8d01a802f1db7307fc754aed8d8 assets/byg/models/block/jacaranda/leaves.json 604953298d30b8d1218a1497d2e5d4c7eb58be2c assets/byg/models/block/jacaranda/leaves_snowy.json efbc1ec07bc7c38156d309dbf1f167c50aa7ceec assets/byg/models/block/jacaranda/log.json 74de0b19925ced521cd4ee6af965c88010e7ec49 assets/byg/models/block/jacaranda/planks.json 76f90f0e23d14f02c0d23819235c0838779777b0 assets/byg/models/block/jacaranda/potted_grower_item.json 818e8d63dad1cb46429bedf227d7ce87ebb3a1d2 assets/byg/models/block/jacaranda/pressure_plate.json 70c8c7438d5b90c1b75553b014b9c7d1469b2993 assets/byg/models/block/jacaranda/pressure_plate_down.json +210ff02c7b82cc40d98d85427ff767c7c2a27e8c assets/byg/models/block/jacaranda/sign.json 2553584974f85b7fe90eb32cfcc5986ebc34f137 assets/byg/models/block/jacaranda/slab.json 6349d34c42e722baf46c21be798035b9e0a27e9d assets/byg/models/block/jacaranda/slab_top.json 4b7cb7567d5ee25e4652825658e80bd5a1a4ef97 assets/byg/models/block/jacaranda/stairs.json @@ -1043,13 +1116,14 @@ f2661b99b8317238983fd14818ba5ddf791d77c0 assets/byg/models/block/lament/fence_ga 1366825497cd91fc82e38064796903c0fc4fe23f assets/byg/models/block/lament/fence_inv.json 472fa12b1b33cf0eff893564e86be63683cb4fea assets/byg/models/block/lament/fence_post.json 7c1eee34a9d91fa0f0712f17d3fd5993c166414c assets/byg/models/block/lament/grower_item.json -65c9a302c9227aaba22734e92f9c2d3e54d7f2c6 assets/byg/models/block/lament/leaves.json +73d77771675050ca15bec084ed0035f93c769568 assets/byg/models/block/lament/leaves.json 605bdb42850b35d94640e7690bc1f0ac859af9e7 assets/byg/models/block/lament/leaves_snowy.json e7c9f32b6952228883bad79854258bce7ac028eb assets/byg/models/block/lament/log.json f4ef8ef7e4e18418fb5161bb4cea15dfb6b8e7fb assets/byg/models/block/lament/planks.json 659391a4fe0672feb4c74e2057f77132414905c5 assets/byg/models/block/lament/potted_grower_item.json d5d657dcf6a34415789c39abeae5bc86d41e4fa4 assets/byg/models/block/lament/pressure_plate.json 9dbd6360730f004afe0501b1652d30ea34c45141 assets/byg/models/block/lament/pressure_plate_down.json +859f61b1c3ec362623b21d6bed6429ce96522463 assets/byg/models/block/lament/sign.json e7a985f1eda2672e0d8d0d0fc21f0fd5a3885ac4 assets/byg/models/block/lament/slab.json cbcb22662b7384c1e8ac94c5a7517831c521161b assets/byg/models/block/lament/slab_top.json 29d9da05e103136f79c2821bf96f74117cdc118a assets/byg/models/block/lament/stairs.json @@ -1078,13 +1152,14 @@ d3e7af8e886b2bbeddba4341cb599090889c901d assets/byg/models/block/mahogany/fence_ 4b738d591c85fc237166262b07a8a0b07250da1f assets/byg/models/block/mahogany/fence_inv.json 6e79c75c084cd44d3b633d21b98900bd4640c184 assets/byg/models/block/mahogany/fence_post.json 2a734dbc733ebd65667011c9b3f6acbf1b1289c2 assets/byg/models/block/mahogany/grower_item.json -a8237b007f8735710657378bd07186ef0e7c6f18 assets/byg/models/block/mahogany/leaves.json +52cf187dd6f45454b2fe18eff7191a3bb6820508 assets/byg/models/block/mahogany/leaves.json a3481313f634ce373eddbe96090cc1ffff96ae37 assets/byg/models/block/mahogany/leaves_snowy.json edfd496ebaa9c5f80edcbc104b1ea54c84cbd411 assets/byg/models/block/mahogany/log.json 47789678c316d2b0d5654ad13f4dfb0be1c1918a assets/byg/models/block/mahogany/planks.json d37a9edbeeb2ef5cb1c75d395a775e0e26c06370 assets/byg/models/block/mahogany/potted_grower_item.json 13c35c96abdc967ccf24364dc7f89dd13098cf85 assets/byg/models/block/mahogany/pressure_plate.json b5123dd3ab45b2012724f8f126ad6369cc35c7a7 assets/byg/models/block/mahogany/pressure_plate_down.json +27d2d318fe84fdc380bbb019712a9097f3378bc8 assets/byg/models/block/mahogany/sign.json c31abb434e8e3a56083dbbd5e208c45dba147edc assets/byg/models/block/mahogany/slab.json f2fd0bdf26816fcd083222230742f05e92d97bed assets/byg/models/block/mahogany/slab_top.json 219d190d69f4355abf53567687cf967bd849fde8 assets/byg/models/block/mahogany/stairs.json @@ -1113,13 +1188,14 @@ b5670973fb23c48b078e8f8435936c006e279549 assets/byg/models/block/mangrove/fence_ e042b1b6d266a6545b6c6e3366f8bbfe4fe8cc6b assets/byg/models/block/mangrove/fence_inv.json 3f077aba9686176cacd47868034e6802fb8ac593 assets/byg/models/block/mangrove/fence_post.json 2c6fc03bb3465f6f26e6fc6e538957f712f51742 assets/byg/models/block/mangrove/grower_item.json -d453ef77f88fcad415c72ca906b401048a71c4cd assets/byg/models/block/mangrove/leaves.json +9b9a987c7d1e0032da6911bd647af4014b81d804 assets/byg/models/block/mangrove/leaves.json dd02ad772d32144d4c8f8008ffc2e894b76ccbed assets/byg/models/block/mangrove/leaves_snowy.json 1c8d145ddeff92246ae37f399fc4ba216e4bf494 assets/byg/models/block/mangrove/log.json e2a68cef72a8896d8ba3c921f96342a1f49deb54 assets/byg/models/block/mangrove/planks.json f2356d78e186347fc47366857c8b9d8781ab059c assets/byg/models/block/mangrove/potted_grower_item.json a12a60a9c24dfb85d193955490282a569491683e assets/byg/models/block/mangrove/pressure_plate.json ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressure_plate_down.json +f9f9163d5d0db6281eba780f2d7cd30a7b6727cd assets/byg/models/block/mangrove/sign.json 156a4fff72f2395df0d3223292374300d1a8074c assets/byg/models/block/mangrove/slab.json 9bc455c6e527549209b5b9aac6a53637a240f825 assets/byg/models/block/mangrove/slab_top.json 0380d94b824120f82f1850fe5cf50e8603ae53d1 assets/byg/models/block/mangrove/stairs.json @@ -1148,13 +1224,14 @@ e120a9497db1bc17c0a3fbbaedbc18c12e59b024 assets/byg/models/block/maple/fence_gat 7bb3b1ae140922e8938b3ec2b0fca39e45cebb11 assets/byg/models/block/maple/fence_inv.json 99982a9b085ec25ad54a5f8dc985f03bbe69acec assets/byg/models/block/maple/fence_post.json 0461bd09eef6935e23481bd039159d1d3923d942 assets/byg/models/block/maple/grower_item.json -b492ee81b256b8a9a4d032a8c16ae40cbb7a2224 assets/byg/models/block/maple/leaves.json +7ab162259aa5599ea01f747210abc294b237ade8 assets/byg/models/block/maple/leaves.json c4c4e223da10d217662ff594b0fca9baf2a26551 assets/byg/models/block/maple/leaves_snowy.json 8b45273f8b3eea9b38ff07632556508721c462ab assets/byg/models/block/maple/log.json 215961082a4a9a9eca7befadf291bd7d7bb22725 assets/byg/models/block/maple/planks.json 4197bcf5d44803d069212a99a9dd4928ee2e39f1 assets/byg/models/block/maple/potted_grower_item.json 7633afb7645857638cd8ccc415d72a9622ddb92e assets/byg/models/block/maple/pressure_plate.json e73bff44b2bce2792f4a22e8291c38affe8ed6be assets/byg/models/block/maple/pressure_plate_down.json +2a9f8f71aee0e801b53c351a89a112632535c1e1 assets/byg/models/block/maple/sign.json fea84a75b119074ee24be1c11df466025d57f4d8 assets/byg/models/block/maple/slab.json d5ae5a72a2e48f6885aa98ae05e3ec72f0a712a6 assets/byg/models/block/maple/slab_top.json e5c23cc125b3cb34edec71b8a10daccb824ab38d assets/byg/models/block/maple/stairs.json @@ -1183,13 +1260,14 @@ fb7263551534e16de22ab10e421af22be40c6d45 assets/byg/models/block/nightshade/fenc fe62516b76e37cded49a19d8e3ccbea4cd8003ff assets/byg/models/block/nightshade/fence_inv.json 25a4d8a82e4ed8268f3fa4135b268c69e15a05af assets/byg/models/block/nightshade/fence_post.json 76626693f23941197f534bcc96ca048273e108d3 assets/byg/models/block/nightshade/grower_item.json -06cbe08114a80e38b461a10b0979853f51932492 assets/byg/models/block/nightshade/leaves.json +e6cffadf9d315e517481259c55fd236efbcd245e assets/byg/models/block/nightshade/leaves.json b537b432708e27fc0f1a28c17a050207971c03aa assets/byg/models/block/nightshade/leaves_snowy.json dde8da2ffda06c74eb3ce764144336dc2b67045a assets/byg/models/block/nightshade/log.json 3af527e52937709d66b4eca1ed13879308328ad3 assets/byg/models/block/nightshade/planks.json f3ab39eab019351994bcc3eaed1e4fd1b0dde4d9 assets/byg/models/block/nightshade/potted_grower_item.json 7e370681f447552103db002a8a3680e98137b92a assets/byg/models/block/nightshade/pressure_plate.json a973b21f7c01d20f27567d54e1c58eaecff8047c assets/byg/models/block/nightshade/pressure_plate_down.json +ddbc522089f9153fb6f51fae7aa59fb735c4fc06 assets/byg/models/block/nightshade/sign.json 9837c243eeb7a2fe43d9df255d1c14a4ca533701 assets/byg/models/block/nightshade/slab.json 9b236e32f9d4d25c502ad393648fbd3f5322b91e assets/byg/models/block/nightshade/slab_top.json 565efe1282cb2fb6afd384d3426605d516b3496d assets/byg/models/block/nightshade/stairs.json @@ -1218,13 +1296,14 @@ f5c31c13dc733a6161974fcc8ef10c52e83ec858 assets/byg/models/block/palm/fence_gate 7076e4c05d75be039980ce353080b2e3aca6c6b4 assets/byg/models/block/palm/fence_inv.json a4c294d282211afdd4c2f736adfb26be1452b6bb assets/byg/models/block/palm/fence_post.json 0e5e6e614254e995dbaad57a84644bdc919eb581 assets/byg/models/block/palm/grower_item.json -fd667e5c8b18477e65519b611e8623778ab857da assets/byg/models/block/palm/leaves.json +a0270c6545d8ee19b66cd917f59e1ac41cb2258a assets/byg/models/block/palm/leaves.json 4f4933f9a710e6df9b6b92f3fc6d7de0e27fd6b5 assets/byg/models/block/palm/leaves_snowy.json 1a042fa111eede6c830941db7040a8f0793d0cc5 assets/byg/models/block/palm/log.json 87d02a07f728a1557a8c0bdc92e4cf4078ca653c assets/byg/models/block/palm/planks.json b9f580b3bbc757a5723c7e686769f21016f0a0bb assets/byg/models/block/palm/potted_grower_item.json 5c0275305fb2d94f5b203d646ff655cdb574da88 assets/byg/models/block/palm/pressure_plate.json 15e19f59603d7611419e5bf01ee7dc08bef58519 assets/byg/models/block/palm/pressure_plate_down.json +5b740e5f44ecc94c35a249752476459c38457b72 assets/byg/models/block/palm/sign.json 0705637c3f7703f7fcc3e25846da8c4a8e76877e assets/byg/models/block/palm/slab.json a450c220fb7e0a98871a0bfe4291792123cdb027 assets/byg/models/block/palm/slab_top.json b7b8e43c14a1b02612d0a08653aa2dd092031fd6 assets/byg/models/block/palm/stairs.json @@ -1253,13 +1332,14 @@ e39c5acf3419fbb329afae4559fa581769bc3dd6 assets/byg/models/block/pine/fence_gate 80a9ca9407adf3ca7aac87ebee512d494bbee27d assets/byg/models/block/pine/fence_inv.json 69ca360a8316da955ae88211a472393c96f86a98 assets/byg/models/block/pine/fence_post.json ec602439e995c63d80924644c23aa19fc81c8158 assets/byg/models/block/pine/grower_item.json -ff2051addd1684bfdeb17b77ff49b7b72201b932 assets/byg/models/block/pine/leaves.json +bd34b6f3022776ef3d75472516b9f0835c3b5603 assets/byg/models/block/pine/leaves.json a2cc2b1edc2c73dbb187da6cd99837fd395b3b2e assets/byg/models/block/pine/leaves_snowy.json 1056173174feb8e341342e7b784bde308469160c assets/byg/models/block/pine/log.json c99cab0d28edb569e7fcfbb9b56cf7a4ab51064b assets/byg/models/block/pine/planks.json cc0cdb399f2c802974c48778050a82885f8ca1f5 assets/byg/models/block/pine/potted_grower_item.json f9a1b1e75e4b5df2eb03d5398628a56ba87a4d9d assets/byg/models/block/pine/pressure_plate.json c5639b72db2422b06d8915dfd3b855a304a514e7 assets/byg/models/block/pine/pressure_plate_down.json +791429c2d0f85c0694bbbaa3658a786481cd54b9 assets/byg/models/block/pine/sign.json 85c94add76039124b8d533d863ff79031f2ea525 assets/byg/models/block/pine/slab.json 4441b7ca282312f4f1a5f0e2591c9503f70d3386 assets/byg/models/block/pine/slab_top.json 6bcb7022cf360abd33f662d10374f81ee0ead557 assets/byg/models/block/pine/stairs.json @@ -1288,13 +1368,14 @@ d4ce9dc4f614b515b82a14abd94cad7d450f241b assets/byg/models/block/rainbow_eucalyp 015cb261df5eb515c8b38dab404aed1d5d2810bf assets/byg/models/block/rainbow_eucalyptus/fence_inv.json 942bb6841d7eda5e4d9b9de7473c06fc39848d1d assets/byg/models/block/rainbow_eucalyptus/fence_post.json fdcad5fbaf61b6afb60d96aa24163af95f196a6c assets/byg/models/block/rainbow_eucalyptus/grower_item.json -3c1fa59a86d502734bb0f53b04b588842b271b3b assets/byg/models/block/rainbow_eucalyptus/leaves.json +e7c08f3941e74a9e16a3a069732b9c92f13da6ea assets/byg/models/block/rainbow_eucalyptus/leaves.json 6e44d3e23b6fe711c82aaefd8101397305e0d032 assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json 625555feb0a745ac4037afc66929885988008296 assets/byg/models/block/rainbow_eucalyptus/log.json d13948e62ac414d46208e114c84a3b223ddc1048 assets/byg/models/block/rainbow_eucalyptus/planks.json fae1765c740be6f7d833a0b8d5ba0c7a48d51f8e assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json 790b4249c297b7d8d893ba076f550b6364aaeadd assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json 3eba8300da3b54415678dc051ef495c1057f59e9 assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json +17e9a839eb43f6dd3bc8b11060114e9aaaf52b65 assets/byg/models/block/rainbow_eucalyptus/sign.json 92df78f84617c95fd91993f0689351dea799284c assets/byg/models/block/rainbow_eucalyptus/slab.json dc2d6a466adb3322f3a8e5569eb37a46841413e9 assets/byg/models/block/rainbow_eucalyptus/slab_top.json 770f556efe82f8aece831f7fea6941c217f78b25 assets/byg/models/block/rainbow_eucalyptus/stairs.json @@ -1323,13 +1404,14 @@ b9445a01055c5ef5758f6fd64463c5ac3a74c751 assets/byg/models/block/redwood/fence_g e795542472cf9752cf492bc3706572fd203356c0 assets/byg/models/block/redwood/fence_inv.json 7558b37a188383d3534b88483d565795d635038f assets/byg/models/block/redwood/fence_post.json 9c9cceb3724a609ea3b4fc4b5074ac1465a49fb9 assets/byg/models/block/redwood/grower_item.json -69d96947d604565ab2987ce540f3cf099d4a6e94 assets/byg/models/block/redwood/leaves.json +d88fbfc57bef37e1e7d9bde795d732f9149daed2 assets/byg/models/block/redwood/leaves.json 7e0a42bfeaaa27446d5a985dfbb224293ded0a10 assets/byg/models/block/redwood/leaves_snowy.json 48a3e474de1fcefb0a1a77234a95f64a502d3c0e assets/byg/models/block/redwood/log.json bb3ebb55ed613c372c05c64cdec881ad0cb74b3d assets/byg/models/block/redwood/planks.json 7adb01da371ce28348d8a49c5f4935a3cae77481 assets/byg/models/block/redwood/potted_grower_item.json 861d9dc4071f590543890ffc44588eb09106b36a assets/byg/models/block/redwood/pressure_plate.json 77da2cac360d8c6175c37a6b785493305f15c793 assets/byg/models/block/redwood/pressure_plate_down.json +254f3e95c7866c71ae44c0b62e1d4b50cdae1609 assets/byg/models/block/redwood/sign.json 15e4ffcc05ad3522c2486b1be63cf328bd3bafb5 assets/byg/models/block/redwood/slab.json e2ac3f180cac701f5754a63cd140b73a5fe152a7 assets/byg/models/block/redwood/slab_top.json 3e20d8d44b26a20ae4bf256ceb0e28b5930bbbd3 assets/byg/models/block/redwood/stairs.json @@ -1358,13 +1440,14 @@ cebd3cdb7a737aa64ebcffae46be68b539b350e0 assets/byg/models/block/skyris/fence_ga 7a74fc6f4a2b5d8959c49db3857e0c574cf2457e assets/byg/models/block/skyris/fence_inv.json d0bf673675e384988067fb2ca054b18c1bd5b13c assets/byg/models/block/skyris/fence_post.json a4ac8a8eaa8928abab08bf6f6a437cfc0d67e01d assets/byg/models/block/skyris/grower_item.json -8fb017a0da46e75f63bb9454e531a8192a6647d8 assets/byg/models/block/skyris/leaves.json +965b2a5455b43f79be311942528a37899c172291 assets/byg/models/block/skyris/leaves.json 192bb0f3e8b490e4ecd5b5f754fb005e04b0bc2f assets/byg/models/block/skyris/leaves_snowy.json bcd28d83aa6744ef566a364bb36f7bfa7376faa9 assets/byg/models/block/skyris/log.json e9ad55913d8b69f5ac6c9d5b22e8585b0b61eaa5 assets/byg/models/block/skyris/planks.json b6fed392982074dc8d55c240beb7c719c8cace75 assets/byg/models/block/skyris/potted_grower_item.json 5aa4c75ece49a325df983f690d3bb57960fdc9a2 assets/byg/models/block/skyris/pressure_plate.json 914a496841df359078acf40d0b3458393979a46d assets/byg/models/block/skyris/pressure_plate_down.json +3edef3a22b5feb4d998a0f41be6e610b3d151123 assets/byg/models/block/skyris/sign.json 16431bd21ba37faceba9182b072ba513570499d5 assets/byg/models/block/skyris/slab.json 706d04c4738ee1a466a12832ea71edf93f33c651 assets/byg/models/block/skyris/slab_top.json d3ed80f613890d5830584cc9057252980c544bee assets/byg/models/block/skyris/stairs.json @@ -1393,13 +1476,14 @@ d851529253a077698465aea91d4c5c0f543f9a6e assets/byg/models/block/sythian/fence_g 5f018cd797232f7108eaa89edaf52d87ee62d661 assets/byg/models/block/sythian/fence_inv.json c52bc83170ce1da40740286d513fde0c86f39654 assets/byg/models/block/sythian/fence_post.json 474b96982097f737c00ae889033e4acf46e35c8d assets/byg/models/block/sythian/grower_item.json -40d0cb59e096772da5f14f0492dc6238eb00ab3a assets/byg/models/block/sythian/leaves.json +e9c5d8407b2e5c7a473bbb1a916bd35cd3c43407 assets/byg/models/block/sythian/leaves.json d7487e5fb582e7d48328d29ab7977219147c4857 assets/byg/models/block/sythian/leaves_snowy.json ff337b115b474c3a8c8b4d6dc2aa8f3568e71d2e assets/byg/models/block/sythian/log.json 560cb6f859f056369ba030379dc5e887c910f832 assets/byg/models/block/sythian/planks.json 0cc3cbc787d1e3f291e648a82f6e4cd33cb8dcea assets/byg/models/block/sythian/potted_grower_item.json a2ca9f484ae49db9f5aef858a248e00adcb9fdc2 assets/byg/models/block/sythian/pressure_plate.json efcb96e91be1632af3f7d673c23ad6bb88fb8764 assets/byg/models/block/sythian/pressure_plate_down.json +c6def3e88527c9c427fbec5c5c716e82627830ba assets/byg/models/block/sythian/sign.json b32f3bb03f67f61c9b4b90e62ad6d91c7bedb139 assets/byg/models/block/sythian/slab.json 1f8825b8ed8f6534c2e6b2f2dec5570e0919acb2 assets/byg/models/block/sythian/slab_top.json d5321722d9a7b0a48a83eedbb6e47040862cb889 assets/byg/models/block/sythian/stairs.json @@ -1428,13 +1512,14 @@ ab254ed8b8ee500ea9a643152e9437864274dc08 assets/byg/models/block/willow/fence.js 10bf9b4a419147e792d4156dcd285111e8935048 assets/byg/models/block/willow/fence_inv.json 8799c88ebdb1f508f86f62b77a244e01e87a6b46 assets/byg/models/block/willow/fence_post.json 5e5afb7a3890d8f48d5e23a2c87b1188619506c8 assets/byg/models/block/willow/grower_item.json -165e84056fd00ee7b13c5227326174e28258eb19 assets/byg/models/block/willow/leaves.json +c5fb5e63e5e076a5b7a5b8f9ea524b604815a78f assets/byg/models/block/willow/leaves.json 1301c5e2999f537a044d5111e5e8a7cd7722173b assets/byg/models/block/willow/leaves_snowy.json feac0b2ff67fbfc5a7e6db13829acf57fec39f5a assets/byg/models/block/willow/log.json 9ec37312d1e64d6921417500edc74171330e4253 assets/byg/models/block/willow/planks.json 683734056c24860ada4f2e9a1a29d31772e42a3e assets/byg/models/block/willow/potted_grower_item.json a792ac13a4ff8673d6da1efbaef9502337887236 assets/byg/models/block/willow/pressure_plate.json f86b9b5f611d5a5833ab40d32752f704e75e8c61 assets/byg/models/block/willow/pressure_plate_down.json +d1ce2de46f5340589926696a51435cbc9609c3a0 assets/byg/models/block/willow/sign.json c451ec6b5682d7f358994d02b496fb2457a09207 assets/byg/models/block/willow/slab.json a8cd96ef4db07698687493aa5a643b2be51b1ced assets/byg/models/block/willow/slab_top.json 5c58b009e7b933a978784bf64e309c37020c52b2 assets/byg/models/block/willow/stairs.json @@ -1463,13 +1548,14 @@ c0e1f1335039334bf52f0e97f23e4ac133d5b74e assets/byg/models/block/witch_hazel/fen 2bc9cf3284f9c3881ebc5dd7352e2020ff12cf00 assets/byg/models/block/witch_hazel/fence_inv.json 6065975d5c2136efc85bec1ccb75651e55a9cbb8 assets/byg/models/block/witch_hazel/fence_post.json 90c0b9e7082cc7e8f34f66035f76ad78d38db60b assets/byg/models/block/witch_hazel/grower_item.json -878ae2b39bf110b29b15098c8cb201c96290e50d assets/byg/models/block/witch_hazel/leaves.json +bee9431e8675056a8eb16e64e61f0134e5c18af0 assets/byg/models/block/witch_hazel/leaves.json 63e8e8531d90ab450275f3170dfa414353a42bf4 assets/byg/models/block/witch_hazel/leaves_snowy.json 2d4d8b8a6a14cc280d4e3fe57a43657d3a52cd96 assets/byg/models/block/witch_hazel/log.json 02de0b41a02a93dafa542e2fa4764f2c66b5f8f1 assets/byg/models/block/witch_hazel/planks.json 782fc93a0a7973cf7be650f47e1d779693fb8b62 assets/byg/models/block/witch_hazel/potted_grower_item.json c313a30572d7f13e67b72e54a6ddab2c99c6acbb assets/byg/models/block/witch_hazel/pressure_plate.json 6fe041a932e5200da73db3bcbed5dff8d9ad7c6c assets/byg/models/block/witch_hazel/pressure_plate_down.json +8582afbd0845c3318b5f4c18049cc9f6863f5b21 assets/byg/models/block/witch_hazel/sign.json 0674f0ad27ac6b8a8a52909fc9bfeff01933c79c assets/byg/models/block/witch_hazel/slab.json 22d6e82975e62c5b4459ccf2d3d24e459d7a1fa3 assets/byg/models/block/witch_hazel/slab_top.json 334718206820ba5730ad12f9676df1b1eb072cfd assets/byg/models/block/witch_hazel/stairs.json @@ -1498,13 +1584,14 @@ ad1adc3e30e9b0ff25b5fe9a89b15e0f2be2f6db assets/byg/models/block/zelkova/fence_g 18c9ea64f78c53360d0a35b2e7275380c4a3ddef assets/byg/models/block/zelkova/fence_inv.json 27d92c9201e4b17e28d5cfff614059862227d776 assets/byg/models/block/zelkova/fence_post.json 2f9a2ee25192c73a00f4dce1af55688765b00e04 assets/byg/models/block/zelkova/grower_item.json -4df30cff616f6a4f6434ec669d14840634245fbc assets/byg/models/block/zelkova/leaves.json +619385594f122104d1821b0088316a371e705a9f assets/byg/models/block/zelkova/leaves.json ef5f55349ca4c1196d94c67884f0035085323a90 assets/byg/models/block/zelkova/leaves_snowy.json 63de24837aa2f58fbd5de80ee4a4e584bdfeabb5 assets/byg/models/block/zelkova/log.json aeeb64d84bd50fb58c48e64c0b921a7e83d16363 assets/byg/models/block/zelkova/planks.json 28dba0d15b0aa5547ebd0ff4563c61126767a53c assets/byg/models/block/zelkova/potted_grower_item.json a4c7aa319e522820d079bcbaf0faaea764a7f2ec assets/byg/models/block/zelkova/pressure_plate.json db7bee9ad1470f8004d6312b37558e63e1806e98 assets/byg/models/block/zelkova/pressure_plate_down.json +b7dfabb50911cfca112511020e923ee92a86615b assets/byg/models/block/zelkova/sign.json 87bc547fc289441746b4a7e4424caee026f6b5d6 assets/byg/models/block/zelkova/slab.json b4fd33232e23ed2bfaed1ebee0b8cc38dd504ad2 assets/byg/models/block/zelkova/slab_top.json 1b25f295105359b99d88f260504b9f6124e27d20 assets/byg/models/block/zelkova/stairs.json @@ -1528,6 +1615,7 @@ a2848cd275262a16626a23992a1a526914d5c364 assets/byg/models/item/aspen_crafting_t 8ccbe3930f4887d6a6f89135d2ea345fefd94ac8 assets/byg/models/item/aspen_planks.json a9afd845f4e771fb6809dc439def5ee35663016e assets/byg/models/item/aspen_pressure_plate.json 0b5ed255f00030cb3ff1df30d8c51d7b6ea9afb6 assets/byg/models/item/aspen_sapling.json +1218b125c3ec876c8d2986607718263a79a6c7b6 assets/byg/models/item/aspen_sign.json 9ce82435d1aa01ba081186b5f538a4872174885a assets/byg/models/item/aspen_slab.json 95e8459211f1b407f8d766e50791cdb84d2d3263 assets/byg/models/item/aspen_stairs.json 0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/item/aspen_trapdoor.json @@ -1544,6 +1632,7 @@ ca67915d4fd002dc7f62d0f988d8d40e77b579fc assets/byg/models/item/baobab_leaves.js 8e820316436b1e08bf280070058a83f0c9935542 assets/byg/models/item/baobab_planks.json b4d3db7e509a15c89df124667a7d6c3e5188bdf6 assets/byg/models/item/baobab_pressure_plate.json 50ba87085b69541ad42bb85171ae33cce565c83c assets/byg/models/item/baobab_sapling.json +8345df193b6280a399fa5040f64d64804102421f assets/byg/models/item/baobab_sign.json 4e836fbab8a65cf4d797008c44509f3a19d11c05 assets/byg/models/item/baobab_slab.json 86a5a2e864b31515ecca3a0ae6cc91cf21654fca assets/byg/models/item/baobab_stairs.json 1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/item/baobab_trapdoor.json @@ -1560,6 +1649,7 @@ faa99f2398307b4a01735cd99d327748658a41a4 assets/byg/models/item/blue_enchanted_l 43a9b7d1d66e10bec791a24437adb0ac3d5af35a assets/byg/models/item/blue_enchanted_planks.json f61a7bf218e65808e180608e03e5d58a2dd97954 assets/byg/models/item/blue_enchanted_pressure_plate.json df6e5276a0b04b4146d38546530cba58bce7fa75 assets/byg/models/item/blue_enchanted_sapling.json +0c45875eba27b5f8ee0fc42d1ff46dabc9198d30 assets/byg/models/item/blue_enchanted_sign.json 994145c6950682114ec3ef589b7be385b4be8869 assets/byg/models/item/blue_enchanted_slab.json 2feab092f5685c98b591642a82c08b0337b9138a assets/byg/models/item/blue_enchanted_stairs.json 39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/item/blue_enchanted_trapdoor.json @@ -1573,6 +1663,7 @@ a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf 661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json 4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json +3500de8878e264d57b6c802b3284cf1e3443f8ac assets/byg/models/item/bulbis_sign.json 9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json 55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json 52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json @@ -1588,6 +1679,7 @@ d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.js 5ca5c2026070205afd31d849c4882b94bb44d141 assets/byg/models/item/cherry_log.json ed80d846b315f4eb21aa2a4fc3a5b584ffa4107d assets/byg/models/item/cherry_planks.json 2cae4e8da59f8d5cb192c6c772200b5b61b946ec assets/byg/models/item/cherry_pressure_plate.json +f0c423dbf72eec80a5d1dd73a07af608e49a8281 assets/byg/models/item/cherry_sign.json 767d86f6a59dd9fc0c6af5a89bda1c752343858b assets/byg/models/item/cherry_slab.json 5c51b95d93aae080bb940eb3ae98743bc259bf75 assets/byg/models/item/cherry_stairs.json c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/item/cherry_trapdoor.json @@ -1604,6 +1696,7 @@ b9f6e475b63f3a86395d511576c0c8262c41fe10 assets/byg/models/item/cika_leaves.json f4a01a1c2d74b1d2780e80597f51b506693a7632 assets/byg/models/item/cika_planks.json af6cb0377220ef4d0b316926cd49c90cdf14b4fe assets/byg/models/item/cika_pressure_plate.json b1fbf364db542513285aa4a7cd55c1f4eafd96d1 assets/byg/models/item/cika_sapling.json +7c3b6dcfb2676daf2a1d9ebb61d4ef32576988dc assets/byg/models/item/cika_sign.json a6b01df5440d0b9cf7eca070fc1cb1ba1ed2883c assets/byg/models/item/cika_slab.json f2c767f3f01c2fb97a87f737df7a766d41bf3706 assets/byg/models/item/cika_stairs.json 93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/item/cika_trapdoor.json @@ -1620,6 +1713,7 @@ c64d221e2469fcc040ca492b5b9e6a37395900a5 assets/byg/models/item/cypress_bookshel 38acbdb182d2cac8f5a799ea9e1709814b0ffaab assets/byg/models/item/cypress_planks.json 461c62bae2a20c4617eb6c5a8ba4dc6d9f0f98ec assets/byg/models/item/cypress_pressure_plate.json 5b9cec5debe640c2da5fd07465f5b4744a7a0695 assets/byg/models/item/cypress_sapling.json +606801dbe2978e25308ad884f683acf32be18bb1 assets/byg/models/item/cypress_sign.json fd97e91d95ffde72791e2854c2ed8d57fc1a2a05 assets/byg/models/item/cypress_slab.json 29a69284ab32d4f7358302067d7767c4599ed305 assets/byg/models/item/cypress_stairs.json beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/item/cypress_trapdoor.json @@ -1636,6 +1730,7 @@ bede82f15ab2d814bfca0c4062a7eb69790d993d assets/byg/models/item/ebony_log.json e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.json 3d72c90b1547a7dad403430ad53efb00d855174e assets/byg/models/item/ebony_pressure_plate.json 077f9c32aabcf49216b03cb5ea184b0535b856f4 assets/byg/models/item/ebony_sapling.json +46c4074d3e03091b9c13107d08d8d1d91f166d4f assets/byg/models/item/ebony_sign.json a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json 98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/item/ebony_trapdoor.json @@ -1650,6 +1745,7 @@ a0789a181dc99f7c1c69b1d5df59bb8d71b631c2 assets/byg/models/item/embur_fence.json 1ea72d91c1202c6105450188d3ae00fb5e7d11bd assets/byg/models/item/embur_pedu.json 017edeb29f425654dce2a9d685154cbb78a39c6d assets/byg/models/item/embur_planks.json 99354ff5e260dd8416cc5cb6c1c4abde2bfe1b79 assets/byg/models/item/embur_pressure_plate.json +06e1b341961539a7af7cc6d40d9a3e15c3ae572e assets/byg/models/item/embur_sign.json 28a053a792a97989455294e072af93c91dd01799 assets/byg/models/item/embur_slab.json de0fe12925ca27d70084852ac3c6ccb4c7d4ed2e assets/byg/models/item/embur_stairs.json 5f1772effcfeb533a5f44759d0bf90a26d8430bb assets/byg/models/item/embur_trapdoor.json @@ -1665,6 +1761,7 @@ d3b25f93ce5afebe19090c439b042f68a903d1f0 assets/byg/models/item/ether_fence_gate f2694503a9059e64da730806ba63d1fa4f4cfbe1 assets/byg/models/item/ether_planks.json cc9ba8a7a057f3edb876b15530f6b5698a94d628 assets/byg/models/item/ether_pressure_plate.json d565b9cd6d02a2f5d0ada6f498cb3a2ecad8f2d6 assets/byg/models/item/ether_sapling.json +dc5732d78bb813e2fae84e54e4ce2f568249f57c assets/byg/models/item/ether_sign.json dc795894c62ad433cebfcbf9591d9c9545a9925a assets/byg/models/item/ether_slab.json f7a7ea114db3b06c36b122e4c860ac10804945ff assets/byg/models/item/ether_stairs.json 989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/item/ether_trapdoor.json @@ -1681,6 +1778,7 @@ dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence_gate.j 062a663882fb45967220ab155328abd01f953c01 assets/byg/models/item/fir_planks.json 8639f85022556f339405fb3f0ac66a994d2b40a9 assets/byg/models/item/fir_pressure_plate.json b3ca097c89198092e4d6933879cec153a980f707 assets/byg/models/item/fir_sapling.json +48d7108c8e8f3f6d17934f10927cd99ff11822aa assets/byg/models/item/fir_sign.json 378ff5a2eb5451b027f4e9b8adfa281edf88d045 assets/byg/models/item/fir_slab.json 4fcf3d712a70e48ec98bdcf5fea15d56644fa306 assets/byg/models/item/fir_stairs.json 74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/item/fir_trapdoor.json @@ -1697,6 +1795,7 @@ d82a38272fd002efdc918a1830f365748cd49888 assets/byg/models/item/green_enchanted_ 2d3ab24ccb420052a423e89ea780b97468bb7938 assets/byg/models/item/green_enchanted_planks.json 3441740912cb1911af5b77d446703342febfc115 assets/byg/models/item/green_enchanted_pressure_plate.json ce18a380e57d37ead5cbee1628e5d255313963f5 assets/byg/models/item/green_enchanted_sapling.json +879ae80dfc4c919c8341b300e738db7069f44994 assets/byg/models/item/green_enchanted_sign.json e4ba9b69838b94276fb3fcb07c14c685bb374827 assets/byg/models/item/green_enchanted_slab.json ada026c9ece852649aacca39d70428180619426c assets/byg/models/item/green_enchanted_stairs.json cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/item/green_enchanted_trapdoor.json @@ -1713,6 +1812,7 @@ be84506996a338d85a16c7f0e2011a30a9d6b5d3 assets/byg/models/item/holly_door.json e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.json 49410ad86799caa3a32d98e271b1684e1a124122 assets/byg/models/item/holly_pressure_plate.json 5be333046661c77987e36265af74c7c54bbcf0e2 assets/byg/models/item/holly_sapling.json +5553e46e15812ddabc6c94abd3d96df4c1b53a9a assets/byg/models/item/holly_sign.json f26a75321b0865a70718812f9896b96aac1b5a3a assets/byg/models/item/holly_slab.json c59089c2f12b84d35e1bb31670eab2b343402bc3 assets/byg/models/item/holly_stairs.json e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/item/holly_trapdoor.json @@ -1727,6 +1827,7 @@ df3a47f283aa11f3cbb524c2d0efb7464bf66845 assets/byg/models/item/imparius_fence_g 3c2d52bf279e7bb74f599c9bf79f76500368ef5a assets/byg/models/item/imparius_mushroom.json b154607a7ed1eeac57e787005663d288f4a13d9d assets/byg/models/item/imparius_planks.json d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressure_plate.json +b2a82f9d890a3502b6966c3a9025ed89f10c5094 assets/byg/models/item/imparius_sign.json 510283f55fbde7b474a834f9c15980d776122460 assets/byg/models/item/imparius_slab.json 7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json 151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json @@ -1743,6 +1844,7 @@ d27aff17a3e2ce53827f5a62d78cdf2819debcbc assets/byg/models/item/jacaranda_fence_ 98793ff287bcfa5b1eea58ba52e6eb2cf89ab42b assets/byg/models/item/jacaranda_planks.json a4b891eeec337ebbcd0e3cc4e7d6bf1e6a5a0132 assets/byg/models/item/jacaranda_pressure_plate.json dcdcc07c8cbca3c5ad973cec28db6e9e7555016e assets/byg/models/item/jacaranda_sapling.json +31b887c724796bd3cec0c3f8b722c5a3bc59a934 assets/byg/models/item/jacaranda_sign.json 5cc496b7d3ea76fc11fc59b8d877c097ee4882b5 assets/byg/models/item/jacaranda_slab.json 91ae49704d5ad331330689daf0fe162f51c16a36 assets/byg/models/item/jacaranda_stairs.json 28da4bad8d1e77950a9ec786e087baf9b640a13b assets/byg/models/item/jacaranda_trapdoor.json @@ -1758,6 +1860,7 @@ ac3287839bbdeeb51a9173a4074cf543fdf23efb assets/byg/models/item/lament_fence.jso b77f8ae1ffe30e5455f6a87868cc7acc9728f70f assets/byg/models/item/lament_planks.json 6da1a2a9534d5b8b8c351e30e5d7ee7433e6a133 assets/byg/models/item/lament_pressure_plate.json 3e85dec796bfb48231ce63c17f149c30bfefbfa2 assets/byg/models/item/lament_sapling.json +c7f580d861bbf92c9f49b72bc8b8274a1b1ed64b assets/byg/models/item/lament_sign.json 2ecebcec270243c5cdb19de5b197b6ce082a5cfa assets/byg/models/item/lament_slab.json 74bb345d7e6ae8fffec74adebb3a4e050be6c7da assets/byg/models/item/lament_stairs.json 3cae05d0760d2dccd3f05f9fc93d51e2264fb18c assets/byg/models/item/lament_trapdoor.json @@ -1774,6 +1877,7 @@ df0559cf08d0846d1b12afac67fbfbfd5fca75df assets/byg/models/item/mahogany_craftin 1517b68ab0172d3e39d1a86464016fdb611d0850 assets/byg/models/item/mahogany_planks.json af307f8aa6295fb81982c254ce4d15503f579b95 assets/byg/models/item/mahogany_pressure_plate.json d274bb65e5894078164344c25fc85f2a7ea994a4 assets/byg/models/item/mahogany_sapling.json +f8491f398c9f64b52c17c7eda0753897a446eda5 assets/byg/models/item/mahogany_sign.json 2d1f4f1ff605d580bf5b664db434cb382ff0b848 assets/byg/models/item/mahogany_slab.json 5ef059d8995b99cdd60adb5ea46c12e3d9400baa assets/byg/models/item/mahogany_stairs.json 1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/item/mahogany_trapdoor.json @@ -1790,6 +1894,7 @@ b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves. 663b1fe6614360a2133136635de85e505363572b assets/byg/models/item/mangrove_planks.json 202d70f947d5f1361bf270a4c7653e17b48be2df assets/byg/models/item/mangrove_pressure_plate.json 2b93482c1bc6c4f91a71e7b7853b2dcd50170cc3 assets/byg/models/item/mangrove_sapling.json +8cbb365b2382be0b9bb441bf5bc18da01b8f2e57 assets/byg/models/item/mangrove_sign.json 6ae725945788d34d3471f064cf00ffe7b457fb3c assets/byg/models/item/mangrove_slab.json 9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/item/mangrove_trapdoor.json @@ -1806,6 +1911,7 @@ de1fb00c2ef5c82a95587827b77f484bb35fcb16 assets/byg/models/item/maple_fence.json 730755678662904e796b4d44afacb09a842c4ee0 assets/byg/models/item/maple_planks.json 02133c31cf8512d4ccd15d1277f2bf45754484d6 assets/byg/models/item/maple_pressure_plate.json e7486c85fd736d98c7f06c5a487dab8e2c942a83 assets/byg/models/item/maple_sapling.json +d084530f24d50d2cfdeea5745cfc34c462891797 assets/byg/models/item/maple_sign.json 5d86a101ab8baebcb9a683f6d71ef95b3a075fc4 assets/byg/models/item/maple_slab.json 4dc6e718612425205a9afefdf089d4440612a6cc assets/byg/models/item/maple_stairs.json 32d8ea1a4b9a5b95e36d4152e9a221bfd2d29c92 assets/byg/models/item/maple_trapdoor.json @@ -1821,6 +1927,7 @@ a637397faf67cda4f303e9d8086d57b15c27468d assets/byg/models/item/nightshade_leave 74c9df807cade4612961b11a1da4151972f639fd assets/byg/models/item/nightshade_planks.json 3df61b09678ab516436a0b50a8e31c408e31589c assets/byg/models/item/nightshade_pressure_plate.json f0bbb5065915d842bfe2bd87462c277218c5bc95 assets/byg/models/item/nightshade_sapling.json +be03d71c92421b83beb9a83e7a458693bf7b25a1 assets/byg/models/item/nightshade_sign.json 5b5d2e2b41c69472fb8022fa333659ad2bf28a64 assets/byg/models/item/nightshade_slab.json 1c97bc6e1ca4177ffc2efb1a505cb7db8645d30b assets/byg/models/item/nightshade_stairs.json 8794a3b3dfc7dedd2a8a3ecc39359c14023857ee assets/byg/models/item/nightshade_trapdoor.json @@ -1837,6 +1944,7 @@ dd1a1264aa8bf8d4aa600aa3beb9eaaa3ae3dcce assets/byg/models/item/palm_fence_gate. 02b33321f618cec53691f04382a3f84de5538ab5 assets/byg/models/item/palm_planks.json b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_plate.json 828ed945909c554046fa0e466626f633a9075dc1 assets/byg/models/item/palm_sapling.json +8f2fcef971226350b49b99f5726c9cde7008cafe assets/byg/models/item/palm_sign.json 3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json 2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/item/palm_trapdoor.json @@ -1853,6 +1961,7 @@ b687c999f9786e4ae51b8e99f79625f607930ccd assets/byg/models/item/pine_door.json fba9a9fd473aa9eb770970dda91e63855a5b1ccf assets/byg/models/item/pine_planks.json ead4c243f01620607f91b993be085bcebb214cf2 assets/byg/models/item/pine_pressure_plate.json 9826776657d6273054a685e72caf5bbf30725957 assets/byg/models/item/pine_sapling.json +5b2548a89184cbdce3496d2b8444a6cc61fbf36a assets/byg/models/item/pine_sign.json 94d803b73017692991f46ea0371dc099a2362580 assets/byg/models/item/pine_slab.json db6fe228afbac567186d648a6aec8262d1ee6a14 assets/byg/models/item/pine_stairs.json fe36b59918baf0e0fd54834ff95ab1babbaf9cbd assets/byg/models/item/pine_trapdoor.json @@ -1869,6 +1978,7 @@ f226d4c0634aa06076e51c4dc5844d9d39f9b1d7 assets/byg/models/item/rainbow_eucalypt 9149e920185851a997066860ffa95c6ccf0fab4b assets/byg/models/item/rainbow_eucalyptus_planks.json e845c8591c0f3300544797e09c45a5e787ded391 assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json c1320dd256a425c6bf3df619c023f419b450eaeb assets/byg/models/item/rainbow_eucalyptus_sapling.json +338b7915c9c90498156a1605d61d889609886869 assets/byg/models/item/rainbow_eucalyptus_sign.json caaf1f7aa3a6e42e3ac2c392e0d8256cccddc45c assets/byg/models/item/rainbow_eucalyptus_slab.json dfd60e8e00afd42f7d88a1571ca5cfce155f80da assets/byg/models/item/rainbow_eucalyptus_stairs.json bd453cf6d9a973cc05eca497d1e2b9873507ab0f assets/byg/models/item/rainbow_eucalyptus_trapdoor.json @@ -1885,6 +1995,7 @@ ebf4e0f3e7b9a74dd65fe879b3c073be4275f65a assets/byg/models/item/redwood_leaves.j bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.json 2ccad4ae6350593f534f95af9360bc1e1c8f0de2 assets/byg/models/item/redwood_pressure_plate.json 4b4f90dfc96b44c0fa7551ffe2319002212f47b7 assets/byg/models/item/redwood_sapling.json +105461a4d5decad7f1c44099d99791ad06654a43 assets/byg/models/item/redwood_sign.json 6bc04400c70e382e07b2b11fb981cf03727b9fa7 assets/byg/models/item/redwood_slab.json 68d710d727c23617894f7e70dfa8f788966e0911 assets/byg/models/item/redwood_stairs.json bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/item/redwood_trapdoor.json @@ -1901,6 +2012,7 @@ b0f7f8504f9fafdc0a2ae4ab6cf48c5ae667156e assets/byg/models/item/skyris_leaves.js e7843e5b430e1861210b4ff66faaa7bc86fb5685 assets/byg/models/item/skyris_planks.json bc63e25d4a09e9dacefdb219a1ab1514d8000d24 assets/byg/models/item/skyris_pressure_plate.json 5101fc54f3156790bf7717b118a4c53d38889e73 assets/byg/models/item/skyris_sapling.json +f8ef93da89e7d48253afeb3de15e12e24ca724f3 assets/byg/models/item/skyris_sign.json b83babc96b05faae942a83eef6038ebba01c121a assets/byg/models/item/skyris_slab.json f399f2ce0b940d0e451cb2062c9cc1211f21c038 assets/byg/models/item/skyris_stairs.json ed4b6adbe2630c9f163c3788471e0f570be1c668 assets/byg/models/item/skyris_trapdoor.json @@ -1971,6 +2083,7 @@ b5ace128271a547e9aec54d9654f961e1eedb37b assets/byg/models/item/stripped_witch_h f624822fa4960cab4ca1aeefaab1b0778b78a149 assets/byg/models/item/sythian_hyphae.json 3785ffb871d4033aa77d7b1ba2beb8d0c022afa5 assets/byg/models/item/sythian_planks.json f59df2cf798a5b7d6d2040046a40cc781e4a41ba assets/byg/models/item/sythian_pressure_plate.json +089596b1b68b4da17298ad3de436f77af815d41b assets/byg/models/item/sythian_sign.json cc130597a10b0e61ed51c8fb16f9c797605d60ed assets/byg/models/item/sythian_slab.json 3e45f23c56a1e0b3fdb339c8626375bce2d3e931 assets/byg/models/item/sythian_stairs.json 66e8914249bfb56050995582985166330e9ff9de assets/byg/models/item/sythian_stem.json @@ -1988,6 +2101,7 @@ b02d9b57bb6db0d6763d8cb1305c747462324142 assets/byg/models/item/willow_leaves.js 0ae4dba613603a07fd48c79830781f02a6026a7c assets/byg/models/item/willow_planks.json 29c830fcf5349965bbd73bd87caf004cb2d5b8c4 assets/byg/models/item/willow_pressure_plate.json d34a3f4732fd8f597e8359c2a8db3f6fce144919 assets/byg/models/item/willow_sapling.json +522e2cced3f7e1797194035fb34a7383e7e36f4d assets/byg/models/item/willow_sign.json 27d9f5b070024aaf18da4fc85617bdcc355c465a assets/byg/models/item/willow_slab.json 77d5d392878fe1a28710e6ee6823bfcd3215c8e2 assets/byg/models/item/willow_stairs.json bce10e0702e13c2c6d95cf6a1bfec374da67b3de assets/byg/models/item/willow_trapdoor.json @@ -2004,6 +2118,7 @@ d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fenc 1ac92832148124b4b1277d8994bedf57782e19a5 assets/byg/models/item/witch_hazel_planks.json 3abb227e0d75fd6f8bdeab5a4e25dfe86a397c8b assets/byg/models/item/witch_hazel_pressure_plate.json c0d2d67481fe5702a0256109243698d3a117818e assets/byg/models/item/witch_hazel_sapling.json +52c306ddee27acbe9fb0aaa69aed6b7fbc50e9a2 assets/byg/models/item/witch_hazel_sign.json efb86376aef5cfb09e69e9fe444ac115d4db0eb2 assets/byg/models/item/witch_hazel_slab.json a75f89ed619c4602a1a89f52515757744d0bd530 assets/byg/models/item/witch_hazel_stairs.json 24f0246e7234ac365aa0593fb4fec098acca5f4b assets/byg/models/item/witch_hazel_trapdoor.json @@ -2020,11 +2135,12 @@ a6396600e00f4b4d0b53fd1fd7c2938b57f22f93 assets/byg/models/item/zelkova_log.json bc785e1c1efec9f89265a5cb5474b3f88eac5064 assets/byg/models/item/zelkova_planks.json 613fa17c691ac2b320f967ebf3a14ec09127ae60 assets/byg/models/item/zelkova_pressure_plate.json 41d236f7a48a2d7493af11495db0579977ab11ff assets/byg/models/item/zelkova_sapling.json +75b2e091f6ce4965ca046143cb548ffbc449e5bd assets/byg/models/item/zelkova_sign.json d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.json 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -c608c1e8f9da0906f1e80cfa8f711c0dea6a5051 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +fba9eff6467daa20afe6405361e86872b8a0fa17 data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json @@ -3429,7 +3545,7 @@ df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_ 7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/blocks/mushrooms.json 6e54f0683d236d69c5cce2c20bd86a6634245578 data/byg/tags/blocks/scaffolding.json -7e565f3244f780e0f97c5280141db6fecf948f5e data/byg/tags/blocks/slabs.json +8609e06689af9adf9b9b148e93751d9035a3302e data/byg/tags/blocks/slabs.json 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json 5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/blocks/wood/blue_enchanted_logs.json @@ -3512,13 +3628,13 @@ df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.j 7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/blocks/leaves.json 337c5359dbf08062360d240e40db3c0544084292 data/minecraft/tags/blocks/logs.json cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/blocks/logs_that_burn.json -7366c20405ff779073d36b21bf1257de3e8162cb data/minecraft/tags/blocks/mineable/axe.json +4778df338b1173432537b360008afe3f44963050 data/minecraft/tags/blocks/mineable/axe.json cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json 3a4b442b0ddecea21abff5d0c7c008162044f778 data/minecraft/tags/blocks/oak_logs.json d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/blocks/planks.json 3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/blocks/sand.json 73720aba09d3697f9d1c29289a0ab94c080c0410 data/minecraft/tags/blocks/saplings.json -845951c0cb4e770ed156f8605a11d0666de90164 data/minecraft/tags/blocks/stairs.json +8f688520cda72285fe1d6880e6e35d3df0987b23 data/minecraft/tags/blocks/stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/trapdoors.json 80d29532a1785f4bc25da05a241660d6f1694447 data/minecraft/tags/blocks/wart_blocks.json 686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/blocks/wooden_buttons.json @@ -3534,9 +3650,9 @@ b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapd cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/items/logs_that_burn.json d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/items/planks.json 3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/items/sand.json -04231e89508f9dd7e245342879b8df4679ed337f data/minecraft/tags/items/saplings.json +bdc2492c1f92de2a4539d7b99b887c6cc0a388e2 data/minecraft/tags/items/saplings.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/slabs.json -845951c0cb4e770ed156f8605a11d0666de90164 data/minecraft/tags/items/stairs.json +8f688520cda72285fe1d6880e6e35d3df0987b23 data/minecraft/tags/items/stairs.json b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/trapdoors.json 686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/wooden_buttons.json de954410ba639f97f3359cbd60af139d96c9a23d data/minecraft/tags/items/wooden_doors.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_sign.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_sign.json new file mode 100644 index 0000000000..da18f6e886 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_wall_sign.json new file mode 100644 index 0000000000..da18f6e886 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/aspen/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_sign.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_sign.json new file mode 100644 index 0000000000..45d430560b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_wall_sign.json new file mode 100644 index 0000000000..45d430560b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/baobab/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sign.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sign.json new file mode 100644 index 0000000000..a497491384 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json new file mode 100644 index 0000000000..a497491384 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/blue_enchanted/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_sign.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_sign.json new file mode 100644 index 0000000000..8fc27c756b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_wall_sign.json new file mode 100644 index 0000000000..8fc27c756b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/bulbis/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_sign.json new file mode 100644 index 0000000000..8e2d49ac83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cherry/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_wall_sign.json new file mode 100644 index 0000000000..8e2d49ac83 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cherry/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cika_sign.json new file mode 100644 index 0000000000..23d02f83f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cika_wall_sign.json new file mode 100644 index 0000000000..23d02f83f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cika/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_sign.json new file mode 100644 index 0000000000..5d5e4d01cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_wall_sign.json new file mode 100644 index 0000000000..5d5e4d01cd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/cypress/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_sign.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_sign.json new file mode 100644 index 0000000000..95d1de27d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_wall_sign.json new file mode 100644 index 0000000000..95d1de27d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ebony/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_sign.json b/Common/src/generated/resources/assets/byg/blockstates/embur_sign.json new file mode 100644 index 0000000000..8a61e3d518 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/embur_wall_sign.json new file mode 100644 index 0000000000..8a61e3d518 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/embur/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_sign.json b/Common/src/generated/resources/assets/byg/blockstates/ether_sign.json new file mode 100644 index 0000000000..c9f4324f8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/ether_wall_sign.json new file mode 100644 index 0000000000..c9f4324f8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/ether/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_sign.json b/Common/src/generated/resources/assets/byg/blockstates/fir_sign.json new file mode 100644 index 0000000000..af0c00500d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/fir_wall_sign.json new file mode 100644 index 0000000000..af0c00500d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/fir/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sign.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sign.json new file mode 100644 index 0000000000..302f91abdc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wall_sign.json new file mode 100644 index 0000000000..302f91abdc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/green_enchanted/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_sign.json b/Common/src/generated/resources/assets/byg/blockstates/holly_sign.json new file mode 100644 index 0000000000..64603538fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/holly_wall_sign.json new file mode 100644 index 0000000000..64603538fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/holly/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_sign.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_sign.json new file mode 100644 index 0000000000..268dd8ba42 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_wall_sign.json new file mode 100644 index 0000000000..268dd8ba42 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/imparius/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sign.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sign.json new file mode 100644 index 0000000000..3c8ac4c812 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_wall_sign.json new file mode 100644 index 0000000000..3c8ac4c812 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/jacaranda/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_sign.json b/Common/src/generated/resources/assets/byg/blockstates/lament_sign.json new file mode 100644 index 0000000000..2623b9d475 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/lament_wall_sign.json new file mode 100644 index 0000000000..2623b9d475 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/lament/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_sign.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_sign.json new file mode 100644 index 0000000000..27c8b236b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_wall_sign.json new file mode 100644 index 0000000000..27c8b236b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mahogany/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_sign.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_sign.json new file mode 100644 index 0000000000..d13f3dbf77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_wall_sign.json new file mode 100644 index 0000000000..d13f3dbf77 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/mangrove/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_sign.json b/Common/src/generated/resources/assets/byg/blockstates/maple_sign.json new file mode 100644 index 0000000000..1d0665ed2a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/maple_wall_sign.json new file mode 100644 index 0000000000..1d0665ed2a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/maple/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_sign.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_sign.json new file mode 100644 index 0000000000..d73f988726 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_wall_sign.json new file mode 100644 index 0000000000..d73f988726 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/nightshade/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_sign.json b/Common/src/generated/resources/assets/byg/blockstates/palm_sign.json new file mode 100644 index 0000000000..923c20c679 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/palm_wall_sign.json new file mode 100644 index 0000000000..923c20c679 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/palm/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_sign.json b/Common/src/generated/resources/assets/byg/blockstates/pine_sign.json new file mode 100644 index 0000000000..cbfd105791 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/pine_wall_sign.json new file mode 100644 index 0000000000..cbfd105791 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/pine/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json new file mode 100644 index 0000000000..d26011ef05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json new file mode 100644 index 0000000000..d26011ef05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/rainbow_eucalyptus/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_sign.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_sign.json new file mode 100644 index 0000000000..cd568e1840 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_wall_sign.json new file mode 100644 index 0000000000..cd568e1840 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/redwood/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_sign.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_sign.json new file mode 100644 index 0000000000..3a1d40c757 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_wall_sign.json new file mode 100644 index 0000000000..3a1d40c757 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/skyris/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_sign.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_sign.json new file mode 100644 index 0000000000..2517cdf3d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_wall_sign.json new file mode 100644 index 0000000000..2517cdf3d1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/sythian/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_sign.json b/Common/src/generated/resources/assets/byg/blockstates/willow_sign.json new file mode 100644 index 0000000000..dcc8473599 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/willow_wall_sign.json new file mode 100644 index 0000000000..dcc8473599 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/willow/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sign.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sign.json new file mode 100644 index 0000000000..84414d8766 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wall_sign.json new file mode 100644 index 0000000000..84414d8766 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/witch_hazel/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_sign.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_sign.json new file mode 100644 index 0000000000..714273202e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_wall_sign.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_wall_sign.json new file mode 100644 index 0000000000..714273202e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_wall_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "byg:block/zelkova/sign" + } + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/lang/en_us.json b/Common/src/generated/resources/assets/byg/lang/en_us.json new file mode 100644 index 0000000000..372ec2da2f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/lang/en_us.json @@ -0,0 +1,2432 @@ +{ + "biome.byg.allium_fields": "Allium Fields", + "biome.byg.amaranth_fields": "Amaranth Fields", + "biome.byg.araucaria_savanna": "Araucaria Savanna", + "biome.byg.arisian_undergrowth": "Arisian Undergrowth", + "biome.byg.aspen_forest": "Aspen Forest", + "biome.byg.atacama_desert": "Atacama Desert", + "biome.byg.autumnal_forest": "Autumnal Forest", + "biome.byg.autumnal_taiga": "Autumnal Taiga", + "biome.byg.autumnal_valley": "Autumnal Valley", + "biome.byg.baobab_savanna": "Baobab Savanna", + "biome.byg.basalt_barrera": "Basalt Barrera", + "biome.byg.bayou": "Bayou", + "biome.byg.black_forest": "Black Forest", + "biome.byg.borealis_grove": "Borealis Grove", + "biome.byg.brimstone_caverns": "Brimstone Caverns", + "biome.byg.bulbis_gardens": "Bulbis Gardens", + "biome.byg.canadian_shield": "Canadian Shield", + "biome.byg.cardinal_tundra": "Cardinal Tundra", + "biome.byg.cherry_blossom_forest": "Cherry Blossom Forest", + "biome.byg.cika_woods": "Cika Woods", + "biome.byg.coconino_meadow": "Coconino Meadow", + "biome.byg.coniferous_forest": "Coniferous Forest", + "biome.byg.crag_gardens": "Crag Gardens", + "biome.byg.crimson_gardens": "Crimson Gardens", + "biome.byg.cryptic_wastes": "Cryptic Wastes", + "biome.byg.cypress_swamplands": "Cypress Swamplands", + "biome.byg.dacite_ridges": "Dacite Ridges", + "biome.byg.dacite_shore": "Dacite Shore", + "biome.byg.dead_sea": "Dead Sea", + "biome.byg.ebony_woods": "Ebony Woods", + "biome.byg.embur_bog": "Embur Bog", + "biome.byg.ethereal_islands": "Ethereal Islands", + "biome.byg.firecracker_shrubland": "Firecracker Shrubland", + "biome.byg.forgotten_forest": "Forgotten Forest", + "biome.byg.fragment_forest": "Fragment Forest", + "biome.byg.frosted_coniferous_forest": "Frosted Coniferous Forest", + "biome.byg.frosted_taiga": "Frosted Taiga", + "biome.byg.glowstone_gardens": "Glowstone Gardens", + "biome.byg.guiana_shield": "Guiana Shield", + "biome.byg.howling_peaks": "Howling Peaks", + "biome.byg.imparius_grove": "Imparius Grove", + "biome.byg.ivis_fields": "Ivis Fields", + "biome.byg.jacaranda_forest": "Jacaranda Forest", + "biome.byg.lush_stacks": "Lush Stacks", + "biome.byg.magma_wastes": "Magma Wastes", + "biome.byg.maple_taiga": "Maple Taiga", + "biome.byg.mojave_desert": "Mojave Desert", + "biome.byg.nightshade_forest": "Nightshade Forest", + "biome.byg.orchard": "Orchard", + "biome.byg.prairie": "Prairie", + "biome.byg.quartz_desert": "Quartz Desert", + "biome.byg.rainbow_beach": "Rainbow Beach", + "biome.byg.red_oak_forest": "Red Oak Forest", + "biome.byg.red_rock_valley": "Red Rock Valley", + "biome.byg.redwood_thicket": "Redwood Thicket", + "biome.byg.rose_fields": "Rose Fields", + "biome.byg.shattered_glacier": "Shattered Glacier", + "biome.byg.shulkren_forest": "Shulkren Forest", + "biome.byg.sierra_badlands": "Sierra Badlands", + "biome.byg.skyris_vale": "Skyris Vale", + "biome.byg.subzero_hypogeal": "Subzero Hypogeal", + "biome.byg.sythian_torrids": "Sythian Torrids", + "biome.byg.temperate_grove": "Temperate Grove", + "biome.byg.temperate_rainforest": "Temperate Rainforest", + "biome.byg.tropical_rainforest": "Tropical Rainforest", + "biome.byg.twilight_meadow": "Twilight Meadow", + "biome.byg.viscal_isles": "Viscal Isles", + "biome.byg.wailing_garth": "Wailing Garth", + "biome.byg.warped_desert": "Warped Desert", + "biome.byg.weeping_mire": "Weeping Mire", + "biome.byg.weeping_witch_forest": "Weeping Witch Forest", + "biome.byg.white_mangrove_marshes": "White Mangrove Marshes", + "biome.byg.windswept_beach": "Windswept Beach", + "biome.byg.windswept_desert": "Windswept Desert", + "biome.byg.windswept_dunes": "Windswept Dunes", + "biome.byg.zelkova_forest": "Zelkova Forest", + "biomepedia.biome.byg.allium_fields.desc": "Lush flowering fields with Pink & Purple Allium Bushes. Large oak trees and villages can be commonly found here.", + "biomepedia.biome.byg.amaranth_fields.desc": "Lush flowering fields with Red, Magenta, Cyan, Orange, & Purple Amaranth Flower Bushes can be found here. Tropical jacaranda trees & jacaranda bushes.", + "biomepedia.biome.byg.araucaria_savanna.desc": "A dry yet floral savanna with canopy araucaria trees & acacia trees. Savanna villages can be commonly found here.", + "biomepedia.biome.byg.aspen_forest.desc": "The Aspen Forest is home to lots of lush flora such as Pink Alliums, Rose, Yellow Daffodils, and Orange Daisies. Dense amounts of aspen trees can be found here along with Taiga Villages.", + "biomepedia.biome.byg.atacama_desert.desc": "A vibrant and floral desert with an abundance of Barrel Cacti, Cacti, Golden Spined Cacti, Prickly Pear Cacti, Aloe Vera, Anemones, & Sages. In the real world, the Atacama Desert is located in Chile, South America along the Pacific Coast!", + "biomepedia.biome.byg.prairie.desc": "A vibrant and hilly grassland with Prairie Grass & Tall Prairie Grass. California Poppies, large oak trees, and villages can be commonly found here.", + "biomepedia.biomeabout.biometags": "Biome tags:", + "biomepedia.biomeabout.climate": "Climate Info:", + "biomepedia.biomeabout.climate.basetemperature": "Temperature: %s", + "biomepedia.biomeabout.climate.downfall": "Downfall: %s", + "biomepedia.biomeabout.climate.precipitation": "Precipitation: %s", + "biomepedia.biomeabout.climate.precipitation.none": "None", + "biomepedia.biomeabout.climate.precipitation.rain": "Rain", + "biomepedia.biomeabout.climate.precipitation.snow": "Snow", + "biomepedia.biomeabout.color": "Color settings:", + "biomepedia.biomeabout.color.fog": "Fog color: %s", + "biomepedia.biomeabout.color.foliage": "Foliage color: %s", + "biomepedia.biomeabout.color.grass": "Grass color: %s", + "biomepedia.biomeabout.color.sky": "Sky color: %s", + "biomepedia.biomeabout.color.water": "Water color: %s", + "biomepedia.biomeabout.color.waterfog": "Water fog color: %s", + "biomepedia.biomeabout.dimensions": "Dimensions:", + "biomepedia.biomeabout.dimensions.none": "This biome doesn't spawn in any dimension.", + "biomepedia.biomeabout.mobspawns": "Mob Spawns:", + "biomepedia.biomeabout.mobspawns.none": "This biome doesn't spawn any mobs.", + "biomepedia.biomelist.search": "Search", + "biomepedia.desc.block.byg.none": "No description available.", + "biomepedia.desc.block.byg.pendorite_block": "This is a Pendorite Block, and if you managed to get this, you're genuinely flexing at this point.\nLike how did you do it and how are you so cool like whoaaaaa.\n\nAnyways if you made it this far, you're cool for reading this :)", + "biomepedia.intro": "Hi and welcome to the Oh The Biomes You'll Go(or \"BYG\" for short) biomepedia! Here you'll find information in regards to our biomes, blocks, items, tools, and more! On the right hand page, select the item you're looking for.\n\nThank you for playing BYG! <3", + "biomepedia.intro.options.biomes": "Biomes", + "biomepedia.intro.options.biomes.hover": "Learn more about BYG's biomes!", + "biomepedia.intro.options.blocksanditems": "Blocks & items", + "biomepedia.intro.options.blocksanditems.hover": "Learn more about BYG's blocks & items!", + "biomepedia.intro.options.disabled.hover": "Coming soon...", + "biomepedia.intro.options.donate": "Donate", + "biomepedia.intro.options.donate.hover": "Enjoying BYG? Support the creators!", + "biomepedia.intro.options.download": "Download Latest", + "biomepedia.intro.options.download.hover": "Get the latest BYG from the official download page!", + "biomepedia.intro.options.issues": "Issues", + "biomepedia.intro.options.issues.hover": "Found a bug or issue? Report it to us!", + "biomepedia.intro.options.ores": "Ores", + "biomepedia.intro.options.ores.hover": "Learn more about BYG's ores!", + "biomepedia.intro.options.translate": "Translate", + "biomepedia.intro.options.translate.hover": "Know any other languages beyond English? Help us translate!", + "block.byg.allium_flower_bush": "Allium Flower Bush", + "block.byg.aloe_vera": "Aloe Vera", + "block.byg.alpine_bellflower": "Alpine Bellflower", + "block.byg.amaranth": "Amaranth", + "block.byg.ametrine_block": "Ametrine Block", + "block.byg.ametrine_cluster": "Ametrine Cluster", + "block.byg.ametrine_ore": "Ametrine Ore", + "block.byg.angelica": "Angelica", + "block.byg.anthracite_block": "Anthracite Block", + "block.byg.anthracite_ore": "Anthracite Ore", + "block.byg.araucaria_leaves": "Araucaria Leaves", + "block.byg.araucaria_sapling": "Araucaria Sapling", + "block.byg.arisian_bloom_branch": "Arisian Bloom Branch", + "block.byg.aspen_bookshelf": "Aspen Bookshelf", + "block.byg.aspen_button": "Aspen Button", + "block.byg.aspen_crafting_table": "Aspen Crafting Table", + "block.byg.aspen_door": "Aspen Door", + "block.byg.aspen_fence": "Aspen Fence", + "block.byg.aspen_fence_gate": "Aspen Fence Gate", + "block.byg.aspen_leaves": "Aspen Leaves", + "block.byg.aspen_log": "Aspen Log", + "block.byg.aspen_planks": "Aspen Planks", + "block.byg.aspen_pressure_plate": "Aspen Pressure Plate", + "block.byg.aspen_sapling": "Aspen Sapling", + "block.byg.aspen_sign": "Aspen Sign", + "block.byg.aspen_slab": "Aspen Slab", + "block.byg.aspen_stairs": "Aspen Stairs", + "block.byg.aspen_trapdoor": "Aspen Trapdoor", + "block.byg.aspen_wall_sign": "Aspen Wall Sign", + "block.byg.aspen_wood": "Aspen Wood", + "block.byg.baobab_bookshelf": "Baobab Bookshelf", + "block.byg.baobab_button": "Baobab Button", + "block.byg.baobab_crafting_table": "Baobab Crafting Table", + "block.byg.baobab_door": "Baobab Door", + "block.byg.baobab_fence": "Baobab Fence", + "block.byg.baobab_fence_gate": "Baobab Fence Gate", + "block.byg.baobab_fruit_block": "Baobab Fruit Block", + "block.byg.baobab_leaves": "Baobab Leaves", + "block.byg.baobab_log": "Baobab Log", + "block.byg.baobab_planks": "Baobab Planks", + "block.byg.baobab_pressure_plate": "Baobab Pressure Plate", + "block.byg.baobab_sapling": "Baobab Sapling", + "block.byg.baobab_sign": "Baobab Sign", + "block.byg.baobab_slab": "Baobab Slab", + "block.byg.baobab_stairs": "Baobab Stairs", + "block.byg.baobab_trapdoor": "Baobab Trapdoor", + "block.byg.baobab_wall_sign": "Baobab Wall Sign", + "block.byg.baobab_wood": "Baobab Wood", + "block.byg.barrel_cactus": "Barrel Cactus", + "block.byg.beach_grass": "Beach Grass", + "block.byg.begonia": "Begonia", + "block.byg.bistort": "Bistort", + "block.byg.black_chiseled_sandstone": "Black Chiseled Sandstone", + "block.byg.black_cut_sandstone": "Black Cut Sandstone", + "block.byg.black_ice": "Black Ice", + "block.byg.black_rose": "Black Rose", + "block.byg.black_sand": "Black Sand", + "block.byg.black_sandstone": "Black Sandstone", + "block.byg.black_smooth_sandstone": "Black Smooth Sandstone", + "block.byg.blooming_aloe_vera": "Blooming Aloe Vera", + "block.byg.blooming_witch_hazel_leaves": "Blooming Witch Hazel Leaves", + "block.byg.blue_chiseled_sandstone": "Blue Chiseled Sandstone", + "block.byg.blue_cut_sandstone": "Blue Cut Sandstone", + "block.byg.blue_enchanted_bookshelf": "Blue Enchanted Bookshelf", + "block.byg.blue_enchanted_button": "Blue Enchanted Button", + "block.byg.blue_enchanted_crafting_table": "Blue Enchanted Crafting Table", + "block.byg.blue_enchanted_door": "Blue Enchanted Door", + "block.byg.blue_enchanted_fence": "Blue Enchanted Fence", + "block.byg.blue_enchanted_fence_gate": "Blue Enchanted Fence Gate", + "block.byg.blue_enchanted_leaves": "Blue Enchanted Leaves", + "block.byg.blue_enchanted_log": "Blue Enchanted Log", + "block.byg.blue_enchanted_planks": "Blue Enchanted Planks", + "block.byg.blue_enchanted_pressure_plate": "Blue Enchanted Pressure Plate", + "block.byg.blue_enchanted_sapling": "Blue Enchanted Sapling", + "block.byg.blue_enchanted_sign": "Blue Enchanted Sign", + "block.byg.blue_enchanted_slab": "Blue Enchanted Slab", + "block.byg.blue_enchanted_stairs": "Blue Enchanted Stairs", + "block.byg.blue_enchanted_trapdoor": "Blue Enchanted Trapdoor", + "block.byg.blue_enchanted_wall_sign": "Blue Enchanted Wall Sign", + "block.byg.blue_enchanted_wood": "Blue Enchanted Wood", + "block.byg.blue_nether_brick_slab": "Blue Nether Brick Slab", + "block.byg.blue_nether_brick_stairs": "Blue Nether Brick Stairs", + "block.byg.blue_nether_brick_wall": "Blue Nether Brick Wall", + "block.byg.blue_nether_bricks": "Blue Nether Bricks", + "block.byg.blue_nether_gold_ore": "Blue Nether Gold Ore", + "block.byg.blue_nether_quartz_ore": "Blue Nether Quartz Ore", + "block.byg.blue_netherrack": "Blue Netherrack", + "block.byg.blue_petal_block": "Blue Petal Block", + "block.byg.blue_sage": "Blue Sage", + "block.byg.blue_sand": "Blue Sand", + "block.byg.blue_sandstone": "Blue Sandstone", + "block.byg.blue_smooth_sandstone": "Blue Smooth Sandstone", + "block.byg.blue_spruce_leaves": "Blue Spruce Leaves", + "block.byg.blue_spruce_sapling": "Blue Spruce Sapling", + "block.byg.blueberry_bush": "Blueberry Bush", + "block.byg.boric_campfire": "Boric Campfire", + "block.byg.boric_fire": "Boric Fire", + "block.byg.boric_lantern": "Boric Lantern", + "block.byg.brimstone": "Brimstone", + "block.byg.brimstone_nether_gold_ore": "Brimstone Nether Gold Ore", + "block.byg.brimstone_nether_quartz_ore": "Brimstone Nether Quartz Ore", + "block.byg.brown_birch_leaves": "Brown Birch Leaves", + "block.byg.brown_birch_sapling": "Brown Birch Sapling", + "block.byg.brown_mushroom_stem": "Brown Mushroom Stem", + "block.byg.brown_oak_leaves": "Brown Oak Leaves", + "block.byg.brown_oak_sapling": "Brown Oak Sapling", + "block.byg.brown_zelkova_leaves": "Brown Zelkova Leaves", + "block.byg.brown_zelkova_sapling": "Brown Zelkova Sapling", + "block.byg.budding_ametrine_ore": "Budding Ametrine Ore", + "block.byg.budding_subzero_crystal": "Budding Subzero Crystal", + "block.byg.bulbis_anomaly": "Bulbis Anomaly", + "block.byg.bulbis_bookshelf": "Bulbis Bookshelf", + "block.byg.bulbis_button": "Bulbis Button", + "block.byg.bulbis_crafting_table": "Bulbis Crafting Table", + "block.byg.bulbis_door": "Bulbis Door", + "block.byg.bulbis_fence": "Bulbis Fence", + "block.byg.bulbis_fence_gate": "Bulbis Fence Gate", + "block.byg.bulbis_oddity": "Bulbis Oddity", + "block.byg.bulbis_phycelium": "Bulbis Phycelium", + "block.byg.bulbis_planks": "Bulbis Planks", + "block.byg.bulbis_pressure_plate": "Bulbis Pressure Plate", + "block.byg.bulbis_shell": "Bulbis Shell", + "block.byg.bulbis_sign": "Bulbis Sign", + "block.byg.bulbis_slab": "Bulbis Slab", + "block.byg.bulbis_sprouts": "Bulbis Sprouts", + "block.byg.bulbis_stairs": "Bulbis Stairs", + "block.byg.bulbis_stem": "Bulbis Stem", + "block.byg.bulbis_trapdoor": "Bulbis Trapdoor", + "block.byg.bulbis_wall_sign": "Bulbis Wall Sign", + "block.byg.bulbis_wood": "Bulbis Wood", + "block.byg.california_poppy": "California Poppy", + "block.byg.carved_barrel_cactus": "Carved Barrel Cactus", + "block.byg.carved_ether_stone": "Carved Ether Stone", + "block.byg.carved_ether_stone_slab": "Carved Ether Stone Slab", + "block.byg.carved_ether_stone_stairs": "Carved Ether Stone Stairs", + "block.byg.carved_ether_stone_wall": "Carved Ether Stone Wall", + "block.byg.cattail": "Cattail", + "block.byg.cattail_sprout": "Cattail Sprout", + "block.byg.cattail_thatch": "Cattail Thatch", + "block.byg.cattail_thatch_carpet": "Cattail Thatch Carpet", + "block.byg.cattail_thatch_slab": "Cattail Thatch Slab", + "block.byg.cattail_thatch_stairs": "Cattail Thatch Stairs", + "block.byg.cherry_bookshelf": "Cherry Bookshelf", + "block.byg.cherry_button": "Cherry Button", + "block.byg.cherry_crafting_table": "Cherry Crafting Table", + "block.byg.cherry_door": "Cherry Door", + "block.byg.cherry_fence": "Cherry Fence", + "block.byg.cherry_fence_gate": "Cherry Fence Gate", + "block.byg.cherry_log": "Cherry Log", + "block.byg.cherry_planks": "Cherry Planks", + "block.byg.cherry_pressure_plate": "Cherry Pressure Plate", + "block.byg.cherry_sign": "Cherry Sign", + "block.byg.cherry_slab": "Cherry Slab", + "block.byg.cherry_stairs": "Cherry Stairs", + "block.byg.cherry_trapdoor": "Cherry Trapdoor", + "block.byg.cherry_wall_sign": "Cherry Wall Sign", + "block.byg.cherry_wood": "Cherry Wood", + "block.byg.chiseled_fungal_imparius": "Chiseled Fungal Imparius", + "block.byg.chiseled_fungal_imparius_slab": "Chiseled Fungal Imparius Slab", + "block.byg.chiseled_fungal_imparius_stairs": "Chiseled Fungal Imparius Stairs", + "block.byg.chiseled_fungal_imparius_wall": "Chiseled Fungal Imparius Wall", + "block.byg.chiseled_red_rock_brick_slab": "Chiseled Red Rock Brick Slab", + "block.byg.chiseled_red_rock_brick_stairs": "Chiseled Red Rock Brick Stairs", + "block.byg.chiseled_red_rock_brick_wall": "Chiseled Red Rock Brick Wall", + "block.byg.chiseled_red_rock_bricks": "Chiseled Red Rock Bricks", + "block.byg.chiseled_therium": "Chiseled Therium", + "block.byg.chiseled_therium_slab": "Chiseled Therium Slab", + "block.byg.chiseled_therium_stairs": "Chiseled Therium Stairs", + "block.byg.chiseled_therium_wall": "Chiseled Therium Wall", + "block.byg.chiseled_travertine": "Chiseled Travertine", + "block.byg.chiseled_travertine_slab": "Chiseled Travertine Slab", + "block.byg.chiseled_travertine_stairs": "Chiseled Travertine Stairs", + "block.byg.chiseled_travertine_wall": "Chiseled Travertine Wall", + "block.byg.chiseled_windswept_sandstone": "Chiseled Windswept Sandstone", + "block.byg.chiseled_windswept_sandstone_slab": "Chiseled Windswept Sandstone Slab", + "block.byg.chiseled_windswept_sandstone_stairs": "Chiseled Windswept Sandstone Stairs", + "block.byg.chiseled_windswept_sandstone_wall": "Chiseled Windswept Sandstone Wall", + "block.byg.cika_bookshelf": "Cika Bookshelf", + "block.byg.cika_button": "Cika Button", + "block.byg.cika_crafting_table": "Cika Crafting Table", + "block.byg.cika_door": "Cika Door", + "block.byg.cika_fence": "Cika Fence", + "block.byg.cika_fence_gate": "Cika Fence Gate", + "block.byg.cika_leaves": "Cika Leaves", + "block.byg.cika_log": "Cika Log", + "block.byg.cika_planks": "Cika Planks", + "block.byg.cika_pressure_plate": "Cika Pressure Plate", + "block.byg.cika_sapling": "Cika Sapling", + "block.byg.cika_sign": "Cika Sign", + "block.byg.cika_slab": "Cika Slab", + "block.byg.cika_stairs": "Cika Stairs", + "block.byg.cika_trapdoor": "Cika Trapdoor", + "block.byg.cika_wall_sign": "Cika Wall Sign", + "block.byg.cika_wood": "Cika Wood", + "block.byg.clover_patch": "Clover Patch", + "block.byg.cobbled_ether_stone": "Cobbled Ether Stone", + "block.byg.cobbled_ether_stone_slab": "Cobbled Ether Stone Slab", + "block.byg.cobbled_ether_stone_stairs": "Cobbled Ether Stone Stairs", + "block.byg.cobbled_ether_stone_wall": "Cobbled Ether Stone Wall", + "block.byg.cracked_red_rock_brick_slab": "Cracked Red Rock Brick Slab", + "block.byg.cracked_red_rock_brick_stairs": "Cracked Red Rock Brick Stairs", + "block.byg.cracked_red_rock_brick_wall": "Cracked Red Rock Brick Wall", + "block.byg.cracked_red_rock_bricks": "Cracked Red Rock Bricks", + "block.byg.cracked_red_sand": "Cracked Red Sand", + "block.byg.cracked_scoria_stone_bricks": "Cracked Scoria Stone Bricks", + "block.byg.crimson_berry_bush": "Crimson Berry Bush", + "block.byg.crocus": "Crocus", + "block.byg.cryptic_bramble": "Cryptic Bramble", + "block.byg.cryptic_campfire": "Cryptic Campfire", + "block.byg.cryptic_end_rod": "Cryptic End Rod", + "block.byg.cryptic_fire": "Cryptic Fire", + "block.byg.cryptic_lantern": "Cryptic Lantern", + "block.byg.cryptic_magma_block": "Cryptic Magma Block", + "block.byg.cryptic_redstone_ore": "Cryptic Redstone Ore", + "block.byg.cryptic_stone": "Cryptic Stone", + "block.byg.cryptic_stone_slab": "Cryptic Stone Slab", + "block.byg.cryptic_stone_stairs": "Cryptic Stone Stairs", + "block.byg.cryptic_stone_wall": "Cryptic Stone Wall", + "block.byg.cryptic_vent": "Cryptic Vent", + "block.byg.cut_windswept_sandstone": "Cut Windswept Sandstone", + "block.byg.cut_windswept_sandstone_slab": "Cut Windswept Sandstone Slab", + "block.byg.cut_windswept_sandstone_stairs": "Cut Windswept Sandstone Stairs", + "block.byg.cut_windswept_sandstone_wall": "Cut Windswept Sandstone Wall", + "block.byg.cyan_amaranth": "Cyan Amaranth", + "block.byg.cyan_rose": "Cyan Rose", + "block.byg.cyan_tulip": "Cyan Tulip", + "block.byg.cypress_bookshelf": "Cypress Bookshelf", + "block.byg.cypress_button": "Cypress Button", + "block.byg.cypress_crafting_table": "Cypress Crafting Table", + "block.byg.cypress_door": "Cypress Door", + "block.byg.cypress_fence": "Cypress Fence", + "block.byg.cypress_fence_gate": "Cypress Fence Gate", + "block.byg.cypress_leaves": "Cypress Leaves", + "block.byg.cypress_log": "Cypress Log", + "block.byg.cypress_planks": "Cypress Planks", + "block.byg.cypress_pressure_plate": "Cypress Pressure Plate", + "block.byg.cypress_sapling": "Cypress Sapling", + "block.byg.cypress_sign": "Cypress Sign", + "block.byg.cypress_slab": "Cypress Slab", + "block.byg.cypress_stairs": "Cypress Stairs", + "block.byg.cypress_trapdoor": "Cypress Trapdoor", + "block.byg.cypress_wall_sign": "Cypress Wall Sign", + "block.byg.cypress_wood": "Cypress Wood", + "block.byg.dacite": "Dacite", + "block.byg.dacite_brick_slab": "Dacite Brick Slab", + "block.byg.dacite_brick_stairs": "Dacite Brick Stairs", + "block.byg.dacite_brick_wall": "Dacite Brick Wall", + "block.byg.dacite_bricks": "Dacite Bricks", + "block.byg.dacite_cobblestone": "Dacite Cobblestone", + "block.byg.dacite_cobblestone_slab": "Dacite Cobblestone Slab", + "block.byg.dacite_cobblestone_stairs": "Dacite Cobblestone Stairs", + "block.byg.dacite_cobblestone_wall": "Dacite Cobblestone Wall", + "block.byg.dacite_pillar": "Dacite Pillar", + "block.byg.dacite_slab": "Dacite Slab", + "block.byg.dacite_stairs": "Dacite Stairs", + "block.byg.dacite_tile": "Dacite Tile", + "block.byg.dacite_tile_slab": "Dacite Tile Slab", + "block.byg.dacite_tile_stairs": "Dacite Tile Stairs", + "block.byg.dacite_tile_wall": "Dacite Tile Wall", + "block.byg.dacite_wall": "Dacite Wall", + "block.byg.daffodil": "Daffodil", + "block.byg.death_cap": "Death Cap", + "block.byg.death_cap_mushroom_block": "Death Cap Mushroom Block", + "block.byg.delphinium": "Delphinium", + "block.byg.dusted_polished_blackstone_bricks": "Dusted Polished Blackstone Bricks", + "block.byg.ebony_bookshelf": "Ebony Bookshelf", + "block.byg.ebony_button": "Ebony Button", + "block.byg.ebony_crafting_table": "Ebony Crafting Table", + "block.byg.ebony_door": "Ebony Door", + "block.byg.ebony_fence": "Ebony Fence", + "block.byg.ebony_fence_gate": "Ebony Fence Gate", + "block.byg.ebony_leaves": "Ebony Leaves", + "block.byg.ebony_log": "Ebony Log", + "block.byg.ebony_planks": "Ebony Planks", + "block.byg.ebony_pressure_plate": "Ebony Pressure Plate", + "block.byg.ebony_sapling": "Ebony Sapling", + "block.byg.ebony_sign": "Ebony Sign", + "block.byg.ebony_slab": "Ebony Slab", + "block.byg.ebony_stairs": "Ebony Stairs", + "block.byg.ebony_trapdoor": "Ebony Trapdoor", + "block.byg.ebony_wall_sign": "Ebony Wall Sign", + "block.byg.ebony_wood": "Ebony Wood", + "block.byg.embur_bookshelf": "Embur Bookshelf", + "block.byg.embur_button": "Embur Button", + "block.byg.embur_crafting_table": "Embur Crafting Table", + "block.byg.embur_door": "Embur Door", + "block.byg.embur_fence": "Embur Fence", + "block.byg.embur_fence_gate": "Embur Fence Gate", + "block.byg.embur_gel_block": "Embur Gel Block", + "block.byg.embur_gel_branch": "Embur Gel Branch", + "block.byg.embur_gel_vines": "Embur Gel Vines", + "block.byg.embur_gel_vines_plant": "Embur Gel Vines Plant", + "block.byg.embur_hyphae": "Embur Hyphae", + "block.byg.embur_lily": "Embur Lily", + "block.byg.embur_nylium": "Embur Nylium", + "block.byg.embur_pedu": "Embur Pedu", + "block.byg.embur_planks": "Embur Planks", + "block.byg.embur_pressure_plate": "Embur Pressure Plate", + "block.byg.embur_roots": "Embur Roots", + "block.byg.embur_sign": "Embur Sign", + "block.byg.embur_slab": "Embur Slab", + "block.byg.embur_sprouts": "Embur Sprouts", + "block.byg.embur_stairs": "Embur Stairs", + "block.byg.embur_trapdoor": "Embur Trapdoor", + "block.byg.embur_wall_sign": "Embur Wall Sign", + "block.byg.embur_wart": "Embur Wart", + "block.byg.emeraldite_ore": "Emeraldite Ore", + "block.byg.end_sand": "End Sand", + "block.byg.ender_lily": "Ender Lily", + "block.byg.ether_bookshelf": "Ether Bookshelf", + "block.byg.ether_bulbs_block": "Ether Bulbs Block", + "block.byg.ether_bush": "Ether Bush", + "block.byg.ether_button": "Ether Button", + "block.byg.ether_crafting_table": "Ether Crafting Table", + "block.byg.ether_door": "Ether Door", + "block.byg.ether_fence": "Ether Fence", + "block.byg.ether_fence_gate": "Ether Fence Gate", + "block.byg.ether_foliage": "Ether Foliage", + "block.byg.ether_grass": "Ether Grass", + "block.byg.ether_leaves": "Ether Leaves", + "block.byg.ether_log": "Ether Log", + "block.byg.ether_phylium": "Ether Phylium", + "block.byg.ether_planks": "Ether Planks", + "block.byg.ether_pressure_plate": "Ether Pressure Plate", + "block.byg.ether_sapling": "Ether Sapling", + "block.byg.ether_sign": "Ether Sign", + "block.byg.ether_slab": "Ether Slab", + "block.byg.ether_soil": "Ether Soil", + "block.byg.ether_stairs": "Ether Stairs", + "block.byg.ether_stone": "Ether Stone", + "block.byg.ether_stone_slab": "Ether Stone Slab", + "block.byg.ether_stone_stairs": "Ether Stone Stairs", + "block.byg.ether_stone_wall": "Ether Stone Wall", + "block.byg.ether_trapdoor": "Ether Trapdoor", + "block.byg.ether_wall_sign": "Ether Wall Sign", + "block.byg.ether_wood": "Ether Wood", + "block.byg.fairy_slipper": "Fairy Slipper", + "block.byg.fir_bookshelf": "Fir Bookshelf", + "block.byg.fir_button": "Fir Button", + "block.byg.fir_crafting_table": "Fir Crafting Table", + "block.byg.fir_door": "Fir Door", + "block.byg.fir_fence": "Fir Fence", + "block.byg.fir_fence_gate": "Fir Fence Gate", + "block.byg.fir_leaves": "Fir Leaves", + "block.byg.fir_log": "Fir Log", + "block.byg.fir_planks": "Fir Planks", + "block.byg.fir_pressure_plate": "Fir Pressure Plate", + "block.byg.fir_sapling": "Fir Sapling", + "block.byg.fir_sign": "Fir Sign", + "block.byg.fir_slab": "Fir Slab", + "block.byg.fir_stairs": "Fir Stairs", + "block.byg.fir_trapdoor": "Fir Trapdoor", + "block.byg.fir_wall_sign": "Fir Wall Sign", + "block.byg.fir_wood": "Fir Wood", + "block.byg.firecracker_flower_bush": "Firecracker Flower Bush", + "block.byg.firecracker_leaves": "Firecracker Leaves", + "block.byg.flower_patch": "Flower Patch", + "block.byg.flowering_barrel_cactus": "Flowering Barrel Cactus", + "block.byg.flowering_indigo_jacaranda_bush": "Flowering Indigo Jacaranda Bush", + "block.byg.flowering_indigo_jacaranda_leaves": "Flowering Indigo Jacaranda Leaves", + "block.byg.flowering_jacaranda_bush": "Flowering Jacaranda Bush", + "block.byg.flowering_jacaranda_leaves": "Flowering Jacaranda Leaves", + "block.byg.flowering_nightshade_leaves": "Flowering Nightshade Leaves", + "block.byg.flowering_orchard_leaves": "Flowering Orchard Leaves", + "block.byg.flowering_palo_verde_leaves": "Flowering Palo Verde Leaves", + "block.byg.flowering_tiny_lily_pads": "Flowering Tiny Lily Pads", + "block.byg.foragers_table": "Foragers Table", + "block.byg.foxglove": "Foxglove", + "block.byg.frost_magma": "Frost Magma", + "block.byg.fungal_imparius": "Fungal Imparius", + "block.byg.fungal_imparius_block": "Fungal Imparius Block", + "block.byg.fungal_imparius_filament": "Fungal Imparius Filament", + "block.byg.fungal_imparius_filament_block": "Fungal Imparius Filament Block", + "block.byg.fungal_imparius_hyphae": "Fungal Imparius Hyphae", + "block.byg.fungal_imparius_stem": "Fungal Imparius Stem", + "block.byg.glowstone_lamp": "Glowstone Lamp", + "block.byg.glowstone_lantern": "Glowstone Lantern", + "block.byg.golden_spined_cactus": "Golden Spined Cactus", + "block.byg.green_apple_skyris_leaves": "Green Apple Skyris Leaves", + "block.byg.green_enchanted_bookshelf": "Green Enchanted Bookshelf", + "block.byg.green_enchanted_button": "Green Enchanted Button", + "block.byg.green_enchanted_crafting_table": "Green Enchanted Crafting Table", + "block.byg.green_enchanted_door": "Green Enchanted Door", + "block.byg.green_enchanted_fence": "Green Enchanted Fence", + "block.byg.green_enchanted_fence_gate": "Green Enchanted Fence Gate", + "block.byg.green_enchanted_leaves": "Green Enchanted Leaves", + "block.byg.green_enchanted_log": "Green Enchanted Log", + "block.byg.green_enchanted_planks": "Green Enchanted Planks", + "block.byg.green_enchanted_pressure_plate": "Green Enchanted Pressure Plate", + "block.byg.green_enchanted_sapling": "Green Enchanted Sapling", + "block.byg.green_enchanted_sign": "Green Enchanted Sign", + "block.byg.green_enchanted_slab": "Green Enchanted Slab", + "block.byg.green_enchanted_stairs": "Green Enchanted Stairs", + "block.byg.green_enchanted_trapdoor": "Green Enchanted Trapdoor", + "block.byg.green_enchanted_wall_sign": "Green Enchanted Wall Sign", + "block.byg.green_enchanted_wood": "Green Enchanted Wood", + "block.byg.green_mushroom": "Green Mushroom", + "block.byg.green_mushroom_block": "Green Mushroom Block", + "block.byg.green_tulip": "Green Tulip", + "block.byg.guzmania": "Guzmania", + "block.byg.hanging_bones": "Hanging Bones", + "block.byg.hanging_sythian_roots": "Hanging Sythian Roots", + "block.byg.hanging_sythian_roots_plant": "Hanging Sythian Roots Plant", + "block.byg.holly_berry_leaves": "Holly Berry Leaves", + "block.byg.holly_bookshelf": "Holly Bookshelf", + "block.byg.holly_button": "Holly Button", + "block.byg.holly_crafting_table": "Holly Crafting Table", + "block.byg.holly_door": "Holly Door", + "block.byg.holly_fence": "Holly Fence", + "block.byg.holly_fence_gate": "Holly Fence Gate", + "block.byg.holly_leaves": "Holly Leaves", + "block.byg.holly_log": "Holly Log", + "block.byg.holly_planks": "Holly Planks", + "block.byg.holly_pressure_plate": "Holly Pressure Plate", + "block.byg.holly_sapling": "Holly Sapling", + "block.byg.holly_sign": "Holly Sign", + "block.byg.holly_slab": "Holly Slab", + "block.byg.holly_stairs": "Holly Stairs", + "block.byg.holly_trapdoor": "Holly Trapdoor", + "block.byg.holly_wall_sign": "Holly Wall Sign", + "block.byg.holly_wood": "Holly Wood", + "block.byg.honey_barrel_cactus": "Honey Barrel Cactus", + "block.byg.horseweed": "Horseweed", + "block.byg.hydrangea_bush": "Hydrangea Bush", + "block.byg.hydrangea_hedge": "Hydrangea Hedge", + "block.byg.hypogeal_imperium": "Hypogeal Imperium", + "block.byg.imbued_nightshade_log": "Imbued Nightshade Log", + "block.byg.imparius_bookshelf": "Imparius Bookshelf", + "block.byg.imparius_bush": "Imparius Bush", + "block.byg.imparius_button": "Imparius Button", + "block.byg.imparius_crafting_table": "Imparius Crafting Table", + "block.byg.imparius_door": "Imparius Door", + "block.byg.imparius_fence": "Imparius Fence", + "block.byg.imparius_fence_gate": "Imparius Fence Gate", + "block.byg.imparius_hyphae": "Imparius Hyphae", + "block.byg.imparius_mushroom": "Imparius Mushroom", + "block.byg.imparius_mushroom_block": "Imparius Mushroom Block", + "block.byg.imparius_mushroom_branch": "Imparius Mushroom Branch", + "block.byg.imparius_phylium": "Imparius Phylium", + "block.byg.imparius_planks": "Imparius Planks", + "block.byg.imparius_pressure_plate": "Imparius Pressure Plate", + "block.byg.imparius_sign": "Imparius Sign", + "block.byg.imparius_slab": "Imparius Slab", + "block.byg.imparius_stairs": "Imparius Stairs", + "block.byg.imparius_stem": "Imparius Stem", + "block.byg.imparius_trapdoor": "Imparius Trapdoor", + "block.byg.imparius_vine": "Imparius Vine", + "block.byg.imparius_vine_plant": "Imparius Vine Plant", + "block.byg.imparius_wall_sign": "Imparius Wall Sign", + "block.byg.incan_lily": "Incan Lily", + "block.byg.indigo_jacaranda_bush": "Indigo Jacaranda Bush", + "block.byg.indigo_jacaranda_leaves": "Indigo Jacaranda Leaves", + "block.byg.indigo_jacaranda_sapling": "Indigo Jacaranda Sapling", + "block.byg.iris": "Iris", + "block.byg.ivis_phylium": "Ivis Phylium", + "block.byg.ivis_roots": "Ivis Roots", + "block.byg.ivis_sprout": "Ivis Sprout", + "block.byg.jacaranda_bookshelf": "Jacaranda Bookshelf", + "block.byg.jacaranda_bush": "Jacaranda Bush", + "block.byg.jacaranda_button": "Jacaranda Button", + "block.byg.jacaranda_crafting_table": "Jacaranda Crafting Table", + "block.byg.jacaranda_door": "Jacaranda Door", + "block.byg.jacaranda_fence": "Jacaranda Fence", + "block.byg.jacaranda_fence_gate": "Jacaranda Fence Gate", + "block.byg.jacaranda_leaves": "Jacaranda Leaves", + "block.byg.jacaranda_log": "Jacaranda Log", + "block.byg.jacaranda_planks": "Jacaranda Planks", + "block.byg.jacaranda_pressure_plate": "Jacaranda Pressure Plate", + "block.byg.jacaranda_sapling": "Jacaranda Sapling", + "block.byg.jacaranda_sign": "Jacaranda Sign", + "block.byg.jacaranda_slab": "Jacaranda Slab", + "block.byg.jacaranda_stairs": "Jacaranda Stairs", + "block.byg.jacaranda_trapdoor": "Jacaranda Trapdoor", + "block.byg.jacaranda_wall_sign": "Jacaranda Wall Sign", + "block.byg.jacaranda_wood": "Jacaranda Wood", + "block.byg.japanese_orchid": "Japanese Orchid", + "block.byg.joshua_leaves": "Joshua Leaves", + "block.byg.joshua_sapling": "Joshua Sapling", + "block.byg.kovan_flower": "Kovan Flower", + "block.byg.lament_bookshelf": "Lament Bookshelf", + "block.byg.lament_button": "Lament Button", + "block.byg.lament_crafting_table": "Lament Crafting Table", + "block.byg.lament_door": "Lament Door", + "block.byg.lament_fence": "Lament Fence", + "block.byg.lament_fence_gate": "Lament Fence Gate", + "block.byg.lament_leaves": "Lament Leaves", + "block.byg.lament_log": "Lament Log", + "block.byg.lament_planks": "Lament Planks", + "block.byg.lament_pressure_plate": "Lament Pressure Plate", + "block.byg.lament_sapling": "Lament Sapling", + "block.byg.lament_sign": "Lament Sign", + "block.byg.lament_slab": "Lament Slab", + "block.byg.lament_sprouts": "Lament Sprouts", + "block.byg.lament_stairs": "Lament Stairs", + "block.byg.lament_trapdoor": "Lament Trapdoor", + "block.byg.lament_vine": "Lament Vine", + "block.byg.lament_vine_plant": "Lament Vine Plant", + "block.byg.lament_wall_sign": "Lament Wall Sign", + "block.byg.lament_wood": "Lament Wood", + "block.byg.large_subzero_crystal_bud": "Large Subzero Crystal Bud", + "block.byg.lazarus_bellflower": "Lazarus Bellflower", + "block.byg.leaf_pile": "Leaf Pile", + "block.byg.light_blue_petal_block": "Light Blue Petal Block", + "block.byg.lignite_block": "Lignite Block", + "block.byg.lignite_ore": "Lignite Ore", + "block.byg.lollipop_flower": "Lollipop Flower", + "block.byg.lush_dirt": "Lush Dirt", + "block.byg.lush_farmland": "Lush Farmland", + "block.byg.lush_grass_block": "Lush Grass Block", + "block.byg.lush_grass_path": "Lush Grass Path", + "block.byg.magenta_amaranth": "Magenta Amaranth", + "block.byg.magenta_tulip": "Magenta Tulip", + "block.byg.magmatic_stone": "Magmatic Stone", + "block.byg.mahogany_bookshelf": "Mahogany Bookshelf", + "block.byg.mahogany_button": "Mahogany Button", + "block.byg.mahogany_crafting_table": "Mahogany Crafting Table", + "block.byg.mahogany_door": "Mahogany Door", + "block.byg.mahogany_fence": "Mahogany Fence", + "block.byg.mahogany_fence_gate": "Mahogany Fence Gate", + "block.byg.mahogany_leaves": "Mahogany Leaves", + "block.byg.mahogany_log": "Mahogany Log", + "block.byg.mahogany_planks": "Mahogany Planks", + "block.byg.mahogany_pressure_plate": "Mahogany Pressure Plate", + "block.byg.mahogany_sapling": "Mahogany Sapling", + "block.byg.mahogany_sign": "Mahogany Sign", + "block.byg.mahogany_slab": "Mahogany Slab", + "block.byg.mahogany_stairs": "Mahogany Stairs", + "block.byg.mahogany_trapdoor": "Mahogany Trapdoor", + "block.byg.mahogany_wall_sign": "Mahogany Wall Sign", + "block.byg.mahogany_wood": "Mahogany Wood", + "block.byg.mangrove_bookshelf": "Mangrove Bookshelf", + "block.byg.mangrove_button": "Mangrove Button", + "block.byg.mangrove_crafting_table": "Mangrove Crafting Table", + "block.byg.mangrove_door": "Mangrove Door", + "block.byg.mangrove_fence": "Mangrove Fence", + "block.byg.mangrove_fence_gate": "Mangrove Fence Gate", + "block.byg.mangrove_leaves": "Mangrove Leaves", + "block.byg.mangrove_log": "Mangrove Log", + "block.byg.mangrove_planks": "Mangrove Planks", + "block.byg.mangrove_pressure_plate": "Mangrove Pressure Plate", + "block.byg.mangrove_sapling": "Mangrove Sapling", + "block.byg.mangrove_sign": "Mangrove Sign", + "block.byg.mangrove_slab": "Mangrove Slab", + "block.byg.mangrove_stairs": "Mangrove Stairs", + "block.byg.mangrove_trapdoor": "Mangrove Trapdoor", + "block.byg.mangrove_wall_sign": "Mangrove Wall Sign", + "block.byg.mangrove_wood": "Mangrove Wood", + "block.byg.maple_bookshelf": "Maple Bookshelf", + "block.byg.maple_button": "Maple Button", + "block.byg.maple_crafting_table": "Maple Crafting Table", + "block.byg.maple_door": "Maple Door", + "block.byg.maple_fence": "Maple Fence", + "block.byg.maple_fence_gate": "Maple Fence Gate", + "block.byg.maple_leaves": "Maple Leaves", + "block.byg.maple_log": "Maple Log", + "block.byg.maple_planks": "Maple Planks", + "block.byg.maple_pressure_plate": "Maple Pressure Plate", + "block.byg.maple_sapling": "Maple Sapling", + "block.byg.maple_sign": "Maple Sign", + "block.byg.maple_slab": "Maple Slab", + "block.byg.maple_stairs": "Maple Stairs", + "block.byg.maple_trapdoor": "Maple Trapdoor", + "block.byg.maple_wall_sign": "Maple Wall Sign", + "block.byg.maple_wood": "Maple Wood", + "block.byg.medium_subzero_crystal_bud": "Medium Subzero Crystal Bud", + "block.byg.mini_cactus": "Mini Cactus", + "block.byg.mossy_red_rock_brick_slab": "Mossy Red Rock Brick Slab", + "block.byg.mossy_red_rock_brick_stairs": "Mossy Red Rock Brick Stairs", + "block.byg.mossy_red_rock_brick_wall": "Mossy Red Rock Brick Wall", + "block.byg.mossy_red_rock_bricks": "Mossy Red Rock Bricks", + "block.byg.mossy_stone": "Mossy Stone", + "block.byg.mossy_stone_slab": "Mossy Stone Slab", + "block.byg.mossy_stone_stairs": "Mossy Stone Stairs", + "block.byg.mossy_stone_wall": "Mossy Stone Wall", + "block.byg.mud_block": "Mud Block", + "block.byg.mud_bricks": "Mud Bricks", + "block.byg.mycelium_netherrack": "Mycelium Netherrack", + "block.byg.nether_bristle": "Nether Bristle", + "block.byg.nightshade_berry_bush": "Nightshade Berry Bush", + "block.byg.nightshade_bookshelf": "Nightshade Bookshelf", + "block.byg.nightshade_button": "Nightshade Button", + "block.byg.nightshade_crafting_table": "Nightshade Crafting Table", + "block.byg.nightshade_door": "Nightshade Door", + "block.byg.nightshade_fence": "Nightshade Fence", + "block.byg.nightshade_fence_gate": "Nightshade Fence Gate", + "block.byg.nightshade_leaves": "Nightshade Leaves", + "block.byg.nightshade_log": "Nightshade Log", + "block.byg.nightshade_phylium": "Nightshade Phylium", + "block.byg.nightshade_planks": "Nightshade Planks", + "block.byg.nightshade_pressure_plate": "Nightshade Pressure Plate", + "block.byg.nightshade_roots": "Nightshade Roots", + "block.byg.nightshade_sapling": "Nightshade Sapling", + "block.byg.nightshade_sign": "Nightshade Sign", + "block.byg.nightshade_slab": "Nightshade Slab", + "block.byg.nightshade_sprouts": "Nightshade Sprouts", + "block.byg.nightshade_stairs": "Nightshade Stairs", + "block.byg.nightshade_trapdoor": "Nightshade Trapdoor", + "block.byg.nightshade_wall_sign": "Nightshade Wall Sign", + "block.byg.nightshade_wood": "Nightshade Wood", + "block.byg.oddity_bush": "Oddity Bush", + "block.byg.oddity_cactus": "Oddity Cactus", + "block.byg.orange_amaranth": "Orange Amaranth", + "block.byg.orange_birch_leaves": "Orange Birch Leaves", + "block.byg.orange_birch_sapling": "Orange Birch Sapling", + "block.byg.orange_daisy": "Orange Daisy", + "block.byg.orange_oak_leaves": "Orange Oak Leaves", + "block.byg.orange_oak_sapling": "Orange Oak Sapling", + "block.byg.orange_spruce_leaves": "Orange Spruce Leaves", + "block.byg.orange_spruce_sapling": "Orange Spruce Sapling", + "block.byg.orchard_leaves": "Orchard Leaves", + "block.byg.orchard_sapling": "Orchard Sapling", + "block.byg.osiria_rose": "Osiria Rose", + "block.byg.overgrown_crimson_blackstone": "Overgrown Crimson Blackstone", + "block.byg.overgrown_dacite": "Overgrown Dacite", + "block.byg.overgrown_netherrack": "Overgrown Netherrack", + "block.byg.overgrown_stone": "Overgrown Stone", + "block.byg.packed_black_ice": "Packed Black Ice", + "block.byg.palm_bookshelf": "Palm Bookshelf", + "block.byg.palm_button": "Palm Button", + "block.byg.palm_crafting_table": "Palm Crafting Table", + "block.byg.palm_door": "Palm Door", + "block.byg.palm_fence": "Palm Fence", + "block.byg.palm_fence_gate": "Palm Fence Gate", + "block.byg.palm_leaves": "Palm Leaves", + "block.byg.palm_log": "Palm Log", + "block.byg.palm_planks": "Palm Planks", + "block.byg.palm_pressure_plate": "Palm Pressure Plate", + "block.byg.palm_sapling": "Palm Sapling", + "block.byg.palm_sign": "Palm Sign", + "block.byg.palm_slab": "Palm Slab", + "block.byg.palm_stairs": "Palm Stairs", + "block.byg.palm_trapdoor": "Palm Trapdoor", + "block.byg.palm_wall_sign": "Palm Wall Sign", + "block.byg.palm_wood": "Palm Wood", + "block.byg.palo_verde_leaves": "Palo Verde Leaves", + "block.byg.palo_verde_log": "Palo Verde Log", + "block.byg.palo_verde_sapling": "Palo Verde Sapling", + "block.byg.palo_verde_wood": "Palo Verde Wood", + "block.byg.peach_leather_flower": "Peach Leather Flower", + "block.byg.peat": "Peat", + "block.byg.pendorite_block": "Pendorite Block", + "block.byg.pendorite_ore": "Pendorite Ore", + "block.byg.pervaded_netherrack": "Pervaded Netherrack", + "block.byg.pine_bookshelf": "Pine Bookshelf", + "block.byg.pine_button": "Pine Button", + "block.byg.pine_crafting_table": "Pine Crafting Table", + "block.byg.pine_door": "Pine Door", + "block.byg.pine_fence": "Pine Fence", + "block.byg.pine_fence_gate": "Pine Fence Gate", + "block.byg.pine_leaves": "Pine Leaves", + "block.byg.pine_log": "Pine Log", + "block.byg.pine_planks": "Pine Planks", + "block.byg.pine_pressure_plate": "Pine Pressure Plate", + "block.byg.pine_sapling": "Pine Sapling", + "block.byg.pine_sign": "Pine Sign", + "block.byg.pine_slab": "Pine Slab", + "block.byg.pine_stairs": "Pine Stairs", + "block.byg.pine_trapdoor": "Pine Trapdoor", + "block.byg.pine_wall_sign": "Pine Wall Sign", + "block.byg.pine_wood": "Pine Wood", + "block.byg.pink_allium": "Pink Allium", + "block.byg.pink_allium_flower_bush": "Pink Allium Flower Bush", + "block.byg.pink_anemone": "Pink Anemone", + "block.byg.pink_cherry_foliage": "Pink Cherry Foliage", + "block.byg.pink_cherry_leaves": "Pink Cherry Leaves", + "block.byg.pink_cherry_sapling": "Pink Cherry Sapling", + "block.byg.pink_chiseled_sandstone": "Pink Chiseled Sandstone", + "block.byg.pink_cut_sandstone": "Pink Cut Sandstone", + "block.byg.pink_daffodil": "Pink Daffodil", + "block.byg.pink_sand": "Pink Sand", + "block.byg.pink_sandstone": "Pink Sandstone", + "block.byg.pink_smooth_sandstone": "Pink Smooth Sandstone", + "block.byg.plant_stem": "Plant Stem", + "block.byg.podzol_dacite": "Podzol Dacite", + "block.byg.poison_ivy": "Poison Ivy", + "block.byg.polished_soapstone": "Polished Soapstone", + "block.byg.polished_soapstone_slab": "Polished Soapstone Slab", + "block.byg.polished_soapstone_stairs": "Polished Soapstone Stairs", + "block.byg.polished_soapstone_wall": "Polished Soapstone Wall", + "block.byg.polished_travertine": "Polished Travertine", + "block.byg.polished_travertine_slab": "Polished Travertine Slab", + "block.byg.polished_travertine_stairs": "Polished Travertine Stairs", + "block.byg.polished_travertine_wall": "Polished Travertine Wall", + "block.byg.pollen_block": "Pollen Block", + "block.byg.potted_alpine_bellflower": "Potted Alpine Bellflower", + "block.byg.potted_angelica": "Potted Angelica", + "block.byg.potted_araucaria_sapling": "Potted Araucaria Sapling", + "block.byg.potted_aspen_sapling": "Potted Aspen Sapling", + "block.byg.potted_baobab_sapling": "Potted Baobab Sapling", + "block.byg.potted_begonia": "Potted Begonia", + "block.byg.potted_bistort": "Potted Bistort", + "block.byg.potted_black_rose": "Potted Black Rose", + "block.byg.potted_blue_enchanted_sapling": "Potted Blue Enchanted Sapling", + "block.byg.potted_blue_sage": "Potted Blue Sage", + "block.byg.potted_blue_spruce_sapling": "Potted Blue Spruce Sapling", + "block.byg.potted_brown_birch_sapling": "Potted Brown Birch Sapling", + "block.byg.potted_brown_oak_sapling": "Potted Brown Oak Sapling", + "block.byg.potted_brown_zelkova_sapling": "Potted Brown Zelkova Sapling", + "block.byg.potted_bulbis_oddity": "Potted Bulbis Oddity", + "block.byg.potted_california_poppy": "Potted California Poppy", + "block.byg.potted_cika_sapling": "Potted Cika Sapling", + "block.byg.potted_crocus": "Potted Crocus", + "block.byg.potted_cyan_rose": "Potted Cyan Rose", + "block.byg.potted_cyan_tulip": "Potted Cyan Tulip", + "block.byg.potted_cypress_sapling": "Potted Cypress Sapling", + "block.byg.potted_daffodil": "Potted Daffodil", + "block.byg.potted_death_cap": "Potted Death Cap", + "block.byg.potted_ebony_sapling": "Potted Ebony Sapling", + "block.byg.potted_embur_wart": "Potted Embur Wart", + "block.byg.potted_ether_sapling": "Potted Ether Sapling", + "block.byg.potted_fir_sapling": "Potted Fir Sapling", + "block.byg.potted_firecracker_flower_bush": "Potted Firecracker Flower Bush", + "block.byg.potted_flowering_indigo_jacaranda_bush": "Potted Flowering Indigo Jacaranda Bush", + "block.byg.potted_flowering_jacaranda_bush": "Potted Flowering Jacaranda Bush", + "block.byg.potted_fungal_imparius": "Potted Fungal Imparius", + "block.byg.potted_golden_spined_cactus": "Potted Golden Spined Cactus", + "block.byg.potted_green_enchanted_sapling": "Potted Green Enchanted Sapling", + "block.byg.potted_green_mushroom": "Potted Green Mushroom", + "block.byg.potted_green_tulip": "Potted Green Tulip", + "block.byg.potted_guzmania": "Potted Guzmania", + "block.byg.potted_holly_sapling": "Potted Holly Sapling", + "block.byg.potted_horseweed": "Potted Horseweed", + "block.byg.potted_hydrangea_bush": "Potted Hydrangea Bush", + "block.byg.potted_imparius_mushroom": "Potted Imparius Mushroom", + "block.byg.potted_incan_lily": "Potted Incan Lily", + "block.byg.potted_indigo_jacaranda_bush": "Potted Indigo Jacaranda Bush", + "block.byg.potted_indigo_jacaranda_sapling": "Potted Indigo Jacaranda Sapling", + "block.byg.potted_iris": "Potted Iris", + "block.byg.potted_jacaranda_bush": "Potted Jacaranda Bush", + "block.byg.potted_jacaranda_sapling": "Potted Jacaranda Sapling", + "block.byg.potted_joshua_sapling": "Potted Joshua Sapling", + "block.byg.potted_kovan_flower": "Potted Kovan Flower", + "block.byg.potted_lament_sapling": "Potted Lament Sapling", + "block.byg.potted_lazarus_bellflower": "Potted Lazarus Bellflower", + "block.byg.potted_lollipop_flower": "Potted Lollipop Flower", + "block.byg.potted_magenta_tulip": "Potted Magenta Tulip", + "block.byg.potted_mahogany_sapling": "Potted Mahogany Sapling", + "block.byg.potted_mangrove_sapling": "Potted Mangrove Sapling", + "block.byg.potted_maple_sapling": "Potted Maple Sapling", + "block.byg.potted_mini_cactus": "Potted Mini Cactus", + "block.byg.potted_nightshade_sapling": "Potted Nightshade Sapling", + "block.byg.potted_orange_birch_sapling": "Potted Orange Birch Sapling", + "block.byg.potted_orange_daisy": "Potted Orange Daisy", + "block.byg.potted_orange_oak_sapling": "Potted Orange Oak Sapling", + "block.byg.potted_orange_spruce_sapling": "Potted Orange Spruce Sapling", + "block.byg.potted_orchard_sapling": "Potted Orchard Sapling", + "block.byg.potted_osiria_rose": "Potted Osiria Rose", + "block.byg.potted_palm_sapling": "Potted Palm Sapling", + "block.byg.potted_palo_verde_sapling": "Potted Palo Verde Sapling", + "block.byg.potted_peach_leather_flower": "Potted Peach Leather Flower", + "block.byg.potted_pine_sapling": "Potted Pine Sapling", + "block.byg.potted_pink_allium": "Potted Pink Allium", + "block.byg.potted_pink_anemone": "Potted Pink Anemone", + "block.byg.potted_pink_cherry_sapling": "Potted Pink Cherry Sapling", + "block.byg.potted_pink_daffodil": "Potted Pink Daffodil", + "block.byg.potted_prickly_pear_cactus": "Potted Prickly Pear Cactus", + "block.byg.potted_protea_flower": "Potted Protea Flower", + "block.byg.potted_purple_bulbis_oddity": "Potted Purple Bulbis Oddity", + "block.byg.potted_purple_sage": "Potted Purple Sage", + "block.byg.potted_purple_tulip": "Potted Purple Tulip", + "block.byg.potted_rainbow_eucalyptus_sapling": "Potted Rainbow Eucalyptus Sapling", + "block.byg.potted_red_birch_sapling": "Potted Red Birch Sapling", + "block.byg.potted_red_maple_sapling": "Potted Red Maple Sapling", + "block.byg.potted_red_oak_sapling": "Potted Red Oak Sapling", + "block.byg.potted_red_spruce_sapling": "Potted Red Spruce Sapling", + "block.byg.potted_redwood_sapling": "Potted Redwood Sapling", + "block.byg.potted_richea": "Potted Richea", + "block.byg.potted_rose": "Potted Rose", + "block.byg.potted_shrub": "Potted Shrub", + "block.byg.potted_shulkren_fungus": "Potted Shulkren Fungus", + "block.byg.potted_silver_maple_sapling": "Potted Silver Maple Sapling", + "block.byg.potted_silver_vase_flower": "Potted Silver Vase Flower", + "block.byg.potted_skyris_sapling": "Potted Skyris Sapling", + "block.byg.potted_snowdrops": "Potted Snowdrops", + "block.byg.potted_soul_shroom": "Potted Soul Shroom", + "block.byg.potted_sythian_fungus": "Potted Sythian Fungus", + "block.byg.potted_torch_ginger": "Potted Torch Ginger", + "block.byg.potted_violet_leather_flower": "Potted Violet Leather Flower", + "block.byg.potted_weeping_milkcap": "Potted Weeping Milkcap", + "block.byg.potted_white_anemone": "Potted White Anemone", + "block.byg.potted_white_cherry_sapling": "Potted White Cherry Sapling", + "block.byg.potted_white_puffball": "Potted White Puffball", + "block.byg.potted_white_sage": "Potted White Sage", + "block.byg.potted_willow_sapling": "Potted Willow Sapling", + "block.byg.potted_winter_cyclamen": "Potted Winter Cyclamen", + "block.byg.potted_winter_rose": "Potted Winter Rose", + "block.byg.potted_winter_scilla": "Potted Winter Scilla", + "block.byg.potted_winter_succulent": "Potted Winter Succulent", + "block.byg.potted_witch_hazel_sapling": "Potted Witch Hazel Sapling", + "block.byg.potted_withering_oak_sapling": "Potted Withering Oak Sapling", + "block.byg.potted_wood_blewit": "Potted Wood Blewit", + "block.byg.potted_yellow_birch_sapling": "Potted Yellow Birch Sapling", + "block.byg.potted_yellow_daffodil": "Potted Yellow Daffodil", + "block.byg.potted_yellow_spruce_sapling": "Potted Yellow Spruce Sapling", + "block.byg.potted_yellow_tulip": "Potted Yellow Tulip", + "block.byg.potted_zelkova_sapling": "Potted Zelkova Sapling", + "block.byg.prairie_grass": "Prairie Grass", + "block.byg.prickly_pear_cactus": "Prickly Pear Cactus", + "block.byg.protea_flower": "Protea Flower", + "block.byg.purple_amaranth": "Purple Amaranth", + "block.byg.purple_bulbis_anomaly": "Purple Bulbis Anomaly", + "block.byg.purple_bulbis_oddity": "Purple Bulbis Oddity", + "block.byg.purple_bulbis_shell": "Purple Bulbis Shell", + "block.byg.purple_chiseled_sandstone": "Purple Chiseled Sandstone", + "block.byg.purple_cut_sandstone": "Purple Cut Sandstone", + "block.byg.purple_petal_block": "Purple Petal Block", + "block.byg.purple_sage": "Purple Sage", + "block.byg.purple_sand": "Purple Sand", + "block.byg.purple_sandstone": "Purple Sandstone", + "block.byg.purple_shroomlight": "Purple Shroomlight", + "block.byg.purple_smooth_sandstone": "Purple Smooth Sandstone", + "block.byg.purple_tulip": "Purple Tulip", + "block.byg.purpur_stone": "Purpur Stone", + "block.byg.purpur_stone_slab": "Purpur Stone Slab", + "block.byg.purpur_stone_stairs": "Purpur Stone Stairs", + "block.byg.purpur_stone_wall": "Purpur Stone Wall", + "block.byg.quartz_crystal": "Quartz Crystal", + "block.byg.quartzite_sand": "Quartzite Sand", + "block.byg.rainbow_eucalyptus_bookshelf": "Rainbow Eucalyptus Bookshelf", + "block.byg.rainbow_eucalyptus_button": "Rainbow Eucalyptus Button", + "block.byg.rainbow_eucalyptus_crafting_table": "Rainbow Eucalyptus Crafting Table", + "block.byg.rainbow_eucalyptus_door": "Rainbow Eucalyptus Door", + "block.byg.rainbow_eucalyptus_fence": "Rainbow Eucalyptus Fence", + "block.byg.rainbow_eucalyptus_fence_gate": "Rainbow Eucalyptus Fence Gate", + "block.byg.rainbow_eucalyptus_leaves": "Rainbow Eucalyptus Leaves", + "block.byg.rainbow_eucalyptus_log": "Rainbow Eucalyptus Log", + "block.byg.rainbow_eucalyptus_planks": "Rainbow Eucalyptus Planks", + "block.byg.rainbow_eucalyptus_pressure_plate": "Rainbow Eucalyptus Pressure Plate", + "block.byg.rainbow_eucalyptus_sapling": "Rainbow Eucalyptus Sapling", + "block.byg.rainbow_eucalyptus_sign": "Rainbow Eucalyptus Sign", + "block.byg.rainbow_eucalyptus_slab": "Rainbow Eucalyptus Slab", + "block.byg.rainbow_eucalyptus_stairs": "Rainbow Eucalyptus Stairs", + "block.byg.rainbow_eucalyptus_trapdoor": "Rainbow Eucalyptus Trapdoor", + "block.byg.rainbow_eucalyptus_wall_sign": "Rainbow Eucalyptus Wall Sign", + "block.byg.rainbow_eucalyptus_wood": "Rainbow Eucalyptus Wood", + "block.byg.raw_pendorite_block": "Raw Pendorite Block", + "block.byg.raw_quartz_block": "Raw Quartz Block", + "block.byg.red_birch_leaves": "Red Birch Leaves", + "block.byg.red_birch_sapling": "Red Birch Sapling", + "block.byg.red_maple_leaves": "Red Maple Leaves", + "block.byg.red_maple_sapling": "Red Maple Sapling", + "block.byg.red_oak_leaves": "Red Oak Leaves", + "block.byg.red_oak_sapling": "Red Oak Sapling", + "block.byg.red_petal_block": "Red Petal Block", + "block.byg.red_rock": "Red Rock", + "block.byg.red_rock_brick_slab": "Red Rock Brick Slab", + "block.byg.red_rock_brick_stairs": "Red Rock Brick Stairs", + "block.byg.red_rock_brick_wall": "Red Rock Brick Wall", + "block.byg.red_rock_bricks": "Red Rock Bricks", + "block.byg.red_rock_slab": "Red Rock Slab", + "block.byg.red_rock_stairs": "Red Rock Stairs", + "block.byg.red_rock_wall": "Red Rock Wall", + "block.byg.red_spruce_leaves": "Red Spruce Leaves", + "block.byg.red_spruce_sapling": "Red Spruce Sapling", + "block.byg.redwood_bookshelf": "Redwood Bookshelf", + "block.byg.redwood_button": "Redwood Button", + "block.byg.redwood_crafting_table": "Redwood Crafting Table", + "block.byg.redwood_door": "Redwood Door", + "block.byg.redwood_fence": "Redwood Fence", + "block.byg.redwood_fence_gate": "Redwood Fence Gate", + "block.byg.redwood_leaves": "Redwood Leaves", + "block.byg.redwood_log": "Redwood Log", + "block.byg.redwood_planks": "Redwood Planks", + "block.byg.redwood_pressure_plate": "Redwood Pressure Plate", + "block.byg.redwood_sapling": "Redwood Sapling", + "block.byg.redwood_sign": "Redwood Sign", + "block.byg.redwood_slab": "Redwood Slab", + "block.byg.redwood_stairs": "Redwood Stairs", + "block.byg.redwood_trapdoor": "Redwood Trapdoor", + "block.byg.redwood_wall_sign": "Redwood Wall Sign", + "block.byg.redwood_wood": "Redwood Wood", + "block.byg.richea": "Richea", + "block.byg.ripe_joshua_leaves": "Ripe Joshua Leaves", + "block.byg.ripe_orchard_leaves": "Ripe Orchard Leaves", + "block.byg.rocky_stone": "Rocky Stone", + "block.byg.rocky_stone_slab": "Rocky Stone Slab", + "block.byg.rocky_stone_stairs": "Rocky Stone Stairs", + "block.byg.rocky_stone_wall": "Rocky Stone Wall", + "block.byg.rose": "Rose", + "block.byg.scorched_bush": "Scorched Bush", + "block.byg.scorched_grass": "Scorched Grass", + "block.byg.scoria_cobblestone": "Scoria Cobblestone", + "block.byg.scoria_cobblestone_slab": "Scoria Cobblestone Slab", + "block.byg.scoria_cobblestone_stairs": "Scoria Cobblestone Stairs", + "block.byg.scoria_cobblestone_wall": "Scoria Cobblestone Wall", + "block.byg.scoria_pillar": "Scoria Pillar", + "block.byg.scoria_stone": "Scoria Stone", + "block.byg.scoria_stone_slab": "Scoria Stone Slab", + "block.byg.scoria_stone_stairs": "Scoria Stone Stairs", + "block.byg.scoria_stone_wall": "Scoria Stone Wall", + "block.byg.scoria_stonebrick_slab": "Scoria Stonebrick Slab", + "block.byg.scoria_stonebrick_stairs": "Scoria Stonebrick Stairs", + "block.byg.scoria_stonebrick_wall": "Scoria Stonebrick Wall", + "block.byg.scoria_stonebricks": "Scoria Stonebricks", + "block.byg.shiny_chiseled_therium": "Shiny Chiseled Therium", + "block.byg.shiny_chiseled_therium_slab": "Shiny Chiseled Therium Slab", + "block.byg.shiny_chiseled_therium_stairs": "Shiny Chiseled Therium Stairs", + "block.byg.shiny_chiseled_therium_wall": "Shiny Chiseled Therium Wall", + "block.byg.shrub": "Shrub", + "block.byg.shulkren_fungus": "Shulkren Fungus", + "block.byg.shulkren_moss_blanket": "Shulkren Moss Blanket", + "block.byg.shulkren_phylium": "Shulkren Phylium", + "block.byg.shulkren_vine": "Shulkren Vine", + "block.byg.shulkren_vine_plant": "Shulkren Vine Plant", + "block.byg.shulkren_wart_block": "Shulkren Wart Block", + "block.byg.silver_maple_leaves": "Silver Maple Leaves", + "block.byg.silver_maple_sapling": "Silver Maple Sapling", + "block.byg.silver_vase_flower": "Silver Vase Flower", + "block.byg.skyris_bookshelf": "Skyris Bookshelf", + "block.byg.skyris_button": "Skyris Button", + "block.byg.skyris_crafting_table": "Skyris Crafting Table", + "block.byg.skyris_door": "Skyris Door", + "block.byg.skyris_fence": "Skyris Fence", + "block.byg.skyris_fence_gate": "Skyris Fence Gate", + "block.byg.skyris_leaves": "Skyris Leaves", + "block.byg.skyris_log": "Skyris Log", + "block.byg.skyris_planks": "Skyris Planks", + "block.byg.skyris_pressure_plate": "Skyris Pressure Plate", + "block.byg.skyris_sapling": "Skyris Sapling", + "block.byg.skyris_sign": "Skyris Sign", + "block.byg.skyris_slab": "Skyris Slab", + "block.byg.skyris_stairs": "Skyris Stairs", + "block.byg.skyris_trapdoor": "Skyris Trapdoor", + "block.byg.skyris_vine": "Skyris Vine", + "block.byg.skyris_wall_sign": "Skyris Wall Sign", + "block.byg.skyris_wood": "Skyris Wood", + "block.byg.small_subzero_crystal_bud": "Small Subzero Crystal Bud", + "block.byg.smooth_windswept_sandstone": "Smooth Windswept Sandstone", + "block.byg.smooth_windswept_sandstone_slab": "Smooth Windswept Sandstone Slab", + "block.byg.smooth_windswept_sandstone_stairs": "Smooth Windswept Sandstone Stairs", + "block.byg.smooth_windswept_sandstone_wall": "Smooth Windswept Sandstone Wall", + "block.byg.snowdrops": "Snowdrops", + "block.byg.soapstone": "Soapstone", + "block.byg.soapstone_brick_slab": "Soapstone Brick Slab", + "block.byg.soapstone_brick_stairs": "Soapstone Brick Stairs", + "block.byg.soapstone_brick_wall": "Soapstone Brick Wall", + "block.byg.soapstone_bricks": "Soapstone Bricks", + "block.byg.soapstone_pillar": "Soapstone Pillar", + "block.byg.soapstone_slab": "Soapstone Slab", + "block.byg.soapstone_stairs": "Soapstone Stairs", + "block.byg.soapstone_tile": "Soapstone Tile", + "block.byg.soapstone_tile_slab": "Soapstone Tile Slab", + "block.byg.soapstone_tile_stairs": "Soapstone Tile Stairs", + "block.byg.soapstone_tile_wall": "Soapstone Tile Wall", + "block.byg.soapstone_wall": "Soapstone Wall", + "block.byg.soul_shroom": "Soul Shroom", + "block.byg.soul_shroom_block": "Soul Shroom Block", + "block.byg.soul_shroom_spore": "Soul Shroom Spore", + "block.byg.soul_shroom_spore_end": "Soul Shroom Spore End", + "block.byg.soul_shroom_stem": "Soul Shroom Stem", + "block.byg.stripped_aspen_log": "Stripped Aspen Log", + "block.byg.stripped_aspen_wood": "Stripped Aspen Wood", + "block.byg.stripped_baobab_log": "Stripped Baobab Log", + "block.byg.stripped_baobab_wood": "Stripped Baobab Wood", + "block.byg.stripped_blue_enchanted_log": "Stripped Blue Enchanted Log", + "block.byg.stripped_blue_enchanted_wood": "Stripped Blue Enchanted Wood", + "block.byg.stripped_bulbis_stem": "Stripped Bulbis Stem", + "block.byg.stripped_bulbis_wood": "Stripped Bulbis Wood", + "block.byg.stripped_cherry_log": "Stripped Cherry Log", + "block.byg.stripped_cherry_wood": "Stripped Cherry Wood", + "block.byg.stripped_cika_log": "Stripped Cika Log", + "block.byg.stripped_cika_wood": "Stripped Cika Wood", + "block.byg.stripped_cypress_log": "Stripped Cypress Log", + "block.byg.stripped_cypress_wood": "Stripped Cypress Wood", + "block.byg.stripped_ebony_log": "Stripped Ebony Log", + "block.byg.stripped_ebony_wood": "Stripped Ebony Wood", + "block.byg.stripped_embur_hyphae": "Stripped Embur Hyphae", + "block.byg.stripped_embur_pedu": "Stripped Embur Pedu", + "block.byg.stripped_ether_log": "Stripped Ether Log", + "block.byg.stripped_ether_wood": "Stripped Ether Wood", + "block.byg.stripped_fir_log": "Stripped Fir Log", + "block.byg.stripped_fir_wood": "Stripped Fir Wood", + "block.byg.stripped_green_enchanted_log": "Stripped Green Enchanted Log", + "block.byg.stripped_green_enchanted_wood": "Stripped Green Enchanted Wood", + "block.byg.stripped_holly_log": "Stripped Holly Log", + "block.byg.stripped_holly_wood": "Stripped Holly Wood", + "block.byg.stripped_jacaranda_log": "Stripped Jacaranda Log", + "block.byg.stripped_jacaranda_wood": "Stripped Jacaranda Wood", + "block.byg.stripped_lament_log": "Stripped Lament Log", + "block.byg.stripped_lament_wood": "Stripped Lament Wood", + "block.byg.stripped_mahogany_log": "Stripped Mahogany Log", + "block.byg.stripped_mahogany_wood": "Stripped Mahogany Wood", + "block.byg.stripped_mangrove_log": "Stripped Mangrove Log", + "block.byg.stripped_mangrove_wood": "Stripped Mangrove Wood", + "block.byg.stripped_maple_log": "Stripped Maple Log", + "block.byg.stripped_maple_wood": "Stripped Maple Wood", + "block.byg.stripped_nightshade_log": "Stripped Nightshade Log", + "block.byg.stripped_nightshade_wood": "Stripped Nightshade Wood", + "block.byg.stripped_palm_log": "Stripped Palm Log", + "block.byg.stripped_palm_wood": "Stripped Palm Wood", + "block.byg.stripped_palo_verde_log": "Stripped Palo Verde Log", + "block.byg.stripped_palo_verde_wood": "Stripped Palo Verde Wood", + "block.byg.stripped_pine_log": "Stripped Pine Log", + "block.byg.stripped_pine_wood": "Stripped Pine Wood", + "block.byg.stripped_rainbow_eucalyptus_log": "Stripped Rainbow Eucalyptus Log", + "block.byg.stripped_rainbow_eucalyptus_wood": "Stripped Rainbow Eucalyptus Wood", + "block.byg.stripped_redwood_log": "Stripped Redwood Log", + "block.byg.stripped_redwood_wood": "Stripped Redwood Wood", + "block.byg.stripped_skyris_log": "Stripped Skyris Log", + "block.byg.stripped_skyris_wood": "Stripped Skyris Wood", + "block.byg.stripped_sythian_hyphae": "Stripped Sythian Hyphae", + "block.byg.stripped_sythian_stem": "Stripped Sythian Stem", + "block.byg.stripped_willow_log": "Stripped Willow Log", + "block.byg.stripped_willow_wood": "Stripped Willow Wood", + "block.byg.stripped_witch_hazel_log": "Stripped Witch Hazel Log", + "block.byg.stripped_witch_hazel_wood": "Stripped Witch Hazel Wood", + "block.byg.stripped_zelkova_log": "Stripped Zelkova Log", + "block.byg.stripped_zelkova_wood": "Stripped Zelkova Wood", + "block.byg.subzero_ash": "Subzero Ash", + "block.byg.subzero_ash_block": "Subzero Ash Block", + "block.byg.subzero_crystal_block": "Subzero Crystal Block", + "block.byg.subzero_crystal_cluster": "Subzero Crystal Cluster", + "block.byg.sythian_bookshelf": "Sythian Bookshelf", + "block.byg.sythian_button": "Sythian Button", + "block.byg.sythian_crafting_table": "Sythian Crafting Table", + "block.byg.sythian_door": "Sythian Door", + "block.byg.sythian_fence": "Sythian Fence", + "block.byg.sythian_fence_gate": "Sythian Fence Gate", + "block.byg.sythian_fungus": "Sythian Fungus", + "block.byg.sythian_hyphae": "Sythian Hyphae", + "block.byg.sythian_nylium": "Sythian Nylium", + "block.byg.sythian_planks": "Sythian Planks", + "block.byg.sythian_pressure_plate": "Sythian Pressure Plate", + "block.byg.sythian_roots": "Sythian Roots", + "block.byg.sythian_sapling": "Sythian Sapling", + "block.byg.sythian_scaffolding": "Sythian Scaffolding", + "block.byg.sythian_sign": "Sythian Sign", + "block.byg.sythian_slab": "Sythian Slab", + "block.byg.sythian_sprout": "Sythian Sprout", + "block.byg.sythian_stairs": "Sythian Stairs", + "block.byg.sythian_stalk_block": "Sythian Stalk Block", + "block.byg.sythian_stem": "Sythian Stem", + "block.byg.sythian_trapdoor": "Sythian Trapdoor", + "block.byg.sythian_wall_sign": "Sythian Wall Sign", + "block.byg.sythian_wart_block": "Sythian Wart Block", + "block.byg.tall_allium": "Tall Allium", + "block.byg.tall_beach_grass": "Tall Beach Grass", + "block.byg.tall_crimson_roots": "Tall Crimson Roots", + "block.byg.tall_cryptic_vent": "Tall Cryptic Vent", + "block.byg.tall_embur_roots": "Tall Embur Roots", + "block.byg.tall_ether_grass": "Tall Ether Grass", + "block.byg.tall_pink_allium": "Tall Pink Allium", + "block.byg.tall_prairie_grass": "Tall Prairie Grass", + "block.byg.thereal_bellflower": "Thereal Bellflower", + "block.byg.therium_block": "Therium Block", + "block.byg.therium_crystal": "Therium Crystal", + "block.byg.therium_glass": "Therium Glass", + "block.byg.therium_glass_pane": "Therium Glass Pane", + "block.byg.therium_lamp": "Therium Lamp", + "block.byg.therium_lantern": "Therium Lantern", + "block.byg.tiny_lilypads": "Tiny Lilypads", + "block.byg.torch_ginger": "Torch Ginger", + "block.byg.travertine": "Travertine", + "block.byg.travertine_slab": "Travertine Slab", + "block.byg.travertine_stairs": "Travertine Stairs", + "block.byg.travertine_wall": "Travertine Wall", + "block.byg.vermilion_sculk": "Vermilion Sculk", + "block.byg.vermilion_sculk_growth": "Vermilion Sculk Growth", + "block.byg.vermilion_sculk_tendrils": "Vermilion Sculk Tendrils", + "block.byg.violet_leather_flower": "Violet Leather Flower", + "block.byg.wailing_bell_blossom": "Wailing Bell Blossom", + "block.byg.wailing_grass": "Wailing Grass", + "block.byg.wailing_nylium": "Wailing Nylium", + "block.byg.wailing_vine": "Wailing Vine", + "block.byg.warped_bush": "Warped Bush", + "block.byg.warped_cactus": "Warped Cactus", + "block.byg.warped_coral": "Warped Coral", + "block.byg.warped_coral_block": "Warped Coral Block", + "block.byg.warped_coral_fan": "Warped Coral Fan", + "block.byg.warped_coral_wall_fan": "Warped Coral Wall Fan", + "block.byg.warped_soul_sand": "Warped Soul Sand", + "block.byg.warped_soul_soil": "Warped Soul Soil", + "block.byg.water_barrel_cactus": "Water Barrel Cactus", + "block.byg.water_silk": "Water Silk", + "block.byg.weeping_milkcap": "Weeping Milkcap", + "block.byg.weeping_milkcap_mushroom_block": "Weeping Milkcap Mushroom Block", + "block.byg.weeping_roots": "Weeping Roots", + "block.byg.weeping_roots_plant": "Weeping Roots Plant", + "block.byg.white_anemone": "White Anemone", + "block.byg.white_cherry_foliage": "White Cherry Foliage", + "block.byg.white_cherry_leaves": "White Cherry Leaves", + "block.byg.white_cherry_sapling": "White Cherry Sapling", + "block.byg.white_chiseled_sandstone": "White Chiseled Sandstone", + "block.byg.white_cut_sandstone": "White Cut Sandstone", + "block.byg.white_mushroom_stem": "White Mushroom Stem", + "block.byg.white_petal_block": "White Petal Block", + "block.byg.white_puffball": "White Puffball", + "block.byg.white_sage": "White Sage", + "block.byg.white_sand": "White Sand", + "block.byg.white_sandstone": "White Sandstone", + "block.byg.white_smooth_sandstone": "White Smooth Sandstone", + "block.byg.willow_bookshelf": "Willow Bookshelf", + "block.byg.willow_button": "Willow Button", + "block.byg.willow_crafting_table": "Willow Crafting Table", + "block.byg.willow_door": "Willow Door", + "block.byg.willow_fence": "Willow Fence", + "block.byg.willow_fence_gate": "Willow Fence Gate", + "block.byg.willow_leaves": "Willow Leaves", + "block.byg.willow_log": "Willow Log", + "block.byg.willow_planks": "Willow Planks", + "block.byg.willow_pressure_plate": "Willow Pressure Plate", + "block.byg.willow_sapling": "Willow Sapling", + "block.byg.willow_sign": "Willow Sign", + "block.byg.willow_slab": "Willow Slab", + "block.byg.willow_stairs": "Willow Stairs", + "block.byg.willow_trapdoor": "Willow Trapdoor", + "block.byg.willow_wall_sign": "Willow Wall Sign", + "block.byg.willow_wood": "Willow Wood", + "block.byg.windswept_sand": "Windswept Sand", + "block.byg.windswept_sandstone": "Windswept Sandstone", + "block.byg.windswept_sandstone_pillar": "Windswept Sandstone Pillar", + "block.byg.windswept_sandstone_slab": "Windswept Sandstone Slab", + "block.byg.windswept_sandstone_stairs": "Windswept Sandstone Stairs", + "block.byg.windswept_sandstone_wall": "Windswept Sandstone Wall", + "block.byg.winter_cyclamen": "Winter Cyclamen", + "block.byg.winter_rose": "Winter Rose", + "block.byg.winter_scilla": "Winter Scilla", + "block.byg.winter_succulent": "Winter Succulent", + "block.byg.witch_hazel_blossom": "Witch Hazel Blossom", + "block.byg.witch_hazel_bookshelf": "Witch Hazel Bookshelf", + "block.byg.witch_hazel_branch": "Witch Hazel Branch", + "block.byg.witch_hazel_button": "Witch Hazel Button", + "block.byg.witch_hazel_crafting_table": "Witch Hazel Crafting Table", + "block.byg.witch_hazel_door": "Witch Hazel Door", + "block.byg.witch_hazel_fence": "Witch Hazel Fence", + "block.byg.witch_hazel_fence_gate": "Witch Hazel Fence Gate", + "block.byg.witch_hazel_leaves": "Witch Hazel Leaves", + "block.byg.witch_hazel_log": "Witch Hazel Log", + "block.byg.witch_hazel_planks": "Witch Hazel Planks", + "block.byg.witch_hazel_pressure_plate": "Witch Hazel Pressure Plate", + "block.byg.witch_hazel_sapling": "Witch Hazel Sapling", + "block.byg.witch_hazel_sign": "Witch Hazel Sign", + "block.byg.witch_hazel_slab": "Witch Hazel Slab", + "block.byg.witch_hazel_stairs": "Witch Hazel Stairs", + "block.byg.witch_hazel_trapdoor": "Witch Hazel Trapdoor", + "block.byg.witch_hazel_wall_sign": "Witch Hazel Wall Sign", + "block.byg.witch_hazel_wood": "Witch Hazel Wood", + "block.byg.withering_oak_leaves": "Withering Oak Leaves", + "block.byg.withering_oak_log": "Withering Oak Log", + "block.byg.withering_oak_sapling": "Withering Oak Sapling", + "block.byg.withering_oak_wood": "Withering Oak Wood", + "block.byg.wood_blewit": "Wood Blewit", + "block.byg.wood_blewit_mushroom_block": "Wood Blewit Mushroom Block", + "block.byg.yellow_birch_leaves": "Yellow Birch Leaves", + "block.byg.yellow_birch_sapling": "Yellow Birch Sapling", + "block.byg.yellow_daffodil": "Yellow Daffodil", + "block.byg.yellow_nether_brick_slab": "Yellow Nether Brick Slab", + "block.byg.yellow_nether_brick_stairs": "Yellow Nether Brick Stairs", + "block.byg.yellow_nether_brick_wall": "Yellow Nether Brick Wall", + "block.byg.yellow_nether_bricks": "Yellow Nether Bricks", + "block.byg.yellow_petal_block": "Yellow Petal Block", + "block.byg.yellow_spruce_leaves": "Yellow Spruce Leaves", + "block.byg.yellow_spruce_sapling": "Yellow Spruce Sapling", + "block.byg.yellow_tulip": "Yellow Tulip", + "block.byg.zelkova_bookshelf": "Zelkova Bookshelf", + "block.byg.zelkova_button": "Zelkova Button", + "block.byg.zelkova_crafting_table": "Zelkova Crafting Table", + "block.byg.zelkova_door": "Zelkova Door", + "block.byg.zelkova_fence": "Zelkova Fence", + "block.byg.zelkova_fence_gate": "Zelkova Fence Gate", + "block.byg.zelkova_leaves": "Zelkova Leaves", + "block.byg.zelkova_log": "Zelkova Log", + "block.byg.zelkova_planks": "Zelkova Planks", + "block.byg.zelkova_pressure_plate": "Zelkova Pressure Plate", + "block.byg.zelkova_sapling": "Zelkova Sapling", + "block.byg.zelkova_sign": "Zelkova Sign", + "block.byg.zelkova_slab": "Zelkova Slab", + "block.byg.zelkova_stairs": "Zelkova Stairs", + "block.byg.zelkova_trapdoor": "Zelkova Trapdoor", + "block.byg.zelkova_wall_sign": "Zelkova Wall Sign", + "block.byg.zelkova_wood": "Zelkova Wood", + "byg.advancements.biomepediagift.description": "Receive a Biomepedia.", + "byg.advancements.biomepediagift.title": "Biome knowledge is Power!", + "byg.advancements.husbandry.berrily_alive.description": "Obtain Blue Berries", + "byg.advancements.husbandry.berrily_alive.title": "Berrily Alive", + "byg.advancements.husbandry.forager.description": "Obtain White Puffball Caps", + "byg.advancements.husbandry.forager.title": "Forager", + "byg.advancements.husbandry.granny_smith.description": "Obtain a Green Apple from the Skyris Highlands", + "byg.advancements.husbandry.granny_smith.title": "Granny Smith?", + "byg.advancements.husbandry.hot_diggity_not_dog.description": "Cook a Cattail on a campfire, you might wanna back away...", + "byg.advancements.husbandry.hot_diggity_not_dog.title": "Hot Diggity Not Dog?", + "byg.advancements.husbandry.just_like_grandmas.description": "Craft any of the 4 BYG pies.", + "byg.advancements.husbandry.just_like_grandmas.title": "Just Like Grandma's", + "byg.advancements.husbandry.root.description": "", + "byg.advancements.husbandry.root.title": "Husbandry", + "byg.advancements.root.description": "", + "byg.advancements.root.title": "Oh the Biomes You'll Go", + "byg.clickevent.hovertext": "Click to open.", + "byg.clickme": "Here(Click me!)", + "byg.command.config.error": "\"%s\" is not a valid config type!", + "byg.command.config.success": "\"%s\" config was reloaded!", + "byg.command.updateconfig.configsuptodate": "Configs are already up to date!", + "byg.command.updateconfig.contactserverowner": "Contact the server owner and let them know BYG's configs are outdated!", + "byg.command.updateconfig.dismiss": "DISMISS", + "byg.command.updateconfig.notifyplayersservershutdown": "BYG: The server owner has decided to shutdown the server to update BYG configs, server shuts down in 60 seconds....", + "byg.command.updateconfig.notifyserverowner.dedicated": "BYG: Server configs are outdated, notify the server owner to run the command \"%s\" or \"%s\" from the dedicated server console.", + "byg.command.updateconfig.notifyserverowner.singleplayer": "BYG: Server configs are outdated, notify the host to run the command \"%s\" or \"%s\".", + "byg.command.updateconfig.outdatedconfigs": "BYG: Configs need updating click either of the highlighted options to update %s or %s", + "byg.command.updateconfig.update": "UPDATE", + "byg.command.updateconfig.update.hover": "Running this command will update your configs and restart your game! A backup of your BYG configs will be created in %s", + "byg.command.updateconfig.warngameclose": "BYG: Warning this command will close your game to ensure all configs are re-read. A backup of your BYG configs will be created in \".../config/byg/backups\"", + "byg.command.updateconfig.warnplayers": "BYG: Warning the server owner is attempting to update all BYG configs, all connected users should expect the possibility of being disconnected...", + "byg.end.not.used": "Warning: You are receiving this warning because BYG's End Biome Source is not being used in this world's End and therefore renders BYG's end config useless. Your config specifies it should be using it! If this is intentional(ie using another end mod), you may disable this warning from appearing in future worlds by visiting your config found here: \"%s\" and setting \"warnBYGEndBiomeSourceNotUsedInNewWorlds\" to \"false\"!\nIf this is not intentional please follow the instructions found here: %s to enable BYG's end.", + "byg.experimental.warning": "You are currently using an experimental or an incomplete version of BYG. Worlds are bound to break or bug if you update BYG in this world!", + "byg.nether.not.used": "Warning: You are receiving this warning because BYG's Nether Biome Source is not being used in this world's Nether and therefore renders BYG's nether config useless. Your config specifies it should be using it! If this is intentional(ie using another nether mod), you may disable this warning from appearing in future worlds by visiting your config found here: \"%s\" and setting \"warnBYGNetherBiomeSourceNotUsedInNewWorlds\" to \"false\"!\nIf this is not intentional please follow the instructions found here: %s to enable BYG's nether.", + "byg.nether.not.used.terrablender": "Warning: You are receiving this warning because BYG's Nether Biome Source is not being used in this world's Nether and therefore renders BYG's nether config useless. Your config specifies it should be using it! If this is intentional(ie using another nether mod), you may disable this warning from appearing in future worlds by visiting BYG's nether config found here: \"%s\" and setting \"warnBYGNetherBiomeSourceNotUsedInNewWorlds\" to \"false\"!\nWe've detected that this world's biome source is controlled by terrablender, please set \"replace_default_nether\" to \"false\" in the terrablender config found here: %s.\n Bare in mind this change applies in new worlds only, if this is an existing world follow thee instructions found here: %s", + "byg.saplingpattern.suggest.hold.shift": "Hold %s to view sapling patterns.", + "byg.saplingpattern.tooltip": "Sapling patterns:", + "byg.screen.configloadfail.openconfigdir": "Open config dir", + "byg.screen.configloadfail.openconfigdir.hover": "Open config directory.", + "byg.screen.configloadfail.recreateconfigs": "Recreate configs", + "byg.screen.configloadfail.recreateconfigs.hover": "Backup & recreate your configs, then restart minecraft.", + "byg.screen.configloadfail.title": "BYG Config loading failed:", + "byg.screen.configloadfail.validate": "Validate configs", + "byg.screen.configloadfail.validate.hover": "Load configs again, if they work, you will continue to load into your world.", + "byg.screen.configloadfail.validate.toast": "Validating BYG configs...", + "byg.serverkill.countdown": "Server shutdown in: %s seconds", + "byg.worldgenexport.exists": "World generation export already exists! View it here: %s!", + "byg.worldgenexport.failed": "Uh oh, the world generation export could not be created, check your latest.log!", + "byg.worldgenexport.singleplayer": "World generation export command must be used in single player!", + "byg.worldgenexport.starting": "Starting world generation export, expect server lag & high ram usage...", + "byg.worldgenexport.success": "World generation export successful! View the files here: %s!", + "container.hypogeal_imperium_container": "Hypogeal Imperium", + "death.attack.byg.cattail_campfire": "%s got too curious", + "dimension.minecraft.overworld": "Overworld", + "dimension.minecraft.the_end": "The End", + "dimension.minecraft.the_nether": "The Nether", + "entity.byg.boat": "Boat", + "entity.minecraft.villager.forager": "Forager", + "item.byg.allium_flower_bush": "Allium Flower Bush", + "item.byg.aloe_vera": "Aloe Vera", + "item.byg.aloe_vera_juice": "Aloe Vera Juice", + "item.byg.alpine_bellflower": "Alpine Bellflower", + "item.byg.amaranth": "Amaranth", + "item.byg.ametrine_block": "Ametrine Block", + "item.byg.ametrine_boots": "Ametrine Boots", + "item.byg.ametrine_chestplate": "Ametrine Chestplate", + "item.byg.ametrine_cluster": "Ametrine Cluster", + "item.byg.ametrine_gems": "Ametrine Gems", + "item.byg.ametrine_helmet": "Ametrine Helmet", + "item.byg.ametrine_horse_armor": "Ametrine Horse Armor", + "item.byg.ametrine_leggings": "Ametrine Leggings", + "item.byg.ametrine_ore": "Ametrine Ore", + "item.byg.angelica": "Angelica", + "item.byg.anthracite": "Anthracite", + "item.byg.anthracite_block": "Anthracite Block", + "item.byg.anthracite_ore": "Anthracite Ore", + "item.byg.araucaria_leaves": "Araucaria Leaves", + "item.byg.araucaria_sapling": "Araucaria Sapling", + "item.byg.arisian_bloom_branch": "Arisian Bloom Branch", + "item.byg.aspen_boat": "Aspen Boat", + "item.byg.aspen_bookshelf": "Aspen Bookshelf", + "item.byg.aspen_button": "Aspen Button", + "item.byg.aspen_crafting_table": "Aspen Crafting Table", + "item.byg.aspen_door": "Aspen Door", + "item.byg.aspen_fence": "Aspen Fence", + "item.byg.aspen_fence_gate": "Aspen Fence Gate", + "item.byg.aspen_leaves": "Aspen Leaves", + "item.byg.aspen_log": "Aspen Log", + "item.byg.aspen_planks": "Aspen Planks", + "item.byg.aspen_pressure_plate": "Aspen Pressure Plate", + "item.byg.aspen_sapling": "Aspen Sapling", + "item.byg.aspen_sign": "Aspen Sign", + "item.byg.aspen_slab": "Aspen Slab", + "item.byg.aspen_stairs": "Aspen Stairs", + "item.byg.aspen_trapdoor": "Aspen Trapdoor", + "item.byg.aspen_wood": "Aspen Wood", + "item.byg.baobab_boat": "Baobab Boat", + "item.byg.baobab_bookshelf": "Baobab Bookshelf", + "item.byg.baobab_button": "Baobab Button", + "item.byg.baobab_crafting_table": "Baobab Crafting Table", + "item.byg.baobab_door": "Baobab Door", + "item.byg.baobab_fence": "Baobab Fence", + "item.byg.baobab_fence_gate": "Baobab Fence Gate", + "item.byg.baobab_fruit": "Baobab Fruit", + "item.byg.baobab_leaves": "Baobab Leaves", + "item.byg.baobab_log": "Baobab Log", + "item.byg.baobab_planks": "Baobab Planks", + "item.byg.baobab_pressure_plate": "Baobab Pressure Plate", + "item.byg.baobab_sapling": "Baobab Sapling", + "item.byg.baobab_sign": "Baobab Sign", + "item.byg.baobab_slab": "Baobab Slab", + "item.byg.baobab_stairs": "Baobab Stairs", + "item.byg.baobab_trapdoor": "Baobab Trapdoor", + "item.byg.baobab_wood": "Baobab Wood", + "item.byg.barrel_cactus": "Barrel Cactus", + "item.byg.beach_grass": "Beach Grass", + "item.byg.begonia": "Begonia", + "item.byg.biomepedia": "Biomepedia", + "item.byg.bistort": "Bistort", + "item.byg.black_chiseled_sandstone": "Black Chiseled Sandstone", + "item.byg.black_cut_sandstone": "Black Cut Sandstone", + "item.byg.black_ice": "Black Ice", + "item.byg.black_rose": "Black Rose", + "item.byg.black_sand": "Black Sand", + "item.byg.black_sandstone": "Black Sandstone", + "item.byg.black_smooth_sandstone": "Black Smooth Sandstone", + "item.byg.blooming_witch_hazel_leaves": "Blooming Witch Hazel Leaves", + "item.byg.blue_chiseled_sandstone": "Blue Chiseled Sandstone", + "item.byg.blue_cut_sandstone": "Blue Cut Sandstone", + "item.byg.blue_enchanted_boat": "Blue Enchanted Boat", + "item.byg.blue_enchanted_bookshelf": "Blue Enchanted Bookshelf", + "item.byg.blue_enchanted_button": "Blue Enchanted Button", + "item.byg.blue_enchanted_crafting_table": "Blue Enchanted Crafting Table", + "item.byg.blue_enchanted_door": "Blue Enchanted Door", + "item.byg.blue_enchanted_fence": "Blue Enchanted Fence", + "item.byg.blue_enchanted_fence_gate": "Blue Enchanted Fence Gate", + "item.byg.blue_enchanted_leaves": "Blue Enchanted Leaves", + "item.byg.blue_enchanted_log": "Blue Enchanted Log", + "item.byg.blue_enchanted_planks": "Blue Enchanted Planks", + "item.byg.blue_enchanted_pressure_plate": "Blue Enchanted Pressure Plate", + "item.byg.blue_enchanted_sapling": "Blue Enchanted Sapling", + "item.byg.blue_enchanted_sign": "Blue Enchanted Sign", + "item.byg.blue_enchanted_slab": "Blue Enchanted Slab", + "item.byg.blue_enchanted_stairs": "Blue Enchanted Stairs", + "item.byg.blue_enchanted_trapdoor": "Blue Enchanted Trapdoor", + "item.byg.blue_enchanted_wood": "Blue Enchanted Wood", + "item.byg.blue_nether_brick": "Blue Nether Brick", + "item.byg.blue_nether_brick_slab": "Blue Nether Brick Slab", + "item.byg.blue_nether_brick_stairs": "Blue Nether Brick Stairs", + "item.byg.blue_nether_brick_wall": "Blue Nether Brick Wall", + "item.byg.blue_nether_bricks": "Blue Nether Bricks", + "item.byg.blue_nether_gold_ore": "Blue Nether Gold Ore", + "item.byg.blue_nether_quartz_ore": "Blue Nether Quartz Ore", + "item.byg.blue_netherrack": "Blue Netherrack", + "item.byg.blue_petal_block": "Blue Petal Block", + "item.byg.blue_sage": "Blue Sage", + "item.byg.blue_sand": "Blue Sand", + "item.byg.blue_sandstone": "Blue Sandstone", + "item.byg.blue_smooth_sandstone": "Blue Smooth Sandstone", + "item.byg.blue_spruce_leaves": "Blue Spruce Leaves", + "item.byg.blue_spruce_sapling": "Blue Spruce Sapling", + "item.byg.blueberries": "Blueberries", + "item.byg.blueberry_pie": "Blueberry Pie", + "item.byg.boric_campfire": "Boric Campfire", + "item.byg.boric_lantern": "Boric Lantern", + "item.byg.brim_powder": "Brim Powder", + "item.byg.brimstone": "Brimstone", + "item.byg.brimstone_nether_gold_ore": "Brimstone Nether Gold Ore", + "item.byg.brimstone_nether_quartz_ore": "Brimstone Nether Quartz Ore", + "item.byg.brown_birch_leaves": "Brown Birch Leaves", + "item.byg.brown_birch_sapling": "Brown Birch Sapling", + "item.byg.brown_mushroom_stem": "Brown Mushroom Stem", + "item.byg.brown_oak_leaves": "Brown Oak Leaves", + "item.byg.brown_oak_sapling": "Brown Oak Sapling", + "item.byg.brown_zelkova_leaves": "Brown Zelkova Leaves", + "item.byg.brown_zelkova_sapling": "Brown Zelkova Sapling", + "item.byg.budding_ametrine_ore": "Budding Ametrine Ore", + "item.byg.budding_subzero_crystal": "Budding Subzero Crystal", + "item.byg.bulbis_anomaly": "Bulbis Anomaly", + "item.byg.bulbis_bookshelf": "Bulbis Bookshelf", + "item.byg.bulbis_button": "Bulbis Button", + "item.byg.bulbis_crafting_table": "Bulbis Crafting Table", + "item.byg.bulbis_door": "Bulbis Door", + "item.byg.bulbis_fence": "Bulbis Fence", + "item.byg.bulbis_fence_gate": "Bulbis Fence Gate", + "item.byg.bulbis_oddity": "Bulbis Oddity", + "item.byg.bulbis_phycelium": "Bulbis Phycelium", + "item.byg.bulbis_planks": "Bulbis Planks", + "item.byg.bulbis_pressure_plate": "Bulbis Pressure Plate", + "item.byg.bulbis_shell": "Bulbis Shell", + "item.byg.bulbis_sign": "Bulbis Sign", + "item.byg.bulbis_slab": "Bulbis Slab", + "item.byg.bulbis_sprouts": "Bulbis Sprouts", + "item.byg.bulbis_stairs": "Bulbis Stairs", + "item.byg.bulbis_stem": "Bulbis Stem", + "item.byg.bulbis_trapdoor": "Bulbis Trapdoor", + "item.byg.bulbis_wood": "Bulbis Wood", + "item.byg.byg_logo": "Byg Logo", + "item.byg.california_poppy": "California Poppy", + "item.byg.carved_barrel_cactus": "Carved Barrel Cactus", + "item.byg.carved_ether_stone": "Carved Ether Stone", + "item.byg.carved_ether_stone_slab": "Carved Ether Stone Slab", + "item.byg.carved_ether_stone_stairs": "Carved Ether Stone Stairs", + "item.byg.carved_ether_stone_wall": "Carved Ether Stone Wall", + "item.byg.cattail_sprout": "Cattail Sprout", + "item.byg.cattail_thatch": "Cattail Thatch", + "item.byg.cattail_thatch_carpet": "Cattail Thatch Carpet", + "item.byg.cattail_thatch_slab": "Cattail Thatch Slab", + "item.byg.cattail_thatch_stairs": "Cattail Thatch Stairs", + "item.byg.chain_plating": "Chain Plating", + "item.byg.cherry_boat": "Cherry Boat", + "item.byg.cherry_bookshelf": "Cherry Bookshelf", + "item.byg.cherry_button": "Cherry Button", + "item.byg.cherry_crafting_table": "Cherry Crafting Table", + "item.byg.cherry_door": "Cherry Door", + "item.byg.cherry_fence": "Cherry Fence", + "item.byg.cherry_fence_gate": "Cherry Fence Gate", + "item.byg.cherry_log": "Cherry Log", + "item.byg.cherry_planks": "Cherry Planks", + "item.byg.cherry_pressure_plate": "Cherry Pressure Plate", + "item.byg.cherry_sign": "Cherry Sign", + "item.byg.cherry_slab": "Cherry Slab", + "item.byg.cherry_stairs": "Cherry Stairs", + "item.byg.cherry_trapdoor": "Cherry Trapdoor", + "item.byg.cherry_wood": "Cherry Wood", + "item.byg.chiseled_fungal_imparius": "Chiseled Fungal Imparius", + "item.byg.chiseled_fungal_imparius_slab": "Chiseled Fungal Imparius Slab", + "item.byg.chiseled_fungal_imparius_stairs": "Chiseled Fungal Imparius Stairs", + "item.byg.chiseled_fungal_imparius_wall": "Chiseled Fungal Imparius Wall", + "item.byg.chiseled_red_rock_brick_slab": "Chiseled Red Rock Brick Slab", + "item.byg.chiseled_red_rock_brick_stairs": "Chiseled Red Rock Brick Stairs", + "item.byg.chiseled_red_rock_brick_wall": "Chiseled Red Rock Brick Wall", + "item.byg.chiseled_red_rock_bricks": "Chiseled Red Rock Bricks", + "item.byg.chiseled_therium": "Chiseled Therium", + "item.byg.chiseled_therium_slab": "Chiseled Therium Slab", + "item.byg.chiseled_therium_stairs": "Chiseled Therium Stairs", + "item.byg.chiseled_therium_wall": "Chiseled Therium Wall", + "item.byg.chiseled_travertine": "Chiseled Travertine", + "item.byg.chiseled_travertine_slab": "Chiseled Travertine Slab", + "item.byg.chiseled_travertine_stairs": "Chiseled Travertine Stairs", + "item.byg.chiseled_travertine_wall": "Chiseled Travertine Wall", + "item.byg.chiseled_windswept_sandstone": "Chiseled Windswept Sandstone", + "item.byg.chiseled_windswept_sandstone_slab": "Chiseled Windswept Sandstone Slab", + "item.byg.chiseled_windswept_sandstone_stairs": "Chiseled Windswept Sandstone Stairs", + "item.byg.chiseled_windswept_sandstone_wall": "Chiseled Windswept Sandstone Wall", + "item.byg.cika_boat": "Cika Boat", + "item.byg.cika_bookshelf": "Cika Bookshelf", + "item.byg.cika_button": "Cika Button", + "item.byg.cika_crafting_table": "Cika Crafting Table", + "item.byg.cika_door": "Cika Door", + "item.byg.cika_fence": "Cika Fence", + "item.byg.cika_fence_gate": "Cika Fence Gate", + "item.byg.cika_leaves": "Cika Leaves", + "item.byg.cika_log": "Cika Log", + "item.byg.cika_planks": "Cika Planks", + "item.byg.cika_pressure_plate": "Cika Pressure Plate", + "item.byg.cika_sapling": "Cika Sapling", + "item.byg.cika_sign": "Cika Sign", + "item.byg.cika_slab": "Cika Slab", + "item.byg.cika_stairs": "Cika Stairs", + "item.byg.cika_trapdoor": "Cika Trapdoor", + "item.byg.cika_wood": "Cika Wood", + "item.byg.clover_patch": "Clover Patch", + "item.byg.cobbled_ether_stone": "Cobbled Ether Stone", + "item.byg.cobbled_ether_stone_slab": "Cobbled Ether Stone Slab", + "item.byg.cobbled_ether_stone_stairs": "Cobbled Ether Stone Stairs", + "item.byg.cobbled_ether_stone_wall": "Cobbled Ether Stone Wall", + "item.byg.cooked_joshua_fruit": "Cooked Joshua Fruit", + "item.byg.cooked_white_puffball_cap": "Cooked White Puffball Cap", + "item.byg.cracked_red_rock_brick_slab": "Cracked Red Rock Brick Slab", + "item.byg.cracked_red_rock_brick_stairs": "Cracked Red Rock Brick Stairs", + "item.byg.cracked_red_rock_brick_wall": "Cracked Red Rock Brick Wall", + "item.byg.cracked_red_rock_bricks": "Cracked Red Rock Bricks", + "item.byg.cracked_red_sand": "Cracked Red Sand", + "item.byg.cracked_scoria_stone_bricks": "Cracked Scoria Stone Bricks", + "item.byg.crimson_berries": "Crimson Berries", + "item.byg.crimson_berry_pie": "Crimson Berry Pie", + "item.byg.crocus": "Crocus", + "item.byg.cryptic_bramble": "Cryptic Bramble", + "item.byg.cryptic_bramble_branch": "Cryptic Bramble Branch", + "item.byg.cryptic_campfire": "Cryptic Campfire", + "item.byg.cryptic_end_rod": "Cryptic End Rod", + "item.byg.cryptic_lantern": "Cryptic Lantern", + "item.byg.cryptic_magma_block": "Cryptic Magma Block", + "item.byg.cryptic_redstone_ore": "Cryptic Redstone Ore", + "item.byg.cryptic_stone": "Cryptic Stone", + "item.byg.cryptic_stone_slab": "Cryptic Stone Slab", + "item.byg.cryptic_stone_stairs": "Cryptic Stone Stairs", + "item.byg.cryptic_stone_wall": "Cryptic Stone Wall", + "item.byg.cryptic_vent": "Cryptic Vent", + "item.byg.cut_windswept_sandstone": "Cut Windswept Sandstone", + "item.byg.cut_windswept_sandstone_slab": "Cut Windswept Sandstone Slab", + "item.byg.cut_windswept_sandstone_stairs": "Cut Windswept Sandstone Stairs", + "item.byg.cut_windswept_sandstone_wall": "Cut Windswept Sandstone Wall", + "item.byg.cyan_amaranth": "Cyan Amaranth", + "item.byg.cyan_rose": "Cyan Rose", + "item.byg.cyan_tulip": "Cyan Tulip", + "item.byg.cypress_boat": "Cypress Boat", + "item.byg.cypress_bookshelf": "Cypress Bookshelf", + "item.byg.cypress_button": "Cypress Button", + "item.byg.cypress_crafting_table": "Cypress Crafting Table", + "item.byg.cypress_door": "Cypress Door", + "item.byg.cypress_fence": "Cypress Fence", + "item.byg.cypress_fence_gate": "Cypress Fence Gate", + "item.byg.cypress_leaves": "Cypress Leaves", + "item.byg.cypress_log": "Cypress Log", + "item.byg.cypress_planks": "Cypress Planks", + "item.byg.cypress_pressure_plate": "Cypress Pressure Plate", + "item.byg.cypress_sapling": "Cypress Sapling", + "item.byg.cypress_sign": "Cypress Sign", + "item.byg.cypress_slab": "Cypress Slab", + "item.byg.cypress_stairs": "Cypress Stairs", + "item.byg.cypress_trapdoor": "Cypress Trapdoor", + "item.byg.cypress_wood": "Cypress Wood", + "item.byg.dacite": "Dacite", + "item.byg.dacite_brick_slab": "Dacite Brick Slab", + "item.byg.dacite_brick_stairs": "Dacite Brick Stairs", + "item.byg.dacite_brick_wall": "Dacite Brick Wall", + "item.byg.dacite_bricks": "Dacite Bricks", + "item.byg.dacite_cobblestone": "Dacite Cobblestone", + "item.byg.dacite_cobblestone_slab": "Dacite Cobblestone Slab", + "item.byg.dacite_cobblestone_stairs": "Dacite Cobblestone Stairs", + "item.byg.dacite_cobblestone_wall": "Dacite Cobblestone Wall", + "item.byg.dacite_pillar": "Dacite Pillar", + "item.byg.dacite_slab": "Dacite Slab", + "item.byg.dacite_stairs": "Dacite Stairs", + "item.byg.dacite_tile": "Dacite Tile", + "item.byg.dacite_tile_slab": "Dacite Tile Slab", + "item.byg.dacite_tile_stairs": "Dacite Tile Stairs", + "item.byg.dacite_tile_wall": "Dacite Tile Wall", + "item.byg.dacite_wall": "Dacite Wall", + "item.byg.daffodil": "Daffodil", + "item.byg.death_cap": "Death Cap", + "item.byg.death_cap_mushroom_block": "Death Cap Mushroom Block", + "item.byg.delphinium": "Delphinium", + "item.byg.dusted_polished_blackstone_bricks": "Dusted Polished Blackstone Bricks", + "item.byg.ebony_boat": "Ebony Boat", + "item.byg.ebony_bookshelf": "Ebony Bookshelf", + "item.byg.ebony_button": "Ebony Button", + "item.byg.ebony_crafting_table": "Ebony Crafting Table", + "item.byg.ebony_door": "Ebony Door", + "item.byg.ebony_fence": "Ebony Fence", + "item.byg.ebony_fence_gate": "Ebony Fence Gate", + "item.byg.ebony_leaves": "Ebony Leaves", + "item.byg.ebony_log": "Ebony Log", + "item.byg.ebony_planks": "Ebony Planks", + "item.byg.ebony_pressure_plate": "Ebony Pressure Plate", + "item.byg.ebony_sapling": "Ebony Sapling", + "item.byg.ebony_sign": "Ebony Sign", + "item.byg.ebony_slab": "Ebony Slab", + "item.byg.ebony_stairs": "Ebony Stairs", + "item.byg.ebony_trapdoor": "Ebony Trapdoor", + "item.byg.ebony_wood": "Ebony Wood", + "item.byg.embur_bookshelf": "Embur Bookshelf", + "item.byg.embur_button": "Embur Button", + "item.byg.embur_crafting_table": "Embur Crafting Table", + "item.byg.embur_door": "Embur Door", + "item.byg.embur_fence": "Embur Fence", + "item.byg.embur_fence_gate": "Embur Fence Gate", + "item.byg.embur_gel_ball": "Embur Gel Ball", + "item.byg.embur_gel_block": "Embur Gel Block", + "item.byg.embur_gel_branch": "Embur Gel Branch", + "item.byg.embur_gel_vines": "Embur Gel Vines", + "item.byg.embur_hyphae": "Embur Hyphae", + "item.byg.embur_lily": "Embur Lily", + "item.byg.embur_nylium": "Embur Nylium", + "item.byg.embur_pedu": "Embur Pedu", + "item.byg.embur_planks": "Embur Planks", + "item.byg.embur_pressure_plate": "Embur Pressure Plate", + "item.byg.embur_roots": "Embur Roots", + "item.byg.embur_sign": "Embur Sign", + "item.byg.embur_slab": "Embur Slab", + "item.byg.embur_sprouts": "Embur Sprouts", + "item.byg.embur_stairs": "Embur Stairs", + "item.byg.embur_trapdoor": "Embur Trapdoor", + "item.byg.embur_wart": "Embur Wart", + "item.byg.emeraldite_ore": "Emeraldite Ore", + "item.byg.emeraldite_shards": "Emeraldite Shards", + "item.byg.end_sand": "End Sand", + "item.byg.ender_lily": "Ender Lily", + "item.byg.ether_bookshelf": "Ether Bookshelf", + "item.byg.ether_bulbs": "Ether Bulbs", + "item.byg.ether_bush": "Ether Bush", + "item.byg.ether_button": "Ether Button", + "item.byg.ether_crafting_table": "Ether Crafting Table", + "item.byg.ether_door": "Ether Door", + "item.byg.ether_fence": "Ether Fence", + "item.byg.ether_fence_gate": "Ether Fence Gate", + "item.byg.ether_foliage": "Ether Foliage", + "item.byg.ether_grass": "Ether Grass", + "item.byg.ether_leaves": "Ether Leaves", + "item.byg.ether_log": "Ether Log", + "item.byg.ether_phylium": "Ether Phylium", + "item.byg.ether_planks": "Ether Planks", + "item.byg.ether_pressure_plate": "Ether Pressure Plate", + "item.byg.ether_sapling": "Ether Sapling", + "item.byg.ether_sign": "Ether Sign", + "item.byg.ether_slab": "Ether Slab", + "item.byg.ether_soil": "Ether Soil", + "item.byg.ether_stairs": "Ether Stairs", + "item.byg.ether_stone": "Ether Stone", + "item.byg.ether_stone_slab": "Ether Stone Slab", + "item.byg.ether_stone_stairs": "Ether Stone Stairs", + "item.byg.ether_stone_wall": "Ether Stone Wall", + "item.byg.ether_trapdoor": "Ether Trapdoor", + "item.byg.ether_wood": "Ether Wood", + "item.byg.fairy_slipper": "Fairy Slipper", + "item.byg.fir_boat": "Fir Boat", + "item.byg.fir_bookshelf": "Fir Bookshelf", + "item.byg.fir_button": "Fir Button", + "item.byg.fir_crafting_table": "Fir Crafting Table", + "item.byg.fir_door": "Fir Door", + "item.byg.fir_fence": "Fir Fence", + "item.byg.fir_fence_gate": "Fir Fence Gate", + "item.byg.fir_leaves": "Fir Leaves", + "item.byg.fir_log": "Fir Log", + "item.byg.fir_planks": "Fir Planks", + "item.byg.fir_pressure_plate": "Fir Pressure Plate", + "item.byg.fir_sapling": "Fir Sapling", + "item.byg.fir_sign": "Fir Sign", + "item.byg.fir_slab": "Fir Slab", + "item.byg.fir_stairs": "Fir Stairs", + "item.byg.fir_trapdoor": "Fir Trapdoor", + "item.byg.fir_wood": "Fir Wood", + "item.byg.firecracker_flower_bush": "Firecracker Flower Bush", + "item.byg.firecracker_leaves": "Firecracker Leaves", + "item.byg.flower_patch": "Flower Patch", + "item.byg.flowering_barrel_cactus": "Flowering Barrel Cactus", + "item.byg.flowering_indigo_jacaranda_bush": "Flowering Indigo Jacaranda Bush", + "item.byg.flowering_indigo_jacaranda_leaves": "Flowering Indigo Jacaranda Leaves", + "item.byg.flowering_jacaranda_bush": "Flowering Jacaranda Bush", + "item.byg.flowering_jacaranda_leaves": "Flowering Jacaranda Leaves", + "item.byg.flowering_nightshade_leaves": "Flowering Nightshade Leaves", + "item.byg.flowering_orchard_leaves": "Flowering Orchard Leaves", + "item.byg.flowering_palo_verde_leaves": "Flowering Palo Verde Leaves", + "item.byg.flowering_tiny_lily_pads": "Flowering Tiny Lily Pads", + "item.byg.foragers_table": "Foragers Table", + "item.byg.foxglove": "Foxglove", + "item.byg.frost_magma": "Frost Magma", + "item.byg.fungal_imparius": "Fungal Imparius", + "item.byg.fungal_imparius_block": "Fungal Imparius Block", + "item.byg.fungal_imparius_filament": "Fungal Imparius Filament", + "item.byg.fungal_imparius_filament_block": "Fungal Imparius Filament Block", + "item.byg.fungal_imparius_hyphae": "Fungal Imparius Hyphae", + "item.byg.fungal_imparius_stem": "Fungal Imparius Stem", + "item.byg.glowstone_lamp": "Glowstone Lamp", + "item.byg.glowstone_lantern": "Glowstone Lantern", + "item.byg.golden_spined_cactus": "Golden Spined Cactus", + "item.byg.green_apple": "Green Apple", + "item.byg.green_apple_pie": "Green Apple Pie", + "item.byg.green_apple_skyris_leaves": "Green Apple Skyris Leaves", + "item.byg.green_enchanted_boat": "Green Enchanted Boat", + "item.byg.green_enchanted_bookshelf": "Green Enchanted Bookshelf", + "item.byg.green_enchanted_button": "Green Enchanted Button", + "item.byg.green_enchanted_crafting_table": "Green Enchanted Crafting Table", + "item.byg.green_enchanted_door": "Green Enchanted Door", + "item.byg.green_enchanted_fence": "Green Enchanted Fence", + "item.byg.green_enchanted_fence_gate": "Green Enchanted Fence Gate", + "item.byg.green_enchanted_leaves": "Green Enchanted Leaves", + "item.byg.green_enchanted_log": "Green Enchanted Log", + "item.byg.green_enchanted_planks": "Green Enchanted Planks", + "item.byg.green_enchanted_pressure_plate": "Green Enchanted Pressure Plate", + "item.byg.green_enchanted_sapling": "Green Enchanted Sapling", + "item.byg.green_enchanted_sign": "Green Enchanted Sign", + "item.byg.green_enchanted_slab": "Green Enchanted Slab", + "item.byg.green_enchanted_stairs": "Green Enchanted Stairs", + "item.byg.green_enchanted_trapdoor": "Green Enchanted Trapdoor", + "item.byg.green_enchanted_wood": "Green Enchanted Wood", + "item.byg.green_mushroom": "Green Mushroom", + "item.byg.green_mushroom_block": "Green Mushroom Block", + "item.byg.green_tulip": "Green Tulip", + "item.byg.guzmania": "Guzmania", + "item.byg.hanging_bones": "Hanging Bones", + "item.byg.hanging_sythian_roots": "Hanging Sythian Roots", + "item.byg.holly_berries": "Holly Berries", + "item.byg.holly_berry_leaves": "Holly Berry Leaves", + "item.byg.holly_boat": "Holly Boat", + "item.byg.holly_bookshelf": "Holly Bookshelf", + "item.byg.holly_button": "Holly Button", + "item.byg.holly_crafting_table": "Holly Crafting Table", + "item.byg.holly_door": "Holly Door", + "item.byg.holly_fence": "Holly Fence", + "item.byg.holly_fence_gate": "Holly Fence Gate", + "item.byg.holly_leaves": "Holly Leaves", + "item.byg.holly_log": "Holly Log", + "item.byg.holly_planks": "Holly Planks", + "item.byg.holly_pressure_plate": "Holly Pressure Plate", + "item.byg.holly_sapling": "Holly Sapling", + "item.byg.holly_sign": "Holly Sign", + "item.byg.holly_slab": "Holly Slab", + "item.byg.holly_stairs": "Holly Stairs", + "item.byg.holly_trapdoor": "Holly Trapdoor", + "item.byg.holly_wood": "Holly Wood", + "item.byg.horseweed": "Horseweed", + "item.byg.hydrangea_bush": "Hydrangea Bush", + "item.byg.hydrangea_hedge": "Hydrangea Hedge", + "item.byg.hypogeal_imperium": "Hypogeal Imperium", + "item.byg.imbued_nightshade_log": "Imbued Nightshade Log", + "item.byg.imparius_bookshelf": "Imparius Bookshelf", + "item.byg.imparius_bush": "Imparius Bush", + "item.byg.imparius_button": "Imparius Button", + "item.byg.imparius_crafting_table": "Imparius Crafting Table", + "item.byg.imparius_door": "Imparius Door", + "item.byg.imparius_fence": "Imparius Fence", + "item.byg.imparius_fence_gate": "Imparius Fence Gate", + "item.byg.imparius_hyphae": "Imparius Hyphae", + "item.byg.imparius_mushroom": "Imparius Mushroom", + "item.byg.imparius_mushroom_block": "Imparius Mushroom Block", + "item.byg.imparius_mushroom_branch": "Imparius Mushroom Branch", + "item.byg.imparius_phylium": "Imparius Phylium", + "item.byg.imparius_planks": "Imparius Planks", + "item.byg.imparius_pressure_plate": "Imparius Pressure Plate", + "item.byg.imparius_sign": "Imparius Sign", + "item.byg.imparius_slab": "Imparius Slab", + "item.byg.imparius_stairs": "Imparius Stairs", + "item.byg.imparius_stem": "Imparius Stem", + "item.byg.imparius_trapdoor": "Imparius Trapdoor", + "item.byg.imparius_vine": "Imparius Vine", + "item.byg.incan_lily": "Incan Lily", + "item.byg.indigo_jacaranda_bush": "Indigo Jacaranda Bush", + "item.byg.indigo_jacaranda_leaves": "Indigo Jacaranda Leaves", + "item.byg.indigo_jacaranda_sapling": "Indigo Jacaranda Sapling", + "item.byg.iris": "Iris", + "item.byg.ivis_phylium": "Ivis Phylium", + "item.byg.ivis_roots": "Ivis Roots", + "item.byg.ivis_sprout": "Ivis Sprout", + "item.byg.jacaranda_boat": "Jacaranda Boat", + "item.byg.jacaranda_bookshelf": "Jacaranda Bookshelf", + "item.byg.jacaranda_bush": "Jacaranda Bush", + "item.byg.jacaranda_button": "Jacaranda Button", + "item.byg.jacaranda_crafting_table": "Jacaranda Crafting Table", + "item.byg.jacaranda_door": "Jacaranda Door", + "item.byg.jacaranda_fence": "Jacaranda Fence", + "item.byg.jacaranda_fence_gate": "Jacaranda Fence Gate", + "item.byg.jacaranda_leaves": "Jacaranda Leaves", + "item.byg.jacaranda_log": "Jacaranda Log", + "item.byg.jacaranda_planks": "Jacaranda Planks", + "item.byg.jacaranda_pressure_plate": "Jacaranda Pressure Plate", + "item.byg.jacaranda_sapling": "Jacaranda Sapling", + "item.byg.jacaranda_sign": "Jacaranda Sign", + "item.byg.jacaranda_slab": "Jacaranda Slab", + "item.byg.jacaranda_stairs": "Jacaranda Stairs", + "item.byg.jacaranda_trapdoor": "Jacaranda Trapdoor", + "item.byg.jacaranda_wood": "Jacaranda Wood", + "item.byg.japanese_orchid": "Japanese Orchid", + "item.byg.joshua_fruit": "Joshua Fruit", + "item.byg.joshua_leaves": "Joshua Leaves", + "item.byg.joshua_sapling": "Joshua Sapling", + "item.byg.kovan_flower": "Kovan Flower", + "item.byg.lament_bookshelf": "Lament Bookshelf", + "item.byg.lament_button": "Lament Button", + "item.byg.lament_crafting_table": "Lament Crafting Table", + "item.byg.lament_door": "Lament Door", + "item.byg.lament_fence": "Lament Fence", + "item.byg.lament_fence_gate": "Lament Fence Gate", + "item.byg.lament_leaves": "Lament Leaves", + "item.byg.lament_log": "Lament Log", + "item.byg.lament_planks": "Lament Planks", + "item.byg.lament_pressure_plate": "Lament Pressure Plate", + "item.byg.lament_sapling": "Lament Sapling", + "item.byg.lament_sign": "Lament Sign", + "item.byg.lament_slab": "Lament Slab", + "item.byg.lament_sprouts": "Lament Sprouts", + "item.byg.lament_stairs": "Lament Stairs", + "item.byg.lament_trapdoor": "Lament Trapdoor", + "item.byg.lament_vine": "Lament Vine", + "item.byg.lament_wood": "Lament Wood", + "item.byg.large_subzero_crystal_bud": "Large Subzero Crystal Bud", + "item.byg.lazarus_bellflower": "Lazarus Bellflower", + "item.byg.leaf_pile": "Leaf Pile", + "item.byg.light_blue_petal_block": "Light Blue Petal Block", + "item.byg.lignite": "Lignite", + "item.byg.lignite_block": "Lignite Block", + "item.byg.lignite_ore": "Lignite Ore", + "item.byg.lollipop_flower": "Lollipop Flower", + "item.byg.lush_dirt": "Lush Dirt", + "item.byg.lush_farmland": "Lush Farmland", + "item.byg.lush_grass_block": "Lush Grass Block", + "item.byg.lush_grass_path": "Lush Grass Path", + "item.byg.magenta_amaranth": "Magenta Amaranth", + "item.byg.magenta_tulip": "Magenta Tulip", + "item.byg.magmatic_stone": "Magmatic Stone", + "item.byg.mahogany_boat": "Mahogany Boat", + "item.byg.mahogany_bookshelf": "Mahogany Bookshelf", + "item.byg.mahogany_button": "Mahogany Button", + "item.byg.mahogany_crafting_table": "Mahogany Crafting Table", + "item.byg.mahogany_door": "Mahogany Door", + "item.byg.mahogany_fence": "Mahogany Fence", + "item.byg.mahogany_fence_gate": "Mahogany Fence Gate", + "item.byg.mahogany_leaves": "Mahogany Leaves", + "item.byg.mahogany_log": "Mahogany Log", + "item.byg.mahogany_planks": "Mahogany Planks", + "item.byg.mahogany_pressure_plate": "Mahogany Pressure Plate", + "item.byg.mahogany_sapling": "Mahogany Sapling", + "item.byg.mahogany_sign": "Mahogany Sign", + "item.byg.mahogany_slab": "Mahogany Slab", + "item.byg.mahogany_stairs": "Mahogany Stairs", + "item.byg.mahogany_trapdoor": "Mahogany Trapdoor", + "item.byg.mahogany_wood": "Mahogany Wood", + "item.byg.mangrove_boat": "Mangrove Boat", + "item.byg.mangrove_bookshelf": "Mangrove Bookshelf", + "item.byg.mangrove_button": "Mangrove Button", + "item.byg.mangrove_crafting_table": "Mangrove Crafting Table", + "item.byg.mangrove_door": "Mangrove Door", + "item.byg.mangrove_fence": "Mangrove Fence", + "item.byg.mangrove_fence_gate": "Mangrove Fence Gate", + "item.byg.mangrove_leaves": "Mangrove Leaves", + "item.byg.mangrove_log": "Mangrove Log", + "item.byg.mangrove_planks": "Mangrove Planks", + "item.byg.mangrove_pressure_plate": "Mangrove Pressure Plate", + "item.byg.mangrove_sapling": "Mangrove Sapling", + "item.byg.mangrove_sign": "Mangrove Sign", + "item.byg.mangrove_slab": "Mangrove Slab", + "item.byg.mangrove_stairs": "Mangrove Stairs", + "item.byg.mangrove_trapdoor": "Mangrove Trapdoor", + "item.byg.mangrove_wood": "Mangrove Wood", + "item.byg.maple_boat": "Maple Boat", + "item.byg.maple_bookshelf": "Maple Bookshelf", + "item.byg.maple_button": "Maple Button", + "item.byg.maple_crafting_table": "Maple Crafting Table", + "item.byg.maple_door": "Maple Door", + "item.byg.maple_fence": "Maple Fence", + "item.byg.maple_fence_gate": "Maple Fence Gate", + "item.byg.maple_leaves": "Maple Leaves", + "item.byg.maple_log": "Maple Log", + "item.byg.maple_planks": "Maple Planks", + "item.byg.maple_pressure_plate": "Maple Pressure Plate", + "item.byg.maple_sapling": "Maple Sapling", + "item.byg.maple_sign": "Maple Sign", + "item.byg.maple_slab": "Maple Slab", + "item.byg.maple_stairs": "Maple Stairs", + "item.byg.maple_trapdoor": "Maple Trapdoor", + "item.byg.maple_wood": "Maple Wood", + "item.byg.medium_subzero_crystal_bud": "Medium Subzero Crystal Bud", + "item.byg.mini_cactus": "Mini Cactus", + "item.byg.mossy_red_rock_brick_slab": "Mossy Red Rock Brick Slab", + "item.byg.mossy_red_rock_brick_stairs": "Mossy Red Rock Brick Stairs", + "item.byg.mossy_red_rock_brick_wall": "Mossy Red Rock Brick Wall", + "item.byg.mossy_red_rock_bricks": "Mossy Red Rock Bricks", + "item.byg.mossy_stone": "Mossy Stone", + "item.byg.mossy_stone_slab": "Mossy Stone Slab", + "item.byg.mossy_stone_stairs": "Mossy Stone Stairs", + "item.byg.mossy_stone_wall": "Mossy Stone Wall", + "item.byg.mud_ball": "Mud Ball", + "item.byg.mud_block": "Mud Block", + "item.byg.mud_bricks": "Mud Bricks", + "item.byg.mycelium_netherrack": "Mycelium Netherrack", + "item.byg.nether_bristle": "Nether Bristle", + "item.byg.nightshade_berries": "Nightshade Berries", + "item.byg.nightshade_berry_pie": "Nightshade Berry Pie", + "item.byg.nightshade_bookshelf": "Nightshade Bookshelf", + "item.byg.nightshade_button": "Nightshade Button", + "item.byg.nightshade_crafting_table": "Nightshade Crafting Table", + "item.byg.nightshade_door": "Nightshade Door", + "item.byg.nightshade_fence": "Nightshade Fence", + "item.byg.nightshade_fence_gate": "Nightshade Fence Gate", + "item.byg.nightshade_leaves": "Nightshade Leaves", + "item.byg.nightshade_log": "Nightshade Log", + "item.byg.nightshade_phylium": "Nightshade Phylium", + "item.byg.nightshade_planks": "Nightshade Planks", + "item.byg.nightshade_pressure_plate": "Nightshade Pressure Plate", + "item.byg.nightshade_roots": "Nightshade Roots", + "item.byg.nightshade_sapling": "Nightshade Sapling", + "item.byg.nightshade_sign": "Nightshade Sign", + "item.byg.nightshade_slab": "Nightshade Slab", + "item.byg.nightshade_sprouts": "Nightshade Sprouts", + "item.byg.nightshade_stairs": "Nightshade Stairs", + "item.byg.nightshade_trapdoor": "Nightshade Trapdoor", + "item.byg.nightshade_wood": "Nightshade Wood", + "item.byg.oddity_bush": "Oddity Bush", + "item.byg.oddity_cactus": "Oddity Cactus", + "item.byg.orange_amaranth": "Orange Amaranth", + "item.byg.orange_birch_leaves": "Orange Birch Leaves", + "item.byg.orange_birch_sapling": "Orange Birch Sapling", + "item.byg.orange_daisy": "Orange Daisy", + "item.byg.orange_oak_leaves": "Orange Oak Leaves", + "item.byg.orange_oak_sapling": "Orange Oak Sapling", + "item.byg.orange_spruce_leaves": "Orange Spruce Leaves", + "item.byg.orange_spruce_sapling": "Orange Spruce Sapling", + "item.byg.orchard_leaves": "Orchard Leaves", + "item.byg.orchard_sapling": "Orchard Sapling", + "item.byg.osiria_rose": "Osiria Rose", + "item.byg.overgrown_crimson_blackstone": "Overgrown Crimson Blackstone", + "item.byg.overgrown_dacite": "Overgrown Dacite", + "item.byg.overgrown_netherrack": "Overgrown Netherrack", + "item.byg.overgrown_stone": "Overgrown Stone", + "item.byg.packed_black_ice": "Packed Black Ice", + "item.byg.palm_boat": "Palm Boat", + "item.byg.palm_bookshelf": "Palm Bookshelf", + "item.byg.palm_button": "Palm Button", + "item.byg.palm_crafting_table": "Palm Crafting Table", + "item.byg.palm_door": "Palm Door", + "item.byg.palm_fence": "Palm Fence", + "item.byg.palm_fence_gate": "Palm Fence Gate", + "item.byg.palm_leaves": "Palm Leaves", + "item.byg.palm_log": "Palm Log", + "item.byg.palm_planks": "Palm Planks", + "item.byg.palm_pressure_plate": "Palm Pressure Plate", + "item.byg.palm_sapling": "Palm Sapling", + "item.byg.palm_sign": "Palm Sign", + "item.byg.palm_slab": "Palm Slab", + "item.byg.palm_stairs": "Palm Stairs", + "item.byg.palm_trapdoor": "Palm Trapdoor", + "item.byg.palm_wood": "Palm Wood", + "item.byg.palo_verde_leaves": "Palo Verde Leaves", + "item.byg.palo_verde_log": "Palo Verde Log", + "item.byg.palo_verde_sapling": "Palo Verde Sapling", + "item.byg.palo_verde_wood": "Palo Verde Wood", + "item.byg.peach_leather_flower": "Peach Leather Flower", + "item.byg.peat": "Peat", + "item.byg.pendorite_axe": "Pendorite Axe", + "item.byg.pendorite_battleaxe": "Pendorite Battleaxe", + "item.byg.pendorite_block": "Pendorite Block", + "item.byg.pendorite_hoe": "Pendorite Hoe", + "item.byg.pendorite_horse_armor": "Pendorite Horse Armor", + "item.byg.pendorite_ingot": "Pendorite Ingot", + "item.byg.pendorite_ore": "Pendorite Ore", + "item.byg.pendorite_pickaxe": "Pendorite Pickaxe", + "item.byg.pendorite_scraps": "Pendorite Scraps", + "item.byg.pendorite_shovel": "Pendorite Shovel", + "item.byg.pendorite_sword": "Pendorite Sword", + "item.byg.pervaded_netherrack": "Pervaded Netherrack", + "item.byg.pine_boat": "Pine Boat", + "item.byg.pine_bookshelf": "Pine Bookshelf", + "item.byg.pine_button": "Pine Button", + "item.byg.pine_crafting_table": "Pine Crafting Table", + "item.byg.pine_door": "Pine Door", + "item.byg.pine_fence": "Pine Fence", + "item.byg.pine_fence_gate": "Pine Fence Gate", + "item.byg.pine_leaves": "Pine Leaves", + "item.byg.pine_log": "Pine Log", + "item.byg.pine_planks": "Pine Planks", + "item.byg.pine_pressure_plate": "Pine Pressure Plate", + "item.byg.pine_sapling": "Pine Sapling", + "item.byg.pine_sign": "Pine Sign", + "item.byg.pine_slab": "Pine Slab", + "item.byg.pine_stairs": "Pine Stairs", + "item.byg.pine_trapdoor": "Pine Trapdoor", + "item.byg.pine_wood": "Pine Wood", + "item.byg.pink_allium": "Pink Allium", + "item.byg.pink_allium_flower_bush": "Pink Allium Flower Bush", + "item.byg.pink_anemone": "Pink Anemone", + "item.byg.pink_cherry_foliage": "Pink Cherry Foliage", + "item.byg.pink_cherry_leaves": "Pink Cherry Leaves", + "item.byg.pink_cherry_sapling": "Pink Cherry Sapling", + "item.byg.pink_chiseled_sandstone": "Pink Chiseled Sandstone", + "item.byg.pink_cut_sandstone": "Pink Cut Sandstone", + "item.byg.pink_daffodil": "Pink Daffodil", + "item.byg.pink_sand": "Pink Sand", + "item.byg.pink_sandstone": "Pink Sandstone", + "item.byg.pink_smooth_sandstone": "Pink Smooth Sandstone", + "item.byg.plant_stem": "Plant Stem", + "item.byg.podzol_dacite": "Podzol Dacite", + "item.byg.poison_ivy": "Poison Ivy", + "item.byg.polished_soapstone": "Polished Soapstone", + "item.byg.polished_soapstone_slab": "Polished Soapstone Slab", + "item.byg.polished_soapstone_stairs": "Polished Soapstone Stairs", + "item.byg.polished_soapstone_wall": "Polished Soapstone Wall", + "item.byg.polished_travertine": "Polished Travertine", + "item.byg.polished_travertine_slab": "Polished Travertine Slab", + "item.byg.polished_travertine_stairs": "Polished Travertine Stairs", + "item.byg.polished_travertine_wall": "Polished Travertine Wall", + "item.byg.pollen_block": "Pollen Block", + "item.byg.pollen_dust": "Pollen Dust", + "item.byg.prairie_grass": "Prairie Grass", + "item.byg.prickly_pear_cactus": "Prickly Pear Cactus", + "item.byg.protea_flower": "Protea Flower", + "item.byg.purple_amaranth": "Purple Amaranth", + "item.byg.purple_bulbis_anomaly": "Purple Bulbis Anomaly", + "item.byg.purple_bulbis_oddity": "Purple Bulbis Oddity", + "item.byg.purple_bulbis_shell": "Purple Bulbis Shell", + "item.byg.purple_chiseled_sandstone": "Purple Chiseled Sandstone", + "item.byg.purple_cut_sandstone": "Purple Cut Sandstone", + "item.byg.purple_petal_block": "Purple Petal Block", + "item.byg.purple_sage": "Purple Sage", + "item.byg.purple_sand": "Purple Sand", + "item.byg.purple_sandstone": "Purple Sandstone", + "item.byg.purple_shroomlight": "Purple Shroomlight", + "item.byg.purple_smooth_sandstone": "Purple Smooth Sandstone", + "item.byg.purple_tulip": "Purple Tulip", + "item.byg.purpur_stone": "Purpur Stone", + "item.byg.purpur_stone_slab": "Purpur Stone Slab", + "item.byg.purpur_stone_stairs": "Purpur Stone Stairs", + "item.byg.purpur_stone_wall": "Purpur Stone Wall", + "item.byg.quartz_crystal": "Quartz Crystal", + "item.byg.quartzite_sand": "Quartzite Sand", + "item.byg.rainbow_eucalyptus_boat": "Rainbow Eucalyptus Boat", + "item.byg.rainbow_eucalyptus_bookshelf": "Rainbow Eucalyptus Bookshelf", + "item.byg.rainbow_eucalyptus_button": "Rainbow Eucalyptus Button", + "item.byg.rainbow_eucalyptus_crafting_table": "Rainbow Eucalyptus Crafting Table", + "item.byg.rainbow_eucalyptus_door": "Rainbow Eucalyptus Door", + "item.byg.rainbow_eucalyptus_fence": "Rainbow Eucalyptus Fence", + "item.byg.rainbow_eucalyptus_fence_gate": "Rainbow Eucalyptus Fence Gate", + "item.byg.rainbow_eucalyptus_leaves": "Rainbow Eucalyptus Leaves", + "item.byg.rainbow_eucalyptus_log": "Rainbow Eucalyptus Log", + "item.byg.rainbow_eucalyptus_planks": "Rainbow Eucalyptus Planks", + "item.byg.rainbow_eucalyptus_pressure_plate": "Rainbow Eucalyptus Pressure Plate", + "item.byg.rainbow_eucalyptus_sapling": "Rainbow Eucalyptus Sapling", + "item.byg.rainbow_eucalyptus_sign": "Rainbow Eucalyptus Sign", + "item.byg.rainbow_eucalyptus_slab": "Rainbow Eucalyptus Slab", + "item.byg.rainbow_eucalyptus_stairs": "Rainbow Eucalyptus Stairs", + "item.byg.rainbow_eucalyptus_trapdoor": "Rainbow Eucalyptus Trapdoor", + "item.byg.rainbow_eucalyptus_wood": "Rainbow Eucalyptus Wood", + "item.byg.raw_pendorite": "Raw Pendorite", + "item.byg.raw_pendorite_block": "Raw Pendorite Block", + "item.byg.raw_quartz_block": "Raw Quartz Block", + "item.byg.red_birch_leaves": "Red Birch Leaves", + "item.byg.red_birch_sapling": "Red Birch Sapling", + "item.byg.red_maple_leaves": "Red Maple Leaves", + "item.byg.red_maple_sapling": "Red Maple Sapling", + "item.byg.red_oak_leaves": "Red Oak Leaves", + "item.byg.red_oak_sapling": "Red Oak Sapling", + "item.byg.red_petal_block": "Red Petal Block", + "item.byg.red_rock": "Red Rock", + "item.byg.red_rock_brick_slab": "Red Rock Brick Slab", + "item.byg.red_rock_brick_stairs": "Red Rock Brick Stairs", + "item.byg.red_rock_brick_wall": "Red Rock Brick Wall", + "item.byg.red_rock_bricks": "Red Rock Bricks", + "item.byg.red_rock_slab": "Red Rock Slab", + "item.byg.red_rock_stairs": "Red Rock Stairs", + "item.byg.red_rock_wall": "Red Rock Wall", + "item.byg.red_spruce_leaves": "Red Spruce Leaves", + "item.byg.red_spruce_sapling": "Red Spruce Sapling", + "item.byg.redwood_boat": "Redwood Boat", + "item.byg.redwood_bookshelf": "Redwood Bookshelf", + "item.byg.redwood_button": "Redwood Button", + "item.byg.redwood_crafting_table": "Redwood Crafting Table", + "item.byg.redwood_door": "Redwood Door", + "item.byg.redwood_fence": "Redwood Fence", + "item.byg.redwood_fence_gate": "Redwood Fence Gate", + "item.byg.redwood_leaves": "Redwood Leaves", + "item.byg.redwood_log": "Redwood Log", + "item.byg.redwood_planks": "Redwood Planks", + "item.byg.redwood_pressure_plate": "Redwood Pressure Plate", + "item.byg.redwood_sapling": "Redwood Sapling", + "item.byg.redwood_sign": "Redwood Sign", + "item.byg.redwood_slab": "Redwood Slab", + "item.byg.redwood_stairs": "Redwood Stairs", + "item.byg.redwood_trapdoor": "Redwood Trapdoor", + "item.byg.redwood_wood": "Redwood Wood", + "item.byg.richea": "Richea", + "item.byg.ripe_joshua_leaves": "Ripe Joshua Leaves", + "item.byg.ripe_orchard_leaves": "Ripe Orchard Leaves", + "item.byg.rocky_stone": "Rocky Stone", + "item.byg.rocky_stone_slab": "Rocky Stone Slab", + "item.byg.rocky_stone_stairs": "Rocky Stone Stairs", + "item.byg.rocky_stone_wall": "Rocky Stone Wall", + "item.byg.rose": "Rose", + "item.byg.scorched_bush": "Scorched Bush", + "item.byg.scorched_grass": "Scorched Grass", + "item.byg.scoria_cobblestone": "Scoria Cobblestone", + "item.byg.scoria_cobblestone_slab": "Scoria Cobblestone Slab", + "item.byg.scoria_cobblestone_stairs": "Scoria Cobblestone Stairs", + "item.byg.scoria_cobblestone_wall": "Scoria Cobblestone Wall", + "item.byg.scoria_pillar": "Scoria Pillar", + "item.byg.scoria_stone": "Scoria Stone", + "item.byg.scoria_stone_slab": "Scoria Stone Slab", + "item.byg.scoria_stone_stairs": "Scoria Stone Stairs", + "item.byg.scoria_stone_wall": "Scoria Stone Wall", + "item.byg.scoria_stonebrick_slab": "Scoria Stonebrick Slab", + "item.byg.scoria_stonebrick_stairs": "Scoria Stonebrick Stairs", + "item.byg.scoria_stonebrick_wall": "Scoria Stonebrick Wall", + "item.byg.scoria_stonebricks": "Scoria Stonebricks", + "item.byg.shiny_chiseled_therium": "Shiny Chiseled Therium", + "item.byg.shiny_chiseled_therium_slab": "Shiny Chiseled Therium Slab", + "item.byg.shiny_chiseled_therium_stairs": "Shiny Chiseled Therium Stairs", + "item.byg.shiny_chiseled_therium_wall": "Shiny Chiseled Therium Wall", + "item.byg.shrub": "Shrub", + "item.byg.shulkren_fungus": "Shulkren Fungus", + "item.byg.shulkren_moss_blanket": "Shulkren Moss Blanket", + "item.byg.shulkren_phylium": "Shulkren Phylium", + "item.byg.shulkren_vine": "Shulkren Vine", + "item.byg.shulkren_wart_block": "Shulkren Wart Block", + "item.byg.silver_maple_leaves": "Silver Maple Leaves", + "item.byg.silver_maple_sapling": "Silver Maple Sapling", + "item.byg.silver_vase_flower": "Silver Vase Flower", + "item.byg.skyris_boat": "Skyris Boat", + "item.byg.skyris_bookshelf": "Skyris Bookshelf", + "item.byg.skyris_button": "Skyris Button", + "item.byg.skyris_crafting_table": "Skyris Crafting Table", + "item.byg.skyris_door": "Skyris Door", + "item.byg.skyris_fence": "Skyris Fence", + "item.byg.skyris_fence_gate": "Skyris Fence Gate", + "item.byg.skyris_leaves": "Skyris Leaves", + "item.byg.skyris_log": "Skyris Log", + "item.byg.skyris_planks": "Skyris Planks", + "item.byg.skyris_pressure_plate": "Skyris Pressure Plate", + "item.byg.skyris_sapling": "Skyris Sapling", + "item.byg.skyris_sign": "Skyris Sign", + "item.byg.skyris_slab": "Skyris Slab", + "item.byg.skyris_stairs": "Skyris Stairs", + "item.byg.skyris_trapdoor": "Skyris Trapdoor", + "item.byg.skyris_vine": "Skyris Vine", + "item.byg.skyris_wood": "Skyris Wood", + "item.byg.small_subzero_crystal_bud": "Small Subzero Crystal Bud", + "item.byg.smooth_windswept_sandstone": "Smooth Windswept Sandstone", + "item.byg.smooth_windswept_sandstone_slab": "Smooth Windswept Sandstone Slab", + "item.byg.smooth_windswept_sandstone_stairs": "Smooth Windswept Sandstone Stairs", + "item.byg.smooth_windswept_sandstone_wall": "Smooth Windswept Sandstone Wall", + "item.byg.snowdrops": "Snowdrops", + "item.byg.soapstone": "Soapstone", + "item.byg.soapstone_brick_slab": "Soapstone Brick Slab", + "item.byg.soapstone_brick_stairs": "Soapstone Brick Stairs", + "item.byg.soapstone_brick_wall": "Soapstone Brick Wall", + "item.byg.soapstone_bricks": "Soapstone Bricks", + "item.byg.soapstone_pillar": "Soapstone Pillar", + "item.byg.soapstone_slab": "Soapstone Slab", + "item.byg.soapstone_stairs": "Soapstone Stairs", + "item.byg.soapstone_tile": "Soapstone Tile", + "item.byg.soapstone_tile_slab": "Soapstone Tile Slab", + "item.byg.soapstone_tile_stairs": "Soapstone Tile Stairs", + "item.byg.soapstone_tile_wall": "Soapstone Tile Wall", + "item.byg.soapstone_wall": "Soapstone Wall", + "item.byg.soul_shroom": "Soul Shroom", + "item.byg.soul_shroom_block": "Soul Shroom Block", + "item.byg.soul_shroom_spore_end": "Soul Shroom Spore End", + "item.byg.soul_shroom_stem": "Soul Shroom Stem", + "item.byg.stripped_aspen_log": "Stripped Aspen Log", + "item.byg.stripped_aspen_wood": "Stripped Aspen Wood", + "item.byg.stripped_baobab_log": "Stripped Baobab Log", + "item.byg.stripped_baobab_wood": "Stripped Baobab Wood", + "item.byg.stripped_blue_enchanted_log": "Stripped Blue Enchanted Log", + "item.byg.stripped_blue_enchanted_wood": "Stripped Blue Enchanted Wood", + "item.byg.stripped_bulbis_stem": "Stripped Bulbis Stem", + "item.byg.stripped_bulbis_wood": "Stripped Bulbis Wood", + "item.byg.stripped_cherry_log": "Stripped Cherry Log", + "item.byg.stripped_cherry_wood": "Stripped Cherry Wood", + "item.byg.stripped_cika_log": "Stripped Cika Log", + "item.byg.stripped_cika_wood": "Stripped Cika Wood", + "item.byg.stripped_cypress_log": "Stripped Cypress Log", + "item.byg.stripped_cypress_wood": "Stripped Cypress Wood", + "item.byg.stripped_ebony_log": "Stripped Ebony Log", + "item.byg.stripped_ebony_wood": "Stripped Ebony Wood", + "item.byg.stripped_embur_hyphae": "Stripped Embur Hyphae", + "item.byg.stripped_embur_pedu": "Stripped Embur Pedu", + "item.byg.stripped_ether_log": "Stripped Ether Log", + "item.byg.stripped_ether_wood": "Stripped Ether Wood", + "item.byg.stripped_fir_log": "Stripped Fir Log", + "item.byg.stripped_fir_wood": "Stripped Fir Wood", + "item.byg.stripped_green_enchanted_log": "Stripped Green Enchanted Log", + "item.byg.stripped_green_enchanted_wood": "Stripped Green Enchanted Wood", + "item.byg.stripped_holly_log": "Stripped Holly Log", + "item.byg.stripped_holly_wood": "Stripped Holly Wood", + "item.byg.stripped_jacaranda_log": "Stripped Jacaranda Log", + "item.byg.stripped_jacaranda_wood": "Stripped Jacaranda Wood", + "item.byg.stripped_lament_log": "Stripped Lament Log", + "item.byg.stripped_lament_wood": "Stripped Lament Wood", + "item.byg.stripped_mahogany_log": "Stripped Mahogany Log", + "item.byg.stripped_mahogany_wood": "Stripped Mahogany Wood", + "item.byg.stripped_mangrove_log": "Stripped Mangrove Log", + "item.byg.stripped_mangrove_wood": "Stripped Mangrove Wood", + "item.byg.stripped_maple_log": "Stripped Maple Log", + "item.byg.stripped_maple_wood": "Stripped Maple Wood", + "item.byg.stripped_nightshade_log": "Stripped Nightshade Log", + "item.byg.stripped_nightshade_wood": "Stripped Nightshade Wood", + "item.byg.stripped_palm_log": "Stripped Palm Log", + "item.byg.stripped_palm_wood": "Stripped Palm Wood", + "item.byg.stripped_palo_verde_log": "Stripped Palo Verde Log", + "item.byg.stripped_palo_verde_wood": "Stripped Palo Verde Wood", + "item.byg.stripped_pine_log": "Stripped Pine Log", + "item.byg.stripped_pine_wood": "Stripped Pine Wood", + "item.byg.stripped_rainbow_eucalyptus_log": "Stripped Rainbow Eucalyptus Log", + "item.byg.stripped_rainbow_eucalyptus_wood": "Stripped Rainbow Eucalyptus Wood", + "item.byg.stripped_redwood_log": "Stripped Redwood Log", + "item.byg.stripped_redwood_wood": "Stripped Redwood Wood", + "item.byg.stripped_skyris_log": "Stripped Skyris Log", + "item.byg.stripped_skyris_wood": "Stripped Skyris Wood", + "item.byg.stripped_sythian_hyphae": "Stripped Sythian Hyphae", + "item.byg.stripped_sythian_stem": "Stripped Sythian Stem", + "item.byg.stripped_willow_log": "Stripped Willow Log", + "item.byg.stripped_willow_wood": "Stripped Willow Wood", + "item.byg.stripped_witch_hazel_log": "Stripped Witch Hazel Log", + "item.byg.stripped_witch_hazel_wood": "Stripped Witch Hazel Wood", + "item.byg.stripped_zelkova_log": "Stripped Zelkova Log", + "item.byg.stripped_zelkova_wood": "Stripped Zelkova Wood", + "item.byg.subzero_ash": "Subzero Ash", + "item.byg.subzero_ash_block": "Subzero Ash Block", + "item.byg.subzero_crystal_block": "Subzero Crystal Block", + "item.byg.subzero_crystal_cluster": "Subzero Crystal Cluster", + "item.byg.subzero_crystal_shard": "Subzero Crystal Shard", + "item.byg.sythian_bookshelf": "Sythian Bookshelf", + "item.byg.sythian_button": "Sythian Button", + "item.byg.sythian_crafting_table": "Sythian Crafting Table", + "item.byg.sythian_door": "Sythian Door", + "item.byg.sythian_fence": "Sythian Fence", + "item.byg.sythian_fence_gate": "Sythian Fence Gate", + "item.byg.sythian_fungus": "Sythian Fungus", + "item.byg.sythian_hyphae": "Sythian Hyphae", + "item.byg.sythian_nylium": "Sythian Nylium", + "item.byg.sythian_planks": "Sythian Planks", + "item.byg.sythian_pressure_plate": "Sythian Pressure Plate", + "item.byg.sythian_roots": "Sythian Roots", + "item.byg.sythian_sapling": "Sythian Sapling", + "item.byg.sythian_scaffolding": "Sythian Scaffolding", + "item.byg.sythian_sign": "Sythian Sign", + "item.byg.sythian_slab": "Sythian Slab", + "item.byg.sythian_sprout": "Sythian Sprout", + "item.byg.sythian_stairs": "Sythian Stairs", + "item.byg.sythian_stalk_block": "Sythian Stalk Block", + "item.byg.sythian_stem": "Sythian Stem", + "item.byg.sythian_trapdoor": "Sythian Trapdoor", + "item.byg.sythian_wart_block": "Sythian Wart Block", + "item.byg.tall_allium": "Tall Allium", + "item.byg.tall_crimson_roots": "Tall Crimson Roots", + "item.byg.tall_cryptic_vent": "Tall Cryptic Vent", + "item.byg.tall_embur_roots": "Tall Embur Roots", + "item.byg.tall_ether_grass": "Tall Ether Grass", + "item.byg.tall_pink_allium": "Tall Pink Allium", + "item.byg.tall_prairie_grass": "Tall Prairie Grass", + "item.byg.thereal_bellflower": "Thereal Bellflower", + "item.byg.therium_block": "Therium Block", + "item.byg.therium_crystal": "Therium Crystal", + "item.byg.therium_glass": "Therium Glass", + "item.byg.therium_glass_pane": "Therium Glass Pane", + "item.byg.therium_lamp": "Therium Lamp", + "item.byg.therium_lantern": "Therium Lantern", + "item.byg.therium_shard": "Therium Shard", + "item.byg.tiny_lilypads": "Tiny Lilypads", + "item.byg.torch_ginger": "Torch Ginger", + "item.byg.travertine": "Travertine", + "item.byg.travertine_slab": "Travertine Slab", + "item.byg.travertine_stairs": "Travertine Stairs", + "item.byg.travertine_wall": "Travertine Wall", + "item.byg.vermilion_sculk": "Vermilion Sculk", + "item.byg.vermilion_sculk_growth": "Vermilion Sculk Growth", + "item.byg.vermilion_sculk_tendrils": "Vermilion Sculk Tendrils", + "item.byg.violet_leather_flower": "Violet Leather Flower", + "item.byg.wailing_bell_blossom": "Wailing Bell Blossom", + "item.byg.wailing_grass": "Wailing Grass", + "item.byg.wailing_nylium": "Wailing Nylium", + "item.byg.wailing_vine": "Wailing Vine", + "item.byg.warped_bush": "Warped Bush", + "item.byg.warped_cactus": "Warped Cactus", + "item.byg.warped_coral": "Warped Coral", + "item.byg.warped_coral_block": "Warped Coral Block", + "item.byg.warped_coral_fan": "Warped Coral Fan", + "item.byg.warped_soul_sand": "Warped Soul Sand", + "item.byg.warped_soul_soil": "Warped Soul Soil", + "item.byg.water_silk": "Water Silk", + "item.byg.weeping_milkcap": "Weeping Milkcap", + "item.byg.weeping_milkcap_mushroom_block": "Weeping Milkcap Mushroom Block", + "item.byg.weeping_roots": "Weeping Roots", + "item.byg.white_anemone": "White Anemone", + "item.byg.white_cherry_foliage": "White Cherry Foliage", + "item.byg.white_cherry_leaves": "White Cherry Leaves", + "item.byg.white_cherry_sapling": "White Cherry Sapling", + "item.byg.white_chiseled_sandstone": "White Chiseled Sandstone", + "item.byg.white_cut_sandstone": "White Cut Sandstone", + "item.byg.white_mushroom_stem": "White Mushroom Stem", + "item.byg.white_petal_block": "White Petal Block", + "item.byg.white_puffball_cap": "White Puffball Cap", + "item.byg.white_puffball_spores": "White Puffball Spores", + "item.byg.white_puffball_stew": "White Puffball Stew", + "item.byg.white_sage": "White Sage", + "item.byg.white_sand": "White Sand", + "item.byg.white_sandstone": "White Sandstone", + "item.byg.white_smooth_sandstone": "White Smooth Sandstone", + "item.byg.willow_boat": "Willow Boat", + "item.byg.willow_bookshelf": "Willow Bookshelf", + "item.byg.willow_button": "Willow Button", + "item.byg.willow_crafting_table": "Willow Crafting Table", + "item.byg.willow_door": "Willow Door", + "item.byg.willow_fence": "Willow Fence", + "item.byg.willow_fence_gate": "Willow Fence Gate", + "item.byg.willow_leaves": "Willow Leaves", + "item.byg.willow_log": "Willow Log", + "item.byg.willow_planks": "Willow Planks", + "item.byg.willow_pressure_plate": "Willow Pressure Plate", + "item.byg.willow_sapling": "Willow Sapling", + "item.byg.willow_sign": "Willow Sign", + "item.byg.willow_slab": "Willow Slab", + "item.byg.willow_stairs": "Willow Stairs", + "item.byg.willow_trapdoor": "Willow Trapdoor", + "item.byg.willow_wood": "Willow Wood", + "item.byg.windswept_sand": "Windswept Sand", + "item.byg.windswept_sandstone": "Windswept Sandstone", + "item.byg.windswept_sandstone_pillar": "Windswept Sandstone Pillar", + "item.byg.windswept_sandstone_slab": "Windswept Sandstone Slab", + "item.byg.windswept_sandstone_stairs": "Windswept Sandstone Stairs", + "item.byg.windswept_sandstone_wall": "Windswept Sandstone Wall", + "item.byg.winter_cyclamen": "Winter Cyclamen", + "item.byg.winter_rose": "Winter Rose", + "item.byg.winter_scilla": "Winter Scilla", + "item.byg.winter_succulent": "Winter Succulent", + "item.byg.witch_hazel_blossom": "Witch Hazel Blossom", + "item.byg.witch_hazel_boat": "Witch Hazel Boat", + "item.byg.witch_hazel_bookshelf": "Witch Hazel Bookshelf", + "item.byg.witch_hazel_branch": "Witch Hazel Branch", + "item.byg.witch_hazel_button": "Witch Hazel Button", + "item.byg.witch_hazel_crafting_table": "Witch Hazel Crafting Table", + "item.byg.witch_hazel_door": "Witch Hazel Door", + "item.byg.witch_hazel_fence": "Witch Hazel Fence", + "item.byg.witch_hazel_fence_gate": "Witch Hazel Fence Gate", + "item.byg.witch_hazel_leaves": "Witch Hazel Leaves", + "item.byg.witch_hazel_log": "Witch Hazel Log", + "item.byg.witch_hazel_planks": "Witch Hazel Planks", + "item.byg.witch_hazel_pressure_plate": "Witch Hazel Pressure Plate", + "item.byg.witch_hazel_sapling": "Witch Hazel Sapling", + "item.byg.witch_hazel_sign": "Witch Hazel Sign", + "item.byg.witch_hazel_slab": "Witch Hazel Slab", + "item.byg.witch_hazel_stairs": "Witch Hazel Stairs", + "item.byg.witch_hazel_trapdoor": "Witch Hazel Trapdoor", + "item.byg.witch_hazel_wood": "Witch Hazel Wood", + "item.byg.withering_oak_leaves": "Withering Oak Leaves", + "item.byg.withering_oak_log": "Withering Oak Log", + "item.byg.withering_oak_sapling": "Withering Oak Sapling", + "item.byg.withering_oak_wood": "Withering Oak Wood", + "item.byg.wood_blewit": "Wood Blewit", + "item.byg.wood_blewit_mushroom_block": "Wood Blewit Mushroom Block", + "item.byg.yellow_birch_leaves": "Yellow Birch Leaves", + "item.byg.yellow_birch_sapling": "Yellow Birch Sapling", + "item.byg.yellow_daffodil": "Yellow Daffodil", + "item.byg.yellow_nether_brick": "Yellow Nether Brick", + "item.byg.yellow_nether_brick_slab": "Yellow Nether Brick Slab", + "item.byg.yellow_nether_brick_stairs": "Yellow Nether Brick Stairs", + "item.byg.yellow_nether_brick_wall": "Yellow Nether Brick Wall", + "item.byg.yellow_nether_bricks": "Yellow Nether Bricks", + "item.byg.yellow_petal_block": "Yellow Petal Block", + "item.byg.yellow_spruce_leaves": "Yellow Spruce Leaves", + "item.byg.yellow_spruce_sapling": "Yellow Spruce Sapling", + "item.byg.yellow_tulip": "Yellow Tulip", + "item.byg.zelkova_boat": "Zelkova Boat", + "item.byg.zelkova_bookshelf": "Zelkova Bookshelf", + "item.byg.zelkova_button": "Zelkova Button", + "item.byg.zelkova_crafting_table": "Zelkova Crafting Table", + "item.byg.zelkova_door": "Zelkova Door", + "item.byg.zelkova_fence": "Zelkova Fence", + "item.byg.zelkova_fence_gate": "Zelkova Fence Gate", + "item.byg.zelkova_leaves": "Zelkova Leaves", + "item.byg.zelkova_log": "Zelkova Log", + "item.byg.zelkova_planks": "Zelkova Planks", + "item.byg.zelkova_pressure_plate": "Zelkova Pressure Plate", + "item.byg.zelkova_sapling": "Zelkova Sapling", + "item.byg.zelkova_sign": "Zelkova Sign", + "item.byg.zelkova_slab": "Zelkova Slab", + "item.byg.zelkova_stairs": "Zelkova Stairs", + "item.byg.zelkova_trapdoor": "Zelkova Trapdoor", + "item.byg.zelkova_wood": "Zelkova Wood", + "itemGroup.byg.byg": "Oh The Biomes You'll Go" +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json index 359f2fe217..84d0d6b221 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/aspen/leaves", - "up": "byg:block/aspen/leaves", - "north": "byg:block/aspen/leaves", - "south": "byg:block/aspen/leaves", - "east": "byg:block/aspen/leaves", - "west": "byg:block/aspen/leaves", + "all": "byg:block/aspen/leaves", "particle": "byg:block/aspen/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/sign.json b/Common/src/generated/resources/assets/byg/models/block/aspen/sign.json new file mode 100644 index 0000000000..a8546925aa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/aspen/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json index f9954ff0a0..bd3b49e026 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/baobab/leaves", - "up": "byg:block/baobab/leaves", - "north": "byg:block/baobab/leaves", - "south": "byg:block/baobab/leaves", - "east": "byg:block/baobab/leaves", - "west": "byg:block/baobab/leaves", + "all": "byg:block/baobab/leaves", "particle": "byg:block/baobab/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/sign.json b/Common/src/generated/resources/assets/byg/models/block/baobab/sign.json new file mode 100644 index 0000000000..3f553d670c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/baobab/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json index 00f99babb8..46e590e5c0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/blue_enchanted/leaves", - "up": "byg:block/blue_enchanted/leaves", - "north": "byg:block/blue_enchanted/leaves", - "south": "byg:block/blue_enchanted/leaves", - "east": "byg:block/blue_enchanted/leaves", - "west": "byg:block/blue_enchanted/leaves", + "all": "byg:block/blue_enchanted/leaves", "particle": "byg:block/blue_enchanted/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/sign.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/sign.json new file mode 100644 index 0000000000..b0dc654b06 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/blue_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/sign.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/sign.json new file mode 100644 index 0000000000..c0fd288a66 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/bulbis/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/sign.json b/Common/src/generated/resources/assets/byg/models/block/cherry/sign.json new file mode 100644 index 0000000000..b1593ff0b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/cherry/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/leaves.json b/Common/src/generated/resources/assets/byg/models/block/cika/leaves.json index 65729da08e..e4091e869b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/cika/leaves", - "up": "byg:block/cika/leaves", - "north": "byg:block/cika/leaves", - "south": "byg:block/cika/leaves", - "east": "byg:block/cika/leaves", - "west": "byg:block/cika/leaves", + "all": "byg:block/cika/leaves", "particle": "byg:block/cika/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/sign.json b/Common/src/generated/resources/assets/byg/models/block/cika/sign.json new file mode 100644 index 0000000000..de4cb19d70 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/cika/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json index a382446e41..cbdd01ba27 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/cypress/leaves", - "up": "byg:block/cypress/leaves", - "north": "byg:block/cypress/leaves", - "south": "byg:block/cypress/leaves", - "east": "byg:block/cypress/leaves", - "west": "byg:block/cypress/leaves", + "all": "byg:block/cypress/leaves", "particle": "byg:block/cypress/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/sign.json b/Common/src/generated/resources/assets/byg/models/block/cypress/sign.json new file mode 100644 index 0000000000..0a327afb28 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/cypress/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json index eddfe28d59..c1cd6518ef 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/ebony/leaves", - "up": "byg:block/ebony/leaves", - "north": "byg:block/ebony/leaves", - "south": "byg:block/ebony/leaves", - "east": "byg:block/ebony/leaves", - "west": "byg:block/ebony/leaves", + "all": "byg:block/ebony/leaves", "particle": "byg:block/ebony/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/sign.json b/Common/src/generated/resources/assets/byg/models/block/ebony/sign.json new file mode 100644 index 0000000000..4b2117c46a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/ebony/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/sign.json b/Common/src/generated/resources/assets/byg/models/block/embur/sign.json new file mode 100644 index 0000000000..639ae4888e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/embur/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json b/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json index 16fd177310..f5dcc50f1c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/ether/leaves", - "up": "byg:block/ether/leaves", - "north": "byg:block/ether/leaves", - "south": "byg:block/ether/leaves", - "east": "byg:block/ether/leaves", - "west": "byg:block/ether/leaves", + "all": "byg:block/ether/leaves", "particle": "byg:block/ether/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/sign.json b/Common/src/generated/resources/assets/byg/models/block/ether/sign.json new file mode 100644 index 0000000000..5db3f71c47 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/ether/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json b/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json index a5b02293d6..dea5abeaeb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/fir/leaves", - "up": "byg:block/fir/leaves", - "north": "byg:block/fir/leaves", - "south": "byg:block/fir/leaves", - "east": "byg:block/fir/leaves", - "west": "byg:block/fir/leaves", + "all": "byg:block/fir/leaves", "particle": "byg:block/fir/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/sign.json b/Common/src/generated/resources/assets/byg/models/block/fir/sign.json new file mode 100644 index 0000000000..4f6c5319ad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/fir/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json index 1d6df36eb5..e3cbd49618 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/green_enchanted/leaves", - "up": "byg:block/green_enchanted/leaves", - "north": "byg:block/green_enchanted/leaves", - "south": "byg:block/green_enchanted/leaves", - "east": "byg:block/green_enchanted/leaves", - "west": "byg:block/green_enchanted/leaves", + "all": "byg:block/green_enchanted/leaves", "particle": "byg:block/green_enchanted/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/sign.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/sign.json new file mode 100644 index 0000000000..660b1bf100 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/green_enchanted/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json b/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json index 478b59b46d..67523a2a07 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/holly/leaves", - "up": "byg:block/holly/leaves", - "north": "byg:block/holly/leaves", - "south": "byg:block/holly/leaves", - "east": "byg:block/holly/leaves", - "west": "byg:block/holly/leaves", + "all": "byg:block/holly/leaves", "particle": "byg:block/holly/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/sign.json b/Common/src/generated/resources/assets/byg/models/block/holly/sign.json new file mode 100644 index 0000000000..2eb20499f3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/holly/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/sign.json b/Common/src/generated/resources/assets/byg/models/block/imparius/sign.json new file mode 100644 index 0000000000..6248db1d72 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/imparius/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json index f820e1cf49..a4e4894f8a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/jacaranda/leaves", - "up": "byg:block/jacaranda/leaves", - "north": "byg:block/jacaranda/leaves", - "south": "byg:block/jacaranda/leaves", - "east": "byg:block/jacaranda/leaves", - "west": "byg:block/jacaranda/leaves", + "all": "byg:block/jacaranda/leaves", "particle": "byg:block/jacaranda/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/sign.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/sign.json new file mode 100644 index 0000000000..5464319b61 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/jacaranda/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json b/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json index ad81c2a93f..39b2376a1a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/lament/leaves", - "up": "byg:block/lament/leaves", - "north": "byg:block/lament/leaves", - "south": "byg:block/lament/leaves", - "east": "byg:block/lament/leaves", - "west": "byg:block/lament/leaves", + "all": "byg:block/lament/leaves", "particle": "byg:block/lament/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/sign.json b/Common/src/generated/resources/assets/byg/models/block/lament/sign.json new file mode 100644 index 0000000000..9bd776bb8c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/lament/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json index 88bd911066..cb1a1202be 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json @@ -21,7 +21,33 @@ 16, 16, 16 - ] + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } }, { "from": [ @@ -33,7 +59,39 @@ 16, 16, 16 - ] + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down", + "tintindex": 1 + }, + "up": { + "texture": "#up", + "cullface": "up", + "tintindex": 1 + }, + "north": { + "texture": "#north", + "cullface": "north", + "tintindex": 1 + }, + "south": { + "texture": "#south", + "cullface": "south", + "tintindex": 1 + }, + "west": { + "texture": "#west", + "cullface": "west", + "tintindex": 1 + }, + "east": { + "texture": "#east", + "cullface": "east", + "tintindex": 1 + } + } } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/sign.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/sign.json new file mode 100644 index 0000000000..4c630b9d87 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/mahogany/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json index 93ce523997..1b82b591eb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/mangrove/leaves", - "up": "byg:block/mangrove/leaves", - "north": "byg:block/mangrove/leaves", - "south": "byg:block/mangrove/leaves", - "east": "byg:block/mangrove/leaves", - "west": "byg:block/mangrove/leaves", + "all": "byg:block/mangrove/leaves", "particle": "byg:block/mangrove/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/sign.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/sign.json new file mode 100644 index 0000000000..1c1e81128b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/mangrove/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json b/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json index ebfdf74fe9..ae6e067a0a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/maple/leaves", - "up": "byg:block/maple/leaves", - "north": "byg:block/maple/leaves", - "south": "byg:block/maple/leaves", - "east": "byg:block/maple/leaves", - "west": "byg:block/maple/leaves", + "all": "byg:block/maple/leaves", "particle": "byg:block/maple/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/sign.json b/Common/src/generated/resources/assets/byg/models/block/maple/sign.json new file mode 100644 index 0000000000..aa52f89386 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/maple/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json index 535a967a48..95828e69d3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/nightshade/leaves", - "up": "byg:block/nightshade/leaves", - "north": "byg:block/nightshade/leaves", - "south": "byg:block/nightshade/leaves", - "east": "byg:block/nightshade/leaves", - "west": "byg:block/nightshade/leaves", + "all": "byg:block/nightshade/leaves", "particle": "byg:block/nightshade/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/sign.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/sign.json new file mode 100644 index 0000000000..8600bedaa9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/nightshade/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json b/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json index a6afd0a862..6ae209b842 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/palm/leaves", - "up": "byg:block/palm/leaves", - "north": "byg:block/palm/leaves", - "south": "byg:block/palm/leaves", - "east": "byg:block/palm/leaves", - "west": "byg:block/palm/leaves", + "all": "byg:block/palm/leaves", "particle": "byg:block/palm/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/sign.json b/Common/src/generated/resources/assets/byg/models/block/palm/sign.json new file mode 100644 index 0000000000..f7d52a13fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/palm/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json b/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json index f648088629..b64e334ee2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/pine/leaves", - "up": "byg:block/pine/leaves", - "north": "byg:block/pine/leaves", - "south": "byg:block/pine/leaves", - "east": "byg:block/pine/leaves", - "west": "byg:block/pine/leaves", + "all": "byg:block/pine/leaves", "particle": "byg:block/pine/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/sign.json b/Common/src/generated/resources/assets/byg/models/block/pine/sign.json new file mode 100644 index 0000000000..8e2d0f349b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/pine/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json index 30bd10007b..73c208740c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/rainbow_eucalyptus/leaves", - "up": "byg:block/rainbow_eucalyptus/leaves", - "north": "byg:block/rainbow_eucalyptus/leaves", - "south": "byg:block/rainbow_eucalyptus/leaves", - "east": "byg:block/rainbow_eucalyptus/leaves", - "west": "byg:block/rainbow_eucalyptus/leaves", + "all": "byg:block/rainbow_eucalyptus/leaves", "particle": "byg:block/rainbow_eucalyptus/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/sign.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/sign.json new file mode 100644 index 0000000000..a50f015ba3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/rainbow_eucalyptus/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json index 621f34a0b1..7016a22ef5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/redwood/leaves", - "up": "byg:block/redwood/leaves", - "north": "byg:block/redwood/leaves", - "south": "byg:block/redwood/leaves", - "east": "byg:block/redwood/leaves", - "west": "byg:block/redwood/leaves", + "all": "byg:block/redwood/leaves", "particle": "byg:block/redwood/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/sign.json b/Common/src/generated/resources/assets/byg/models/block/redwood/sign.json new file mode 100644 index 0000000000..8731a7c25f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/redwood/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json index fbcce3ad66..df4835c17e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/skyris/leaves", - "up": "byg:block/skyris/leaves", - "north": "byg:block/skyris/leaves", - "south": "byg:block/skyris/leaves", - "east": "byg:block/skyris/leaves", - "west": "byg:block/skyris/leaves", + "all": "byg:block/skyris/leaves", "particle": "byg:block/skyris/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/sign.json b/Common/src/generated/resources/assets/byg/models/block/skyris/sign.json new file mode 100644 index 0000000000..e2f9b24089 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/skyris/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json index e390a438ee..9a2d4ab232 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/sythian/leaves", - "up": "byg:block/sythian/leaves", - "north": "byg:block/sythian/leaves", - "south": "byg:block/sythian/leaves", - "east": "byg:block/sythian/leaves", - "west": "byg:block/sythian/leaves", + "all": "byg:block/sythian/leaves", "particle": "byg:block/sythian/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/sign.json b/Common/src/generated/resources/assets/byg/models/block/sythian/sign.json new file mode 100644 index 0000000000..62141960a9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/sythian/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json index 14f0f13e4c..f49cee674e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json @@ -21,7 +21,33 @@ 16, 16, 16 - ] + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } }, { "from": [ @@ -33,7 +59,39 @@ 16, 16, 16 - ] + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down", + "tintindex": 1 + }, + "up": { + "texture": "#up", + "cullface": "up", + "tintindex": 1 + }, + "north": { + "texture": "#north", + "cullface": "north", + "tintindex": 1 + }, + "south": { + "texture": "#south", + "cullface": "south", + "tintindex": 1 + }, + "west": { + "texture": "#west", + "cullface": "west", + "tintindex": 1 + }, + "east": { + "texture": "#east", + "cullface": "east", + "tintindex": 1 + } + } } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/sign.json b/Common/src/generated/resources/assets/byg/models/block/willow/sign.json new file mode 100644 index 0000000000..cd64626a0b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/willow/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json index b28e8481d5..fd8d138f89 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/witch_hazel/leaves", - "up": "byg:block/witch_hazel/leaves", - "north": "byg:block/witch_hazel/leaves", - "south": "byg:block/witch_hazel/leaves", - "east": "byg:block/witch_hazel/leaves", - "west": "byg:block/witch_hazel/leaves", + "all": "byg:block/witch_hazel/leaves", "particle": "byg:block/witch_hazel/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/sign.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/sign.json new file mode 100644 index 0000000000..6d5a13b7ad --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/witch_hazel/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json index 3ddbd59908..62fc764736 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves.json @@ -1,12 +1,7 @@ { - "parent": "minecraft:block/cube", + "parent": "minecraft:block/leaves", "textures": { - "down": "byg:block/zelkova/leaves", - "up": "byg:block/zelkova/leaves", - "north": "byg:block/zelkova/leaves", - "south": "byg:block/zelkova/leaves", - "east": "byg:block/zelkova/leaves", - "west": "byg:block/zelkova/leaves", + "all": "byg:block/zelkova/leaves", "particle": "byg:block/zelkova/leaves" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/sign.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/sign.json new file mode 100644 index 0000000000..ed66b1ea9d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "byg:block/zelkova/planks" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_sign.json b/Common/src/generated/resources/assets/byg/models/item/aspen_sign.json new file mode 100644 index 0000000000..f5829534d4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/aspen/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_sign.json b/Common/src/generated/resources/assets/byg/models/item/baobab_sign.json new file mode 100644 index 0000000000..6726b84b3b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/baobab/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sign.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sign.json new file mode 100644 index 0000000000..4c5b805659 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/blue_enchanted/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_sign.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_sign.json new file mode 100644 index 0000000000..3416d1946b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/bulbis/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_sign.json b/Common/src/generated/resources/assets/byg/models/item/cherry_sign.json new file mode 100644 index 0000000000..27c7f9619e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cherry/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_sign.json b/Common/src/generated/resources/assets/byg/models/item/cika_sign.json new file mode 100644 index 0000000000..c2fc29010e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cika_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cika/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_sign.json b/Common/src/generated/resources/assets/byg/models/item/cypress_sign.json new file mode 100644 index 0000000000..4df69c12f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/cypress/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_sign.json b/Common/src/generated/resources/assets/byg/models/item/ebony_sign.json new file mode 100644 index 0000000000..eaf123c5d3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ebony/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_sign.json b/Common/src/generated/resources/assets/byg/models/item/embur_sign.json new file mode 100644 index 0000000000..b3c5365a54 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/embur_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/embur/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_sign.json b/Common/src/generated/resources/assets/byg/models/item/ether_sign.json new file mode 100644 index 0000000000..9a3621f813 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/ether_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/ether/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_sign.json b/Common/src/generated/resources/assets/byg/models/item/fir_sign.json new file mode 100644 index 0000000000..b24a5983e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/fir_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/fir/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sign.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sign.json new file mode 100644 index 0000000000..9f6de399bb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/green_enchanted/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_sign.json b/Common/src/generated/resources/assets/byg/models/item/holly_sign.json new file mode 100644 index 0000000000..b488f341c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/holly_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/holly/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_sign.json b/Common/src/generated/resources/assets/byg/models/item/imparius_sign.json new file mode 100644 index 0000000000..4a0f5ea6eb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/imparius/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_sign.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_sign.json new file mode 100644 index 0000000000..d0cd301a9a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/jacaranda/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_sign.json b/Common/src/generated/resources/assets/byg/models/item/lament_sign.json new file mode 100644 index 0000000000..181b71c335 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/lament_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/lament/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_sign.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_sign.json new file mode 100644 index 0000000000..e4ee9f9d46 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mahogany/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_sign.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_sign.json new file mode 100644 index 0000000000..c0f4e48275 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/mangrove/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_sign.json b/Common/src/generated/resources/assets/byg/models/item/maple_sign.json new file mode 100644 index 0000000000..1e0f239596 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/maple_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/maple/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_sign.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_sign.json new file mode 100644 index 0000000000..340c905707 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/nightshade/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_sign.json b/Common/src/generated/resources/assets/byg/models/item/palm_sign.json new file mode 100644 index 0000000000..fada1bd85e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/palm_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/palm/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_sign.json b/Common/src/generated/resources/assets/byg/models/item/pine_sign.json new file mode 100644 index 0000000000..e524c2d7d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/pine_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/pine/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json new file mode 100644 index 0000000000..69f4190b11 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/rainbow_eucalyptus/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_sign.json b/Common/src/generated/resources/assets/byg/models/item/redwood_sign.json new file mode 100644 index 0000000000..df9c411fc4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/redwood/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_sign.json b/Common/src/generated/resources/assets/byg/models/item/skyris_sign.json new file mode 100644 index 0000000000..51df8dcefc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/skyris/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_sign.json b/Common/src/generated/resources/assets/byg/models/item/sythian_sign.json new file mode 100644 index 0000000000..d27900a93b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/sythian/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_sign.json b/Common/src/generated/resources/assets/byg/models/item/willow_sign.json new file mode 100644 index 0000000000..527eb12ab4 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/willow_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/willow/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sign.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sign.json new file mode 100644 index 0000000000..9f9a88eafc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/witch_hazel/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_sign.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_sign.json new file mode 100644 index 0000000000..c3c1e9e9d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "byg:item/zelkova/sign" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index f511d1d85e..83c8c12ba7 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,11 +19,11 @@ "experience": 1000 }, "criteria": { - "byg:magma_wastes": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:twilight_meadow" } } }, @@ -35,735 +35,726 @@ } } }, - "byg:jacaranda_forest": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:ethereal_islands": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:crag_gardens" } } }, - "byg:imparius_grove": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:red_oak_forest" } } }, - "byg:frosted_taiga": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:borealis_grove" } } }, - "byg:red_rock_valley": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:dacite_ridges" } } }, - "byg:fragment_forest": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:sythian_torrids" } } }, - "byg:ivis_fields": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:magma_wastes" } } }, - "byg:dead_sea": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:wailing_garth" } } }, - "byg:shattered_glacier": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:araucaria_savanna" } } }, - "byg:cypress_swamplands": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:shattered_glacier" } } }, - "byg:autumnal_forest": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:glowstone_gardens" } } }, - "byg:subzero_hypogeal": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:basalt_barrera" } } }, - "byg:dacite_shore": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:guiana_shield": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:ebony_woods" } } }, - "byg:lush_stacks": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:embur_bog" } } }, - "byg:cryptic_wastes": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:temperate_grove" } } }, - "byg:cika_woods": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:howling_peaks" } } }, - "byg:sythian_torrids": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:prairie" } } }, - "byg:maple_taiga": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:weeping_witch_forest" } } }, - "byg:sierra_badlands": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:autumnal_valley" } } }, - "byg:windswept_desert": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:subzero_hypogeal" } } }, - "byg:allium_fields": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:tropical_rainforest" } } }, - "byg:coniferous_forest": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:imparius_grove" } } }, - "byg:basalt_barrera": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:wailing_garth": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:dacite_shore" } } }, - "byg:nightshade_forest": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:frosted_taiga" } } }, - "byg:rainbow_beach": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:bulbis_gardens" } } }, - "byg:skyris_vale": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:cryptic_wastes" } } }, - "byg:embur_bog": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:maple_taiga" } } }, - "byg:viscal_isles": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:ivis_fields" } } }, - "byg:bulbis_gardens": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:cypress_swamplands" } } }, - "byg:bayou": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:cika_woods" } } }, - "byg:black_forest": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:forgotten_forest" } } }, - "byg:borealis_grove": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:fragment_forest" } } }, - "byg:warped_desert": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:autumnal_taiga" } } }, - "byg:quartz_desert": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:amaranth_fields" } } }, - "byg:crag_gardens": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:temperate_rainforest" } } }, - "byg:frosted_coniferous_forest": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:rainbow_beach" } } }, - "byg:temperate_rainforest": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:weeping_mire" } } }, - "byg:autumnal_taiga": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:lush_stacks" } } }, - "byg:weeping_witch_forest": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:guiana_shield" } } }, - "byg:arisian_undergrowth": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:bayou" } } }, - "byg:autumnal_valley": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:dead_sea" } } }, - "byg:prairie": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:shulkren_forest" } } }, - "byg:canadian_shield": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:aspen_forest" } } }, - "byg:tropical_rainforest": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:orchard" } } }, - "byg:shulkren_forest": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:cardinal_tundra" } } }, - "byg:aspen_forest": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:red_rock_valley" } } }, - "byg:dacite_ridges": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:coniferous_forest" } } }, - "byg:cardinal_tundra": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:allium_fields" } } }, - "byg:forgotten_forest": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:sierra_badlands" } } }, - "byg:twilight_meadow": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:windswept_beach" } } }, - "byg:ebony_woods": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:firecracker_shrubland" } } }, - "byg:firecracker_shrubland": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:ethereal_islands" } } }, - "byg:red_oak_forest": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:skyris_vale" } } }, - "byg:brimstone_caverns": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:atacama_desert" } } }, - "byg:zelkova_forest": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:baobab_savanna" } } }, - "byg:howling_peaks": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:windswept_desert" } } }, - "byg:orchard": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:brimstone_caverns" } } }, - "byg:coconino_meadow": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:black_forest" } } }, - "byg:crimson_gardens": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:nightshade_forest" } } }, - "byg:araucaria_savanna": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:viscal_isles" } } }, - "byg:temperate_grove": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:rose_fields" } } }, - "byg:glowstone_gardens": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:zelkova_forest" } } }, - "byg:windswept_beach": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:redwood_thicket" } } }, - "byg:redwood_thicket": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:jacaranda_forest" } } }, - "byg:atacama_desert": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:crimson_gardens" } } }, - "byg:baobab_savanna": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:quartz_desert" } } }, - "byg:weeping_mire": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:coconino_meadow" } } }, - "byg:amaranth_fields": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:warped_desert" } } }, - "byg:white_mangrove_marshes": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:canadian_shield" } } }, - "byg:rose_fields": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:autumnal_forest" } } }, - "byg:cherry_blossom_forest": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:arisian_undergrowth" } } } }, "requirements": [ [ - "byg:magma_wastes" + "byg:twilight_meadow" ], [ "byg:mojave_desert" ], [ - "byg:jacaranda_forest" - ], - [ - "byg:ethereal_islands" - ], - [ - "byg:imparius_grove" + "byg:cherry_blossom_forest" ], [ - "byg:frosted_taiga" + "byg:crag_gardens" ], [ - "byg:red_rock_valley" + "byg:red_oak_forest" ], [ - "byg:fragment_forest" + "byg:borealis_grove" ], [ - "byg:ivis_fields" + "byg:dacite_ridges" ], [ - "byg:dead_sea" + "byg:sythian_torrids" ], [ - "byg:shattered_glacier" + "byg:magma_wastes" ], [ - "byg:cypress_swamplands" + "byg:wailing_garth" ], [ - "byg:autumnal_forest" + "byg:araucaria_savanna" ], [ - "byg:subzero_hypogeal" + "byg:shattered_glacier" ], [ - "byg:dacite_shore" + "byg:glowstone_gardens" ], [ - "byg:guiana_shield" + "byg:basalt_barrera" ], [ - "byg:lush_stacks" + "byg:white_mangrove_marshes" ], [ - "byg:cryptic_wastes" + "byg:ebony_woods" ], [ - "byg:cika_woods" + "byg:embur_bog" ], [ - "byg:sythian_torrids" + "byg:temperate_grove" ], [ - "byg:maple_taiga" + "byg:howling_peaks" ], [ - "byg:sierra_badlands" + "byg:prairie" ], [ - "byg:windswept_desert" + "byg:weeping_witch_forest" ], [ - "byg:allium_fields" + "byg:autumnal_valley" ], [ - "byg:coniferous_forest" + "byg:subzero_hypogeal" ], [ - "byg:basalt_barrera" + "byg:tropical_rainforest" ], [ - "byg:wailing_garth" + "byg:imparius_grove" ], [ - "byg:nightshade_forest" + "byg:frosted_coniferous_forest" ], [ - "byg:rainbow_beach" + "byg:dacite_shore" ], [ - "byg:skyris_vale" + "byg:frosted_taiga" ], [ - "byg:embur_bog" + "byg:bulbis_gardens" ], [ - "byg:viscal_isles" + "byg:cryptic_wastes" ], [ - "byg:bulbis_gardens" + "byg:maple_taiga" ], [ - "byg:bayou" + "byg:ivis_fields" ], [ - "byg:black_forest" + "byg:cypress_swamplands" ], [ - "byg:borealis_grove" + "byg:cika_woods" ], [ - "byg:warped_desert" + "byg:forgotten_forest" ], [ - "byg:quartz_desert" + "byg:fragment_forest" ], [ - "byg:crag_gardens" + "byg:autumnal_taiga" ], [ - "byg:frosted_coniferous_forest" + "byg:amaranth_fields" ], [ "byg:temperate_rainforest" ], [ - "byg:autumnal_taiga" - ], - [ - "byg:weeping_witch_forest" + "byg:rainbow_beach" ], [ - "byg:arisian_undergrowth" + "byg:weeping_mire" ], [ - "byg:autumnal_valley" + "byg:lush_stacks" ], [ - "byg:prairie" + "byg:guiana_shield" ], [ - "byg:canadian_shield" + "byg:bayou" ], [ - "byg:tropical_rainforest" + "byg:dead_sea" ], [ "byg:shulkren_forest" @@ -772,79 +763,88 @@ "byg:aspen_forest" ], [ - "byg:dacite_ridges" + "byg:orchard" ], [ "byg:cardinal_tundra" ], [ - "byg:forgotten_forest" + "byg:red_rock_valley" ], [ - "byg:twilight_meadow" + "byg:coniferous_forest" ], [ - "byg:ebony_woods" + "byg:allium_fields" + ], + [ + "byg:sierra_badlands" + ], + [ + "byg:windswept_beach" ], [ "byg:firecracker_shrubland" ], [ - "byg:red_oak_forest" + "byg:ethereal_islands" ], [ - "byg:brimstone_caverns" + "byg:skyris_vale" ], [ - "byg:zelkova_forest" + "byg:atacama_desert" ], [ - "byg:howling_peaks" + "byg:baobab_savanna" ], [ - "byg:orchard" + "byg:windswept_desert" ], [ - "byg:coconino_meadow" + "byg:brimstone_caverns" ], [ - "byg:crimson_gardens" + "byg:black_forest" ], [ - "byg:araucaria_savanna" + "byg:nightshade_forest" ], [ - "byg:temperate_grove" + "byg:viscal_isles" ], [ - "byg:glowstone_gardens" + "byg:rose_fields" ], [ - "byg:windswept_beach" + "byg:zelkova_forest" ], [ "byg:redwood_thicket" ], [ - "byg:atacama_desert" + "byg:jacaranda_forest" ], [ - "byg:baobab_savanna" + "byg:crimson_gardens" ], [ - "byg:weeping_mire" + "byg:quartz_desert" ], [ - "byg:amaranth_fields" + "byg:coconino_meadow" ], [ - "byg:white_mangrove_marshes" + "byg:warped_desert" ], [ - "byg:rose_fields" + "byg:canadian_shield" ], [ - "byg:cherry_blossom_forest" + "byg:autumnal_forest" + ], + [ + "byg:arisian_undergrowth" ] ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/slabs.json b/Common/src/generated/resources/data/byg/tags/blocks/slabs.json index f5e95b83fb..94494c10a0 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/slabs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/slabs.json @@ -4,6 +4,7 @@ "byg:aspen_slab", "byg:baobab_slab", "byg:blue_enchanted_slab", + "byg:blue_nether_brick_slab", "byg:bulbis_slab", "byg:carved_ether_stone_slab", "byg:cattail_thatch_slab", @@ -63,8 +64,7 @@ "byg:willow_slab", "byg:windswept_sandstone_slab", "byg:witch_hazel_slab", - "byg:zelkova_slab", - "byg:blue_nether_brick_slab", - "byg:yellow_nether_brick_slab" + "byg:yellow_nether_brick_slab", + "byg:zelkova_slab" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 49d436a56e..743e575e96 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -10,9 +10,11 @@ "byg:aspen_log", "byg:aspen_planks", "byg:aspen_pressure_plate", + "byg:aspen_sign", "byg:aspen_slab", "byg:aspen_stairs", "byg:aspen_trapdoor", + "byg:aspen_wall_sign", "byg:aspen_wood", "byg:baobab_bookshelf", "byg:baobab_button", @@ -23,9 +25,11 @@ "byg:baobab_log", "byg:baobab_planks", "byg:baobab_pressure_plate", + "byg:baobab_sign", "byg:baobab_slab", "byg:baobab_stairs", "byg:baobab_trapdoor", + "byg:baobab_wall_sign", "byg:baobab_wood", "byg:blue_enchanted_bookshelf", "byg:blue_enchanted_button", @@ -36,9 +40,11 @@ "byg:blue_enchanted_log", "byg:blue_enchanted_planks", "byg:blue_enchanted_pressure_plate", + "byg:blue_enchanted_sign", "byg:blue_enchanted_slab", "byg:blue_enchanted_stairs", "byg:blue_enchanted_trapdoor", + "byg:blue_enchanted_wall_sign", "byg:blue_enchanted_wood", "byg:boric_campfire", "byg:brown_mushroom_stem", @@ -50,10 +56,12 @@ "byg:bulbis_fence_gate", "byg:bulbis_planks", "byg:bulbis_pressure_plate", + "byg:bulbis_sign", "byg:bulbis_slab", "byg:bulbis_stairs", "byg:bulbis_stem", "byg:bulbis_trapdoor", + "byg:bulbis_wall_sign", "byg:bulbis_wood", "byg:cherry_bookshelf", "byg:cherry_button", @@ -64,9 +72,11 @@ "byg:cherry_log", "byg:cherry_planks", "byg:cherry_pressure_plate", + "byg:cherry_sign", "byg:cherry_slab", "byg:cherry_stairs", "byg:cherry_trapdoor", + "byg:cherry_wall_sign", "byg:cherry_wood", "byg:cika_bookshelf", "byg:cika_button", @@ -77,9 +87,11 @@ "byg:cika_log", "byg:cika_planks", "byg:cika_pressure_plate", + "byg:cika_sign", "byg:cika_slab", "byg:cika_stairs", "byg:cika_trapdoor", + "byg:cika_wall_sign", "byg:cika_wood", "byg:cryptic_campfire", "byg:cypress_bookshelf", @@ -91,9 +103,11 @@ "byg:cypress_log", "byg:cypress_planks", "byg:cypress_pressure_plate", + "byg:cypress_sign", "byg:cypress_slab", "byg:cypress_stairs", "byg:cypress_trapdoor", + "byg:cypress_wall_sign", "byg:cypress_wood", "byg:death_cap_mushroom_block", "byg:ebony_bookshelf", @@ -105,9 +119,11 @@ "byg:ebony_log", "byg:ebony_planks", "byg:ebony_pressure_plate", + "byg:ebony_sign", "byg:ebony_slab", "byg:ebony_stairs", "byg:ebony_trapdoor", + "byg:ebony_wall_sign", "byg:ebony_wood", "byg:embur_bookshelf", "byg:embur_button", @@ -119,9 +135,11 @@ "byg:embur_pedu", "byg:embur_planks", "byg:embur_pressure_plate", + "byg:embur_sign", "byg:embur_slab", "byg:embur_stairs", "byg:embur_trapdoor", + "byg:embur_wall_sign", "byg:ether_bookshelf", "byg:ether_button", "byg:ether_crafting_table", @@ -131,9 +149,11 @@ "byg:ether_log", "byg:ether_planks", "byg:ether_pressure_plate", + "byg:ether_sign", "byg:ether_slab", "byg:ether_stairs", "byg:ether_trapdoor", + "byg:ether_wall_sign", "byg:ether_wood", "byg:fir_bookshelf", "byg:fir_button", @@ -144,9 +164,11 @@ "byg:fir_log", "byg:fir_planks", "byg:fir_pressure_plate", + "byg:fir_sign", "byg:fir_slab", "byg:fir_stairs", "byg:fir_trapdoor", + "byg:fir_wall_sign", "byg:fir_wood", "byg:fungal_imparius_hyphae", "byg:fungal_imparius_stem", @@ -159,9 +181,11 @@ "byg:green_enchanted_log", "byg:green_enchanted_planks", "byg:green_enchanted_pressure_plate", + "byg:green_enchanted_sign", "byg:green_enchanted_slab", "byg:green_enchanted_stairs", "byg:green_enchanted_trapdoor", + "byg:green_enchanted_wall_sign", "byg:green_enchanted_wood", "byg:green_mushroom_block", "byg:holly_bookshelf", @@ -173,9 +197,11 @@ "byg:holly_log", "byg:holly_planks", "byg:holly_pressure_plate", + "byg:holly_sign", "byg:holly_slab", "byg:holly_stairs", "byg:holly_trapdoor", + "byg:holly_wall_sign", "byg:holly_wood", "byg:imbued_nightshade_log", "byg:imparius_bookshelf", @@ -187,10 +213,12 @@ "byg:imparius_hyphae", "byg:imparius_planks", "byg:imparius_pressure_plate", + "byg:imparius_sign", "byg:imparius_slab", "byg:imparius_stairs", "byg:imparius_stem", "byg:imparius_trapdoor", + "byg:imparius_wall_sign", "byg:jacaranda_bookshelf", "byg:jacaranda_button", "byg:jacaranda_crafting_table", @@ -200,9 +228,11 @@ "byg:jacaranda_log", "byg:jacaranda_planks", "byg:jacaranda_pressure_plate", + "byg:jacaranda_sign", "byg:jacaranda_slab", "byg:jacaranda_stairs", "byg:jacaranda_trapdoor", + "byg:jacaranda_wall_sign", "byg:jacaranda_wood", "byg:lament_bookshelf", "byg:lament_button", @@ -213,9 +243,11 @@ "byg:lament_log", "byg:lament_planks", "byg:lament_pressure_plate", + "byg:lament_sign", "byg:lament_slab", "byg:lament_stairs", "byg:lament_trapdoor", + "byg:lament_wall_sign", "byg:lament_wood", "byg:mahogany_bookshelf", "byg:mahogany_button", @@ -226,9 +258,11 @@ "byg:mahogany_log", "byg:mahogany_planks", "byg:mahogany_pressure_plate", + "byg:mahogany_sign", "byg:mahogany_slab", "byg:mahogany_stairs", "byg:mahogany_trapdoor", + "byg:mahogany_wall_sign", "byg:mahogany_wood", "byg:mangrove_bookshelf", "byg:mangrove_button", @@ -239,9 +273,11 @@ "byg:mangrove_log", "byg:mangrove_planks", "byg:mangrove_pressure_plate", + "byg:mangrove_sign", "byg:mangrove_slab", "byg:mangrove_stairs", "byg:mangrove_trapdoor", + "byg:mangrove_wall_sign", "byg:mangrove_wood", "byg:maple_bookshelf", "byg:maple_button", @@ -252,9 +288,11 @@ "byg:maple_log", "byg:maple_planks", "byg:maple_pressure_plate", + "byg:maple_sign", "byg:maple_slab", "byg:maple_stairs", "byg:maple_trapdoor", + "byg:maple_wall_sign", "byg:maple_wood", "byg:nightshade_bookshelf", "byg:nightshade_button", @@ -265,9 +303,11 @@ "byg:nightshade_log", "byg:nightshade_planks", "byg:nightshade_pressure_plate", + "byg:nightshade_sign", "byg:nightshade_slab", "byg:nightshade_stairs", "byg:nightshade_trapdoor", + "byg:nightshade_wall_sign", "byg:nightshade_wood", "byg:palm_bookshelf", "byg:palm_button", @@ -278,9 +318,11 @@ "byg:palm_log", "byg:palm_planks", "byg:palm_pressure_plate", + "byg:palm_sign", "byg:palm_slab", "byg:palm_stairs", "byg:palm_trapdoor", + "byg:palm_wall_sign", "byg:palm_wood", "byg:palo_verde_log", "byg:palo_verde_wood", @@ -293,9 +335,11 @@ "byg:pine_log", "byg:pine_planks", "byg:pine_pressure_plate", + "byg:pine_sign", "byg:pine_slab", "byg:pine_stairs", "byg:pine_trapdoor", + "byg:pine_wall_sign", "byg:pine_wood", "byg:plant_stem", "byg:rainbow_eucalyptus_bookshelf", @@ -307,9 +351,11 @@ "byg:rainbow_eucalyptus_log", "byg:rainbow_eucalyptus_planks", "byg:rainbow_eucalyptus_pressure_plate", + "byg:rainbow_eucalyptus_sign", "byg:rainbow_eucalyptus_slab", "byg:rainbow_eucalyptus_stairs", "byg:rainbow_eucalyptus_trapdoor", + "byg:rainbow_eucalyptus_wall_sign", "byg:rainbow_eucalyptus_wood", "byg:redwood_bookshelf", "byg:redwood_button", @@ -320,9 +366,11 @@ "byg:redwood_log", "byg:redwood_planks", "byg:redwood_pressure_plate", + "byg:redwood_sign", "byg:redwood_slab", "byg:redwood_stairs", "byg:redwood_trapdoor", + "byg:redwood_wall_sign", "byg:redwood_wood", "byg:skyris_bookshelf", "byg:skyris_button", @@ -333,9 +381,11 @@ "byg:skyris_log", "byg:skyris_planks", "byg:skyris_pressure_plate", + "byg:skyris_sign", "byg:skyris_slab", "byg:skyris_stairs", "byg:skyris_trapdoor", + "byg:skyris_wall_sign", "byg:skyris_wood", "byg:soul_shroom_block", "byg:soul_shroom_stem", @@ -407,10 +457,12 @@ "byg:sythian_planks", "byg:sythian_pressure_plate", "byg:sythian_scaffolding", + "byg:sythian_sign", "byg:sythian_slab", "byg:sythian_stairs", "byg:sythian_stem", "byg:sythian_trapdoor", + "byg:sythian_wall_sign", "byg:weeping_milkcap_mushroom_block", "byg:white_mushroom_stem", "byg:willow_bookshelf", @@ -422,9 +474,11 @@ "byg:willow_log", "byg:willow_planks", "byg:willow_pressure_plate", + "byg:willow_sign", "byg:willow_slab", "byg:willow_stairs", "byg:willow_trapdoor", + "byg:willow_wall_sign", "byg:willow_wood", "byg:witch_hazel_bookshelf", "byg:witch_hazel_button", @@ -435,9 +489,11 @@ "byg:witch_hazel_log", "byg:witch_hazel_planks", "byg:witch_hazel_pressure_plate", + "byg:witch_hazel_sign", "byg:witch_hazel_slab", "byg:witch_hazel_stairs", "byg:witch_hazel_trapdoor", + "byg:witch_hazel_wall_sign", "byg:witch_hazel_wood", "byg:withering_oak_log", "byg:withering_oak_wood", @@ -451,9 +507,11 @@ "byg:zelkova_log", "byg:zelkova_planks", "byg:zelkova_pressure_plate", + "byg:zelkova_sign", "byg:zelkova_slab", "byg:zelkova_stairs", "byg:zelkova_trapdoor", + "byg:zelkova_wall_sign", "byg:zelkova_wood" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json index b89ac49bb4..c82079ecd2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -4,6 +4,7 @@ "byg:aspen_stairs", "byg:baobab_stairs", "byg:blue_enchanted_stairs", + "byg:blue_nether_brick_stairs", "byg:bulbis_stairs", "byg:carved_ether_stone_stairs", "byg:cattail_thatch_stairs", @@ -63,6 +64,7 @@ "byg:willow_stairs", "byg:windswept_sandstone_stairs", "byg:witch_hazel_stairs", + "byg:yellow_nether_brick_stairs", "byg:zelkova_stairs" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json index 2ef4daebe5..ee8c1e2de4 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json @@ -1,9 +1,14 @@ { "replace": false, "values": [ + "byg:araucaria_sapling", "byg:aspen_sapling", "byg:baobab_sapling", "byg:blue_enchanted_sapling", + "byg:blue_spruce_sapling", + "byg:brown_birch_sapling", + "byg:brown_oak_sapling", + "byg:brown_zelkova_sapling", "byg:cika_sapling", "byg:cypress_sapling", "byg:ebony_sapling", @@ -13,23 +18,34 @@ "byg:holly_sapling", "byg:indigo_jacaranda_sapling", "byg:jacaranda_sapling", + "byg:joshua_sapling", "byg:lament_sapling", "byg:mahogany_sapling", "byg:mangrove_sapling", "byg:maple_sapling", "byg:nightshade_sapling", + "byg:orange_birch_sapling", + "byg:orange_oak_sapling", + "byg:orange_spruce_sapling", + "byg:orchard_sapling", "byg:palm_sapling", "byg:palo_verde_sapling", "byg:pine_sapling", "byg:pink_cherry_sapling", "byg:rainbow_eucalyptus_sapling", + "byg:red_birch_sapling", "byg:red_maple_sapling", + "byg:red_oak_sapling", + "byg:red_spruce_sapling", "byg:redwood_sapling", "byg:silver_maple_sapling", "byg:skyris_sapling", "byg:white_cherry_sapling", "byg:willow_sapling", "byg:witch_hazel_sapling", + "byg:withering_oak_sapling", + "byg:yellow_birch_sapling", + "byg:yellow_spruce_sapling", "byg:zelkova_sapling" ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 0000000000..c82079ecd2 --- /dev/null +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,70 @@ +{ + "replace": false, + "values": [ + "byg:aspen_stairs", + "byg:baobab_stairs", + "byg:blue_enchanted_stairs", + "byg:blue_nether_brick_stairs", + "byg:bulbis_stairs", + "byg:carved_ether_stone_stairs", + "byg:cattail_thatch_stairs", + "byg:cherry_stairs", + "byg:chiseled_fungal_imparius_stairs", + "byg:chiseled_red_rock_brick_stairs", + "byg:chiseled_therium_stairs", + "byg:chiseled_travertine_stairs", + "byg:chiseled_windswept_sandstone_stairs", + "byg:cika_stairs", + "byg:cobbled_ether_stone_stairs", + "byg:cracked_red_rock_brick_stairs", + "byg:cryptic_stone_stairs", + "byg:cut_windswept_sandstone_stairs", + "byg:cypress_stairs", + "byg:dacite_brick_stairs", + "byg:dacite_cobblestone_stairs", + "byg:dacite_stairs", + "byg:dacite_tile_stairs", + "byg:ebony_stairs", + "byg:embur_stairs", + "byg:ether_stairs", + "byg:ether_stone_stairs", + "byg:fir_stairs", + "byg:green_enchanted_stairs", + "byg:holly_stairs", + "byg:imparius_stairs", + "byg:jacaranda_stairs", + "byg:lament_stairs", + "byg:mahogany_stairs", + "byg:mangrove_stairs", + "byg:maple_stairs", + "byg:mossy_red_rock_brick_stairs", + "byg:mossy_stone_stairs", + "byg:nightshade_stairs", + "byg:palm_stairs", + "byg:pine_stairs", + "byg:polished_soapstone_stairs", + "byg:polished_travertine_stairs", + "byg:purpur_stone_stairs", + "byg:rainbow_eucalyptus_stairs", + "byg:red_rock_brick_stairs", + "byg:red_rock_stairs", + "byg:redwood_stairs", + "byg:rocky_stone_stairs", + "byg:scoria_cobblestone_stairs", + "byg:scoria_stone_stairs", + "byg:scoria_stonebrick_stairs", + "byg:shiny_chiseled_therium_stairs", + "byg:skyris_stairs", + "byg:smooth_windswept_sandstone_stairs", + "byg:soapstone_brick_stairs", + "byg:soapstone_stairs", + "byg:soapstone_tile_stairs", + "byg:sythian_stairs", + "byg:travertine_stairs", + "byg:willow_stairs", + "byg:windswept_sandstone_stairs", + "byg:witch_hazel_stairs", + "byg:yellow_nether_brick_stairs", + "byg:zelkova_stairs" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/textures/item/fir_planks.png b/Common/src/main/resources/assets/byg/textures/item/fir/sign.png similarity index 100% rename from Common/src/main/resources/assets/byg/textures/item/fir_planks.png rename to Common/src/main/resources/assets/byg/textures/item/fir/sign.png diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index aeebaa8fd8..a4f4091510 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -221,6 +221,9 @@ protected void registerStatesAndModels() { if (type.sign() != null) { final var model = models().sign(typeName + "/sign", planksLoc); signBlock((StandingSignBlock) type.sign().get(), (WallSignBlock) type.wallSign().get(), model); + + itemModels().withExistingParent(type.sign().getId().getPath(), generatedParent) + .texture("layer0", rl(typeLocItem + "sign")); } // No wood walls for now From 121088476fbc26aa9428835769d83dc68b1d7c34 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 20:57:17 +0300 Subject: [PATCH 76/90] Remove manual sign loot tables --- .../byg/loot_tables/blocks/aspen_sign.json | 19 ------------------- .../byg/loot_tables/blocks/baobab_sign.json | 19 ------------------- .../blocks/blue_enchanted_sign.json | 19 ------------------- .../byg/loot_tables/blocks/bulbis_sign.json | 19 ------------------- .../byg/loot_tables/blocks/cherry_sign.json | 19 ------------------- .../byg/loot_tables/blocks/cika_sign.json | 19 ------------------- .../byg/loot_tables/blocks/cypress_sign.json | 19 ------------------- .../byg/loot_tables/blocks/ebony_sign.json | 19 ------------------- .../byg/loot_tables/blocks/embur_sign.json | 19 ------------------- .../byg/loot_tables/blocks/ether_sign.json | 19 ------------------- .../data/byg/loot_tables/blocks/fir_sign.json | 19 ------------------- .../blocks/green_enchanted_sign.json | 19 ------------------- .../byg/loot_tables/blocks/holly_sign.json | 19 ------------------- .../byg/loot_tables/blocks/imparius_sign.json | 19 ------------------- .../loot_tables/blocks/jacaranda_sign.json | 19 ------------------- .../byg/loot_tables/blocks/lament_sign.json | 19 ------------------- .../byg/loot_tables/blocks/mahogany_sign.json | 19 ------------------- .../byg/loot_tables/blocks/mangrove_sign.json | 19 ------------------- .../byg/loot_tables/blocks/maple_sign.json | 19 ------------------- .../loot_tables/blocks/nightshade_sign.json | 19 ------------------- .../byg/loot_tables/blocks/palm_sign.json | 19 ------------------- .../byg/loot_tables/blocks/pine_sign.json | 19 ------------------- .../blocks/rainbow_eucalyptus_sign.json | 19 ------------------- .../byg/loot_tables/blocks/redwood_sign.json | 19 ------------------- .../byg/loot_tables/blocks/skyris_sign.json | 19 ------------------- .../byg/loot_tables/blocks/sythian_sign.json | 19 ------------------- .../byg/loot_tables/blocks/willow_sign.json | 19 ------------------- .../loot_tables/blocks/witch_hazel_sign.json | 19 ------------------- .../byg/loot_tables/blocks/zelkova_sign.json | 19 ------------------- .../providers/loot/BYGBlockLootProvider.java | 1 + 30 files changed, 1 insertion(+), 551 deletions(-) delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/cherry_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/cika_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/embur_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/ether_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/fir_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/holly_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/imparius_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/lament_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/maple_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/palm_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/pine_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/willow_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sign.json diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sign.json deleted file mode 100644 index b8ce96a4a2..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/aspen_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sign.json deleted file mode 100644 index 03b298264b..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/baobab_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:baobab_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json deleted file mode 100644 index c0e2c559a3..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:blue_enchanted_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_sign.json deleted file mode 100644 index 953f7f41f3..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/bulbis_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:bulbis_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_sign.json deleted file mode 100644 index 8ad5558bf3..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cherry_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:cherry_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/cika_sign.json deleted file mode 100644 index 02b5da1980..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cika_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:cika_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sign.json deleted file mode 100644 index d46d1965f4..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/cypress_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:cypress_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sign.json deleted file mode 100644 index d32d8c0f94..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ebony_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:ebony_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/embur_sign.json deleted file mode 100644 index ca5b5b4842..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/embur_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:embur_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/ether_sign.json deleted file mode 100644 index 3c3437a228..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/ether_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:ether_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/fir_sign.json deleted file mode 100644 index aba2e5028a..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/fir_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:fir_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json deleted file mode 100644 index eec0724b0b..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:green_enchanted_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/holly_sign.json deleted file mode 100644 index 3aeb6f9c34..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/holly_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:holly_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_sign.json deleted file mode 100644 index e4a54c6e4b..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/imparius_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:imparius_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sign.json deleted file mode 100644 index 091023b1b4..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/jacaranda_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:jacaranda_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/lament_sign.json deleted file mode 100644 index 091f74d4f7..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/lament_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:lament_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sign.json deleted file mode 100644 index c2edac479b..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mahogany_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:mahogany_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sign.json deleted file mode 100644 index 70ae7d0ac7..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/mangrove_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:mangrove_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/maple_sign.json deleted file mode 100644 index 365223bb05..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/maple_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:maple_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sign.json deleted file mode 100644 index 8b20b8ef76..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/nightshade_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:nightshade_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/palm_sign.json deleted file mode 100644 index d24829ea47..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/palm_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:palm_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/pine_sign.json deleted file mode 100644 index 7a8c9414d1..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/pine_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:pine_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json deleted file mode 100644 index e04cca490c..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:rainbow_eucalyptus_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sign.json deleted file mode 100644 index b49896bad6..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/redwood_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:redwood_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sign.json deleted file mode 100644 index f9e9d2386f..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/skyris_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:skyris_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sign.json deleted file mode 100644 index 01cb573f18..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/sythian_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:sythian_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/willow_sign.json deleted file mode 100644 index 3b94c03599..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/willow_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:willow_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json deleted file mode 100644 index cd5b3bc873..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:witch_hazel_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sign.json b/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sign.json deleted file mode 100644 index 1dd928a9c6..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/zelkova_sign.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:zelkova_sign" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java index 52e6bde884..d1e085bce3 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java @@ -37,6 +37,7 @@ protected void addTables() { add(type.slab(), BlockLoot::createSlabItemTable); dropSelf(type.stairs()); dropSelf(type.trapdoor()); + dropSelf(type.sign()); } } From 582cc19b8abce6fc6617bd258e34fc8b4c2a0e31 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 21:06:35 +0300 Subject: [PATCH 77/90] Sign recipes --- .../byg/common/item/BYGItemTags.java | 15 +++++++++++++++ .../byg/datagen/providers/BYGRecipeProviders.java | 15 +++++++++++++-- .../providers/tag/BYGItemTagsProvider.java | 7 +++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 Common/src/main/java/potionstudios/byg/common/item/BYGItemTags.java diff --git a/Common/src/main/java/potionstudios/byg/common/item/BYGItemTags.java b/Common/src/main/java/potionstudios/byg/common/item/BYGItemTags.java new file mode 100644 index 0000000000..be2a8f6733 --- /dev/null +++ b/Common/src/main/java/potionstudios/byg/common/item/BYGItemTags.java @@ -0,0 +1,15 @@ +package potionstudios.byg.common.item; + +import net.minecraft.core.Registry; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import potionstudios.byg.BYG; + +public class BYGItemTags { + + public static final TagKey STICKS = byg("sticks"); + + private static TagKey byg(String path) { + return TagKey.create(Registry.ITEM_REGISTRY, BYG.createLocation(path)); + } +} diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index b636e89529..fa4d035e8f 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -11,6 +11,7 @@ import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.common.item.BYGItemTags; import java.util.function.Consumer; @@ -64,7 +65,7 @@ protected void buildCraftingRecipes(Consumer consumer) { .group("wooden_fence") .pattern("W#W") .pattern("W#W") - .define('#', Items.STICK) // TODO this should be a tag + .define('#', BYGItemTags.STICKS) .define('W', type.planks()) .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/fence")); @@ -73,7 +74,7 @@ protected void buildCraftingRecipes(Consumer consumer) { .pattern("#W#") .pattern("#W#") .unlockedBy("has_planks", has(type.planks())) - .define('#', Items.STICK) // TODO this should be a tag + .define('#', BYGItemTags.STICKS) .define('W', type.planks()) .save(consumer, BYG.createLocation("wood/" + type + "/fence_gate")); ShapelessRecipeBuilder.shapeless(type.planks(), 4) @@ -115,6 +116,16 @@ protected void buildCraftingRecipes(Consumer consumer) { .define('L', type.log()) .unlockedBy("has_log", has(type.log())) .save(consumer, BYG.createLocation("wood/" + type + "/wood")); + if (type.sign() != null) { + ShapedRecipeBuilder.shaped(type.sign(), 3) + .group("sign") + .pattern("PPP") + .pattern("PPP") + .pattern(" S ") + .define('P', type.planks()) + .define('S', BYGItemTags.STICKS) + .save(consumer, BYG.createLocation("wood/" + type + "/sign")); + } } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java index a00ce2ff5c..a345950616 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/tag/BYGItemTagsProvider.java @@ -11,15 +11,18 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Material; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGBlockTags; import potionstudios.byg.common.block.BYGBlocks; import potionstudios.byg.common.block.BYGWoodTypes; +import potionstudios.byg.common.item.BYGItemTags; import potionstudios.byg.common.item.BYGItems; import potionstudios.byg.datagen.util.DatagenUtils; import potionstudios.byg.datagen.util.PredicatedTagProvider; @@ -70,6 +73,10 @@ protected void addTags() { .add(isBlockMaterial(Material.LEAVES), ItemTags.LEAVES) // Can't copy this one due to slight differences .run(this::tag); + tag(BYGItemTags.STICKS) + .add(Items.STICK) + .addOptionalTag(Tags.Items.RODS_WOODEN.location()); + DatagenUtils.sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders); } From 080cca936fb485ca712cf28aedb20b78e70dda57 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 21:27:34 +0300 Subject: [PATCH 78/90] Sign recipes --- Common/src/generated/resources/.cache/cache | 234 +++++++--- .../adventure/oh_the_biomes_youll_go.json | 438 +++++++++--------- .../recipes/byg.byg/wood/aspen/sign.json | 34 ++ .../recipes/byg.byg/wood/baobab/sign.json | 34 ++ .../byg.byg/wood/blue_enchanted/sign.json | 34 ++ .../recipes/byg.byg/wood/bulbis/sign.json | 34 ++ .../recipes/byg.byg/wood/cherry/sign.json | 34 ++ .../recipes/byg.byg/wood/cika/sign.json | 34 ++ .../recipes/byg.byg/wood/cypress/sign.json | 34 ++ .../recipes/byg.byg/wood/ebony/sign.json | 34 ++ .../recipes/byg.byg/wood/embur/sign.json | 34 ++ .../recipes/byg.byg/wood/ether/sign.json | 34 ++ .../recipes/byg.byg/wood/fir/sign.json | 34 ++ .../byg.byg/wood/green_enchanted/sign.json | 34 ++ .../recipes/byg.byg/wood/holly/sign.json | 34 ++ .../recipes/byg.byg/wood/imparius/sign.json | 34 ++ .../recipes/byg.byg/wood/jacaranda/sign.json | 34 ++ .../recipes/byg.byg/wood/lament/sign.json | 34 ++ .../recipes/byg.byg/wood/mahogany/sign.json | 34 ++ .../recipes/byg.byg/wood/mangrove/sign.json | 34 ++ .../recipes/byg.byg/wood/maple/sign.json | 34 ++ .../recipes/byg.byg/wood/nightshade/sign.json | 34 ++ .../recipes/byg.byg/wood/palm/sign.json | 34 ++ .../recipes/byg.byg/wood/pine/sign.json | 34 ++ .../byg.byg/wood/rainbow_eucalyptus/sign.json | 34 ++ .../recipes/byg.byg/wood/redwood/sign.json | 34 ++ .../recipes/byg.byg/wood/skyris/sign.json | 34 ++ .../recipes/byg.byg/wood/sythian/sign.json | 34 ++ .../recipes/byg.byg/wood/willow/sign.json | 34 ++ .../byg.byg/wood/witch_hazel/sign.json | 34 ++ .../recipes/byg.byg/wood/zelkova/sign.json | 34 ++ .../byg/loot_tables/blocks/aspen_sign.json | 20 + .../byg/loot_tables/blocks/baobab_sign.json | 20 + .../blocks/blue_enchanted_sign.json | 20 + .../byg/loot_tables/blocks/bulbis_sign.json | 20 + .../byg/loot_tables/blocks/cherry_sign.json | 20 + .../byg/loot_tables/blocks/cika_sign.json | 20 + .../byg/loot_tables/blocks/cypress_sign.json | 20 + .../byg/loot_tables/blocks/ebony_sign.json | 20 + .../byg/loot_tables/blocks/embur_sign.json | 20 + .../byg/loot_tables/blocks/ether_sign.json | 20 + .../data/byg/loot_tables/blocks/fir_sign.json | 20 + .../blocks/green_enchanted_sign.json | 20 + .../byg/loot_tables/blocks/holly_sign.json | 20 + .../byg/loot_tables/blocks/imparius_sign.json | 20 + .../loot_tables/blocks/jacaranda_sign.json | 20 + .../byg/loot_tables/blocks/lament_sign.json | 20 + .../byg/loot_tables/blocks/mahogany_sign.json | 20 + .../byg/loot_tables/blocks/mangrove_sign.json | 20 + .../byg/loot_tables/blocks/maple_sign.json | 20 + .../loot_tables/blocks/nightshade_sign.json | 20 + .../byg/loot_tables/blocks/palm_sign.json | 20 + .../byg/loot_tables/blocks/pine_sign.json | 20 + .../blocks/potted_aspen_sapling.json | 20 + .../blocks/potted_baobab_sapling.json | 20 + .../blocks/potted_blue_enchanted_sapling.json | 20 + .../blocks/potted_bulbis_oddity.json | 20 + .../blocks/potted_cika_sapling.json | 20 + .../blocks/potted_cypress_sapling.json | 20 + .../blocks/potted_ebony_sapling.json | 20 + .../loot_tables/blocks/potted_embur_wart.json | 20 + .../blocks/potted_ether_sapling.json | 20 + .../blocks/potted_fir_sapling.json | 20 + .../potted_green_enchanted_sapling.json | 20 + .../blocks/potted_holly_sapling.json | 20 + .../blocks/potted_imparius_mushroom.json | 20 + .../blocks/potted_jacaranda_sapling.json | 20 + .../blocks/potted_lament_sapling.json | 20 + .../blocks/potted_mahogany_sapling.json | 20 + .../blocks/potted_mangrove_sapling.json | 20 + .../blocks/potted_maple_sapling.json | 20 + .../blocks/potted_nightshade_sapling.json | 20 + .../blocks/potted_palm_sapling.json | 20 + .../blocks/potted_pine_sapling.json | 20 + .../potted_rainbow_eucalyptus_sapling.json | 20 + .../blocks/potted_redwood_sapling.json | 20 + .../blocks/potted_skyris_sapling.json | 20 + .../blocks/potted_sythian_fungus.json | 20 + .../blocks/potted_willow_sapling.json | 20 + .../blocks/potted_witch_hazel_sapling.json | 20 + .../blocks/potted_zelkova_sapling.json | 20 + .../blocks/rainbow_eucalyptus_sign.json | 20 + .../byg/loot_tables/blocks/redwood_sign.json | 20 + .../byg/loot_tables/blocks/skyris_sign.json | 20 + .../byg/loot_tables/blocks/sythian_sign.json | 20 + .../byg/loot_tables/blocks/willow_sign.json | 20 + .../loot_tables/blocks/witch_hazel_sign.json | 20 + .../byg/loot_tables/blocks/zelkova_sign.json | 20 + .../data/byg/recipes/wood/aspen/fence.json | 2 +- .../byg/recipes/wood/aspen/fence_gate.json | 2 +- .../data/byg/recipes/wood/aspen/sign.json} | 15 +- .../data/byg/recipes/wood/baobab/fence.json | 2 +- .../byg/recipes/wood/baobab/fence_gate.json | 2 +- .../data/byg/recipes/wood/baobab/sign.json} | 15 +- .../recipes/wood/blue_enchanted/fence.json | 2 +- .../wood/blue_enchanted/fence_gate.json | 2 +- .../recipes/wood/blue_enchanted/sign.json} | 15 +- .../data/byg/recipes/wood/bulbis/fence.json | 2 +- .../byg/recipes/wood/bulbis/fence_gate.json | 2 +- .../data/byg/recipes/wood/bulbis/sign.json} | 15 +- .../data/byg/recipes/wood/cherry/fence.json | 2 +- .../byg/recipes/wood/cherry/fence_gate.json | 2 +- .../data/byg/recipes/wood/cherry/sign.json} | 15 +- .../data/byg/recipes/wood/cika/fence.json | 2 +- .../byg/recipes/wood/cika/fence_gate.json | 2 +- .../data/byg/recipes/wood/cika/sign.json} | 15 +- .../data/byg/recipes/wood/cypress/fence.json | 2 +- .../byg/recipes/wood/cypress/fence_gate.json | 2 +- .../data/byg/recipes/wood/cypress/sign.json} | 15 +- .../data/byg/recipes/wood/ebony/fence.json | 2 +- .../byg/recipes/wood/ebony/fence_gate.json | 2 +- .../data/byg/recipes/wood/ebony/sign.json} | 15 +- .../data/byg/recipes/wood/embur/fence.json | 2 +- .../byg/recipes/wood/embur/fence_gate.json | 2 +- .../data/byg/recipes/wood/embur/sign.json} | 15 +- .../data/byg/recipes/wood/ether/fence.json | 2 +- .../byg/recipes/wood/ether/fence_gate.json | 2 +- .../data/byg/recipes/wood/ether/sign.json} | 15 +- .../data/byg/recipes/wood/fir/fence.json | 2 +- .../data/byg/recipes/wood/fir/fence_gate.json | 2 +- .../data/byg/recipes/wood/fir/sign.json} | 15 +- .../recipes/wood/green_enchanted/fence.json | 2 +- .../wood/green_enchanted/fence_gate.json | 2 +- .../recipes/wood/green_enchanted/sign.json} | 15 +- .../data/byg/recipes/wood/holly/fence.json | 2 +- .../byg/recipes/wood/holly/fence_gate.json | 2 +- .../data/byg/recipes/wood/holly/sign.json} | 15 +- .../data/byg/recipes/wood/imparius/fence.json | 2 +- .../byg/recipes/wood/imparius/fence_gate.json | 2 +- .../data/byg/recipes/wood/imparius/sign.json | 21 + .../byg/recipes/wood/jacaranda/fence.json | 2 +- .../recipes/wood/jacaranda/fence_gate.json | 2 +- .../byg/recipes/wood/jacaranda/sign.json} | 15 +- .../data/byg/recipes/wood/lament/fence.json | 2 +- .../byg/recipes/wood/lament/fence_gate.json | 2 +- .../data/byg/recipes/wood/lament/sign.json} | 15 +- .../data/byg/recipes/wood/mahogany/fence.json | 2 +- .../byg/recipes/wood/mahogany/fence_gate.json | 2 +- .../data/byg/recipes/wood/mahogany/sign.json} | 15 +- .../data/byg/recipes/wood/mangrove/fence.json | 2 +- .../byg/recipes/wood/mangrove/fence_gate.json | 2 +- .../data/byg/recipes/wood/mangrove/sign.json} | 15 +- .../data/byg/recipes/wood/maple/fence.json | 2 +- .../byg/recipes/wood/maple/fence_gate.json | 2 +- .../data/byg/recipes/wood/maple/sign.json} | 15 +- .../byg/recipes/wood/nightshade/fence.json | 2 +- .../recipes/wood/nightshade/fence_gate.json | 2 +- .../byg/recipes/wood/nightshade/sign.json} | 15 +- .../data/byg/recipes/wood/palm/fence.json | 2 +- .../byg/recipes/wood/palm/fence_gate.json | 2 +- .../data/byg/recipes/wood/palm/sign.json} | 15 +- .../data/byg/recipes/wood/pine/fence.json | 2 +- .../byg/recipes/wood/pine/fence_gate.json | 2 +- .../data/byg/recipes/wood/pine/sign.json} | 15 +- .../wood/rainbow_eucalyptus/fence.json | 2 +- .../wood/rainbow_eucalyptus/fence_gate.json | 2 +- .../wood/rainbow_eucalyptus/sign.json} | 15 +- .../data/byg/recipes/wood/redwood/fence.json | 2 +- .../byg/recipes/wood/redwood/fence_gate.json | 2 +- .../data/byg/recipes/wood/redwood/sign.json} | 15 +- .../data/byg/recipes/wood/skyris/fence.json | 2 +- .../byg/recipes/wood/skyris/fence_gate.json | 2 +- .../data/byg/recipes/wood/skyris/sign.json} | 15 +- .../data/byg/recipes/wood/sythian/fence.json | 2 +- .../byg/recipes/wood/sythian/fence_gate.json | 2 +- .../data/byg/recipes/wood/sythian/sign.json} | 15 +- .../data/byg/recipes/wood/willow/fence.json | 2 +- .../byg/recipes/wood/willow/fence_gate.json | 2 +- .../data/byg/recipes/wood/willow/sign.json} | 15 +- .../byg/recipes/wood/witch_hazel/fence.json | 2 +- .../recipes/wood/witch_hazel/fence_gate.json | 2 +- .../byg/recipes/wood/witch_hazel/sign.json} | 15 +- .../data/byg/recipes/wood/zelkova/fence.json | 2 +- .../byg/recipes/wood/zelkova/fence_gate.json | 2 +- .../data/byg/recipes/wood/zelkova/sign.json} | 15 +- .../resources/data/byg/tags/items/sticks.json | 10 + .../byg/blockstates/aspen_wall_sign.json | 7 - .../byg/blockstates/baobab_wall_sign.json | 7 - .../blockstates/blue_enchanted_wall_sign.json | 7 - .../byg/blockstates/bulbis_wall_sign.json | 7 - .../byg/blockstates/cherry_wall_sign.json | 7 - .../byg/blockstates/cika_wall_sign.json | 7 - .../byg/blockstates/cypress_wall_sign.json | 7 - .../byg/blockstates/ebony_wall_sign.json | 7 - .../byg/blockstates/embur_wall_sign.json | 7 - .../byg/blockstates/ether_wall_sign.json | 7 - .../assets/byg/blockstates/fir_wall_sign.json | 7 - .../green_enchanted_wall_sign.json | 7 - .../byg/blockstates/holly_wall_sign.json | 7 - .../byg/blockstates/imparius_wall_sign.json | 7 - .../byg/blockstates/jacaranda_wall_sign.json | 7 - .../byg/blockstates/lament_wall_sign.json | 7 - .../byg/blockstates/mahogany_wall_sign.json | 7 - .../byg/blockstates/mangrove_wall_sign.json | 7 - .../byg/blockstates/maple_wall_sign.json | 7 - .../byg/blockstates/nightshade_wall_sign.json | 7 - .../byg/blockstates/palm_wall_sign.json | 7 - .../byg/blockstates/pine_wall_sign.json | 7 - .../rainbow_eucalyptus_wall_sign.json | 7 - .../byg/blockstates/redwood_wall_sign.json | 7 - .../byg/blockstates/skyris_wall_sign.json | 7 - .../byg/blockstates/sythian_wall_sign.json | 7 - .../byg/blockstates/willow_wall_sign.json | 7 - .../blockstates/witch_hazel_wall_sign.json | 7 - .../byg/blockstates/zelkova_wall_sign.json | 7 - .../blocks/potted_aspen_sapling.json | 33 -- .../blocks/potted_baobab_sapling.json | 33 -- .../blocks/potted_blue_enchanted_sapling.json | 33 -- .../blocks/potted_bulbis_oddity.json | 33 -- .../blocks/potted_cika_sapling.json | 33 -- .../blocks/potted_cypress_sapling.json | 33 -- .../blocks/potted_ebony_sapling.json | 33 -- .../loot_tables/blocks/potted_embur_wart.json | 33 -- .../blocks/potted_ether_sapling.json | 33 -- .../blocks/potted_fir_sapling.json | 33 -- .../potted_green_enchanted_sapling.json | 33 -- .../blocks/potted_holly_sapling.json | 33 -- .../blocks/potted_imparius_mushroom.json | 33 -- .../blocks/potted_jacaranda_sapling.json | 33 -- .../blocks/potted_lament_sapling.json | 33 -- .../blocks/potted_mahogany_sapling.json | 33 -- .../blocks/potted_mangrove_sapling.json | 33 -- .../blocks/potted_maple_sapling.json | 33 -- .../blocks/potted_nightshade_sapling.json | 33 -- .../blocks/potted_palm_sapling.json | 33 -- .../blocks/potted_pine_sapling.json | 33 -- .../potted_rainbow_eucalyptus_sapli.json | 33 -- .../potted_rainbow_eucalyptus_sapling.json | 33 -- .../blocks/potted_redwood_sapling.json | 33 -- .../blocks/potted_skyris_sapling.json | 33 -- .../blocks/potted_sythian_fungus.json | 33 -- .../blocks/potted_willow_sapling.json | 33 -- .../blocks/potted_witch_hazel_sapling.json | 33 -- .../blocks/potted_zelkova_sapling.json | 33 -- .../datagen/providers/BYGRecipeProviders.java | 1 + .../providers/loot/BYGBlockLootProvider.java | 8 + 236 files changed, 2842 insertions(+), 1692 deletions(-) create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json create mode 100644 Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json create mode 100644 Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json rename Common/src/{main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json => generated/resources/data/byg/recipes/wood/aspen/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json => generated/resources/data/byg/recipes/wood/baobab/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json => generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json => generated/resources/data/byg/recipes/wood/bulbis/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json => generated/resources/data/byg/recipes/wood/cherry/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json => generated/resources/data/byg/recipes/wood/cika/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json => generated/resources/data/byg/recipes/wood/cypress/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json => generated/resources/data/byg/recipes/wood/ebony/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json => generated/resources/data/byg/recipes/wood/embur/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_ether_planks.json => generated/resources/data/byg/recipes/wood/ether/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/oak_sign_from_fir_planks.json => generated/resources/data/byg/recipes/wood/fir/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json => generated/resources/data/byg/recipes/wood/green_enchanted/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/oak_sign_from_holly_planks.json => generated/resources/data/byg/recipes/wood/holly/sign.json} (54%) create mode 100644 Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json rename Common/src/{main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json => generated/resources/data/byg/recipes/wood/jacaranda/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json => generated/resources/data/byg/recipes/wood/lament/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json => generated/resources/data/byg/recipes/wood/mahogany/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json => generated/resources/data/byg/recipes/wood/mangrove/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json => generated/resources/data/byg/recipes/wood/maple/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json => generated/resources/data/byg/recipes/wood/nightshade/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json => generated/resources/data/byg/recipes/wood/palm/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/oak_sign_from_pine_planks.json => generated/resources/data/byg/recipes/wood/pine/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json => generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json => generated/resources/data/byg/recipes/wood/redwood/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json => generated/resources/data/byg/recipes/wood/skyris/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json => generated/resources/data/byg/recipes/wood/sythian/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/oak_sign_from_willow_planks.json => generated/resources/data/byg/recipes/wood/willow/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json => generated/resources/data/byg/recipes/wood/witch_hazel/sign.json} (54%) rename Common/src/{main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json => generated/resources/data/byg/recipes/wood/zelkova/sign.json} (54%) create mode 100644 Common/src/generated/resources/data/byg/tags/items/sticks.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/aspen_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/baobab_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/bulbis_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cherry_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cika_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/cypress_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ebony_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/embur_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/ether_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/fir_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/holly_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/imparius_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/jacaranda_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/lament_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mahogany_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/mangrove_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/maple_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/nightshade_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/palm_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/pine_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/redwood_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/skyris_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/sythian_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/willow_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/witch_hazel_wall_sign.json delete mode 100644 Common/src/main/resources/assets/byg/blockstates/zelkova_wall_sign.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_embur_wart.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapli.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json delete mode 100644 Common/src/main/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index 0488d8119e..cf345eb0e9 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2140,7 +2140,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -fba9eff6467daa20afe6405361e86872b8a0fa17 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +a1f6f4c765911900e5b5b785ba571df5ee55bb84 data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json @@ -2157,6 +2157,7 @@ db985793fdd315c02ba0d3be4cb1764ac320e387 data/byg/advancements/recipes/byg.byg/w 3dfc28bfe74af2d2aa2f87f61e088ea4543c8cca data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json db84ae5b52bba81b3e43f27613343f80abdfbd19 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json 0b8a550c52cb3c9e1aa883e77aa32b10f3f07770 data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json +cb211482cc1335e19a05a5e76f4a95dcbb8068e4 data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json 5f42b62b9a96d8eb55d3bf645bafae9de79f6b13 data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json fa6e7b7f077e8e0a3ffb64c8bb443132b0914c15 data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json 70fe220fa3368bd5be4b984c385e086531920331 data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json @@ -2170,6 +2171,7 @@ e7dae4923c93313f898cf8769280740d3d73bb1c data/byg/advancements/recipes/byg.byg/w f65bf801cc20711aae25ae606741fc1bf04fb445 data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json 96b241c110d1505c97c6ef75487aed6c81fbf2b5 data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json 8684aace48a2f8c53dbecac0c70f37d66465e5f6 data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json +ae26bf7a014ee3df2b787f1f28107fe26188927e data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json 833619c47c131b4c72c1b6a56796c451f9c2bff0 data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json 19f58aad206582307b90f8db9784d80d40460e8d data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json @@ -2183,6 +2185,7 @@ f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/w 23fe49cffbed25aa69be0ff760d983f067af2b65 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json f41f2d2d3c0af5821bc96e82b7a0429b02e379a8 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json 6864e4a80e3e28f2edc0ed5e6f133110d4364113 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json +d42276e89ada47b1843a34a0339821e888e7799d data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json 513a7028ba639f101216ceac8786ea58647b0ab5 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json 71ae592506dbd4598b54f717a182268035d3c0b2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json 59dd8ff337e24b31e917ab5405e8692c452b47b4 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json @@ -2195,6 +2198,7 @@ e750119b99fb80d6a938f4753bc7490aee61300d data/byg/advancements/recipes/byg.byg/w c50eea308107c7fbb7c5254415df875448eff056 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json 8342d661d5bb9157c11a082342ae5d4764706786 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json 995bf4d4574badf99459ebc78dcb2707774190b3 data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json +532cd6db1c55f54cd3c585d7525a724d78a1ea03 data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json ef0119d4da07d55c8a35779d0a1231acd24ad6fe data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json 14dcfdd0b3b214ce0b94bec84a8e834695bd93ee data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json 999a1a1a0be1d07927214494be8dc56ba59a5d6f data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json @@ -2208,6 +2212,7 @@ e1588dd3dc5c8002944d146df52e6271500963ab data/byg/advancements/recipes/byg.byg/w 097af9339c3f2d7bc75ed63c67242dbfbdb60308 data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json c3daf89e6c51f92a94448687e88128853602ab94 data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json efe4a39583a805af78c82bfe7f224e36844abe3f data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json +b4f3260cfa20e997423b8c39eb5f400928ac109b data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json 131415f581121f364e982090cd76e69de0d5c07c data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json 7c19345d226ea6e1a1adab274168dfe289200373 data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json @@ -2221,6 +2226,7 @@ ddbd1ecd8afe20b7be22ddb9105886a3bbb52375 data/byg/advancements/recipes/byg.byg/w 6551ec208aba255c717faad92d7646ff435e2dca data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json 7669036e415ce7f705c7103a4f9a47655f2b33b8 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json d9615b7a10088c08da377d5037e9264235f0eced data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json +d9fc5ac5ea1c0c84c9f2a88d18a9cfb077d49221 data/byg/advancements/recipes/byg.byg/wood/cika/sign.json 761cabe05bc9c0ea350782e2acbccabcec112bf7 data/byg/advancements/recipes/byg.byg/wood/cika/slab.json 280574a7a2a3df2ab428677d10f15cefe9af326e data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json dcaafbd26e9fc567180c8dc46b465b515473a713 data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json @@ -2234,6 +2240,7 @@ bd475e53816f3adddde30dc00d917c7d23d0aee1 data/byg/advancements/recipes/byg.byg/w 6ade55f8bfb3a222785938193bc19e98bbd647a1 data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json 88fad555f9efec69903219ab247e55b7db136f30 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json 04b81587e55ceaf3998232cf34b1805ad93fbadd data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json +a27cd42686e9419ec7f7e83569b93320c5eda893 data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json 0095d0adaaa11d85552ab54d5195b1aa557572b9 data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json 40e7f6394d71ccbd802b40b1fb9a81556d92e79a data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json fcfe35857371e012b64fc77fea5524b63abe2be2 data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json @@ -2247,6 +2254,7 @@ ec1ebec1e8fd863cb4adefc098ae89e70ca04c22 data/byg/advancements/recipes/byg.byg/w f1a0277ee9f6b8bda41805b9e07fe1b8277eae82 data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json 114915093f7c91ddf77e806f0714a293c3d58ff3 data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json 0c17e3d382a5afcb9be55ea38be12caac60a6e4e data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json +1e97f568589d2c19d95317a720aba3ef454a8f21 data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json c11c95a814d930a9a9128fdbcc8138c651a1a0db data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json c146cebcc5cda2004d61257e4c2deb4ff421e9de data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json 9dd64acb1012c36dbcf979f00f680b3f716465b4 data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json @@ -2259,6 +2267,7 @@ cbcd24147b96d8fd638fdd20408334d90e7c5872 data/byg/advancements/recipes/byg.byg/w b5ef8379f588abfdd1371574f7ccbffa33b390f8 data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json 7d3dfe79e35bf36008c981751cea61947d7a5f29 data/byg/advancements/recipes/byg.byg/wood/embur/planks.json f9d2ff3b2735a14c7a67c360ec9ad3d37757e4ab data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json +ecd2242dc9b6a660f8e6c7166e10233c23b16ff4 data/byg/advancements/recipes/byg.byg/wood/embur/sign.json 2ab26df6c178f0e2b2ec97a223cfbec14025b82a data/byg/advancements/recipes/byg.byg/wood/embur/slab.json 59a7be5ea54968e4ba14615daca8072d133a059c data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json bfa220a3176ed010f6cb184120033569e5d744f0 data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json @@ -2271,6 +2280,7 @@ d6aaa33a010ad1cbea45f91268d42c8c76ac1c92 data/byg/advancements/recipes/byg.byg/w e4a8688990d64c704fe7aa5428f30426c7d7d3a2 data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json d68f20e0ec94d8d8eecf15a1ef6063036875367b data/byg/advancements/recipes/byg.byg/wood/ether/planks.json d98639a6ccf4e011f162f02574cee6555ca1e8de data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json +0fdfbc021c7ce21753fb743b4c242e4e90c0ce2a data/byg/advancements/recipes/byg.byg/wood/ether/sign.json 715a1fe551746f7a1b389ad3a7b1666d18c82b73 data/byg/advancements/recipes/byg.byg/wood/ether/slab.json 775f6170cff6aef3714388add618c14e020ef8b6 data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json f9116fff9b742d987945bc396246b41b5a3bf12c data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json @@ -2284,6 +2294,7 @@ d7a335cf63c00f03382f7f789152eabb3ac239ee data/byg/advancements/recipes/byg.byg/w 95737ca56cacec4ad5ed80b082b00368c4f1cf5d data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json e298d7496d24bb85a66eaea0e2046dafb45648e4 data/byg/advancements/recipes/byg.byg/wood/fir/planks.json 8e456a2336d2dc21b4dcba3065046232f94fb5d7 data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json +64258155cd95c243326cb094b907349dab3b73a8 data/byg/advancements/recipes/byg.byg/wood/fir/sign.json c6401f67edcd9707b45b10b2c9560e304cf3be7a data/byg/advancements/recipes/byg.byg/wood/fir/slab.json c400e09dcf59ab7f73b0ac154397a9cad91ec87a data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json 3c1c1585f83dfc80c4186cd8c770798e4a490c77 data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json @@ -2297,6 +2308,7 @@ bebbb2fbcc6a1225668a050d6a0b222bb5a79491 data/byg/advancements/recipes/byg.byg/w 68dcda315f00202e49dbcb472fcf1b661ed24bd8 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json 218356c5e4f374c61bf58b550b705a2fabd07890 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json d43f52cc90905d4898f973a27d338a63a8fd3db6 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json +53960d9f69587b124373a14bad63cce14ee8e7ef data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json 0cacea4b7f3fd744f07bcfde562a016ac1508f0f data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json 10dcdf764a5544180480a21b04592e313d0553ba data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json 06c3958dc0ec2b7f80fa4050851e39cecfd41580 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json @@ -2310,6 +2322,7 @@ f1a32e7e0c01275e64bc728f792b179f485f4dd5 data/byg/advancements/recipes/byg.byg/w 63797ab6e35fbeeba288b9567f335701ad16cae7 data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json 98e27ec36fc04cc29d6efb765dccba93d84f652a data/byg/advancements/recipes/byg.byg/wood/holly/planks.json 1cbf4262c545c09d1765a3f0824b678f382ab058 data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json +86520336890984f0c1208a3c3e577df6edec51f3 data/byg/advancements/recipes/byg.byg/wood/holly/sign.json 936142a10cdea1fe8c61b747f2180e16cca306a6 data/byg/advancements/recipes/byg.byg/wood/holly/slab.json 6f33d35a03824ffe3bda33c1e7b72e124d8fd2aa data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json 78e889d6619efb1d8e8d1be701e640b2968dee46 data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json @@ -2322,6 +2335,7 @@ df0d7e8f0280269736ac22d62e84b3db7c2e6c39 data/byg/advancements/recipes/byg.byg/w a36d45d9a4f718aba0a4dd6588d995d0995c24f8 data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json 1d66707ae8a8628874adaedeaefb28d40ceebc9a data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json 39f4a722c4ca867bd464893909002c4be38d8927 data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json +2c2fee5bac940847710738ecb1a5136e5c9086c0 data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json 21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json @@ -2335,6 +2349,7 @@ d6db26dc1358ebc8d2b800946cd02a63b269813a data/byg/advancements/recipes/byg.byg/w 49a7a3016d146de8c893756a8601ab48d61f9e33 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json e7086261f7b57af35c174f6338a464c047ee7bb6 data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json 336fc3792690640efe58fa048f1fdeb328773669 data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json +92fbba80c2ec334d001619f69df1c74c878e6c9b data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json 890e6fbbebe86e8c4949fcc5f20e7c15672223ad data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json 5a0f6fffd88be08b587aa7f5bf4e83de18bbdf4e data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json 9d4a8d79a288204acc3b39d70e8d071484c09446 data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json @@ -2347,6 +2362,7 @@ fc5cdeb834d0985ad3bab1b2f59db019fd042b4b data/byg/advancements/recipes/byg.byg/w d0bca869b44928eb27282f5a4b4afe9a254b74b3 data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json b61ba3e679c804622eeb07bfd53d694099e83c1c data/byg/advancements/recipes/byg.byg/wood/lament/planks.json 974735c810011ed37ecf7993137390066049c5ed data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json +8f05423a309e3f568041a14561ed99f85742ef4c data/byg/advancements/recipes/byg.byg/wood/lament/sign.json 0f35cac5b1c9806eb1dd8723c92bb5273feb2988 data/byg/advancements/recipes/byg.byg/wood/lament/slab.json b9c56f373d702e86e512a481a78d2ecbf0100898 data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json 62ecbf2fdc225488e8b44bbb3c54f000055d43bd data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json @@ -2360,6 +2376,7 @@ d6b591dee348b32c4942eb45549d8c9cff8ddf02 data/byg/advancements/recipes/byg.byg/w 3bf65b830f1fb1ff60cad8aa91294e3ec6afab1b data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json a9e0f8677d35a3447eb658bce8619837156150f8 data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json 44d191e7415b89f3f75961b0e4f9fa028f776843 data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json +63dbce130802d0c093ea2acdb559653d4f11e7d7 data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json dbb51975c5190152740d709a03e264737fe1c2ce data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json b7f8754d44b9a3833d7ac10d62a9f00ae77af26e data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json 21d421d0b92bd3bb4edfbc901976bc76bbbdfa00 data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json @@ -2373,6 +2390,7 @@ cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/w 8dc550f42ca8270dc3c6d98eaa270e346eeeef20 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json 1ebc0797ea321249ac527b39e383af6e8c81a76e data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json 941a750649fc69ff8dc9629056552085ff0a4f1a data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json +77db39daa5ea2e697e7266c28e2596a55c5baac4 data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json 90d4390fe6f7c5bb8246f959a4b34251a8ce9dee data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json 80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json @@ -2386,6 +2404,7 @@ d5afcf929b117947a249d990c7a38c1329602d83 data/byg/advancements/recipes/byg.byg/w 403c513bdfe578de2ea2726773f16770ed3d9f90 data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json b2b8f0a248822d59d7decf84408e84f067bc4250 data/byg/advancements/recipes/byg.byg/wood/maple/planks.json 02563db07b402d445c35fd495bd615c66aa46517 data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json +3a3b6f8ac79b351af8b5e105f05badc0325b807a data/byg/advancements/recipes/byg.byg/wood/maple/sign.json b723b3e3ecf3d647499b4afea51157d5be61b830 data/byg/advancements/recipes/byg.byg/wood/maple/slab.json 8f3ed300254a103a0bf9b49eb0a6bc4527f3e2a0 data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json 2462c5675fe9ea34bc455e158b73d28f2b995210 data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json @@ -2398,6 +2417,7 @@ c560c853dcebf5028fb974bf928cd08a97effca6 data/byg/advancements/recipes/byg.byg/w 7424866d4cfbc7f66606837bd73fd4c358109cd7 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json 95c181f92a7d0bede76c0927ab1ff9aaeee9edaa data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json 6f77c8749d512ac370c4e3eeda4c2620f8ced14a data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json +486c3cb51603387efbaf01f94c56323fc71bb474 data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json 6237257ab8d96d71f1482649060d9b48dc04a039 data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json a7581263bd5c31bd45d691415a2ad25c7117cb64 data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json 3a8450da76c3d276e069cbd7dddb6b7461f98ad0 data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json @@ -2411,6 +2431,7 @@ ea278f1d625776b8651b4126ca2cbbff65364aaa data/byg/advancements/recipes/byg.byg/w 44a7dc86b3fe68ce619d6a2b13485fb9b6dd8f92 data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json 45701258292dcade3701dfa6e86536873b530ed2 data/byg/advancements/recipes/byg.byg/wood/palm/planks.json 507824f93c6a3e112a25ef20217669dafaa235d4 data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json +49bc8952e16edeed3512d180b653927982a6db48 data/byg/advancements/recipes/byg.byg/wood/palm/sign.json ded595aca78b27ff23c66f8d0584185e2764ffbc data/byg/advancements/recipes/byg.byg/wood/palm/slab.json 40c85e634608fe669547035181bb8c43be47449f data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json a7caf367c6e2d197bc9d109a3fbc6e1e08bf26c5 data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json @@ -2424,6 +2445,7 @@ a7caf367c6e2d197bc9d109a3fbc6e1e08bf26c5 data/byg/advancements/recipes/byg.byg/w b780788a4c989154d95b64d41aeb9c9cfc039e7f data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json f35deddb85ba57119510eb56ebffd267c2ebd557 data/byg/advancements/recipes/byg.byg/wood/pine/planks.json 6cc95e191de6ba78c7555673c2c388d367223b30 data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json +6c5cc5c0284c3e6daa84a1e758f9daebdd14485e data/byg/advancements/recipes/byg.byg/wood/pine/sign.json afbaf9dab1f1c68e97f3ca96cd99dc5b7ba04467 data/byg/advancements/recipes/byg.byg/wood/pine/slab.json daa17726d156767ba4cbd318e8100b4ddc859561 data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json 7b1a7bb2a7e121fa7ae90e6060047368f7b9fe00 data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json @@ -2437,6 +2459,7 @@ eadce2b6426ac50951f1aa732979c4019cff07f5 data/byg/advancements/recipes/byg.byg/w 7d8ce6ad138fddf06b324945be9a96ff4b9c3528 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json e8b1b41d81dac589ecf150cf0e82d57faa4a107a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json 6227f328f4b447d2f36e97c8d72e5ccb76a66424 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json +a3b9e342ef1d909d20192a3929d942ca5978e968 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json 7c133afaff2bb99301724866abb2596fa4da4cc4 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json 1fc9cd0e17b8ac252188befd4b65402ffbc3907d data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json 028ad9ae534f745665b580f11ea2d474eb2ff19a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json @@ -2450,6 +2473,7 @@ be69c1d9eb87be384841071b2f14ac154472f0f7 data/byg/advancements/recipes/byg.byg/w fbebcc53fe2b597c287a30264edda80ced5d92dd data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json b7bcbecfef8c29248d0ca0f0c1d87a8b424e8fb9 data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json +23e151a5194c12babc7e90a132c92c5161b1a340 data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json 4246aff3798c80f6f7548f1b83f1b5bc9a749525 data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json 48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json @@ -2463,6 +2487,7 @@ aab1b61b74b8e343ac121d35dfbf87b607311534 data/byg/advancements/recipes/byg.byg/w 91e61481d1b7640aea47e3bf37c39fc14bb450d8 data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json ab1a468b669904bb3b22409f06ce5345300b54db data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json b630b384d3f541bec7bd863d16aca2f2b8a7edad data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json +bab88f8d8dab7ab858cc8a6eac45901f3843f4a4 data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json a83d445b4c5452b3e0f13e3ecf19b4ec7adae235 data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json 6732c2a40272a07e9477266dad98b084b3f0ccdc data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json 1005e61c2f79e7a742e473ac164b11deac03fe5c data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json @@ -2475,6 +2500,7 @@ bed0fe7f9f783c594170979ab9af60abe160f5c7 data/byg/advancements/recipes/byg.byg/w 4fddc714997fcbe7e2c371553ea37de3772c8739 data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json 07dcd4470b107c239d1a00488eec0772816b45ed data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json 1eb44357bceb6eebb4cf88464d9e2dfd1d3eff52 data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json +2a331da6611dbb222b93ebb7828016727d204b5d data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json 1eb658f6cd7e634bace3ed76afc5f7733e3a358f data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json 6ae698e128fcf2fd1020eabaff033be7788dfcf6 data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json b8d75b0c9d037bf5d186265c3a2b8f92f8f6a5e9 data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json @@ -2488,6 +2514,7 @@ e29da2c4e8fd38b40d92e8b6e320afb8d1bb56db data/byg/advancements/recipes/byg.byg/w 5f7c4ceae94bc2ff3aa19ce230ef6d66cc0c18ed data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json 8f1a00431112150c0c0044fea6ad876d8c9495e5 data/byg/advancements/recipes/byg.byg/wood/willow/planks.json d04480bf1d069032f9466601054d79b6e8b40296 data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json +7133a479391f550218a8ac40afa5a6a5614f1cd4 data/byg/advancements/recipes/byg.byg/wood/willow/sign.json dd4b6fd9c90c3ce98f842957d2aee4f2fb1dcd39 data/byg/advancements/recipes/byg.byg/wood/willow/slab.json 812032f12d83f5125bfc7113c6592491ec8911f6 data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json 44da6f86672f69a1e64351f411b9ae7a3e445518 data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json @@ -2501,6 +2528,7 @@ a186210030093ba5c30b6820e7bb2325b8cd9a6c data/byg/advancements/recipes/byg.byg/w 6c7c8dcbf4a3f58ed04126f191c5b75fbeb0ee40 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json cef8647c4e6d4fd7167fe917133ece74cfc11a61 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json 816ef82b64f6e7859c006d51164e180c560d77e4 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json +c5091c1ddc4657ea6a4d7ebb80162b090b876e97 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json 6e1be4972fd1e7b9d8ec96f0f933b2c666c26fae data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json bb44865b80806f1bc536521caecfbd752f4d12c7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json 5384dd297cf8df2c86d6ccad6832bf54fd640fbe data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json @@ -2514,6 +2542,7 @@ c59b21fdafb3dc04832f154d75c9baed1033b052 data/byg/advancements/recipes/byg.byg/w 747a3bb3e57b40c834af5aba294ee78364fddb0e data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json ba9f51cd727d9e0365d68153fc5d2a25e9c4035b data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json d7c781e47dc8891cbb9a0c2660c64dca75fcf983 data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json +44cd52f9905f74870358719860e566501154d1ab data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json 3bf8c396e8086903d0eb0c71dcde3f2e305423a7 data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json b0cbd5fdb61a5c8ccf6a5a58a4bfad85b3acde92 data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json 83eb246f22ed55bd11083437fbf8df5221ef5089 data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json @@ -2530,6 +2559,7 @@ af5f616aa7f9ea8573b9639071b50d0305e4635e data/byg/loot_tables/blocks/aspen_door. 72a4f570456e6ea341d4837f966b43a1c7f59988 data/byg/loot_tables/blocks/aspen_planks.json bc3c651912acbb22ea8543e73010d90c410acea5 data/byg/loot_tables/blocks/aspen_pressure_plate.json cb535913fb27b9190af7a197a5e345f95c083b24 data/byg/loot_tables/blocks/aspen_sapling.json +55c9c8b37698b43ea1e00bef2e8c4cbf38134838 data/byg/loot_tables/blocks/aspen_sign.json 36661d9bb16a6562aabebdd8940edb4bebc373f0 data/byg/loot_tables/blocks/aspen_slab.json 7d5c98ad0c2c8cfa705fedbcb19a0011a2378222 data/byg/loot_tables/blocks/aspen_stairs.json 14d5ebca01f19097950358c70a62850fdabad3dc data/byg/loot_tables/blocks/aspen_trapdoor.json @@ -2545,6 +2575,7 @@ d7027b6283850cfb3d1b0702dafb3a4c9219a825 data/byg/loot_tables/blocks/baobab_craf 982d0fd10518afaabaa0bdde22d45da5ed5fe67c data/byg/loot_tables/blocks/baobab_planks.json 5c9de6c0fa0c689c06d9412660c9dbde44d7d2e7 data/byg/loot_tables/blocks/baobab_pressure_plate.json 392c1803655bfa041bdd488fefad7f7dc925262e data/byg/loot_tables/blocks/baobab_sapling.json +4037435c6c1c096f7cae08b5016fed4dcba57b0a data/byg/loot_tables/blocks/baobab_sign.json b7cf8dc8435b21b62e40a89c8ee95df10e3bc45f data/byg/loot_tables/blocks/baobab_slab.json f301cf55de793df46dc3825ec481de7fbb85c190 data/byg/loot_tables/blocks/baobab_stairs.json 1c091e05557eb61d63a0056f3a4ce526ae650e9b data/byg/loot_tables/blocks/baobab_trapdoor.json @@ -2560,6 +2591,7 @@ a79a06bfee5670dc52d09f97978a2f56f2183b77 data/byg/loot_tables/blocks/blue_enchan a640b504a8890f3fd94e9322119918aebc8ac1de data/byg/loot_tables/blocks/blue_enchanted_planks.json fae23599b47dc89793294be20b55c37fd15650b7 data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json 06442c880a0b922e24291c50238e20081777d6db data/byg/loot_tables/blocks/blue_enchanted_sapling.json +c02a870dd91dc7acca26256529916c05a90ca752 data/byg/loot_tables/blocks/blue_enchanted_sign.json b1b9466559f2be5df34098b73ce509d482053367 data/byg/loot_tables/blocks/blue_enchanted_slab.json 79451c11891e56c348e1274be7b91040b27fcaa7 data/byg/loot_tables/blocks/blue_enchanted_stairs.json 8dc1ed2cac3ed834df9ca9c5321c94cd2308ee0e data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json @@ -2573,6 +2605,7 @@ b1af433ab8cc9ce7326c33467b0ad8c67710dc26 data/byg/loot_tables/blocks/bulbis_butt 4c0eb782a74bcb2a98ce447a26d1edc80879655e data/byg/loot_tables/blocks/bulbis_oddity.json 5d9aaa8aa2b977180288229a3e0ce8a825d3b0cc data/byg/loot_tables/blocks/bulbis_planks.json 60c9a35a289f69ded442f44a39470bc8f8a6434f data/byg/loot_tables/blocks/bulbis_pressure_plate.json +4a1203d54f801729b8ce5bc4dfe2c921dc9b8cb0 data/byg/loot_tables/blocks/bulbis_sign.json 03490d0f7d61049458affa07a2201c3581d1f382 data/byg/loot_tables/blocks/bulbis_slab.json 71645d8e9808ae02c137ef808c06c1966ba01c5d data/byg/loot_tables/blocks/bulbis_stairs.json b44c2fba3b513ac7e603dd32016a6f3034e29bbf data/byg/loot_tables/blocks/bulbis_stem.json @@ -2587,6 +2620,7 @@ c326165e4c573ce89cdd28377dd5b74d4f7d52bf data/byg/loot_tables/blocks/cherry_fenc 5d0b722797fa28822bc9f5ffb7c26b834f15ca1d data/byg/loot_tables/blocks/cherry_log.json 28301e9d562bbe8d909c45cfff5f5d13d9341b88 data/byg/loot_tables/blocks/cherry_planks.json ca80674bc1eb79c1aa7aea0d93f8485f9d2f5927 data/byg/loot_tables/blocks/cherry_pressure_plate.json +7ac809b8875c8419e3283f8803368f8cfe24f873 data/byg/loot_tables/blocks/cherry_sign.json f8ff03d7566e10dcacbc83d28a5bfbe5d84ca546 data/byg/loot_tables/blocks/cherry_slab.json c1c9d9ddf407512eb0ba487e9dc69d720e9e6833 data/byg/loot_tables/blocks/cherry_stairs.json cacda2362ff78a98a84e6b13a07314702f8d74b2 data/byg/loot_tables/blocks/cherry_trapdoor.json @@ -2602,6 +2636,7 @@ c38905528f4e8f4ed69e4c9e7264dedd1f0209b2 data/byg/loot_tables/blocks/cika_log.js 4734f29e2d9ebd4f8c4622769d239729cc78e912 data/byg/loot_tables/blocks/cika_planks.json 8953a3fd62c3c3255de7d96f95a972b146cad8e2 data/byg/loot_tables/blocks/cika_pressure_plate.json a735c30655c5dc36796e43ce854009662e7addb0 data/byg/loot_tables/blocks/cika_sapling.json +2677544542f52a8b331c01b503c635558c12f788 data/byg/loot_tables/blocks/cika_sign.json 34101344ea1dc71e88ec28f43d84356f755f7999 data/byg/loot_tables/blocks/cika_slab.json 1a8c607cbceef4bddc7adcb5f03ba77730b7841c data/byg/loot_tables/blocks/cika_stairs.json 20e02bbe50b60d345bf800bb0975f5f84b479386 data/byg/loot_tables/blocks/cika_trapdoor.json @@ -2617,6 +2652,7 @@ d03c3e10d2e573d1dd930a52fbc899c1f94e48b1 data/byg/loot_tables/blocks/cypress_lea e1a5d5a54d4b14ee9982c6425a06b5efa1649d65 data/byg/loot_tables/blocks/cypress_planks.json 3fdc753ebb1c84c21f2ab9f77e87293c2a0ee5a8 data/byg/loot_tables/blocks/cypress_pressure_plate.json e26bb6c61c1d9f981c95c5836766fbc2a7abc7f9 data/byg/loot_tables/blocks/cypress_sapling.json +370ca78afa49724bb9dfc537995ab5007f20a522 data/byg/loot_tables/blocks/cypress_sign.json 9b8d675c8db24946f09cfa31a35983ca4029240a data/byg/loot_tables/blocks/cypress_slab.json c3e11ce37f30094bce856f06809293a985ed1fca data/byg/loot_tables/blocks/cypress_stairs.json 15135f4d2e7c93418010f97e7d29990ac1202dc7 data/byg/loot_tables/blocks/cypress_trapdoor.json @@ -2632,6 +2668,7 @@ f028142aec62da97824b7268ba60cffc797daeec data/byg/loot_tables/blocks/ebony_log.j 7916dd819b3daeb5f66dfa191d8bc92c19488092 data/byg/loot_tables/blocks/ebony_planks.json 666c8b5d0345249311620c4239419eee84358c97 data/byg/loot_tables/blocks/ebony_pressure_plate.json 75baaf6d65cdf78c0661fb3169740e0b970cfb65 data/byg/loot_tables/blocks/ebony_sapling.json +2ed50e5aecbb6f6c37ae5aed0178bb5aac72187a data/byg/loot_tables/blocks/ebony_sign.json 121b3bdb6d3fb501abefc428286c589bb73683f4 data/byg/loot_tables/blocks/ebony_slab.json 67e33650222524c6f81b67da6d0ab7c6f643222b data/byg/loot_tables/blocks/ebony_stairs.json 51fd339251c32e2d0eb0f8c97cd64051984ccbab data/byg/loot_tables/blocks/ebony_trapdoor.json @@ -2646,6 +2683,7 @@ e8085a5d474fa62b0ff685e669ae6f3040edc3f3 data/byg/loot_tables/blocks/embur_door. 2b5fe9da810badb614d8b0dc59e9fb5d3a4d37be data/byg/loot_tables/blocks/embur_pedu.json ff41398d1e169f0b9fa5f978b15659a302d75bda data/byg/loot_tables/blocks/embur_planks.json 47f0468fe2b90fab3e6dd7d642d82ee43499f444 data/byg/loot_tables/blocks/embur_pressure_plate.json +62cadaa1cbb9fc9f6229b366dbece3fea3f97b9b data/byg/loot_tables/blocks/embur_sign.json fbd42fdc4106ecfcc9b72e9488a155fe00d3e397 data/byg/loot_tables/blocks/embur_slab.json 16d99e9aff0cdadd33e81881af97dba1f93d1e6a data/byg/loot_tables/blocks/embur_stairs.json aae59db4b06a2eb6c8cb9c97f3dd71d83f78b3eb data/byg/loot_tables/blocks/embur_trapdoor.json @@ -2661,6 +2699,7 @@ ad6a63db380b49cc5badedfd4cb06244004ec6a0 data/byg/loot_tables/blocks/ether_leave 3de26ec684d8f939600c4c1c3a11a669b1eba73a data/byg/loot_tables/blocks/ether_planks.json 8c8f883f9b45307ec49b02302878a5d420311a06 data/byg/loot_tables/blocks/ether_pressure_plate.json e161bb580cd8ef6eb2908e07accd0ac52b1e7fda data/byg/loot_tables/blocks/ether_sapling.json +45044463f8b045fb1425aec899317c452b969a3d data/byg/loot_tables/blocks/ether_sign.json fbd6f5bd03a2a635d1420c62f9a391964cbe5bfb data/byg/loot_tables/blocks/ether_slab.json 0695606ed0b53636f0f14f13f61c2c3af1c20ec1 data/byg/loot_tables/blocks/ether_stairs.json 118323ce7bf34cf1186c3822ab007965eb3003a8 data/byg/loot_tables/blocks/ether_trapdoor.json @@ -2676,6 +2715,7 @@ b5efec5ac3a7d060de56206154777b991e0575bd data/byg/loot_tables/blocks/fir_log.jso d13ec6203800992a6fd515d62d672b632157cd29 data/byg/loot_tables/blocks/fir_planks.json a338779558a66fe18918fb95eb7e14693cb53591 data/byg/loot_tables/blocks/fir_pressure_plate.json f95ff7bec8df583ed0e3549aa19629709cfc1670 data/byg/loot_tables/blocks/fir_sapling.json +cf1245faa8f10ec2c0149fbb0b3960964b05e124 data/byg/loot_tables/blocks/fir_sign.json 1ca421fedcaa795f4069108e2676e6ff0b83d576 data/byg/loot_tables/blocks/fir_slab.json 23aa64d28acc7ee6b388c7b1dcda4bf8116271dc data/byg/loot_tables/blocks/fir_stairs.json d358f89ab615ded7e4951788315b78f2e0527e58 data/byg/loot_tables/blocks/fir_trapdoor.json @@ -2691,6 +2731,7 @@ a3ee2f2889c5a1c21f100a8bb95a8565f3527d5a data/byg/loot_tables/blocks/green_encha 7ebcfb1eff1630db1b22fd063044d0227f362da9 data/byg/loot_tables/blocks/green_enchanted_planks.json c0b8c919fb298929b7750fc85d79049dda97eeb8 data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json a94f96a5a606d0d16c0de9804f33fb6e7dfef249 data/byg/loot_tables/blocks/green_enchanted_sapling.json +636eeb180b2131c700732f902568cad4e36ca57c data/byg/loot_tables/blocks/green_enchanted_sign.json 428c3f3d1949976d76381ea8effc71aa644aa9e2 data/byg/loot_tables/blocks/green_enchanted_slab.json 682af6470c2c7f943c5d1bc0dfd76d7c7bcd08e4 data/byg/loot_tables/blocks/green_enchanted_stairs.json d2565d8758262679b33115d0f15b531e9ca3f589 data/byg/loot_tables/blocks/green_enchanted_trapdoor.json @@ -2706,6 +2747,7 @@ ea949079f62370ccb76c7edde0353453f459bf43 data/byg/loot_tables/blocks/holly_fence 4b54a247279c00691501eb65ebffc752777f4d2d data/byg/loot_tables/blocks/holly_planks.json b4def8b29dccd71683084287c244da9f839a6ea3 data/byg/loot_tables/blocks/holly_pressure_plate.json 269bff7d19dc9a2cabc96079686f8304d14f797f data/byg/loot_tables/blocks/holly_sapling.json +d8b7111d5901acc22e8bc2e165e0f17ebddc186a data/byg/loot_tables/blocks/holly_sign.json 75e7b6e8b039bb1438063b0dc6fd8bce9f300b0e data/byg/loot_tables/blocks/holly_slab.json 849571d9a9f29d2e3a2c048469f7056e7c89bdb7 data/byg/loot_tables/blocks/holly_stairs.json edee1c31489bf36cea8f929d4878493d3e8589bb data/byg/loot_tables/blocks/holly_trapdoor.json @@ -2720,6 +2762,7 @@ fc2a7d626071145a42a0386656ff6d584e862f9c data/byg/loot_tables/blocks/imparius_fe 241b5c3b79acc99ef8861e9a9faf9283cdfc6dec data/byg/loot_tables/blocks/imparius_mushroom.json 136c1bbc57999a3d02296dd2407b55ff020b638f data/byg/loot_tables/blocks/imparius_planks.json 532082c639e9e66e8b2475c0a1ed0ae867a3b99a data/byg/loot_tables/blocks/imparius_pressure_plate.json +211616ef7f2bfb375aabfa2851d35c8865a6a179 data/byg/loot_tables/blocks/imparius_sign.json 70c90dac660fe61ee556750284b2dabe9e666371 data/byg/loot_tables/blocks/imparius_slab.json 36c9c862e04b27ef62f4ae3a53bd94eae96fc2f3 data/byg/loot_tables/blocks/imparius_stairs.json 3d36172be374f58f30fe3a00cc5a730935d85c54 data/byg/loot_tables/blocks/imparius_stem.json @@ -2735,6 +2778,7 @@ ad53834ab8e2526cde5101930e463ddae1e1e9f6 data/byg/loot_tables/blocks/jacaranda_f 5f6f4355961c76f5c989e9d88e92049f4ae2cba2 data/byg/loot_tables/blocks/jacaranda_planks.json 8e4b71f27e99356ce93717c87674467c8db7358d data/byg/loot_tables/blocks/jacaranda_pressure_plate.json 1139c74e917034b1281960e0ca28ac1d88e57096 data/byg/loot_tables/blocks/jacaranda_sapling.json +c7769235b1848f195c0f218f0b088649027f9556 data/byg/loot_tables/blocks/jacaranda_sign.json 6911bfe176770c4a0dfcf854f8c2864ef578f0bf data/byg/loot_tables/blocks/jacaranda_slab.json 0bd018ef3c769002b130d6b24f28a24f4ec7b37e data/byg/loot_tables/blocks/jacaranda_stairs.json ab27f287e25d20b0a4611ff392ce22380a4223f5 data/byg/loot_tables/blocks/jacaranda_trapdoor.json @@ -2750,6 +2794,7 @@ b4dac1d2e406a42dddb4cd40296990094f8f4a3f data/byg/loot_tables/blocks/lament_fenc e126dad5e35224de08a7b558c7503f381da2b32a data/byg/loot_tables/blocks/lament_planks.json 14b9073a5dbe7705c932adc6594dcbe935edaea6 data/byg/loot_tables/blocks/lament_pressure_plate.json abf4374f97c63c84c1ddca0bcb57d6208404a382 data/byg/loot_tables/blocks/lament_sapling.json +48e398efc5465f13730d32ce93c7454d2228ce62 data/byg/loot_tables/blocks/lament_sign.json e535eec166ba82498cfeb98e0596db8b84a3c635 data/byg/loot_tables/blocks/lament_slab.json ac67d8a344ed7abc98c55fcc299421aed5fcfe41 data/byg/loot_tables/blocks/lament_stairs.json 0c5cc01363ec61b45e9b00ab84c66bc392df48a1 data/byg/loot_tables/blocks/lament_trapdoor.json @@ -2765,6 +2810,7 @@ da526b5cc199d5d9de35cd3c7608fba35ee98918 data/byg/loot_tables/blocks/mahogany_lo b075b0714593d53f9dfab80a85453b70b676021d data/byg/loot_tables/blocks/mahogany_planks.json bede3adce3a1d3cd47d92d5e0b5e7cd0c8e7135f data/byg/loot_tables/blocks/mahogany_pressure_plate.json 729663427e10d094a9ecc8b6af2d6f1bc0c73a4e data/byg/loot_tables/blocks/mahogany_sapling.json +22cc061aa32d44c245444b3081edd4910daf18fc data/byg/loot_tables/blocks/mahogany_sign.json 9f2552de57b885c8aaeae30b5b3265664d349aa6 data/byg/loot_tables/blocks/mahogany_slab.json 6a986caf4fa73189647e6a0d825cc7b28399c816 data/byg/loot_tables/blocks/mahogany_stairs.json 1b3fa755c297261101dde8f9f0b52635dd439b25 data/byg/loot_tables/blocks/mahogany_trapdoor.json @@ -2780,6 +2826,7 @@ d6f9867d25584168ca53ce4932463b02ed02d481 data/byg/loot_tables/blocks/mangrove_le ab9640aebd5b7051becb8330b3b3ca4a2c8e69e3 data/byg/loot_tables/blocks/mangrove_planks.json cf7afd2bda0e77f0908580420b207df3364133ea data/byg/loot_tables/blocks/mangrove_pressure_plate.json e0ca13cf682dc596004b95d01579177251a9d020 data/byg/loot_tables/blocks/mangrove_sapling.json +a3874b45f0a6e0ff99d21474cc9ff2ccbbe1232e data/byg/loot_tables/blocks/mangrove_sign.json 613e5728b8a65d7523176969313e2e9abe1e464e data/byg/loot_tables/blocks/mangrove_slab.json 8240221971f809efad5b37bf10bed010f22ed82a data/byg/loot_tables/blocks/mangrove_stairs.json 18845dd277a8a2df7c4eb27ce4ffb36e8a83b4d6 data/byg/loot_tables/blocks/mangrove_trapdoor.json @@ -2795,6 +2842,7 @@ dcf4c978d3ef9af781d23b39ed1cf71fcf3f3ec6 data/byg/loot_tables/blocks/maple_log.j 5769a0932e5d7d8b3cfe69408bc1e3b78c2f2600 data/byg/loot_tables/blocks/maple_planks.json 26aacfbccdfe3f216e266da48fdd79a6cb70445e data/byg/loot_tables/blocks/maple_pressure_plate.json 98252b21bcff2f5164076c8b784b875c37623e05 data/byg/loot_tables/blocks/maple_sapling.json +804634e13f32af42a33fafaab08293eaa41a8e6a data/byg/loot_tables/blocks/maple_sign.json 6a2a86d26780cd384a47bf71c0800417019f4ab3 data/byg/loot_tables/blocks/maple_slab.json 00cbb21eb48df7c6c44068d3be42468825647aec data/byg/loot_tables/blocks/maple_stairs.json d658f0a526928e209575b3a492c0b6aef5b786bc data/byg/loot_tables/blocks/maple_trapdoor.json @@ -2810,6 +2858,7 @@ fe72d175883a5aa16a31af42087a8aa8b2a1a454 data/byg/loot_tables/blocks/nightshade_ e30aca37414a4d43586ea65ddca320c88cc18ac2 data/byg/loot_tables/blocks/nightshade_planks.json 364607ffd1f2d819cfe96703e68e801792a518a3 data/byg/loot_tables/blocks/nightshade_pressure_plate.json 67c0c5601d82968b54791c8aadfa153b92031ea0 data/byg/loot_tables/blocks/nightshade_sapling.json +b625973e08e3a3da4450d21449b083eeed6fa56a data/byg/loot_tables/blocks/nightshade_sign.json 785e38bb4f0e1d858102052d2dc56b1d5b82e423 data/byg/loot_tables/blocks/nightshade_slab.json fbbcb5affc50dc9abd82d7304180ac9f09df487b data/byg/loot_tables/blocks/nightshade_stairs.json 0aaabc0b78d63d2b7c99c91c0919130498f74aa2 data/byg/loot_tables/blocks/nightshade_trapdoor.json @@ -2825,6 +2874,7 @@ b8358b9c867da230bf0483d551e52366618cded4 data/byg/loot_tables/blocks/palm_leaves 58384d14852400bb7791acebc5bf0d5fa6cf6422 data/byg/loot_tables/blocks/palm_planks.json 5a4badfc830f778596a964ff88b9775fb4799d85 data/byg/loot_tables/blocks/palm_pressure_plate.json b27aea3350f52e86cdbf0994efd204257ca276e9 data/byg/loot_tables/blocks/palm_sapling.json +d0f4ae3d41a9d248ef0a01d0a4cf54bffe7458ad data/byg/loot_tables/blocks/palm_sign.json 8cf3450048c9c5f2372ea23a9b28c618874fd5d1 data/byg/loot_tables/blocks/palm_slab.json 648dfa24f653a034faa1691f17cb22a33c409036 data/byg/loot_tables/blocks/palm_stairs.json 81eaa1c8f3bb399f64bea1260e80e81871c001dc data/byg/loot_tables/blocks/palm_trapdoor.json @@ -2840,10 +2890,39 @@ b5a1ceb6e374630b9880870c142fe9328ebe1adc data/byg/loot_tables/blocks/pine_leaves 02077776920a661414aa886422346aefbe407c3c data/byg/loot_tables/blocks/pine_planks.json 183362b783e3eec4eb2b37f365ec621daac17856 data/byg/loot_tables/blocks/pine_pressure_plate.json be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/pine_sapling.json +671fefd52ffc07978507a400d84a1f384ed711be data/byg/loot_tables/blocks/pine_sign.json 60e6ded8e5bdc569d641a8ef03f6b77e9d50af96 data/byg/loot_tables/blocks/pine_slab.json 860beef877197883976c86ec033f813b36e0034d data/byg/loot_tables/blocks/pine_stairs.json e57c157b678cbcc65bccfeaff51cf9a9a245bb49 data/byg/loot_tables/blocks/pine_trapdoor.json 02043c8d0cef3c0a6a6bdb8c04aa8a83a6660e84 data/byg/loot_tables/blocks/pine_wood.json +cb535913fb27b9190af7a197a5e345f95c083b24 data/byg/loot_tables/blocks/potted_aspen_sapling.json +392c1803655bfa041bdd488fefad7f7dc925262e data/byg/loot_tables/blocks/potted_baobab_sapling.json +06442c880a0b922e24291c50238e20081777d6db data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +4c0eb782a74bcb2a98ce447a26d1edc80879655e data/byg/loot_tables/blocks/potted_bulbis_oddity.json +a735c30655c5dc36796e43ce854009662e7addb0 data/byg/loot_tables/blocks/potted_cika_sapling.json +e26bb6c61c1d9f981c95c5836766fbc2a7abc7f9 data/byg/loot_tables/blocks/potted_cypress_sapling.json +75baaf6d65cdf78c0661fb3169740e0b970cfb65 data/byg/loot_tables/blocks/potted_ebony_sapling.json +05cc992603c03a862cc8bac30ab3f477d8edcc24 data/byg/loot_tables/blocks/potted_embur_wart.json +e161bb580cd8ef6eb2908e07accd0ac52b1e7fda data/byg/loot_tables/blocks/potted_ether_sapling.json +f95ff7bec8df583ed0e3549aa19629709cfc1670 data/byg/loot_tables/blocks/potted_fir_sapling.json +a94f96a5a606d0d16c0de9804f33fb6e7dfef249 data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +269bff7d19dc9a2cabc96079686f8304d14f797f data/byg/loot_tables/blocks/potted_holly_sapling.json +241b5c3b79acc99ef8861e9a9faf9283cdfc6dec data/byg/loot_tables/blocks/potted_imparius_mushroom.json +1139c74e917034b1281960e0ca28ac1d88e57096 data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +abf4374f97c63c84c1ddca0bcb57d6208404a382 data/byg/loot_tables/blocks/potted_lament_sapling.json +729663427e10d094a9ecc8b6af2d6f1bc0c73a4e data/byg/loot_tables/blocks/potted_mahogany_sapling.json +e0ca13cf682dc596004b95d01579177251a9d020 data/byg/loot_tables/blocks/potted_mangrove_sapling.json +98252b21bcff2f5164076c8b784b875c37623e05 data/byg/loot_tables/blocks/potted_maple_sapling.json +67c0c5601d82968b54791c8aadfa153b92031ea0 data/byg/loot_tables/blocks/potted_nightshade_sapling.json +b27aea3350f52e86cdbf0994efd204257ca276e9 data/byg/loot_tables/blocks/potted_palm_sapling.json +be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/potted_pine_sapling.json +4277deb0748dead9ffa5db13043047b101e7bf15 data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +d0d173ed0bad14836e55ea13af684503e5d9eafa data/byg/loot_tables/blocks/potted_redwood_sapling.json +36ff436ff3fc00540de1a467d561633c09c469dd data/byg/loot_tables/blocks/potted_skyris_sapling.json +78ec7dda56281a026011ac5457d3fe6cbd3f2980 data/byg/loot_tables/blocks/potted_sythian_fungus.json +d1f77c5d4586e93e383c4368a9a9e71c1e33744e data/byg/loot_tables/blocks/potted_willow_sapling.json +6598eadb6c1f8c9e77a717af9ae9add6e99db838 data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +5bf789893e95ce60b66b8b48cc6fcf5ced5bef0a data/byg/loot_tables/blocks/potted_zelkova_sapling.json 5119f2f7f79bc753e66beb6a82d09e19fee77889 data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json bde0a0722e9fee015e715db6e58211ebaa994405 data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json 98e88c37a09dbdb096155609c252931d24fdccdb data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json @@ -2855,6 +2934,7 @@ dbee9dac52d9c0c996c93eb1a37a2de1e74d0f2a data/byg/loot_tables/blocks/rainbow_euc c11fefe42ac9d194ee58d385951989c118a3f8d9 data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json 20b751754bb9703f1715d9e36625efcdba20502c data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json 4277deb0748dead9ffa5db13043047b101e7bf15 data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json +618b9d68a97eb44ea8c4df1cf0cb55d66aec0897 data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json 42bd507cd8067a41b65bb7a8027219b7207907ce data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json fb4671036519c5b43d27e15696802263a5bc6f1f data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json cbe1f86effc6c5f4fe1e84d8bfbc76bcce98e020 data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json @@ -2870,6 +2950,7 @@ b3067290862e9112f91f28ceb7429174b2d184e4 data/byg/loot_tables/blocks/redwood_log 97adbff5f7a483946f3d62c562ed7becdea2e0a2 data/byg/loot_tables/blocks/redwood_planks.json ac75f7713715f4e601870f42c65c4ef08bf5d8ad data/byg/loot_tables/blocks/redwood_pressure_plate.json d0d173ed0bad14836e55ea13af684503e5d9eafa data/byg/loot_tables/blocks/redwood_sapling.json +770fcadc384de0835d545ff5bdd50cd77f36a402 data/byg/loot_tables/blocks/redwood_sign.json 5550654e653ac56bb36183d66dc858a6c868bdf6 data/byg/loot_tables/blocks/redwood_slab.json 93f2892f1a504592b71721654241b3e9db230061 data/byg/loot_tables/blocks/redwood_stairs.json 19eb6314f23e1c4edfd12f46a8444e3b087b3516 data/byg/loot_tables/blocks/redwood_trapdoor.json @@ -2885,6 +2966,7 @@ bf9e1251a504a965a7f128d66448e724fa0fed08 data/byg/loot_tables/blocks/skyris_log. a4e7fe64e838a52cc9572d412760c0dd065e5a64 data/byg/loot_tables/blocks/skyris_planks.json 7fdcdcafd57309a610d2a97134ba70067d8ad285 data/byg/loot_tables/blocks/skyris_pressure_plate.json 36ff436ff3fc00540de1a467d561633c09c469dd data/byg/loot_tables/blocks/skyris_sapling.json +f3f09f800d9d0803be043830cf99088876c7f4fd data/byg/loot_tables/blocks/skyris_sign.json ffea3eb1e308904cf7bbd0eebd3c6563755466ff data/byg/loot_tables/blocks/skyris_slab.json 8a98f8316e0adb8059e45a3b6a10ade3a62a16a0 data/byg/loot_tables/blocks/skyris_stairs.json 378c3104e8b2c03cd58b749f589f6b6bf42b366b data/byg/loot_tables/blocks/skyris_trapdoor.json @@ -2955,6 +3037,7 @@ d3503287ffb3d65d6a30d44b547c32abc046eeb0 data/byg/loot_tables/blocks/sythian_but 28be92a0ef940ced2c4561d1924aa4dc89a8ff0b data/byg/loot_tables/blocks/sythian_hyphae.json 8e6f41a44442da7c6767a0bb5d51905d7dcfa662 data/byg/loot_tables/blocks/sythian_planks.json 924a02a61f12020ad3954755a6f02c5a49ddbadf data/byg/loot_tables/blocks/sythian_pressure_plate.json +9b80e5956479fa3abccee4bee47458c0341b3dc9 data/byg/loot_tables/blocks/sythian_sign.json 6ed0afc80d0b609ee7b7d5ef653fb8627fa4a4ae data/byg/loot_tables/blocks/sythian_slab.json b7bdd6076a894bdf8700de7a75081ac707598d6a data/byg/loot_tables/blocks/sythian_stairs.json bad0da7de372efddb7c82859e4f7c158c82487a0 data/byg/loot_tables/blocks/sythian_stem.json @@ -2971,6 +3054,7 @@ f98fd3d9fd1693de652d96f568eb82a1e3bbe182 data/byg/loot_tables/blocks/willow_leav 88d9922070b764920b2017ca34a4e1c3b89bfc17 data/byg/loot_tables/blocks/willow_planks.json d16feca097f761a74490d5a5ce8096b220215c25 data/byg/loot_tables/blocks/willow_pressure_plate.json d1f77c5d4586e93e383c4368a9a9e71c1e33744e data/byg/loot_tables/blocks/willow_sapling.json +1883b6edbfbbcb616388490f1c1d602013ed20d6 data/byg/loot_tables/blocks/willow_sign.json 99bbb214e2a52b0f9c83d0c1ff8fa82001834eb2 data/byg/loot_tables/blocks/willow_slab.json e62edf561486a0e9559217a4e3a20d320abeb6e3 data/byg/loot_tables/blocks/willow_stairs.json c9a3210632d12d1a4e64c40c65928295f1f37a41 data/byg/loot_tables/blocks/willow_trapdoor.json @@ -2986,6 +3070,7 @@ fe760ae22644ff1ef18e525a83d2106dd0f87274 data/byg/loot_tables/blocks/witch_hazel c94799611bfd5ba96b1c3130d60069ee0dbe9f08 data/byg/loot_tables/blocks/witch_hazel_planks.json a4232c2a72f0006fcce7cb341871536499238904 data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json 6598eadb6c1f8c9e77a717af9ae9add6e99db838 data/byg/loot_tables/blocks/witch_hazel_sapling.json +1f154b7272c21345522cb1b8de90a5fcfac651d6 data/byg/loot_tables/blocks/witch_hazel_sign.json 31413b8b215f4f6283ac95796abc27064530b77e data/byg/loot_tables/blocks/witch_hazel_slab.json a9131abc8187e62ca476e3fb1e04f8b5982f85f1 data/byg/loot_tables/blocks/witch_hazel_stairs.json fc322b84ce46a8b8fd1237a7ed49d571682c28ca data/byg/loot_tables/blocks/witch_hazel_trapdoor.json @@ -3001,6 +3086,7 @@ d600547a5788f7083e0549f1ecf6f15525c82ce5 data/byg/loot_tables/blocks/zelkova_log c074de11fe36eecba5c79e04419f117f5b48fd5a data/byg/loot_tables/blocks/zelkova_planks.json 5d1bace0bf6297f57d55ddf1fdf47d6896cc1ae3 data/byg/loot_tables/blocks/zelkova_pressure_plate.json 5bf789893e95ce60b66b8b48cc6fcf5ced5bef0a data/byg/loot_tables/blocks/zelkova_sapling.json +41447f6150e3c66c899fed36bc9a2e237c53fce6 data/byg/loot_tables/blocks/zelkova_sign.json 6d30fc27d8fa94dbfc0c51033207d36b01a390c7 data/byg/loot_tables/blocks/zelkova_slab.json 42f9e0310af3102984e3765efafbfc69753d865a data/byg/loot_tables/blocks/zelkova_stairs.json 744d023c8c56788532ee8fe06225e7ba6314faac data/byg/loot_tables/blocks/zelkova_trapdoor.json @@ -3054,10 +3140,11 @@ e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.j a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json b1ea352ac9d826d92c548d06df8cc71883325219 data/byg/recipes/wood/aspen/crafting_table.json 2e074f27da76623d60b4818fc91da6d6a25631f7 data/byg/recipes/wood/aspen/door.json -73c58c2e232229cdcd4a9660b569b4e514a6ba8a data/byg/recipes/wood/aspen/fence.json -073ac10577cb1c49ec9da3abfae7447afbd15fe8 data/byg/recipes/wood/aspen/fence_gate.json +3eee811b3c5590c755adace143e2f47692dc16f7 data/byg/recipes/wood/aspen/fence.json +4494153276bc6b54995d1fda56b7ca7554eb46d6 data/byg/recipes/wood/aspen/fence_gate.json 783c791292b8003c229ede378f587fd6c415cfe5 data/byg/recipes/wood/aspen/planks.json 27ba6f01a336d971e5ec751bb64a2f635a434be5 data/byg/recipes/wood/aspen/pressure_plate.json +6e2204e7adbfa389d63b71c773e643d3bb2f5014 data/byg/recipes/wood/aspen/sign.json d7a1d70300005e933b50adb1acbec3a589a06297 data/byg/recipes/wood/aspen/slab.json 56f6741a5d527c2e790acfc0e0d2efa4420f9e3a data/byg/recipes/wood/aspen/stairs.json 015b0b00f19a550e60dadb8f9cda438a1ffaa221 data/byg/recipes/wood/aspen/trapdoor.json @@ -3067,10 +3154,11 @@ d28c218f0f9f6c078619e2c26fe3e1835d980a9f data/byg/recipes/wood/aspen/wood.json 7ad9aad06477fbad1d33dd07449f84cde3ef823d data/byg/recipes/wood/baobab/button.json 5dfab2c004a0a1797e83719081cd2b2c5580297a data/byg/recipes/wood/baobab/crafting_table.json cc8efc86e9d25b5eb2c56073eca38423f7065d93 data/byg/recipes/wood/baobab/door.json -c26a6df862df265f1b5a76c1667373333febed1b data/byg/recipes/wood/baobab/fence.json -bc4ac59bbeb4d07f1340a59ea1f8f531bb1e8d9d data/byg/recipes/wood/baobab/fence_gate.json +449a07dd2a4cff484a706a318054a09004481d16 data/byg/recipes/wood/baobab/fence.json +da0bf30721c59c9b4127a1dac601f0dd8bc75a27 data/byg/recipes/wood/baobab/fence_gate.json 073f67bd061280348c117639af247a85acac4e18 data/byg/recipes/wood/baobab/planks.json e9ea4c56af7c08592ab33701533d2fbb2f07e472 data/byg/recipes/wood/baobab/pressure_plate.json +30ad230ce3245d66d4836793832e8ee339d7971e data/byg/recipes/wood/baobab/sign.json 0ca12512f00f62c144a4a1ea75110f1fa3a11ceb data/byg/recipes/wood/baobab/slab.json 634e1ee6eaaf1cd7a38f716e566ab3c763971f79 data/byg/recipes/wood/baobab/stairs.json 718313d55269a53b0a11200c07dcb028999d9731 data/byg/recipes/wood/baobab/trapdoor.json @@ -3080,10 +3168,11 @@ cdcea7dcf02fcac9f38cdebf4fbe3e1373674e0a data/byg/recipes/wood/blue_enchanted/bo 052228530563a6e5e40e4ca9c599e3c5b6b2e7f1 data/byg/recipes/wood/blue_enchanted/button.json 2dd0aff848fe2e5065fe8a8ef589269afb318064 data/byg/recipes/wood/blue_enchanted/crafting_table.json 3a591e628e2cc31995ec4fdb9fdb5088c1fc7e9b data/byg/recipes/wood/blue_enchanted/door.json -e7eeb1cc90892dcb31cf3b5c918ad5549acb3984 data/byg/recipes/wood/blue_enchanted/fence.json -d564fa63efed912a6941d291c5a499b39854307b data/byg/recipes/wood/blue_enchanted/fence_gate.json +39938b0a98d1378f84c5a6c8360bca36e3b13e6c data/byg/recipes/wood/blue_enchanted/fence.json +643a7bcb21e4e9a3d2c580c3f7a74e8b9aa37ceb data/byg/recipes/wood/blue_enchanted/fence_gate.json 14cee8bfff1a506fd525aedc3c5244b7bf5a999d data/byg/recipes/wood/blue_enchanted/planks.json 787b857d14904563c701ac265b71f171f410845f data/byg/recipes/wood/blue_enchanted/pressure_plate.json +40c25e8ee524e545f90defd1faae3d5475e9dc9d data/byg/recipes/wood/blue_enchanted/sign.json a31ee3423b1b94f5f0f725bbaa1bd475af2529a6 data/byg/recipes/wood/blue_enchanted/slab.json 642a4cdb86732d1bd0df8e77fbc158ea0b747a4c data/byg/recipes/wood/blue_enchanted/stairs.json 6288b691a45bfb216bb823d8e2f4ce9b71a01775 data/byg/recipes/wood/blue_enchanted/trapdoor.json @@ -3092,10 +3181,11 @@ f376a529b65cb0bfd3e1138f087935cfe197c8c8 data/byg/recipes/wood/bulbis/bookshelf. 3b63cc1e4ac322cf4c21ec0815e0e5adb1632938 data/byg/recipes/wood/bulbis/button.json 24b50ed86668b9c10dffe4ff3c3ff3628319990e data/byg/recipes/wood/bulbis/crafting_table.json 67800a40053b00689a31dfd0efcda4fc1d08f066 data/byg/recipes/wood/bulbis/door.json -0ffd6670039dbd035a7ed8aeff7c28d39b9ff8e3 data/byg/recipes/wood/bulbis/fence.json -c7d42d60e3ffc6f17028fe495f4d2fe20f47c424 data/byg/recipes/wood/bulbis/fence_gate.json +1f8af944397c019aadee26cde978cd31e5e7b8fa data/byg/recipes/wood/bulbis/fence.json +860f879b59ba30da1a223a6d2b970bc441d053a3 data/byg/recipes/wood/bulbis/fence_gate.json 338e3d049ad40ffedad289df4168a312c10f2b94 data/byg/recipes/wood/bulbis/planks.json f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_plate.json +c671d31e0fb3326d94d4d69f7074cca552114242 data/byg/recipes/wood/bulbis/sign.json f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json 2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json @@ -3105,10 +3195,11 @@ f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf. 69a6c51e9be471a4fdf07a0d253b4b3f76026818 data/byg/recipes/wood/cherry/button.json 032216390b5e594204b830a8338af8a4db15039f data/byg/recipes/wood/cherry/crafting_table.json b4cd0c2f83180f071060cbb47c2bc18b485cd329 data/byg/recipes/wood/cherry/door.json -e70972b9e4b8503218933cf69caae4f28852558c data/byg/recipes/wood/cherry/fence.json -1b0d138a0e2653ae3daaf5e3af62893a45514ecb data/byg/recipes/wood/cherry/fence_gate.json +493e440aa9bccf432249792f9be04a3ec6a79661 data/byg/recipes/wood/cherry/fence.json +4b54f86555c187bf6121fafe0c5dd4d8a42fbdf3 data/byg/recipes/wood/cherry/fence_gate.json 28edc8349437a264eeb4ebddfc214deec3d1fb88 data/byg/recipes/wood/cherry/planks.json 7a9a8fd4e78eb7200da14f359424fa885400425e data/byg/recipes/wood/cherry/pressure_plate.json +62631fe4fb0ad86fed2199af679befe27175869b data/byg/recipes/wood/cherry/sign.json 34165d5515938d8f03bc640c5c4d6095310ff503 data/byg/recipes/wood/cherry/slab.json e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json f2e078bc274292f6555d1e28d485f9b7b6641de2 data/byg/recipes/wood/cherry/trapdoor.json @@ -3118,10 +3209,11 @@ c3931becfcf4f37f896ec97b536aad2a006a26aa data/byg/recipes/wood/cika/bookshelf.js 1225b84e5ab6917972f15229e2733c17c9265aba data/byg/recipes/wood/cika/button.json ee25638100ad8238083995c754da3aecc36a46e6 data/byg/recipes/wood/cika/crafting_table.json 10202553084d0d7950261e8d350bb8d706adf428 data/byg/recipes/wood/cika/door.json -276810bd6a9c3514cb0f9eae361dee4232fcd222 data/byg/recipes/wood/cika/fence.json -7a20c825a465ed5cca2a2b5a21e5246e5eff5e90 data/byg/recipes/wood/cika/fence_gate.json +907f223e5bbd6fba1931576f7dd1852bdd9ae890 data/byg/recipes/wood/cika/fence.json +fa3e96f26d9fe2500664940a395558b49234034b data/byg/recipes/wood/cika/fence_gate.json 4144f24a51f076711b652d8dc263d847f4e0f9f1 data/byg/recipes/wood/cika/planks.json 94f6ec4de852211c4b2108527f215c7f9a31d39a data/byg/recipes/wood/cika/pressure_plate.json +0bc8405d54d4b4e616c60cd608da7fd416007fce data/byg/recipes/wood/cika/sign.json da0c6a3d35ec44c43f0dd23a8f67c672476379bc data/byg/recipes/wood/cika/slab.json deca528a6fd5b0a2445ee388685a857ba2ad3463 data/byg/recipes/wood/cika/stairs.json 3f0f2756422aa6c65d4c248ce38464df692a749a data/byg/recipes/wood/cika/trapdoor.json @@ -3131,10 +3223,11 @@ bb34adc112d88028f6e18a12e11eaa0d47bd290e data/byg/recipes/wood/cypress/bookshelf 77c6b91acb8813e49be3238993c50e4aa2f03194 data/byg/recipes/wood/cypress/button.json f49127239fb1ab9d6802b9e1fe66e1c572ec2118 data/byg/recipes/wood/cypress/crafting_table.json 5a7c0c05282005ed0d691a7bbb0f5ac0f957477e data/byg/recipes/wood/cypress/door.json -da84cfa442da22cd420c9beb3b83809048b24929 data/byg/recipes/wood/cypress/fence.json -ace13bffd8ab14666fb12d4947c3a4c881c02ee1 data/byg/recipes/wood/cypress/fence_gate.json +b8e9b1110f0ed239709845e50297579524f68e5c data/byg/recipes/wood/cypress/fence.json +487991f00a986d342de6725c04b7afdd92536e57 data/byg/recipes/wood/cypress/fence_gate.json 1d7448e510d921e8f79e54d5f219c9ac2b7fede1 data/byg/recipes/wood/cypress/planks.json 210e0438be44d8e2cbc208ac03fdca0bee1cd476 data/byg/recipes/wood/cypress/pressure_plate.json +dd003e75e84f447e2b9fa6daac80c68534e9d5fd data/byg/recipes/wood/cypress/sign.json 4858f390405103a5725338a816ac6d0d4d4bd732 data/byg/recipes/wood/cypress/slab.json 2bd5355bf93b6081d2fb6ed0905b317889bc8196 data/byg/recipes/wood/cypress/stairs.json fc7e5419f84acc14b0aa73b4dc8d58d2f480a74b data/byg/recipes/wood/cypress/trapdoor.json @@ -3144,10 +3237,11 @@ dcceaf00fa6006d3a5b1338df05350b1b7463ae6 data/byg/recipes/wood/ebony/bookshelf.j 632826dba9bce03f3ed485ed57dc46afebd8a538 data/byg/recipes/wood/ebony/button.json 1ecbc6da6ff49798e35a10b15887fbce992b9372 data/byg/recipes/wood/ebony/crafting_table.json 76a1adacb68adf209a91a7693b9d6df433111402 data/byg/recipes/wood/ebony/door.json -e7fe3c01f190a0b22e1e7a57257a018df7a43fe1 data/byg/recipes/wood/ebony/fence.json -81fb1ab680f4562be18be9243b3bff3c9d0ad8fd data/byg/recipes/wood/ebony/fence_gate.json +4050bf7a7bb6dd2b33cf9e3f22c4c190535bd91a data/byg/recipes/wood/ebony/fence.json +48ca144bc06eff7d58ab76015e0825e21b93215b data/byg/recipes/wood/ebony/fence_gate.json aca20354a788e1d97963eec8c4fed0a825d75df2 data/byg/recipes/wood/ebony/planks.json 083a97f1cc0659a9b168c24d28190daa7482be9c data/byg/recipes/wood/ebony/pressure_plate.json +9bea96fd2e5c4ea9dcf64c063af16d0756afc3b2 data/byg/recipes/wood/ebony/sign.json ecd292502b1ba405da5b7cd6dc907e6741a7ab34 data/byg/recipes/wood/ebony/slab.json b03173249150fb57da7ea0b5fc3272530c0333e1 data/byg/recipes/wood/ebony/stairs.json cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.json @@ -3156,10 +3250,11 @@ cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.js 7a5e21e999d6bc461b8934c2a073f3d8da4a3f6d data/byg/recipes/wood/embur/button.json c0248cde772f05bb5267e8eea2edff9918c04129 data/byg/recipes/wood/embur/crafting_table.json 0a8bf0fdedbbde1757e57746687eb7e9be2657dd data/byg/recipes/wood/embur/door.json -0a226581ca43a6c77873fa18f31fd36c4fe8ed10 data/byg/recipes/wood/embur/fence.json -5c85109e1af8dba86bb0a30cf3375ad45de2d50b data/byg/recipes/wood/embur/fence_gate.json +8474fdbdc4be6989ac158273a084db7a3949f8d6 data/byg/recipes/wood/embur/fence.json +3e03758f168e7ee5589dfc1325c2eb354983f292 data/byg/recipes/wood/embur/fence_gate.json c8eb7b747c73416ee2825910308480af5dde6d70 data/byg/recipes/wood/embur/planks.json a8b7439e42a12200de7d26d484cfa55e6dc887e0 data/byg/recipes/wood/embur/pressure_plate.json +a59cb66804182cc1d8ff937285ea4ed78ffdfdbb data/byg/recipes/wood/embur/sign.json eed8be018b86684fc516f039fb94e3a45306e02c data/byg/recipes/wood/embur/slab.json 917ef07f88a9f0dc7c9e0aeed83e9bc664704387 data/byg/recipes/wood/embur/stairs.json 30d2582c69bde3513ec61e48a523f39844193cb5 data/byg/recipes/wood/embur/trapdoor.json @@ -3168,10 +3263,11 @@ ea032914737512f8483a9325d5e96d760cb190ad data/byg/recipes/wood/embur/wood.json 74876a43f8e763fe5bd418f95b65b02fff554be6 data/byg/recipes/wood/ether/button.json a434b4d028fd5b097f88886c6fce58641204bed5 data/byg/recipes/wood/ether/crafting_table.json 52faa07cde0a3d4c4bc49393244b8e990b3751ee data/byg/recipes/wood/ether/door.json -3290b2244194f3581a11308e63e8a69806bc71b4 data/byg/recipes/wood/ether/fence.json -070557e4753efcf76363f559a6c6605d63eff796 data/byg/recipes/wood/ether/fence_gate.json +e934ac326eb7aa5a7d78d0723e7433e679b1b295 data/byg/recipes/wood/ether/fence.json +18896a7ff4d512f756063e67d919cdfed07de580 data/byg/recipes/wood/ether/fence_gate.json 9507b8fd3f1eae3c4acf6e10f74c9a6084cf89f7 data/byg/recipes/wood/ether/planks.json b48bac9b7aaa14fd286e4e71149fc78dd381ea5c data/byg/recipes/wood/ether/pressure_plate.json +7a0788225ca02fcb5d9e9bd7a06176ceaf2ea0de data/byg/recipes/wood/ether/sign.json eda83001030b0dfac6c3ccd92c9c7f452eee6f7b data/byg/recipes/wood/ether/slab.json 7764e07cb9aa3053869082917560c5985b9b1bb6 data/byg/recipes/wood/ether/stairs.json e308f8d569ee3f59be3884908821c4d5c66a58b7 data/byg/recipes/wood/ether/trapdoor.json @@ -3181,10 +3277,11 @@ b533ac19abbd2dbd6270ebf3b0ba54e2c133fa9e data/byg/recipes/wood/fir/boat.json e6a9f18b10d3b48f7fd2fe855e6039080eb517c2 data/byg/recipes/wood/fir/button.json a627b1aa2a568bf4ee9310b52517667a6cb922ee data/byg/recipes/wood/fir/crafting_table.json 19a468ff39297c013f5b0875e0c5d519eacd7b20 data/byg/recipes/wood/fir/door.json -855156f8f955233ecce478b342ee9ae91d38c395 data/byg/recipes/wood/fir/fence.json -ef31fdf7b6014cea5e6b81217f14256b200ad30a data/byg/recipes/wood/fir/fence_gate.json +077d0fc0f1abceb31a1870ca58cbc3558c70270b data/byg/recipes/wood/fir/fence.json +1bf3efc97e3c7b4e81237da624a147398b0953af data/byg/recipes/wood/fir/fence_gate.json 37bc3c333eac8a46c60c454532e936d3653684d7 data/byg/recipes/wood/fir/planks.json b245db81b6ec383a91df91673ae90fc3dad0f850 data/byg/recipes/wood/fir/pressure_plate.json +bd86ebe2a27734587a9e78fb6f21a377280756cd data/byg/recipes/wood/fir/sign.json 65b20003f1b266d431be4bfcbc51d2dbd7b64b66 data/byg/recipes/wood/fir/slab.json 4493f95748ed40595d49ac0e87a5363381d1fc96 data/byg/recipes/wood/fir/stairs.json e9a451281d8d3cb683acec506e9b8e78608cce43 data/byg/recipes/wood/fir/trapdoor.json @@ -3194,10 +3291,11 @@ dbadfa96e072ebce74b5b5e591a2819fd2ff273a data/byg/recipes/wood/fir/wood.json dcaabfe86ea6ec5dc7dcd37a9ac9dd58ab30d67f data/byg/recipes/wood/green_enchanted/button.json d0380a692f02a3d60ad98bfb692c201430da8c05 data/byg/recipes/wood/green_enchanted/crafting_table.json 2589e2b9e995fbe3c8140a7b62fb0d79a5610ac9 data/byg/recipes/wood/green_enchanted/door.json -5e5094a9fad5d379908c529a2fbf7f606e74f208 data/byg/recipes/wood/green_enchanted/fence.json -e98e8d98c76900bab625bdd600c0fdfe3341c342 data/byg/recipes/wood/green_enchanted/fence_gate.json +74c92c418d8f70bb00d614eb750c466c0b5640e7 data/byg/recipes/wood/green_enchanted/fence.json +1ce52ae0fb0c36ee423b912450c8fe4ccb3eeb2a data/byg/recipes/wood/green_enchanted/fence_gate.json c7d0e4ee4be1a208fdf212b86fdf0a2db4c18be0 data/byg/recipes/wood/green_enchanted/planks.json f553c9c526821bc0db3aff458c4aeeef2d915ad6 data/byg/recipes/wood/green_enchanted/pressure_plate.json +eb255275b17d2f57d22b6d4e06c661f233ec75ff data/byg/recipes/wood/green_enchanted/sign.json 6208b13057c1da578a2ac8aba7af65d4ecdcf2aa data/byg/recipes/wood/green_enchanted/slab.json b519845d4d931b9e50a74d1be071b0301e1638cc data/byg/recipes/wood/green_enchanted/stairs.json 9e87eebd551c977e3ef7ba14c442bfa7a51e3b52 data/byg/recipes/wood/green_enchanted/trapdoor.json @@ -3207,10 +3305,11 @@ c0400126b1da6b09625d144d5b7a3e45290295a0 data/byg/recipes/wood/green_enchanted/w 7ed678397ba3356fef446b9e9208c177d8e17ad6 data/byg/recipes/wood/holly/button.json 94cb01fe12e818480c5a7cb29758b8f9011d00dc data/byg/recipes/wood/holly/crafting_table.json ab5fe57e1951ed5875bd86823d50b95a88b1bde7 data/byg/recipes/wood/holly/door.json -a616a23b829b524d58c5a688d188209189198eb7 data/byg/recipes/wood/holly/fence.json -54bd22cc31320218e0ce45babbfe16091b09eda4 data/byg/recipes/wood/holly/fence_gate.json +8ef62e1057d9cddd14b332994c871006dde6d394 data/byg/recipes/wood/holly/fence.json +7ac4b5efdbb5d6d23c2e6dfc979c705e58c92967 data/byg/recipes/wood/holly/fence_gate.json 38e375959973d1b42f2efa4b2536938c4908e764 data/byg/recipes/wood/holly/planks.json 9fa3efad105acdd7b7f9c7e4fcf2196fc3bf1a55 data/byg/recipes/wood/holly/pressure_plate.json +00b4aed892be6b79f06eb4d83d086bb2a3f546b9 data/byg/recipes/wood/holly/sign.json 52ed1932b6579679c372be18c832d7727ae26625 data/byg/recipes/wood/holly/slab.json 0621b9364a6d328033e2053fc429244482dfa00f data/byg/recipes/wood/holly/stairs.json 86046c7ccfd2aa099c32b40ed0180fcbe5112b74 data/byg/recipes/wood/holly/trapdoor.json @@ -3219,10 +3318,11 @@ a9c1d8af053d39f6eaf0bad7900520cbf829e71e data/byg/recipes/wood/imparius/bookshel f14e001c77f79df5fc2ba69a2237211512e1a418 data/byg/recipes/wood/imparius/button.json c193ac4b435da0f1dd58c510e0d89d8a07484e78 data/byg/recipes/wood/imparius/crafting_table.json 590de7ea72c32aaf0054aa4f0d55f924bbebfa44 data/byg/recipes/wood/imparius/door.json -cb6c314ed19538182edc68df0201c75ed9ae2576 data/byg/recipes/wood/imparius/fence.json -fda598130e789b7ae529c1bc27e4bdbe27164238 data/byg/recipes/wood/imparius/fence_gate.json +c7209745c248d8a557cfef522d1e3528288abbfe data/byg/recipes/wood/imparius/fence.json +e0d714b999e5726cb81e8a3c2edab0a0370b21ee data/byg/recipes/wood/imparius/fence_gate.json 4e701bf430384fed46f4180d0f4074e5ec4a7265 data/byg/recipes/wood/imparius/planks.json 12e1f28f258a1082813f9dca884af096a9244593 data/byg/recipes/wood/imparius/pressure_plate.json +319f2c33e35fac0637267fcc1978b8b19b0688e2 data/byg/recipes/wood/imparius/sign.json 10860028f3d9b845bb05d85b6d8d7c6e9f3c6419 data/byg/recipes/wood/imparius/slab.json 7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json 67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json @@ -3232,10 +3332,11 @@ f767b1117c2dbd3c215b4d57fe9248255b964e88 data/byg/recipes/wood/jacaranda/bookshe 808323bac21913eaa2fb4ae6f54a91d8ace3fb26 data/byg/recipes/wood/jacaranda/button.json f8b8eb8a0061854626ffc42feddc02ee1ede5738 data/byg/recipes/wood/jacaranda/crafting_table.json 9920e72996e8e36c711d27b67bc743155460656a data/byg/recipes/wood/jacaranda/door.json -8cda82ff065cbac09c43b41373a88479aa206c24 data/byg/recipes/wood/jacaranda/fence.json -24b886a894133dafcfc5a5a48629c14374f6c8c7 data/byg/recipes/wood/jacaranda/fence_gate.json +01ad53eb7c72ea7fdc98c308b9d0b956c5c9ad43 data/byg/recipes/wood/jacaranda/fence.json +13e9194d0abc955c0d74bf59fcd1c298af0283fb data/byg/recipes/wood/jacaranda/fence_gate.json 2016114072e5c68b6e242061fbba0d742234c9a3 data/byg/recipes/wood/jacaranda/planks.json 24c8ca28e1bd2621ebba7005614126bee27a3ed9 data/byg/recipes/wood/jacaranda/pressure_plate.json +e4a069b7dba9340e4b2c79e0631c4ef8a99b8396 data/byg/recipes/wood/jacaranda/sign.json 4f6e33e4604db3fda59343a7f5f529f7d640e4f5 data/byg/recipes/wood/jacaranda/slab.json 22f968a1384eff9b0e2dc6f2c2913f19946f0057 data/byg/recipes/wood/jacaranda/stairs.json fa2f16445640fec9d6f2476fbf9d11636c5742fc data/byg/recipes/wood/jacaranda/trapdoor.json @@ -3244,10 +3345,11 @@ fa2f16445640fec9d6f2476fbf9d11636c5742fc data/byg/recipes/wood/jacaranda/trapdoo 450b8b29ef6d74ee50c8459e1a0baab86b25893b data/byg/recipes/wood/lament/button.json 804b7b6478646d9282f0af35fa3d2d679272b6f3 data/byg/recipes/wood/lament/crafting_table.json b12fad2e730589d29459831f7b8628f7911b0c29 data/byg/recipes/wood/lament/door.json -4d0b6f95902432f614a4fa02591afa860c01abe7 data/byg/recipes/wood/lament/fence.json -b7d2d12aa998660f5017638cb2fd6d22a6be70ab data/byg/recipes/wood/lament/fence_gate.json +0139d9270bf01a1a5443886c31dbcc0061f77c05 data/byg/recipes/wood/lament/fence.json +7e60fef2e3aa29945c9ac298b140a7596598bce5 data/byg/recipes/wood/lament/fence_gate.json 692a2814497aaedfea9746a7ae48eef7981b5c0a data/byg/recipes/wood/lament/planks.json 7f724e794ef82417b257e1c7e598b27f5ca65ede data/byg/recipes/wood/lament/pressure_plate.json +24db50a14232b7731c538ccb3fa3473c5bac5f00 data/byg/recipes/wood/lament/sign.json 71d034e12ad67752a6dcbe6d673afe255d2ed685 data/byg/recipes/wood/lament/slab.json 2a894b5f0b7a5c2db4cc0c14536b244c263aab85 data/byg/recipes/wood/lament/stairs.json e6052e40cf349355523ed97c22b58d894b33dfac data/byg/recipes/wood/lament/trapdoor.json @@ -3257,10 +3359,11 @@ bd227ea44f539c1b70089a8faeab074bf9fb0002 data/byg/recipes/wood/mahogany/bookshel 2c4490731c6f1e34847594539b87684359d4d53b data/byg/recipes/wood/mahogany/button.json f99aaf03fab34e61bd8f80401533330096c678d1 data/byg/recipes/wood/mahogany/crafting_table.json 9b72e81bca8c9eaa1c4de3da15e989dcac9f94a8 data/byg/recipes/wood/mahogany/door.json -59fa3e0dac96a85801d9bf2a872e2efa7f361e97 data/byg/recipes/wood/mahogany/fence.json -fc9ebe68d5750b4789f65567d1aa16c1963819ab data/byg/recipes/wood/mahogany/fence_gate.json +0b2fd7d36a9292ba3354b25a18be8743a448c16d data/byg/recipes/wood/mahogany/fence.json +ae6fa3c01970b40f5a2909b2db21dc29069a3380 data/byg/recipes/wood/mahogany/fence_gate.json 4250e0784fca1d4c65e0f1b34b1142befdc5120e data/byg/recipes/wood/mahogany/planks.json e363352d2c68a4b1555dc3a459f75095f6e5423e data/byg/recipes/wood/mahogany/pressure_plate.json +675f106268e0a754a2a763349ef0e8cde0f39322 data/byg/recipes/wood/mahogany/sign.json a2b8e800096876b7a50eccdda34bc53fbb0c0677 data/byg/recipes/wood/mahogany/slab.json ffebea536d574ddafc22ff1ac4a34332cb35f15e data/byg/recipes/wood/mahogany/stairs.json bbf36d70b55c0251abc6a6adfaef04f0f42366d1 data/byg/recipes/wood/mahogany/trapdoor.json @@ -3270,10 +3373,11 @@ b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshel 7f509ecbf155c4a6d403d6f1629217babec5aa2f data/byg/recipes/wood/mangrove/button.json 6552b958b35161883cee35b51679b8d082343261 data/byg/recipes/wood/mangrove/crafting_table.json 9b526909e767b9fe1d1b0f6b31556626fa6c4c81 data/byg/recipes/wood/mangrove/door.json -122a5dd663fb0e43f7f07289a82b6bb1d8c41654 data/byg/recipes/wood/mangrove/fence.json -9855dfd884fcb8d9cbc3afc7a3b1d408257b6e4d data/byg/recipes/wood/mangrove/fence_gate.json +2e193e1994df461e89927202f4c9da12d9196add data/byg/recipes/wood/mangrove/fence.json +6d058a8ef785a44e63d0f52c6931804ea2665e10 data/byg/recipes/wood/mangrove/fence_gate.json 83e6bb28f9ae4c6eb46f68d5252a1e845d98dbe1 data/byg/recipes/wood/mangrove/planks.json 028d326cde235b07b5c8934cdfe9dbe63c9156fb data/byg/recipes/wood/mangrove/pressure_plate.json +1b894e5091a9a3e715dbb68aa4949a0486997440 data/byg/recipes/wood/mangrove/sign.json 5e501c611ce5205b97fb14abd195ae4a7cbf56b9 data/byg/recipes/wood/mangrove/slab.json 5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json 9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json @@ -3283,10 +3387,11 @@ d796470649d727ee1e163eaa77375ad1b7193c86 data/byg/recipes/wood/maple/bookshelf.j 75f2707b23ede4528b8d4e76d7bdac4edf39231c data/byg/recipes/wood/maple/button.json 377b35f88e1a85b0c71f467c0100911d0d64c6ce data/byg/recipes/wood/maple/crafting_table.json bf5cfa798ad7e708dd16afff436ad8bb0c45d40c data/byg/recipes/wood/maple/door.json -9f077e298edf3d7be1dc035cfb668afe2a7061f5 data/byg/recipes/wood/maple/fence.json -468b815ccb741a89849d14bac728ded7635f3276 data/byg/recipes/wood/maple/fence_gate.json +28029c2996f57185f7d23fb17c8bfbb4e035e32f data/byg/recipes/wood/maple/fence.json +b41602ea8d61156567e1be03f44add7a6e69f8f8 data/byg/recipes/wood/maple/fence_gate.json 7be46c11bac419d1eac8c00db392a8b3f71c3c88 data/byg/recipes/wood/maple/planks.json b12a4b910686e06a3176bc93b7628ace019b25b6 data/byg/recipes/wood/maple/pressure_plate.json +6c1190db81ffdbe7de9ad884e2124c6a0cad3018 data/byg/recipes/wood/maple/sign.json f063860c7a1f68d86917c62eb28233956bb9b508 data/byg/recipes/wood/maple/slab.json b053481f3918d9dbe880b262aa27501676905bac data/byg/recipes/wood/maple/stairs.json e71c7a2b907d8dc2bcd9d44c9a7f06b757d2d19f data/byg/recipes/wood/maple/trapdoor.json @@ -3295,10 +3400,11 @@ e71c7a2b907d8dc2bcd9d44c9a7f06b757d2d19f data/byg/recipes/wood/maple/trapdoor.js fb731632fc441eef65edd773e72759b185c6d866 data/byg/recipes/wood/nightshade/button.json e941f260e96d1c82a0fc2cb9622edd227269733d data/byg/recipes/wood/nightshade/crafting_table.json 9828ab1f9bc4bb53b87c106e4c4bee9989df0764 data/byg/recipes/wood/nightshade/door.json -e413ce280efce5047f7ed98ccd5ba9e0f8c3ca48 data/byg/recipes/wood/nightshade/fence.json -f0f012a31d50cace41599b03166f92e7ceb36bd9 data/byg/recipes/wood/nightshade/fence_gate.json +d21aca548c94397e49321bb9dd4d1a6570372d6a data/byg/recipes/wood/nightshade/fence.json +dfeac9482a6a9d973213b84aadb2f14787cd5f44 data/byg/recipes/wood/nightshade/fence_gate.json 28c71aa583c5cd150bd6962496ec781bac057017 data/byg/recipes/wood/nightshade/planks.json 064a8bbb780dad8b5cf1c4c66cd58e0d2da80eb8 data/byg/recipes/wood/nightshade/pressure_plate.json +268442fe2414863230e306be6c98fb0af8fdbd2a data/byg/recipes/wood/nightshade/sign.json c5c6bb0ccbee4eb60bc9dd7cd8b411346a4b024f data/byg/recipes/wood/nightshade/slab.json afe90f1802908dab650b36cc6d67bfbe15a7117b data/byg/recipes/wood/nightshade/stairs.json e0614498736d2fb02b1b58793ca93c1abca85933 data/byg/recipes/wood/nightshade/trapdoor.json @@ -3308,10 +3414,11 @@ e01f1b1b87ff1f6511f7cc2d1f04f457b96bfb01 data/byg/recipes/wood/palm/bookshelf.js 64410fa72ab5ce643357c3ba80c2cbc2f2d52310 data/byg/recipes/wood/palm/button.json 4690828bbeff88ab7d98224b91caf4bbaed143af data/byg/recipes/wood/palm/crafting_table.json 821de9401aa3f912f0cb9232a3d466550c6afdbd data/byg/recipes/wood/palm/door.json -d6f56b21d8d030c5c0d7259c4012482588bb016e data/byg/recipes/wood/palm/fence.json -183ca9fb9f223dbd21a30c02afb9a364cd821d54 data/byg/recipes/wood/palm/fence_gate.json +963e34105e7674a7faa997d3a2ebe931ed4dc176 data/byg/recipes/wood/palm/fence.json +0221b14cca55e62e4c61c75b69a1d1da6b1d410d data/byg/recipes/wood/palm/fence_gate.json 84c066105d39659d690885a593cc9698fa7fc0e2 data/byg/recipes/wood/palm/planks.json 1c06ed0ee707db44cb23332ee623a07efb2187a7 data/byg/recipes/wood/palm/pressure_plate.json +b549f1cd011a225c119992f1028026910c8b4e1f data/byg/recipes/wood/palm/sign.json e8fd0779a8eb0c996d45f66461d0391fd77b9d13 data/byg/recipes/wood/palm/slab.json 69ac3c83af773a6a3c9edeaf738306320f72f81c data/byg/recipes/wood/palm/stairs.json 6c73f4e9cd248aa03cf2caad2bf3293356429246 data/byg/recipes/wood/palm/trapdoor.json @@ -3321,10 +3428,11 @@ b467b0cee4750a02504e2841f552bb70366c534b data/byg/recipes/wood/pine/bookshelf.js d70141a9e3f6abc78ea5826d4e9079d05e80cbb3 data/byg/recipes/wood/pine/button.json 47d74161d4c0e71724130894f512264e75c0891a data/byg/recipes/wood/pine/crafting_table.json 7fb68840968c00f6bfcf0a86c727b06fa5b21d5e data/byg/recipes/wood/pine/door.json -0a2818245b716a54d048bae968fe0978a5ac5aac data/byg/recipes/wood/pine/fence.json -7550eed2ed6fcf35f19c09f6828ba7b517c51074 data/byg/recipes/wood/pine/fence_gate.json +f4225a3146891b5b4bea6554c0c0179b83177ba0 data/byg/recipes/wood/pine/fence.json +ab2103bf27b9778c7a9b710ddf33bb1ff3d83e05 data/byg/recipes/wood/pine/fence_gate.json cb2f512e683654d888dba39147e7aaddde714747 data/byg/recipes/wood/pine/planks.json aa599d4693145fbe6640eb641a8e6a146aa1979c data/byg/recipes/wood/pine/pressure_plate.json +fddaf7bf350298a7440e627174d9fe160fd0c423 data/byg/recipes/wood/pine/sign.json 52a3c129ef1b5eee710d0c93f1075a76dc3661bc data/byg/recipes/wood/pine/slab.json f8c29c9be3523c673696e74de77789e8e963c913 data/byg/recipes/wood/pine/stairs.json 1633e25a0a403bb814a843fb69091912be0b79dc data/byg/recipes/wood/pine/trapdoor.json @@ -3334,10 +3442,11 @@ cc3bc70c4f94d4fe78810876d6aa3e53666daf6c data/byg/recipes/wood/rainbow_eucalyptu d006ff219554dc0604eba87f187c6bcdd1175292 data/byg/recipes/wood/rainbow_eucalyptus/button.json 6a1569afe56172370459a5e4edc475ac384c6240 data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json 9c321fb29c2cd975b6be0f2ff8089c23fed4a5a3 data/byg/recipes/wood/rainbow_eucalyptus/door.json -c30eed790cfe5039e70d933e3a4b295732094d5c data/byg/recipes/wood/rainbow_eucalyptus/fence.json -ed5e3811254a16559b251aa022b17482acd88dc4 data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json +21a1da70c755a603ae66e22faac545b80d2eb1fd data/byg/recipes/wood/rainbow_eucalyptus/fence.json +2f255f9dae36d7660073351144594a468a32fd1c data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json 15ed565185c7121779d81681d21786827f7da2a9 data/byg/recipes/wood/rainbow_eucalyptus/planks.json b9fc1e92cc85df382bafe5ac98f4aec5be98bb78 data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json +8d8cd5fe36fc3b83130d3d476f86bd51bbdce88f data/byg/recipes/wood/rainbow_eucalyptus/sign.json 2fa6aa1168283859d5c8f6838d63b5fa4cd02637 data/byg/recipes/wood/rainbow_eucalyptus/slab.json bd4f1e62614b1103516a6a14161ca565e6c9239a data/byg/recipes/wood/rainbow_eucalyptus/stairs.json 1d588f35d134aefdde6bd3218c669e2b4f89981d data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json @@ -3347,10 +3456,11 @@ f7a5ae59fa7ed24c1c058c763f1091ec2e4f7781 data/byg/recipes/wood/redwood/bookshelf 22dc47db0d6ff52a8d64533ba0357e0a17a16d97 data/byg/recipes/wood/redwood/button.json d214073ed8a1c702de6a76839e0cf1dd99795f29 data/byg/recipes/wood/redwood/crafting_table.json 8672046a5beeb30c27e0713d4884711af402915d data/byg/recipes/wood/redwood/door.json -8db0cac9701161e68d6136c2a544eeaa50450919 data/byg/recipes/wood/redwood/fence.json -530770b1a0ff8a804ebd3eeca5eae2cbe47c1a25 data/byg/recipes/wood/redwood/fence_gate.json +ba180c9d0b58f541c3e3f85ec7d48636d345f698 data/byg/recipes/wood/redwood/fence.json +d05398798e4eaf23b93cf77dc9061a090930c543 data/byg/recipes/wood/redwood/fence_gate.json 8b57e4a5d837d62b149b51643670eade7e7ef8cc data/byg/recipes/wood/redwood/planks.json a264a4076ca765cfce6f1a4de2c78fb7808bb11e data/byg/recipes/wood/redwood/pressure_plate.json +aa18f3f95adff6cf6b3a45041ccd51ff30e10cdc data/byg/recipes/wood/redwood/sign.json e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json 5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json 87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json @@ -3360,10 +3470,11 @@ e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json b2aa86756f081a02c6c78c00b0a42065a264adf3 data/byg/recipes/wood/skyris/button.json 8728371c728bd571cef555668f5a07675e8d1df4 data/byg/recipes/wood/skyris/crafting_table.json 9208b050275cc74fdfe91c6cb03150907f7d704d data/byg/recipes/wood/skyris/door.json -669aa3c9255a1fc6ff72cf23ad07bdcc81ab249b data/byg/recipes/wood/skyris/fence.json -d696d556a315190ecfa8963a2aaadedb542b5cb0 data/byg/recipes/wood/skyris/fence_gate.json +a4ec1dcf127df7172837ef1bee1c9bdb0ad7504b data/byg/recipes/wood/skyris/fence.json +371fe32cabe87d56d1444c496dc4ac7f1f8e8de1 data/byg/recipes/wood/skyris/fence_gate.json 4f299bdf264590c0546189f4acca5e4c0d898bea data/byg/recipes/wood/skyris/planks.json 102d1f688da4cdb83de4da0e11e8efcc85551d54 data/byg/recipes/wood/skyris/pressure_plate.json +ecb5702ac2f059cdb9fd87a3a362c8f64f97456b data/byg/recipes/wood/skyris/sign.json c0fb8c5f94db8296362f5579e94236fb5ab9a118 data/byg/recipes/wood/skyris/slab.json 4ad1fd1d426c4e72e754936c08811fdb2cd4a96a data/byg/recipes/wood/skyris/stairs.json d2cf8c3c8524cdb3ce6f363aafd50fd989008a03 data/byg/recipes/wood/skyris/trapdoor.json @@ -3372,10 +3483,11 @@ b3572896d593001a84adf0dbb35959fb381aa5bd data/byg/recipes/wood/skyris/wood.json aacccae5dbf9ab6190d494d9321b7af851aef0fc data/byg/recipes/wood/sythian/button.json 7ac944da1dfe8ffcfa39b910be5b8c9a481bd47d data/byg/recipes/wood/sythian/crafting_table.json 7ae2280ffbdb41f6f3297e7caba1868b63a20dd0 data/byg/recipes/wood/sythian/door.json -de5bd13afa0090b9fadd9f3ff8aed61ad7187db5 data/byg/recipes/wood/sythian/fence.json -fef20da37df03ee4d29e91b23ade55d4118a4aa2 data/byg/recipes/wood/sythian/fence_gate.json +bf531484d426261343046c7310828041a9078e9a data/byg/recipes/wood/sythian/fence.json +8b38bc84bbc33290c8172cf95dca816326645e44 data/byg/recipes/wood/sythian/fence_gate.json fd1dcb3bc09c335e9581d95213d3af165744118f data/byg/recipes/wood/sythian/planks.json 51d9e735a6333c2a179a95a9f4563a4db6ffa1af data/byg/recipes/wood/sythian/pressure_plate.json +b18348e306adc9d8393e5bf4009bc6262a8cadca data/byg/recipes/wood/sythian/sign.json 61667e39c7df0009f3c8aa324fea644f4c64dfc9 data/byg/recipes/wood/sythian/slab.json 26cf9803288adde5e8f5a1466c980be751e92be8 data/byg/recipes/wood/sythian/stairs.json 505117e54a49ffef4fc44cc52b3f7a5d790acdcf data/byg/recipes/wood/sythian/trapdoor.json @@ -3385,10 +3497,11 @@ fd1dcb3bc09c335e9581d95213d3af165744118f data/byg/recipes/wood/sythian/planks.js 331708c6a157e1c2b5f43c57e7c65c0b80886e34 data/byg/recipes/wood/willow/button.json a3c68bcafe458a0b2d459cbf8614f0f4d47a5401 data/byg/recipes/wood/willow/crafting_table.json 5e9c71117e0307036ead5af0e2d5729613fb7fc9 data/byg/recipes/wood/willow/door.json -7f2fec1c3c43065f88c5fafaca070e1617afa749 data/byg/recipes/wood/willow/fence.json -f88432533a32bfddee27c824aae37198c6c7b67e data/byg/recipes/wood/willow/fence_gate.json +f47a914611b7529c5377071f20939b2a65ea9c22 data/byg/recipes/wood/willow/fence.json +3cd4de1d963ec741bda482d4b5dcd44230cfa234 data/byg/recipes/wood/willow/fence_gate.json 0725f98b1ad68bf6d8564b1618c6c247b7e80ef8 data/byg/recipes/wood/willow/planks.json 14eeff76c2beb34eaf7d817ba4494c38c84e8bbc data/byg/recipes/wood/willow/pressure_plate.json +0d3e6fa6281ef7fb0adba4e690fefa3f44975ada data/byg/recipes/wood/willow/sign.json cb9a56bb7cdcca02a6936cc3bf47dc65ded746f8 data/byg/recipes/wood/willow/slab.json 3a751748a2b9069d0a425f13056cd7c51e3f8721 data/byg/recipes/wood/willow/stairs.json da344558dd48b0428d760f60d8d47ad0a1cf3d0f data/byg/recipes/wood/willow/trapdoor.json @@ -3398,10 +3511,11 @@ da344558dd48b0428d760f60d8d47ad0a1cf3d0f data/byg/recipes/wood/willow/trapdoor.j e1b3fe1dce1b76bc2f177e84e8ea7db1f2645015 data/byg/recipes/wood/witch_hazel/button.json f3051a1922fe1afeda7d43b1335a90f63f5695d8 data/byg/recipes/wood/witch_hazel/crafting_table.json a7b74ca3edfc8f597f716b644c559d760732e42a data/byg/recipes/wood/witch_hazel/door.json -eb27a528dbcb12b8e5d40a66ef8d2bba046f997a data/byg/recipes/wood/witch_hazel/fence.json -d70e49110b3b8441a2aa0211cd86c6cfad508c2d data/byg/recipes/wood/witch_hazel/fence_gate.json +c33282ee5ba481b99b31418313ef656f7c075b85 data/byg/recipes/wood/witch_hazel/fence.json +746fc180c1010ddfcba9f78bbd46d2b1893678a7 data/byg/recipes/wood/witch_hazel/fence_gate.json d5f8f3331d7268d45e382b896c7664665a7d5dd9 data/byg/recipes/wood/witch_hazel/planks.json a4b642fd4648e4691ab27e6dd2e45f6a9ea10308 data/byg/recipes/wood/witch_hazel/pressure_plate.json +99861c1a3c4887e28bca33bcfc67feaff61aeea4 data/byg/recipes/wood/witch_hazel/sign.json cf423f46d8a554275b125d46fe11589c44b089d7 data/byg/recipes/wood/witch_hazel/slab.json bcb31b82d756d66eaf2ba6ac42175f065f055a6c data/byg/recipes/wood/witch_hazel/stairs.json 3237525986cf267bcebfdec1d9679c7cae8de1f4 data/byg/recipes/wood/witch_hazel/trapdoor.json @@ -3411,10 +3525,11 @@ e3a1b871d0ad4c86097b356c06d343b8d96129fd data/byg/recipes/wood/zelkova/boat.json 34c2d86ebff26218427b83e7a09cf1b6907032d8 data/byg/recipes/wood/zelkova/button.json 83aed9be1c7d230ffa7fca714539021bc495e32a data/byg/recipes/wood/zelkova/crafting_table.json 55f02f16c273e1f3359af8520a422d922905cc11 data/byg/recipes/wood/zelkova/door.json -705b4dd446242ca58f4215dae2de57fbff052c48 data/byg/recipes/wood/zelkova/fence.json -03051c467ed5bee881bc36d6cd047226a5e812a8 data/byg/recipes/wood/zelkova/fence_gate.json +c59f39dbcbf9b3fa97bd56bb8add80ac57e84e12 data/byg/recipes/wood/zelkova/fence.json +984589f81fae2850c89ea079ca42a32e8d2e5626 data/byg/recipes/wood/zelkova/fence_gate.json 1fdf7c8c242c238c0025521a400d69eac31dd289 data/byg/recipes/wood/zelkova/planks.json 2ee988906823ce6d7ba83fd772b693dee61e4089 data/byg/recipes/wood/zelkova/pressure_plate.json +0617be7ca54ee255663658317c7112e65dee6078 data/byg/recipes/wood/zelkova/sign.json 65b4c7eba317fbcc85d56bccf004458b9aae1f6e data/byg/recipes/wood/zelkova/slab.json 5cc3d6c5d4ad75828481945934c82b9b4681d1f1 data/byg/recipes/wood/zelkova/stairs.json 7d1bd145500fbeffd22edc9d35239aa995d48815 data/byg/recipes/wood/zelkova/trapdoor.json @@ -3580,6 +3695,7 @@ a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs. b9ab1582ed849d23d78df79d78211ec07ba14d27 data/byg/tags/entity_types/boats.json fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/items/bookshelves.json ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/items/mushrooms.json +6d49966ebc8bda4c28b7d3305ba9480a5d8ab251 data/byg/tags/items/sticks.json 05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/items/wood/aspen_logs.json fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/items/wood/baobab_logs.json 5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/items/wood/blue_enchanted_logs.json diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index 83c8c12ba7..e009bc34a7 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,75 +19,75 @@ "experience": 1000 }, "criteria": { - "byg:twilight_meadow": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:autumnal_valley" } } }, - "byg:mojave_desert": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:embur_bog" } } }, - "byg:cherry_blossom_forest": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:ebony_woods" } } }, - "byg:crag_gardens": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:amaranth_fields" } } }, - "byg:red_oak_forest": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:nightshade_forest" } } }, - "byg:borealis_grove": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:bulbis_gardens" } } }, - "byg:dacite_ridges": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:temperate_rainforest" } } }, - "byg:sythian_torrids": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:sierra_badlands" } } }, - "byg:magma_wastes": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:zelkova_forest" } } }, @@ -99,211 +99,211 @@ } } }, - "byg:araucaria_savanna": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:black_forest" } } }, - "byg:shattered_glacier": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:orchard" } } }, - "byg:glowstone_gardens": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:weeping_mire" } } }, - "byg:basalt_barrera": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:coconino_meadow" } } }, - "byg:white_mangrove_marshes": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:lush_stacks" } } }, - "byg:ebony_woods": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:ivis_fields" } } }, - "byg:embur_bog": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:viscal_isles" } } }, - "byg:temperate_grove": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:twilight_meadow" } } }, - "byg:howling_peaks": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:allium_fields" } } }, - "byg:prairie": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:warped_desert" } } }, - "byg:weeping_witch_forest": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:magma_wastes" } } }, - "byg:autumnal_valley": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:rose_fields" } } }, - "byg:subzero_hypogeal": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:redwood_thicket" } } }, - "byg:tropical_rainforest": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:tropical_rainforest" + "biome": "byg:atacama_desert" } } }, - "byg:imparius_grove": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:red_rock_valley" } } }, - "byg:frosted_coniferous_forest": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:cypress_swamplands" } } }, - "byg:dacite_shore": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:araucaria_savanna" } } }, - "byg:frosted_taiga": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:bayou" } } }, - "byg:bulbis_gardens": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:baobab_savanna" } } }, - "byg:cryptic_wastes": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:ethereal_islands" } } }, - "byg:maple_taiga": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:skyris_vale" } } }, - "byg:ivis_fields": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:weeping_witch_forest" } } }, - "byg:cypress_swamplands": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:cika_woods": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:subzero_hypogeal" } } }, - "byg:forgotten_forest": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:crimson_gardens" } } }, - "byg:fragment_forest": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:cika_woods" } } }, @@ -315,536 +315,536 @@ } } }, - "byg:amaranth_fields": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:red_oak_forest" } } }, - "byg:temperate_rainforest": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:sythian_torrids" } } }, - "byg:rainbow_beach": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:temperate_grove" } } }, - "byg:weeping_mire": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:canadian_shield" } } }, - "byg:lush_stacks": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:basalt_barrera" } } }, - "byg:guiana_shield": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:forgotten_forest" } } }, - "byg:bayou": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:prairie" } } }, - "byg:dead_sea": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:crag_gardens" } } }, - "byg:shulkren_forest": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:jacaranda_forest" } } }, - "byg:aspen_forest": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:dead_sea" } } }, - "byg:orchard": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:fragment_forest" } } }, - "byg:cardinal_tundra": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:shattered_glacier" } } }, - "byg:red_rock_valley": { + "byg:tropical_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:tropical_rainforest" } } }, - "byg:coniferous_forest": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:cardinal_tundra" } } }, - "byg:allium_fields": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:glowstone_gardens" } } }, - "byg:sierra_badlands": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:dacite_ridges" } } }, - "byg:windswept_beach": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:brimstone_caverns" } } }, - "byg:firecracker_shrubland": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:dacite_shore" } } }, - "byg:ethereal_islands": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:arisian_undergrowth" } } }, - "byg:skyris_vale": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:borealis_grove" } } }, - "byg:atacama_desert": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:aspen_forest" } } }, - "byg:baobab_savanna": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:windswept_desert": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:frosted_taiga" } } }, - "byg:brimstone_caverns": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:guiana_shield" } } }, - "byg:black_forest": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:autumnal_forest" } } }, - "byg:nightshade_forest": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:windswept_beach" } } }, - "byg:viscal_isles": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:mojave_desert" } } }, - "byg:rose_fields": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:coniferous_forest" } } }, - "byg:zelkova_forest": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:maple_taiga" } } }, - "byg:redwood_thicket": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:firecracker_shrubland" } } }, - "byg:jacaranda_forest": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:imparius_grove" } } }, - "byg:crimson_gardens": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:shulkren_forest" } } }, - "byg:quartz_desert": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:rainbow_beach" } } }, - "byg:coconino_meadow": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:warped_desert": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:quartz_desert" } } }, - "byg:canadian_shield": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:windswept_desert" } } }, - "byg:autumnal_forest": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:cryptic_wastes" } } }, - "byg:arisian_undergrowth": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:howling_peaks" } } } }, "requirements": [ [ - "byg:twilight_meadow" + "byg:autumnal_valley" ], [ - "byg:mojave_desert" + "byg:embur_bog" ], [ - "byg:cherry_blossom_forest" + "byg:ebony_woods" ], [ - "byg:crag_gardens" + "byg:amaranth_fields" ], [ - "byg:red_oak_forest" + "byg:nightshade_forest" ], [ - "byg:borealis_grove" + "byg:bulbis_gardens" ], [ - "byg:dacite_ridges" + "byg:temperate_rainforest" ], [ - "byg:sythian_torrids" + "byg:sierra_badlands" ], [ - "byg:magma_wastes" + "byg:zelkova_forest" ], [ "byg:wailing_garth" ], [ - "byg:araucaria_savanna" + "byg:black_forest" ], [ - "byg:shattered_glacier" + "byg:orchard" ], [ - "byg:glowstone_gardens" + "byg:weeping_mire" ], [ - "byg:basalt_barrera" + "byg:coconino_meadow" ], [ - "byg:white_mangrove_marshes" + "byg:lush_stacks" ], [ - "byg:ebony_woods" + "byg:ivis_fields" ], [ - "byg:embur_bog" + "byg:viscal_isles" ], [ - "byg:temperate_grove" + "byg:twilight_meadow" ], [ - "byg:howling_peaks" + "byg:allium_fields" ], [ - "byg:prairie" + "byg:warped_desert" ], [ - "byg:weeping_witch_forest" + "byg:magma_wastes" ], [ - "byg:autumnal_valley" + "byg:rose_fields" ], [ - "byg:subzero_hypogeal" + "byg:redwood_thicket" ], [ - "byg:tropical_rainforest" + "byg:atacama_desert" ], [ - "byg:imparius_grove" + "byg:red_rock_valley" ], [ - "byg:frosted_coniferous_forest" + "byg:cypress_swamplands" ], [ - "byg:dacite_shore" + "byg:araucaria_savanna" ], [ - "byg:frosted_taiga" + "byg:bayou" ], [ - "byg:bulbis_gardens" + "byg:baobab_savanna" ], [ - "byg:cryptic_wastes" + "byg:ethereal_islands" ], [ - "byg:maple_taiga" + "byg:skyris_vale" ], [ - "byg:ivis_fields" + "byg:weeping_witch_forest" ], [ - "byg:cypress_swamplands" + "byg:white_mangrove_marshes" ], [ - "byg:cika_woods" + "byg:subzero_hypogeal" ], [ - "byg:forgotten_forest" + "byg:crimson_gardens" ], [ - "byg:fragment_forest" + "byg:cika_woods" ], [ "byg:autumnal_taiga" ], [ - "byg:amaranth_fields" + "byg:red_oak_forest" ], [ - "byg:temperate_rainforest" + "byg:sythian_torrids" ], [ - "byg:rainbow_beach" + "byg:temperate_grove" ], [ - "byg:weeping_mire" + "byg:canadian_shield" ], [ - "byg:lush_stacks" + "byg:basalt_barrera" ], [ - "byg:guiana_shield" + "byg:forgotten_forest" ], [ - "byg:bayou" + "byg:prairie" ], [ - "byg:dead_sea" + "byg:crag_gardens" ], [ - "byg:shulkren_forest" + "byg:jacaranda_forest" ], [ - "byg:aspen_forest" + "byg:dead_sea" ], [ - "byg:orchard" + "byg:fragment_forest" ], [ - "byg:cardinal_tundra" + "byg:shattered_glacier" ], [ - "byg:red_rock_valley" + "byg:tropical_rainforest" ], [ - "byg:coniferous_forest" + "byg:cardinal_tundra" ], [ - "byg:allium_fields" + "byg:glowstone_gardens" ], [ - "byg:sierra_badlands" + "byg:dacite_ridges" ], [ - "byg:windswept_beach" + "byg:brimstone_caverns" ], [ - "byg:firecracker_shrubland" + "byg:dacite_shore" ], [ - "byg:ethereal_islands" + "byg:arisian_undergrowth" ], [ - "byg:skyris_vale" + "byg:borealis_grove" ], [ - "byg:atacama_desert" + "byg:aspen_forest" ], [ - "byg:baobab_savanna" + "byg:cherry_blossom_forest" ], [ - "byg:windswept_desert" + "byg:frosted_taiga" ], [ - "byg:brimstone_caverns" + "byg:guiana_shield" ], [ - "byg:black_forest" + "byg:autumnal_forest" ], [ - "byg:nightshade_forest" + "byg:windswept_beach" ], [ - "byg:viscal_isles" + "byg:mojave_desert" ], [ - "byg:rose_fields" + "byg:coniferous_forest" ], [ - "byg:zelkova_forest" + "byg:maple_taiga" ], [ - "byg:redwood_thicket" + "byg:firecracker_shrubland" ], [ - "byg:jacaranda_forest" + "byg:imparius_grove" ], [ - "byg:crimson_gardens" + "byg:shulkren_forest" ], [ - "byg:quartz_desert" + "byg:rainbow_beach" ], [ - "byg:coconino_meadow" + "byg:frosted_coniferous_forest" ], [ - "byg:warped_desert" + "byg:quartz_desert" ], [ - "byg:canadian_shield" + "byg:windswept_desert" ], [ - "byg:autumnal_forest" + "byg:cryptic_wastes" ], [ - "byg:arisian_undergrowth" + "byg:howling_peaks" ] ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json new file mode 100644 index 0000000000..98fbccedc5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/aspen/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:aspen_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/aspen/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json new file mode 100644 index 0000000000..5998782530 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/baobab/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:baobab_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/baobab/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json new file mode 100644 index 0000000000..02ba0348ec --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:blue_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/blue_enchanted/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json new file mode 100644 index 0000000000..98e0c8eb25 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/bulbis/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:bulbis_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/bulbis/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json new file mode 100644 index 0000000000..c0406d587b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cherry/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cherry_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cherry/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json new file mode 100644 index 0000000000..29e92f4025 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cika/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cika_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cika/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json new file mode 100644 index 0000000000..d219737f09 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/cypress/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:cypress_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/cypress/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json new file mode 100644 index 0000000000..385530337d --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ebony/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ebony_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ebony/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json new file mode 100644 index 0000000000..762cbf2517 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/embur/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:embur_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/embur/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json new file mode 100644 index 0000000000..6d04f92047 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/ether/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:ether_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/ether/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json new file mode 100644 index 0000000000..1295967d18 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/fir/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:fir_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/fir/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json new file mode 100644 index 0000000000..22e6679c88 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:green_enchanted_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/green_enchanted/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json new file mode 100644 index 0000000000..1f72afcb2f --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/holly/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:holly_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/holly/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json new file mode 100644 index 0000000000..b472565461 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/imparius/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:imparius_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/imparius/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json new file mode 100644 index 0000000000..02ef65cbec --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/jacaranda/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:jacaranda_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/jacaranda/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json new file mode 100644 index 0000000000..adf2dd0085 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/lament/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:lament_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/lament/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json new file mode 100644 index 0000000000..0ccabb4de4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mahogany/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mahogany_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mahogany/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json new file mode 100644 index 0000000000..2b5ad97172 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/mangrove/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:mangrove_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/mangrove/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json new file mode 100644 index 0000000000..8c580f4903 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/maple/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/maple/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json new file mode 100644 index 0000000000..c2d616ec33 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/nightshade/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:nightshade_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/nightshade/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json new file mode 100644 index 0000000000..3c4eb90305 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/palm/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:palm_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/palm/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json new file mode 100644 index 0000000000..b682245a3a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/pine/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:pine_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/pine/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json new file mode 100644 index 0000000000..a3af42d8a0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:rainbow_eucalyptus_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/rainbow_eucalyptus/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json new file mode 100644 index 0000000000..58e9b0b00b --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/redwood/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:redwood_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/redwood/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json new file mode 100644 index 0000000000..9797799da1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/skyris/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:skyris_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/skyris/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json new file mode 100644 index 0000000000..fa1772c49a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/sythian/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:sythian_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/sythian/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json new file mode 100644 index 0000000000..31405ba33a --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/willow/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:willow_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/willow/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json new file mode 100644 index 0000000000..0cd81ced66 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:witch_hazel_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/witch_hazel/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json new file mode 100644 index 0000000000..f3f61c4c73 --- /dev/null +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "byg:wood/zelkova/sign" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "byg:zelkova_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "byg:wood/zelkova/sign" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json new file mode 100644 index 0000000000..adc1e8a8c1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json new file mode 100644 index 0000000000..5ea6f18f8c --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:baobab_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json new file mode 100644 index 0000000000..0405e689b6 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:blue_enchanted_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json new file mode 100644 index 0000000000..f325a6b9ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:bulbis_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json new file mode 100644 index 0000000000..9c74617f03 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cherry_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json new file mode 100644 index 0000000000..b66727782c --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cika_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json new file mode 100644 index 0000000000..0b54261e89 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cypress_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json new file mode 100644 index 0000000000..1321aa0b44 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ebony_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json new file mode 100644 index 0000000000..19c02543a1 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:embur_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json new file mode 100644 index 0000000000..22313eb3e2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ether_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json new file mode 100644 index 0000000000..330f883812 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:fir_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json new file mode 100644 index 0000000000..632b235d28 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:green_enchanted_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json new file mode 100644 index 0000000000..08a6460250 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:holly_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json new file mode 100644 index 0000000000..3c82073471 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:imparius_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json new file mode 100644 index 0000000000..fd9c076181 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:jacaranda_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json new file mode 100644 index 0000000000..b963302826 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:lament_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json new file mode 100644 index 0000000000..9dea5f2e8b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mahogany_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json new file mode 100644 index 0000000000..22ada4159e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mangrove_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json new file mode 100644 index 0000000000..7d13cbfd18 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:maple_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json new file mode 100644 index 0000000000..36800867c7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:nightshade_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json new file mode 100644 index 0000000000..2f2bd4ac2b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:palm_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json new file mode 100644 index 0000000000..bb699b50bc --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:pine_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json new file mode 100644 index 0000000000..e6519d1ed7 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:aspen_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json new file mode 100644 index 0000000000..fd01e1be94 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:baobab_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json new file mode 100644 index 0000000000..65ab2a28fa --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:blue_enchanted_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json new file mode 100644 index 0000000000..11f625be42 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:bulbis_oddity" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json new file mode 100644 index 0000000000..733c36087d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cika_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json new file mode 100644 index 0000000000..36e1c97c80 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:cypress_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json new file mode 100644 index 0000000000..eca2d5f92d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ebony_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json new file mode 100644 index 0000000000..9704c258ff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:embur_wart" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json new file mode 100644 index 0000000000..8349cfd79d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:ether_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json new file mode 100644 index 0000000000..863e53dbc2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:fir_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json new file mode 100644 index 0000000000..aa3f852269 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:green_enchanted_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json new file mode 100644 index 0000000000..f8b99b8c8f --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:holly_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json new file mode 100644 index 0000000000..c82de50d0d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:imparius_mushroom" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json new file mode 100644 index 0000000000..8a3ac1eb62 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:jacaranda_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json new file mode 100644 index 0000000000..e6a84344d2 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:lament_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json new file mode 100644 index 0000000000..bebf2c27f5 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mahogany_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json new file mode 100644 index 0000000000..aec6e5e59d --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:mangrove_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json new file mode 100644 index 0000000000..c0b5268073 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:maple_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json new file mode 100644 index 0000000000..8052a4865b --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:nightshade_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json new file mode 100644 index 0000000000..37a918823a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:palm_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json new file mode 100644 index 0000000000..6371ad2a67 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:pine_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json new file mode 100644 index 0000000000..8e262c8133 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:rainbow_eucalyptus_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json new file mode 100644 index 0000000000..c66a085348 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:redwood_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json new file mode 100644 index 0000000000..e3c43375b4 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:skyris_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json new file mode 100644 index 0000000000..b33f3634d0 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:sythian_fungus" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json new file mode 100644 index 0000000000..dc2c76370a --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:willow_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json new file mode 100644 index 0000000000..d4169e0053 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:witch_hazel_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json new file mode 100644 index 0000000000..8c301c740f --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:zelkova_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json new file mode 100644 index 0000000000..6e9519231e --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:rainbow_eucalyptus_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json new file mode 100644 index 0000000000..ea50d6ed52 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:redwood_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json new file mode 100644 index 0000000000..e11cfe4efb --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:skyris_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json new file mode 100644 index 0000000000..38e5306aff --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:sythian_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json new file mode 100644 index 0000000000..c8ae96a045 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:willow_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json new file mode 100644 index 0000000000..56efd6dd39 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:witch_hazel_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json new file mode 100644 index 0000000000..ce34c4e103 --- /dev/null +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "byg:zelkova_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json index 43db3578c3..50332fcd1d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:aspen_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json index 2803e54133..0ef53cc809 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:aspen_planks" diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json index 2768d31076..cadeb59689 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:aspen_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json index 7850267e20..20280badc0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:baobab_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json index 78c29c1289..aad6c49a12 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:baobab_planks" diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json index 4a029bebf1..a79ecc842d 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:baobab_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json index 61cfef6ef2..384fab2b8d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:blue_enchanted_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json index 9648f48172..712de5810a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:blue_enchanted_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json index 35c972a6cd..153b94654a 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:blue_enchanted_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json index ee3080ea6a..1557b4f241 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:bulbis_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json index 96dc4104c6..df96bf82ba 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:bulbis_planks" diff --git a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json index 31f658e1e0..d9e9f38cf0 100644 --- a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:crimson_sign", + "item": "byg:bulbis_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json index e8350681dc..47fb1c6a95 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cherry_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json index e59013af4e..23a5059940 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cherry_planks" diff --git a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json index b52b983912..07989aa85e 100644 --- a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:crimson_sign", + "item": "byg:cherry_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json index c08b593ce3..d1dc6fa4ac 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cika_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json index b256d10737..822c0c4c3e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cika_planks" diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json index a9ea277a33..c8e14d9a65 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cika_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:cika_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json index 2dd8614b45..c7e1ef43dc 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cypress_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json index a96629912a..6f361cd322 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:cypress_planks" diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json index 071c0ab0cc..64b7edfbd4 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:cypress_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json index ea0982d0db..f4d2e1b255 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:ebony_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json index 59554a626f..bd7cd1c9ec 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:ebony_planks" diff --git a/Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json index b4e8e6fb2c..e8aa38a1b9 100644 --- a/Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:dark_oak_sign", + "item": "byg:ebony_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json index 8793529374..53987691c3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:embur_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json index fa61c3d8fb..b313d74761 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:embur_planks" diff --git a/Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json index ff76b58fc5..c47b18a40e 100644 --- a/Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:embur_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:spruce_sign", + "item": "byg:embur_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json index 9cd77210ff..bebbda77dd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:ether_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json index b094c5f7eb..6367312e92 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:ether_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json index e88a2dd70a..45fc170d49 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:ether_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:ether_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json index e21595e940..44115c0286 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:fir_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json index 33427541d9..55f2835146 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:fir_planks" diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json index ba2a22c1f9..c14b1529e9 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:fir_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:fir_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json index bef7f6de5b..dd86a1c26b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:green_enchanted_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json index a349c298e9..3f40082cd8 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:green_enchanted_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json index 4747352f80..192074ed04 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:green_enchanted_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:green_enchanted_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json index b33d9318c8..78881c3ecd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:holly_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json index b7c78b813d..c5189260d1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:holly_planks" diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json index 92571b2331..fb78047e43 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:holly_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:holly_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json index 12ce4f0a59..b47f501bdd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:imparius_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json index e8b9d64ddc..4ed1004b77 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:imparius_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json new file mode 100644 index 0000000000..727a4d4499 --- /dev/null +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "sign", + "pattern": [ + "PPP", + "PPP", + " S " + ], + "key": { + "P": { + "item": "byg:imparius_planks" + }, + "S": { + "tag": "byg:sticks" + } + }, + "result": { + "item": "byg:imparius_sign", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json index 3b868d16ca..6e0499c128 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:jacaranda_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json index bf5429904c..1557256900 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:jacaranda_planks" diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json index 17e058529a..f9316263fd 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:jacaranda_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json index 3fb8dfd0ea..496a1f32b1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:lament_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json index 18736a369e..d9d2a4fad6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:lament_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json index bf96d7145e..a601c6c441 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:lament_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:lament_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json index 2c801829ba..143bb873b6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:mahogany_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json index 5e2b118710..7d18716e4b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:mahogany_planks" diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json index ad0f0f68f5..565c168b00 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:mahogany_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:mahogany_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json index 10887cb102..30bd460ec1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:mangrove_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json index bd5c9e6084..e1d74e18b0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:mangrove_planks" diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json index cdff2bf8b7..83a8fe19db 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:mangrove_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:mangrove_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json index 11379ab02e..1b1d49454e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:maple_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json index 19a03c72af..23bee3ccd8 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:maple_planks" diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json index 282e066404..bfedeedc9b 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:maple_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:maple_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json index e9de593277..8e5e0b5055 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:nightshade_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json index dd394df919..5c9d1c59a4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:nightshade_planks" diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json index 5615f2d334..f7f3e58f53 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:nightshade_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json index 13f2621288..c500b9125e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:palm_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json index c0557d0571..123b15d266 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:palm_planks" diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json index fafd9c1c7a..132fde1bef 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:palm_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:palm_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json index f3367bab11..2b7254b881 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:pine_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json index 36640e58f1..17b910984c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:pine_planks" diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json index c42fece3cf..fc7824c759 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:pine_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:pine_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json index 937501994c..c921ffbf8c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:rainbow_eucalyptus_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json index a927564569..f10de2ff49 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:rainbow_eucalyptus_planks" diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json index ad9ca29710..29099e8aee 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:rainbow_eucalyptus_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:rainbow_eucalyptus_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json index c6cceed9ec..6e05b96fb6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:redwood_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json index 2b29726f4f..442d397f0f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:redwood_planks" diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json index 8194dbf56b..6533d1e21c 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:redwood_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:redwood_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json index bad6b78fe6..e96480a1c4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:skyris_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json index b617f1c187..52be2c8716 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:skyris_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json index 9935fbbf62..a453d90e91 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:skyris_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json index 987defa062..ef60efc831 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:sythian_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json index d1e1fb446b..223e7ea02b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:sythian_planks" diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json index 9219b38a09..e4c5c35225 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:sythian_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:sythian_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json index 1844792486..37bfdc583f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:willow_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json index 7c00658110..3d9f708db2 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:willow_planks" diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json index 4309f2f837..89ffd00ca0 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:willow_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:willow_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json index 8cb4e5a2c9..186a9d0700 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:witch_hazel_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json index 1c7b065d8d..ac25137f9d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:witch_hazel_planks" diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json index 2c024b2cb1..03edd48a7a 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:witch_hazel_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:witch_hazel_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json index 513fe46e03..901778b61f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:zelkova_planks" diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json index fada05c890..e03978bbee 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "byg:sticks" }, "W": { "item": "byg:zelkova_planks" diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json rename to Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json index 746aa2a2bd..70175a3cc6 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:zelkova_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:zelkova_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/items/sticks.json b/Common/src/generated/resources/data/byg/tags/items/sticks.json new file mode 100644 index 0000000000..ebe34b7fad --- /dev/null +++ b/Common/src/generated/resources/data/byg/tags/items/sticks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:rods/wooden", + "required": false + }, + "minecraft:stick" + ] +} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/aspen_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/aspen_wall_sign.json deleted file mode 100644 index cf3a406557..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/aspen_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/aspen_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/baobab_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/baobab_wall_sign.json deleted file mode 100644 index 372c85deba..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/baobab_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/baobab_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json deleted file mode 100644 index 961aee2ca8..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/blue_enchanted_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/blue_enchanted_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/bulbis_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/bulbis_wall_sign.json deleted file mode 100644 index 955b552855..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/bulbis_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/bulbis_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cherry_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/cherry_wall_sign.json deleted file mode 100644 index b34a8112da..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cherry_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cherry_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cika_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/cika_wall_sign.json deleted file mode 100644 index ba435fa509..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cika_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cika_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/cypress_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/cypress_wall_sign.json deleted file mode 100644 index a8ad044ad7..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/cypress_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/cypress_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ebony_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/ebony_wall_sign.json deleted file mode 100644 index af97b0f997..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ebony_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ebony_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/embur_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/embur_wall_sign.json deleted file mode 100644 index fcab2628fb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/embur_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/embur_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/ether_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/ether_wall_sign.json deleted file mode 100644 index d60f9b8ad3..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/ether_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/ether_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/fir_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/fir_wall_sign.json deleted file mode 100644 index a45293910d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/fir_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/fir_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall_sign.json deleted file mode 100644 index 3eb0680c18..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/green_enchanted_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/green_enchanted_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/holly_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/holly_wall_sign.json deleted file mode 100644 index baa7cc90d5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/holly_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/holly_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/imparius_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/imparius_wall_sign.json deleted file mode 100644 index 58bfac9201..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/imparius_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/imparius_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/jacaranda_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/jacaranda_wall_sign.json deleted file mode 100644 index f048f93437..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/jacaranda_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/jacaranda_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/lament_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/lament_wall_sign.json deleted file mode 100644 index 7df71f11d4..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/lament_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/lament_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mahogany_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/mahogany_wall_sign.json deleted file mode 100644 index ea44cb52f5..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mahogany_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mahogany_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/mangrove_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/mangrove_wall_sign.json deleted file mode 100644 index 2c930a613f..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/mangrove_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/mangrove_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/maple_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/maple_wall_sign.json deleted file mode 100644 index 025be0637e..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/maple_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/maple_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/nightshade_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/nightshade_wall_sign.json deleted file mode 100644 index 8e68ba61bf..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/nightshade_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/nightshade_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/palm_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/palm_wall_sign.json deleted file mode 100644 index 3192397c88..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/palm_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/palm_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/pine_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/pine_wall_sign.json deleted file mode 100644 index 3733bf9691..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/pine_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/pine_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json deleted file mode 100644 index 0797077c1d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/rainbow_eucalyptus_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/redwood_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/redwood_wall_sign.json deleted file mode 100644 index c2262b8961..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/redwood_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/redwood_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/skyris_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/skyris_wall_sign.json deleted file mode 100644 index e53e86826d..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/skyris_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/skyris_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/sythian_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/sythian_wall_sign.json deleted file mode 100644 index bd60a3cb8c..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/sythian_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/sythian_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/willow_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/willow_wall_sign.json deleted file mode 100644 index 44fb26cdcb..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/willow_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/willow_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wall_sign.json deleted file mode 100644 index 4304531e88..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/witch_hazel_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/witch_hazel_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/assets/byg/blockstates/zelkova_wall_sign.json b/Common/src/main/resources/assets/byg/blockstates/zelkova_wall_sign.json deleted file mode 100644 index 33f9785142..0000000000 --- a/Common/src/main/resources/assets/byg/blockstates/zelkova_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "byg:block/zelkova_sign" - } - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json deleted file mode 100644 index ed8d9d0dbb..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:aspen_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json deleted file mode 100644 index 6c402a0b53..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:baobab_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json deleted file mode 100644 index 0513f3007a..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:blue_enchanted_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json deleted file mode 100644 index 41f5b73258..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:bulbis_oddity" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json deleted file mode 100644 index f74bcbda42..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:cika_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json deleted file mode 100644 index 13f0d43a23..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:cypress_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json deleted file mode 100644 index 55a93a0de8..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:ebony_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_embur_wart.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_embur_wart.json deleted file mode 100644 index cf90c8d710..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_embur_wart.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:embur_wart" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json deleted file mode 100644 index 75905dcd2d..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:ether_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json deleted file mode 100644 index d4784e9983..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:fir_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json deleted file mode 100644 index f58e37b9a3..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:green_enchanted_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json deleted file mode 100644 index 63730ae5d8..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:holly_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json deleted file mode 100644 index e8c598702f..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:imparius_mushroom" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json deleted file mode 100644 index 4bede5aff7..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:jacaranda_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json deleted file mode 100644 index f2685fedaa..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:lament_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json deleted file mode 100644 index aefade6794..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:mahogany_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json deleted file mode 100644 index 178f09bc89..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:mangrove_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json deleted file mode 100644 index 1eb097fa60..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:maple_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json deleted file mode 100644 index 26b6292ebf..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:nightshade_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json deleted file mode 100644 index c9635933e7..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:palm_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json deleted file mode 100644 index e8790b8a2f..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:pine_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapli.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapli.json deleted file mode 100644 index 1627640739..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapli.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:rainbow_eucalyptus_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json deleted file mode 100644 index 1627640739..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:rainbow_eucalyptus_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json deleted file mode 100644 index c22f11d5aa..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:redwood_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json deleted file mode 100644 index 24aa2da6c1..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:skyris_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json deleted file mode 100644 index 7d2d899ebb..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:sythian_fungus" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json deleted file mode 100644 index d5b00dc262..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:willow_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json deleted file mode 100644 index 7082c878d8..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:witch_hazel_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json b/Common/src/main/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json deleted file mode 100644 index 8d9b421de1..0000000000 --- a/Common/src/main/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "byg:zelkova_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ], - "type": "minecraft:block" -} \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java index fa4d035e8f..3cff9c7513 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGRecipeProviders.java @@ -124,6 +124,7 @@ protected void buildCraftingRecipes(Consumer consumer) { .pattern(" S ") .define('P', type.planks()) .define('S', BYGItemTags.STICKS) + .unlockedBy("has_planks", has(type.planks())) .save(consumer, BYG.createLocation("wood/" + type + "/sign")); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java index d1e085bce3..f93aec2f04 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java @@ -6,6 +6,8 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import net.minecraftforge.registries.ForgeRegistries; +import potionstudios.byg.BYG; import potionstudios.byg.common.block.BYGWoodTypes; import javax.annotation.Nullable; @@ -38,6 +40,12 @@ protected void addTables() { dropSelf(type.stairs()); dropSelf(type.trapdoor()); dropSelf(type.sign()); + + if (type.growerItem() != null) { + final var growerName = type.growerItem().getId().getPath(); + final var potted = ForgeRegistries.BLOCKS.getValue(BYG.createLocation("potted_" + growerName)); + dropOther(potted, type.growerItem()); + } } } From 0c3b039f0f6ef21aa222ebf4c256e107c6352851 Mon Sep 17 00:00:00 2001 From: matyrobbrt Date: Tue, 7 Jun 2022 21:57:17 +0300 Subject: [PATCH 79/90] (1.18.X) Sign Recipes (#800) * Remove old sign recipes * Add new sign recipes * Add sticks tag --- ...from_aspen_planks.json => aspen_sign.json} | 15 ++++++------- ...om_baobab_planks.json => baobab_sign.json} | 15 ++++++------- ...d_planks.json => blue_enchanted_sign.json} | 15 ++++++------- ...om_bulbis_planks.json => bulbis_sign.json} | 15 ++++++------- ...om_cherry_planks.json => cherry_sign.json} | 15 ++++++------- ...n_from_cika_planks.json => cika_sign.json} | 15 ++++++------- ..._cypress_planks.json => cypress_sign.json} | 15 ++++++------- ...from_ebony_planks.json => ebony_sign.json} | 15 ++++++------- ...from_embur_planks.json => embur_sign.json} | 15 ++++++------- ...from_ether_planks.json => ether_sign.json} | 15 ++++++------- ...ign_from_fir_planks.json => fir_sign.json} | 15 ++++++------- ..._planks.json => green_enchanted_sign.json} | 15 ++++++------- ...from_holly_planks.json => holly_sign.json} | 15 ++++++------- .../data/byg/recipes/imparius_sign.json | 21 +++++++++++++++++++ ...aranda_planks.json => jacaranda_sign.json} | 15 ++++++------- ..._imparius_planks.json => lament_sign.json} | 15 ++++++------- ...ahogany_planks.json => mahogany_sign.json} | 15 ++++++------- ...angrove_planks.json => mangrove_sign.json} | 15 ++++++------- ...from_maple_planks.json => maple_sign.json} | 15 ++++++------- ...shade_planks.json => nightshade_sign.json} | 15 ++++++------- ...n_from_palm_planks.json => palm_sign.json} | 15 ++++++------- ...n_from_pine_planks.json => pine_sign.json} | 15 ++++++------- ...anks.json => rainbow_eucalyptus_sign.json} | 15 ++++++------- ..._redwood_planks.json => redwood_sign.json} | 15 ++++++------- ...om_skyris_planks.json => skyris_sign.json} | 15 ++++++------- ..._sythian_planks.json => sythian_sign.json} | 15 ++++++------- ...om_willow_planks.json => willow_sign.json} | 15 ++++++------- ...azel_planks.json => witch_hazel_sign.json} | 15 ++++++------- ..._zelkova_planks.json => zelkova_sign.json} | 15 ++++++------- .../resources/data/byg/tags/items/sticks.json | 10 +++++++++ 30 files changed, 255 insertions(+), 196 deletions(-) rename Common/src/main/resources/data/byg/recipes/{birch_sign_from_aspen_planks.json => aspen_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{acacia_sign_from_baobab_planks.json => baobab_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_blue_enchanted_planks.json => blue_enchanted_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{crimson_sign_from_bulbis_planks.json => bulbis_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{crimson_sign_from_cherry_planks.json => cherry_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{acacia_sign_from_cika_planks.json => cika_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{birch_sign_from_cypress_planks.json => cypress_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{dark_oak_sign_from_ebony_planks.json => ebony_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{spruce_sign_from_embur_planks.json => embur_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_ether_planks.json => ether_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{oak_sign_from_fir_planks.json => fir_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_green_enchanted_planks.json => green_enchanted_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{oak_sign_from_holly_planks.json => holly_sign.json} (54%) create mode 100644 Common/src/main/resources/data/byg/recipes/imparius_sign.json rename Common/src/main/resources/data/byg/recipes/{jungle_sign_from_jacaranda_planks.json => jacaranda_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_imparius_planks.json => lament_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{jungle_sign_from_mahogany_planks.json => mahogany_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{birch_sign_from_mangrove_planks.json => mangrove_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{acacia_sign_from_maple_planks.json => maple_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{jungle_sign_from_nightshade_planks.json => nightshade_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{acacia_sign_from_palm_planks.json => palm_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{oak_sign_from_pine_planks.json => pine_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{oak_sign_from_rainbow_eucalyptus_planks.json => rainbow_eucalyptus_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{acacia_sign_from_redwood_planks.json => redwood_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_skyris_planks.json => skyris_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{birch_sign_from_sythian_planks.json => sythian_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{oak_sign_from_willow_planks.json => willow_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{warped_sign_from_witch_hazel_planks.json => witch_hazel_sign.json} (54%) rename Common/src/main/resources/data/byg/recipes/{jungle_sign_from_zelkova_planks.json => zelkova_sign.json} (54%) create mode 100644 Common/src/main/resources/data/byg/tags/items/sticks.json diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json b/Common/src/main/resources/data/byg/recipes/aspen_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json rename to Common/src/main/resources/data/byg/recipes/aspen_sign.json index 2768d31076..cadeb59689 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_aspen_planks.json +++ b/Common/src/main/resources/data/byg/recipes/aspen_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:aspen_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:aspen_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json b/Common/src/main/resources/data/byg/recipes/baobab_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json rename to Common/src/main/resources/data/byg/recipes/baobab_sign.json index 4a029bebf1..a79ecc842d 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_baobab_planks.json +++ b/Common/src/main/resources/data/byg/recipes/baobab_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:baobab_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:baobab_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json b/Common/src/main/resources/data/byg/recipes/blue_enchanted_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json rename to Common/src/main/resources/data/byg/recipes/blue_enchanted_sign.json index 35c972a6cd..153b94654a 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_blue_enchanted_planks.json +++ b/Common/src/main/resources/data/byg/recipes/blue_enchanted_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:blue_enchanted_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:blue_enchanted_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json b/Common/src/main/resources/data/byg/recipes/bulbis_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json rename to Common/src/main/resources/data/byg/recipes/bulbis_sign.json index 31f658e1e0..d9e9f38cf0 100644 --- a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_bulbis_planks.json +++ b/Common/src/main/resources/data/byg/recipes/bulbis_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:bulbis_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:crimson_sign", + "item": "byg:bulbis_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json b/Common/src/main/resources/data/byg/recipes/cherry_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json rename to Common/src/main/resources/data/byg/recipes/cherry_sign.json index b52b983912..07989aa85e 100644 --- a/Common/src/main/resources/data/byg/recipes/crimson_sign_from_cherry_planks.json +++ b/Common/src/main/resources/data/byg/recipes/cherry_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cherry_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:crimson_sign", + "item": "byg:cherry_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json b/Common/src/main/resources/data/byg/recipes/cika_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json rename to Common/src/main/resources/data/byg/recipes/cika_sign.json index a9ea277a33..c8e14d9a65 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_cika_planks.json +++ b/Common/src/main/resources/data/byg/recipes/cika_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cika_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:cika_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json b/Common/src/main/resources/data/byg/recipes/cypress_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json rename to Common/src/main/resources/data/byg/recipes/cypress_sign.json index 071c0ab0cc..64b7edfbd4 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_cypress_planks.json +++ b/Common/src/main/resources/data/byg/recipes/cypress_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:cypress_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:cypress_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json b/Common/src/main/resources/data/byg/recipes/ebony_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json rename to Common/src/main/resources/data/byg/recipes/ebony_sign.json index b4e8e6fb2c..e8aa38a1b9 100644 --- a/Common/src/main/resources/data/byg/recipes/dark_oak_sign_from_ebony_planks.json +++ b/Common/src/main/resources/data/byg/recipes/ebony_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:ebony_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:dark_oak_sign", + "item": "byg:ebony_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json b/Common/src/main/resources/data/byg/recipes/embur_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json rename to Common/src/main/resources/data/byg/recipes/embur_sign.json index ff76b58fc5..c47b18a40e 100644 --- a/Common/src/main/resources/data/byg/recipes/spruce_sign_from_embur_planks.json +++ b/Common/src/main/resources/data/byg/recipes/embur_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:embur_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:spruce_sign", + "item": "byg:embur_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json b/Common/src/main/resources/data/byg/recipes/ether_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json rename to Common/src/main/resources/data/byg/recipes/ether_sign.json index e88a2dd70a..45fc170d49 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_ether_planks.json +++ b/Common/src/main/resources/data/byg/recipes/ether_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:ether_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:ether_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json b/Common/src/main/resources/data/byg/recipes/fir_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json rename to Common/src/main/resources/data/byg/recipes/fir_sign.json index ba2a22c1f9..c14b1529e9 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_fir_planks.json +++ b/Common/src/main/resources/data/byg/recipes/fir_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:fir_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:fir_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json b/Common/src/main/resources/data/byg/recipes/green_enchanted_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json rename to Common/src/main/resources/data/byg/recipes/green_enchanted_sign.json index 4747352f80..192074ed04 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_green_enchanted_planks.json +++ b/Common/src/main/resources/data/byg/recipes/green_enchanted_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:green_enchanted_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:green_enchanted_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json b/Common/src/main/resources/data/byg/recipes/holly_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json rename to Common/src/main/resources/data/byg/recipes/holly_sign.json index 92571b2331..fb78047e43 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_holly_planks.json +++ b/Common/src/main/resources/data/byg/recipes/holly_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:holly_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:holly_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/imparius_sign.json b/Common/src/main/resources/data/byg/recipes/imparius_sign.json new file mode 100644 index 0000000000..727a4d4499 --- /dev/null +++ b/Common/src/main/resources/data/byg/recipes/imparius_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "sign", + "pattern": [ + "PPP", + "PPP", + " S " + ], + "key": { + "P": { + "item": "byg:imparius_planks" + }, + "S": { + "tag": "byg:sticks" + } + }, + "result": { + "item": "byg:imparius_sign", + "count": 3 + } +} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json b/Common/src/main/resources/data/byg/recipes/jacaranda_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json rename to Common/src/main/resources/data/byg/recipes/jacaranda_sign.json index 17e058529a..f9316263fd 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_jacaranda_planks.json +++ b/Common/src/main/resources/data/byg/recipes/jacaranda_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:jacaranda_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:jacaranda_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json b/Common/src/main/resources/data/byg/recipes/lament_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json rename to Common/src/main/resources/data/byg/recipes/lament_sign.json index bf96d7145e..a601c6c441 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_imparius_planks.json +++ b/Common/src/main/resources/data/byg/recipes/lament_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:lament_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:lament_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json b/Common/src/main/resources/data/byg/recipes/mahogany_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json rename to Common/src/main/resources/data/byg/recipes/mahogany_sign.json index ad0f0f68f5..565c168b00 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_mahogany_planks.json +++ b/Common/src/main/resources/data/byg/recipes/mahogany_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:mahogany_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:mahogany_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json b/Common/src/main/resources/data/byg/recipes/mangrove_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json rename to Common/src/main/resources/data/byg/recipes/mangrove_sign.json index cdff2bf8b7..83a8fe19db 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_mangrove_planks.json +++ b/Common/src/main/resources/data/byg/recipes/mangrove_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:mangrove_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:mangrove_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json b/Common/src/main/resources/data/byg/recipes/maple_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json rename to Common/src/main/resources/data/byg/recipes/maple_sign.json index 282e066404..bfedeedc9b 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_maple_planks.json +++ b/Common/src/main/resources/data/byg/recipes/maple_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:maple_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:maple_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json b/Common/src/main/resources/data/byg/recipes/nightshade_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json rename to Common/src/main/resources/data/byg/recipes/nightshade_sign.json index 5615f2d334..f7f3e58f53 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_nightshade_planks.json +++ b/Common/src/main/resources/data/byg/recipes/nightshade_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:nightshade_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:nightshade_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json b/Common/src/main/resources/data/byg/recipes/palm_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json rename to Common/src/main/resources/data/byg/recipes/palm_sign.json index fafd9c1c7a..132fde1bef 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_palm_planks.json +++ b/Common/src/main/resources/data/byg/recipes/palm_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:palm_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:palm_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json b/Common/src/main/resources/data/byg/recipes/pine_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json rename to Common/src/main/resources/data/byg/recipes/pine_sign.json index c42fece3cf..fc7824c759 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_pine_planks.json +++ b/Common/src/main/resources/data/byg/recipes/pine_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:pine_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:pine_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json rename to Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json index ad9ca29710..29099e8aee 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_rainbow_eucalyptus_planks.json +++ b/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:rainbow_eucalyptus_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:rainbow_eucalyptus_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json b/Common/src/main/resources/data/byg/recipes/redwood_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json rename to Common/src/main/resources/data/byg/recipes/redwood_sign.json index 8194dbf56b..6533d1e21c 100644 --- a/Common/src/main/resources/data/byg/recipes/acacia_sign_from_redwood_planks.json +++ b/Common/src/main/resources/data/byg/recipes/redwood_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:redwood_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:acacia_sign", + "item": "byg:redwood_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json b/Common/src/main/resources/data/byg/recipes/skyris_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json rename to Common/src/main/resources/data/byg/recipes/skyris_sign.json index 9935fbbf62..a453d90e91 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_skyris_planks.json +++ b/Common/src/main/resources/data/byg/recipes/skyris_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:skyris_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:skyris_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json b/Common/src/main/resources/data/byg/recipes/sythian_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json rename to Common/src/main/resources/data/byg/recipes/sythian_sign.json index 9219b38a09..e4c5c35225 100644 --- a/Common/src/main/resources/data/byg/recipes/birch_sign_from_sythian_planks.json +++ b/Common/src/main/resources/data/byg/recipes/sythian_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:sythian_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:birch_sign", + "item": "byg:sythian_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json b/Common/src/main/resources/data/byg/recipes/willow_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json rename to Common/src/main/resources/data/byg/recipes/willow_sign.json index 4309f2f837..89ffd00ca0 100644 --- a/Common/src/main/resources/data/byg/recipes/oak_sign_from_willow_planks.json +++ b/Common/src/main/resources/data/byg/recipes/willow_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:willow_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:oak_sign", + "item": "byg:willow_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json b/Common/src/main/resources/data/byg/recipes/witch_hazel_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json rename to Common/src/main/resources/data/byg/recipes/witch_hazel_sign.json index 2c024b2cb1..03edd48a7a 100644 --- a/Common/src/main/resources/data/byg/recipes/warped_sign_from_witch_hazel_planks.json +++ b/Common/src/main/resources/data/byg/recipes/witch_hazel_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:witch_hazel_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:warped_sign", + "item": "byg:witch_hazel_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json b/Common/src/main/resources/data/byg/recipes/zelkova_sign.json similarity index 54% rename from Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json rename to Common/src/main/resources/data/byg/recipes/zelkova_sign.json index 746aa2a2bd..70175a3cc6 100644 --- a/Common/src/main/resources/data/byg/recipes/jungle_sign_from_zelkova_planks.json +++ b/Common/src/main/resources/data/byg/recipes/zelkova_sign.json @@ -1,20 +1,21 @@ { "type": "minecraft:crafting_shaped", + "group": "sign", "pattern": [ - "###", - "###", - " X " + "PPP", + "PPP", + " S " ], "key": { - "#": { + "P": { "item": "byg:zelkova_planks" }, - "X": { - "item": "minecraft:stick" + "S": { + "tag": "byg:sticks" } }, "result": { - "item": "minecraft:jungle_sign", + "item": "byg:zelkova_sign", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/sticks.json b/Common/src/main/resources/data/byg/tags/items/sticks.json new file mode 100644 index 0000000000..ebe34b7fad --- /dev/null +++ b/Common/src/main/resources/data/byg/tags/items/sticks.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:rods/wooden", + "required": false + }, + "minecraft:stick" + ] +} \ No newline at end of file From dd2260d24fad0daf286e99fbf36b3e5469e01399 Mon Sep 17 00:00:00 2001 From: AOCAWOL Date: Tue, 7 Jun 2022 12:00:47 -0700 Subject: [PATCH 80/90] -Added missing fir sign texture --- .../assets/byg/textures/item/fir_sign.png | Bin 0 -> 251 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Common/src/main/resources/assets/byg/textures/item/fir_sign.png diff --git a/Common/src/main/resources/assets/byg/textures/item/fir_sign.png b/Common/src/main/resources/assets/byg/textures/item/fir_sign.png new file mode 100644 index 0000000000000000000000000000000000000000..15cf99fbc7a104a0a32e16177704e6ec97bb30e9 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oP5n9ZOM|~;ARCAm{POv4@Yfbz3+F8u>ioFzei!T+Iv zA=tk{2qakG5n0T@z;_UY8Fx&~ehU-~@pN$v(Fkts4&*vuz~StBmdKI;Vst02H!R;Q#;t literal 0 HcmV?d00001 From b2185abf6894825100c0705caa0b7afe1c99346b Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 22:17:07 +0300 Subject: [PATCH 81/90] Revert "Merge upstream" This reverts commit 56708a6f1e0ac571e9a30da12aedaa7491addfad, reversing changes made to 080cca936fb485ca712cf28aedb20b78e70dda57. --- .../data/byg/recipes/wood/aspen/sign.json} | 0 .../data/byg/recipes/wood/baobab/sign.json} | 0 .../recipes/wood/blue_enchanted/sign.json} | 0 .../data/byg/recipes/wood/bulbis/sign.json} | 0 .../data/byg/recipes/wood/cherry/sign.json} | 0 .../data/byg/recipes/wood/cika/sign.json} | 0 .../data/byg/recipes/wood/cypress/sign.json} | 0 .../data/byg/recipes/wood/ebony/sign.json} | 0 .../data/byg/recipes/wood/embur/sign.json} | 0 .../data/byg/recipes/wood/ether/sign.json} | 0 .../data/byg/recipes/wood/fir/sign.json} | 0 .../recipes/wood/green_enchanted/sign.json} | 0 .../data/byg/recipes/wood/holly/sign.json} | 0 .../byg/recipes/wood/jacaranda/sign.json} | 0 .../data/byg/recipes/wood/lament/sign.json} | 0 .../data/byg/recipes/wood/mahogany/sign.json} | 0 .../data/byg/recipes/wood/mangrove/sign.json} | 0 .../data/byg/recipes/wood/maple/sign.json} | 0 .../byg/recipes/wood/nightshade/sign.json} | 0 .../data/byg/recipes/wood/palm/sign.json} | 0 .../data/byg/recipes/wood/pine/sign.json} | 0 .../wood/rainbow_eucalyptus/door.json} | 13 +++++------ .../data/byg/recipes/wood/redwood/sign.json} | 0 .../data/byg/recipes/wood/skyris/sign.json} | 0 .../data/byg/recipes/wood/sythian/sign.json} | 0 .../data/byg/recipes/wood/willow/sign.json} | 0 .../byg/recipes/wood/witch_hazel/sign.json} | 0 .../data/byg/recipes/wood/zelkova/sign.json} | 0 .../assets/byg/textures/item/fir_sign.png | Bin 251 -> 0 bytes .../data/byg/recipes/imparius_sign.json | 21 ------------------ .../resources/data/byg/tags/items/sticks.json | 10 --------- 31 files changed, 5 insertions(+), 39 deletions(-) rename Common/src/{main/resources/data/byg/recipes/aspen_sign.json => generated/resources/data/byg/recipes/wood/aspen/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/baobab_sign.json => generated/resources/data/byg/recipes/wood/baobab/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/blue_enchanted_sign.json => generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/bulbis_sign.json => generated/resources/data/byg/recipes/wood/bulbis/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cherry_sign.json => generated/resources/data/byg/recipes/wood/cherry/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cika_sign.json => generated/resources/data/byg/recipes/wood/cika/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/cypress_sign.json => generated/resources/data/byg/recipes/wood/cypress/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/ebony_sign.json => generated/resources/data/byg/recipes/wood/ebony/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/embur_sign.json => generated/resources/data/byg/recipes/wood/embur/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/ether_sign.json => generated/resources/data/byg/recipes/wood/ether/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/fir_sign.json => generated/resources/data/byg/recipes/wood/fir/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/green_enchanted_sign.json => generated/resources/data/byg/recipes/wood/green_enchanted/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/holly_sign.json => generated/resources/data/byg/recipes/wood/holly/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/jacaranda_sign.json => generated/resources/data/byg/recipes/wood/jacaranda/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/lament_sign.json => generated/resources/data/byg/recipes/wood/lament/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/mahogany_sign.json => generated/resources/data/byg/recipes/wood/mahogany/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/mangrove_sign.json => generated/resources/data/byg/recipes/wood/mangrove/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/maple_sign.json => generated/resources/data/byg/recipes/wood/maple/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/nightshade_sign.json => generated/resources/data/byg/recipes/wood/nightshade/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/palm_sign.json => generated/resources/data/byg/recipes/wood/palm/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/pine_sign.json => generated/resources/data/byg/recipes/wood/pine/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json => generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json} (55%) rename Common/src/{main/resources/data/byg/recipes/redwood_sign.json => generated/resources/data/byg/recipes/wood/redwood/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/skyris_sign.json => generated/resources/data/byg/recipes/wood/skyris/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/sythian_sign.json => generated/resources/data/byg/recipes/wood/sythian/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/willow_sign.json => generated/resources/data/byg/recipes/wood/willow/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/witch_hazel_sign.json => generated/resources/data/byg/recipes/wood/witch_hazel/sign.json} (100%) rename Common/src/{main/resources/data/byg/recipes/zelkova_sign.json => generated/resources/data/byg/recipes/wood/zelkova/sign.json} (100%) delete mode 100644 Common/src/main/resources/assets/byg/textures/item/fir_sign.png delete mode 100644 Common/src/main/resources/data/byg/recipes/imparius_sign.json delete mode 100644 Common/src/main/resources/data/byg/tags/items/sticks.json diff --git a/Common/src/main/resources/data/byg/recipes/aspen_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/aspen_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/baobab_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/baobab_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/blue_enchanted_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/blue_enchanted_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/bulbis_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/bulbis_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/cherry_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cherry_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/cika_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cika_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/cypress_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/cypress_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/ebony_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/ebony_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/embur_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/embur_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/ether_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/ether_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/fir_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/fir_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/green_enchanted_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/green_enchanted_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/holly_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/holly_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/jacaranda_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/jacaranda_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/lament_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/lament_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/mahogany_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/mahogany_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/mangrove_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/mangrove_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/maple_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/maple_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/nightshade_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/nightshade_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/palm_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/palm_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/pine_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/pine_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json similarity index 55% rename from Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json index 29099e8aee..ef3a25cbb7 100644 --- a/Common/src/main/resources/data/byg/recipes/rainbow_eucalyptus_sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json @@ -1,21 +1,18 @@ { "type": "minecraft:crafting_shaped", - "group": "sign", + "group": "wooden_door", "pattern": [ - "PPP", - "PPP", - " S " + "PP", + "PP", + "PP" ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" - }, - "S": { - "tag": "byg:sticks" } }, "result": { - "item": "byg:rainbow_eucalyptus_sign", + "item": "byg:rainbow_eucalyptus_door", "count": 3 } } \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/recipes/redwood_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/redwood_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/skyris_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/skyris_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/sythian_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/sythian_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/willow_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/willow_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/witch_hazel_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/witch_hazel_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json diff --git a/Common/src/main/resources/data/byg/recipes/zelkova_sign.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json similarity index 100% rename from Common/src/main/resources/data/byg/recipes/zelkova_sign.json rename to Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json diff --git a/Common/src/main/resources/assets/byg/textures/item/fir_sign.png b/Common/src/main/resources/assets/byg/textures/item/fir_sign.png deleted file mode 100644 index 15cf99fbc7a104a0a32e16177704e6ec97bb30e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|-oP5n9ZOM|~;ARCAm{POv4@Yfbz3+F8u>ioFzei!T+Iv zA=tk{2qakG5n0T@z;_UY8Fx&~ehU-~@pN$v(Fkts4&*vuz~StBmdKI;Vst02H!R;Q#;t diff --git a/Common/src/main/resources/data/byg/recipes/imparius_sign.json b/Common/src/main/resources/data/byg/recipes/imparius_sign.json deleted file mode 100644 index 727a4d4499..0000000000 --- a/Common/src/main/resources/data/byg/recipes/imparius_sign.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], - "key": { - "P": { - "item": "byg:imparius_planks" - }, - "S": { - "tag": "byg:sticks" - } - }, - "result": { - "item": "byg:imparius_sign", - "count": 3 - } -} \ No newline at end of file diff --git a/Common/src/main/resources/data/byg/tags/items/sticks.json b/Common/src/main/resources/data/byg/tags/items/sticks.json deleted file mode 100644 index ebe34b7fad..0000000000 --- a/Common/src/main/resources/data/byg/tags/items/sticks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "#forge:rods/wooden", - "required": false - }, - "minecraft:stick" - ] -} \ No newline at end of file From d2f046987661f42c78ff31d00d6a7b1393aed276 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 22:17:26 +0300 Subject: [PATCH 82/90] Update sign.png --- .../assets/byg/textures/item/fir/sign.png | Bin 251 -> 251 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Common/src/main/resources/assets/byg/textures/item/fir/sign.png b/Common/src/main/resources/assets/byg/textures/item/fir/sign.png index 608d6eb2f791c55706c82cc9b9230462a4c3a97d..15cf99fbc7a104a0a32e16177704e6ec97bb30e9 100644 GIT binary patch delta 20 ccmey(_?vM;E7w5=2EK!gJ0@noo!FlP09kPe)&Kwi delta 20 bcmey(_?vM;E7u_g2EId#q8eTe6Z>-jP(uek From bdf21a06934764683a48f073829dc8a04879d457 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 7 Jun 2022 22:26:34 +0300 Subject: [PATCH 83/90] Re-add flower pot --- Common/src/generated/resources/.cache/cache | 58 +-- .../adventure/oh_the_biomes_youll_go.json | 444 +++++++++--------- .../blocks/potted_aspen_sapling.json | 15 + .../blocks/potted_baobab_sapling.json | 15 + .../blocks/potted_blue_enchanted_sapling.json | 15 + .../blocks/potted_bulbis_oddity.json | 15 + .../blocks/potted_cika_sapling.json | 15 + .../blocks/potted_cypress_sapling.json | 15 + .../blocks/potted_ebony_sapling.json | 15 + .../loot_tables/blocks/potted_embur_wart.json | 15 + .../blocks/potted_ether_sapling.json | 15 + .../blocks/potted_fir_sapling.json | 15 + .../potted_green_enchanted_sapling.json | 15 + .../blocks/potted_holly_sapling.json | 15 + .../blocks/potted_imparius_mushroom.json | 15 + .../blocks/potted_jacaranda_sapling.json | 15 + .../blocks/potted_lament_sapling.json | 15 + .../blocks/potted_mahogany_sapling.json | 15 + .../blocks/potted_mangrove_sapling.json | 15 + .../blocks/potted_maple_sapling.json | 15 + .../blocks/potted_nightshade_sapling.json | 15 + .../blocks/potted_palm_sapling.json | 15 + .../blocks/potted_pine_sapling.json | 15 + .../potted_rainbow_eucalyptus_sapling.json | 15 + .../blocks/potted_redwood_sapling.json | 15 + .../blocks/potted_skyris_sapling.json | 15 + .../blocks/potted_sythian_fungus.json | 15 + .../blocks/potted_willow_sapling.json | 15 + .../blocks/potted_witch_hazel_sapling.json | 15 + .../blocks/potted_zelkova_sapling.json | 15 + .../providers/loot/BYGBlockLootProvider.java | 10 +- 31 files changed, 680 insertions(+), 252 deletions(-) diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache index cf345eb0e9..29cea9017f 100644 --- a/Common/src/generated/resources/.cache/cache +++ b/Common/src/generated/resources/.cache/cache @@ -2140,7 +2140,7 @@ d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.jso 7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json 5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -a1f6f4c765911900e5b5b785ba571df5ee55bb84 data/byg/advancements/adventure/oh_the_biomes_youll_go.json +d38ed1ea9db48a72020b2d9c62a9b7f78abc00f0 data/byg/advancements/adventure/oh_the_biomes_youll_go.json 088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json @@ -2895,34 +2895,34 @@ be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/pine_saplin 860beef877197883976c86ec033f813b36e0034d data/byg/loot_tables/blocks/pine_stairs.json e57c157b678cbcc65bccfeaff51cf9a9a245bb49 data/byg/loot_tables/blocks/pine_trapdoor.json 02043c8d0cef3c0a6a6bdb8c04aa8a83a6660e84 data/byg/loot_tables/blocks/pine_wood.json -cb535913fb27b9190af7a197a5e345f95c083b24 data/byg/loot_tables/blocks/potted_aspen_sapling.json -392c1803655bfa041bdd488fefad7f7dc925262e data/byg/loot_tables/blocks/potted_baobab_sapling.json -06442c880a0b922e24291c50238e20081777d6db data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json -4c0eb782a74bcb2a98ce447a26d1edc80879655e data/byg/loot_tables/blocks/potted_bulbis_oddity.json -a735c30655c5dc36796e43ce854009662e7addb0 data/byg/loot_tables/blocks/potted_cika_sapling.json -e26bb6c61c1d9f981c95c5836766fbc2a7abc7f9 data/byg/loot_tables/blocks/potted_cypress_sapling.json -75baaf6d65cdf78c0661fb3169740e0b970cfb65 data/byg/loot_tables/blocks/potted_ebony_sapling.json -05cc992603c03a862cc8bac30ab3f477d8edcc24 data/byg/loot_tables/blocks/potted_embur_wart.json -e161bb580cd8ef6eb2908e07accd0ac52b1e7fda data/byg/loot_tables/blocks/potted_ether_sapling.json -f95ff7bec8df583ed0e3549aa19629709cfc1670 data/byg/loot_tables/blocks/potted_fir_sapling.json -a94f96a5a606d0d16c0de9804f33fb6e7dfef249 data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json -269bff7d19dc9a2cabc96079686f8304d14f797f data/byg/loot_tables/blocks/potted_holly_sapling.json -241b5c3b79acc99ef8861e9a9faf9283cdfc6dec data/byg/loot_tables/blocks/potted_imparius_mushroom.json -1139c74e917034b1281960e0ca28ac1d88e57096 data/byg/loot_tables/blocks/potted_jacaranda_sapling.json -abf4374f97c63c84c1ddca0bcb57d6208404a382 data/byg/loot_tables/blocks/potted_lament_sapling.json -729663427e10d094a9ecc8b6af2d6f1bc0c73a4e data/byg/loot_tables/blocks/potted_mahogany_sapling.json -e0ca13cf682dc596004b95d01579177251a9d020 data/byg/loot_tables/blocks/potted_mangrove_sapling.json -98252b21bcff2f5164076c8b784b875c37623e05 data/byg/loot_tables/blocks/potted_maple_sapling.json -67c0c5601d82968b54791c8aadfa153b92031ea0 data/byg/loot_tables/blocks/potted_nightshade_sapling.json -b27aea3350f52e86cdbf0994efd204257ca276e9 data/byg/loot_tables/blocks/potted_palm_sapling.json -be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/potted_pine_sapling.json -4277deb0748dead9ffa5db13043047b101e7bf15 data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json -d0d173ed0bad14836e55ea13af684503e5d9eafa data/byg/loot_tables/blocks/potted_redwood_sapling.json -36ff436ff3fc00540de1a467d561633c09c469dd data/byg/loot_tables/blocks/potted_skyris_sapling.json -78ec7dda56281a026011ac5457d3fe6cbd3f2980 data/byg/loot_tables/blocks/potted_sythian_fungus.json -d1f77c5d4586e93e383c4368a9a9e71c1e33744e data/byg/loot_tables/blocks/potted_willow_sapling.json -6598eadb6c1f8c9e77a717af9ae9add6e99db838 data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json -5bf789893e95ce60b66b8b48cc6fcf5ced5bef0a data/byg/loot_tables/blocks/potted_zelkova_sapling.json +f7e86302fd3899228a4a4b91c466796df2152f7b data/byg/loot_tables/blocks/potted_aspen_sapling.json +6636d73c8fbf1de3a8f40116a908cc9b3065444b data/byg/loot_tables/blocks/potted_baobab_sapling.json +e2225831a46fe898d023257a5381d76384cb317a data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +a73c099c69c1029c0a8463653cac049054b468d3 data/byg/loot_tables/blocks/potted_bulbis_oddity.json +2647a90a645aa14ecab5fc3b29e8dfaaacd6822c data/byg/loot_tables/blocks/potted_cika_sapling.json +30f9d36ce02753fe46a0f8cbf6853d3b30b8ee7f data/byg/loot_tables/blocks/potted_cypress_sapling.json +a847937232f84de33af109a4b1482a74d7f4d4e1 data/byg/loot_tables/blocks/potted_ebony_sapling.json +8cd7e5d30cf09050399bff4b8c609860c15e2c8f data/byg/loot_tables/blocks/potted_embur_wart.json +062c66924711bae4ce843457192e3f40c55409bf data/byg/loot_tables/blocks/potted_ether_sapling.json +b76854eeb5580ca1296b78af5dd50d6950d3a7fa data/byg/loot_tables/blocks/potted_fir_sapling.json +39201eca9dacc2765ce07cdd286bbfa19949c9ae data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +5027042948ffb61a95a28b6fc9eb59dd7e6b77c9 data/byg/loot_tables/blocks/potted_holly_sapling.json +79f16533eb667b70fb13b42ad66a91cf38280d68 data/byg/loot_tables/blocks/potted_imparius_mushroom.json +aa82ebcb822d1dd6697f224e3ec7fde057afbf62 data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +1d1c49cb919ce9a4fb1a478420704faada30b53c data/byg/loot_tables/blocks/potted_lament_sapling.json +2f0e74f824914a5366ebb3801db2fbb82f76aa94 data/byg/loot_tables/blocks/potted_mahogany_sapling.json +7b0410d3d354acf2108c5cf4337a1c262d7ccb5e data/byg/loot_tables/blocks/potted_mangrove_sapling.json +9322bfcc503b90681c0d3b34194b84dcfb78fcf3 data/byg/loot_tables/blocks/potted_maple_sapling.json +707742f870bf832a343bbabe6d74b132956e26a0 data/byg/loot_tables/blocks/potted_nightshade_sapling.json +08bdc8cb2e9605b61734b651a9a767698eafd086 data/byg/loot_tables/blocks/potted_palm_sapling.json +08c9cf13e67375a41fc57718f4d1930176728e47 data/byg/loot_tables/blocks/potted_pine_sapling.json +a2dd310aef7fbc14867b94c052d1bbbef364f6e0 data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +df108eb8bfa788939cc3fa2510f4ae53dbe0687a data/byg/loot_tables/blocks/potted_redwood_sapling.json +a7581e96538751d3e0a547246e4d15b42cdc5ba3 data/byg/loot_tables/blocks/potted_skyris_sapling.json +bcb72503fa97b727d5efb8c164705a164f20938e data/byg/loot_tables/blocks/potted_sythian_fungus.json +8551fa39ca5e7e19db6187d33e94475421f0eaca data/byg/loot_tables/blocks/potted_willow_sapling.json +d40c87d768ddc9ac0c91899d03bb56765831f865 data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +464e1bd0c8d1a1ec0d051d4f77219b6d75efc05c data/byg/loot_tables/blocks/potted_zelkova_sapling.json 5119f2f7f79bc753e66beb6a82d09e19fee77889 data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json bde0a0722e9fee015e715db6e58211ebaa994405 data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json 98e88c37a09dbdb096155609c252931d24fdccdb data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index e009bc34a7..6d81380b1c 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -19,395 +19,395 @@ "experience": 1000 }, "criteria": { - "byg:autumnal_valley": { + "byg:borealis_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_valley" + "biome": "byg:borealis_grove" } } }, - "byg:embur_bog": { + "byg:prairie": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:embur_bog" + "biome": "byg:prairie" } } }, - "byg:ebony_woods": { + "byg:baobab_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ebony_woods" + "biome": "byg:baobab_savanna" } } }, - "byg:amaranth_fields": { + "byg:lush_stacks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:amaranth_fields" + "biome": "byg:lush_stacks" } } }, - "byg:nightshade_forest": { + "byg:shattered_glacier": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:nightshade_forest" + "biome": "byg:shattered_glacier" } } }, - "byg:bulbis_gardens": { + "byg:red_oak_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bulbis_gardens" + "biome": "byg:red_oak_forest" } } }, - "byg:temperate_rainforest": { + "byg:jacaranda_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_rainforest" + "biome": "byg:jacaranda_forest" } } }, - "byg:sierra_badlands": { + "byg:red_rock_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sierra_badlands" + "biome": "byg:red_rock_valley" } } }, - "byg:zelkova_forest": { + "byg:skyris_vale": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:zelkova_forest" + "biome": "byg:skyris_vale" } } }, - "byg:wailing_garth": { + "byg:rainbow_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:wailing_garth" + "biome": "byg:rainbow_beach" } } }, - "byg:black_forest": { + "byg:amaranth_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:black_forest" + "biome": "byg:amaranth_fields" } } }, - "byg:orchard": { + "byg:dacite_ridges": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:orchard" + "biome": "byg:dacite_ridges" } } }, - "byg:weeping_mire": { + "byg:redwood_thicket": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_mire" + "biome": "byg:redwood_thicket" } } }, - "byg:coconino_meadow": { + "byg:weeping_witch_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coconino_meadow" + "biome": "byg:weeping_witch_forest" } } }, - "byg:lush_stacks": { + "byg:dead_sea": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:lush_stacks" + "biome": "byg:dead_sea" } } }, - "byg:ivis_fields": { + "byg:autumnal_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ivis_fields" + "biome": "byg:autumnal_taiga" } } }, - "byg:viscal_isles": { + "byg:ivis_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:viscal_isles" + "biome": "byg:ivis_fields" } } }, - "byg:twilight_meadow": { + "byg:autumnal_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:twilight_meadow" + "biome": "byg:autumnal_forest" } } }, - "byg:allium_fields": { + "byg:cherry_blossom_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:allium_fields" + "biome": "byg:cherry_blossom_forest" } } }, - "byg:warped_desert": { + "byg:windswept_beach": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:warped_desert" + "biome": "byg:windswept_beach" } } }, - "byg:magma_wastes": { + "byg:cypress_swamplands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:magma_wastes" + "biome": "byg:cypress_swamplands" } } }, - "byg:rose_fields": { + "byg:atacama_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rose_fields" + "biome": "byg:atacama_desert" } } }, - "byg:redwood_thicket": { + "byg:howling_peaks": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:redwood_thicket" + "biome": "byg:howling_peaks" } } }, - "byg:atacama_desert": { + "byg:dacite_shore": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:atacama_desert" + "biome": "byg:dacite_shore" } } }, - "byg:red_rock_valley": { + "byg:cika_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_rock_valley" + "biome": "byg:cika_woods" } } }, - "byg:cypress_swamplands": { + "byg:wailing_garth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cypress_swamplands" + "biome": "byg:wailing_garth" } } }, - "byg:araucaria_savanna": { + "byg:arisian_undergrowth": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:araucaria_savanna" + "biome": "byg:arisian_undergrowth" } } }, - "byg:bayou": { + "byg:aspen_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:bayou" + "biome": "byg:aspen_forest" } } }, - "byg:baobab_savanna": { + "byg:canadian_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:baobab_savanna" + "biome": "byg:canadian_shield" } } }, - "byg:ethereal_islands": { + "byg:crag_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:ethereal_islands" + "biome": "byg:crag_gardens" } } }, - "byg:skyris_vale": { + "byg:brimstone_caverns": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:skyris_vale" + "biome": "byg:brimstone_caverns" } } }, - "byg:weeping_witch_forest": { + "byg:cardinal_tundra": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:weeping_witch_forest" + "biome": "byg:cardinal_tundra" } } }, - "byg:white_mangrove_marshes": { + "byg:windswept_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:white_mangrove_marshes" + "biome": "byg:windswept_desert" } } }, - "byg:subzero_hypogeal": { + "byg:frosted_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:subzero_hypogeal" + "biome": "byg:frosted_taiga" } } }, - "byg:crimson_gardens": { + "byg:magma_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crimson_gardens" + "biome": "byg:magma_wastes" } } }, - "byg:cika_woods": { + "byg:white_mangrove_marshes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cika_woods" + "biome": "byg:white_mangrove_marshes" } } }, - "byg:autumnal_taiga": { + "byg:viscal_isles": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_taiga" + "biome": "byg:viscal_isles" } } }, - "byg:red_oak_forest": { + "byg:araucaria_savanna": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:red_oak_forest" + "biome": "byg:araucaria_savanna" } } }, - "byg:sythian_torrids": { + "byg:warped_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:sythian_torrids" + "biome": "byg:warped_desert" } } }, - "byg:temperate_grove": { + "byg:autumnal_valley": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:temperate_grove" + "biome": "byg:autumnal_valley" } } }, - "byg:canadian_shield": { + "byg:sythian_torrids": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:canadian_shield" + "biome": "byg:sythian_torrids" } } }, - "byg:basalt_barrera": { + "byg:black_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:basalt_barrera" + "biome": "byg:black_forest" } } }, - "byg:forgotten_forest": { + "byg:imparius_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:forgotten_forest" + "biome": "byg:imparius_grove" } } }, - "byg:prairie": { + "byg:nightshade_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:prairie" + "biome": "byg:nightshade_forest" } } }, - "byg:crag_gardens": { + "byg:bayou": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:crag_gardens" + "biome": "byg:bayou" } } }, - "byg:jacaranda_forest": { + "byg:subzero_hypogeal": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:jacaranda_forest" + "biome": "byg:subzero_hypogeal" } } }, - "byg:dead_sea": { + "byg:zelkova_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dead_sea" + "biome": "byg:zelkova_forest" } } }, - "byg:fragment_forest": { + "byg:shulkren_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:fragment_forest" + "biome": "byg:shulkren_forest" } } }, - "byg:shattered_glacier": { + "byg:basalt_barrera": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shattered_glacier" + "biome": "byg:basalt_barrera" } } }, @@ -419,432 +419,432 @@ } } }, - "byg:cardinal_tundra": { + "byg:ethereal_islands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cardinal_tundra" + "biome": "byg:ethereal_islands" } } }, - "byg:glowstone_gardens": { + "byg:coconino_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:glowstone_gardens" + "biome": "byg:coconino_meadow" } } }, - "byg:dacite_ridges": { + "byg:firecracker_shrubland": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_ridges" + "biome": "byg:firecracker_shrubland" } } }, - "byg:brimstone_caverns": { + "byg:guiana_shield": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:brimstone_caverns" + "biome": "byg:guiana_shield" } } }, - "byg:dacite_shore": { + "byg:orchard": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:dacite_shore" + "biome": "byg:orchard" } } }, - "byg:arisian_undergrowth": { + "byg:glowstone_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:arisian_undergrowth" + "biome": "byg:glowstone_gardens" } } }, - "byg:borealis_grove": { + "byg:bulbis_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:borealis_grove" + "biome": "byg:bulbis_gardens" } } }, - "byg:aspen_forest": { + "byg:mojave_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:aspen_forest" + "biome": "byg:mojave_desert" } } }, - "byg:cherry_blossom_forest": { + "byg:frosted_coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cherry_blossom_forest" + "biome": "byg:frosted_coniferous_forest" } } }, - "byg:frosted_taiga": { + "byg:weeping_mire": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_taiga" + "biome": "byg:weeping_mire" } } }, - "byg:guiana_shield": { + "byg:sierra_badlands": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:guiana_shield" + "biome": "byg:sierra_badlands" } } }, - "byg:autumnal_forest": { + "byg:crimson_gardens": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:autumnal_forest" + "biome": "byg:crimson_gardens" } } }, - "byg:windswept_beach": { + "byg:rose_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_beach" + "biome": "byg:rose_fields" } } }, - "byg:mojave_desert": { + "byg:ebony_woods": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:mojave_desert" + "biome": "byg:ebony_woods" } } }, - "byg:coniferous_forest": { + "byg:temperate_grove": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:coniferous_forest" + "biome": "byg:temperate_grove" } } }, - "byg:maple_taiga": { + "byg:twilight_meadow": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:maple_taiga" + "biome": "byg:twilight_meadow" } } }, - "byg:firecracker_shrubland": { + "byg:quartz_desert": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:firecracker_shrubland" + "biome": "byg:quartz_desert" } } }, - "byg:imparius_grove": { + "byg:embur_bog": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:imparius_grove" + "biome": "byg:embur_bog" } } }, - "byg:shulkren_forest": { + "byg:forgotten_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:shulkren_forest" + "biome": "byg:forgotten_forest" } } }, - "byg:rainbow_beach": { + "byg:coniferous_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:rainbow_beach" + "biome": "byg:coniferous_forest" } } }, - "byg:frosted_coniferous_forest": { + "byg:temperate_rainforest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:frosted_coniferous_forest" + "biome": "byg:temperate_rainforest" } } }, - "byg:quartz_desert": { + "byg:fragment_forest": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:quartz_desert" + "biome": "byg:fragment_forest" } } }, - "byg:windswept_desert": { + "byg:cryptic_wastes": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:windswept_desert" + "biome": "byg:cryptic_wastes" } } }, - "byg:cryptic_wastes": { + "byg:maple_taiga": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:cryptic_wastes" + "biome": "byg:maple_taiga" } } }, - "byg:howling_peaks": { + "byg:allium_fields": { "trigger": "minecraft:location", "conditions": { "location": { - "biome": "byg:howling_peaks" + "biome": "byg:allium_fields" } } } }, "requirements": [ [ - "byg:autumnal_valley" + "byg:borealis_grove" ], [ - "byg:embur_bog" + "byg:prairie" ], [ - "byg:ebony_woods" + "byg:baobab_savanna" ], [ - "byg:amaranth_fields" + "byg:lush_stacks" ], [ - "byg:nightshade_forest" + "byg:shattered_glacier" ], [ - "byg:bulbis_gardens" + "byg:red_oak_forest" ], [ - "byg:temperate_rainforest" + "byg:jacaranda_forest" ], [ - "byg:sierra_badlands" + "byg:red_rock_valley" ], [ - "byg:zelkova_forest" + "byg:skyris_vale" ], [ - "byg:wailing_garth" + "byg:rainbow_beach" ], [ - "byg:black_forest" + "byg:amaranth_fields" ], [ - "byg:orchard" + "byg:dacite_ridges" ], [ - "byg:weeping_mire" + "byg:redwood_thicket" ], [ - "byg:coconino_meadow" + "byg:weeping_witch_forest" ], [ - "byg:lush_stacks" + "byg:dead_sea" ], [ - "byg:ivis_fields" + "byg:autumnal_taiga" ], [ - "byg:viscal_isles" + "byg:ivis_fields" ], [ - "byg:twilight_meadow" + "byg:autumnal_forest" ], [ - "byg:allium_fields" + "byg:cherry_blossom_forest" ], [ - "byg:warped_desert" + "byg:windswept_beach" ], [ - "byg:magma_wastes" + "byg:cypress_swamplands" ], [ - "byg:rose_fields" + "byg:atacama_desert" ], [ - "byg:redwood_thicket" + "byg:howling_peaks" ], [ - "byg:atacama_desert" + "byg:dacite_shore" ], [ - "byg:red_rock_valley" + "byg:cika_woods" ], [ - "byg:cypress_swamplands" + "byg:wailing_garth" ], [ - "byg:araucaria_savanna" + "byg:arisian_undergrowth" ], [ - "byg:bayou" + "byg:aspen_forest" ], [ - "byg:baobab_savanna" + "byg:canadian_shield" ], [ - "byg:ethereal_islands" + "byg:crag_gardens" ], [ - "byg:skyris_vale" + "byg:brimstone_caverns" ], [ - "byg:weeping_witch_forest" + "byg:cardinal_tundra" ], [ - "byg:white_mangrove_marshes" + "byg:windswept_desert" ], [ - "byg:subzero_hypogeal" + "byg:frosted_taiga" ], [ - "byg:crimson_gardens" + "byg:magma_wastes" ], [ - "byg:cika_woods" + "byg:white_mangrove_marshes" ], [ - "byg:autumnal_taiga" + "byg:viscal_isles" ], [ - "byg:red_oak_forest" + "byg:araucaria_savanna" ], [ - "byg:sythian_torrids" + "byg:warped_desert" ], [ - "byg:temperate_grove" + "byg:autumnal_valley" ], [ - "byg:canadian_shield" + "byg:sythian_torrids" ], [ - "byg:basalt_barrera" + "byg:black_forest" ], [ - "byg:forgotten_forest" + "byg:imparius_grove" ], [ - "byg:prairie" + "byg:nightshade_forest" ], [ - "byg:crag_gardens" + "byg:bayou" ], [ - "byg:jacaranda_forest" + "byg:subzero_hypogeal" ], [ - "byg:dead_sea" + "byg:zelkova_forest" ], [ - "byg:fragment_forest" + "byg:shulkren_forest" ], [ - "byg:shattered_glacier" + "byg:basalt_barrera" ], [ "byg:tropical_rainforest" ], [ - "byg:cardinal_tundra" + "byg:ethereal_islands" ], [ - "byg:glowstone_gardens" + "byg:coconino_meadow" ], [ - "byg:dacite_ridges" + "byg:firecracker_shrubland" ], [ - "byg:brimstone_caverns" + "byg:guiana_shield" ], [ - "byg:dacite_shore" + "byg:orchard" ], [ - "byg:arisian_undergrowth" + "byg:glowstone_gardens" ], [ - "byg:borealis_grove" + "byg:bulbis_gardens" ], [ - "byg:aspen_forest" + "byg:mojave_desert" ], [ - "byg:cherry_blossom_forest" + "byg:frosted_coniferous_forest" ], [ - "byg:frosted_taiga" + "byg:weeping_mire" ], [ - "byg:guiana_shield" + "byg:sierra_badlands" ], [ - "byg:autumnal_forest" + "byg:crimson_gardens" ], [ - "byg:windswept_beach" + "byg:rose_fields" ], [ - "byg:mojave_desert" + "byg:ebony_woods" ], [ - "byg:coniferous_forest" + "byg:temperate_grove" ], [ - "byg:maple_taiga" + "byg:twilight_meadow" ], [ - "byg:firecracker_shrubland" + "byg:quartz_desert" ], [ - "byg:imparius_grove" + "byg:embur_bog" ], [ - "byg:shulkren_forest" + "byg:forgotten_forest" ], [ - "byg:rainbow_beach" + "byg:coniferous_forest" ], [ - "byg:frosted_coniferous_forest" + "byg:temperate_rainforest" ], [ - "byg:quartz_desert" + "byg:fragment_forest" ], [ - "byg:windswept_desert" + "byg:cryptic_wastes" ], [ - "byg:cryptic_wastes" + "byg:maple_taiga" ], [ - "byg:howling_peaks" + "byg:allium_fields" ] ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json index e6519d1ed7..fb77c00ea3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json index fd01e1be94..30159fa7cb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json index 65ab2a28fa..ac79c4394b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json index 11f625be42..30347721e8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json index 733c36087d..0ba7ef8729 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json index 36e1c97c80..02b8193a93 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json index eca2d5f92d..05df10f684 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json index 9704c258ff..a4985bf1ab 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json index 8349cfd79d..848f25bf57 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json index 863e53dbc2..7baacd2842 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json index aa3f852269..895d7ecab4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json index f8b99b8c8f..905b1bdd03 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json index c82de50d0d..83c25a3772 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json index 8a3ac1eb62..4308456f8c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json index e6a84344d2..ddd0551ccc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json index bebf2c27f5..1f96348a09 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json index aec6e5e59d..91cf2f1962 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json index c0b5268073..4136a3ea59 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json index 8052a4865b..af631749c3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json index 37a918823a..f984a43e37 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json index 6371ad2a67..711d4e3de2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json index 8e262c8133..5a2c66b89b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json index c66a085348..de33cdb434 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json index e3c43375b4..32db15ef27 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json index b33f3634d0..1518abd657 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json index dc2c76370a..c29aefd615 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json index d4169e0053..a4686c8e02 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json index 8c301c740f..8cb012ab51 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json @@ -15,6 +15,21 @@ "condition": "minecraft:survives_explosion" } ] + }, + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flower_pot" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] } ] } \ No newline at end of file diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java index f93aec2f04..c6b8d23651 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/loot/BYGBlockLootProvider.java @@ -4,7 +4,9 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraftforge.registries.ForgeRegistries; import potionstudios.byg.BYG; @@ -44,7 +46,13 @@ protected void addTables() { if (type.growerItem() != null) { final var growerName = type.growerItem().getId().getPath(); final var potted = ForgeRegistries.BLOCKS.getValue(BYG.createLocation("potted_" + growerName)); - dropOther(potted, type.growerItem()); + add(potted, LootTable.lootTable() + .withPool(applyExplosionCondition(type.growerItem(), LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(type.growerItem())))) + .withPool(applyExplosionCondition(Items.FLOWER_POT, LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(Items.FLOWER_POT))))); } } } From ec3f85df57a6c9ae661ce59275211111a9c38cc5 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 16:45:33 +0300 Subject: [PATCH 84/90] Make datagen compile --- .../potionstudios/byg/datagen/BYGDataGen.java | 27 +++--- .../advancements/BYGAdvancementProvider.java | 19 ++-- .../byg/datagen/util/DatagenUtils.java | 15 +-- .../providers/BYGBlockTagsProvider.java | 94 ------------------- .../byg/mixin/dev/TagBuilderAccess.java | 14 +++ 5 files changed, 44 insertions(+), 125 deletions(-) delete mode 100644 Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java create mode 100644 Forge/src/main/java/potionstudios/byg/mixin/dev/TagBuilderAccess.java diff --git a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java index b44c1484b0..66647ac293 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/BYGDataGen.java @@ -22,21 +22,20 @@ static void onDatagen(final GatherDataEvent event) { final var gen = event.getGenerator(); final var existingFileHelper = event.getExistingFileHelper(); - if (event.includeServer()) { - gen.addProvider(new BYGLootTablesProvider(gen)); - final var blockTags = new BYGBlockTagsProvider(gen, existingFileHelper); - gen.addProvider(blockTags); - gen.addProvider(new BYGItemTagsProvider(gen, blockTags, existingFileHelper)); - gen.addProvider(new BYGEntityTagsProvider(gen, existingFileHelper)); - gen.addProvider(new BYGBiomeTagsProvider(gen, existingFileHelper)); - gen.addProvider(new BYGRecipeProviders(gen)); + // Server: + gen.addProvider(event.includeServer(), new BYGLootTablesProvider(gen)); + final var blockTags = new BYGBlockTagsProvider(gen, existingFileHelper); + gen.addProvider(event.includeServer(), blockTags); + gen.addProvider(event.includeServer(), new BYGItemTagsProvider(gen, blockTags, existingFileHelper)); + gen.addProvider(event.includeServer(), new BYGEntityTagsProvider(gen, existingFileHelper)); + gen.addProvider(event.includeServer(), new BYGBiomeTagsProvider(gen, existingFileHelper)); + gen.addProvider(event.includeServer(), new BYGRecipeProviders(gen)); - gen.addProvider(new BYGAdvancementProvider(gen, existingFileHelper)); - } - if (event.includeClient()) { - gen.addProvider(new BYGWoodAssetsProvider(gen, existingFileHelper)); - gen.addProvider(new EnUsLanguageProvider(gen)); - } + gen.addProvider(event.includeServer(), new BYGAdvancementProvider(gen, existingFileHelper)); + + // Client: + gen.addProvider(event.includeServer(), new BYGWoodAssetsProvider(gen, existingFileHelper)); + gen.addProvider(event.includeClient(), new EnUsLanguageProvider(gen)); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java index e7652ced38..6b5f6d44e6 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/advancements/BYGAdvancementProvider.java @@ -1,25 +1,24 @@ package potionstudios.byg.datagen.providers.advancements; +import static potionstudios.byg.BYG.createLocation; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.FrameType; import net.minecraft.advancements.critereon.EntityPredicate; -import net.minecraft.advancements.critereon.TickTrigger; +import net.minecraft.advancements.critereon.PlayerTrigger; import net.minecraft.data.DataGenerator; import net.minecraft.data.advancements.AdvancementProvider; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.network.chat.Component; import net.minecraftforge.common.data.ExistingFileHelper; import potionstudios.byg.common.item.BYGItems; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; import java.util.function.Consumer; import java.util.function.Supplier; -import static potionstudios.byg.BYG.createLocation; - -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class BYGAdvancementProvider extends AdvancementProvider { @@ -35,11 +34,11 @@ public BYGAdvancementProvider(DataGenerator generatorIn, ExistingFileHelper file @Override protected void registerAdvancements(Consumer consumer, ExistingFileHelper fileHelper) { final Advancement root = Advancement.Builder.advancement() - .display(BYGItems.BYG_LOGO.get(), new TranslatableComponent("byg.advancements.root.title"), new TranslatableComponent("byg.advancements.root.description"), createLocation("textures/block/lush_dirt.png"), FrameType.TASK, false, false, false) - .addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).save(consumer, "byg:root"); + .display(BYGItems.BYG_LOGO.get(), Component.translatable("byg.advancements.root.title"), Component.translatable("byg.advancements.root.description"), createLocation("textures/block/lush_dirt.png"), FrameType.TASK, false, false, false) + .addCriterion("tick", new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), EntityPredicate.Composite.ANY)).save(consumer, "byg:root"); Advancement.Builder.advancement() - .parent(root).display(BYGItems.BIOMEPEDIA.get(), new TranslatableComponent("byg.advancements.biomepediagift.title"), new TranslatableComponent("byg.advancements.biomepediagift.description"), null, FrameType.TASK, false, false, true) - .addCriterion("tick", new TickTrigger.TriggerInstance(EntityPredicate.Composite.ANY)).rewards(new AdvancementRewards.Builder().addLootTable(createLocation("advancement/biomepedia_gift"))).save(consumer, "byg:biomepedia_gift"); + .parent(root).display(BYGItems.BIOMEPEDIA.get(), Component.translatable("byg.advancements.biomepediagift.title"), Component.translatable("byg.advancements.biomepediagift.description"), null, FrameType.TASK, false, false, true) + .addCriterion("tick", new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), EntityPredicate.Composite.ANY)).rewards(new AdvancementRewards.Builder().addLootTable(createLocation("advancement/biomepedia_gift"))).save(consumer, "byg:biomepedia_gift"); advancements.stream().map(Supplier::get).forEach(cons -> cons.accept(consumer, root)); } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java b/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java index 46fe6aa330..9f32b70e51 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/util/DatagenUtils.java @@ -1,7 +1,8 @@ package potionstudios.byg.datagen.util; -import net.minecraft.tags.Tag; -import potionstudios.byg.mixin.access.TagBuilderAccess; +import net.minecraft.tags.TagBuilder; +import net.minecraft.tags.TagEntry; +import potionstudios.byg.mixin.dev.TagBuilderAccess; import java.util.Comparator; import java.util.HashSet; @@ -11,14 +12,14 @@ public class DatagenUtils { - public static void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(Map tags) { - for (Tag.Builder value : tags.values()) { - List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); + public static void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(Map tags) { + for (TagBuilder value : tags.values()) { + List builderEntries = ((TagBuilderAccess) value).getEntries(); - Set noDuplicates = new HashSet<>(builderEntries); + Set noDuplicates = new HashSet<>(builderEntries); builderEntries.clear(); builderEntries.addAll(noDuplicates); - builderEntries.sort(Comparator.comparing(builderEntry -> builderEntry.entry().toString())); + builderEntries.sort(Comparator.comparing(TagEntry::toString)); } } diff --git a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java b/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java deleted file mode 100644 index 83698ec794..0000000000 --- a/Forge/src/main/java/potionstudios/byg/datagen/providers/BYGBlockTagsProvider.java +++ /dev/null @@ -1,94 +0,0 @@ -package potionstudios.byg.datagen.providers; - -import net.minecraft.core.Registry; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.TagsProvider; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.TagKey; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraftforge.common.data.ExistingFileHelper; -import org.jetbrains.annotations.Nullable; -import potionstudios.byg.BYG; -import potionstudios.byg.common.block.BYGBlockTags; -import potionstudios.byg.reg.RegistryObject; - -import java.util.Arrays; -import java.util.function.Supplier; - -import static potionstudios.byg.common.block.BYGBlocks.*; - -@SuppressWarnings("ALL") -public class BYGBlockTagsProvider extends TagsProvider { - - - public BYGBlockTagsProvider(DataGenerator pGenerator, @Nullable ExistingFileHelper existingFileHelper) { - super(pGenerator, Registry.BLOCK, BYG.MOD_ID, existingFileHelper); - } - - @Override - protected void addTags() { - tag( - BYGBlockTags.LUSH, - LUSH_GRASS_PATH, LUSH_GRASS_BLOCK, LUSH_FARMLAND - ); - tag(BYGBlockTags.GROUND_MANGROVE_TREE).addTags(BlockTags.DIRT, BlockTags.SAND).add(MUD_BLOCK.get(), Blocks.CLAY); - - final var slabsTag = super.tag(BYGBlockTags.SLABS); - PROVIDER.getEntries() - .stream() - .map(RegistryObject::get) - .filter(SlabBlock.class::isInstance) - .forEach(slabsTag::add); - - tag(BYGBlockTags.END_STONE).add(ETHER_STONE.get(), BULBIS_PHYCELIUM.get(), NIGHTSHADE_PHYLIUM.get(), IMPARIUS_PHYLIUM.get(), IVIS_PHYLIUM.get(), SHULKREN_PHYLIUM.get(), Blocks.END_STONE); - - for (TagKey netherPlantTag : BYGBlockTags.END_PLANT_TAGS) { - tag(netherPlantTag).add(Blocks.END_STONE).addTag(BYGBlockTags.END_STONE) - .addOptionalTag(new ResourceLocation("c", "end_stones")) - .addOptionalTag(new ResourceLocation("forge", "end_stones")); - } - - for (TagKey netherPlantTag : BYGBlockTags.NETHER_PLANT_TAGS) { - tag(netherPlantTag).addTag(BlockTags.NYLIUM).add(Blocks.MYCELIUM).add(Blocks.SOUL_SOIL); - } - - for (TagKey plantTag : BYGBlockTags.PLANT_TAGS) { - this.tag(plantTag).addTag(BlockTags.DIRT); - } - for (TagKey plantTag : BYGBlockTags.MUSHROOM_TAGS) { - this.tag(plantTag).addTag(BlockTags.MUSHROOM_GROW_BLOCK).addTag(BlockTags.DIRT).addTags(BlockTags.BASE_STONE_OVERWORLD); - } - - for (TagKey desertPlantTag : BYGBlockTags.SAND_PLANT_TAGS) { - this.tag(desertPlantTag).addTag(BlockTags.SAND); - } - this.tag(BYGBlockTags.GROUND_PALM_SAPLING).addTag(BlockTags.SAND).addTag(BlockTags.DIRT); - this.tag(BYGBlockTags.GROUND_FAIRY_SLIPPER).addTag(BlockTags.LOGS); - sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(); - } - - private void sortTagsAlphabeticallyAndRemoveDuplicateTagEntries() { -// for (Tag.Builder value : this.builders.values()) { -// List builderEntries = ((TagBuilderAccess) value).byg_getEntries(); -// -// Set noDuplicates = new HashSet<>(builderEntries); -// builderEntries.clear(); -// builderEntries.addAll(noDuplicates); -// Collections.sort(builderEntries, Comparator.comparing(builderEntry -> builderEntry.entry().toString())); -// } - } - - @SafeVarargs - @SuppressWarnings("ALL") - private void tag(TagKey tag, Supplier... blocks) { - this.tag(tag).add(Arrays.stream(blocks).map(Supplier::get).toArray(Block[]::new)); - } - - @Override - public String getName() { - return "BYG Blocks"; - } -} diff --git a/Forge/src/main/java/potionstudios/byg/mixin/dev/TagBuilderAccess.java b/Forge/src/main/java/potionstudios/byg/mixin/dev/TagBuilderAccess.java new file mode 100644 index 0000000000..4c173250e5 --- /dev/null +++ b/Forge/src/main/java/potionstudios/byg/mixin/dev/TagBuilderAccess.java @@ -0,0 +1,14 @@ +package potionstudios.byg.mixin.dev; + +import net.minecraft.tags.TagBuilder; +import net.minecraft.tags.TagEntry; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; + +@Mixin(TagBuilder.class) +public interface TagBuilderAccess { + @Accessor + List getEntries(); +} From 0594df4a7c84db3b2a979c27bcecbd0b8d61fe8b Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 16:48:30 +0300 Subject: [PATCH 85/90] Update BYGWoodAssetsProvider.java --- .../byg/datagen/providers/BYGWoodAssetsProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index a4f4091510..8d2e5acad7 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -2,6 +2,7 @@ import net.minecraft.core.Direction; import net.minecraft.core.Registry; +import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.resources.ResourceLocation; @@ -295,7 +296,7 @@ public ItemModelBuilder item(String path) { } @Override - public void run(HashCache cache) throws IOException { + public void run(CachedOutput cache) throws IOException { super.run(cache); item.generateAll(cache); } @@ -318,7 +319,7 @@ protected void registerModels() { } @Override - public void generateAll(HashCache cache) { + public void generateAll(CachedOutput cache) { super.generateAll(cache); } From 5d5e34da08ee3b7c9ade10525aa9f1ee737fe534 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 18:41:15 +0300 Subject: [PATCH 86/90] This is cursed.. nothing works anymore --- .../entity/npc/BYGVillagerProfessions.java | 25 ++++++- .../world/biome/end/BYGEndBiomeSource.java | 2 +- .../biome/nether/BYGNetherBiomeSource.java | 4 +- .../common/world/structure/BYGStructures.java | 14 ++++ .../byg/data/BYGDataProviders.java | 23 ------ .../advancements/BYGAdvancementProvider.java | 73 ------------------- .../byg/mixin/access/BiomeSourceAccess.java | 8 -- .../byg/mixin/access/StructuresAccess.java | 17 +---- .../access/VillagerProfessionAccess.java | 30 -------- Common/src/main/resources/byg.mixins.json | 1 - Forge/build.gradle | 3 +- .../main/java/potionstudios/byg/BYGForge.java | 8 +- .../byg/mixin/client/MixinMinecraft.java | 14 ++-- .../src/main/resources/byg_forge.mixins.json | 3 +- build.gradle | 2 +- 15 files changed, 55 insertions(+), 172 deletions(-) delete mode 100644 Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java delete mode 100644 Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java delete mode 100644 Common/src/main/java/potionstudios/byg/mixin/access/VillagerProfessionAccess.java diff --git a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerProfessions.java b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerProfessions.java index c9a6682b9a..1131890e65 100644 --- a/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerProfessions.java +++ b/Common/src/main/java/potionstudios/byg/common/entity/npc/BYGVillagerProfessions.java @@ -1,20 +1,29 @@ package potionstudios.byg.common.entity.npc; +import com.google.common.collect.ImmutableSet; +import net.minecraft.core.Holder; import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.ai.village.poi.PoiType; import net.minecraft.world.entity.npc.VillagerProfession; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import potionstudios.byg.BYG; import potionstudios.byg.common.entity.ai.village.poi.BYGPoiTypes; -import potionstudios.byg.mixin.access.VillagerProfessionAccess; import potionstudios.byg.reg.RegistrationProvider; import potionstudios.byg.reg.RegistryObject; +import javax.annotation.Nullable; +import java.util.function.Predicate; import java.util.function.Supplier; public class BYGVillagerProfessions { private static final RegistrationProvider PROVIDER = RegistrationProvider.get(Registry.VILLAGER_PROFESSION_REGISTRY, BYG.MOD_ID); - public static final RegistryObject FORAGER = createVillagerProfession("forager", () -> VillagerProfessionAccess.byg_invokeRegister("forager", BYGPoiTypes.FORAGER.getResourceKey(), null)); + public static final RegistryObject FORAGER = createVillagerProfession("forager", () -> register(BYG.MOD_ID + ":forager", BYGPoiTypes.FORAGER.getResourceKey(), null)); private static RegistryObject createVillagerProfession(String id, Supplier villagerProfession) { return PROVIDER.register(id, villagerProfession); @@ -22,4 +31,16 @@ private static RegistryObject createVillager public static void loadClass() { } + + private static VillagerProfession register(String name, ResourceKey heldJobSite, @Nullable SoundEvent sound) { + return register(name, ($$1x) -> $$1x.is(heldJobSite), ($$1x) -> $$1x.is(heldJobSite), sound); + } + + private static VillagerProfession register(String name, Predicate> heldJobSite, Predicate> $$2, @Nullable SoundEvent $$3) { + return register(name, heldJobSite, $$2, ImmutableSet.of(), ImmutableSet.of(), $$3); + } + + private static VillagerProfession register(String name, Predicate> heldJobSite, Predicate> $$2, ImmutableSet $$3, ImmutableSet $$4, @Nullable SoundEvent $$5) { + return new VillagerProfession(name, heldJobSite, $$2, $$3, $$4, $$5); + } } diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/end/BYGEndBiomeSource.java b/Common/src/main/java/potionstudios/byg/common/world/biome/end/BYGEndBiomeSource.java index 1860d0108f..f8c5c7ccec 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/end/BYGEndBiomeSource.java +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/end/BYGEndBiomeSource.java @@ -41,7 +41,7 @@ protected BYGEndBiomeSource(Registry biomeRegistry) { @Override public void lazyLoad(long seed) { EndBiomesConfig config = EndBiomesConfig.getConfig(); - Set> possibleBiomes = ((BiomeSourceAccess) this).byg_getPossibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); + Set> possibleBiomes = possibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); BiPredicate>, ResourceKey> filter = (existing, added) -> !existing.contains(added) && possibleBiomes.contains(added); this.islandBiomeResolver = getIslandBiomeResolver(biomeRegistry, seed, config.islandLayers().filter(filter)); this.voidBiomeResolver = getVoidBiomeResolver(biomeRegistry, seed, config.voidLayers().filter(filter)); diff --git a/Common/src/main/java/potionstudios/byg/common/world/biome/nether/BYGNetherBiomeSource.java b/Common/src/main/java/potionstudios/byg/common/world/biome/nether/BYGNetherBiomeSource.java index fa7e309742..ac74e09142 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/biome/nether/BYGNetherBiomeSource.java +++ b/Common/src/main/java/potionstudios/byg/common/world/biome/nether/BYGNetherBiomeSource.java @@ -40,7 +40,7 @@ protected BYGNetherBiomeSource(Registry biomeRegistry) { NetherBiomesConfig config = NetherBiomesConfig.getConfig(); - Set> possibleBiomes = ((BiomeSourceAccess) this).byg_getPossibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); + Set> possibleBiomes = possibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); BiPredicate>, ResourceKey> filter = (existing, added) -> !existing.contains(added) && possibleBiomes.contains(added); int usedLayerSize = config.layerSize(); @@ -50,7 +50,7 @@ protected BYGNetherBiomeSource(Registry biomeRegistry) { @Override public void lazyLoad(long seed) { NetherBiomesConfig config = NetherBiomesConfig.getConfig(); - Set> possibleBiomes = ((BiomeSourceAccess) this).byg_getPossibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); + Set> possibleBiomes = possibleBiomes().stream().map(Holder::unwrapKey).map(Optional::orElseThrow).collect(Collectors.toSet()); BiPredicate>, ResourceKey> filter = (existing, added) -> !existing.contains(added) && possibleBiomes.contains(added); this.lowerLayerRoughnessNoise = new FastNoiseLite((int) seed); diff --git a/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructures.java b/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructures.java index 6166a90c0a..247312a5ef 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructures.java @@ -5,10 +5,13 @@ import net.minecraft.data.BuiltinRegistries; import net.minecraft.data.worldgen.features.CaveFeatures; import net.minecraft.data.worldgen.placement.PlacementUtils; +import net.minecraft.tags.TagKey; import net.minecraft.util.random.SimpleWeightedRandomList; import net.minecraft.util.valueproviders.ConstantFloat; import net.minecraft.util.valueproviders.UniformFloat; import net.minecraft.util.valueproviders.UniformInt; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.GenerationStep; @@ -19,6 +22,7 @@ import net.minecraft.world.level.levelgen.placement.RandomOffsetPlacement; import net.minecraft.world.level.levelgen.placement.RarityFilter; import net.minecraft.world.level.levelgen.structure.Structure; +import net.minecraft.world.level.levelgen.structure.StructureSpawnOverride; import net.minecraft.world.level.levelgen.structure.TerrainAdjustment; import net.minecraft.world.level.levelgen.structure.structures.JigsawStructure; import potionstudios.byg.BYG; @@ -32,10 +36,12 @@ import potionstudios.byg.common.world.structure.village.pool.RuinsVillagePools; import potionstudios.byg.common.world.structure.village.pool.SkyrisVillagePools; import potionstudios.byg.common.world.structure.village.pool.TropicalVillagePools; +import potionstudios.byg.mixin.access.StructuresAccess; import potionstudios.byg.reg.RegistrationProvider; import potionstudios.byg.util.blendingfunction.BlendingFunction; import java.util.List; +import java.util.Map; import java.util.function.Supplier; import static potionstudios.byg.mixin.access.StructuresAccess.structure; @@ -144,6 +150,14 @@ private static Holder register(String id, Supplier structu return PROVIDER.register(id, structureSupplier).asHolder(); } + private static Structure.StructureSettings structure(TagKey tag, TerrainAdjustment adj) { + return StructuresAccess.structure(tag, Map.of(), GenerationStep.Decoration.SURFACE_STRUCTURES, adj); + } + + private static Structure.StructureSettings structure(TagKey tag, GenerationStep.Decoration decoration, TerrainAdjustment adj) { + return StructuresAccess.structure(tag, Map.of(), decoration, adj); + } + public static void loadClass() { } } diff --git a/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java b/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java deleted file mode 100644 index 21f5e13e39..0000000000 --- a/Common/src/main/java/potionstudios/byg/data/BYGDataProviders.java +++ /dev/null @@ -1,23 +0,0 @@ -package potionstudios.byg.data; - -import net.minecraft.data.CachedOutput; -import net.minecraft.data.HashCache; -import potionstudios.byg.data.advancements.BYGAdvancementProvider; - -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; - -public class BYGDataProviders { - - public static void generateProviders() { -// Path exportPath = Paths.get("generated"); -// try { -// CachedOutput cache = new HashCache(exportPath, "cache"); -// BYGAdvancementProvider bygAdvancementProvider = new BYGAdvancementProvider(exportPath); -// bygAdvancementProvider.run(cache); -// } catch (IOException e) { -// e.printStackTrace(); -// } - } -} diff --git a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java b/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java deleted file mode 100644 index a73696f491..0000000000 --- a/Common/src/main/java/potionstudios/byg/data/advancements/BYGAdvancementProvider.java +++ /dev/null @@ -1,73 +0,0 @@ -package potionstudios.byg.data.advancements; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementRewards; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.advancements.FrameType; -import net.minecraft.advancements.critereon.EntityPredicate; -import net.minecraft.advancements.critereon.PlayerTrigger; -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataProvider; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import potionstudios.byg.BYG; -import potionstudios.byg.common.item.BYGItems; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.List; -import java.util.Set; -import java.util.function.Consumer; - -public class BYGAdvancementProvider implements DataProvider { - private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create(); - private final Path outputFolder; - - private static final List> ADVANCEMENTS = ImmutableList.of(new BYGHusbandryAdvancements()); - - public BYGAdvancementProvider(Path outputFolder) { - this.outputFolder = outputFolder; - } - - @Override - public void run(CachedOutput cache) { - Path path = this.outputFolder; - Set set = Sets.newHashSet(); - Consumer consumer = (advancement) -> { - if (!set.add(advancement.getId())) { - throw new IllegalStateException("Duplicate advancement " + advancement.getId()); - } else { - Path path2 = createPath(path, advancement); - - try { - DataProvider.saveStable(cache, advancement.deconstruct().serializeToJson(), path2); - } catch (IOException var6) { - BYG.LOGGER.error("Couldn't save advancement {}", path2, var6); - } - - } - }; - - - Advancement root = Advancement.Builder.advancement().display(BYGItems.BYG_LOGO.get(), Component.translatable("byg.advancements.root.title"), Component.translatable("byg.advancements.root.description"), BYG.createLocation("textures/block/lush_dirt.png"), FrameType.TASK, false, false, false).addCriterion("tick", new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), EntityPredicate.Composite.ANY)).save(consumer, "byg:root"); - Advancement.Builder.advancement().parent(root).display(BYGItems.BIOMEPEDIA.get(), Component.translatable("byg.advancements.biomepediagift.title"), Component.translatable("byg.advancements.biomepediagift.description"), null, FrameType.TASK, false, false, true).addCriterion("tick", new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), EntityPredicate.Composite.ANY)).rewards(new AdvancementRewards.Builder().addLootTable(BYG.createLocation("advancement/biomepedia_gift"))).save(consumer, "byg:biomepedia_gift"); - - for (BYGAdvancementConsumer advancement : ADVANCEMENTS) { - advancement.accept(consumer, root); - } - } - - private static Path createPath(Path path, Advancement advancement) { - String nameSpace = advancement.getId().getNamespace(); - return path.resolve("data/" + nameSpace + "/advancements/" + advancement.getId().getPath() + ".json"); - } - - @Override - public String getName() { - return "BYG Advancements"; - } -} diff --git a/Common/src/main/java/potionstudios/byg/mixin/access/BiomeSourceAccess.java b/Common/src/main/java/potionstudios/byg/mixin/access/BiomeSourceAccess.java index c3cc8b3373..89e7b9d976 100644 --- a/Common/src/main/java/potionstudios/byg/mixin/access/BiomeSourceAccess.java +++ b/Common/src/main/java/potionstudios/byg/mixin/access/BiomeSourceAccess.java @@ -1,21 +1,13 @@ package potionstudios.byg.mixin.access; import com.mojang.serialization.Codec; -import net.minecraft.core.Holder; -import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; -import java.util.Set; - @Mixin(BiomeSource.class) public interface BiomeSourceAccess { @Invoker("codec") Codec byg_invokeCodec(); - - @Accessor("possibleBiomes") - Set> byg_getPossibleBiomes(); } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java b/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java index e528699e31..3f6a14be36 100644 --- a/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java +++ b/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java @@ -1,10 +1,6 @@ package potionstudios.byg.mixin.access; -import net.minecraft.core.Holder; -import net.minecraft.core.HolderSet; -import net.minecraft.data.BuiltinRegistries; import net.minecraft.data.worldgen.Structures; -import net.minecraft.resources.ResourceKey; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.Biome; @@ -19,20 +15,9 @@ @Mixin(Structures.class) public interface StructuresAccess { - - - @Invoker("structure") - static Structure.StructureSettings structure(TagKey p_236546_, Map p_236547_, GenerationStep.Decoration p_236548_, TerrainAdjustment p_236549_) { - throw new Error("Mixin did not apply!"); - } - - @Invoker("structure") - static Structure.StructureSettings structure(TagKey p_236539_, GenerationStep.Decoration p_236540_, TerrainAdjustment p_236541_) { - throw new Error("Mixin did not apply!"); - } @Invoker("structure") - static Structure.StructureSettings structure(TagKey p_236543_, TerrainAdjustment p_236544_) { + static Structure.StructureSettings structure(TagKey tag, Map override, GenerationStep.Decoration step, TerrainAdjustment adjustment) { throw new Error("Mixin did not apply!"); } } diff --git a/Common/src/main/java/potionstudios/byg/mixin/access/VillagerProfessionAccess.java b/Common/src/main/java/potionstudios/byg/mixin/access/VillagerProfessionAccess.java deleted file mode 100644 index c5d57fd8a6..0000000000 --- a/Common/src/main/java/potionstudios/byg/mixin/access/VillagerProfessionAccess.java +++ /dev/null @@ -1,30 +0,0 @@ -package potionstudios.byg.mixin.access; - -import com.google.common.collect.ImmutableSet; -import net.minecraft.core.Holder; -import net.minecraft.resources.ResourceKey; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.entity.ai.village.poi.PoiType; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import javax.annotation.Nullable; -import java.util.function.Predicate; - -@Mixin(VillagerProfession.class) -public interface VillagerProfessionAccess { - - @Invoker("") - static VillagerProfession byg_invokeCreate(String $$0, Predicate> $$1, Predicate> $$2, ImmutableSet $$3, ImmutableSet $$4, @Nullable SoundEvent $$5) { - throw new Error("Mixin did not apply!"); - } - - @Invoker("register") - static VillagerProfession byg_invokeRegister(String $$0, ResourceKey $$1, @Nullable SoundEvent $$2) { - throw new Error("Mixin did not apply!"); - - } -} diff --git a/Common/src/main/resources/byg.mixins.json b/Common/src/main/resources/byg.mixins.json index 0722c20f0b..0de65f9e23 100644 --- a/Common/src/main/resources/byg.mixins.json +++ b/Common/src/main/resources/byg.mixins.json @@ -56,7 +56,6 @@ "access.VanillaBiomeAccess", "access.VegetationFeaturesAccess", "access.VegetationPlacementsAccess", - "access.VillagerProfessionAccess", "access.VillagerTypeAccess", "access.WaterlilyBlockAccess", "access.WeightedEntryWrapperAccess", diff --git a/Forge/build.gradle b/Forge/build.gradle index fc612a2833..1fef61043c 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -121,7 +121,7 @@ minecraft { environment("MOD_CLASSES", [output.classesDirs.asPath, sourceSets.data.output.asPath, output.resourcesDir.path, commonOutput.classesDirs.asPath, commonOutput.resourcesDir.path].join(";")) mods { - modDataRun { + byg { source sourceSets.main as SourceSet source sourceSets.data as SourceSet source project(":Common").sourceSets.main as SourceSet @@ -137,6 +137,7 @@ dependencies { annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${minecraft_version}-${terrablender_version}") library shadow("blue.endless:jankson:${jankson_version}") + dataImplementation sourceSets.main.output } reg.configureJarTask(shadowJar) diff --git a/Forge/src/main/java/potionstudios/byg/BYGForge.java b/Forge/src/main/java/potionstudios/byg/BYGForge.java index ccf3765abf..2abd0e118f 100644 --- a/Forge/src/main/java/potionstudios/byg/BYGForge.java +++ b/Forge/src/main/java/potionstudios/byg/BYGForge.java @@ -9,7 +9,6 @@ import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -79,9 +78,10 @@ private void commonLoad(FMLCommonSetupEvent event) { event.enqueueWork(BYG::threadSafeCommonLoad); event.enqueueWork(ForgeNetworkHandler::init); event.enqueueWork(this::registerTerraBlender); - BiomeDictionaryConfig.getConfig().biomeDictionary().forEach((biomeResourceKey, dictionary) -> { - BiomeDictionary.addTypes(biomeResourceKey, dictionary.stream().map(BiomeDictionary.Type::getType).toArray(BiomeDictionary.Type[]::new)); - }); + // TODO biome dict is :crab: +// BiomeDictionaryConfig.getConfig().biomeDictionary().forEach((biomeResourceKey, dictionary) -> { +// BiomeDictionary.addTypes(biomeResourceKey, dictionary.stream().map(BiomeDictionary.Type::getType).toArray(BiomeDictionary.Type[]::new)); +// }); Registry.register(Registry.BIOME_SOURCE, BYGEndBiomeSource.LOCATION, BYGForgeEndBiomeSource.CODEC); Registry.register(Registry.BIOME_SOURCE, BYGNetherBiomeSource.LOCATION, BYGForgeNetherBiomeSource.CODEC); diff --git a/Forge/src/main/java/potionstudios/byg/mixin/client/MixinMinecraft.java b/Forge/src/main/java/potionstudios/byg/mixin/client/MixinMinecraft.java index ec4a937e89..9093615d04 100644 --- a/Forge/src/main/java/potionstudios/byg/mixin/client/MixinMinecraft.java +++ b/Forge/src/main/java/potionstudios/byg/mixin/client/MixinMinecraft.java @@ -3,6 +3,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.server.WorldStem; +import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.world.level.storage.LevelStorageSource; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; @@ -13,22 +14,17 @@ import potionstudios.byg.client.gui.screen.BYGConfigLoadFailureScreen; import potionstudios.byg.config.BYGConfigHandler; -import java.util.function.Function; - @Mixin(Minecraft.class) public abstract class MixinMinecraft { - @Shadow public abstract void setScreen(@Nullable Screen $$0); - @Shadow - protected abstract void doLoadLevel(String par1, Function par2, Function par3, boolean par4, Minecraft.ExperimentalDialogType par5, boolean par6); + public abstract void doWorldLoad(String p_231381_, LevelStorageSource.LevelStorageAccess p_231382_, PackRepository p_231383_, WorldStem p_231384_); - @SuppressWarnings("InvalidInjectorMethodSignature") - @Inject(method = "doLoadLevel", at = @At("HEAD"), cancellable = true, remap = false) - private void loadBYGConfigs(String p_205206_, Function p_205207_, Function p_205208_, boolean p_205209_, Minecraft.ExperimentalDialogType p_205210_, boolean creating, CallbackInfo ci) { + @Inject(method = "doWorldLoad", at = @At("HEAD"), cancellable = true, remap = false) + private void loadBYGConfigs(String p_231381_, LevelStorageSource.LevelStorageAccess p_231382_, PackRepository p_231383_, WorldStem p_231384_, CallbackInfo ci) { try { String loadAllConfigs = BYGConfigHandler.loadAllConfigs(true, false); if(!loadAllConfigs.isEmpty()) { @@ -36,7 +32,7 @@ private void loadBYGConfigs(String p_205206_, Function doLoadLevel(p_205206_, p_205207_, p_205208_, p_205209_, p_205210_, creating) + () -> doWorldLoad(p_231381_, p_231382_, p_231383_, p_231384_) )); ci.cancel(); } diff --git a/Forge/src/main/resources/byg_forge.mixins.json b/Forge/src/main/resources/byg_forge.mixins.json index 22aa70edcd..3d8aa76645 100644 --- a/Forge/src/main/resources/byg_forge.mixins.json +++ b/Forge/src/main/resources/byg_forge.mixins.json @@ -5,7 +5,8 @@ "refmap": "byg_forge.refmap.json", "mixins": [ "dev.ModelBuilderMixin", - "dev.ModelProviderAccess" + "dev.ModelProviderAccess", + "dev.TagBuilderAccess" ], "client": [ "client.MixinInventoryScreen", diff --git a/build.gradle b/build.gradle index 4c86deffb2..ee9433aafc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.matyrobbrt.mc.registrationutils' version '0.2.6' + id 'com.matyrobbrt.mc.registrationutils' version '1.19-1.0.0' } registrationUtils { From b4c52bca452ab2192ca152a1ccb8001b76bd836a Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 20:33:26 +0300 Subject: [PATCH 87/90] runData --- .../03e4de26f1265135874f8cdcaebc09d9c08eb42b | 52 + .../3b4ee89eae22ec457d81b430a4f1a2e0afc9b857 | 2258 ++++++++++ .../55f0273cb61243ff3d2fde23212f03e66541da02 | 12 + .../67cce32b1c3cbbcb1f646605f4914e3f196986c2 | 588 +++ .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 799 ++++ .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 2 + Common/src/generated/resources/.cache/cache | 3779 ----------------- .../e96ec6bce616c89889fb1019febdaef36b955008 | 181 + .../fb07fd0e5e59c798298e44c793e29943bd74dcd4 | 10 + .../fcc0d197db45e404a8bc894ca09c0611e5a65cab | 2 + .../assets/byg/blockstates/aspen_button.json | 124 +- .../assets/byg/blockstates/aspen_door.json | 148 +- .../assets/byg/blockstates/aspen_fence.json | 36 +- .../byg/blockstates/aspen_fence_gate.json | 100 +- .../assets/byg/blockstates/aspen_slab.json | 6 +- .../assets/byg/blockstates/aspen_stairs.json | 280 +- .../byg/blockstates/aspen_trapdoor.json | 70 +- .../assets/byg/blockstates/baobab_button.json | 124 +- .../assets/byg/blockstates/baobab_door.json | 148 +- .../assets/byg/blockstates/baobab_fence.json | 36 +- .../byg/blockstates/baobab_fence_gate.json | 100 +- .../assets/byg/blockstates/baobab_slab.json | 6 +- .../assets/byg/blockstates/baobab_stairs.json | 280 +- .../byg/blockstates/baobab_trapdoor.json | 70 +- .../blockstates/blue_enchanted_button.json | 124 +- .../byg/blockstates/blue_enchanted_door.json | 148 +- .../byg/blockstates/blue_enchanted_fence.json | 36 +- .../blue_enchanted_fence_gate.json | 100 +- .../byg/blockstates/blue_enchanted_slab.json | 6 +- .../blockstates/blue_enchanted_stairs.json | 280 +- .../blockstates/blue_enchanted_trapdoor.json | 70 +- .../assets/byg/blockstates/bulbis_button.json | 124 +- .../assets/byg/blockstates/bulbis_door.json | 148 +- .../assets/byg/blockstates/bulbis_fence.json | 36 +- .../byg/blockstates/bulbis_fence_gate.json | 100 +- .../assets/byg/blockstates/bulbis_slab.json | 6 +- .../assets/byg/blockstates/bulbis_stairs.json | 280 +- .../byg/blockstates/bulbis_trapdoor.json | 70 +- .../assets/byg/blockstates/cherry_button.json | 124 +- .../assets/byg/blockstates/cherry_door.json | 148 +- .../assets/byg/blockstates/cherry_fence.json | 36 +- .../byg/blockstates/cherry_fence_gate.json | 100 +- .../assets/byg/blockstates/cherry_slab.json | 6 +- .../assets/byg/blockstates/cherry_stairs.json | 280 +- .../byg/blockstates/cherry_trapdoor.json | 70 +- .../assets/byg/blockstates/cika_button.json | 124 +- .../assets/byg/blockstates/cika_door.json | 148 +- .../assets/byg/blockstates/cika_fence.json | 36 +- .../byg/blockstates/cika_fence_gate.json | 100 +- .../assets/byg/blockstates/cika_slab.json | 6 +- .../assets/byg/blockstates/cika_stairs.json | 280 +- .../assets/byg/blockstates/cika_trapdoor.json | 70 +- .../byg/blockstates/cypress_button.json | 124 +- .../assets/byg/blockstates/cypress_door.json | 148 +- .../assets/byg/blockstates/cypress_fence.json | 36 +- .../byg/blockstates/cypress_fence_gate.json | 100 +- .../assets/byg/blockstates/cypress_slab.json | 6 +- .../byg/blockstates/cypress_stairs.json | 280 +- .../byg/blockstates/cypress_trapdoor.json | 70 +- .../assets/byg/blockstates/ebony_button.json | 124 +- .../assets/byg/blockstates/ebony_door.json | 148 +- .../assets/byg/blockstates/ebony_fence.json | 36 +- .../byg/blockstates/ebony_fence_gate.json | 100 +- .../assets/byg/blockstates/ebony_slab.json | 6 +- .../assets/byg/blockstates/ebony_stairs.json | 280 +- .../byg/blockstates/ebony_trapdoor.json | 70 +- .../assets/byg/blockstates/embur_button.json | 124 +- .../assets/byg/blockstates/embur_door.json | 148 +- .../assets/byg/blockstates/embur_fence.json | 36 +- .../byg/blockstates/embur_fence_gate.json | 100 +- .../assets/byg/blockstates/embur_slab.json | 6 +- .../assets/byg/blockstates/embur_stairs.json | 280 +- .../byg/blockstates/embur_trapdoor.json | 70 +- .../assets/byg/blockstates/ether_button.json | 124 +- .../assets/byg/blockstates/ether_door.json | 148 +- .../assets/byg/blockstates/ether_fence.json | 36 +- .../byg/blockstates/ether_fence_gate.json | 100 +- .../assets/byg/blockstates/ether_slab.json | 6 +- .../assets/byg/blockstates/ether_stairs.json | 280 +- .../byg/blockstates/ether_trapdoor.json | 70 +- .../assets/byg/blockstates/fir_button.json | 124 +- .../assets/byg/blockstates/fir_door.json | 148 +- .../assets/byg/blockstates/fir_fence.json | 36 +- .../byg/blockstates/fir_fence_gate.json | 100 +- .../assets/byg/blockstates/fir_slab.json | 6 +- .../assets/byg/blockstates/fir_stairs.json | 280 +- .../assets/byg/blockstates/fir_trapdoor.json | 70 +- .../blockstates/green_enchanted_button.json | 124 +- .../byg/blockstates/green_enchanted_door.json | 148 +- .../blockstates/green_enchanted_fence.json | 36 +- .../green_enchanted_fence_gate.json | 100 +- .../byg/blockstates/green_enchanted_slab.json | 6 +- .../blockstates/green_enchanted_stairs.json | 280 +- .../blockstates/green_enchanted_trapdoor.json | 70 +- .../assets/byg/blockstates/holly_button.json | 124 +- .../assets/byg/blockstates/holly_door.json | 148 +- .../assets/byg/blockstates/holly_fence.json | 36 +- .../byg/blockstates/holly_fence_gate.json | 100 +- .../assets/byg/blockstates/holly_slab.json | 6 +- .../assets/byg/blockstates/holly_stairs.json | 280 +- .../byg/blockstates/holly_trapdoor.json | 70 +- .../byg/blockstates/imparius_button.json | 124 +- .../assets/byg/blockstates/imparius_door.json | 148 +- .../byg/blockstates/imparius_fence.json | 36 +- .../byg/blockstates/imparius_fence_gate.json | 100 +- .../assets/byg/blockstates/imparius_slab.json | 6 +- .../byg/blockstates/imparius_stairs.json | 280 +- .../byg/blockstates/imparius_trapdoor.json | 70 +- .../byg/blockstates/jacaranda_button.json | 124 +- .../byg/blockstates/jacaranda_door.json | 148 +- .../byg/blockstates/jacaranda_fence.json | 36 +- .../byg/blockstates/jacaranda_fence_gate.json | 100 +- .../byg/blockstates/jacaranda_slab.json | 6 +- .../byg/blockstates/jacaranda_stairs.json | 280 +- .../byg/blockstates/jacaranda_trapdoor.json | 70 +- .../assets/byg/blockstates/lament_button.json | 124 +- .../assets/byg/blockstates/lament_door.json | 148 +- .../assets/byg/blockstates/lament_fence.json | 36 +- .../byg/blockstates/lament_fence_gate.json | 100 +- .../assets/byg/blockstates/lament_slab.json | 6 +- .../assets/byg/blockstates/lament_stairs.json | 280 +- .../byg/blockstates/lament_trapdoor.json | 70 +- .../byg/blockstates/mahogany_button.json | 124 +- .../assets/byg/blockstates/mahogany_door.json | 148 +- .../byg/blockstates/mahogany_fence.json | 36 +- .../byg/blockstates/mahogany_fence_gate.json | 100 +- .../assets/byg/blockstates/mahogany_slab.json | 6 +- .../byg/blockstates/mahogany_stairs.json | 280 +- .../byg/blockstates/mahogany_trapdoor.json | 70 +- .../byg/blockstates/mangrove_button.json | 124 +- .../assets/byg/blockstates/mangrove_door.json | 148 +- .../byg/blockstates/mangrove_fence.json | 36 +- .../byg/blockstates/mangrove_fence_gate.json | 100 +- .../assets/byg/blockstates/mangrove_slab.json | 6 +- .../byg/blockstates/mangrove_stairs.json | 280 +- .../byg/blockstates/mangrove_trapdoor.json | 70 +- .../assets/byg/blockstates/maple_button.json | 124 +- .../assets/byg/blockstates/maple_door.json | 148 +- .../assets/byg/blockstates/maple_fence.json | 36 +- .../byg/blockstates/maple_fence_gate.json | 100 +- .../assets/byg/blockstates/maple_slab.json | 6 +- .../assets/byg/blockstates/maple_stairs.json | 280 +- .../byg/blockstates/maple_trapdoor.json | 70 +- .../byg/blockstates/nightshade_button.json | 124 +- .../byg/blockstates/nightshade_door.json | 148 +- .../byg/blockstates/nightshade_fence.json | 36 +- .../blockstates/nightshade_fence_gate.json | 100 +- .../byg/blockstates/nightshade_slab.json | 6 +- .../byg/blockstates/nightshade_stairs.json | 280 +- .../byg/blockstates/nightshade_trapdoor.json | 70 +- .../assets/byg/blockstates/palm_button.json | 124 +- .../assets/byg/blockstates/palm_door.json | 148 +- .../assets/byg/blockstates/palm_fence.json | 36 +- .../byg/blockstates/palm_fence_gate.json | 100 +- .../assets/byg/blockstates/palm_slab.json | 6 +- .../assets/byg/blockstates/palm_stairs.json | 280 +- .../assets/byg/blockstates/palm_trapdoor.json | 70 +- .../assets/byg/blockstates/pine_button.json | 124 +- .../assets/byg/blockstates/pine_door.json | 148 +- .../assets/byg/blockstates/pine_fence.json | 36 +- .../byg/blockstates/pine_fence_gate.json | 100 +- .../assets/byg/blockstates/pine_slab.json | 6 +- .../assets/byg/blockstates/pine_stairs.json | 280 +- .../assets/byg/blockstates/pine_trapdoor.json | 70 +- .../rainbow_eucalyptus_button.json | 124 +- .../blockstates/rainbow_eucalyptus_door.json | 148 +- .../blockstates/rainbow_eucalyptus_fence.json | 36 +- .../rainbow_eucalyptus_fence_gate.json | 100 +- .../blockstates/rainbow_eucalyptus_slab.json | 6 +- .../rainbow_eucalyptus_stairs.json | 280 +- .../rainbow_eucalyptus_trapdoor.json | 70 +- .../byg/blockstates/redwood_button.json | 124 +- .../assets/byg/blockstates/redwood_door.json | 148 +- .../assets/byg/blockstates/redwood_fence.json | 36 +- .../byg/blockstates/redwood_fence_gate.json | 100 +- .../assets/byg/blockstates/redwood_slab.json | 6 +- .../byg/blockstates/redwood_stairs.json | 280 +- .../byg/blockstates/redwood_trapdoor.json | 70 +- .../assets/byg/blockstates/skyris_button.json | 124 +- .../assets/byg/blockstates/skyris_door.json | 148 +- .../assets/byg/blockstates/skyris_fence.json | 36 +- .../byg/blockstates/skyris_fence_gate.json | 100 +- .../assets/byg/blockstates/skyris_slab.json | 6 +- .../assets/byg/blockstates/skyris_stairs.json | 280 +- .../byg/blockstates/skyris_trapdoor.json | 70 +- .../byg/blockstates/sythian_button.json | 124 +- .../assets/byg/blockstates/sythian_door.json | 148 +- .../assets/byg/blockstates/sythian_fence.json | 36 +- .../byg/blockstates/sythian_fence_gate.json | 100 +- .../assets/byg/blockstates/sythian_slab.json | 6 +- .../byg/blockstates/sythian_stairs.json | 280 +- .../byg/blockstates/sythian_trapdoor.json | 70 +- .../assets/byg/blockstates/willow_button.json | 124 +- .../assets/byg/blockstates/willow_door.json | 148 +- .../assets/byg/blockstates/willow_fence.json | 36 +- .../byg/blockstates/willow_fence_gate.json | 100 +- .../assets/byg/blockstates/willow_slab.json | 6 +- .../assets/byg/blockstates/willow_stairs.json | 280 +- .../byg/blockstates/willow_trapdoor.json | 70 +- .../byg/blockstates/witch_hazel_button.json | 124 +- .../byg/blockstates/witch_hazel_door.json | 148 +- .../byg/blockstates/witch_hazel_fence.json | 36 +- .../blockstates/witch_hazel_fence_gate.json | 100 +- .../byg/blockstates/witch_hazel_slab.json | 6 +- .../byg/blockstates/witch_hazel_stairs.json | 280 +- .../byg/blockstates/witch_hazel_trapdoor.json | 70 +- .../byg/blockstates/zelkova_button.json | 124 +- .../assets/byg/blockstates/zelkova_door.json | 148 +- .../assets/byg/blockstates/zelkova_fence.json | 36 +- .../byg/blockstates/zelkova_fence_gate.json | 100 +- .../assets/byg/blockstates/zelkova_slab.json | 6 +- .../byg/blockstates/zelkova_stairs.json | 280 +- .../byg/blockstates/zelkova_trapdoor.json | 70 +- .../byg/models/block/aspen/bookshelf.json | 8 +- .../models/block/aspen/crafting_table.json | 8 +- .../bottom_left.json} | 2 +- .../block/aspen/door/bottom_left_open.json | 7 + .../{door_top.json => door/bottom_right.json} | 2 +- .../block/aspen/door/bottom_right_open.json | 7 + .../top_left.json} | 2 +- .../block/aspen/door/top_left_open.json | 7 + .../{door_bottom.json => door/top_right.json} | 2 +- .../block/aspen/door/top_right_open.json | 7 + .../assets/byg/models/block/aspen/fence.json | 4 +- .../byg/models/block/aspen/fence_inv.json | 4 +- .../byg/models/block/aspen/fence_post.json | 4 +- .../byg/models/block/aspen/leaves_snowy.json | 8 +- .../assets/byg/models/block/aspen/log.json | 4 +- .../assets/byg/models/block/aspen/planks.json | 8 +- .../assets/byg/models/block/aspen/slab.json | 2 +- .../byg/models/block/aspen/slab_top.json | 2 +- .../assets/byg/models/block/aspen/stairs.json | 2 +- .../byg/models/block/aspen/stairs_inner.json | 2 +- .../byg/models/block/aspen/stairs_outer.json | 2 +- .../byg/models/block/aspen/stripped_log.json | 4 +- .../byg/models/block/baobab/bookshelf.json | 8 +- .../models/block/baobab/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/baobab/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/baobab/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/baobab/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/baobab/door/top_right_open.json | 7 + .../assets/byg/models/block/baobab/fence.json | 4 +- .../byg/models/block/baobab/fence_inv.json | 4 +- .../byg/models/block/baobab/fence_post.json | 4 +- .../byg/models/block/baobab/leaves_snowy.json | 8 +- .../assets/byg/models/block/baobab/log.json | 4 +- .../byg/models/block/baobab/planks.json | 8 +- .../assets/byg/models/block/baobab/slab.json | 2 +- .../byg/models/block/baobab/slab_top.json | 2 +- .../byg/models/block/baobab/stairs.json | 2 +- .../byg/models/block/baobab/stairs_inner.json | 2 +- .../byg/models/block/baobab/stairs_outer.json | 2 +- .../byg/models/block/baobab/stripped_log.json | 4 +- .../block/blue_enchanted/bookshelf.json | 8 +- .../block/blue_enchanted/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../blue_enchanted/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../blue_enchanted/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../blue_enchanted/door/top_right_open.json | 7 + .../models/block/blue_enchanted/fence.json | 4 +- .../block/blue_enchanted/fence_inv.json | 4 +- .../block/blue_enchanted/fence_post.json | 4 +- .../block/blue_enchanted/leaves_snowy.json | 8 +- .../byg/models/block/blue_enchanted/log.json | 4 +- .../models/block/blue_enchanted/planks.json | 8 +- .../byg/models/block/blue_enchanted/slab.json | 2 +- .../models/block/blue_enchanted/slab_top.json | 2 +- .../models/block/blue_enchanted/stairs.json | 2 +- .../block/blue_enchanted/stairs_inner.json | 2 +- .../block/blue_enchanted/stairs_outer.json | 2 +- .../block/blue_enchanted/stripped_log.json | 4 +- .../byg/models/block/bulbis/bookshelf.json | 8 +- .../models/block/bulbis/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/bulbis/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/bulbis/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/bulbis/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/bulbis/door/top_right_open.json | 7 + .../assets/byg/models/block/bulbis/fence.json | 4 +- .../byg/models/block/bulbis/fence_inv.json | 4 +- .../byg/models/block/bulbis/fence_post.json | 4 +- .../assets/byg/models/block/bulbis/log.json | 4 +- .../byg/models/block/bulbis/planks.json | 8 +- .../assets/byg/models/block/bulbis/slab.json | 2 +- .../byg/models/block/bulbis/slab_top.json | 2 +- .../byg/models/block/bulbis/stairs.json | 2 +- .../byg/models/block/bulbis/stairs_inner.json | 2 +- .../byg/models/block/bulbis/stairs_outer.json | 2 +- .../byg/models/block/bulbis/stripped_log.json | 4 +- .../byg/models/block/cherry/bookshelf.json | 8 +- .../models/block/cherry/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/cherry/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/cherry/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/cherry/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/cherry/door/top_right_open.json | 7 + .../assets/byg/models/block/cherry/fence.json | 4 +- .../byg/models/block/cherry/fence_inv.json | 4 +- .../byg/models/block/cherry/fence_post.json | 4 +- .../assets/byg/models/block/cherry/log.json | 4 +- .../byg/models/block/cherry/planks.json | 8 +- .../assets/byg/models/block/cherry/slab.json | 2 +- .../byg/models/block/cherry/slab_top.json | 2 +- .../byg/models/block/cherry/stairs.json | 2 +- .../byg/models/block/cherry/stairs_inner.json | 2 +- .../byg/models/block/cherry/stairs_outer.json | 2 +- .../byg/models/block/cherry/stripped_log.json | 4 +- .../byg/models/block/cika/bookshelf.json | 8 +- .../byg/models/block/cika/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/cika/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/cika/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../models/block/cika/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/cika/door/top_right_open.json | 7 + .../assets/byg/models/block/cika/fence.json | 4 +- .../byg/models/block/cika/fence_inv.json | 4 +- .../byg/models/block/cika/fence_post.json | 4 +- .../byg/models/block/cika/leaves_snowy.json | 8 +- .../assets/byg/models/block/cika/log.json | 4 +- .../assets/byg/models/block/cika/planks.json | 8 +- .../assets/byg/models/block/cika/slab.json | 2 +- .../byg/models/block/cika/slab_top.json | 2 +- .../assets/byg/models/block/cika/stairs.json | 2 +- .../byg/models/block/cika/stairs_inner.json | 2 +- .../byg/models/block/cika/stairs_outer.json | 2 +- .../byg/models/block/cika/stripped_log.json | 4 +- .../byg/models/block/cypress/bookshelf.json | 8 +- .../models/block/cypress/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/cypress/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/cypress/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/cypress/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/cypress/door/top_right_open.json | 7 + .../byg/models/block/cypress/fence.json | 4 +- .../byg/models/block/cypress/fence_inv.json | 4 +- .../byg/models/block/cypress/fence_post.json | 4 +- .../models/block/cypress/leaves_snowy.json | 8 +- .../assets/byg/models/block/cypress/log.json | 4 +- .../byg/models/block/cypress/planks.json | 8 +- .../assets/byg/models/block/cypress/slab.json | 2 +- .../byg/models/block/cypress/slab_top.json | 2 +- .../byg/models/block/cypress/stairs.json | 2 +- .../models/block/cypress/stairs_inner.json | 2 +- .../models/block/cypress/stairs_outer.json | 2 +- .../models/block/cypress/stripped_log.json | 4 +- .../byg/models/block/ebony/bookshelf.json | 8 +- .../models/block/ebony/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/ebony/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/ebony/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/ebony/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/ebony/door/top_right_open.json | 7 + .../assets/byg/models/block/ebony/fence.json | 4 +- .../byg/models/block/ebony/fence_inv.json | 4 +- .../byg/models/block/ebony/fence_post.json | 4 +- .../byg/models/block/ebony/leaves_snowy.json | 8 +- .../assets/byg/models/block/ebony/log.json | 4 +- .../assets/byg/models/block/ebony/planks.json | 8 +- .../assets/byg/models/block/ebony/slab.json | 2 +- .../byg/models/block/ebony/slab_top.json | 2 +- .../assets/byg/models/block/ebony/stairs.json | 2 +- .../byg/models/block/ebony/stairs_inner.json | 2 +- .../byg/models/block/ebony/stairs_outer.json | 2 +- .../byg/models/block/ebony/stripped_log.json | 4 +- .../byg/models/block/embur/bookshelf.json | 8 +- .../models/block/embur/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/embur/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/embur/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/embur/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/embur/door/top_right_open.json | 7 + .../assets/byg/models/block/embur/fence.json | 4 +- .../byg/models/block/embur/fence_inv.json | 4 +- .../byg/models/block/embur/fence_post.json | 4 +- .../assets/byg/models/block/embur/log.json | 4 +- .../assets/byg/models/block/embur/planks.json | 8 +- .../assets/byg/models/block/embur/slab.json | 2 +- .../byg/models/block/embur/slab_top.json | 2 +- .../assets/byg/models/block/embur/stairs.json | 2 +- .../byg/models/block/embur/stairs_inner.json | 2 +- .../byg/models/block/embur/stairs_outer.json | 2 +- .../byg/models/block/embur/stripped_log.json | 4 +- .../byg/models/block/ether/bookshelf.json | 8 +- .../models/block/ether/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/ether/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/ether/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/ether/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/ether/door/top_right_open.json | 7 + .../assets/byg/models/block/ether/fence.json | 4 +- .../byg/models/block/ether/fence_inv.json | 4 +- .../byg/models/block/ether/fence_post.json | 4 +- .../byg/models/block/ether/leaves_snowy.json | 8 +- .../assets/byg/models/block/ether/log.json | 4 +- .../assets/byg/models/block/ether/planks.json | 8 +- .../assets/byg/models/block/ether/slab.json | 2 +- .../byg/models/block/ether/slab_top.json | 2 +- .../assets/byg/models/block/ether/stairs.json | 2 +- .../byg/models/block/ether/stairs_inner.json | 2 +- .../byg/models/block/ether/stairs_outer.json | 2 +- .../byg/models/block/ether/stripped_log.json | 4 +- .../byg/models/block/fir/bookshelf.json | 8 +- .../byg/models/block/fir/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/fir/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/fir/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../models/block/fir/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../models/block/fir/door/top_right_open.json | 7 + .../assets/byg/models/block/fir/fence.json | 4 +- .../byg/models/block/fir/fence_inv.json | 4 +- .../byg/models/block/fir/fence_post.json | 4 +- .../byg/models/block/fir/leaves_snowy.json | 8 +- .../assets/byg/models/block/fir/log.json | 4 +- .../assets/byg/models/block/fir/planks.json | 8 +- .../assets/byg/models/block/fir/slab.json | 2 +- .../assets/byg/models/block/fir/slab_top.json | 2 +- .../assets/byg/models/block/fir/stairs.json | 2 +- .../byg/models/block/fir/stairs_inner.json | 2 +- .../byg/models/block/fir/stairs_outer.json | 2 +- .../byg/models/block/fir/stripped_log.json | 4 +- .../block/green_enchanted/bookshelf.json | 8 +- .../block/green_enchanted/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../green_enchanted/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../green_enchanted/door/top_right_open.json | 7 + .../models/block/green_enchanted/fence.json | 4 +- .../block/green_enchanted/fence_inv.json | 4 +- .../block/green_enchanted/fence_post.json | 4 +- .../block/green_enchanted/leaves_snowy.json | 8 +- .../byg/models/block/green_enchanted/log.json | 4 +- .../models/block/green_enchanted/planks.json | 8 +- .../models/block/green_enchanted/slab.json | 2 +- .../block/green_enchanted/slab_top.json | 2 +- .../models/block/green_enchanted/stairs.json | 2 +- .../block/green_enchanted/stairs_inner.json | 2 +- .../block/green_enchanted/stairs_outer.json | 2 +- .../block/green_enchanted/stripped_log.json | 4 +- .../byg/models/block/holly/bookshelf.json | 8 +- .../models/block/holly/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/holly/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/holly/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/holly/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/holly/door/top_right_open.json | 7 + .../assets/byg/models/block/holly/fence.json | 4 +- .../byg/models/block/holly/fence_inv.json | 4 +- .../byg/models/block/holly/fence_post.json | 4 +- .../byg/models/block/holly/leaves_snowy.json | 8 +- .../assets/byg/models/block/holly/log.json | 4 +- .../assets/byg/models/block/holly/planks.json | 8 +- .../assets/byg/models/block/holly/slab.json | 2 +- .../byg/models/block/holly/slab_top.json | 2 +- .../assets/byg/models/block/holly/stairs.json | 2 +- .../byg/models/block/holly/stairs_inner.json | 2 +- .../byg/models/block/holly/stairs_outer.json | 2 +- .../byg/models/block/holly/stripped_log.json | 4 +- .../byg/models/block/imparius/bookshelf.json | 8 +- .../models/block/imparius/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/imparius/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../imparius/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/imparius/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/imparius/door/top_right_open.json | 7 + .../byg/models/block/imparius/fence.json | 4 +- .../byg/models/block/imparius/fence_inv.json | 4 +- .../byg/models/block/imparius/fence_post.json | 4 +- .../assets/byg/models/block/imparius/log.json | 4 +- .../byg/models/block/imparius/planks.json | 8 +- .../byg/models/block/imparius/slab.json | 2 +- .../byg/models/block/imparius/slab_top.json | 2 +- .../byg/models/block/imparius/stairs.json | 2 +- .../models/block/imparius/stairs_inner.json | 2 +- .../models/block/imparius/stairs_outer.json | 2 +- .../byg/models/block/jacaranda/bookshelf.json | 8 +- .../block/jacaranda/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../jacaranda/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../jacaranda/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/jacaranda/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/jacaranda/door/top_right_open.json | 7 + .../byg/models/block/jacaranda/fence.json | 4 +- .../byg/models/block/jacaranda/fence_inv.json | 4 +- .../models/block/jacaranda/fence_post.json | 4 +- .../models/block/jacaranda/leaves_snowy.json | 8 +- .../byg/models/block/jacaranda/log.json | 4 +- .../byg/models/block/jacaranda/planks.json | 8 +- .../byg/models/block/jacaranda/slab.json | 2 +- .../byg/models/block/jacaranda/slab_top.json | 2 +- .../byg/models/block/jacaranda/stairs.json | 2 +- .../models/block/jacaranda/stairs_inner.json | 2 +- .../models/block/jacaranda/stairs_outer.json | 2 +- .../models/block/jacaranda/stripped_log.json | 4 +- .../byg/models/block/lament/bookshelf.json | 8 +- .../models/block/lament/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/lament/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/lament/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/lament/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/lament/door/top_right_open.json | 7 + .../assets/byg/models/block/lament/fence.json | 4 +- .../byg/models/block/lament/fence_inv.json | 4 +- .../byg/models/block/lament/fence_post.json | 4 +- .../byg/models/block/lament/leaves_snowy.json | 8 +- .../assets/byg/models/block/lament/log.json | 4 +- .../byg/models/block/lament/planks.json | 8 +- .../assets/byg/models/block/lament/slab.json | 2 +- .../byg/models/block/lament/slab_top.json | 2 +- .../byg/models/block/lament/stairs.json | 2 +- .../byg/models/block/lament/stairs_inner.json | 2 +- .../byg/models/block/lament/stairs_outer.json | 2 +- .../byg/models/block/lament/stripped_log.json | 4 +- .../byg/models/block/mahogany/bookshelf.json | 8 +- .../models/block/mahogany/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/mahogany/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../mahogany/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/mahogany/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/mahogany/door/top_right_open.json | 7 + .../byg/models/block/mahogany/fence.json | 4 +- .../byg/models/block/mahogany/fence_inv.json | 4 +- .../byg/models/block/mahogany/fence_post.json | 4 +- .../byg/models/block/mahogany/leaves.json | 106 +- .../models/block/mahogany/leaves_snowy.json | 8 +- .../assets/byg/models/block/mahogany/log.json | 4 +- .../byg/models/block/mahogany/planks.json | 8 +- .../byg/models/block/mahogany/slab.json | 2 +- .../byg/models/block/mahogany/slab_top.json | 2 +- .../byg/models/block/mahogany/stairs.json | 2 +- .../models/block/mahogany/stairs_inner.json | 2 +- .../models/block/mahogany/stairs_outer.json | 2 +- .../models/block/mahogany/stripped_log.json | 4 +- .../byg/models/block/mangrove/bookshelf.json | 8 +- .../models/block/mangrove/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/mangrove/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../mangrove/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/mangrove/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/mangrove/door/top_right_open.json | 7 + .../byg/models/block/mangrove/fence.json | 4 +- .../byg/models/block/mangrove/fence_inv.json | 4 +- .../byg/models/block/mangrove/fence_post.json | 4 +- .../models/block/mangrove/leaves_snowy.json | 8 +- .../assets/byg/models/block/mangrove/log.json | 4 +- .../byg/models/block/mangrove/planks.json | 8 +- .../byg/models/block/mangrove/slab.json | 2 +- .../byg/models/block/mangrove/slab_top.json | 2 +- .../byg/models/block/mangrove/stairs.json | 2 +- .../models/block/mangrove/stairs_inner.json | 2 +- .../models/block/mangrove/stairs_outer.json | 2 +- .../models/block/mangrove/stripped_log.json | 4 +- .../byg/models/block/maple/bookshelf.json | 8 +- .../models/block/maple/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/maple/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/maple/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/maple/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/maple/door/top_right_open.json | 7 + .../assets/byg/models/block/maple/fence.json | 4 +- .../byg/models/block/maple/fence_inv.json | 4 +- .../byg/models/block/maple/fence_post.json | 4 +- .../byg/models/block/maple/leaves_snowy.json | 8 +- .../assets/byg/models/block/maple/log.json | 4 +- .../assets/byg/models/block/maple/planks.json | 8 +- .../assets/byg/models/block/maple/slab.json | 2 +- .../byg/models/block/maple/slab_top.json | 2 +- .../assets/byg/models/block/maple/stairs.json | 2 +- .../byg/models/block/maple/stairs_inner.json | 2 +- .../byg/models/block/maple/stairs_outer.json | 2 +- .../byg/models/block/maple/stripped_log.json | 4 +- .../models/block/nightshade/bookshelf.json | 8 +- .../block/nightshade/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../nightshade/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../nightshade/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/nightshade/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/nightshade/door/top_right_open.json | 7 + .../byg/models/block/nightshade/fence.json | 4 +- .../models/block/nightshade/fence_inv.json | 4 +- .../models/block/nightshade/fence_post.json | 4 +- .../models/block/nightshade/leaves_snowy.json | 8 +- .../byg/models/block/nightshade/log.json | 4 +- .../byg/models/block/nightshade/planks.json | 8 +- .../byg/models/block/nightshade/slab.json | 2 +- .../byg/models/block/nightshade/slab_top.json | 2 +- .../byg/models/block/nightshade/stairs.json | 2 +- .../models/block/nightshade/stairs_inner.json | 2 +- .../models/block/nightshade/stairs_outer.json | 2 +- .../models/block/nightshade/stripped_log.json | 4 +- .../byg/models/block/palm/bookshelf.json | 8 +- .../byg/models/block/palm/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/palm/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/palm/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../models/block/palm/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/palm/door/top_right_open.json | 7 + .../assets/byg/models/block/palm/fence.json | 4 +- .../byg/models/block/palm/fence_inv.json | 4 +- .../byg/models/block/palm/fence_post.json | 4 +- .../byg/models/block/palm/leaves_snowy.json | 8 +- .../assets/byg/models/block/palm/log.json | 4 +- .../assets/byg/models/block/palm/planks.json | 8 +- .../assets/byg/models/block/palm/slab.json | 2 +- .../byg/models/block/palm/slab_top.json | 2 +- .../assets/byg/models/block/palm/stairs.json | 2 +- .../byg/models/block/palm/stairs_inner.json | 2 +- .../byg/models/block/palm/stairs_outer.json | 2 +- .../byg/models/block/palm/stripped_log.json | 4 +- .../byg/models/block/pine/bookshelf.json | 8 +- .../byg/models/block/pine/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/pine/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/pine/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../models/block/pine/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/pine/door/top_right_open.json | 7 + .../assets/byg/models/block/pine/fence.json | 4 +- .../byg/models/block/pine/fence_inv.json | 4 +- .../byg/models/block/pine/fence_post.json | 4 +- .../byg/models/block/pine/leaves_snowy.json | 8 +- .../assets/byg/models/block/pine/log.json | 4 +- .../assets/byg/models/block/pine/planks.json | 8 +- .../assets/byg/models/block/pine/slab.json | 2 +- .../byg/models/block/pine/slab_top.json | 2 +- .../assets/byg/models/block/pine/stairs.json | 2 +- .../byg/models/block/pine/stairs_inner.json | 2 +- .../byg/models/block/pine/stairs_outer.json | 2 +- .../byg/models/block/pine/stripped_log.json | 4 +- .../block/rainbow_eucalyptus/bookshelf.json | 8 +- .../rainbow_eucalyptus/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../door/top_right_open.json | 7 + .../block/rainbow_eucalyptus/fence.json | 4 +- .../block/rainbow_eucalyptus/fence_inv.json | 4 +- .../block/rainbow_eucalyptus/fence_post.json | 4 +- .../rainbow_eucalyptus/leaves_snowy.json | 8 +- .../models/block/rainbow_eucalyptus/log.json | 4 +- .../block/rainbow_eucalyptus/planks.json | 8 +- .../models/block/rainbow_eucalyptus/slab.json | 2 +- .../block/rainbow_eucalyptus/slab_top.json | 2 +- .../block/rainbow_eucalyptus/stairs.json | 2 +- .../rainbow_eucalyptus/stairs_inner.json | 2 +- .../rainbow_eucalyptus/stairs_outer.json | 2 +- .../rainbow_eucalyptus/stripped_log.json | 4 +- .../byg/models/block/redwood/bookshelf.json | 8 +- .../models/block/redwood/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/redwood/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/redwood/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/redwood/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/redwood/door/top_right_open.json | 7 + .../byg/models/block/redwood/fence.json | 4 +- .../byg/models/block/redwood/fence_inv.json | 4 +- .../byg/models/block/redwood/fence_post.json | 4 +- .../models/block/redwood/leaves_snowy.json | 8 +- .../assets/byg/models/block/redwood/log.json | 4 +- .../byg/models/block/redwood/planks.json | 8 +- .../assets/byg/models/block/redwood/slab.json | 2 +- .../byg/models/block/redwood/slab_top.json | 2 +- .../byg/models/block/redwood/stairs.json | 2 +- .../models/block/redwood/stairs_inner.json | 2 +- .../models/block/redwood/stairs_outer.json | 2 +- .../models/block/redwood/stripped_log.json | 4 +- .../byg/models/block/skyris/bookshelf.json | 8 +- .../models/block/skyris/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/skyris/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/skyris/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/skyris/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/skyris/door/top_right_open.json | 7 + .../assets/byg/models/block/skyris/fence.json | 4 +- .../byg/models/block/skyris/fence_inv.json | 4 +- .../byg/models/block/skyris/fence_post.json | 4 +- .../byg/models/block/skyris/leaves_snowy.json | 8 +- .../assets/byg/models/block/skyris/log.json | 4 +- .../byg/models/block/skyris/planks.json | 8 +- .../assets/byg/models/block/skyris/slab.json | 2 +- .../byg/models/block/skyris/slab_top.json | 2 +- .../byg/models/block/skyris/stairs.json | 2 +- .../byg/models/block/skyris/stairs_inner.json | 2 +- .../byg/models/block/skyris/stairs_outer.json | 2 +- .../byg/models/block/skyris/stripped_log.json | 4 +- .../byg/models/block/sythian/bookshelf.json | 8 +- .../models/block/sythian/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/sythian/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/sythian/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/sythian/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/sythian/door/top_right_open.json | 7 + .../byg/models/block/sythian/fence.json | 4 +- .../byg/models/block/sythian/fence_inv.json | 4 +- .../byg/models/block/sythian/fence_post.json | 4 +- .../models/block/sythian/leaves_snowy.json | 8 +- .../assets/byg/models/block/sythian/log.json | 4 +- .../byg/models/block/sythian/planks.json | 8 +- .../assets/byg/models/block/sythian/slab.json | 2 +- .../byg/models/block/sythian/slab_top.json | 2 +- .../byg/models/block/sythian/stairs.json | 2 +- .../models/block/sythian/stairs_inner.json | 2 +- .../models/block/sythian/stairs_outer.json | 2 +- .../models/block/sythian/stripped_log.json | 4 +- .../byg/models/block/willow/bookshelf.json | 8 +- .../models/block/willow/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/willow/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/willow/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/willow/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/willow/door/top_right_open.json | 7 + .../assets/byg/models/block/willow/fence.json | 4 +- .../byg/models/block/willow/fence_inv.json | 4 +- .../byg/models/block/willow/fence_post.json | 4 +- .../byg/models/block/willow/leaves.json | 106 +- .../byg/models/block/willow/leaves_snowy.json | 8 +- .../assets/byg/models/block/willow/log.json | 4 +- .../byg/models/block/willow/planks.json | 8 +- .../assets/byg/models/block/willow/slab.json | 2 +- .../byg/models/block/willow/slab_top.json | 2 +- .../byg/models/block/willow/stairs.json | 2 +- .../byg/models/block/willow/stairs_inner.json | 2 +- .../byg/models/block/willow/stairs_outer.json | 2 +- .../byg/models/block/willow/stripped_log.json | 4 +- .../models/block/witch_hazel/bookshelf.json | 8 +- .../block/witch_hazel/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../witch_hazel/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../witch_hazel/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/witch_hazel/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../witch_hazel/door/top_right_open.json | 7 + .../byg/models/block/witch_hazel/fence.json | 4 +- .../models/block/witch_hazel/fence_inv.json | 4 +- .../models/block/witch_hazel/fence_post.json | 4 +- .../block/witch_hazel/leaves_snowy.json | 8 +- .../byg/models/block/witch_hazel/log.json | 4 +- .../byg/models/block/witch_hazel/planks.json | 8 +- .../byg/models/block/witch_hazel/slab.json | 2 +- .../models/block/witch_hazel/slab_top.json | 2 +- .../byg/models/block/witch_hazel/stairs.json | 2 +- .../block/witch_hazel/stairs_inner.json | 2 +- .../block/witch_hazel/stairs_outer.json | 2 +- .../block/witch_hazel/stripped_log.json | 4 +- .../byg/models/block/zelkova/bookshelf.json | 8 +- .../models/block/zelkova/crafting_table.json | 8 +- .../{door_top.json => door/bottom_left.json} | 2 +- .../block/zelkova/door/bottom_left_open.json | 7 + .../bottom_right.json} | 2 +- .../block/zelkova/door/bottom_right_open.json | 7 + .../{door_bottom.json => door/top_left.json} | 2 +- .../block/zelkova/door/top_left_open.json | 7 + .../top_right.json} | 2 +- .../block/zelkova/door/top_right_open.json | 7 + .../byg/models/block/zelkova/fence.json | 4 +- .../byg/models/block/zelkova/fence_inv.json | 4 +- .../byg/models/block/zelkova/fence_post.json | 4 +- .../models/block/zelkova/leaves_snowy.json | 8 +- .../assets/byg/models/block/zelkova/log.json | 4 +- .../byg/models/block/zelkova/planks.json | 8 +- .../assets/byg/models/block/zelkova/slab.json | 2 +- .../byg/models/block/zelkova/slab_top.json | 2 +- .../byg/models/block/zelkova/stairs.json | 2 +- .../models/block/zelkova/stairs_inner.json | 2 +- .../models/block/zelkova/stairs_outer.json | 2 +- .../models/block/zelkova/stripped_log.json | 4 +- .../byg/models/item/aspen_bookshelf.json | 20 +- .../assets/byg/models/item/aspen_button.json | 20 +- .../byg/models/item/aspen_crafting_table.json | 20 +- .../assets/byg/models/item/aspen_fence.json | 20 +- .../byg/models/item/aspen_fence_gate.json | 20 +- .../assets/byg/models/item/aspen_leaves.json | 20 +- .../assets/byg/models/item/aspen_log.json | 20 +- .../assets/byg/models/item/aspen_planks.json | 20 +- .../byg/models/item/aspen_pressure_plate.json | 20 +- .../assets/byg/models/item/aspen_slab.json | 20 +- .../assets/byg/models/item/aspen_stairs.json | 20 +- .../byg/models/item/aspen_trapdoor.json | 20 +- .../assets/byg/models/item/aspen_wood.json | 20 +- .../byg/models/item/baobab_bookshelf.json | 20 +- .../assets/byg/models/item/baobab_button.json | 20 +- .../models/item/baobab_crafting_table.json | 20 +- .../assets/byg/models/item/baobab_fence.json | 20 +- .../byg/models/item/baobab_fence_gate.json | 20 +- .../assets/byg/models/item/baobab_leaves.json | 20 +- .../assets/byg/models/item/baobab_log.json | 20 +- .../assets/byg/models/item/baobab_planks.json | 20 +- .../models/item/baobab_pressure_plate.json | 20 +- .../assets/byg/models/item/baobab_slab.json | 20 +- .../assets/byg/models/item/baobab_stairs.json | 20 +- .../byg/models/item/baobab_trapdoor.json | 20 +- .../assets/byg/models/item/baobab_wood.json | 20 +- .../models/item/blue_enchanted_bookshelf.json | 20 +- .../models/item/blue_enchanted_button.json | 20 +- .../item/blue_enchanted_crafting_table.json | 20 +- .../byg/models/item/blue_enchanted_fence.json | 20 +- .../item/blue_enchanted_fence_gate.json | 20 +- .../models/item/blue_enchanted_leaves.json | 20 +- .../byg/models/item/blue_enchanted_log.json | 20 +- .../models/item/blue_enchanted_planks.json | 20 +- .../item/blue_enchanted_pressure_plate.json | 20 +- .../byg/models/item/blue_enchanted_slab.json | 20 +- .../models/item/blue_enchanted_stairs.json | 20 +- .../models/item/blue_enchanted_trapdoor.json | 20 +- .../byg/models/item/blue_enchanted_wood.json | 20 +- .../byg/models/item/bulbis_bookshelf.json | 20 +- .../assets/byg/models/item/bulbis_button.json | 20 +- .../models/item/bulbis_crafting_table.json | 20 +- .../assets/byg/models/item/bulbis_fence.json | 20 +- .../byg/models/item/bulbis_fence_gate.json | 20 +- .../assets/byg/models/item/bulbis_planks.json | 20 +- .../models/item/bulbis_pressure_plate.json | 20 +- .../assets/byg/models/item/bulbis_slab.json | 20 +- .../assets/byg/models/item/bulbis_stairs.json | 20 +- .../assets/byg/models/item/bulbis_stem.json | 20 +- .../byg/models/item/bulbis_trapdoor.json | 20 +- .../assets/byg/models/item/bulbis_wood.json | 20 +- .../byg/models/item/cherry_bookshelf.json | 20 +- .../assets/byg/models/item/cherry_button.json | 20 +- .../models/item/cherry_crafting_table.json | 20 +- .../assets/byg/models/item/cherry_fence.json | 20 +- .../byg/models/item/cherry_fence_gate.json | 20 +- .../assets/byg/models/item/cherry_log.json | 20 +- .../assets/byg/models/item/cherry_planks.json | 20 +- .../models/item/cherry_pressure_plate.json | 20 +- .../assets/byg/models/item/cherry_slab.json | 20 +- .../assets/byg/models/item/cherry_stairs.json | 20 +- .../byg/models/item/cherry_trapdoor.json | 20 +- .../assets/byg/models/item/cherry_wood.json | 20 +- .../byg/models/item/cika_bookshelf.json | 20 +- .../assets/byg/models/item/cika_button.json | 20 +- .../byg/models/item/cika_crafting_table.json | 20 +- .../assets/byg/models/item/cika_fence.json | 20 +- .../byg/models/item/cika_fence_gate.json | 20 +- .../assets/byg/models/item/cika_leaves.json | 20 +- .../assets/byg/models/item/cika_log.json | 20 +- .../assets/byg/models/item/cika_planks.json | 20 +- .../byg/models/item/cika_pressure_plate.json | 20 +- .../assets/byg/models/item/cika_slab.json | 20 +- .../assets/byg/models/item/cika_stairs.json | 20 +- .../assets/byg/models/item/cika_trapdoor.json | 20 +- .../assets/byg/models/item/cika_wood.json | 20 +- .../byg/models/item/cypress_bookshelf.json | 20 +- .../byg/models/item/cypress_button.json | 20 +- .../models/item/cypress_crafting_table.json | 20 +- .../assets/byg/models/item/cypress_fence.json | 20 +- .../byg/models/item/cypress_fence_gate.json | 20 +- .../byg/models/item/cypress_leaves.json | 20 +- .../assets/byg/models/item/cypress_log.json | 20 +- .../byg/models/item/cypress_planks.json | 20 +- .../models/item/cypress_pressure_plate.json | 20 +- .../assets/byg/models/item/cypress_slab.json | 20 +- .../byg/models/item/cypress_stairs.json | 20 +- .../byg/models/item/cypress_trapdoor.json | 20 +- .../assets/byg/models/item/cypress_wood.json | 20 +- .../byg/models/item/ebony_bookshelf.json | 20 +- .../assets/byg/models/item/ebony_button.json | 20 +- .../byg/models/item/ebony_crafting_table.json | 20 +- .../assets/byg/models/item/ebony_fence.json | 20 +- .../byg/models/item/ebony_fence_gate.json | 20 +- .../assets/byg/models/item/ebony_leaves.json | 20 +- .../assets/byg/models/item/ebony_log.json | 20 +- .../assets/byg/models/item/ebony_planks.json | 20 +- .../byg/models/item/ebony_pressure_plate.json | 20 +- .../assets/byg/models/item/ebony_slab.json | 20 +- .../assets/byg/models/item/ebony_stairs.json | 20 +- .../byg/models/item/ebony_trapdoor.json | 20 +- .../assets/byg/models/item/ebony_wood.json | 20 +- .../byg/models/item/embur_bookshelf.json | 20 +- .../assets/byg/models/item/embur_button.json | 20 +- .../byg/models/item/embur_crafting_table.json | 20 +- .../assets/byg/models/item/embur_fence.json | 20 +- .../byg/models/item/embur_fence_gate.json | 20 +- .../assets/byg/models/item/embur_hyphae.json | 20 +- .../assets/byg/models/item/embur_pedu.json | 20 +- .../assets/byg/models/item/embur_planks.json | 20 +- .../byg/models/item/embur_pressure_plate.json | 20 +- .../assets/byg/models/item/embur_slab.json | 20 +- .../assets/byg/models/item/embur_stairs.json | 20 +- .../byg/models/item/embur_trapdoor.json | 20 +- .../byg/models/item/ether_bookshelf.json | 20 +- .../assets/byg/models/item/ether_button.json | 20 +- .../byg/models/item/ether_crafting_table.json | 20 +- .../assets/byg/models/item/ether_fence.json | 20 +- .../byg/models/item/ether_fence_gate.json | 20 +- .../assets/byg/models/item/ether_leaves.json | 20 +- .../assets/byg/models/item/ether_log.json | 20 +- .../assets/byg/models/item/ether_planks.json | 20 +- .../byg/models/item/ether_pressure_plate.json | 20 +- .../assets/byg/models/item/ether_slab.json | 20 +- .../assets/byg/models/item/ether_stairs.json | 20 +- .../byg/models/item/ether_trapdoor.json | 20 +- .../assets/byg/models/item/ether_wood.json | 20 +- .../assets/byg/models/item/fir_bookshelf.json | 20 +- .../assets/byg/models/item/fir_button.json | 20 +- .../byg/models/item/fir_crafting_table.json | 20 +- .../assets/byg/models/item/fir_fence.json | 20 +- .../byg/models/item/fir_fence_gate.json | 20 +- .../assets/byg/models/item/fir_leaves.json | 20 +- .../assets/byg/models/item/fir_log.json | 20 +- .../assets/byg/models/item/fir_planks.json | 20 +- .../byg/models/item/fir_pressure_plate.json | 20 +- .../assets/byg/models/item/fir_slab.json | 20 +- .../assets/byg/models/item/fir_stairs.json | 20 +- .../assets/byg/models/item/fir_trapdoor.json | 20 +- .../assets/byg/models/item/fir_wood.json | 20 +- .../item/green_enchanted_bookshelf.json | 20 +- .../models/item/green_enchanted_button.json | 20 +- .../item/green_enchanted_crafting_table.json | 20 +- .../models/item/green_enchanted_fence.json | 20 +- .../item/green_enchanted_fence_gate.json | 20 +- .../models/item/green_enchanted_leaves.json | 20 +- .../byg/models/item/green_enchanted_log.json | 20 +- .../models/item/green_enchanted_planks.json | 20 +- .../item/green_enchanted_pressure_plate.json | 20 +- .../byg/models/item/green_enchanted_slab.json | 20 +- .../models/item/green_enchanted_stairs.json | 20 +- .../models/item/green_enchanted_trapdoor.json | 20 +- .../byg/models/item/green_enchanted_wood.json | 20 +- .../byg/models/item/holly_bookshelf.json | 20 +- .../assets/byg/models/item/holly_button.json | 20 +- .../byg/models/item/holly_crafting_table.json | 20 +- .../assets/byg/models/item/holly_fence.json | 20 +- .../byg/models/item/holly_fence_gate.json | 20 +- .../assets/byg/models/item/holly_leaves.json | 20 +- .../assets/byg/models/item/holly_log.json | 20 +- .../assets/byg/models/item/holly_planks.json | 20 +- .../byg/models/item/holly_pressure_plate.json | 20 +- .../assets/byg/models/item/holly_slab.json | 20 +- .../assets/byg/models/item/holly_stairs.json | 20 +- .../byg/models/item/holly_trapdoor.json | 20 +- .../assets/byg/models/item/holly_wood.json | 20 +- .../byg/models/item/imparius_bookshelf.json | 20 +- .../byg/models/item/imparius_button.json | 20 +- .../models/item/imparius_crafting_table.json | 20 +- .../byg/models/item/imparius_fence.json | 20 +- .../byg/models/item/imparius_fence_gate.json | 20 +- .../byg/models/item/imparius_hyphae.json | 20 +- .../byg/models/item/imparius_planks.json | 20 +- .../models/item/imparius_pressure_plate.json | 20 +- .../assets/byg/models/item/imparius_slab.json | 20 +- .../byg/models/item/imparius_stairs.json | 20 +- .../assets/byg/models/item/imparius_stem.json | 20 +- .../byg/models/item/imparius_trapdoor.json | 20 +- .../byg/models/item/jacaranda_bookshelf.json | 20 +- .../byg/models/item/jacaranda_button.json | 20 +- .../models/item/jacaranda_crafting_table.json | 20 +- .../byg/models/item/jacaranda_fence.json | 20 +- .../byg/models/item/jacaranda_fence_gate.json | 20 +- .../byg/models/item/jacaranda_leaves.json | 20 +- .../assets/byg/models/item/jacaranda_log.json | 20 +- .../byg/models/item/jacaranda_planks.json | 20 +- .../models/item/jacaranda_pressure_plate.json | 20 +- .../byg/models/item/jacaranda_slab.json | 20 +- .../byg/models/item/jacaranda_stairs.json | 20 +- .../byg/models/item/jacaranda_trapdoor.json | 20 +- .../byg/models/item/jacaranda_wood.json | 20 +- .../byg/models/item/lament_bookshelf.json | 20 +- .../assets/byg/models/item/lament_button.json | 20 +- .../models/item/lament_crafting_table.json | 20 +- .../assets/byg/models/item/lament_fence.json | 20 +- .../byg/models/item/lament_fence_gate.json | 20 +- .../assets/byg/models/item/lament_leaves.json | 20 +- .../assets/byg/models/item/lament_log.json | 20 +- .../assets/byg/models/item/lament_planks.json | 20 +- .../models/item/lament_pressure_plate.json | 20 +- .../assets/byg/models/item/lament_slab.json | 20 +- .../assets/byg/models/item/lament_stairs.json | 20 +- .../byg/models/item/lament_trapdoor.json | 20 +- .../assets/byg/models/item/lament_wood.json | 20 +- .../byg/models/item/mahogany_bookshelf.json | 20 +- .../byg/models/item/mahogany_button.json | 20 +- .../models/item/mahogany_crafting_table.json | 20 +- .../byg/models/item/mahogany_fence.json | 20 +- .../byg/models/item/mahogany_fence_gate.json | 20 +- .../byg/models/item/mahogany_leaves.json | 20 +- .../assets/byg/models/item/mahogany_log.json | 20 +- .../byg/models/item/mahogany_planks.json | 20 +- .../models/item/mahogany_pressure_plate.json | 20 +- .../assets/byg/models/item/mahogany_slab.json | 20 +- .../byg/models/item/mahogany_stairs.json | 20 +- .../byg/models/item/mahogany_trapdoor.json | 20 +- .../assets/byg/models/item/mahogany_wood.json | 20 +- .../byg/models/item/mangrove_bookshelf.json | 20 +- .../byg/models/item/mangrove_button.json | 20 +- .../models/item/mangrove_crafting_table.json | 20 +- .../byg/models/item/mangrove_fence.json | 20 +- .../byg/models/item/mangrove_fence_gate.json | 20 +- .../byg/models/item/mangrove_leaves.json | 20 +- .../assets/byg/models/item/mangrove_log.json | 20 +- .../byg/models/item/mangrove_planks.json | 20 +- .../models/item/mangrove_pressure_plate.json | 20 +- .../assets/byg/models/item/mangrove_slab.json | 20 +- .../byg/models/item/mangrove_stairs.json | 20 +- .../byg/models/item/mangrove_trapdoor.json | 20 +- .../assets/byg/models/item/mangrove_wood.json | 20 +- .../byg/models/item/maple_bookshelf.json | 20 +- .../assets/byg/models/item/maple_button.json | 20 +- .../byg/models/item/maple_crafting_table.json | 20 +- .../assets/byg/models/item/maple_fence.json | 20 +- .../byg/models/item/maple_fence_gate.json | 20 +- .../assets/byg/models/item/maple_leaves.json | 20 +- .../assets/byg/models/item/maple_log.json | 20 +- .../assets/byg/models/item/maple_planks.json | 20 +- .../byg/models/item/maple_pressure_plate.json | 20 +- .../assets/byg/models/item/maple_slab.json | 20 +- .../assets/byg/models/item/maple_stairs.json | 20 +- .../byg/models/item/maple_trapdoor.json | 20 +- .../assets/byg/models/item/maple_wood.json | 20 +- .../byg/models/item/nightshade_bookshelf.json | 20 +- .../byg/models/item/nightshade_button.json | 20 +- .../item/nightshade_crafting_table.json | 20 +- .../byg/models/item/nightshade_fence.json | 20 +- .../models/item/nightshade_fence_gate.json | 20 +- .../byg/models/item/nightshade_leaves.json | 20 +- .../byg/models/item/nightshade_log.json | 20 +- .../byg/models/item/nightshade_planks.json | 20 +- .../item/nightshade_pressure_plate.json | 20 +- .../byg/models/item/nightshade_slab.json | 20 +- .../byg/models/item/nightshade_stairs.json | 20 +- .../byg/models/item/nightshade_trapdoor.json | 20 +- .../byg/models/item/nightshade_wood.json | 20 +- .../byg/models/item/palm_bookshelf.json | 20 +- .../assets/byg/models/item/palm_button.json | 20 +- .../byg/models/item/palm_crafting_table.json | 20 +- .../assets/byg/models/item/palm_fence.json | 20 +- .../byg/models/item/palm_fence_gate.json | 20 +- .../assets/byg/models/item/palm_leaves.json | 20 +- .../assets/byg/models/item/palm_log.json | 20 +- .../assets/byg/models/item/palm_planks.json | 20 +- .../byg/models/item/palm_pressure_plate.json | 20 +- .../assets/byg/models/item/palm_slab.json | 20 +- .../assets/byg/models/item/palm_stairs.json | 20 +- .../assets/byg/models/item/palm_trapdoor.json | 20 +- .../assets/byg/models/item/palm_wood.json | 20 +- .../byg/models/item/pine_bookshelf.json | 20 +- .../assets/byg/models/item/pine_button.json | 20 +- .../byg/models/item/pine_crafting_table.json | 20 +- .../assets/byg/models/item/pine_fence.json | 20 +- .../byg/models/item/pine_fence_gate.json | 20 +- .../assets/byg/models/item/pine_leaves.json | 20 +- .../assets/byg/models/item/pine_log.json | 20 +- .../assets/byg/models/item/pine_planks.json | 20 +- .../byg/models/item/pine_pressure_plate.json | 20 +- .../assets/byg/models/item/pine_slab.json | 20 +- .../assets/byg/models/item/pine_stairs.json | 20 +- .../assets/byg/models/item/pine_trapdoor.json | 20 +- .../assets/byg/models/item/pine_wood.json | 20 +- .../item/rainbow_eucalyptus_bookshelf.json | 20 +- .../item/rainbow_eucalyptus_button.json | 20 +- .../rainbow_eucalyptus_crafting_table.json | 20 +- .../models/item/rainbow_eucalyptus_fence.json | 20 +- .../item/rainbow_eucalyptus_fence_gate.json | 20 +- .../item/rainbow_eucalyptus_leaves.json | 20 +- .../models/item/rainbow_eucalyptus_log.json | 20 +- .../item/rainbow_eucalyptus_planks.json | 20 +- .../rainbow_eucalyptus_pressure_plate.json | 20 +- .../models/item/rainbow_eucalyptus_slab.json | 20 +- .../item/rainbow_eucalyptus_stairs.json | 20 +- .../item/rainbow_eucalyptus_trapdoor.json | 20 +- .../models/item/rainbow_eucalyptus_wood.json | 20 +- .../byg/models/item/redwood_bookshelf.json | 20 +- .../byg/models/item/redwood_button.json | 20 +- .../models/item/redwood_crafting_table.json | 20 +- .../assets/byg/models/item/redwood_fence.json | 20 +- .../byg/models/item/redwood_fence_gate.json | 20 +- .../byg/models/item/redwood_leaves.json | 20 +- .../assets/byg/models/item/redwood_log.json | 20 +- .../byg/models/item/redwood_planks.json | 20 +- .../models/item/redwood_pressure_plate.json | 20 +- .../assets/byg/models/item/redwood_slab.json | 20 +- .../byg/models/item/redwood_stairs.json | 20 +- .../byg/models/item/redwood_trapdoor.json | 20 +- .../assets/byg/models/item/redwood_wood.json | 20 +- .../byg/models/item/skyris_bookshelf.json | 20 +- .../assets/byg/models/item/skyris_button.json | 20 +- .../models/item/skyris_crafting_table.json | 20 +- .../assets/byg/models/item/skyris_fence.json | 20 +- .../byg/models/item/skyris_fence_gate.json | 20 +- .../assets/byg/models/item/skyris_leaves.json | 20 +- .../assets/byg/models/item/skyris_log.json | 20 +- .../assets/byg/models/item/skyris_planks.json | 20 +- .../models/item/skyris_pressure_plate.json | 20 +- .../assets/byg/models/item/skyris_slab.json | 20 +- .../assets/byg/models/item/skyris_stairs.json | 20 +- .../byg/models/item/skyris_trapdoor.json | 20 +- .../assets/byg/models/item/skyris_wood.json | 20 +- .../byg/models/item/stripped_aspen_log.json | 20 +- .../byg/models/item/stripped_aspen_wood.json | 20 +- .../byg/models/item/stripped_baobab_log.json | 20 +- .../byg/models/item/stripped_baobab_wood.json | 20 +- .../item/stripped_blue_enchanted_log.json | 20 +- .../item/stripped_blue_enchanted_wood.json | 20 +- .../byg/models/item/stripped_bulbis_stem.json | 20 +- .../byg/models/item/stripped_bulbis_wood.json | 20 +- .../byg/models/item/stripped_cherry_log.json | 20 +- .../byg/models/item/stripped_cherry_wood.json | 20 +- .../byg/models/item/stripped_cika_log.json | 20 +- .../byg/models/item/stripped_cika_wood.json | 20 +- .../byg/models/item/stripped_cypress_log.json | 20 +- .../models/item/stripped_cypress_wood.json | 20 +- .../byg/models/item/stripped_ebony_log.json | 20 +- .../byg/models/item/stripped_ebony_wood.json | 20 +- .../models/item/stripped_embur_hyphae.json | 20 +- .../byg/models/item/stripped_embur_pedu.json | 20 +- .../byg/models/item/stripped_ether_log.json | 20 +- .../byg/models/item/stripped_ether_wood.json | 20 +- .../byg/models/item/stripped_fir_log.json | 20 +- .../byg/models/item/stripped_fir_wood.json | 20 +- .../item/stripped_green_enchanted_log.json | 20 +- .../item/stripped_green_enchanted_wood.json | 20 +- .../byg/models/item/stripped_holly_log.json | 20 +- .../byg/models/item/stripped_holly_wood.json | 20 +- .../models/item/stripped_jacaranda_log.json | 20 +- .../models/item/stripped_jacaranda_wood.json | 20 +- .../byg/models/item/stripped_lament_log.json | 20 +- .../byg/models/item/stripped_lament_wood.json | 20 +- .../models/item/stripped_mahogany_log.json | 20 +- .../models/item/stripped_mahogany_wood.json | 20 +- .../models/item/stripped_mangrove_log.json | 20 +- .../models/item/stripped_mangrove_wood.json | 20 +- .../byg/models/item/stripped_maple_log.json | 20 +- .../byg/models/item/stripped_maple_wood.json | 20 +- .../models/item/stripped_nightshade_log.json | 20 +- .../models/item/stripped_nightshade_wood.json | 20 +- .../byg/models/item/stripped_palm_log.json | 20 +- .../byg/models/item/stripped_palm_wood.json | 20 +- .../byg/models/item/stripped_pine_log.json | 20 +- .../byg/models/item/stripped_pine_wood.json | 20 +- .../item/stripped_rainbow_eucalyptus_log.json | 20 +- .../stripped_rainbow_eucalyptus_wood.json | 20 +- .../byg/models/item/stripped_redwood_log.json | 20 +- .../models/item/stripped_redwood_wood.json | 20 +- .../byg/models/item/stripped_skyris_log.json | 20 +- .../byg/models/item/stripped_skyris_wood.json | 20 +- .../models/item/stripped_sythian_hyphae.json | 20 +- .../models/item/stripped_sythian_stem.json | 20 +- .../byg/models/item/stripped_willow_log.json | 20 +- .../byg/models/item/stripped_willow_wood.json | 20 +- .../models/item/stripped_witch_hazel_log.json | 20 +- .../item/stripped_witch_hazel_wood.json | 20 +- .../byg/models/item/stripped_zelkova_log.json | 20 +- .../models/item/stripped_zelkova_wood.json | 20 +- .../byg/models/item/sythian_bookshelf.json | 20 +- .../byg/models/item/sythian_button.json | 20 +- .../models/item/sythian_crafting_table.json | 20 +- .../assets/byg/models/item/sythian_fence.json | 20 +- .../byg/models/item/sythian_fence_gate.json | 20 +- .../byg/models/item/sythian_hyphae.json | 20 +- .../byg/models/item/sythian_planks.json | 20 +- .../models/item/sythian_pressure_plate.json | 20 +- .../assets/byg/models/item/sythian_slab.json | 20 +- .../byg/models/item/sythian_stairs.json | 20 +- .../assets/byg/models/item/sythian_stem.json | 20 +- .../byg/models/item/sythian_trapdoor.json | 20 +- .../byg/models/item/sythian_wart_block.json | 20 +- .../byg/models/item/willow_bookshelf.json | 20 +- .../assets/byg/models/item/willow_button.json | 20 +- .../models/item/willow_crafting_table.json | 20 +- .../assets/byg/models/item/willow_fence.json | 20 +- .../byg/models/item/willow_fence_gate.json | 20 +- .../assets/byg/models/item/willow_leaves.json | 20 +- .../assets/byg/models/item/willow_log.json | 20 +- .../assets/byg/models/item/willow_planks.json | 20 +- .../models/item/willow_pressure_plate.json | 20 +- .../assets/byg/models/item/willow_slab.json | 20 +- .../assets/byg/models/item/willow_stairs.json | 20 +- .../byg/models/item/willow_trapdoor.json | 20 +- .../assets/byg/models/item/willow_wood.json | 20 +- .../models/item/witch_hazel_bookshelf.json | 20 +- .../byg/models/item/witch_hazel_button.json | 20 +- .../item/witch_hazel_crafting_table.json | 20 +- .../byg/models/item/witch_hazel_fence.json | 20 +- .../models/item/witch_hazel_fence_gate.json | 20 +- .../byg/models/item/witch_hazel_leaves.json | 20 +- .../byg/models/item/witch_hazel_log.json | 20 +- .../byg/models/item/witch_hazel_planks.json | 20 +- .../item/witch_hazel_pressure_plate.json | 20 +- .../byg/models/item/witch_hazel_slab.json | 20 +- .../byg/models/item/witch_hazel_stairs.json | 20 +- .../byg/models/item/witch_hazel_trapdoor.json | 20 +- .../byg/models/item/witch_hazel_wood.json | 20 +- .../byg/models/item/zelkova_bookshelf.json | 20 +- .../byg/models/item/zelkova_button.json | 20 +- .../models/item/zelkova_crafting_table.json | 20 +- .../assets/byg/models/item/zelkova_fence.json | 20 +- .../byg/models/item/zelkova_fence_gate.json | 20 +- .../byg/models/item/zelkova_leaves.json | 20 +- .../assets/byg/models/item/zelkova_log.json | 20 +- .../byg/models/item/zelkova_planks.json | 20 +- .../models/item/zelkova_pressure_plate.json | 20 +- .../assets/byg/models/item/zelkova_slab.json | 20 +- .../byg/models/item/zelkova_stairs.json | 20 +- .../byg/models/item/zelkova_trapdoor.json | 20 +- .../assets/byg/models/item/zelkova_wood.json | 20 +- .../adventure/oh_the_biomes_youll_go.json | 1680 +++++--- .../byg/advancements/biomepedia_gift.json | 38 +- .../advancements/husbandry/berrily_alive.json | 34 +- .../byg/advancements/husbandry/forager.json | 34 +- .../advancements/husbandry/granny_smith.json | 34 +- .../husbandry/hot_diggity_not_dog.json | 44 +- .../husbandry/just_like_grandmas.json | 54 +- .../data/byg/advancements/husbandry/root.json | 26 +- .../recipes/byg.byg/wood/aspen/boat.json | 20 +- .../recipes/byg.byg/wood/aspen/bookshelf.json | 20 +- .../recipes/byg.byg/wood/aspen/button.json | 20 +- .../byg.byg/wood/aspen/crafting_table.json | 20 +- .../recipes/byg.byg/wood/aspen/door.json | 20 +- .../recipes/byg.byg/wood/aspen/fence.json | 20 +- .../byg.byg/wood/aspen/fence_gate.json | 20 +- .../recipes/byg.byg/wood/aspen/planks.json | 20 +- .../byg.byg/wood/aspen/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/aspen/sign.json | 20 +- .../recipes/byg.byg/wood/aspen/slab.json | 20 +- .../recipes/byg.byg/wood/aspen/stairs.json | 20 +- .../recipes/byg.byg/wood/aspen/trapdoor.json | 20 +- .../recipes/byg.byg/wood/aspen/wood.json | 20 +- .../recipes/byg.byg/wood/baobab/boat.json | 20 +- .../byg.byg/wood/baobab/bookshelf.json | 20 +- .../recipes/byg.byg/wood/baobab/button.json | 20 +- .../byg.byg/wood/baobab/crafting_table.json | 20 +- .../recipes/byg.byg/wood/baobab/door.json | 20 +- .../recipes/byg.byg/wood/baobab/fence.json | 20 +- .../byg.byg/wood/baobab/fence_gate.json | 20 +- .../recipes/byg.byg/wood/baobab/planks.json | 20 +- .../byg.byg/wood/baobab/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/baobab/sign.json | 20 +- .../recipes/byg.byg/wood/baobab/slab.json | 20 +- .../recipes/byg.byg/wood/baobab/stairs.json | 20 +- .../recipes/byg.byg/wood/baobab/trapdoor.json | 20 +- .../recipes/byg.byg/wood/baobab/wood.json | 20 +- .../byg.byg/wood/blue_enchanted/boat.json | 20 +- .../wood/blue_enchanted/bookshelf.json | 20 +- .../byg.byg/wood/blue_enchanted/button.json | 20 +- .../wood/blue_enchanted/crafting_table.json | 20 +- .../byg.byg/wood/blue_enchanted/door.json | 20 +- .../byg.byg/wood/blue_enchanted/fence.json | 20 +- .../wood/blue_enchanted/fence_gate.json | 20 +- .../byg.byg/wood/blue_enchanted/planks.json | 20 +- .../wood/blue_enchanted/pressure_plate.json | 20 +- .../byg.byg/wood/blue_enchanted/sign.json | 20 +- .../byg.byg/wood/blue_enchanted/slab.json | 20 +- .../byg.byg/wood/blue_enchanted/stairs.json | 20 +- .../byg.byg/wood/blue_enchanted/trapdoor.json | 20 +- .../byg.byg/wood/blue_enchanted/wood.json | 20 +- .../byg.byg/wood/bulbis/bookshelf.json | 20 +- .../recipes/byg.byg/wood/bulbis/button.json | 20 +- .../byg.byg/wood/bulbis/crafting_table.json | 20 +- .../recipes/byg.byg/wood/bulbis/door.json | 20 +- .../recipes/byg.byg/wood/bulbis/fence.json | 20 +- .../byg.byg/wood/bulbis/fence_gate.json | 20 +- .../recipes/byg.byg/wood/bulbis/planks.json | 20 +- .../byg.byg/wood/bulbis/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/bulbis/sign.json | 20 +- .../recipes/byg.byg/wood/bulbis/slab.json | 20 +- .../recipes/byg.byg/wood/bulbis/stairs.json | 20 +- .../recipes/byg.byg/wood/bulbis/trapdoor.json | 20 +- .../recipes/byg.byg/wood/bulbis/wood.json | 20 +- .../recipes/byg.byg/wood/cherry/boat.json | 20 +- .../byg.byg/wood/cherry/bookshelf.json | 20 +- .../recipes/byg.byg/wood/cherry/button.json | 20 +- .../byg.byg/wood/cherry/crafting_table.json | 20 +- .../recipes/byg.byg/wood/cherry/door.json | 20 +- .../recipes/byg.byg/wood/cherry/fence.json | 20 +- .../byg.byg/wood/cherry/fence_gate.json | 20 +- .../recipes/byg.byg/wood/cherry/planks.json | 20 +- .../byg.byg/wood/cherry/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/cherry/sign.json | 20 +- .../recipes/byg.byg/wood/cherry/slab.json | 20 +- .../recipes/byg.byg/wood/cherry/stairs.json | 20 +- .../recipes/byg.byg/wood/cherry/trapdoor.json | 20 +- .../recipes/byg.byg/wood/cherry/wood.json | 20 +- .../recipes/byg.byg/wood/cika/boat.json | 20 +- .../recipes/byg.byg/wood/cika/bookshelf.json | 20 +- .../recipes/byg.byg/wood/cika/button.json | 20 +- .../byg.byg/wood/cika/crafting_table.json | 20 +- .../recipes/byg.byg/wood/cika/door.json | 20 +- .../recipes/byg.byg/wood/cika/fence.json | 20 +- .../recipes/byg.byg/wood/cika/fence_gate.json | 20 +- .../recipes/byg.byg/wood/cika/planks.json | 20 +- .../byg.byg/wood/cika/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/cika/sign.json | 20 +- .../recipes/byg.byg/wood/cika/slab.json | 20 +- .../recipes/byg.byg/wood/cika/stairs.json | 20 +- .../recipes/byg.byg/wood/cika/trapdoor.json | 20 +- .../recipes/byg.byg/wood/cika/wood.json | 20 +- .../recipes/byg.byg/wood/cypress/boat.json | 20 +- .../byg.byg/wood/cypress/bookshelf.json | 20 +- .../recipes/byg.byg/wood/cypress/button.json | 20 +- .../byg.byg/wood/cypress/crafting_table.json | 20 +- .../recipes/byg.byg/wood/cypress/door.json | 20 +- .../recipes/byg.byg/wood/cypress/fence.json | 20 +- .../byg.byg/wood/cypress/fence_gate.json | 20 +- .../recipes/byg.byg/wood/cypress/planks.json | 20 +- .../byg.byg/wood/cypress/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/cypress/sign.json | 20 +- .../recipes/byg.byg/wood/cypress/slab.json | 20 +- .../recipes/byg.byg/wood/cypress/stairs.json | 20 +- .../byg.byg/wood/cypress/trapdoor.json | 20 +- .../recipes/byg.byg/wood/cypress/wood.json | 20 +- .../recipes/byg.byg/wood/ebony/boat.json | 20 +- .../recipes/byg.byg/wood/ebony/bookshelf.json | 20 +- .../recipes/byg.byg/wood/ebony/button.json | 20 +- .../byg.byg/wood/ebony/crafting_table.json | 20 +- .../recipes/byg.byg/wood/ebony/door.json | 20 +- .../recipes/byg.byg/wood/ebony/fence.json | 20 +- .../byg.byg/wood/ebony/fence_gate.json | 20 +- .../recipes/byg.byg/wood/ebony/planks.json | 20 +- .../byg.byg/wood/ebony/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/ebony/sign.json | 20 +- .../recipes/byg.byg/wood/ebony/slab.json | 20 +- .../recipes/byg.byg/wood/ebony/stairs.json | 20 +- .../recipes/byg.byg/wood/ebony/trapdoor.json | 20 +- .../recipes/byg.byg/wood/ebony/wood.json | 20 +- .../recipes/byg.byg/wood/embur/bookshelf.json | 20 +- .../recipes/byg.byg/wood/embur/button.json | 20 +- .../byg.byg/wood/embur/crafting_table.json | 20 +- .../recipes/byg.byg/wood/embur/door.json | 20 +- .../recipes/byg.byg/wood/embur/fence.json | 20 +- .../byg.byg/wood/embur/fence_gate.json | 20 +- .../recipes/byg.byg/wood/embur/planks.json | 20 +- .../byg.byg/wood/embur/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/embur/sign.json | 20 +- .../recipes/byg.byg/wood/embur/slab.json | 20 +- .../recipes/byg.byg/wood/embur/stairs.json | 20 +- .../recipes/byg.byg/wood/embur/trapdoor.json | 20 +- .../recipes/byg.byg/wood/embur/wood.json | 20 +- .../recipes/byg.byg/wood/ether/bookshelf.json | 20 +- .../recipes/byg.byg/wood/ether/button.json | 20 +- .../byg.byg/wood/ether/crafting_table.json | 20 +- .../recipes/byg.byg/wood/ether/door.json | 20 +- .../recipes/byg.byg/wood/ether/fence.json | 20 +- .../byg.byg/wood/ether/fence_gate.json | 20 +- .../recipes/byg.byg/wood/ether/planks.json | 20 +- .../byg.byg/wood/ether/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/ether/sign.json | 20 +- .../recipes/byg.byg/wood/ether/slab.json | 20 +- .../recipes/byg.byg/wood/ether/stairs.json | 20 +- .../recipes/byg.byg/wood/ether/trapdoor.json | 20 +- .../recipes/byg.byg/wood/ether/wood.json | 20 +- .../recipes/byg.byg/wood/fir/boat.json | 20 +- .../recipes/byg.byg/wood/fir/bookshelf.json | 20 +- .../recipes/byg.byg/wood/fir/button.json | 20 +- .../byg.byg/wood/fir/crafting_table.json | 20 +- .../recipes/byg.byg/wood/fir/door.json | 20 +- .../recipes/byg.byg/wood/fir/fence.json | 20 +- .../recipes/byg.byg/wood/fir/fence_gate.json | 20 +- .../recipes/byg.byg/wood/fir/planks.json | 20 +- .../byg.byg/wood/fir/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/fir/sign.json | 20 +- .../recipes/byg.byg/wood/fir/slab.json | 20 +- .../recipes/byg.byg/wood/fir/stairs.json | 20 +- .../recipes/byg.byg/wood/fir/trapdoor.json | 20 +- .../recipes/byg.byg/wood/fir/wood.json | 20 +- .../byg.byg/wood/green_enchanted/boat.json | 20 +- .../wood/green_enchanted/bookshelf.json | 20 +- .../byg.byg/wood/green_enchanted/button.json | 20 +- .../wood/green_enchanted/crafting_table.json | 20 +- .../byg.byg/wood/green_enchanted/door.json | 20 +- .../byg.byg/wood/green_enchanted/fence.json | 20 +- .../wood/green_enchanted/fence_gate.json | 20 +- .../byg.byg/wood/green_enchanted/planks.json | 20 +- .../wood/green_enchanted/pressure_plate.json | 20 +- .../byg.byg/wood/green_enchanted/sign.json | 20 +- .../byg.byg/wood/green_enchanted/slab.json | 20 +- .../byg.byg/wood/green_enchanted/stairs.json | 20 +- .../wood/green_enchanted/trapdoor.json | 20 +- .../byg.byg/wood/green_enchanted/wood.json | 20 +- .../recipes/byg.byg/wood/holly/boat.json | 20 +- .../recipes/byg.byg/wood/holly/bookshelf.json | 20 +- .../recipes/byg.byg/wood/holly/button.json | 20 +- .../byg.byg/wood/holly/crafting_table.json | 20 +- .../recipes/byg.byg/wood/holly/door.json | 20 +- .../recipes/byg.byg/wood/holly/fence.json | 20 +- .../byg.byg/wood/holly/fence_gate.json | 20 +- .../recipes/byg.byg/wood/holly/planks.json | 20 +- .../byg.byg/wood/holly/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/holly/sign.json | 20 +- .../recipes/byg.byg/wood/holly/slab.json | 20 +- .../recipes/byg.byg/wood/holly/stairs.json | 20 +- .../recipes/byg.byg/wood/holly/trapdoor.json | 20 +- .../recipes/byg.byg/wood/holly/wood.json | 20 +- .../byg.byg/wood/imparius/bookshelf.json | 20 +- .../recipes/byg.byg/wood/imparius/button.json | 20 +- .../byg.byg/wood/imparius/crafting_table.json | 20 +- .../recipes/byg.byg/wood/imparius/door.json | 20 +- .../recipes/byg.byg/wood/imparius/fence.json | 20 +- .../byg.byg/wood/imparius/fence_gate.json | 20 +- .../recipes/byg.byg/wood/imparius/planks.json | 20 +- .../byg.byg/wood/imparius/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/imparius/sign.json | 20 +- .../recipes/byg.byg/wood/imparius/slab.json | 20 +- .../recipes/byg.byg/wood/imparius/stairs.json | 20 +- .../byg.byg/wood/imparius/trapdoor.json | 20 +- .../recipes/byg.byg/wood/imparius/wood.json | 20 +- .../recipes/byg.byg/wood/jacaranda/boat.json | 20 +- .../byg.byg/wood/jacaranda/bookshelf.json | 20 +- .../byg.byg/wood/jacaranda/button.json | 20 +- .../wood/jacaranda/crafting_table.json | 20 +- .../recipes/byg.byg/wood/jacaranda/door.json | 20 +- .../recipes/byg.byg/wood/jacaranda/fence.json | 20 +- .../byg.byg/wood/jacaranda/fence_gate.json | 20 +- .../byg.byg/wood/jacaranda/planks.json | 20 +- .../wood/jacaranda/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/jacaranda/sign.json | 20 +- .../recipes/byg.byg/wood/jacaranda/slab.json | 20 +- .../byg.byg/wood/jacaranda/stairs.json | 20 +- .../byg.byg/wood/jacaranda/trapdoor.json | 20 +- .../recipes/byg.byg/wood/jacaranda/wood.json | 20 +- .../byg.byg/wood/lament/bookshelf.json | 20 +- .../recipes/byg.byg/wood/lament/button.json | 20 +- .../byg.byg/wood/lament/crafting_table.json | 20 +- .../recipes/byg.byg/wood/lament/door.json | 20 +- .../recipes/byg.byg/wood/lament/fence.json | 20 +- .../byg.byg/wood/lament/fence_gate.json | 20 +- .../recipes/byg.byg/wood/lament/planks.json | 20 +- .../byg.byg/wood/lament/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/lament/sign.json | 20 +- .../recipes/byg.byg/wood/lament/slab.json | 20 +- .../recipes/byg.byg/wood/lament/stairs.json | 20 +- .../recipes/byg.byg/wood/lament/trapdoor.json | 20 +- .../recipes/byg.byg/wood/lament/wood.json | 20 +- .../recipes/byg.byg/wood/mahogany/boat.json | 20 +- .../byg.byg/wood/mahogany/bookshelf.json | 20 +- .../recipes/byg.byg/wood/mahogany/button.json | 20 +- .../byg.byg/wood/mahogany/crafting_table.json | 20 +- .../recipes/byg.byg/wood/mahogany/door.json | 20 +- .../recipes/byg.byg/wood/mahogany/fence.json | 20 +- .../byg.byg/wood/mahogany/fence_gate.json | 20 +- .../recipes/byg.byg/wood/mahogany/planks.json | 20 +- .../byg.byg/wood/mahogany/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/mahogany/sign.json | 20 +- .../recipes/byg.byg/wood/mahogany/slab.json | 20 +- .../recipes/byg.byg/wood/mahogany/stairs.json | 20 +- .../byg.byg/wood/mahogany/trapdoor.json | 20 +- .../recipes/byg.byg/wood/mahogany/wood.json | 20 +- .../recipes/byg.byg/wood/mangrove/boat.json | 20 +- .../byg.byg/wood/mangrove/bookshelf.json | 20 +- .../recipes/byg.byg/wood/mangrove/button.json | 20 +- .../byg.byg/wood/mangrove/crafting_table.json | 20 +- .../recipes/byg.byg/wood/mangrove/door.json | 20 +- .../recipes/byg.byg/wood/mangrove/fence.json | 20 +- .../byg.byg/wood/mangrove/fence_gate.json | 20 +- .../recipes/byg.byg/wood/mangrove/planks.json | 20 +- .../byg.byg/wood/mangrove/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/mangrove/sign.json | 20 +- .../recipes/byg.byg/wood/mangrove/slab.json | 20 +- .../recipes/byg.byg/wood/mangrove/stairs.json | 20 +- .../byg.byg/wood/mangrove/trapdoor.json | 20 +- .../recipes/byg.byg/wood/mangrove/wood.json | 20 +- .../recipes/byg.byg/wood/maple/boat.json | 20 +- .../recipes/byg.byg/wood/maple/bookshelf.json | 20 +- .../recipes/byg.byg/wood/maple/button.json | 20 +- .../byg.byg/wood/maple/crafting_table.json | 20 +- .../recipes/byg.byg/wood/maple/door.json | 20 +- .../recipes/byg.byg/wood/maple/fence.json | 20 +- .../byg.byg/wood/maple/fence_gate.json | 20 +- .../recipes/byg.byg/wood/maple/planks.json | 20 +- .../byg.byg/wood/maple/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/maple/sign.json | 20 +- .../recipes/byg.byg/wood/maple/slab.json | 20 +- .../recipes/byg.byg/wood/maple/stairs.json | 20 +- .../recipes/byg.byg/wood/maple/trapdoor.json | 20 +- .../recipes/byg.byg/wood/maple/wood.json | 20 +- .../byg.byg/wood/nightshade/bookshelf.json | 20 +- .../byg.byg/wood/nightshade/button.json | 20 +- .../wood/nightshade/crafting_table.json | 20 +- .../recipes/byg.byg/wood/nightshade/door.json | 20 +- .../byg.byg/wood/nightshade/fence.json | 20 +- .../byg.byg/wood/nightshade/fence_gate.json | 20 +- .../byg.byg/wood/nightshade/planks.json | 20 +- .../wood/nightshade/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/nightshade/sign.json | 20 +- .../recipes/byg.byg/wood/nightshade/slab.json | 20 +- .../byg.byg/wood/nightshade/stairs.json | 20 +- .../byg.byg/wood/nightshade/trapdoor.json | 20 +- .../recipes/byg.byg/wood/nightshade/wood.json | 20 +- .../recipes/byg.byg/wood/palm/boat.json | 20 +- .../recipes/byg.byg/wood/palm/bookshelf.json | 20 +- .../recipes/byg.byg/wood/palm/button.json | 20 +- .../byg.byg/wood/palm/crafting_table.json | 20 +- .../recipes/byg.byg/wood/palm/door.json | 20 +- .../recipes/byg.byg/wood/palm/fence.json | 20 +- .../recipes/byg.byg/wood/palm/fence_gate.json | 20 +- .../recipes/byg.byg/wood/palm/planks.json | 20 +- .../byg.byg/wood/palm/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/palm/sign.json | 20 +- .../recipes/byg.byg/wood/palm/slab.json | 20 +- .../recipes/byg.byg/wood/palm/stairs.json | 20 +- .../recipes/byg.byg/wood/palm/trapdoor.json | 20 +- .../recipes/byg.byg/wood/palm/wood.json | 20 +- .../recipes/byg.byg/wood/pine/boat.json | 20 +- .../recipes/byg.byg/wood/pine/bookshelf.json | 20 +- .../recipes/byg.byg/wood/pine/button.json | 20 +- .../byg.byg/wood/pine/crafting_table.json | 20 +- .../recipes/byg.byg/wood/pine/door.json | 20 +- .../recipes/byg.byg/wood/pine/fence.json | 20 +- .../recipes/byg.byg/wood/pine/fence_gate.json | 20 +- .../recipes/byg.byg/wood/pine/planks.json | 20 +- .../byg.byg/wood/pine/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/pine/sign.json | 20 +- .../recipes/byg.byg/wood/pine/slab.json | 20 +- .../recipes/byg.byg/wood/pine/stairs.json | 20 +- .../recipes/byg.byg/wood/pine/trapdoor.json | 20 +- .../recipes/byg.byg/wood/pine/wood.json | 20 +- .../byg.byg/wood/rainbow_eucalyptus/boat.json | 20 +- .../wood/rainbow_eucalyptus/bookshelf.json | 20 +- .../wood/rainbow_eucalyptus/button.json | 20 +- .../rainbow_eucalyptus/crafting_table.json | 20 +- .../byg.byg/wood/rainbow_eucalyptus/door.json | 20 +- .../wood/rainbow_eucalyptus/fence.json | 20 +- .../wood/rainbow_eucalyptus/fence_gate.json | 20 +- .../wood/rainbow_eucalyptus/planks.json | 20 +- .../rainbow_eucalyptus/pressure_plate.json | 20 +- .../byg.byg/wood/rainbow_eucalyptus/sign.json | 20 +- .../byg.byg/wood/rainbow_eucalyptus/slab.json | 20 +- .../wood/rainbow_eucalyptus/stairs.json | 20 +- .../wood/rainbow_eucalyptus/trapdoor.json | 20 +- .../byg.byg/wood/rainbow_eucalyptus/wood.json | 20 +- .../recipes/byg.byg/wood/redwood/boat.json | 20 +- .../byg.byg/wood/redwood/bookshelf.json | 20 +- .../recipes/byg.byg/wood/redwood/button.json | 20 +- .../byg.byg/wood/redwood/crafting_table.json | 20 +- .../recipes/byg.byg/wood/redwood/door.json | 20 +- .../recipes/byg.byg/wood/redwood/fence.json | 20 +- .../byg.byg/wood/redwood/fence_gate.json | 20 +- .../recipes/byg.byg/wood/redwood/planks.json | 20 +- .../byg.byg/wood/redwood/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/redwood/sign.json | 20 +- .../recipes/byg.byg/wood/redwood/slab.json | 20 +- .../recipes/byg.byg/wood/redwood/stairs.json | 20 +- .../byg.byg/wood/redwood/trapdoor.json | 20 +- .../recipes/byg.byg/wood/redwood/wood.json | 20 +- .../recipes/byg.byg/wood/skyris/boat.json | 20 +- .../byg.byg/wood/skyris/bookshelf.json | 20 +- .../recipes/byg.byg/wood/skyris/button.json | 20 +- .../byg.byg/wood/skyris/crafting_table.json | 20 +- .../recipes/byg.byg/wood/skyris/door.json | 20 +- .../recipes/byg.byg/wood/skyris/fence.json | 20 +- .../byg.byg/wood/skyris/fence_gate.json | 20 +- .../recipes/byg.byg/wood/skyris/planks.json | 20 +- .../byg.byg/wood/skyris/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/skyris/sign.json | 20 +- .../recipes/byg.byg/wood/skyris/slab.json | 20 +- .../recipes/byg.byg/wood/skyris/stairs.json | 20 +- .../recipes/byg.byg/wood/skyris/trapdoor.json | 20 +- .../recipes/byg.byg/wood/skyris/wood.json | 20 +- .../byg.byg/wood/sythian/bookshelf.json | 20 +- .../recipes/byg.byg/wood/sythian/button.json | 20 +- .../byg.byg/wood/sythian/crafting_table.json | 20 +- .../recipes/byg.byg/wood/sythian/door.json | 20 +- .../recipes/byg.byg/wood/sythian/fence.json | 20 +- .../byg.byg/wood/sythian/fence_gate.json | 20 +- .../recipes/byg.byg/wood/sythian/planks.json | 20 +- .../byg.byg/wood/sythian/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/sythian/sign.json | 20 +- .../recipes/byg.byg/wood/sythian/slab.json | 20 +- .../recipes/byg.byg/wood/sythian/stairs.json | 20 +- .../byg.byg/wood/sythian/trapdoor.json | 20 +- .../recipes/byg.byg/wood/sythian/wood.json | 20 +- .../recipes/byg.byg/wood/willow/boat.json | 20 +- .../byg.byg/wood/willow/bookshelf.json | 20 +- .../recipes/byg.byg/wood/willow/button.json | 20 +- .../byg.byg/wood/willow/crafting_table.json | 20 +- .../recipes/byg.byg/wood/willow/door.json | 20 +- .../recipes/byg.byg/wood/willow/fence.json | 20 +- .../byg.byg/wood/willow/fence_gate.json | 20 +- .../recipes/byg.byg/wood/willow/planks.json | 20 +- .../byg.byg/wood/willow/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/willow/sign.json | 20 +- .../recipes/byg.byg/wood/willow/slab.json | 20 +- .../recipes/byg.byg/wood/willow/stairs.json | 20 +- .../recipes/byg.byg/wood/willow/trapdoor.json | 20 +- .../recipes/byg.byg/wood/willow/wood.json | 20 +- .../byg.byg/wood/witch_hazel/boat.json | 20 +- .../byg.byg/wood/witch_hazel/bookshelf.json | 20 +- .../byg.byg/wood/witch_hazel/button.json | 20 +- .../wood/witch_hazel/crafting_table.json | 20 +- .../byg.byg/wood/witch_hazel/door.json | 20 +- .../byg.byg/wood/witch_hazel/fence.json | 20 +- .../byg.byg/wood/witch_hazel/fence_gate.json | 20 +- .../byg.byg/wood/witch_hazel/planks.json | 20 +- .../wood/witch_hazel/pressure_plate.json | 20 +- .../byg.byg/wood/witch_hazel/sign.json | 20 +- .../byg.byg/wood/witch_hazel/slab.json | 20 +- .../byg.byg/wood/witch_hazel/stairs.json | 20 +- .../byg.byg/wood/witch_hazel/trapdoor.json | 20 +- .../byg.byg/wood/witch_hazel/wood.json | 20 +- .../recipes/byg.byg/wood/zelkova/boat.json | 20 +- .../byg.byg/wood/zelkova/bookshelf.json | 20 +- .../recipes/byg.byg/wood/zelkova/button.json | 20 +- .../byg.byg/wood/zelkova/crafting_table.json | 20 +- .../recipes/byg.byg/wood/zelkova/door.json | 20 +- .../recipes/byg.byg/wood/zelkova/fence.json | 20 +- .../byg.byg/wood/zelkova/fence_gate.json | 20 +- .../recipes/byg.byg/wood/zelkova/planks.json | 20 +- .../byg.byg/wood/zelkova/pressure_plate.json | 20 +- .../recipes/byg.byg/wood/zelkova/sign.json | 20 +- .../recipes/byg.byg/wood/zelkova/slab.json | 20 +- .../recipes/byg.byg/wood/zelkova/stairs.json | 20 +- .../byg.byg/wood/zelkova/trapdoor.json | 20 +- .../recipes/byg.byg/wood/zelkova/wood.json | 20 +- .../resources/data/byg/advancements/root.json | 28 +- .../loot_tables/blocks/aspen_bookshelf.json | 8 +- .../byg/loot_tables/blocks/aspen_button.json | 12 +- .../blocks/aspen_crafting_table.json | 12 +- .../byg/loot_tables/blocks/aspen_door.json | 14 +- .../byg/loot_tables/blocks/aspen_fence.json | 12 +- .../loot_tables/blocks/aspen_fence_gate.json | 12 +- .../byg/loot_tables/blocks/aspen_leaves.json | 80 +- .../byg/loot_tables/blocks/aspen_log.json | 12 +- .../byg/loot_tables/blocks/aspen_planks.json | 12 +- .../blocks/aspen_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/aspen_sapling.json | 12 +- .../byg/loot_tables/blocks/aspen_sign.json | 12 +- .../byg/loot_tables/blocks/aspen_slab.json | 10 +- .../byg/loot_tables/blocks/aspen_stairs.json | 12 +- .../loot_tables/blocks/aspen_trapdoor.json | 12 +- .../byg/loot_tables/blocks/aspen_wood.json | 12 +- .../loot_tables/blocks/baobab_bookshelf.json | 8 +- .../byg/loot_tables/blocks/baobab_button.json | 12 +- .../blocks/baobab_crafting_table.json | 12 +- .../byg/loot_tables/blocks/baobab_door.json | 14 +- .../byg/loot_tables/blocks/baobab_fence.json | 12 +- .../loot_tables/blocks/baobab_fence_gate.json | 12 +- .../byg/loot_tables/blocks/baobab_leaves.json | 80 +- .../byg/loot_tables/blocks/baobab_log.json | 12 +- .../byg/loot_tables/blocks/baobab_planks.json | 12 +- .../blocks/baobab_pressure_plate.json | 12 +- .../loot_tables/blocks/baobab_sapling.json | 12 +- .../byg/loot_tables/blocks/baobab_sign.json | 12 +- .../byg/loot_tables/blocks/baobab_slab.json | 10 +- .../byg/loot_tables/blocks/baobab_stairs.json | 12 +- .../loot_tables/blocks/baobab_trapdoor.json | 12 +- .../byg/loot_tables/blocks/baobab_wood.json | 12 +- .../blocks/blue_enchanted_bookshelf.json | 8 +- .../blocks/blue_enchanted_button.json | 12 +- .../blocks/blue_enchanted_crafting_table.json | 12 +- .../blocks/blue_enchanted_door.json | 14 +- .../blocks/blue_enchanted_fence.json | 12 +- .../blocks/blue_enchanted_fence_gate.json | 12 +- .../blocks/blue_enchanted_leaves.json | 80 +- .../blocks/blue_enchanted_log.json | 12 +- .../blocks/blue_enchanted_planks.json | 12 +- .../blocks/blue_enchanted_pressure_plate.json | 12 +- .../blocks/blue_enchanted_sapling.json | 12 +- .../blocks/blue_enchanted_sign.json | 12 +- .../blocks/blue_enchanted_slab.json | 10 +- .../blocks/blue_enchanted_stairs.json | 12 +- .../blocks/blue_enchanted_trapdoor.json | 12 +- .../blocks/blue_enchanted_wood.json | 12 +- .../loot_tables/blocks/bulbis_bookshelf.json | 8 +- .../byg/loot_tables/blocks/bulbis_button.json | 12 +- .../blocks/bulbis_crafting_table.json | 12 +- .../byg/loot_tables/blocks/bulbis_door.json | 14 +- .../byg/loot_tables/blocks/bulbis_fence.json | 12 +- .../loot_tables/blocks/bulbis_fence_gate.json | 12 +- .../byg/loot_tables/blocks/bulbis_oddity.json | 12 +- .../byg/loot_tables/blocks/bulbis_planks.json | 12 +- .../blocks/bulbis_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/bulbis_sign.json | 12 +- .../byg/loot_tables/blocks/bulbis_slab.json | 10 +- .../byg/loot_tables/blocks/bulbis_stairs.json | 12 +- .../byg/loot_tables/blocks/bulbis_stem.json | 12 +- .../loot_tables/blocks/bulbis_trapdoor.json | 12 +- .../byg/loot_tables/blocks/bulbis_wood.json | 12 +- .../loot_tables/blocks/cherry_bookshelf.json | 8 +- .../byg/loot_tables/blocks/cherry_button.json | 12 +- .../blocks/cherry_crafting_table.json | 12 +- .../byg/loot_tables/blocks/cherry_door.json | 14 +- .../byg/loot_tables/blocks/cherry_fence.json | 12 +- .../loot_tables/blocks/cherry_fence_gate.json | 12 +- .../byg/loot_tables/blocks/cherry_log.json | 12 +- .../byg/loot_tables/blocks/cherry_planks.json | 12 +- .../blocks/cherry_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/cherry_sign.json | 12 +- .../byg/loot_tables/blocks/cherry_slab.json | 10 +- .../byg/loot_tables/blocks/cherry_stairs.json | 12 +- .../loot_tables/blocks/cherry_trapdoor.json | 12 +- .../byg/loot_tables/blocks/cherry_wood.json | 12 +- .../loot_tables/blocks/cika_bookshelf.json | 8 +- .../byg/loot_tables/blocks/cika_button.json | 12 +- .../blocks/cika_crafting_table.json | 12 +- .../byg/loot_tables/blocks/cika_door.json | 14 +- .../byg/loot_tables/blocks/cika_fence.json | 12 +- .../loot_tables/blocks/cika_fence_gate.json | 12 +- .../byg/loot_tables/blocks/cika_leaves.json | 80 +- .../data/byg/loot_tables/blocks/cika_log.json | 12 +- .../byg/loot_tables/blocks/cika_planks.json | 12 +- .../blocks/cika_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/cika_sapling.json | 12 +- .../byg/loot_tables/blocks/cika_sign.json | 12 +- .../byg/loot_tables/blocks/cika_slab.json | 10 +- .../byg/loot_tables/blocks/cika_stairs.json | 12 +- .../byg/loot_tables/blocks/cika_trapdoor.json | 12 +- .../byg/loot_tables/blocks/cika_wood.json | 12 +- .../loot_tables/blocks/cypress_bookshelf.json | 8 +- .../loot_tables/blocks/cypress_button.json | 12 +- .../blocks/cypress_crafting_table.json | 12 +- .../byg/loot_tables/blocks/cypress_door.json | 14 +- .../byg/loot_tables/blocks/cypress_fence.json | 12 +- .../blocks/cypress_fence_gate.json | 12 +- .../loot_tables/blocks/cypress_leaves.json | 80 +- .../byg/loot_tables/blocks/cypress_log.json | 12 +- .../loot_tables/blocks/cypress_planks.json | 12 +- .../blocks/cypress_pressure_plate.json | 12 +- .../loot_tables/blocks/cypress_sapling.json | 12 +- .../byg/loot_tables/blocks/cypress_sign.json | 12 +- .../byg/loot_tables/blocks/cypress_slab.json | 10 +- .../loot_tables/blocks/cypress_stairs.json | 12 +- .../loot_tables/blocks/cypress_trapdoor.json | 12 +- .../byg/loot_tables/blocks/cypress_wood.json | 12 +- .../loot_tables/blocks/ebony_bookshelf.json | 8 +- .../byg/loot_tables/blocks/ebony_button.json | 12 +- .../blocks/ebony_crafting_table.json | 12 +- .../byg/loot_tables/blocks/ebony_door.json | 14 +- .../byg/loot_tables/blocks/ebony_fence.json | 12 +- .../loot_tables/blocks/ebony_fence_gate.json | 12 +- .../byg/loot_tables/blocks/ebony_leaves.json | 80 +- .../byg/loot_tables/blocks/ebony_log.json | 12 +- .../byg/loot_tables/blocks/ebony_planks.json | 12 +- .../blocks/ebony_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/ebony_sapling.json | 12 +- .../byg/loot_tables/blocks/ebony_sign.json | 12 +- .../byg/loot_tables/blocks/ebony_slab.json | 10 +- .../byg/loot_tables/blocks/ebony_stairs.json | 12 +- .../loot_tables/blocks/ebony_trapdoor.json | 12 +- .../byg/loot_tables/blocks/ebony_wood.json | 12 +- .../loot_tables/blocks/embur_bookshelf.json | 8 +- .../byg/loot_tables/blocks/embur_button.json | 12 +- .../blocks/embur_crafting_table.json | 12 +- .../byg/loot_tables/blocks/embur_door.json | 14 +- .../byg/loot_tables/blocks/embur_fence.json | 12 +- .../loot_tables/blocks/embur_fence_gate.json | 12 +- .../byg/loot_tables/blocks/embur_hyphae.json | 12 +- .../byg/loot_tables/blocks/embur_pedu.json | 12 +- .../byg/loot_tables/blocks/embur_planks.json | 12 +- .../blocks/embur_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/embur_sign.json | 12 +- .../byg/loot_tables/blocks/embur_slab.json | 10 +- .../byg/loot_tables/blocks/embur_stairs.json | 12 +- .../loot_tables/blocks/embur_trapdoor.json | 12 +- .../byg/loot_tables/blocks/embur_wart.json | 12 +- .../loot_tables/blocks/ether_bookshelf.json | 8 +- .../byg/loot_tables/blocks/ether_button.json | 12 +- .../blocks/ether_crafting_table.json | 12 +- .../byg/loot_tables/blocks/ether_door.json | 14 +- .../byg/loot_tables/blocks/ether_fence.json | 12 +- .../loot_tables/blocks/ether_fence_gate.json | 12 +- .../byg/loot_tables/blocks/ether_leaves.json | 80 +- .../byg/loot_tables/blocks/ether_log.json | 12 +- .../byg/loot_tables/blocks/ether_planks.json | 12 +- .../blocks/ether_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/ether_sapling.json | 12 +- .../byg/loot_tables/blocks/ether_sign.json | 12 +- .../byg/loot_tables/blocks/ether_slab.json | 10 +- .../byg/loot_tables/blocks/ether_stairs.json | 12 +- .../loot_tables/blocks/ether_trapdoor.json | 12 +- .../byg/loot_tables/blocks/ether_wood.json | 12 +- .../byg/loot_tables/blocks/fir_bookshelf.json | 8 +- .../byg/loot_tables/blocks/fir_button.json | 12 +- .../blocks/fir_crafting_table.json | 12 +- .../data/byg/loot_tables/blocks/fir_door.json | 14 +- .../byg/loot_tables/blocks/fir_fence.json | 12 +- .../loot_tables/blocks/fir_fence_gate.json | 12 +- .../byg/loot_tables/blocks/fir_leaves.json | 80 +- .../data/byg/loot_tables/blocks/fir_log.json | 12 +- .../byg/loot_tables/blocks/fir_planks.json | 12 +- .../blocks/fir_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/fir_sapling.json | 12 +- .../data/byg/loot_tables/blocks/fir_sign.json | 12 +- .../data/byg/loot_tables/blocks/fir_slab.json | 10 +- .../byg/loot_tables/blocks/fir_stairs.json | 12 +- .../byg/loot_tables/blocks/fir_trapdoor.json | 12 +- .../data/byg/loot_tables/blocks/fir_wood.json | 12 +- .../blocks/green_enchanted_bookshelf.json | 8 +- .../blocks/green_enchanted_button.json | 12 +- .../green_enchanted_crafting_table.json | 12 +- .../blocks/green_enchanted_door.json | 14 +- .../blocks/green_enchanted_fence.json | 12 +- .../blocks/green_enchanted_fence_gate.json | 12 +- .../blocks/green_enchanted_leaves.json | 80 +- .../blocks/green_enchanted_log.json | 12 +- .../blocks/green_enchanted_planks.json | 12 +- .../green_enchanted_pressure_plate.json | 12 +- .../blocks/green_enchanted_sapling.json | 12 +- .../blocks/green_enchanted_sign.json | 12 +- .../blocks/green_enchanted_slab.json | 10 +- .../blocks/green_enchanted_stairs.json | 12 +- .../blocks/green_enchanted_trapdoor.json | 12 +- .../blocks/green_enchanted_wood.json | 12 +- .../loot_tables/blocks/holly_bookshelf.json | 8 +- .../byg/loot_tables/blocks/holly_button.json | 12 +- .../blocks/holly_crafting_table.json | 12 +- .../byg/loot_tables/blocks/holly_door.json | 14 +- .../byg/loot_tables/blocks/holly_fence.json | 12 +- .../loot_tables/blocks/holly_fence_gate.json | 12 +- .../byg/loot_tables/blocks/holly_leaves.json | 80 +- .../byg/loot_tables/blocks/holly_log.json | 12 +- .../byg/loot_tables/blocks/holly_planks.json | 12 +- .../blocks/holly_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/holly_sapling.json | 12 +- .../byg/loot_tables/blocks/holly_sign.json | 12 +- .../byg/loot_tables/blocks/holly_slab.json | 10 +- .../byg/loot_tables/blocks/holly_stairs.json | 12 +- .../loot_tables/blocks/holly_trapdoor.json | 12 +- .../byg/loot_tables/blocks/holly_wood.json | 12 +- .../blocks/imparius_bookshelf.json | 8 +- .../loot_tables/blocks/imparius_button.json | 12 +- .../blocks/imparius_crafting_table.json | 12 +- .../byg/loot_tables/blocks/imparius_door.json | 14 +- .../loot_tables/blocks/imparius_fence.json | 12 +- .../blocks/imparius_fence_gate.json | 12 +- .../loot_tables/blocks/imparius_hyphae.json | 12 +- .../loot_tables/blocks/imparius_mushroom.json | 12 +- .../loot_tables/blocks/imparius_planks.json | 12 +- .../blocks/imparius_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/imparius_sign.json | 12 +- .../byg/loot_tables/blocks/imparius_slab.json | 10 +- .../loot_tables/blocks/imparius_stairs.json | 12 +- .../byg/loot_tables/blocks/imparius_stem.json | 12 +- .../loot_tables/blocks/imparius_trapdoor.json | 12 +- .../blocks/jacaranda_bookshelf.json | 8 +- .../loot_tables/blocks/jacaranda_button.json | 12 +- .../blocks/jacaranda_crafting_table.json | 12 +- .../loot_tables/blocks/jacaranda_door.json | 14 +- .../loot_tables/blocks/jacaranda_fence.json | 12 +- .../blocks/jacaranda_fence_gate.json | 12 +- .../loot_tables/blocks/jacaranda_leaves.json | 80 +- .../byg/loot_tables/blocks/jacaranda_log.json | 12 +- .../loot_tables/blocks/jacaranda_planks.json | 12 +- .../blocks/jacaranda_pressure_plate.json | 12 +- .../loot_tables/blocks/jacaranda_sapling.json | 12 +- .../loot_tables/blocks/jacaranda_sign.json | 12 +- .../loot_tables/blocks/jacaranda_slab.json | 10 +- .../loot_tables/blocks/jacaranda_stairs.json | 12 +- .../blocks/jacaranda_trapdoor.json | 12 +- .../loot_tables/blocks/jacaranda_wood.json | 12 +- .../loot_tables/blocks/lament_bookshelf.json | 8 +- .../byg/loot_tables/blocks/lament_button.json | 12 +- .../blocks/lament_crafting_table.json | 12 +- .../byg/loot_tables/blocks/lament_door.json | 14 +- .../byg/loot_tables/blocks/lament_fence.json | 12 +- .../loot_tables/blocks/lament_fence_gate.json | 12 +- .../byg/loot_tables/blocks/lament_leaves.json | 80 +- .../byg/loot_tables/blocks/lament_log.json | 12 +- .../byg/loot_tables/blocks/lament_planks.json | 12 +- .../blocks/lament_pressure_plate.json | 12 +- .../loot_tables/blocks/lament_sapling.json | 12 +- .../byg/loot_tables/blocks/lament_sign.json | 12 +- .../byg/loot_tables/blocks/lament_slab.json | 10 +- .../byg/loot_tables/blocks/lament_stairs.json | 12 +- .../loot_tables/blocks/lament_trapdoor.json | 12 +- .../byg/loot_tables/blocks/lament_wood.json | 12 +- .../blocks/mahogany_bookshelf.json | 8 +- .../loot_tables/blocks/mahogany_button.json | 12 +- .../blocks/mahogany_crafting_table.json | 12 +- .../byg/loot_tables/blocks/mahogany_door.json | 14 +- .../loot_tables/blocks/mahogany_fence.json | 12 +- .../blocks/mahogany_fence_gate.json | 12 +- .../loot_tables/blocks/mahogany_leaves.json | 80 +- .../byg/loot_tables/blocks/mahogany_log.json | 12 +- .../loot_tables/blocks/mahogany_planks.json | 12 +- .../blocks/mahogany_pressure_plate.json | 12 +- .../loot_tables/blocks/mahogany_sapling.json | 12 +- .../byg/loot_tables/blocks/mahogany_sign.json | 12 +- .../byg/loot_tables/blocks/mahogany_slab.json | 10 +- .../loot_tables/blocks/mahogany_stairs.json | 12 +- .../loot_tables/blocks/mahogany_trapdoor.json | 12 +- .../byg/loot_tables/blocks/mahogany_wood.json | 12 +- .../blocks/mangrove_bookshelf.json | 8 +- .../loot_tables/blocks/mangrove_button.json | 12 +- .../blocks/mangrove_crafting_table.json | 12 +- .../byg/loot_tables/blocks/mangrove_door.json | 14 +- .../loot_tables/blocks/mangrove_fence.json | 12 +- .../blocks/mangrove_fence_gate.json | 12 +- .../loot_tables/blocks/mangrove_leaves.json | 80 +- .../byg/loot_tables/blocks/mangrove_log.json | 12 +- .../loot_tables/blocks/mangrove_planks.json | 12 +- .../blocks/mangrove_pressure_plate.json | 12 +- .../loot_tables/blocks/mangrove_sapling.json | 12 +- .../byg/loot_tables/blocks/mangrove_sign.json | 12 +- .../byg/loot_tables/blocks/mangrove_slab.json | 10 +- .../loot_tables/blocks/mangrove_stairs.json | 12 +- .../loot_tables/blocks/mangrove_trapdoor.json | 12 +- .../byg/loot_tables/blocks/mangrove_wood.json | 12 +- .../loot_tables/blocks/maple_bookshelf.json | 8 +- .../byg/loot_tables/blocks/maple_button.json | 12 +- .../blocks/maple_crafting_table.json | 12 +- .../byg/loot_tables/blocks/maple_door.json | 14 +- .../byg/loot_tables/blocks/maple_fence.json | 12 +- .../loot_tables/blocks/maple_fence_gate.json | 12 +- .../byg/loot_tables/blocks/maple_leaves.json | 80 +- .../byg/loot_tables/blocks/maple_log.json | 12 +- .../byg/loot_tables/blocks/maple_planks.json | 12 +- .../blocks/maple_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/maple_sapling.json | 12 +- .../byg/loot_tables/blocks/maple_sign.json | 12 +- .../byg/loot_tables/blocks/maple_slab.json | 10 +- .../byg/loot_tables/blocks/maple_stairs.json | 12 +- .../loot_tables/blocks/maple_trapdoor.json | 12 +- .../byg/loot_tables/blocks/maple_wood.json | 12 +- .../blocks/nightshade_bookshelf.json | 8 +- .../loot_tables/blocks/nightshade_button.json | 12 +- .../blocks/nightshade_crafting_table.json | 12 +- .../loot_tables/blocks/nightshade_door.json | 14 +- .../loot_tables/blocks/nightshade_fence.json | 12 +- .../blocks/nightshade_fence_gate.json | 12 +- .../loot_tables/blocks/nightshade_leaves.json | 80 +- .../loot_tables/blocks/nightshade_log.json | 12 +- .../loot_tables/blocks/nightshade_planks.json | 12 +- .../blocks/nightshade_pressure_plate.json | 12 +- .../blocks/nightshade_sapling.json | 12 +- .../loot_tables/blocks/nightshade_sign.json | 12 +- .../loot_tables/blocks/nightshade_slab.json | 10 +- .../loot_tables/blocks/nightshade_stairs.json | 12 +- .../blocks/nightshade_trapdoor.json | 12 +- .../loot_tables/blocks/nightshade_wood.json | 12 +- .../loot_tables/blocks/palm_bookshelf.json | 8 +- .../byg/loot_tables/blocks/palm_button.json | 12 +- .../blocks/palm_crafting_table.json | 12 +- .../byg/loot_tables/blocks/palm_door.json | 14 +- .../byg/loot_tables/blocks/palm_fence.json | 12 +- .../loot_tables/blocks/palm_fence_gate.json | 12 +- .../byg/loot_tables/blocks/palm_leaves.json | 80 +- .../data/byg/loot_tables/blocks/palm_log.json | 12 +- .../byg/loot_tables/blocks/palm_planks.json | 12 +- .../blocks/palm_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/palm_sapling.json | 12 +- .../byg/loot_tables/blocks/palm_sign.json | 12 +- .../byg/loot_tables/blocks/palm_slab.json | 10 +- .../byg/loot_tables/blocks/palm_stairs.json | 12 +- .../byg/loot_tables/blocks/palm_trapdoor.json | 12 +- .../byg/loot_tables/blocks/palm_wood.json | 12 +- .../loot_tables/blocks/pine_bookshelf.json | 8 +- .../byg/loot_tables/blocks/pine_button.json | 12 +- .../blocks/pine_crafting_table.json | 12 +- .../byg/loot_tables/blocks/pine_door.json | 14 +- .../byg/loot_tables/blocks/pine_fence.json | 12 +- .../loot_tables/blocks/pine_fence_gate.json | 12 +- .../byg/loot_tables/blocks/pine_leaves.json | 80 +- .../data/byg/loot_tables/blocks/pine_log.json | 12 +- .../byg/loot_tables/blocks/pine_planks.json | 12 +- .../blocks/pine_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/pine_sapling.json | 12 +- .../byg/loot_tables/blocks/pine_sign.json | 12 +- .../byg/loot_tables/blocks/pine_slab.json | 10 +- .../byg/loot_tables/blocks/pine_stairs.json | 12 +- .../byg/loot_tables/blocks/pine_trapdoor.json | 12 +- .../byg/loot_tables/blocks/pine_wood.json | 12 +- .../blocks/potted_aspen_sapling.json | 22 +- .../blocks/potted_baobab_sapling.json | 22 +- .../blocks/potted_blue_enchanted_sapling.json | 22 +- .../blocks/potted_bulbis_oddity.json | 22 +- .../blocks/potted_cika_sapling.json | 22 +- .../blocks/potted_cypress_sapling.json | 22 +- .../blocks/potted_ebony_sapling.json | 22 +- .../loot_tables/blocks/potted_embur_wart.json | 22 +- .../blocks/potted_ether_sapling.json | 22 +- .../blocks/potted_fir_sapling.json | 22 +- .../potted_green_enchanted_sapling.json | 22 +- .../blocks/potted_holly_sapling.json | 22 +- .../blocks/potted_imparius_mushroom.json | 22 +- .../blocks/potted_jacaranda_sapling.json | 22 +- .../blocks/potted_lament_sapling.json | 22 +- .../blocks/potted_mahogany_sapling.json | 22 +- .../blocks/potted_mangrove_sapling.json | 22 +- .../blocks/potted_maple_sapling.json | 22 +- .../blocks/potted_nightshade_sapling.json | 22 +- .../blocks/potted_palm_sapling.json | 22 +- .../blocks/potted_pine_sapling.json | 22 +- .../potted_rainbow_eucalyptus_sapling.json | 22 +- .../blocks/potted_redwood_sapling.json | 22 +- .../blocks/potted_skyris_sapling.json | 22 +- .../blocks/potted_sythian_fungus.json | 22 +- .../blocks/potted_willow_sapling.json | 22 +- .../blocks/potted_witch_hazel_sapling.json | 22 +- .../blocks/potted_zelkova_sapling.json | 22 +- .../blocks/rainbow_eucalyptus_bookshelf.json | 8 +- .../blocks/rainbow_eucalyptus_button.json | 12 +- .../rainbow_eucalyptus_crafting_table.json | 12 +- .../blocks/rainbow_eucalyptus_door.json | 14 +- .../blocks/rainbow_eucalyptus_fence.json | 12 +- .../blocks/rainbow_eucalyptus_fence_gate.json | 12 +- .../blocks/rainbow_eucalyptus_leaves.json | 80 +- .../blocks/rainbow_eucalyptus_log.json | 12 +- .../blocks/rainbow_eucalyptus_planks.json | 12 +- .../rainbow_eucalyptus_pressure_plate.json | 12 +- .../blocks/rainbow_eucalyptus_sapling.json | 12 +- .../blocks/rainbow_eucalyptus_sign.json | 12 +- .../blocks/rainbow_eucalyptus_slab.json | 10 +- .../blocks/rainbow_eucalyptus_stairs.json | 12 +- .../blocks/rainbow_eucalyptus_trapdoor.json | 12 +- .../blocks/rainbow_eucalyptus_wood.json | 12 +- .../loot_tables/blocks/redwood_bookshelf.json | 8 +- .../loot_tables/blocks/redwood_button.json | 12 +- .../blocks/redwood_crafting_table.json | 12 +- .../byg/loot_tables/blocks/redwood_door.json | 14 +- .../byg/loot_tables/blocks/redwood_fence.json | 12 +- .../blocks/redwood_fence_gate.json | 12 +- .../loot_tables/blocks/redwood_leaves.json | 80 +- .../byg/loot_tables/blocks/redwood_log.json | 12 +- .../loot_tables/blocks/redwood_planks.json | 12 +- .../blocks/redwood_pressure_plate.json | 12 +- .../loot_tables/blocks/redwood_sapling.json | 12 +- .../byg/loot_tables/blocks/redwood_sign.json | 12 +- .../byg/loot_tables/blocks/redwood_slab.json | 10 +- .../loot_tables/blocks/redwood_stairs.json | 12 +- .../loot_tables/blocks/redwood_trapdoor.json | 12 +- .../byg/loot_tables/blocks/redwood_wood.json | 12 +- .../loot_tables/blocks/skyris_bookshelf.json | 8 +- .../byg/loot_tables/blocks/skyris_button.json | 12 +- .../blocks/skyris_crafting_table.json | 12 +- .../byg/loot_tables/blocks/skyris_door.json | 14 +- .../byg/loot_tables/blocks/skyris_fence.json | 12 +- .../loot_tables/blocks/skyris_fence_gate.json | 12 +- .../byg/loot_tables/blocks/skyris_leaves.json | 80 +- .../byg/loot_tables/blocks/skyris_log.json | 12 +- .../byg/loot_tables/blocks/skyris_planks.json | 12 +- .../blocks/skyris_pressure_plate.json | 12 +- .../loot_tables/blocks/skyris_sapling.json | 12 +- .../byg/loot_tables/blocks/skyris_sign.json | 12 +- .../byg/loot_tables/blocks/skyris_slab.json | 10 +- .../byg/loot_tables/blocks/skyris_stairs.json | 12 +- .../loot_tables/blocks/skyris_trapdoor.json | 12 +- .../byg/loot_tables/blocks/skyris_wood.json | 12 +- .../blocks/stripped_aspen_log.json | 12 +- .../blocks/stripped_aspen_wood.json | 12 +- .../blocks/stripped_baobab_log.json | 12 +- .../blocks/stripped_baobab_wood.json | 12 +- .../blocks/stripped_blue_enchanted_log.json | 12 +- .../blocks/stripped_blue_enchanted_wood.json | 12 +- .../blocks/stripped_bulbis_stem.json | 12 +- .../blocks/stripped_bulbis_wood.json | 12 +- .../blocks/stripped_cherry_log.json | 12 +- .../blocks/stripped_cherry_wood.json | 12 +- .../loot_tables/blocks/stripped_cika_log.json | 12 +- .../blocks/stripped_cika_wood.json | 12 +- .../blocks/stripped_cypress_log.json | 12 +- .../blocks/stripped_cypress_wood.json | 12 +- .../blocks/stripped_ebony_log.json | 12 +- .../blocks/stripped_ebony_wood.json | 12 +- .../blocks/stripped_embur_hyphae.json | 12 +- .../blocks/stripped_embur_pedu.json | 12 +- .../blocks/stripped_ether_log.json | 12 +- .../blocks/stripped_ether_wood.json | 12 +- .../loot_tables/blocks/stripped_fir_log.json | 12 +- .../loot_tables/blocks/stripped_fir_wood.json | 12 +- .../blocks/stripped_green_enchanted_log.json | 12 +- .../blocks/stripped_green_enchanted_wood.json | 12 +- .../blocks/stripped_holly_log.json | 12 +- .../blocks/stripped_holly_wood.json | 12 +- .../blocks/stripped_jacaranda_log.json | 12 +- .../blocks/stripped_jacaranda_wood.json | 12 +- .../blocks/stripped_lament_log.json | 12 +- .../blocks/stripped_lament_wood.json | 12 +- .../blocks/stripped_mahogany_log.json | 12 +- .../blocks/stripped_mahogany_wood.json | 12 +- .../blocks/stripped_mangrove_log.json | 12 +- .../blocks/stripped_mangrove_wood.json | 12 +- .../blocks/stripped_maple_log.json | 12 +- .../blocks/stripped_maple_wood.json | 12 +- .../blocks/stripped_nightshade_log.json | 12 +- .../blocks/stripped_nightshade_wood.json | 12 +- .../loot_tables/blocks/stripped_palm_log.json | 12 +- .../blocks/stripped_palm_wood.json | 12 +- .../loot_tables/blocks/stripped_pine_log.json | 12 +- .../blocks/stripped_pine_wood.json | 12 +- .../stripped_rainbow_eucalyptus_log.json | 12 +- .../stripped_rainbow_eucalyptus_wood.json | 12 +- .../blocks/stripped_redwood_log.json | 12 +- .../blocks/stripped_redwood_wood.json | 12 +- .../blocks/stripped_skyris_log.json | 12 +- .../blocks/stripped_skyris_wood.json | 12 +- .../blocks/stripped_sythian_hyphae.json | 12 +- .../blocks/stripped_sythian_stem.json | 12 +- .../blocks/stripped_willow_log.json | 12 +- .../blocks/stripped_willow_wood.json | 12 +- .../blocks/stripped_witch_hazel_log.json | 12 +- .../blocks/stripped_witch_hazel_wood.json | 12 +- .../blocks/stripped_zelkova_log.json | 12 +- .../blocks/stripped_zelkova_wood.json | 12 +- .../loot_tables/blocks/sythian_bookshelf.json | 8 +- .../loot_tables/blocks/sythian_button.json | 12 +- .../blocks/sythian_crafting_table.json | 12 +- .../byg/loot_tables/blocks/sythian_door.json | 14 +- .../byg/loot_tables/blocks/sythian_fence.json | 12 +- .../blocks/sythian_fence_gate.json | 12 +- .../loot_tables/blocks/sythian_fungus.json | 12 +- .../loot_tables/blocks/sythian_hyphae.json | 12 +- .../loot_tables/blocks/sythian_planks.json | 12 +- .../blocks/sythian_pressure_plate.json | 12 +- .../byg/loot_tables/blocks/sythian_sign.json | 12 +- .../byg/loot_tables/blocks/sythian_slab.json | 10 +- .../loot_tables/blocks/sythian_stairs.json | 12 +- .../byg/loot_tables/blocks/sythian_stem.json | 12 +- .../loot_tables/blocks/sythian_trapdoor.json | 12 +- .../blocks/sythian_wart_block.json | 80 +- .../loot_tables/blocks/willow_bookshelf.json | 8 +- .../byg/loot_tables/blocks/willow_button.json | 12 +- .../blocks/willow_crafting_table.json | 12 +- .../byg/loot_tables/blocks/willow_door.json | 14 +- .../byg/loot_tables/blocks/willow_fence.json | 12 +- .../loot_tables/blocks/willow_fence_gate.json | 12 +- .../byg/loot_tables/blocks/willow_leaves.json | 80 +- .../byg/loot_tables/blocks/willow_log.json | 12 +- .../byg/loot_tables/blocks/willow_planks.json | 12 +- .../blocks/willow_pressure_plate.json | 12 +- .../loot_tables/blocks/willow_sapling.json | 12 +- .../byg/loot_tables/blocks/willow_sign.json | 12 +- .../byg/loot_tables/blocks/willow_slab.json | 10 +- .../byg/loot_tables/blocks/willow_stairs.json | 12 +- .../loot_tables/blocks/willow_trapdoor.json | 12 +- .../byg/loot_tables/blocks/willow_wood.json | 12 +- .../blocks/witch_hazel_bookshelf.json | 8 +- .../blocks/witch_hazel_button.json | 12 +- .../blocks/witch_hazel_crafting_table.json | 12 +- .../loot_tables/blocks/witch_hazel_door.json | 14 +- .../loot_tables/blocks/witch_hazel_fence.json | 12 +- .../blocks/witch_hazel_fence_gate.json | 12 +- .../blocks/witch_hazel_leaves.json | 80 +- .../loot_tables/blocks/witch_hazel_log.json | 12 +- .../blocks/witch_hazel_planks.json | 12 +- .../blocks/witch_hazel_pressure_plate.json | 12 +- .../blocks/witch_hazel_sapling.json | 12 +- .../loot_tables/blocks/witch_hazel_sign.json | 12 +- .../loot_tables/blocks/witch_hazel_slab.json | 10 +- .../blocks/witch_hazel_stairs.json | 12 +- .../blocks/witch_hazel_trapdoor.json | 12 +- .../loot_tables/blocks/witch_hazel_wood.json | 12 +- .../loot_tables/blocks/zelkova_bookshelf.json | 8 +- .../loot_tables/blocks/zelkova_button.json | 12 +- .../blocks/zelkova_crafting_table.json | 12 +- .../byg/loot_tables/blocks/zelkova_door.json | 14 +- .../byg/loot_tables/blocks/zelkova_fence.json | 12 +- .../blocks/zelkova_fence_gate.json | 12 +- .../loot_tables/blocks/zelkova_leaves.json | 80 +- .../byg/loot_tables/blocks/zelkova_log.json | 12 +- .../loot_tables/blocks/zelkova_planks.json | 12 +- .../blocks/zelkova_pressure_plate.json | 12 +- .../loot_tables/blocks/zelkova_sapling.json | 12 +- .../byg/loot_tables/blocks/zelkova_sign.json | 12 +- .../byg/loot_tables/blocks/zelkova_slab.json | 10 +- .../loot_tables/blocks/zelkova_stairs.json | 12 +- .../loot_tables/blocks/zelkova_trapdoor.json | 12 +- .../byg/loot_tables/blocks/zelkova_wood.json | 12 +- .../data/byg/loot_tables/boats/aspen.json | 4 +- .../byg/loot_tables/boats/aspen_fall.json | 8 +- .../data/byg/loot_tables/boats/baobab.json | 4 +- .../byg/loot_tables/boats/baobab_fall.json | 8 +- .../byg/loot_tables/boats/blue_enchanted.json | 4 +- .../boats/blue_enchanted_fall.json | 8 +- .../data/byg/loot_tables/boats/cherry.json | 4 +- .../byg/loot_tables/boats/cherry_fall.json | 8 +- .../data/byg/loot_tables/boats/cika.json | 4 +- .../data/byg/loot_tables/boats/cika_fall.json | 8 +- .../data/byg/loot_tables/boats/cypress.json | 4 +- .../byg/loot_tables/boats/cypress_fall.json | 8 +- .../data/byg/loot_tables/boats/ebony.json | 4 +- .../byg/loot_tables/boats/ebony_fall.json | 8 +- .../data/byg/loot_tables/boats/fir.json | 4 +- .../data/byg/loot_tables/boats/fir_fall.json | 8 +- .../loot_tables/boats/green_enchanted.json | 4 +- .../boats/green_enchanted_fall.json | 8 +- .../data/byg/loot_tables/boats/holly.json | 4 +- .../byg/loot_tables/boats/holly_fall.json | 8 +- .../data/byg/loot_tables/boats/jacaranda.json | 4 +- .../byg/loot_tables/boats/jacaranda_fall.json | 8 +- .../data/byg/loot_tables/boats/mahogony.json | 4 +- .../byg/loot_tables/boats/mahogony_fall.json | 8 +- .../data/byg/loot_tables/boats/mangrove.json | 4 +- .../byg/loot_tables/boats/mangrove_fall.json | 8 +- .../data/byg/loot_tables/boats/maple.json | 4 +- .../byg/loot_tables/boats/maple_fall.json | 8 +- .../data/byg/loot_tables/boats/palm.json | 4 +- .../data/byg/loot_tables/boats/palm_fall.json | 8 +- .../data/byg/loot_tables/boats/pine.json | 4 +- .../data/byg/loot_tables/boats/pine_fall.json | 8 +- .../loot_tables/boats/rainbow_eucalyptus.json | 4 +- .../boats/rainbow_eucalyptus_fall.json | 8 +- .../data/byg/loot_tables/boats/redwood.json | 4 +- .../byg/loot_tables/boats/redwood_fall.json | 8 +- .../data/byg/loot_tables/boats/skyris.json | 4 +- .../byg/loot_tables/boats/skyris_fall.json | 8 +- .../data/byg/loot_tables/boats/willow.json | 4 +- .../byg/loot_tables/boats/willow_fall.json | 8 +- .../byg/loot_tables/boats/witch_hazel.json | 4 +- .../loot_tables/boats/witch_hazel_fall.json | 8 +- .../data/byg/loot_tables/boats/zelkova.json | 4 +- .../byg/loot_tables/boats/zelkova_fall.json | 8 +- .../data/byg/recipes/wood/aspen/boat.json | 8 +- .../byg/recipes/wood/aspen/bookshelf.json | 16 +- .../recipes/wood/aspen/crafting_table.json | 8 +- .../data/byg/recipes/wood/aspen/door.json | 14 +- .../data/byg/recipes/wood/aspen/fence.json | 12 +- .../byg/recipes/wood/aspen/fence_gate.json | 8 +- .../data/byg/recipes/wood/aspen/planks.json | 4 +- .../recipes/wood/aspen/pressure_plate.json | 6 +- .../data/byg/recipes/wood/aspen/sign.json | 14 +- .../data/byg/recipes/wood/aspen/slab.json | 10 +- .../data/byg/recipes/wood/aspen/stairs.json | 14 +- .../data/byg/recipes/wood/aspen/trapdoor.json | 12 +- .../data/byg/recipes/wood/aspen/wood.json | 12 +- .../data/byg/recipes/wood/baobab/boat.json | 8 +- .../byg/recipes/wood/baobab/bookshelf.json | 16 +- .../recipes/wood/baobab/crafting_table.json | 8 +- .../data/byg/recipes/wood/baobab/door.json | 14 +- .../data/byg/recipes/wood/baobab/fence.json | 12 +- .../byg/recipes/wood/baobab/fence_gate.json | 8 +- .../data/byg/recipes/wood/baobab/planks.json | 4 +- .../recipes/wood/baobab/pressure_plate.json | 6 +- .../data/byg/recipes/wood/baobab/sign.json | 14 +- .../data/byg/recipes/wood/baobab/slab.json | 10 +- .../data/byg/recipes/wood/baobab/stairs.json | 14 +- .../byg/recipes/wood/baobab/trapdoor.json | 12 +- .../data/byg/recipes/wood/baobab/wood.json | 12 +- .../byg/recipes/wood/blue_enchanted/boat.json | 8 +- .../wood/blue_enchanted/bookshelf.json | 16 +- .../wood/blue_enchanted/crafting_table.json | 8 +- .../byg/recipes/wood/blue_enchanted/door.json | 14 +- .../recipes/wood/blue_enchanted/fence.json | 12 +- .../wood/blue_enchanted/fence_gate.json | 8 +- .../recipes/wood/blue_enchanted/planks.json | 4 +- .../wood/blue_enchanted/pressure_plate.json | 6 +- .../byg/recipes/wood/blue_enchanted/sign.json | 14 +- .../byg/recipes/wood/blue_enchanted/slab.json | 10 +- .../recipes/wood/blue_enchanted/stairs.json | 14 +- .../recipes/wood/blue_enchanted/trapdoor.json | 12 +- .../byg/recipes/wood/blue_enchanted/wood.json | 12 +- .../byg/recipes/wood/bulbis/bookshelf.json | 16 +- .../recipes/wood/bulbis/crafting_table.json | 8 +- .../data/byg/recipes/wood/bulbis/door.json | 14 +- .../data/byg/recipes/wood/bulbis/fence.json | 12 +- .../byg/recipes/wood/bulbis/fence_gate.json | 8 +- .../data/byg/recipes/wood/bulbis/planks.json | 4 +- .../recipes/wood/bulbis/pressure_plate.json | 6 +- .../data/byg/recipes/wood/bulbis/sign.json | 14 +- .../data/byg/recipes/wood/bulbis/slab.json | 10 +- .../data/byg/recipes/wood/bulbis/stairs.json | 14 +- .../byg/recipes/wood/bulbis/trapdoor.json | 12 +- .../data/byg/recipes/wood/bulbis/wood.json | 12 +- .../data/byg/recipes/wood/cherry/boat.json | 8 +- .../byg/recipes/wood/cherry/bookshelf.json | 16 +- .../recipes/wood/cherry/crafting_table.json | 8 +- .../data/byg/recipes/wood/cherry/door.json | 14 +- .../data/byg/recipes/wood/cherry/fence.json | 12 +- .../byg/recipes/wood/cherry/fence_gate.json | 8 +- .../data/byg/recipes/wood/cherry/planks.json | 4 +- .../recipes/wood/cherry/pressure_plate.json | 6 +- .../data/byg/recipes/wood/cherry/sign.json | 14 +- .../data/byg/recipes/wood/cherry/slab.json | 10 +- .../data/byg/recipes/wood/cherry/stairs.json | 14 +- .../byg/recipes/wood/cherry/trapdoor.json | 12 +- .../data/byg/recipes/wood/cherry/wood.json | 12 +- .../data/byg/recipes/wood/cika/boat.json | 8 +- .../data/byg/recipes/wood/cika/bookshelf.json | 16 +- .../byg/recipes/wood/cika/crafting_table.json | 8 +- .../data/byg/recipes/wood/cika/door.json | 14 +- .../data/byg/recipes/wood/cika/fence.json | 12 +- .../byg/recipes/wood/cika/fence_gate.json | 8 +- .../data/byg/recipes/wood/cika/planks.json | 4 +- .../byg/recipes/wood/cika/pressure_plate.json | 6 +- .../data/byg/recipes/wood/cika/sign.json | 14 +- .../data/byg/recipes/wood/cika/slab.json | 10 +- .../data/byg/recipes/wood/cika/stairs.json | 14 +- .../data/byg/recipes/wood/cika/trapdoor.json | 12 +- .../data/byg/recipes/wood/cika/wood.json | 12 +- .../data/byg/recipes/wood/cypress/boat.json | 8 +- .../byg/recipes/wood/cypress/bookshelf.json | 16 +- .../recipes/wood/cypress/crafting_table.json | 8 +- .../data/byg/recipes/wood/cypress/door.json | 14 +- .../data/byg/recipes/wood/cypress/fence.json | 12 +- .../byg/recipes/wood/cypress/fence_gate.json | 8 +- .../data/byg/recipes/wood/cypress/planks.json | 4 +- .../recipes/wood/cypress/pressure_plate.json | 6 +- .../data/byg/recipes/wood/cypress/sign.json | 14 +- .../data/byg/recipes/wood/cypress/slab.json | 10 +- .../data/byg/recipes/wood/cypress/stairs.json | 14 +- .../byg/recipes/wood/cypress/trapdoor.json | 12 +- .../data/byg/recipes/wood/cypress/wood.json | 12 +- .../data/byg/recipes/wood/ebony/boat.json | 8 +- .../byg/recipes/wood/ebony/bookshelf.json | 16 +- .../recipes/wood/ebony/crafting_table.json | 8 +- .../data/byg/recipes/wood/ebony/door.json | 14 +- .../data/byg/recipes/wood/ebony/fence.json | 12 +- .../byg/recipes/wood/ebony/fence_gate.json | 8 +- .../data/byg/recipes/wood/ebony/planks.json | 4 +- .../recipes/wood/ebony/pressure_plate.json | 6 +- .../data/byg/recipes/wood/ebony/sign.json | 14 +- .../data/byg/recipes/wood/ebony/slab.json | 10 +- .../data/byg/recipes/wood/ebony/stairs.json | 14 +- .../data/byg/recipes/wood/ebony/trapdoor.json | 12 +- .../data/byg/recipes/wood/ebony/wood.json | 12 +- .../byg/recipes/wood/embur/bookshelf.json | 16 +- .../recipes/wood/embur/crafting_table.json | 8 +- .../data/byg/recipes/wood/embur/door.json | 14 +- .../data/byg/recipes/wood/embur/fence.json | 12 +- .../byg/recipes/wood/embur/fence_gate.json | 8 +- .../data/byg/recipes/wood/embur/planks.json | 4 +- .../recipes/wood/embur/pressure_plate.json | 6 +- .../data/byg/recipes/wood/embur/sign.json | 14 +- .../data/byg/recipes/wood/embur/slab.json | 10 +- .../data/byg/recipes/wood/embur/stairs.json | 14 +- .../data/byg/recipes/wood/embur/trapdoor.json | 12 +- .../data/byg/recipes/wood/embur/wood.json | 12 +- .../byg/recipes/wood/ether/bookshelf.json | 16 +- .../recipes/wood/ether/crafting_table.json | 8 +- .../data/byg/recipes/wood/ether/door.json | 14 +- .../data/byg/recipes/wood/ether/fence.json | 12 +- .../byg/recipes/wood/ether/fence_gate.json | 8 +- .../data/byg/recipes/wood/ether/planks.json | 4 +- .../recipes/wood/ether/pressure_plate.json | 6 +- .../data/byg/recipes/wood/ether/sign.json | 14 +- .../data/byg/recipes/wood/ether/slab.json | 10 +- .../data/byg/recipes/wood/ether/stairs.json | 14 +- .../data/byg/recipes/wood/ether/trapdoor.json | 12 +- .../data/byg/recipes/wood/ether/wood.json | 12 +- .../data/byg/recipes/wood/fir/boat.json | 8 +- .../data/byg/recipes/wood/fir/bookshelf.json | 16 +- .../byg/recipes/wood/fir/crafting_table.json | 8 +- .../data/byg/recipes/wood/fir/door.json | 14 +- .../data/byg/recipes/wood/fir/fence.json | 12 +- .../data/byg/recipes/wood/fir/fence_gate.json | 8 +- .../data/byg/recipes/wood/fir/planks.json | 4 +- .../byg/recipes/wood/fir/pressure_plate.json | 6 +- .../data/byg/recipes/wood/fir/sign.json | 14 +- .../data/byg/recipes/wood/fir/slab.json | 10 +- .../data/byg/recipes/wood/fir/stairs.json | 14 +- .../data/byg/recipes/wood/fir/trapdoor.json | 12 +- .../data/byg/recipes/wood/fir/wood.json | 12 +- .../recipes/wood/green_enchanted/boat.json | 8 +- .../wood/green_enchanted/bookshelf.json | 16 +- .../wood/green_enchanted/crafting_table.json | 8 +- .../recipes/wood/green_enchanted/door.json | 14 +- .../recipes/wood/green_enchanted/fence.json | 12 +- .../wood/green_enchanted/fence_gate.json | 8 +- .../recipes/wood/green_enchanted/planks.json | 4 +- .../wood/green_enchanted/pressure_plate.json | 6 +- .../recipes/wood/green_enchanted/sign.json | 14 +- .../recipes/wood/green_enchanted/slab.json | 10 +- .../recipes/wood/green_enchanted/stairs.json | 14 +- .../wood/green_enchanted/trapdoor.json | 12 +- .../recipes/wood/green_enchanted/wood.json | 12 +- .../data/byg/recipes/wood/holly/boat.json | 8 +- .../byg/recipes/wood/holly/bookshelf.json | 16 +- .../recipes/wood/holly/crafting_table.json | 8 +- .../data/byg/recipes/wood/holly/door.json | 14 +- .../data/byg/recipes/wood/holly/fence.json | 12 +- .../byg/recipes/wood/holly/fence_gate.json | 8 +- .../data/byg/recipes/wood/holly/planks.json | 4 +- .../recipes/wood/holly/pressure_plate.json | 6 +- .../data/byg/recipes/wood/holly/sign.json | 14 +- .../data/byg/recipes/wood/holly/slab.json | 10 +- .../data/byg/recipes/wood/holly/stairs.json | 14 +- .../data/byg/recipes/wood/holly/trapdoor.json | 12 +- .../data/byg/recipes/wood/holly/wood.json | 12 +- .../byg/recipes/wood/imparius/bookshelf.json | 16 +- .../recipes/wood/imparius/crafting_table.json | 8 +- .../data/byg/recipes/wood/imparius/door.json | 14 +- .../data/byg/recipes/wood/imparius/fence.json | 12 +- .../byg/recipes/wood/imparius/fence_gate.json | 8 +- .../byg/recipes/wood/imparius/planks.json | 4 +- .../recipes/wood/imparius/pressure_plate.json | 6 +- .../data/byg/recipes/wood/imparius/sign.json | 14 +- .../data/byg/recipes/wood/imparius/slab.json | 10 +- .../byg/recipes/wood/imparius/stairs.json | 14 +- .../byg/recipes/wood/imparius/trapdoor.json | 12 +- .../data/byg/recipes/wood/imparius/wood.json | 12 +- .../data/byg/recipes/wood/jacaranda/boat.json | 8 +- .../byg/recipes/wood/jacaranda/bookshelf.json | 16 +- .../wood/jacaranda/crafting_table.json | 8 +- .../data/byg/recipes/wood/jacaranda/door.json | 14 +- .../byg/recipes/wood/jacaranda/fence.json | 12 +- .../recipes/wood/jacaranda/fence_gate.json | 8 +- .../byg/recipes/wood/jacaranda/planks.json | 4 +- .../wood/jacaranda/pressure_plate.json | 6 +- .../data/byg/recipes/wood/jacaranda/sign.json | 14 +- .../data/byg/recipes/wood/jacaranda/slab.json | 10 +- .../byg/recipes/wood/jacaranda/stairs.json | 14 +- .../byg/recipes/wood/jacaranda/trapdoor.json | 12 +- .../data/byg/recipes/wood/jacaranda/wood.json | 12 +- .../byg/recipes/wood/lament/bookshelf.json | 16 +- .../recipes/wood/lament/crafting_table.json | 8 +- .../data/byg/recipes/wood/lament/door.json | 14 +- .../data/byg/recipes/wood/lament/fence.json | 12 +- .../byg/recipes/wood/lament/fence_gate.json | 8 +- .../data/byg/recipes/wood/lament/planks.json | 4 +- .../recipes/wood/lament/pressure_plate.json | 6 +- .../data/byg/recipes/wood/lament/sign.json | 14 +- .../data/byg/recipes/wood/lament/slab.json | 10 +- .../data/byg/recipes/wood/lament/stairs.json | 14 +- .../byg/recipes/wood/lament/trapdoor.json | 12 +- .../data/byg/recipes/wood/lament/wood.json | 12 +- .../data/byg/recipes/wood/mahogany/boat.json | 8 +- .../byg/recipes/wood/mahogany/bookshelf.json | 16 +- .../recipes/wood/mahogany/crafting_table.json | 8 +- .../data/byg/recipes/wood/mahogany/door.json | 14 +- .../data/byg/recipes/wood/mahogany/fence.json | 12 +- .../byg/recipes/wood/mahogany/fence_gate.json | 8 +- .../byg/recipes/wood/mahogany/planks.json | 4 +- .../recipes/wood/mahogany/pressure_plate.json | 6 +- .../data/byg/recipes/wood/mahogany/sign.json | 14 +- .../data/byg/recipes/wood/mahogany/slab.json | 10 +- .../byg/recipes/wood/mahogany/stairs.json | 14 +- .../byg/recipes/wood/mahogany/trapdoor.json | 12 +- .../data/byg/recipes/wood/mahogany/wood.json | 12 +- .../data/byg/recipes/wood/mangrove/boat.json | 8 +- .../byg/recipes/wood/mangrove/bookshelf.json | 16 +- .../recipes/wood/mangrove/crafting_table.json | 8 +- .../data/byg/recipes/wood/mangrove/door.json | 14 +- .../data/byg/recipes/wood/mangrove/fence.json | 12 +- .../byg/recipes/wood/mangrove/fence_gate.json | 8 +- .../byg/recipes/wood/mangrove/planks.json | 4 +- .../recipes/wood/mangrove/pressure_plate.json | 6 +- .../data/byg/recipes/wood/mangrove/sign.json | 14 +- .../data/byg/recipes/wood/mangrove/slab.json | 10 +- .../byg/recipes/wood/mangrove/stairs.json | 14 +- .../byg/recipes/wood/mangrove/trapdoor.json | 12 +- .../data/byg/recipes/wood/mangrove/wood.json | 12 +- .../data/byg/recipes/wood/maple/boat.json | 8 +- .../byg/recipes/wood/maple/bookshelf.json | 16 +- .../recipes/wood/maple/crafting_table.json | 8 +- .../data/byg/recipes/wood/maple/door.json | 14 +- .../data/byg/recipes/wood/maple/fence.json | 12 +- .../byg/recipes/wood/maple/fence_gate.json | 8 +- .../data/byg/recipes/wood/maple/planks.json | 4 +- .../recipes/wood/maple/pressure_plate.json | 6 +- .../data/byg/recipes/wood/maple/sign.json | 14 +- .../data/byg/recipes/wood/maple/slab.json | 10 +- .../data/byg/recipes/wood/maple/stairs.json | 14 +- .../data/byg/recipes/wood/maple/trapdoor.json | 12 +- .../data/byg/recipes/wood/maple/wood.json | 12 +- .../recipes/wood/nightshade/bookshelf.json | 16 +- .../wood/nightshade/crafting_table.json | 8 +- .../byg/recipes/wood/nightshade/door.json | 14 +- .../byg/recipes/wood/nightshade/fence.json | 12 +- .../recipes/wood/nightshade/fence_gate.json | 8 +- .../byg/recipes/wood/nightshade/planks.json | 4 +- .../wood/nightshade/pressure_plate.json | 6 +- .../byg/recipes/wood/nightshade/sign.json | 14 +- .../byg/recipes/wood/nightshade/slab.json | 10 +- .../byg/recipes/wood/nightshade/stairs.json | 14 +- .../byg/recipes/wood/nightshade/trapdoor.json | 12 +- .../byg/recipes/wood/nightshade/wood.json | 12 +- .../data/byg/recipes/wood/palm/boat.json | 8 +- .../data/byg/recipes/wood/palm/bookshelf.json | 16 +- .../byg/recipes/wood/palm/crafting_table.json | 8 +- .../data/byg/recipes/wood/palm/door.json | 14 +- .../data/byg/recipes/wood/palm/fence.json | 12 +- .../byg/recipes/wood/palm/fence_gate.json | 8 +- .../data/byg/recipes/wood/palm/planks.json | 4 +- .../byg/recipes/wood/palm/pressure_plate.json | 6 +- .../data/byg/recipes/wood/palm/sign.json | 14 +- .../data/byg/recipes/wood/palm/slab.json | 10 +- .../data/byg/recipes/wood/palm/stairs.json | 14 +- .../data/byg/recipes/wood/palm/trapdoor.json | 12 +- .../data/byg/recipes/wood/palm/wood.json | 12 +- .../data/byg/recipes/wood/pine/boat.json | 8 +- .../data/byg/recipes/wood/pine/bookshelf.json | 16 +- .../byg/recipes/wood/pine/crafting_table.json | 8 +- .../data/byg/recipes/wood/pine/door.json | 14 +- .../data/byg/recipes/wood/pine/fence.json | 12 +- .../byg/recipes/wood/pine/fence_gate.json | 8 +- .../data/byg/recipes/wood/pine/planks.json | 4 +- .../byg/recipes/wood/pine/pressure_plate.json | 6 +- .../data/byg/recipes/wood/pine/sign.json | 14 +- .../data/byg/recipes/wood/pine/slab.json | 10 +- .../data/byg/recipes/wood/pine/stairs.json | 14 +- .../data/byg/recipes/wood/pine/trapdoor.json | 12 +- .../data/byg/recipes/wood/pine/wood.json | 12 +- .../recipes/wood/rainbow_eucalyptus/boat.json | 8 +- .../wood/rainbow_eucalyptus/bookshelf.json | 16 +- .../rainbow_eucalyptus/crafting_table.json | 8 +- .../recipes/wood/rainbow_eucalyptus/door.json | 14 +- .../wood/rainbow_eucalyptus/fence.json | 12 +- .../wood/rainbow_eucalyptus/fence_gate.json | 8 +- .../wood/rainbow_eucalyptus/planks.json | 4 +- .../rainbow_eucalyptus/pressure_plate.json | 6 +- .../recipes/wood/rainbow_eucalyptus/sign.json | 14 +- .../recipes/wood/rainbow_eucalyptus/slab.json | 10 +- .../wood/rainbow_eucalyptus/stairs.json | 14 +- .../wood/rainbow_eucalyptus/trapdoor.json | 12 +- .../recipes/wood/rainbow_eucalyptus/wood.json | 12 +- .../data/byg/recipes/wood/redwood/boat.json | 8 +- .../byg/recipes/wood/redwood/bookshelf.json | 16 +- .../recipes/wood/redwood/crafting_table.json | 8 +- .../data/byg/recipes/wood/redwood/door.json | 14 +- .../data/byg/recipes/wood/redwood/fence.json | 12 +- .../byg/recipes/wood/redwood/fence_gate.json | 8 +- .../data/byg/recipes/wood/redwood/planks.json | 4 +- .../recipes/wood/redwood/pressure_plate.json | 6 +- .../data/byg/recipes/wood/redwood/sign.json | 14 +- .../data/byg/recipes/wood/redwood/slab.json | 10 +- .../data/byg/recipes/wood/redwood/stairs.json | 14 +- .../byg/recipes/wood/redwood/trapdoor.json | 12 +- .../data/byg/recipes/wood/redwood/wood.json | 12 +- .../data/byg/recipes/wood/skyris/boat.json | 8 +- .../byg/recipes/wood/skyris/bookshelf.json | 16 +- .../recipes/wood/skyris/crafting_table.json | 8 +- .../data/byg/recipes/wood/skyris/door.json | 14 +- .../data/byg/recipes/wood/skyris/fence.json | 12 +- .../byg/recipes/wood/skyris/fence_gate.json | 8 +- .../data/byg/recipes/wood/skyris/planks.json | 4 +- .../recipes/wood/skyris/pressure_plate.json | 6 +- .../data/byg/recipes/wood/skyris/sign.json | 14 +- .../data/byg/recipes/wood/skyris/slab.json | 10 +- .../data/byg/recipes/wood/skyris/stairs.json | 14 +- .../byg/recipes/wood/skyris/trapdoor.json | 12 +- .../data/byg/recipes/wood/skyris/wood.json | 12 +- .../byg/recipes/wood/sythian/bookshelf.json | 16 +- .../recipes/wood/sythian/crafting_table.json | 8 +- .../data/byg/recipes/wood/sythian/door.json | 14 +- .../data/byg/recipes/wood/sythian/fence.json | 12 +- .../byg/recipes/wood/sythian/fence_gate.json | 8 +- .../data/byg/recipes/wood/sythian/planks.json | 4 +- .../recipes/wood/sythian/pressure_plate.json | 6 +- .../data/byg/recipes/wood/sythian/sign.json | 14 +- .../data/byg/recipes/wood/sythian/slab.json | 10 +- .../data/byg/recipes/wood/sythian/stairs.json | 14 +- .../byg/recipes/wood/sythian/trapdoor.json | 12 +- .../data/byg/recipes/wood/sythian/wood.json | 12 +- .../data/byg/recipes/wood/willow/boat.json | 8 +- .../byg/recipes/wood/willow/bookshelf.json | 16 +- .../recipes/wood/willow/crafting_table.json | 8 +- .../data/byg/recipes/wood/willow/door.json | 14 +- .../data/byg/recipes/wood/willow/fence.json | 12 +- .../byg/recipes/wood/willow/fence_gate.json | 8 +- .../data/byg/recipes/wood/willow/planks.json | 4 +- .../recipes/wood/willow/pressure_plate.json | 6 +- .../data/byg/recipes/wood/willow/sign.json | 14 +- .../data/byg/recipes/wood/willow/slab.json | 10 +- .../data/byg/recipes/wood/willow/stairs.json | 14 +- .../byg/recipes/wood/willow/trapdoor.json | 12 +- .../data/byg/recipes/wood/willow/wood.json | 12 +- .../byg/recipes/wood/witch_hazel/boat.json | 8 +- .../recipes/wood/witch_hazel/bookshelf.json | 16 +- .../wood/witch_hazel/crafting_table.json | 8 +- .../byg/recipes/wood/witch_hazel/door.json | 14 +- .../byg/recipes/wood/witch_hazel/fence.json | 12 +- .../recipes/wood/witch_hazel/fence_gate.json | 8 +- .../byg/recipes/wood/witch_hazel/planks.json | 4 +- .../wood/witch_hazel/pressure_plate.json | 6 +- .../byg/recipes/wood/witch_hazel/sign.json | 14 +- .../byg/recipes/wood/witch_hazel/slab.json | 10 +- .../byg/recipes/wood/witch_hazel/stairs.json | 14 +- .../recipes/wood/witch_hazel/trapdoor.json | 12 +- .../byg/recipes/wood/witch_hazel/wood.json | 12 +- .../data/byg/recipes/wood/zelkova/boat.json | 8 +- .../byg/recipes/wood/zelkova/bookshelf.json | 16 +- .../recipes/wood/zelkova/crafting_table.json | 8 +- .../data/byg/recipes/wood/zelkova/door.json | 14 +- .../data/byg/recipes/wood/zelkova/fence.json | 12 +- .../byg/recipes/wood/zelkova/fence_gate.json | 8 +- .../data/byg/recipes/wood/zelkova/planks.json | 4 +- .../recipes/wood/zelkova/pressure_plate.json | 6 +- .../data/byg/recipes/wood/zelkova/sign.json | 14 +- .../data/byg/recipes/wood/zelkova/slab.json | 10 +- .../data/byg/recipes/wood/zelkova/stairs.json | 14 +- .../byg/recipes/wood/zelkova/trapdoor.json | 12 +- .../data/byg/recipes/wood/zelkova/wood.json | 12 +- .../data/byg/tags/blocks/bookshelves.json | 1 - .../data/byg/tags/blocks/end_stone.json | 1 - .../resources/data/byg/tags/blocks/lush.json | 1 - .../may_place_on/allium_flower_bush.json | 1 - .../may_place_on/alpine_bellflower.json | 1 - .../tags/blocks/may_place_on/amaranth.json | 1 - .../tags/blocks/may_place_on/angelica.json | 1 - .../may_place_on/araucaria_sapling.json | 1 - .../blocks/may_place_on/aspen_sapling.json | 1 - .../blocks/may_place_on/baobab_sapling.json | 1 - .../tags/blocks/may_place_on/beach_grass.json | 1 - .../byg/tags/blocks/may_place_on/begonia.json | 1 - .../byg/tags/blocks/may_place_on/bistort.json | 1 - .../tags/blocks/may_place_on/black_rose.json | 1 - .../may_place_on/blue_enchanted_sapling.json | 1 - .../tags/blocks/may_place_on/blue_sage.json | 1 - .../may_place_on/blue_spruce_sapling.json | 1 - .../may_place_on/brown_birch_sapling.json | 1 - .../may_place_on/brown_oak_sapling.json | 1 - .../may_place_on/brown_zelkova_sapling.json | 1 - .../blocks/may_place_on/bulbis_oddity.json | 1 - .../blocks/may_place_on/california_poppy.json | 1 - .../blocks/may_place_on/cika_sapling.json | 1 - .../blocks/may_place_on/clover_patch.json | 1 - .../byg/tags/blocks/may_place_on/crocus.json | 1 - .../blocks/may_place_on/cyan_amaranth.json | 1 - .../blocks/may_place_on/cypress_sapling.json | 1 - .../tags/blocks/may_place_on/death_cap.json | 1 - .../tags/blocks/may_place_on/delphinium.json | 1 - .../blocks/may_place_on/ebony_sapling.json | 1 - .../tags/blocks/may_place_on/embur_wart.json | 1 - .../blocks/may_place_on/ether_sapling.json | 1 - .../blocks/may_place_on/fairy_slipper.json | 1 - .../tags/blocks/may_place_on/fir_sapling.json | 1 - .../may_place_on/firecracker_flower_bush.json | 1 - .../blocks/may_place_on/flower_patch.json | 1 - .../flowering_indigo_jacaranda_bush.json | 1 - .../flowering_jacaranda_bush.json | 1 - .../tags/blocks/may_place_on/foxglove.json | 1 - .../blocks/may_place_on/fungal_imparius.json | 1 - .../may_place_on/golden_spined_cactus.json | 1 - .../may_place_on/green_enchanted_sapling.json | 1 - .../blocks/may_place_on/green_mushroom.json | 1 - .../tags/blocks/may_place_on/green_tulip.json | 1 - .../tags/blocks/may_place_on/guzmania.json | 1 - .../blocks/may_place_on/holly_sapling.json | 1 - .../tags/blocks/may_place_on/horseweed.json | 1 - .../blocks/may_place_on/hydrangea_bush.json | 1 - .../may_place_on/imparius_mushroom.json | 1 - .../tags/blocks/may_place_on/incan_lily.json | 1 - .../indigo_jacaranda_sapling.json | 1 - .../byg/tags/blocks/may_place_on/iris.json | 1 - .../may_place_on/jacaranda_sapling.json | 1 - .../blocks/may_place_on/japanese_orchid.json | 1 - .../blocks/may_place_on/joshua_sapling.json | 1 - .../blocks/may_place_on/kovan_flower.json | 1 - .../blocks/may_place_on/lament_sapling.json | 1 - .../may_place_on/lazarus_bellflower.json | 1 - .../blocks/may_place_on/lollipop_flower.json | 1 - .../blocks/may_place_on/magenta_amaranth.json | 1 - .../blocks/may_place_on/magenta_tulip.json | 1 - .../blocks/may_place_on/mahogany_sapling.json | 1 - .../blocks/may_place_on/mangrove_sapling.json | 1 - .../blocks/may_place_on/mangrove_tree.json | 1 - .../blocks/may_place_on/maple_sapling.json | 1 - .../tags/blocks/may_place_on/mini_cactus.json | 1 - .../may_place_on/nightshade_sapling.json | 1 - .../blocks/may_place_on/orange_amaranth.json | 1 - .../may_place_on/orange_birch_sapling.json | 1 - .../blocks/may_place_on/orange_daisy.json | 1 - .../may_place_on/orange_oak_sapling.json | 1 - .../may_place_on/orange_spruce_sapling.json | 1 - .../blocks/may_place_on/orchard_sapling.json | 1 - .../tags/blocks/may_place_on/osiria_rose.json | 1 - .../blocks/may_place_on/palm_sapling.json | 1 - .../may_place_on/palo_verde_sapling.json | 1 - .../may_place_on/peach_leather_flower.json | 1 - .../blocks/may_place_on/pine_sapling.json | 1 - .../tags/blocks/may_place_on/pink_allium.json | 1 - .../blocks/may_place_on/pink_allium_bush.json | 1 - .../blocks/may_place_on/pink_anemone.json | 1 - .../may_place_on/pink_cherry_sapling.json | 1 - .../blocks/may_place_on/pink_daffodil.json | 1 - .../blocks/may_place_on/prairie_grass.json | 1 - .../may_place_on/prickly_pear_cactus.json | 1 - .../blocks/may_place_on/protea_flower.json | 1 - .../blocks/may_place_on/purple_amaranth.json | 1 - .../may_place_on/purple_bulbis_oddity.json | 1 - .../tags/blocks/may_place_on/purple_sage.json | 1 - .../blocks/may_place_on/purple_tulip.json | 1 - .../rainbow_eucalyptus_sapling.json | 1 - .../may_place_on/red_birch_sapling.json | 1 - .../may_place_on/red_maple_sapling.json | 1 - .../blocks/may_place_on/red_oak_sapling.json | 1 - .../may_place_on/red_spruce_sapling.json | 1 - .../blocks/may_place_on/redwood_sapling.json | 1 - .../byg/tags/blocks/may_place_on/richea.json | 1 - .../byg/tags/blocks/may_place_on/rose.json | 1 - .../blocks/may_place_on/shulkren_fungus.json | 1 - .../may_place_on/silver_maple_sapling.json | 1 - .../may_place_on/silver_vase_flower.json | 1 - .../blocks/may_place_on/skyris_sapling.json | 1 - .../tags/blocks/may_place_on/soul_shroom.json | 1 - .../blocks/may_place_on/sythian_fungus.json | 1 - .../tags/blocks/may_place_on/tall_allium.json | 1 - .../blocks/may_place_on/tall_beach_grass.json | 1 - .../blocks/may_place_on/tall_pink_allium.json | 1 - .../may_place_on/tall_prairie_grass.json | 1 - .../blocks/may_place_on/torch_ginger.json | 1 - .../may_place_on/violet_leather_flower.json | 1 - .../blocks/may_place_on/weeping_milk_cap.json | 1 - .../blocks/may_place_on/white_anemone.json | 1 - .../may_place_on/white_cherry_sapling.json | 1 - .../tags/blocks/may_place_on/white_sage.json | 1 - .../blocks/may_place_on/willow_sapling.json | 1 - .../blocks/may_place_on/winter_succulent.json | 1 - .../may_place_on/witch_hazel_sapling.json | 1 - .../may_place_on/withering_oak_sapling.json | 1 - .../tags/blocks/may_place_on/wood_blewit.json | 1 - .../may_place_on/yellow_birch_sapling.json | 1 - .../blocks/may_place_on/yellow_daffodil.json | 1 - .../may_place_on/yellow_spruce_sapling.json | 1 - .../blocks/may_place_on/yellow_tulip.json | 1 - .../blocks/may_place_on/zelkova_sapling.json | 1 - .../data/byg/tags/blocks/mushrooms.json | 1 - .../data/byg/tags/blocks/scaffolding.json | 1 - .../resources/data/byg/tags/blocks/slabs.json | 1 - .../data/byg/tags/blocks/wood/aspen_logs.json | 1 - .../byg/tags/blocks/wood/baobab_logs.json | 1 - .../tags/blocks/wood/blue_enchanted_logs.json | 1 - .../byg/tags/blocks/wood/bulbis_logs.json | 1 - .../byg/tags/blocks/wood/cherry_logs.json | 1 - .../data/byg/tags/blocks/wood/cika_logs.json | 1 - .../byg/tags/blocks/wood/cypress_logs.json | 1 - .../data/byg/tags/blocks/wood/ebony_logs.json | 1 - .../data/byg/tags/blocks/wood/embur_logs.json | 1 - .../data/byg/tags/blocks/wood/ether_logs.json | 1 - .../data/byg/tags/blocks/wood/fir_logs.json | 1 - .../blocks/wood/green_enchanted_logs.json | 1 - .../data/byg/tags/blocks/wood/holly_logs.json | 1 - .../byg/tags/blocks/wood/imparius_logs.json | 1 - .../byg/tags/blocks/wood/jacaranda_logs.json | 1 - .../byg/tags/blocks/wood/lament_logs.json | 1 - .../byg/tags/blocks/wood/mahogany_logs.json | 1 - .../byg/tags/blocks/wood/mangrove_logs.json | 1 - .../data/byg/tags/blocks/wood/maple_logs.json | 1 - .../byg/tags/blocks/wood/nightshade_logs.json | 1 - .../data/byg/tags/blocks/wood/palm_logs.json | 1 - .../byg/tags/blocks/wood/palo_verde_logs.json | 1 - .../data/byg/tags/blocks/wood/pine_logs.json | 1 - .../blocks/wood/rainbow_eucalyptus_logs.json | 1 - .../byg/tags/blocks/wood/redwood_logs.json | 1 - .../byg/tags/blocks/wood/skyris_logs.json | 1 - .../byg/tags/blocks/wood/sythian_logs.json | 1 - .../byg/tags/blocks/wood/willow_logs.json | 1 - .../tags/blocks/wood/witch_hazel_logs.json | 1 - .../tags/blocks/wood/withering_oak_logs.json | 1 - .../byg/tags/blocks/wood/zelkova_logs.json | 1 - .../data/byg/tags/entity_types/boats.json | 1 - .../data/byg/tags/items/bookshelves.json | 1 - .../data/byg/tags/items/mushrooms.json | 1 - .../resources/data/byg/tags/items/sticks.json | 1 - .../data/byg/tags/items/wood/aspen_logs.json | 1 - .../data/byg/tags/items/wood/baobab_logs.json | 1 - .../tags/items/wood/blue_enchanted_logs.json | 1 - .../data/byg/tags/items/wood/bulbis_logs.json | 1 - .../data/byg/tags/items/wood/cherry_logs.json | 1 - .../data/byg/tags/items/wood/cika_logs.json | 1 - .../byg/tags/items/wood/cypress_logs.json | 1 - .../data/byg/tags/items/wood/ebony_logs.json | 1 - .../data/byg/tags/items/wood/embur_logs.json | 1 - .../data/byg/tags/items/wood/ether_logs.json | 1 - .../data/byg/tags/items/wood/fir_logs.json | 1 - .../tags/items/wood/green_enchanted_logs.json | 1 - .../data/byg/tags/items/wood/holly_logs.json | 1 - .../byg/tags/items/wood/imparius_logs.json | 1 - .../byg/tags/items/wood/jacaranda_logs.json | 1 - .../data/byg/tags/items/wood/lament_logs.json | 1 - .../byg/tags/items/wood/mahogany_logs.json | 1 - .../byg/tags/items/wood/mangrove_logs.json | 1 - .../data/byg/tags/items/wood/maple_logs.json | 1 - .../byg/tags/items/wood/nightshade_logs.json | 1 - .../data/byg/tags/items/wood/palm_logs.json | 1 - .../byg/tags/items/wood/palo_verde_logs.json | 1 - .../data/byg/tags/items/wood/pine_logs.json | 1 - .../items/wood/rainbow_eucalyptus_logs.json | 1 - .../byg/tags/items/wood/redwood_logs.json | 1 - .../data/byg/tags/items/wood/skyris_logs.json | 1 - .../byg/tags/items/wood/sythian_logs.json | 1 - .../data/byg/tags/items/wood/willow_logs.json | 1 - .../byg/tags/items/wood/witch_hazel_logs.json | 1 - .../tags/items/wood/withering_oak_logs.json | 1 - .../byg/tags/items/wood/zelkova_logs.json | 1 - .../byg/tags/worldgen/biome/is_badlands.json | 1 - .../byg/tags/worldgen/biome/is_beach.json | 1 - .../data/byg/tags/worldgen/biome/is_dead.json | 1 - .../tags/worldgen/biome/is_deep_ocean.json | 1 - .../data/byg/tags/worldgen/biome/is_icy.json | 1 - .../byg/tags/worldgen/biome/is_ocean.json | 1 - .../byg/tags/worldgen/biome/is_sandy.json | 1 - .../byg/tags/worldgen/biome/is_snowy.json | 1 - .../byg/tags/worldgen/biome/is_spooky.json | 1 - .../byg/tags/worldgen/biome/is_swamp.json | 1 - .../byg/tags/worldgen/biome/is_wasteland.json | 1 - .../data/minecraft/tags/blocks/buttons.json | 1 - .../data/minecraft/tags/blocks/campfires.json | 1 - .../data/minecraft/tags/blocks/ice.json | 1 - .../data/minecraft/tags/blocks/leaves.json | 1 - .../data/minecraft/tags/blocks/logs.json | 1 - .../minecraft/tags/blocks/logs_that_burn.json | 1 - .../minecraft/tags/blocks/mineable/axe.json | 1 - .../tags/blocks/mineable/shovel.json | 1 - .../data/minecraft/tags/blocks/oak_logs.json | 1 - .../data/minecraft/tags/blocks/planks.json | 1 - .../data/minecraft/tags/blocks/sand.json | 1 - .../data/minecraft/tags/blocks/saplings.json | 1 - .../data/minecraft/tags/blocks/stairs.json | 1 - .../data/minecraft/tags/blocks/trapdoors.json | 1 - .../minecraft/tags/blocks/wart_blocks.json | 1 - .../minecraft/tags/blocks/wooden_buttons.json | 1 - .../minecraft/tags/blocks/wooden_doors.json | 1 - .../minecraft/tags/blocks/wooden_fences.json | 1 - .../tags/blocks/wooden_pressure_plates.json | 1 - .../minecraft/tags/blocks/wooden_slabs.json | 1 - .../minecraft/tags/blocks/wooden_stairs.json | 1 - .../tags/blocks/wooden_trapdoors.json | 1 - .../data/minecraft/tags/items/buttons.json | 1 - .../data/minecraft/tags/items/leaves.json | 1 - .../data/minecraft/tags/items/logs.json | 1 - .../minecraft/tags/items/logs_that_burn.json | 1 - .../data/minecraft/tags/items/planks.json | 1 - .../data/minecraft/tags/items/sand.json | 1 - .../data/minecraft/tags/items/saplings.json | 1 - .../data/minecraft/tags/items/slabs.json | 1 - .../data/minecraft/tags/items/stairs.json | 1 - .../data/minecraft/tags/items/trapdoors.json | 1 - .../minecraft/tags/items/wooden_buttons.json | 1 - .../minecraft/tags/items/wooden_doors.json | 1 - .../minecraft/tags/items/wooden_fences.json | 1 - .../tags/items/wooden_pressure_plates.json | 1 - .../minecraft/tags/items/wooden_slabs.json | 1 - .../minecraft/tags/items/wooden_stairs.json | 1 - .../tags/items/wooden_trapdoors.json | 1 - .../potionstudios/byg/core/BYGRegistry.java | 2 +- .../providers/BYGWoodAssetsProvider.java | 64 +- gradle.properties | 2 +- 2888 files changed, 32803 insertions(+), 31487 deletions(-) create mode 100644 Common/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b create mode 100644 Common/src/generated/resources/.cache/3b4ee89eae22ec457d81b430a4f1a2e0afc9b857 create mode 100644 Common/src/generated/resources/.cache/55f0273cb61243ff3d2fde23212f03e66541da02 create mode 100644 Common/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 create mode 100644 Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e create mode 100644 Common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 delete mode 100644 Common/src/generated/resources/.cache/cache create mode 100644 Common/src/generated/resources/.cache/e96ec6bce616c89889fb1019febdaef36b955008 create mode 100644 Common/src/generated/resources/.cache/fb07fd0e5e59c798298e44c793e29943bd74dcd4 create mode 100644 Common/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab rename Common/src/generated/resources/assets/byg/models/block/aspen/{door_bottom_hinge.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/aspen/{door_top.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/aspen/{door_top_hinge.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/aspen/{door_bottom.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/baobab/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/baobab/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/baobab/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/baobab/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/blue_enchanted/{door_top.json => door/bottom_left.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/blue_enchanted/{door_top_hinge.json => door/bottom_right.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/blue_enchanted/{door_bottom.json => door/top_left.json} (73%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/blue_enchanted/{door_bottom_hinge.json => door/top_right.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/bulbis/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/bulbis/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/bulbis/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/bulbis/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cherry/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cherry/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cherry/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cherry/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cika/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cika/{door_top_hinge.json => door/bottom_right.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cika/{door_bottom.json => door/top_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cika/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cika/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cypress/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cypress/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/cypress/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/cypress/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/ebony/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/ebony/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/ebony/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/ebony/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/embur/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/embur/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/embur/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/embur/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/embur/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/ether/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/ether/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/ether/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/ether/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/ether/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/fir/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/fir/{door_top_hinge.json => door/bottom_right.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/fir/{door_bottom.json => door/top_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/fir/{door_bottom_hinge.json => door/top_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/fir/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/green_enchanted/{door_top.json => door/bottom_left.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/green_enchanted/{door_top_hinge.json => door/bottom_right.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/green_enchanted/{door_bottom.json => door/top_left.json} (73%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/green_enchanted/{door_bottom_hinge.json => door/top_right.json} (73%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/holly/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/holly/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/holly/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/holly/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/holly/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/imparius/{door_top.json => door/bottom_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/imparius/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/imparius/{door_bottom.json => door/top_left.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/imparius/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/jacaranda/{door_top.json => door/bottom_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/jacaranda/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/jacaranda/{door_bottom.json => door/top_left.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/jacaranda/{door_bottom_hinge.json => door/top_right.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/lament/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/lament/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/lament/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/lament/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/lament/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/mahogany/{door_top.json => door/bottom_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/mahogany/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/mahogany/{door_bottom.json => door/top_left.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/mahogany/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/mangrove/{door_top.json => door/bottom_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/mangrove/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/mangrove/{door_bottom.json => door/top_left.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/mangrove/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/maple/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/maple/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/maple/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/maple/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/maple/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/nightshade/{door_top.json => door/bottom_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/nightshade/{door_top_hinge.json => door/bottom_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/nightshade/{door_bottom.json => door/top_left.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/nightshade/{door_bottom_hinge.json => door/top_right.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/palm/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/palm/{door_top_hinge.json => door/bottom_right.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/palm/{door_bottom.json => door/top_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/palm/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/palm/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/pine/{door_top.json => door/bottom_left.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/pine/{door_top_hinge.json => door/bottom_right.json} (67%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/pine/{door_bottom.json => door/top_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/pine/{door_bottom_hinge.json => door/top_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/pine/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/{door_top.json => door/bottom_left.json} (73%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/{door_top_hinge.json => door/bottom_right.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/{door_bottom.json => door/top_left.json} (74%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/{door_bottom_hinge.json => door/top_right.json} (74%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/redwood/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/redwood/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/redwood/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/redwood/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/skyris/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/skyris/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/skyris/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/skyris/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/sythian/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/sythian/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/sythian/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/sythian/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/willow/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/willow/{door_top_hinge.json => door/bottom_right.json} (68%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/willow/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/willow/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/willow/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/witch_hazel/{door_top.json => door/bottom_left.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/witch_hazel/{door_top_hinge.json => door/bottom_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/witch_hazel/{door_bottom.json => door/top_left.json} (72%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/witch_hazel/{door_bottom_hinge.json => door/top_right.json} (71%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right_open.json rename Common/src/generated/resources/assets/byg/models/block/zelkova/{door_top.json => door/bottom_left.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left_open.json rename Common/src/generated/resources/assets/byg/models/block/zelkova/{door_top_hinge.json => door/bottom_right.json} (69%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right_open.json rename Common/src/generated/resources/assets/byg/models/block/zelkova/{door_bottom.json => door/top_left.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left_open.json rename Common/src/generated/resources/assets/byg/models/block/zelkova/{door_bottom_hinge.json => door/top_right.json} (70%) create mode 100644 Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right_open.json diff --git a/Common/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Common/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b new file mode 100644 index 0000000000..779d5e617f --- /dev/null +++ b/Common/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -0,0 +1,52 @@ +// 1.19 2022-06-08T20:08:31.1944278 Tags for minecraft:item +9ad18a5f91a85156fdb4a0fe04bfced0a85190f6 data/byg/tags/items/bookshelves.json +ef89ece741f37ca4edef1a32af40e5bd5fef30ed data/byg/tags/items/mushrooms.json +f9741f495c31cbca5e778b6b8fef1011d144397c data/byg/tags/items/sticks.json +7703e5d02c2746bdbbbc0ed84ca702ba0ffbf08f data/byg/tags/items/wood/aspen_logs.json +6e452e56808f54cc00f849724e4c707876b8dc62 data/byg/tags/items/wood/baobab_logs.json +2f4f003fcf3e0abe5f6910af3f84a2c23f861755 data/byg/tags/items/wood/blue_enchanted_logs.json +60471b0693276a23d3e570d946ae8b281a670967 data/byg/tags/items/wood/bulbis_logs.json +6025faea67820ec5603c746f11158ada99723aad data/byg/tags/items/wood/cherry_logs.json +0c2e6ad3ab992852d39b97b7e68c3b9f5163a200 data/byg/tags/items/wood/cika_logs.json +c4c46b42bcbfb2d5f9fdc30ca094140f3ca55669 data/byg/tags/items/wood/cypress_logs.json +40aded7130bc80f71359616f444235b1d84269b1 data/byg/tags/items/wood/ebony_logs.json +19bceb41a62f2024bdb7079aa69a2990b5afb49c data/byg/tags/items/wood/embur_logs.json +0a9d1609711a1eaf2c4896b3c2771b2048b3834b data/byg/tags/items/wood/ether_logs.json +def5f419deab903798347c2bbc6b67fc6050c0bb data/byg/tags/items/wood/fir_logs.json +15e6e7aed0a9615d4470f7d2499734f117846e67 data/byg/tags/items/wood/green_enchanted_logs.json +5675baabec6f48813b01ad90224966f04e63e1ff data/byg/tags/items/wood/holly_logs.json +477df1cf06cfe87245f7dfbee2703103540354c3 data/byg/tags/items/wood/imparius_logs.json +f25c6968ff68cb356a0223c0c7d87c6bd98fe365 data/byg/tags/items/wood/jacaranda_logs.json +dddfc92c770ad7f92a3bbdf9bcc91bce4261347e data/byg/tags/items/wood/lament_logs.json +bc209ef504cd8e1f9bb684ca72923ddbf4eddacc data/byg/tags/items/wood/mahogany_logs.json +43bac38b67128575b270ceaea927bf628d7f9859 data/byg/tags/items/wood/mangrove_logs.json +2c0ab0d6b8e69b49a963860699e7dd105c7de5e8 data/byg/tags/items/wood/maple_logs.json +778d3a63d8cce3649f87a7e084ea24229c85cfd1 data/byg/tags/items/wood/nightshade_logs.json +5d48ee13f5e465f19a7b3efa6691763b0f53592e data/byg/tags/items/wood/palm_logs.json +54cf56b00b4bb1a2a860f813021e229fc65fe3b6 data/byg/tags/items/wood/palo_verde_logs.json +94f72a755c3831ec716034a60afbd6e062135dea data/byg/tags/items/wood/pine_logs.json +5f624f68a4e536875061508b262c2d130e75ae4b data/byg/tags/items/wood/rainbow_eucalyptus_logs.json +1f83b1a5783ea13aec0600e7812d4f78d1953881 data/byg/tags/items/wood/redwood_logs.json +0c8ce69039282be5f6b814248b8397590423af8e data/byg/tags/items/wood/skyris_logs.json +2233f58716ca83938f2fd3b85cc1d5cba070d8e1 data/byg/tags/items/wood/sythian_logs.json +b5444de87b7a8a3d8cf1a1d93d8e0f785a2ebbd3 data/byg/tags/items/wood/willow_logs.json +d9bee530cb743b4401ddc0ae6e746db1446cb58c data/byg/tags/items/wood/witch_hazel_logs.json +905fafa6eeb610de1832dd4816b99b1f102dc7d4 data/byg/tags/items/wood/withering_oak_logs.json +c45f5216a4bfbe4957d094bbbe5e0c7200697677 data/byg/tags/items/wood/zelkova_logs.json +9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/items/buttons.json +411e2fb5471ebd29a09a36e86eaf61b18455d688 data/minecraft/tags/items/leaves.json +33b235c8f4002c5dbd589c5fe366c207db40bf00 data/minecraft/tags/items/logs.json +2b8005337c8db298e3e8bea249c881029f2bbfef data/minecraft/tags/items/logs_that_burn.json +783bd34843ae1ebe7eee31074eef9ceb8f2d9243 data/minecraft/tags/items/planks.json +694444607939e5deac55f0e05c9a2fcf754c7418 data/minecraft/tags/items/sand.json +a906b2923bd4e6c1a32969ee526d6117df7026b5 data/minecraft/tags/items/saplings.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/items/slabs.json +5963df094b99da0ee350cf32a6123322b62e6cac data/minecraft/tags/items/stairs.json +d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/items/trapdoors.json +9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/items/wooden_buttons.json +8f7ff378ccfcaaebc4a0222ee7e11cecb44f7d9e data/minecraft/tags/items/wooden_doors.json +4d32f5855aeee653ff9b92b88865c88b08fa782f data/minecraft/tags/items/wooden_fences.json +e3b5e4bd8dc3d019e1ccda81d4d5cba553ebc2e8 data/minecraft/tags/items/wooden_pressure_plates.json +c9f4a4e34c5fabc6838bd4d6017c7f93aa5ca00c data/minecraft/tags/items/wooden_slabs.json +6c66002027cbd32fc13f9df0493a7783888303d5 data/minecraft/tags/items/wooden_stairs.json +d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/items/wooden_trapdoors.json diff --git a/Common/src/generated/resources/.cache/3b4ee89eae22ec457d81b430a4f1a2e0afc9b857 b/Common/src/generated/resources/.cache/3b4ee89eae22ec457d81b430a4f1a2e0afc9b857 new file mode 100644 index 0000000000..086493ecbe --- /dev/null +++ b/Common/src/generated/resources/.cache/3b4ee89eae22ec457d81b430a4f1a2e0afc9b857 @@ -0,0 +1,2258 @@ +// 1.19 2022-06-08T20:08:31.2414632 Wood Asset Providers +5124909204021a9feaed8d326567a42de602790d assets/byg/blockstates/aspen_bookshelf.json +4a966dece1ebed3e04986b51629a880ba21d8459 assets/byg/blockstates/aspen_button.json +e622b2d66c4c8d8a942586c19e8fe60d03a212fa assets/byg/blockstates/aspen_crafting_table.json +74275c9dec8d501a57495567b9825f2f72860dc0 assets/byg/blockstates/aspen_door.json +58bd2587698e7ee4918e5cddbc7d7cfd09effca7 assets/byg/blockstates/aspen_fence.json +8343c0fc0023e3b2f2fcec85a19047eb4d258304 assets/byg/blockstates/aspen_fence_gate.json +b257cea0ba3635e27dab2bc20c157860c7a70cbe assets/byg/blockstates/aspen_leaves.json +5eaefe3ec3e5139a75eec39647730b163b99afd0 assets/byg/blockstates/aspen_log.json +7a67308e650d3f599b14a7f0b8caa14ca5844522 assets/byg/blockstates/aspen_planks.json +0c8e776ac3046c9edf79c896fbc8237c126104bb assets/byg/blockstates/aspen_pressure_plate.json +05aad3172a135138e015885fc9583655292e5373 assets/byg/blockstates/aspen_sapling.json +6d3a556628d6de496f4204473092f6912bc67184 assets/byg/blockstates/aspen_sign.json +414a47c76a358d67676241cc766a80f02daa3faf assets/byg/blockstates/aspen_slab.json +72c5832e9126c71243a9c3eeaaa46ea93e710567 assets/byg/blockstates/aspen_stairs.json +c951d1ab94e32c8b53e8140be7efcbb5814afd9b assets/byg/blockstates/aspen_trapdoor.json +6d3a556628d6de496f4204473092f6912bc67184 assets/byg/blockstates/aspen_wall_sign.json +735ea84d832a3930b9aeebc44970564090d2f7c0 assets/byg/blockstates/aspen_wood.json +7351e163ee5558b03ff646939a494d5c48a77706 assets/byg/blockstates/baobab_bookshelf.json +39e369377fd11dd8374aae5053bbb209fde74295 assets/byg/blockstates/baobab_button.json +0dff969923d121976de11cf357241604281e5c25 assets/byg/blockstates/baobab_crafting_table.json +a82c67e921fc7627988c337193165f50928e4921 assets/byg/blockstates/baobab_door.json +c11af18bdea8fe9b001df2252cb10aa028231146 assets/byg/blockstates/baobab_fence.json +40ead0d781c967102ca6c4992f548d657e7d25e0 assets/byg/blockstates/baobab_fence_gate.json +bbb9b88e1525d2b19ab36d1c51572e089c19beec assets/byg/blockstates/baobab_leaves.json +d77e53a830eb0be23f290fffc6f1495d203d6632 assets/byg/blockstates/baobab_log.json +ab16f505dcb0dd1f3d75159de92aebe80426dabf assets/byg/blockstates/baobab_planks.json +8b3db893db4c6f9bbe687249c73fe55bc5a77f31 assets/byg/blockstates/baobab_pressure_plate.json +39113140ef94a453a18c38d39e53c8753e3b682a assets/byg/blockstates/baobab_sapling.json +8d4038fcb106236ef073037bfccb1da86e7fd754 assets/byg/blockstates/baobab_sign.json +78b7550a2986dd3ad8b7ae68b454e95a7c503d61 assets/byg/blockstates/baobab_slab.json +9dcaf5091a63594ceae5864ab98419ad710f1df1 assets/byg/blockstates/baobab_stairs.json +00cfd59e2e13103ab6be0e8d5b83f3973f78dc2f assets/byg/blockstates/baobab_trapdoor.json +8d4038fcb106236ef073037bfccb1da86e7fd754 assets/byg/blockstates/baobab_wall_sign.json +5aa8f8ec546d9f405ea693b41f5407857a144ceb assets/byg/blockstates/baobab_wood.json +f542873517cf06d7682db970c1f6861fcd3bbdc2 assets/byg/blockstates/blue_enchanted_bookshelf.json +b23a43b26e6f66827d7a7a83d7a686c7bf390040 assets/byg/blockstates/blue_enchanted_button.json +4fac9be1149f333a179abefa920d12daf46f32c8 assets/byg/blockstates/blue_enchanted_crafting_table.json +9c85767e10eed36dbfbd8b49dde7963d515e2802 assets/byg/blockstates/blue_enchanted_door.json +062115ed4f75ecf92dcdf97752e7e88cb8d5c7f3 assets/byg/blockstates/blue_enchanted_fence.json +6ee788b4def21308d2d399637f4a16a6cc0ca568 assets/byg/blockstates/blue_enchanted_fence_gate.json +26340fd9061e4698d067d053d7173e6b65137de9 assets/byg/blockstates/blue_enchanted_leaves.json +d82d4c43e47839d359f1fc6c84955f854929b7da assets/byg/blockstates/blue_enchanted_log.json +5eae800a8d15669470e9ea0f3a85bfc0275bd789 assets/byg/blockstates/blue_enchanted_planks.json +0cb57c59a380ad954c3a1802d312355871051845 assets/byg/blockstates/blue_enchanted_pressure_plate.json +a11fcb9ae44aa65489707f6c749d85fb3a2c061a assets/byg/blockstates/blue_enchanted_sapling.json +5936d609e78bcab8f93bb6eb35446f69c8e304cc assets/byg/blockstates/blue_enchanted_sign.json +a6d0ff7d935c9b0ed3d701db1fd183bcd8e50915 assets/byg/blockstates/blue_enchanted_slab.json +4026bffa27a2af61dffceb7224e83dfaa2d087c7 assets/byg/blockstates/blue_enchanted_stairs.json +f17d61f59f31f163de85e81115cadade20c257ce assets/byg/blockstates/blue_enchanted_trapdoor.json +5936d609e78bcab8f93bb6eb35446f69c8e304cc assets/byg/blockstates/blue_enchanted_wall_sign.json +53785c99ee9ba5c0a8241c0ca2b53162a731309d assets/byg/blockstates/blue_enchanted_wood.json +81b5987a30797f00cac91253f5a65113bf281324 assets/byg/blockstates/bulbis_bookshelf.json +423a4b2c065150a08670239c068202ca79bf0828 assets/byg/blockstates/bulbis_button.json +2f84c2e85860a36157c455773404236148a0fb03 assets/byg/blockstates/bulbis_crafting_table.json +b91efb23137326d24c69c53aadd749516376821a assets/byg/blockstates/bulbis_door.json +3e69573f8fafcd02d1591d0385ec327b49108ad9 assets/byg/blockstates/bulbis_fence.json +d76057a9db0973a2a8098732c0141613ae754efd assets/byg/blockstates/bulbis_fence_gate.json +0c60af431d282c08c759d8dfd7e4b31ed82fec9e assets/byg/blockstates/bulbis_oddity.json +63d692ae0112dbab8ade4be425b26ceb3c9ae639 assets/byg/blockstates/bulbis_planks.json +d703f0c0f3cc8bd4aa835c1a020602e43b056c8d assets/byg/blockstates/bulbis_pressure_plate.json +d163372b165df745b0a3ead4c1bb2ccbeefa58ec assets/byg/blockstates/bulbis_sign.json +6bfc8b5d70686acc73565249854c8ba7e95a106e assets/byg/blockstates/bulbis_slab.json +75fd6d22e90a72ecd5915afeda9ebc242a72383f assets/byg/blockstates/bulbis_stairs.json +cfd31e5f0971d445ed53341602c7c2e8af238fc6 assets/byg/blockstates/bulbis_stem.json +e0f4277147062b81fc18a861bc5ad7b13e4630c9 assets/byg/blockstates/bulbis_trapdoor.json +d163372b165df745b0a3ead4c1bb2ccbeefa58ec assets/byg/blockstates/bulbis_wall_sign.json +f9f89eb997feab346842d6d1613a180851059b52 assets/byg/blockstates/bulbis_wood.json +4b676461183ef71ba21b943379c14e99178adfe7 assets/byg/blockstates/cherry_bookshelf.json +8e83e15c38e71d37b952c67ed33c029aa0f46cb2 assets/byg/blockstates/cherry_button.json +8342a920d9464ee4db90e6f889e50b4e55c6fcfe assets/byg/blockstates/cherry_crafting_table.json +01d8d8afd848ae95d2c8c1ab2ce1709787edfa7a assets/byg/blockstates/cherry_door.json +f01c54a9f3fbcc3532674ec9e026be88f0895536 assets/byg/blockstates/cherry_fence.json +7f4e6d8ad2d755711d6389dcc6c795f4250ae236 assets/byg/blockstates/cherry_fence_gate.json +0af4496a1956159cd81b8961dbeed5c35d6c05da assets/byg/blockstates/cherry_log.json +e1cb37601ca3490eb7b41ad03b852626eee28429 assets/byg/blockstates/cherry_planks.json +38f7bf7fab639b5296a7687122d30fefbbe496f1 assets/byg/blockstates/cherry_pressure_plate.json +da884d58c4c55992825e652512c8102adc0e2fb6 assets/byg/blockstates/cherry_sign.json +4245fb4245ca57fe28a838e13e865029b7b9b721 assets/byg/blockstates/cherry_slab.json +0b4130ebf6af14cbdc38979e06d17e066f184933 assets/byg/blockstates/cherry_stairs.json +e8430b3a3a20cfb39e26a4a2854bc23d3eea2f93 assets/byg/blockstates/cherry_trapdoor.json +da884d58c4c55992825e652512c8102adc0e2fb6 assets/byg/blockstates/cherry_wall_sign.json +118779bd7609f208791e7676d73054dfe5c8d13c assets/byg/blockstates/cherry_wood.json +617891edcd43ab7f231e9a2abc40905953d29f89 assets/byg/blockstates/cika_bookshelf.json +fb76514dcb283de908f2cb19a0af5c9f3dd878e2 assets/byg/blockstates/cika_button.json +c894176da190ecb2f5595022ba43933502552d69 assets/byg/blockstates/cika_crafting_table.json +a3b62a99acc777b737f92961dc175801545d48cd assets/byg/blockstates/cika_door.json +4e3b8389b5b6be093d315c8ca70bf863678f7bee assets/byg/blockstates/cika_fence.json +94042413c9ee59af9a7a0300af728e906ec793e9 assets/byg/blockstates/cika_fence_gate.json +d603bd52cacf7260886ea9ff8971d8422b588971 assets/byg/blockstates/cika_leaves.json +f107167ddd168dd26adde0ab8bf98419a3c1abf6 assets/byg/blockstates/cika_log.json +6a28c8f506b0a6fde275f721c8854533debc3124 assets/byg/blockstates/cika_planks.json +bc50a5ff4fb6ae25c5b950af39d01a83ea93f3dc assets/byg/blockstates/cika_pressure_plate.json +c412d02c031e6efcdddd9af503c18e5e4b881794 assets/byg/blockstates/cika_sapling.json +dc58a47f567e160793a40a500a94f88ab0f630ef assets/byg/blockstates/cika_sign.json +0a6b0ed655ec56a9f03303f2fe8fa94a5d943f1a assets/byg/blockstates/cika_slab.json +caf216bafd1ca14dbec3fe00d9039db25f53b857 assets/byg/blockstates/cika_stairs.json +6358fc0d5c167c99281fd0fad134172af0e6a704 assets/byg/blockstates/cika_trapdoor.json +dc58a47f567e160793a40a500a94f88ab0f630ef assets/byg/blockstates/cika_wall_sign.json +c13e2253aa146a541cc8bb2378168dca08313654 assets/byg/blockstates/cika_wood.json +c1a7e8762531ec55dee97013613772669d149cb7 assets/byg/blockstates/cypress_bookshelf.json +10c34f6ba2f1130e879cd28020b061d379917c00 assets/byg/blockstates/cypress_button.json +1d9820d4312d8169b98fe8b9c55cf3eced92357c assets/byg/blockstates/cypress_crafting_table.json +2c2e14b3dbf66923b59e48b602cd2bb8bd6f1062 assets/byg/blockstates/cypress_door.json +75b85e96dcb0b172566d8006abba1c3985a907a2 assets/byg/blockstates/cypress_fence.json +ba33b6c475d49fa63f7316a2c7c33978dc5b1f17 assets/byg/blockstates/cypress_fence_gate.json +df725804507b5ce44def3e6462d01f3340fe4601 assets/byg/blockstates/cypress_leaves.json +da82d9a5499b60f940bb879756015ee0c5273ce9 assets/byg/blockstates/cypress_log.json +c5813b7479904e8554429a1f754d275e36cc92ca assets/byg/blockstates/cypress_planks.json +752473c3f7c65f9f39a7cce2d0ca8045b185f22f assets/byg/blockstates/cypress_pressure_plate.json +458860c6fd8c3dc098f9922ffca6eece01d4e519 assets/byg/blockstates/cypress_sapling.json +009b16b7709a5cb83937f0999bbdbde4a412f8d2 assets/byg/blockstates/cypress_sign.json +9df41b9114eea8b0b15ea7578cf3b5cf6b0801d4 assets/byg/blockstates/cypress_slab.json +b09627c86cd7a2ccf6de7d363f771ec67eb7a376 assets/byg/blockstates/cypress_stairs.json +26e85eb6336db468b6b344691f86ce979f0fb0c9 assets/byg/blockstates/cypress_trapdoor.json +009b16b7709a5cb83937f0999bbdbde4a412f8d2 assets/byg/blockstates/cypress_wall_sign.json +1ddf38cb7805d26e76927f336beb757219905eeb assets/byg/blockstates/cypress_wood.json +844bf086ae4544dae798b7aef6af1622fd9a0f31 assets/byg/blockstates/ebony_bookshelf.json +569d7660ac6505167696d971648c46883a1c5b8b assets/byg/blockstates/ebony_button.json +aa1c5efcb7cbe3a1f95fbec654068aa2a1eaa64a assets/byg/blockstates/ebony_crafting_table.json +2632d98f1e9ba34efc9a9a883b4fba8e6990479f assets/byg/blockstates/ebony_door.json +8c8d2dc16e5d525cc447e51157409f16058dc250 assets/byg/blockstates/ebony_fence.json +747f93e1825585a16225b023f3c2c3f382d9a9ed assets/byg/blockstates/ebony_fence_gate.json +3ad81d56bed9a07eb9ae9a500af9113618e29bd0 assets/byg/blockstates/ebony_leaves.json +1740a78fc5a6033d868ba6469f0209e553056584 assets/byg/blockstates/ebony_log.json +e1def4e3d73e6474c929a88aa6d51c96db547fe3 assets/byg/blockstates/ebony_planks.json +1775c2b17a4a1687cdc8160169c12224690c54b2 assets/byg/blockstates/ebony_pressure_plate.json +4085ec43e8ba1fd2ffe5cf43a3cc42034e4ae748 assets/byg/blockstates/ebony_sapling.json +6cf54dd43c936f509199d200cee0828bfc2346f5 assets/byg/blockstates/ebony_sign.json +d237c3f43a4a3ac1b83509ac0e48c7a533cbeba8 assets/byg/blockstates/ebony_slab.json +cbc0fa9eceacc961bcf910ff805840255c69339e assets/byg/blockstates/ebony_stairs.json +c953347f0b8a9f375b0956586d646fafa0eccc95 assets/byg/blockstates/ebony_trapdoor.json +6cf54dd43c936f509199d200cee0828bfc2346f5 assets/byg/blockstates/ebony_wall_sign.json +79af3c3ea23801a8ccbc01ac412e963938dbda9f assets/byg/blockstates/ebony_wood.json +541c1abef5411b8e82a8ed0e323740731d9f050e assets/byg/blockstates/embur_bookshelf.json +a0210ae3540a704f5d6a71ffabeb30a1400a723d assets/byg/blockstates/embur_button.json +8db7fc19b9c5df1125898a1bff23ba8d40af4865 assets/byg/blockstates/embur_crafting_table.json +529a45ced474d4cae375e0d4e61cd10236271470 assets/byg/blockstates/embur_door.json +4abc230e5d6e4e7e0b711305127b380e704d14c7 assets/byg/blockstates/embur_fence.json +d0ece75629f0787448b45db9a6ba148786d03ff9 assets/byg/blockstates/embur_fence_gate.json +7511f5aa871184deaad9850d51c72d15300872b9 assets/byg/blockstates/embur_hyphae.json +e53fcacb06d254a6ad22a316a427338cebbcc9b4 assets/byg/blockstates/embur_pedu.json +c839db2b48c9b5e8587a9db630b89e3e6b587c3f assets/byg/blockstates/embur_planks.json +326a435e7297e9fbe75a5be02a49fedd128a0cec assets/byg/blockstates/embur_pressure_plate.json +ba474f688b45f20d976fb973e5f27952e66766fd assets/byg/blockstates/embur_sign.json +f51f2ddcb785f054f8fbe82175a282b2f92dc577 assets/byg/blockstates/embur_slab.json +186a12d2073ac6fa63c696670b133d8ce742e816 assets/byg/blockstates/embur_stairs.json +adc28126e70549675bc56d5c1dcdff6bd116e83c assets/byg/blockstates/embur_trapdoor.json +ba474f688b45f20d976fb973e5f27952e66766fd assets/byg/blockstates/embur_wall_sign.json +3a644af333a392aaef76ffaca8ba2d534aabc99f assets/byg/blockstates/embur_wart.json +a01b35e78dadfef444a13ef4a4cc388a94afb264 assets/byg/blockstates/ether_bookshelf.json +9921ccb65aac791a2fbbb842fbe8c5112d401022 assets/byg/blockstates/ether_button.json +cb71eaf5d74f4c57b92aaf984da9f8b005d6235e assets/byg/blockstates/ether_crafting_table.json +28cce54d365ff00cf4596245eeee73e7196e6308 assets/byg/blockstates/ether_door.json +2753e53d41faa6888855fdc91741097871361158 assets/byg/blockstates/ether_fence.json +a8f91805fb110d8f06d45d16aba07791eb57dcb1 assets/byg/blockstates/ether_fence_gate.json +7a7164d93855771f4e3fbef6433c0184e9f3e285 assets/byg/blockstates/ether_leaves.json +c4bc7dfb9dba9a452c7ea22a65ca4426b30e98d6 assets/byg/blockstates/ether_log.json +ab5ebd1abc1882a3232b071eceb358e9a914d985 assets/byg/blockstates/ether_planks.json +77c028d80f999741c80b190e4bae2db330a3a61f assets/byg/blockstates/ether_pressure_plate.json +2f56f3fdc0c2b43e563c17d1a6f59bb767e810a9 assets/byg/blockstates/ether_sapling.json +d067eaf60351982ef677a171dd24ba02132acfe3 assets/byg/blockstates/ether_sign.json +62aadfe2fae58d70e77c1df0561a14c74e9517b2 assets/byg/blockstates/ether_slab.json +86d9eb3c99139e1637228d94b1d2487905465204 assets/byg/blockstates/ether_stairs.json +5cbf5d2afcaaeeabb8fe03f23aa2b8a1f09ea03a assets/byg/blockstates/ether_trapdoor.json +d067eaf60351982ef677a171dd24ba02132acfe3 assets/byg/blockstates/ether_wall_sign.json +86aca81e8254b28f1a27ba2b77d4b410a2b4d4b7 assets/byg/blockstates/ether_wood.json +7c824c5b31113e064cdd90c5ce2e00161313c993 assets/byg/blockstates/fir_bookshelf.json +168e44f887e9bd2101e79e9e4c3dbd3d63644497 assets/byg/blockstates/fir_button.json +bdd2ecb5e7eca12a59e61d69f5cb2ce84c2aa8fe assets/byg/blockstates/fir_crafting_table.json +5b6228c4996f309da4ecbd5dfe0c2ff51a2a57b4 assets/byg/blockstates/fir_door.json +3eddfd04b361031317b6c4408ee0bf6033c5ee89 assets/byg/blockstates/fir_fence.json +01b9b915396eb9259775747cee33dfa8f38ee591 assets/byg/blockstates/fir_fence_gate.json +7be90a1818ac34f829100d9c6bb33b1dd10af1a9 assets/byg/blockstates/fir_leaves.json +0f130b5da15b21a82259bcec28ee18694855d35d assets/byg/blockstates/fir_log.json +9db4821f2066710a4e9b7cf986a66b73b0393cb5 assets/byg/blockstates/fir_planks.json +cf297892370dc9e708246262fd02e2ba654bfff2 assets/byg/blockstates/fir_pressure_plate.json +75dd9127a822dacbe792db8091ac3ed384232d1e assets/byg/blockstates/fir_sapling.json +9a5941d9aef32c3df636389ca91aa606b2bb12d9 assets/byg/blockstates/fir_sign.json +e6bf21df6635a129c0603d4d81e4da54dcf56f49 assets/byg/blockstates/fir_slab.json +ef316e66ed7a635e96f85f42a5421132dcd34ef0 assets/byg/blockstates/fir_stairs.json +864401519fe23312508098dc7805ea682761137b assets/byg/blockstates/fir_trapdoor.json +9a5941d9aef32c3df636389ca91aa606b2bb12d9 assets/byg/blockstates/fir_wall_sign.json +660f35ce4a24dcfa8ba00ab7bd108a75c4d67b75 assets/byg/blockstates/fir_wood.json +6edd5b645842ffea071cb8f113127abcb5e1a26b assets/byg/blockstates/green_enchanted_bookshelf.json +729c36f6d92d630d388e0cada24dd2a7600a5cfd assets/byg/blockstates/green_enchanted_button.json +20c49a3a9cd18e610861919b591b26c0055b0ae2 assets/byg/blockstates/green_enchanted_crafting_table.json +80ce8f8910258298291955836195b617584dc19e assets/byg/blockstates/green_enchanted_door.json +8f5ddb0fc1c68a206d29df17a23ffed5c9e6698f assets/byg/blockstates/green_enchanted_fence.json +a08a7ae0a167557c26e308b53f8434528932cd17 assets/byg/blockstates/green_enchanted_fence_gate.json +601162f2ccd689759ef529c7bc1c7c211c2bc566 assets/byg/blockstates/green_enchanted_leaves.json +c2d3ec038336e7c176577b056e189351b74e0593 assets/byg/blockstates/green_enchanted_log.json +cee149bacd98614f6d69231db2d7e56cdb9746a7 assets/byg/blockstates/green_enchanted_planks.json +223f42e068b3d8d208e82733954a9200d5861fe1 assets/byg/blockstates/green_enchanted_pressure_plate.json +8f2c73fc7bdc7497d0fc9456b62a0197cdbb661c assets/byg/blockstates/green_enchanted_sapling.json +d9f2ae6a72ef54a2cddbd1191d9d0c955b66ffbb assets/byg/blockstates/green_enchanted_sign.json +bd083f87d108df54ca3e1cf581dcbe1dc8a9379e assets/byg/blockstates/green_enchanted_slab.json +42167bd9f66df67eeaf153cf70e4d5be7590daa9 assets/byg/blockstates/green_enchanted_stairs.json +16678aea14202242e2fc4cc47e1081a292efc53b assets/byg/blockstates/green_enchanted_trapdoor.json +d9f2ae6a72ef54a2cddbd1191d9d0c955b66ffbb assets/byg/blockstates/green_enchanted_wall_sign.json +422dd68c44382abd8c8a48208235413a5a35f2be assets/byg/blockstates/green_enchanted_wood.json +30ba234da6b8a8cb59e53dd06ea3626753e9fc73 assets/byg/blockstates/holly_bookshelf.json +93867a9fb719d46ada9259fe09e988b33d249c27 assets/byg/blockstates/holly_button.json +e726a4970a35c27fa81b57b54987280e25d44a42 assets/byg/blockstates/holly_crafting_table.json +a63d30f5293109f1b5898da3f0bb9bb4aab60013 assets/byg/blockstates/holly_door.json +90c6fff7a96afda796b9147dbad34a1fb8becb3a assets/byg/blockstates/holly_fence.json +eafbc92b6f9dd7a4066c47510b0545ded73754e6 assets/byg/blockstates/holly_fence_gate.json +d3e66352fcc24ea069d2bdc843566023ccdcaf55 assets/byg/blockstates/holly_leaves.json +2d17380f4c183a023d1bffabef6d8dad3f677b72 assets/byg/blockstates/holly_log.json +a1b1a2300567ec2d74160e95cac69099bb5148be assets/byg/blockstates/holly_planks.json +7fb90ce5336240074bc1b6fd500556405030bb20 assets/byg/blockstates/holly_pressure_plate.json +304c096b346448624f5ddddd976b8592d9f70ba4 assets/byg/blockstates/holly_sapling.json +35d1eeedaef30ec9872b89c214672d1184f43a74 assets/byg/blockstates/holly_sign.json +59fbda88d85b2c4370b6f9b5d4a7eea7d86a2fe2 assets/byg/blockstates/holly_slab.json +b72332763d41bd212da699e789ed5e315b069a54 assets/byg/blockstates/holly_stairs.json +c01aa069b0e21167827ee605f591d8d8ee19b238 assets/byg/blockstates/holly_trapdoor.json +35d1eeedaef30ec9872b89c214672d1184f43a74 assets/byg/blockstates/holly_wall_sign.json +5f254e8df64444c901000048302ccef29abe77e0 assets/byg/blockstates/holly_wood.json +a78e26b8b224d9bac29c03b70a05969539e1f823 assets/byg/blockstates/imparius_bookshelf.json +fdb57e28ed71755db108980b6a1d255102c618d3 assets/byg/blockstates/imparius_button.json +7079e542af9326b5b296ac0989987e9db3944d6c assets/byg/blockstates/imparius_crafting_table.json +10e29e9b1a156337f56cc318628e9e18fe9d5632 assets/byg/blockstates/imparius_door.json +fdb913c814a175e70b243d6552eef62b424398e6 assets/byg/blockstates/imparius_fence.json +7d6f23f499353dded164bc41daa0eb11af321cda assets/byg/blockstates/imparius_fence_gate.json +c449c4eaa0a1b220cbeba8c7b21a5d9ab883356a assets/byg/blockstates/imparius_hyphae.json +1e3d6bddca732e8c9ca2c973cdb9cbcad97703fc assets/byg/blockstates/imparius_mushroom.json +980414069185f40da2716de5b86d419041cdfbb0 assets/byg/blockstates/imparius_planks.json +19a02dfdd1aca7adf795dd4d1c57f4ed6513e98c assets/byg/blockstates/imparius_pressure_plate.json +2e5eb1b6b4769994396f386bf58ac165a52975da assets/byg/blockstates/imparius_sign.json +f3d88bf35c273663fb1a91d7228aa62f257e2ff3 assets/byg/blockstates/imparius_slab.json +67699188d8044830bba99caf1c9c3df5930310e2 assets/byg/blockstates/imparius_stairs.json +0fe4403e33ad868f8030def3cfdee44c20a3bdde assets/byg/blockstates/imparius_stem.json +3ee79daa9c8cde5b87b28960ca984aa6afb9bdf2 assets/byg/blockstates/imparius_trapdoor.json +2e5eb1b6b4769994396f386bf58ac165a52975da assets/byg/blockstates/imparius_wall_sign.json +1f57fe50a109c49ddd9b9f604bdddd5e5d8c51e0 assets/byg/blockstates/jacaranda_bookshelf.json +aea697f21a0e1564ac95013d63b5c599caa55077 assets/byg/blockstates/jacaranda_button.json +c4ccab8b7d31e8da6e10c08ffb5f56c33209bfc1 assets/byg/blockstates/jacaranda_crafting_table.json +c371f5db0940421e783224c9bc9f1e14a301445f assets/byg/blockstates/jacaranda_door.json +330b959ad897633a298a42b334f00b9b17cbe7ee assets/byg/blockstates/jacaranda_fence.json +8fe76492327ef838f9e632c49c7fb88d5c33e816 assets/byg/blockstates/jacaranda_fence_gate.json +d869af2f39eabe5d29dc08f2c848ae5305473753 assets/byg/blockstates/jacaranda_leaves.json +4098f4727f8b64038eb2cd33a39b9fa8cc548245 assets/byg/blockstates/jacaranda_log.json +9dc0d5d8c1683b7d00ae50ff64c661b3857aa69b assets/byg/blockstates/jacaranda_planks.json +ead5771efa134ec215399f763737fa290c0f9c97 assets/byg/blockstates/jacaranda_pressure_plate.json +9f3b5eff5e3f50842b6751065e31548ca9f0aff6 assets/byg/blockstates/jacaranda_sapling.json +b4057885d30b5131da94861ea4adb454f5ecb376 assets/byg/blockstates/jacaranda_sign.json +cebe2c45918e35fbeaf84167d3f33bc000fa033c assets/byg/blockstates/jacaranda_slab.json +991c35fdc269effa4c0780006788d2344298601e assets/byg/blockstates/jacaranda_stairs.json +0ab3395c5173ec4b3cdfe944b2c130b70441f112 assets/byg/blockstates/jacaranda_trapdoor.json +b4057885d30b5131da94861ea4adb454f5ecb376 assets/byg/blockstates/jacaranda_wall_sign.json +58ce0cb149b405bc4b0b75ee0ecd15b2aa9ec5e3 assets/byg/blockstates/jacaranda_wood.json +478f6678bb0e028a45c53b5441e916d6575341f0 assets/byg/blockstates/lament_bookshelf.json +f6bb6d3962a32905b4b1529961c75ba00e1aa024 assets/byg/blockstates/lament_button.json +56ab0a316d14dc22a7db744a8c55d5f749190bac assets/byg/blockstates/lament_crafting_table.json +632be20cc7cf58f92da1341ecaa605ec7d7dc0e6 assets/byg/blockstates/lament_door.json +6d6ddfa7694eb290cf1f5f1e585d3806a49e8bd8 assets/byg/blockstates/lament_fence.json +b4697bb3933c849493009f16655217c428fdee9b assets/byg/blockstates/lament_fence_gate.json +bee9b3565419ffa84a3ad810ccccc798fede9d53 assets/byg/blockstates/lament_leaves.json +891607a9db13c11955db6896e6aedf457040ea77 assets/byg/blockstates/lament_log.json +c822fade5d0e2f2c856ae3a568dc25382a51339d assets/byg/blockstates/lament_planks.json +cc1b4c20e1d6a82bdb885b7af73ac49c1797e597 assets/byg/blockstates/lament_pressure_plate.json +532e510c558b7bd4501cd4105491455eef69af2c assets/byg/blockstates/lament_sapling.json +722d838065dd1072c75cbc9c7981fc207534a123 assets/byg/blockstates/lament_sign.json +b8051895ba518c0fe64a8ddcc5e26ac3d6cd476a assets/byg/blockstates/lament_slab.json +6ccd50d41ff8fa54e858bf3272e16727ca4fac8a assets/byg/blockstates/lament_stairs.json +ba93b2ade0d79ce7720fa948d7458238fa01697e assets/byg/blockstates/lament_trapdoor.json +722d838065dd1072c75cbc9c7981fc207534a123 assets/byg/blockstates/lament_wall_sign.json +90ad0723c4e2c046fad9bd700867fe2eaf269904 assets/byg/blockstates/lament_wood.json +40025345223eedb68d6051f3fd024183bbf3b1bc assets/byg/blockstates/mahogany_bookshelf.json +e9b2bf4a5dce1110e22be927d68343527aabf875 assets/byg/blockstates/mahogany_button.json +a1d368bb928f10d0ea123f14ec6dd4970929d530 assets/byg/blockstates/mahogany_crafting_table.json +bdbe1782eb72973a1ee8c3a806aabde95533c15d assets/byg/blockstates/mahogany_door.json +124f720256fe5ecf4e84246fcde22abc89a3f9b3 assets/byg/blockstates/mahogany_fence.json +6d9588fea573efd2857696b5c1add1ff6aadc786 assets/byg/blockstates/mahogany_fence_gate.json +b8a59386ae6b713a54c6a2031896e45ef8f7a8b4 assets/byg/blockstates/mahogany_leaves.json +f9302553ce38b1adb959bb821c4136ac8f8d4082 assets/byg/blockstates/mahogany_log.json +557ee4693c6fd92e2151b7515020de5cdd9b9366 assets/byg/blockstates/mahogany_planks.json +4cef307ff3ddcbb65773d336f9523e7cdadd27b3 assets/byg/blockstates/mahogany_pressure_plate.json +05c9cf7b6798041abd79676ede6d2f9052515328 assets/byg/blockstates/mahogany_sapling.json +2c76d3e60e743d566ac8e8066fce87e618f9fd5d assets/byg/blockstates/mahogany_sign.json +85532c3d9dfc3264bc9591a9ac77fce4ad3833d4 assets/byg/blockstates/mahogany_slab.json +1fa520cffe7d75e014547ccfd7f7b2406015fdd8 assets/byg/blockstates/mahogany_stairs.json +15fb94be1f62cead43f8cf2af67019e98fe0b038 assets/byg/blockstates/mahogany_trapdoor.json +2c76d3e60e743d566ac8e8066fce87e618f9fd5d assets/byg/blockstates/mahogany_wall_sign.json +d53a84d4c835a3aa84beb647047891becf02acee assets/byg/blockstates/mahogany_wood.json +25b265ba4e38b70f146ea776f79fed56e7c363ca assets/byg/blockstates/mangrove_bookshelf.json +380e810e00aab6aa4bd5580d2ed19fed8b6023b5 assets/byg/blockstates/mangrove_button.json +49f7b38a829bc0813460f14a23aee04add36ae6e assets/byg/blockstates/mangrove_crafting_table.json +1fe526f6f1347f89be6727ae48a2a02c811ad9fa assets/byg/blockstates/mangrove_door.json +3c449697cba84572fed56b9f43e5957ad3ec5a6c assets/byg/blockstates/mangrove_fence.json +6f5ae6353a56cc65106265fd02528db0ff93b76b assets/byg/blockstates/mangrove_fence_gate.json +171857d3b876628e2c89ede7f977bce24b09cb51 assets/byg/blockstates/mangrove_leaves.json +775cbb3375a6fad37d72affb88b6edf26552f3c8 assets/byg/blockstates/mangrove_log.json +50c8a6fff0bf4ff4931274428804622896070cbb assets/byg/blockstates/mangrove_planks.json +4950e1185a949226d1a909fe12cac1e2dcadb974 assets/byg/blockstates/mangrove_pressure_plate.json +76bc1ef48abcac46da4b863d854ef968ba42aa89 assets/byg/blockstates/mangrove_sapling.json +738e28f071bb0ffd2feef5dfaea80268baf56782 assets/byg/blockstates/mangrove_sign.json +faf46e92c9774c2daa2aec1c19fcf62fd72b5a62 assets/byg/blockstates/mangrove_slab.json +511a5bd5c29f79c0664947a41a0ff421d388d67f assets/byg/blockstates/mangrove_stairs.json +ff5bd74f82f4a6a4678aa7a25b2fa54192a18164 assets/byg/blockstates/mangrove_trapdoor.json +738e28f071bb0ffd2feef5dfaea80268baf56782 assets/byg/blockstates/mangrove_wall_sign.json +7b209011b3afdba6a9e9b3118146f617bbd89528 assets/byg/blockstates/mangrove_wood.json +453d28a037c01da8e5a4d0c592008281e2e461a2 assets/byg/blockstates/maple_bookshelf.json +ba6f077aca7eb33c3410513ed390dbf477d5c3e9 assets/byg/blockstates/maple_button.json +a5ea778b5a0982706c294063f365a2848fe91355 assets/byg/blockstates/maple_crafting_table.json +adbce54fa0834e469aa30887d05bd8e77def05fd assets/byg/blockstates/maple_door.json +97865c26f87c300cf26858e6612f6d9eabbdcbd1 assets/byg/blockstates/maple_fence.json +61e8b44a47d4f92600b9e6acd666e181d867e089 assets/byg/blockstates/maple_fence_gate.json +d4671342bd965475f3e07f639db54dacd77e8680 assets/byg/blockstates/maple_leaves.json +d6acd00372dd0864baeb87f65a6b17e6944daed8 assets/byg/blockstates/maple_log.json +6c7863fcdddef01c5a5f653f71c2a40ed600e85b assets/byg/blockstates/maple_planks.json +5caaa7b3556689ffef3fe91f1f276fcb5e4f261b assets/byg/blockstates/maple_pressure_plate.json +ec574aaebea21a86b4a827dfe3e73d26c3405cac assets/byg/blockstates/maple_sapling.json +9131c55b11daa9fcb773674a72543df2e742c7f8 assets/byg/blockstates/maple_sign.json +91ff39eb3efa56f75034a51bc4d1e866c3b14ce8 assets/byg/blockstates/maple_slab.json +dbe162a7d4d22cca3184e0d29b4c05be422887f6 assets/byg/blockstates/maple_stairs.json +45aa2553616e8da2d7b7309373beefdd6410b771 assets/byg/blockstates/maple_trapdoor.json +9131c55b11daa9fcb773674a72543df2e742c7f8 assets/byg/blockstates/maple_wall_sign.json +46214dde1a5ca0d5acf6b446a849ea034e1a7bc8 assets/byg/blockstates/maple_wood.json +b7fee28561ee117ea8e1654b5f732f18aed4121a assets/byg/blockstates/nightshade_bookshelf.json +4c8b070a5f7e304fc7a2457f80951b04979cb1ea assets/byg/blockstates/nightshade_button.json +1855ca3421f5fa4ebc9865dd3ee86d7510da0943 assets/byg/blockstates/nightshade_crafting_table.json +b48f4d5fa2b623f05eca9ebcc47afc36363bcc82 assets/byg/blockstates/nightshade_door.json +d18fd40824fdce3dbe3bcccd2bafcc9872c80f9d assets/byg/blockstates/nightshade_fence.json +42a6ca9385dbff3e9f921cb5c5c885604bf5fe30 assets/byg/blockstates/nightshade_fence_gate.json +cce3ba6a40f6826b8e8601c0d0baaa4c90eecd91 assets/byg/blockstates/nightshade_leaves.json +acb3b857778ccdf700c13f1b71ba276ca7ea2aee assets/byg/blockstates/nightshade_log.json +2c90ae14aa400ef5b0e3938e6f038c9cfac1da0f assets/byg/blockstates/nightshade_planks.json +e0ed8a3c3460db31f39217cfff95ce02b9bed54f assets/byg/blockstates/nightshade_pressure_plate.json +e7fb70ef10043d1718d6edf4ee04032023178bed assets/byg/blockstates/nightshade_sapling.json +62bbaf03328350cf461fbc044e01c87f17cb8c52 assets/byg/blockstates/nightshade_sign.json +ccb4dd0a6d5abf6b19a2640b6d3d2e2bf53f3f7a assets/byg/blockstates/nightshade_slab.json +4ca433a440001e3a8350804e4bc01d80ec2b330d assets/byg/blockstates/nightshade_stairs.json +cedba855c0fd21ae7bc4ff3eb235aeb84c099779 assets/byg/blockstates/nightshade_trapdoor.json +62bbaf03328350cf461fbc044e01c87f17cb8c52 assets/byg/blockstates/nightshade_wall_sign.json +af1ef83df5ba4b3bb0292e8427eef0256a37f719 assets/byg/blockstates/nightshade_wood.json +b756cac9068f92de9a96e2f9e6eecdcfdbc8d578 assets/byg/blockstates/palm_bookshelf.json +3fd94fef4448f30d964289448663dcc9f7551f6a assets/byg/blockstates/palm_button.json +c15ada7e94d53cdd6e8732a1e94b128cb6781e4f assets/byg/blockstates/palm_crafting_table.json +960e6860141ff73dde223beede97800f9bb7b2cb assets/byg/blockstates/palm_door.json +d27b39fa98040d000f5b0b1ee23b08122062cb8b assets/byg/blockstates/palm_fence.json +7288b87be84d99646f30b99f035c4d8e8b294777 assets/byg/blockstates/palm_fence_gate.json +0bbc28b26b1e1ba81056bb2cb4e8d0bdab41a871 assets/byg/blockstates/palm_leaves.json +0dc4db716b92de90e9b03bcfa6519da02d05eba6 assets/byg/blockstates/palm_log.json +a132eb94cd515df20951a4783dd9d51a68916335 assets/byg/blockstates/palm_planks.json +6e4b61ffbf2800b3ef02ac9fe7b00d714348cfc8 assets/byg/blockstates/palm_pressure_plate.json +7bd7cbdfb00cf7af8243874210fc58fee1f2aec3 assets/byg/blockstates/palm_sapling.json +8146b610742ba9894c58b1b0ab7aba992d70d22d assets/byg/blockstates/palm_sign.json +222727b2c6ba3ec186b0d7a0c3cbb83417342b85 assets/byg/blockstates/palm_slab.json +3319215f438e7e165c322efbc48ea81be1494c60 assets/byg/blockstates/palm_stairs.json +6571a99874b5e2842f4c7438ecb1760df7475ffd assets/byg/blockstates/palm_trapdoor.json +8146b610742ba9894c58b1b0ab7aba992d70d22d assets/byg/blockstates/palm_wall_sign.json +46ea9d1b56b6c9d8e614fcad9ab3369b319295e4 assets/byg/blockstates/palm_wood.json +77eebc5ac5dfe86029fe6a1378c942d2264b344b assets/byg/blockstates/pine_bookshelf.json +ac7b1cda15f597c5c1ad2837f445f92a90764edf assets/byg/blockstates/pine_button.json +0e687c825b4327368c902ced274e2c904a435bae assets/byg/blockstates/pine_crafting_table.json +c746becf9221496b3ce43e321e715317175c6502 assets/byg/blockstates/pine_door.json +4858bdf149e008b779b6ac13cbef6b55b4ff6e27 assets/byg/blockstates/pine_fence.json +29e13b04bfd95dd1be340eec203644bd05979ea5 assets/byg/blockstates/pine_fence_gate.json +7891365e120df94abce934b92b439b8bf0e739d3 assets/byg/blockstates/pine_leaves.json +cb1d26d4e0e79dc379534ed40e3fce70286dff6c assets/byg/blockstates/pine_log.json +78910cb3ecd2319802999bb8af582a3a9071c573 assets/byg/blockstates/pine_planks.json +623c442bb89e509c0a3f9bd1677ee93648f975ba assets/byg/blockstates/pine_pressure_plate.json +7ab8505c98f4b918bf90f2397e3e4e110876b85e assets/byg/blockstates/pine_sapling.json +a1c042c5ce75c9461c93fcaad6a4bcb1873f2521 assets/byg/blockstates/pine_sign.json +08b06734427ea6b7170cc874faa1d7d09bbd0f82 assets/byg/blockstates/pine_slab.json +cad6b561046ccbef261e1fc7e4ee2fd1e186a398 assets/byg/blockstates/pine_stairs.json +0b1558cc864a0bb2a93da8ca41b1eae6f5e2e719 assets/byg/blockstates/pine_trapdoor.json +a1c042c5ce75c9461c93fcaad6a4bcb1873f2521 assets/byg/blockstates/pine_wall_sign.json +4634221d4fd1c7982bf6683f7f6f921aace966d5 assets/byg/blockstates/pine_wood.json +ba38896e67aa0bdf4aa6d2fbf131c8f996cb1884 assets/byg/blockstates/potted_aspen_sapling.json +396b1c1eebfe284fb5fe37194c4f92d3973f0604 assets/byg/blockstates/potted_baobab_sapling.json +e0646f869668101f50c799d6bd7b3404533d4d0d assets/byg/blockstates/potted_blue_enchanted_sapling.json +0f352aaf61041a6df76f7841ce6012f6c47f10c6 assets/byg/blockstates/potted_bulbis_oddity.json +22500d051594ee5446c7378806b800f5b7c12c56 assets/byg/blockstates/potted_cika_sapling.json +6586a51a95769ac9ec3523e3eeda37b2d8cd06c5 assets/byg/blockstates/potted_cypress_sapling.json +242d974a499bcbf72d30eb06310d674b3ec5a3e4 assets/byg/blockstates/potted_ebony_sapling.json +787590683cd95c31165038f2506eba6c7b7ed184 assets/byg/blockstates/potted_embur_wart.json +90337c0e97c7f754e3c5f77d8599cb9a9a56fa49 assets/byg/blockstates/potted_ether_sapling.json +cbe397326eb28e32cc1be46aa9f10b10137b0b6a assets/byg/blockstates/potted_fir_sapling.json +a7e8c17df20cfe48a7eb772d1e211e6d4305d6d8 assets/byg/blockstates/potted_green_enchanted_sapling.json +76cc4110a2e3fed46b31211470657c8bef3cb8af assets/byg/blockstates/potted_holly_sapling.json +8183aa85d1aa9507cb0efdeb668e212cd38baa3e assets/byg/blockstates/potted_imparius_mushroom.json +66afa4ea8add42ce798aa9412bffcf8ce2d6cd41 assets/byg/blockstates/potted_jacaranda_sapling.json +5acb8b7553ab019ecd31ba9b02d11351d205efe8 assets/byg/blockstates/potted_lament_sapling.json +4476cc1fcea7ca5d07a22c87182ca14673b8ed43 assets/byg/blockstates/potted_mahogany_sapling.json +903e732dd57b22021a74b044bea18e516f3ca407 assets/byg/blockstates/potted_mangrove_sapling.json +8f7b45a8cc0399da3b35483f9aca56fd4c859154 assets/byg/blockstates/potted_maple_sapling.json +60bce019a265559b96c6b57955ca7a3e882c74a5 assets/byg/blockstates/potted_nightshade_sapling.json +87212ad1611cef8567a33f931686734b4fe52cda assets/byg/blockstates/potted_palm_sapling.json +e1c62eaec8641f150e8281a17b787f4e5000f98a assets/byg/blockstates/potted_pine_sapling.json +ed8c388f1e354b11c13cbc843fe18150a2283733 assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json +f713c460f4b569e13c818cc816c0a289a9f45dec assets/byg/blockstates/potted_redwood_sapling.json +243a0ff914a651bf9ed199db9df1f7a54e4cea88 assets/byg/blockstates/potted_skyris_sapling.json +4f94ce664f8816cdd82fe6e86a1db71bcabe3a1c assets/byg/blockstates/potted_sythian_fungus.json +9effc7f7674a1a77028188c2da790d6c04706a2b assets/byg/blockstates/potted_willow_sapling.json +82240e030c7ff2b6af1f39f7465deec9250938d0 assets/byg/blockstates/potted_witch_hazel_sapling.json +a0b69a9f1382fd35337c741f3c78e1994c049a56 assets/byg/blockstates/potted_zelkova_sapling.json +dd2e08b3008de394dc6e055ab00b67776edcb53f assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json +0c72d043776b291d236e38fbd8294d724f2497e0 assets/byg/blockstates/rainbow_eucalyptus_button.json +f227abce9b8cfafebab3ebc2889b5b4d5ebb56f3 assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json +b8f67a9a6847fc5013f442c53c54cc15e43ab683 assets/byg/blockstates/rainbow_eucalyptus_door.json +2ecb79a42dab8beff5a201225fd22764b4b5603f assets/byg/blockstates/rainbow_eucalyptus_fence.json +78972ab5a379c5453b84b2d081c5469530421b89 assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json +00daeb4653292ef376940780b2c9869eeb8d764e assets/byg/blockstates/rainbow_eucalyptus_leaves.json +23dc3169dfd9ec859a417c43c9cc0fb03a88a0e8 assets/byg/blockstates/rainbow_eucalyptus_log.json +2d8affb80efd1174f855835f3da0d2ad88551074 assets/byg/blockstates/rainbow_eucalyptus_planks.json +aaae05ea05035418a5b7d37ea3fb897e28c396a2 assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json +cf64779463e28b5ef0a524338cc44d8d0105bd5e assets/byg/blockstates/rainbow_eucalyptus_sapling.json +bed236cf39d8b5fb146253c22cdfe45a88a6102b assets/byg/blockstates/rainbow_eucalyptus_sign.json +30a7ce12d3de3819a53586534f0e6d19059ae3a7 assets/byg/blockstates/rainbow_eucalyptus_slab.json +9388b2bd2975dfedee2691c145cb2ea919dc701b assets/byg/blockstates/rainbow_eucalyptus_stairs.json +191ebf67036e7b273c6befce1f73f2d3705b1da1 assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json +bed236cf39d8b5fb146253c22cdfe45a88a6102b assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json +022f7ba87108e0c3674187d6cc07c038a994f7af assets/byg/blockstates/rainbow_eucalyptus_wood.json +2b35f550957d7080cd35ba4406d66dbb6022d807 assets/byg/blockstates/redwood_bookshelf.json +390aecb0674ea2d1843f24600f740311f0f376b6 assets/byg/blockstates/redwood_button.json +f87ceed666306a2bca5991e1306d7bd30d4dbf20 assets/byg/blockstates/redwood_crafting_table.json +343dcedac15a2dbc48816cf309aa06e1a34442d8 assets/byg/blockstates/redwood_door.json +b87e942a4df6b42fcce3705f733fbe48a7592567 assets/byg/blockstates/redwood_fence.json +8045dadae2898f0738359531281aad5c81a1468d assets/byg/blockstates/redwood_fence_gate.json +df9888ed9a88d2af2c16ab5d88fe8923b369c49c assets/byg/blockstates/redwood_leaves.json +e6728b44696e140daf90d45f87f6c2dd9bf3ac51 assets/byg/blockstates/redwood_log.json +4bd39a393e588ae13a23cad2b5acb3cbb6176637 assets/byg/blockstates/redwood_planks.json +5342be6bb88c2d4a7f911387b1f46c771775a4c7 assets/byg/blockstates/redwood_pressure_plate.json +984a39e8f663f5fb470ff9889f7a7b4867fc5f43 assets/byg/blockstates/redwood_sapling.json +c48a80bfe768f568b195bc886775115f24efbb79 assets/byg/blockstates/redwood_sign.json +8a83e44b5ddc4cbcd48223ae66468319ea12fe25 assets/byg/blockstates/redwood_slab.json +f16064a66e738bfb9a665296af038c1e3f1a645c assets/byg/blockstates/redwood_stairs.json +8808fd047dcfefc4e13c7abdcc3fd5abccd8c7e3 assets/byg/blockstates/redwood_trapdoor.json +c48a80bfe768f568b195bc886775115f24efbb79 assets/byg/blockstates/redwood_wall_sign.json +bcbdd1a808848651866ed8ffcbc3a2aee4e09cfc assets/byg/blockstates/redwood_wood.json +d0e2f47f84af6f7104562c17a4142f4e1b171399 assets/byg/blockstates/skyris_bookshelf.json +8f27e781be01c640feb0713cc769f1917489e845 assets/byg/blockstates/skyris_button.json +6086978c1ef5a2f1f587ad1c0a5bf9b0ccc52476 assets/byg/blockstates/skyris_crafting_table.json +8463ef0afd192ec9f02653860d001a6243dc09e5 assets/byg/blockstates/skyris_door.json +f1d0a77f5a046b2bd18f8ee1698834ccb73c6e67 assets/byg/blockstates/skyris_fence.json +8ff71d4bfe0b892410aa1c671e664b4ca7189d9b assets/byg/blockstates/skyris_fence_gate.json +8c32b6b247ac19def303faac39b7c3f08fba80c2 assets/byg/blockstates/skyris_leaves.json +70b3b7e7cf65169df9f6501c96a428c338c08874 assets/byg/blockstates/skyris_log.json +433405351cd6416b1c51df199c3ccfdae08582b2 assets/byg/blockstates/skyris_planks.json +bf0f0cc1e3ff1a29935f5619d7a6ce19e0d2defc assets/byg/blockstates/skyris_pressure_plate.json +7d40344c8fceca0fb10e234c3c151cc212d8c7d7 assets/byg/blockstates/skyris_sapling.json +cd10ad46c424b7ff74923c2bfacd2a891fba8083 assets/byg/blockstates/skyris_sign.json +7537bac77921c60a5f51654f074719b9b5d3ba6b assets/byg/blockstates/skyris_slab.json +6e0f07144256fd710a8a8e8d2d2f825adc8eb1c2 assets/byg/blockstates/skyris_stairs.json +b10d960d347f29690fe362463a8fb75113aea4a4 assets/byg/blockstates/skyris_trapdoor.json +cd10ad46c424b7ff74923c2bfacd2a891fba8083 assets/byg/blockstates/skyris_wall_sign.json +2be49e79bd0f72454706257109416f9e5fadd3bb assets/byg/blockstates/skyris_wood.json +eab43b06f7d5afa4e6ae7c6289752d8c65873375 assets/byg/blockstates/stripped_aspen_log.json +3c836901f670b8dbce2fa6b8b127d5c70f309d52 assets/byg/blockstates/stripped_aspen_wood.json +7933468db3116577b71452d5e22278c934278758 assets/byg/blockstates/stripped_baobab_log.json +4becdbcd2eb8bcbe2f02831b3e742b6b6cb9e205 assets/byg/blockstates/stripped_baobab_wood.json +5dcc5c96f69639346d47891ab9d4ae12f30db9ed assets/byg/blockstates/stripped_blue_enchanted_log.json +188e5bbe2490a7b2cc66ddd29714306d532cd032 assets/byg/blockstates/stripped_blue_enchanted_wood.json +6777013dbb704f7df4e306d2372d4c277faf4f3f assets/byg/blockstates/stripped_bulbis_stem.json +734de514ab3833061b90c531d3e94f73ffb35fb4 assets/byg/blockstates/stripped_bulbis_wood.json +0a6e4caa01502ea421c149a738209d7fb4e1f427 assets/byg/blockstates/stripped_cherry_log.json +feb6dc1f10cf93c3d868dc387a5a24ff9fa7d531 assets/byg/blockstates/stripped_cherry_wood.json +01e5dec8d214259d103c8cb790aa71edcd51fe3d assets/byg/blockstates/stripped_cika_log.json +f99fe97181231d2bb99e62d8757f5f604c51fc68 assets/byg/blockstates/stripped_cika_wood.json +5a39e3ae36095eb1bea937cbdec6debd8e0f395b assets/byg/blockstates/stripped_cypress_log.json +c59cff41f13e2398c2b3baa11e396e0e7963f249 assets/byg/blockstates/stripped_cypress_wood.json +e3dfa7315d61642a0bfda10623d373a6fe5cdf7d assets/byg/blockstates/stripped_ebony_log.json +57fdbfadb6fb55407487fbd3d5ffe84df428f097 assets/byg/blockstates/stripped_ebony_wood.json +f02c5b888d2721d1c3235d584a39a7092b7893c6 assets/byg/blockstates/stripped_embur_hyphae.json +7e689ee8b64cedf8f57fc72a4006f614e3e6fab9 assets/byg/blockstates/stripped_embur_pedu.json +0b512b3cacab9884271211aa6df181d654122694 assets/byg/blockstates/stripped_ether_log.json +70f19cc22bf0912ee7e687838ee045102f819035 assets/byg/blockstates/stripped_ether_wood.json +fd0d71e325cac9083b0585d29c9ff712a23bd080 assets/byg/blockstates/stripped_fir_log.json +cb65d06382f4ca04a4d7ea62324542450bc9df98 assets/byg/blockstates/stripped_fir_wood.json +ea3dec5c9dc9165f30e99ab0f584299375d21712 assets/byg/blockstates/stripped_green_enchanted_log.json +973db24c2e7d8f252cbac91c8a2e653718df49c8 assets/byg/blockstates/stripped_green_enchanted_wood.json +7f07cfce61e7c45d8af5101c8a46829ad736f794 assets/byg/blockstates/stripped_holly_log.json +eaf63f20b2c1492404c06182620d01121c3b0dd4 assets/byg/blockstates/stripped_holly_wood.json +886e8ee3b57ae72eb335177b8ef72e43389ced5c assets/byg/blockstates/stripped_jacaranda_log.json +3b76dbb3aa566a387bc0184b25bf7a82f9039018 assets/byg/blockstates/stripped_jacaranda_wood.json +78d4b02ddc9e6ae9bfc79a94044e0829926d16f7 assets/byg/blockstates/stripped_lament_log.json +bda1320deaecbb2353df5f10c2e02b8224c912bc assets/byg/blockstates/stripped_lament_wood.json +8ec0155feec801d4705e978a9506edc11cc8b9bf assets/byg/blockstates/stripped_mahogany_log.json +36fdae28388c321ece0857ba3869bef8d31a4708 assets/byg/blockstates/stripped_mahogany_wood.json +4cb38248a2f5114dfe3f1d7a50a4871fcceacc0c assets/byg/blockstates/stripped_mangrove_log.json +ccc58dfbb55bb8b89b5041bcaf25398923593755 assets/byg/blockstates/stripped_mangrove_wood.json +ec7b36aac1feb41b309ec449edaac486c4dad864 assets/byg/blockstates/stripped_maple_log.json +1d87e1e5e874182475744d2c74b7cf5e7b4142b7 assets/byg/blockstates/stripped_maple_wood.json +74b77224794885b4efdab8d4862465b318f14252 assets/byg/blockstates/stripped_nightshade_log.json +b95e9d615ffd4ebeff64ffb7cbecedbc120094a1 assets/byg/blockstates/stripped_nightshade_wood.json +0ee782dc116f64af80dbff075f40c7e2d9acb94e assets/byg/blockstates/stripped_palm_log.json +9ae4ad77f5284010a2802213ff1318a18b492cfd assets/byg/blockstates/stripped_palm_wood.json +3f3878e1a8c5b96b53075f9cac3f296c4b4d1340 assets/byg/blockstates/stripped_pine_log.json +ed02b6009437d290eadab2df15ddccc0a9348617 assets/byg/blockstates/stripped_pine_wood.json +8a0274bbe7d0ba42adff9e9036297dbf85ab15ea assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json +3ff0023b762a97b3306ac06af6315f2dbbdfb1d7 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json +6bd5029b1d0c8fdcee6508e130e467b1853b44cc assets/byg/blockstates/stripped_redwood_log.json +681bb58e942c432526819966c1538049ed850028 assets/byg/blockstates/stripped_redwood_wood.json +6448bd58986230e2e69f3672b8f99d331197a8f0 assets/byg/blockstates/stripped_skyris_log.json +964051cce59c59df962cbb01a1b13a5c8e708e13 assets/byg/blockstates/stripped_skyris_wood.json +1bdc83b2622c051133b580fc73cadd15345f13a5 assets/byg/blockstates/stripped_sythian_hyphae.json +a21264ccc827f151fdbfa4f519c4f9d00ff2a832 assets/byg/blockstates/stripped_sythian_stem.json +e9d315ff29f9397a17e392711775963ad6b17605 assets/byg/blockstates/stripped_willow_log.json +54ae8580fb31af8aa12503684aaa9905a6d1b201 assets/byg/blockstates/stripped_willow_wood.json +a560a3183064f5d20834807b79f090f81da788e2 assets/byg/blockstates/stripped_witch_hazel_log.json +d8451bca5f3e2c5e61c8d129a5c9629d45c75faa assets/byg/blockstates/stripped_witch_hazel_wood.json +4ff6e138df97ae7b3a00e0477a0acd932ebca155 assets/byg/blockstates/stripped_zelkova_log.json +5c22be3a4d633f5c3a11f6186b5b3f05643c528b assets/byg/blockstates/stripped_zelkova_wood.json +96cac7857bc3bde50759a1c1b0c09630c5222a5f assets/byg/blockstates/sythian_bookshelf.json +1c1e87ffb4680b69880cc5f44695cb0cd64fecaa assets/byg/blockstates/sythian_button.json +c196cd047cb34aef1202bf0706bb3a19f259f118 assets/byg/blockstates/sythian_crafting_table.json +5e3e4c5a7e882cb2dd0cc21073f86105bc26ab93 assets/byg/blockstates/sythian_door.json +0ba2553caa1dc9027f7b5a1d7f6445f6527bfc42 assets/byg/blockstates/sythian_fence.json +53283b97199d89785a96169b26606e2d6a3fe127 assets/byg/blockstates/sythian_fence_gate.json +c9d95a8d4eb602880411393daf69225a5b6be78b assets/byg/blockstates/sythian_fungus.json +eef38af5d15e50ccbe9c9271274234464d265cc3 assets/byg/blockstates/sythian_hyphae.json +fbe3f928c17ac5e8f8df3cedf8d502845956feb2 assets/byg/blockstates/sythian_planks.json +2be1851673574b8cc7272176c87be0ed93d069d5 assets/byg/blockstates/sythian_pressure_plate.json +4a5eca438915d928e98009ebe5f211c53fe21251 assets/byg/blockstates/sythian_sign.json +1a41f091394d34be62d0709094baf8dae0f1cb88 assets/byg/blockstates/sythian_slab.json +1d3cc7ece06715bb60b5fde69b0cef6b6ddfe69b assets/byg/blockstates/sythian_stairs.json +619514408d39212685bf2cb813741b13f5a3f9a7 assets/byg/blockstates/sythian_stem.json +05687a7511babb3793095516cb205ce7a738b384 assets/byg/blockstates/sythian_trapdoor.json +4a5eca438915d928e98009ebe5f211c53fe21251 assets/byg/blockstates/sythian_wall_sign.json +b77bd1d1661c13eb9d03cc5bc21ec7efe0f18588 assets/byg/blockstates/sythian_wart_block.json +704ad3f60960d28a10db919c4fbf111d9bd02ded assets/byg/blockstates/willow_bookshelf.json +e1ec4fa0c45eb37c0423bc11ed32acf5d9592af9 assets/byg/blockstates/willow_button.json +d3bf094c7c4c2ccc523f413b2cde2bc7376d9649 assets/byg/blockstates/willow_crafting_table.json +654b75799d56e294eeb1d90b0d57a5ea7cf178e4 assets/byg/blockstates/willow_door.json +bc449c114a73cd691c0259b1e3c41ca82d7c8b9e assets/byg/blockstates/willow_fence.json +f69000e89d4e3a5c4385a71cbe3e4649f1713d10 assets/byg/blockstates/willow_fence_gate.json +5eff5835bce42965ab6044354bf3cfd01160b429 assets/byg/blockstates/willow_leaves.json +077bacdf1812fd899bb6ce1ee8366ac16e77107b assets/byg/blockstates/willow_log.json +53fb788664221f84f8d39aade95aed76eead86f2 assets/byg/blockstates/willow_planks.json +eb3851f46d449ca087a6f49af6b739b5f91d4d3f assets/byg/blockstates/willow_pressure_plate.json +108710861cd7530e48b4fd64cc7b6677ddef91c0 assets/byg/blockstates/willow_sapling.json +b18757a550ca451c06e19aa6e94182c6d13ef293 assets/byg/blockstates/willow_sign.json +eb24b2593a6b7de3b674be5fb56d5afe3819863c assets/byg/blockstates/willow_slab.json +59569e8c610b471535164c80760a5d32dd300d05 assets/byg/blockstates/willow_stairs.json +637890023409b0f4a8e279888daf8123af86d7ec assets/byg/blockstates/willow_trapdoor.json +b18757a550ca451c06e19aa6e94182c6d13ef293 assets/byg/blockstates/willow_wall_sign.json +a7e5c8089fd08c592b11fd324559fcc091bed139 assets/byg/blockstates/willow_wood.json +cfff6c621277cdc85fed5ae3ae2f45a4dfb46103 assets/byg/blockstates/witch_hazel_bookshelf.json +8ec65ecc67d503c063e03746994642d2852c9546 assets/byg/blockstates/witch_hazel_button.json +3c2af6def2177a384900c491a539207c9a9e82f6 assets/byg/blockstates/witch_hazel_crafting_table.json +b10204afda40dfb53fd6b5fffaf32e2a18c848d6 assets/byg/blockstates/witch_hazel_door.json +c34ccfbb6b9526a282c7de508f4006fb996cb498 assets/byg/blockstates/witch_hazel_fence.json +30e1f6d1346e4daaca842b8ad3003b8ab86753b8 assets/byg/blockstates/witch_hazel_fence_gate.json +b34a9dfe2f932962c3bfb74d13b1e2e4711f552c assets/byg/blockstates/witch_hazel_leaves.json +7c5b68f4a6402ac03edfe7b8d6dd479403907494 assets/byg/blockstates/witch_hazel_log.json +33ba159dfb7cbcc595e062becce5702c83c5f5ea assets/byg/blockstates/witch_hazel_planks.json +87fc1790b5b1e37b025029dfe6723338aca01a13 assets/byg/blockstates/witch_hazel_pressure_plate.json +35c628a43fdb302e383704aafadedb1a015e5627 assets/byg/blockstates/witch_hazel_sapling.json +ddaef16a5f891efb46478ae2b9acdc69bf75a6e2 assets/byg/blockstates/witch_hazel_sign.json +27e29ea2ab6dfe43d9595679133f672c0656436c assets/byg/blockstates/witch_hazel_slab.json +4f8bddda1a4ef8acdff750abe64dcbd76f4f5cc7 assets/byg/blockstates/witch_hazel_stairs.json +2cea949958f9e1b8da45683e5b95c088f74ddd88 assets/byg/blockstates/witch_hazel_trapdoor.json +ddaef16a5f891efb46478ae2b9acdc69bf75a6e2 assets/byg/blockstates/witch_hazel_wall_sign.json +b53123e87bb824dff0694a1e0b58e50bb080cef0 assets/byg/blockstates/witch_hazel_wood.json +819d406a7d32a384453ec215a75c372188b39cee assets/byg/blockstates/zelkova_bookshelf.json +ad5fa8797a31847eac30c9e3ffb11d344c26be91 assets/byg/blockstates/zelkova_button.json +a4e6eeceaeea89be08a7d02ed61a469f0bd121e3 assets/byg/blockstates/zelkova_crafting_table.json +8e7ed872de72be0975e45b02dd9cd076efd77881 assets/byg/blockstates/zelkova_door.json +90689b0217d3d8d5062d849c71f5d062d778c2c6 assets/byg/blockstates/zelkova_fence.json +d668f69ec265017a21c501c11ff8431f1a432e7d assets/byg/blockstates/zelkova_fence_gate.json +7234f2f25cf828926ce4843120616cfc89c0be66 assets/byg/blockstates/zelkova_leaves.json +f7bdb0d4fe9679f6a10508e29a38ee90adcbc32f assets/byg/blockstates/zelkova_log.json +d3d72f361a908b65762a1a959a5a9a32012295ea assets/byg/blockstates/zelkova_planks.json +d115e356f57eec17ed32400700475dcfdbbddf37 assets/byg/blockstates/zelkova_pressure_plate.json +ac81ad04dcb929b4ada1a42a55a8a8608510c59b assets/byg/blockstates/zelkova_sapling.json +0811ea8b5fa7244ae29c9ce531a914e0a75eb477 assets/byg/blockstates/zelkova_sign.json +63f171bcc9e4b4db1b7b92c9c44970e5412d0476 assets/byg/blockstates/zelkova_slab.json +dc7f608a24f9b593d3a56b8e469cbcd8e95c7059 assets/byg/blockstates/zelkova_stairs.json +b58b38488f7dcc603bbf6002a33516c848f28c07 assets/byg/blockstates/zelkova_trapdoor.json +0811ea8b5fa7244ae29c9ce531a914e0a75eb477 assets/byg/blockstates/zelkova_wall_sign.json +f5c09009e0695653a4fde5b7369e1cd59487b018 assets/byg/blockstates/zelkova_wood.json +2b5081551f277b23fb86e417b017bb6076a6263b assets/byg/models/block/aspen/bookshelf.json +c79a0d44cd4f7f49fea3b72762026f453b8ba9fb assets/byg/models/block/aspen/button.json +045087f2a57ae309b627a98fca0005aa7edec896 assets/byg/models/block/aspen/button_inventory.json +bc3c65d25ad294f358be47a73904c7009690b397 assets/byg/models/block/aspen/button_pressed.json +f189511640cc8245e3d6f0c7b954c201484cd264 assets/byg/models/block/aspen/crafting_table.json +af029d603895e5e87308f491b549f8d65910f423 assets/byg/models/block/aspen/door/bottom_left.json +5c21fccfe6eaf0c859ca689d1cd4d3e9dec72244 assets/byg/models/block/aspen/door/bottom_left_open.json +729df3d3e3e6317d1cd12a29e5271d1444c28ecf assets/byg/models/block/aspen/door/bottom_right.json +8a3319c462a41fb6445b5a486607ba6057ac1d0b assets/byg/models/block/aspen/door/bottom_right_open.json +ac76394a8d59dae203a0755842a0daaea7cdcb48 assets/byg/models/block/aspen/door/top_left.json +dcb8405dc0f6d934cf3bbd2a40e63f0d7d711696 assets/byg/models/block/aspen/door/top_left_open.json +379f86fa70ac6286abdd3c155ee0379ec00c3a47 assets/byg/models/block/aspen/door/top_right.json +b9799ac801bf61671ec3b8333df91d0d445a9846 assets/byg/models/block/aspen/door/top_right_open.json +b487a38ad9be8a0d54ca0f25e56a8d566e46c35d assets/byg/models/block/aspen/fence.json +bad87510dd7fb2b8c03be6e223c6a2127a09d6a5 assets/byg/models/block/aspen/fence_gate.json +e53e175bf33511667403449239d0be48681b8a90 assets/byg/models/block/aspen/fence_gate_open.json +0b5b2240b55aac0f7b400f0ffbf01b4e117feb5b assets/byg/models/block/aspen/fence_gate_wall.json +23a74d0c44b3910b758910fb2fa0d1b26827040f assets/byg/models/block/aspen/fence_gate_wall_open.json +c936f6890a36cea87bfd647dd987c0c390a479af assets/byg/models/block/aspen/fence_inv.json +9d2da1a82cc505a45f7dd1785295b39728bddb14 assets/byg/models/block/aspen/fence_post.json +687c4331563bbac06f01029b03a0d5584e459a76 assets/byg/models/block/aspen/grower_item.json +d89aef94546aaa248ac843bca0f297da373de5f9 assets/byg/models/block/aspen/leaves.json +6039fd670d86df7b3f3b22aa997d5b335ea41831 assets/byg/models/block/aspen/leaves_snowy.json +dd452223b781777eccc5a819cc92036adb86eaa5 assets/byg/models/block/aspen/log.json +20186d414a62bc9358e70bbbbeaf9655ac08f9c9 assets/byg/models/block/aspen/planks.json +d8692a3a8cd8c0540fc796ca9fcf251de8a4a3cc assets/byg/models/block/aspen/potted_grower_item.json +a1c09dc584911873c3fbc1fc54b088768230a354 assets/byg/models/block/aspen/pressure_plate.json +8a64b6ec8f847070857c172fbd7df4f5501e5f6d assets/byg/models/block/aspen/pressure_plate_down.json +f8a13c3b754dd6004199b713aaccbba0a23bb675 assets/byg/models/block/aspen/sign.json +0a0f2b42467351c5160043f243315a462cec0181 assets/byg/models/block/aspen/slab.json +6285c94cfbb8f1b8166f36a7d12a4172c7aa3f8d assets/byg/models/block/aspen/slab_top.json +bfa5006c69e01eb32233c33b08fa485a42b9aa50 assets/byg/models/block/aspen/stairs.json +d913829611e23a19d739f5257d290aff7e462168 assets/byg/models/block/aspen/stairs_inner.json +ec6fa82ee1140dfb9a6437653ea846fcbbebb982 assets/byg/models/block/aspen/stairs_outer.json +df6c84946729ba8bf467fe003693a78b2d6f41fc assets/byg/models/block/aspen/stripped_log.json +a8aca7ce3f728f9e400f124168e2646154d63330 assets/byg/models/block/aspen/stripped_wood.json +e9947e7b163827851dfe7653a702cb3840c9eefc assets/byg/models/block/aspen/trapdoor_bottom.json +f839472fac83269ebc2a98a67b76c950a484a03c assets/byg/models/block/aspen/trapdoor_open.json +c4dc8b7ea8dfc09107a7106a2904845e42e354a3 assets/byg/models/block/aspen/trapdoor_top.json +8304f56a3d937b5c1696bc19d38b3868b9542c86 assets/byg/models/block/aspen/wood.json +b6f4aaf70eefadee8f4add87f8fba0c61851e791 assets/byg/models/block/baobab/bookshelf.json +c24ded57a676b1266679c28cca7191a12257a2e5 assets/byg/models/block/baobab/button.json +f0c0e79491f6294991a61cd67167a13f131842f8 assets/byg/models/block/baobab/button_inventory.json +91bf2968a8855b06e4917cb27b056dbc9c6e5bbc assets/byg/models/block/baobab/button_pressed.json +a6f1bb4f1148f80601a82dee4992e0f875cd0acd assets/byg/models/block/baobab/crafting_table.json +b9b0b43098e6c95b7898233b8e65a6b607342fed assets/byg/models/block/baobab/door/bottom_left.json +99aee0d05290d78431418661c1579d1aa622e89d assets/byg/models/block/baobab/door/bottom_left_open.json +b54f96dff280c83567265a0cecd30e51d3d87bcd assets/byg/models/block/baobab/door/bottom_right.json +4637932aa9ea41954203e187c70d6a478777a74d assets/byg/models/block/baobab/door/bottom_right_open.json +cfbc2e7b03e24285c85c387b49c04b367ed91881 assets/byg/models/block/baobab/door/top_left.json +cbb5ea445971fc0ed92addec0a498ce7a2f319ee assets/byg/models/block/baobab/door/top_left_open.json +b70a2b48e5518b028ee825b6227e20d04d19e077 assets/byg/models/block/baobab/door/top_right.json +cbabc0baa285540608267fa0ada81fdda4e64d56 assets/byg/models/block/baobab/door/top_right_open.json +4cbfdc64b26e2c757b222b54b7a51b74d14fd57b assets/byg/models/block/baobab/fence.json +71dd51178e8f42c6dfa7d9ab19fed2774d63f33c assets/byg/models/block/baobab/fence_gate.json +9a565b38783099b1a125f634265051de2236e04f assets/byg/models/block/baobab/fence_gate_open.json +44ddf8ee980211f08e3aca8862cb69f1643d6d34 assets/byg/models/block/baobab/fence_gate_wall.json +7f1aae70a41d7657909a118ce447487071e52299 assets/byg/models/block/baobab/fence_gate_wall_open.json +5d096407c05e3a15e7bdccd8e0a9cd80ad1cf8bd assets/byg/models/block/baobab/fence_inv.json +da227fe0397b26818afb7dca97e0a115274a3afb assets/byg/models/block/baobab/fence_post.json +dc035dfc754ac1137056e9bc25fb3d7a214d7029 assets/byg/models/block/baobab/grower_item.json +d8eb8e661395efb3b9f9a8ed7ba9a265a4e1bb04 assets/byg/models/block/baobab/leaves.json +4d3a1b345ec2beac6bcd3bcfecbb84f8650c50c3 assets/byg/models/block/baobab/leaves_snowy.json +e2549f4c3a7eb68359acf121cfef661bed947635 assets/byg/models/block/baobab/log.json +188f7ef388c93add3b49920a544b7eba3e0a3daf assets/byg/models/block/baobab/planks.json +4ebfc00ebe3a4ca414c72d3fc5c61e30952d9b9a assets/byg/models/block/baobab/potted_grower_item.json +5426a4b4b40fe31dda8d65c70179f159c0594afa assets/byg/models/block/baobab/pressure_plate.json +078e930cad6ac413f4d9f8c7128d3e1150bdebda assets/byg/models/block/baobab/pressure_plate_down.json +84943b96ad4a259b44338ce3165cea5b1d2e3e2c assets/byg/models/block/baobab/sign.json +a3dea36967428e478c01bb18d2ffa3117fe4ec85 assets/byg/models/block/baobab/slab.json +dcada9bababff41d3fd58df32254a716a8f57c09 assets/byg/models/block/baobab/slab_top.json +fe6b57184efed4ef3f4058aa1d6c2ecdbebf76e3 assets/byg/models/block/baobab/stairs.json +ed0ce69973a5aa7811c2ba53658c1743bb5fb770 assets/byg/models/block/baobab/stairs_inner.json +e0cc5c13b53311bd4e562348cea8210a6c568f61 assets/byg/models/block/baobab/stairs_outer.json +d5450e366348557ef0900674735bd4bbc661e9bc assets/byg/models/block/baobab/stripped_log.json +6074fdbc6a8482f0ea1b4ef113e1986ef2a15df7 assets/byg/models/block/baobab/stripped_wood.json +24a2f240de587080efcb51cc96c1e690d746a877 assets/byg/models/block/baobab/trapdoor_bottom.json +04e12ff8a0e75aeb7aa672de03b4f11e1afed4d9 assets/byg/models/block/baobab/trapdoor_open.json +860c222a681afb1539ba1b1c586f0db5244ad034 assets/byg/models/block/baobab/trapdoor_top.json +8b42b08b781a3c251a9ac6a18e8d554a2df55e46 assets/byg/models/block/baobab/wood.json +b1f7732f6f31e84442db93aa0f23b4651b53f6f3 assets/byg/models/block/blue_enchanted/bookshelf.json +c4f334cbd0cf2a519b26a76a7830445ca2e119bf assets/byg/models/block/blue_enchanted/button.json +e0ce0bd5d5f304fd7f379890ee428dda7ad11fd3 assets/byg/models/block/blue_enchanted/button_inventory.json +4526968c10e7fc2c666120393f5d9187d167e1c7 assets/byg/models/block/blue_enchanted/button_pressed.json +8f558f3406f74782b5a21883fa513703d5225533 assets/byg/models/block/blue_enchanted/crafting_table.json +82c1e95e6065d0f8e17c496f00b3e267a84726c7 assets/byg/models/block/blue_enchanted/door/bottom_left.json +bb9ff0b4cb1dd6ea7b07a639f7738796a083eaba assets/byg/models/block/blue_enchanted/door/bottom_left_open.json +f26a21f995fa71096f25841d158c1ee6f8479eb4 assets/byg/models/block/blue_enchanted/door/bottom_right.json +e986fde4dfbbb3f854dd5b09a93ea040fee330da assets/byg/models/block/blue_enchanted/door/bottom_right_open.json +d36ade0f192d94b8f3b268448f1942e4a086c176 assets/byg/models/block/blue_enchanted/door/top_left.json +6c584a9b673c9393d8aa67aea8c37cf2b0829aee assets/byg/models/block/blue_enchanted/door/top_left_open.json +00a67a84cf55c5ee36888f122000e1ec6de56e17 assets/byg/models/block/blue_enchanted/door/top_right.json +07e45ca95cbb3e24dd20afc94a192dced429c968 assets/byg/models/block/blue_enchanted/door/top_right_open.json +f5de849c0cb66fa178a95da4373c80a088f07b36 assets/byg/models/block/blue_enchanted/fence.json +f02dd2a40b1cd2788a794b7f20a485b8a9705e3a assets/byg/models/block/blue_enchanted/fence_gate.json +0983816b27786779ba04034d7bc7a2615bcbff11 assets/byg/models/block/blue_enchanted/fence_gate_open.json +5cd32704460b99018c78796bb8ee0fa385e0454c assets/byg/models/block/blue_enchanted/fence_gate_wall.json +13c078b579f20ed47466e8fe504033907f4ee62e assets/byg/models/block/blue_enchanted/fence_gate_wall_open.json +55e00878b366b252bb3699ebe35f415d9afbe4aa assets/byg/models/block/blue_enchanted/fence_inv.json +ddb9e663c1d5c1a99265326a7ffc2acef311d455 assets/byg/models/block/blue_enchanted/fence_post.json +e608699a6c1193d357404a5b36f2a0c3377e42cd assets/byg/models/block/blue_enchanted/grower_item.json +fe707e4a28db75167f6faac1a934c622f25f416a assets/byg/models/block/blue_enchanted/leaves.json +0d0635a49b45ad9f5aa11a631c2e347659a58a31 assets/byg/models/block/blue_enchanted/leaves_snowy.json +087ddb197ae3d9ed64dd6c405cecd10613922e67 assets/byg/models/block/blue_enchanted/log.json +64fcff2d2fc0a32fdf19a5a5b5118086e578be9a assets/byg/models/block/blue_enchanted/planks.json +e0d79a0bf96fbb6ea20af054984bda649573ccf5 assets/byg/models/block/blue_enchanted/potted_grower_item.json +0096c06dbe7d42442170ea9c4cbefa78865f7f8f assets/byg/models/block/blue_enchanted/pressure_plate.json +e072d374fb5280043560566b8bb6bfc1833efb71 assets/byg/models/block/blue_enchanted/pressure_plate_down.json +3ccd0b2ce04743e1cd7b6348174403ea1ebd75c5 assets/byg/models/block/blue_enchanted/sign.json +0c7c41b8c576f277236f9828b24dd7f35dcad6ac assets/byg/models/block/blue_enchanted/slab.json +d936dc484700389e0518af0c0f65b9206a66b32d assets/byg/models/block/blue_enchanted/slab_top.json +901c0d30003d4b9e69d1b47d600a05ac7797880f assets/byg/models/block/blue_enchanted/stairs.json +69ad0b44fecd9547ef73c44f7e692ff12422fa1c assets/byg/models/block/blue_enchanted/stairs_inner.json +63770bbffa9320688126af30c4c637f255ec68dd assets/byg/models/block/blue_enchanted/stairs_outer.json +6598de54bc932c7cc09da5060ec6c8b17f791b89 assets/byg/models/block/blue_enchanted/stripped_log.json +3146679ebfcb295e5edd9bf8d8833976229c66b0 assets/byg/models/block/blue_enchanted/stripped_wood.json +a604403a5a31eb58fc67abfd09be8c48e9d39828 assets/byg/models/block/blue_enchanted/trapdoor_bottom.json +0bb3c5d92316c5451f3326a5ae775f52fb116594 assets/byg/models/block/blue_enchanted/trapdoor_open.json +24140af9a0ed5775b22c39cc2aac68796ad3265e assets/byg/models/block/blue_enchanted/trapdoor_top.json +bb93cad327f32ffa20d127f599a136a1bfceb427 assets/byg/models/block/blue_enchanted/wood.json +bbbe40dcc5ef357adff038070cca88d05299e63a assets/byg/models/block/bulbis/bookshelf.json +0b3903e9eb9761c55bfad6c89ff2f1faf11c934e assets/byg/models/block/bulbis/button.json +a4a89f9040dcdaac976b79a9c219662a47003af1 assets/byg/models/block/bulbis/button_inventory.json +a3002865ed80a70d4ec80daac09a52407d2d2b22 assets/byg/models/block/bulbis/button_pressed.json +16fb959dd0c948d491f8d0c41fb6898dba055cda assets/byg/models/block/bulbis/crafting_table.json +49566a2addae912e7e499200722469bf22c3121e assets/byg/models/block/bulbis/door/bottom_left.json +3e61704debf928c6a2f817fd93f8226762578fa8 assets/byg/models/block/bulbis/door/bottom_left_open.json +730edba13fd53e65b525aed4e15b4c0462caf30d assets/byg/models/block/bulbis/door/bottom_right.json +4a78b282b2b51078e676c143baee1c767a30a9ed assets/byg/models/block/bulbis/door/bottom_right_open.json +74e8051374b275be1ef7aaf6207e9d990acdf8b8 assets/byg/models/block/bulbis/door/top_left.json +c996b48b0d618ab8df19ab1320f9c745fb085af0 assets/byg/models/block/bulbis/door/top_left_open.json +4d7a24162b4ac851af80facec93e58ad0307e454 assets/byg/models/block/bulbis/door/top_right.json +723d5ac2691ee7751814e61a20ce51c69139a6b8 assets/byg/models/block/bulbis/door/top_right_open.json +ff45b7eb75f5d4dd31021ba7280762c1a963ee92 assets/byg/models/block/bulbis/fence.json +a10548e4282fbe33fdbc967bc41ff94de453fade assets/byg/models/block/bulbis/fence_gate.json +a8fc19170e531f1c33d3254a861f347141732398 assets/byg/models/block/bulbis/fence_gate_open.json +a3805acdee44ba66772757a19a4b6cef367a557c assets/byg/models/block/bulbis/fence_gate_wall.json +b06d88b72fa4ce3ba3e990b22f9c66b1c6a14b6f assets/byg/models/block/bulbis/fence_gate_wall_open.json +c010cac988b4928956d3a18477e2135358b5005a assets/byg/models/block/bulbis/fence_inv.json +501811db1bae7ca353212cc10f915f4597aff53b assets/byg/models/block/bulbis/fence_post.json +70a78b9cec43ef8119d56635f5b1a214efb5a8dd assets/byg/models/block/bulbis/grower_item.json +aaaabc514008504b047a7de460f15cc3825804c4 assets/byg/models/block/bulbis/log.json +c02a2c5142c34361359c055cfaccf362bea346e1 assets/byg/models/block/bulbis/planks.json +c632ad0ce1a4a7717d32af4aa682c357a3332438 assets/byg/models/block/bulbis/potted_grower_item.json +c2f45b63a14b48c9afabeddf35d1c251ca20f6b7 assets/byg/models/block/bulbis/pressure_plate.json +c236e0f9a3d6028420a424e805cd5f6a74b6ff6f assets/byg/models/block/bulbis/pressure_plate_down.json +4badc1d8becc2e34ef7d73ed07225bf8dd4d5fde assets/byg/models/block/bulbis/sign.json +3c44f493fb5f05e06ceb623547b51a13beecd6b9 assets/byg/models/block/bulbis/slab.json +c0829704b57f30d0aeac6dabbccf54e06ffa5658 assets/byg/models/block/bulbis/slab_top.json +22fd424c08dafb3c3bcafc7939e04461fa86f050 assets/byg/models/block/bulbis/stairs.json +7f16f5ed69a65f8f8dfb4c3b02d22c0b84887aa5 assets/byg/models/block/bulbis/stairs_inner.json +577cc254ce55092de4830f085485037da0ea6861 assets/byg/models/block/bulbis/stairs_outer.json +88fc1bf2123774a977f70ac0ce6a327a94b08f43 assets/byg/models/block/bulbis/stripped_log.json +9a07ae5bef5d666d280fdf9c6ca591f551762f28 assets/byg/models/block/bulbis/stripped_wood.json +05c30d0916bb623e939bdd3d1ef1427cbbf6af07 assets/byg/models/block/bulbis/trapdoor_bottom.json +05b2d611aa6ac7d3ba67c10e3959cda48d1a381b assets/byg/models/block/bulbis/trapdoor_open.json +f70e05d9c193a3d700f8a7eced95e273a76b448e assets/byg/models/block/bulbis/trapdoor_top.json +e88ca356380a3361d59c8976287ada19a4794624 assets/byg/models/block/bulbis/wood.json +ff3c05c2c28f0641adf8ddfd9441c938bde6ce8c assets/byg/models/block/cherry/bookshelf.json +eace3002eb5b5333e7d1b492161446b9166eb1fe assets/byg/models/block/cherry/button.json +704bfeb0ebf7d919b965bf19f3f2778f047d4468 assets/byg/models/block/cherry/button_inventory.json +d72f41c2c122b439d0fd7cfb9d917d0515713f45 assets/byg/models/block/cherry/button_pressed.json +630d1476cdd1876064667f0030b491023e753cbd assets/byg/models/block/cherry/crafting_table.json +cb0a2bdfe33bcb505c7a857c9d6009f356ae7792 assets/byg/models/block/cherry/door/bottom_left.json +7ec4d0f82a2d0e17324af3352b14f626a5f833e0 assets/byg/models/block/cherry/door/bottom_left_open.json +0676f1b70180ba6b07fb4ad17a4ebaf06a202b15 assets/byg/models/block/cherry/door/bottom_right.json +766cb80fd054e851c85105d929604fa14545e4a0 assets/byg/models/block/cherry/door/bottom_right_open.json +ba3ef4b8c8fc7784cec27836dd81f1dd318e6569 assets/byg/models/block/cherry/door/top_left.json +9e86b33fd535087731f83aeb66d6accaabfdfc6c assets/byg/models/block/cherry/door/top_left_open.json +52e5bef41d1fdcb7add381061bd06fef406ffdbf assets/byg/models/block/cherry/door/top_right.json +05e291923f3376161c8607af8792b7e4589b9bf7 assets/byg/models/block/cherry/door/top_right_open.json +fb24c06cb7bb181636155e3a1026f7d397f72cf8 assets/byg/models/block/cherry/fence.json +c66c3d63241e24452e2456d1e976a6f7d03d225f assets/byg/models/block/cherry/fence_gate.json +3d015b0bedece2f507a1137df9a4e8b0bce87784 assets/byg/models/block/cherry/fence_gate_open.json +37caf34b6a88e4c796b7adbf0ea680cc4a281e3e assets/byg/models/block/cherry/fence_gate_wall.json +3b052604ddb361116e27d5a91e609d9231ea37e5 assets/byg/models/block/cherry/fence_gate_wall_open.json +93cde9890e23d67d9c12b348877da2f067dba70b assets/byg/models/block/cherry/fence_inv.json +c85b7b2659ffde0474161e62713dfa910e9ea6dc assets/byg/models/block/cherry/fence_post.json +446234e3611ea15f989c6748a0a450c4499c267f assets/byg/models/block/cherry/log.json +fbfc15081aa692d266a79636b0f949814334b72f assets/byg/models/block/cherry/planks.json +8aedb920f41d735e62ed34b3de42f51d0b8df291 assets/byg/models/block/cherry/pressure_plate.json +7ec9732505b40bbadcd67006de86cb39669b3ef8 assets/byg/models/block/cherry/pressure_plate_down.json +7281939c1a5c96fc69c5fa5565653d749ecc8640 assets/byg/models/block/cherry/sign.json +c996588b5dd2338fc1edce37718896eb838badcd assets/byg/models/block/cherry/slab.json +582969151a8efba6400533feeadaffa583ef0d25 assets/byg/models/block/cherry/slab_top.json +21e795a7dfc71a63f6920aa5695e1d1281218a8b assets/byg/models/block/cherry/stairs.json +2eb202bae2819438a0f68a0f10411727d5588b63 assets/byg/models/block/cherry/stairs_inner.json +d0215434c7efd628ad56f41ee4bcc66204674805 assets/byg/models/block/cherry/stairs_outer.json +969f122b810caac82509549a8273d361f670d438 assets/byg/models/block/cherry/stripped_log.json +faeb3d47f37000651ac41b711c6fd16870df2f6d assets/byg/models/block/cherry/stripped_wood.json +4ca210d69e455afb410b57aa8e5181c6e5d6079c assets/byg/models/block/cherry/trapdoor_bottom.json +5c886a28cfccf21ec428b938b0ad98a3380a1926 assets/byg/models/block/cherry/trapdoor_open.json +94ef1be400719ed56443b278a0bb9398d1b6c832 assets/byg/models/block/cherry/trapdoor_top.json +b87d0eaf311b17839a48310de36defc5dee21bb6 assets/byg/models/block/cherry/wood.json +adc468d4d8ca96af4d466c6b55b3e1ee25cd7bd8 assets/byg/models/block/cika/bookshelf.json +f2be47077419b57844d469479a076f88dd050279 assets/byg/models/block/cika/button.json +784e1c1c8aa326d034fc70d0a340c28c822a672d assets/byg/models/block/cika/button_inventory.json +e542d051dd476b875b064894c3a81e47cdf0b9fe assets/byg/models/block/cika/button_pressed.json +5470bece182d77a3929e0c159ad7d929187a55b9 assets/byg/models/block/cika/crafting_table.json +8223908a7c1b77019c2189732b205238fa002a02 assets/byg/models/block/cika/door/bottom_left.json +fac9c18436338e420ff3bdd22cc9084811f5a086 assets/byg/models/block/cika/door/bottom_left_open.json +f29a23c107aae3b8e3b533debae099439b2a0fd2 assets/byg/models/block/cika/door/bottom_right.json +35916b2eea886db9f4a5eeba3bef3d5e1c686c12 assets/byg/models/block/cika/door/bottom_right_open.json +b0d47ad643f4ecf3ad68362d8b85c14a82dd890f assets/byg/models/block/cika/door/top_left.json +a9041aa68cb9364005967210dbc4e0543d95811f assets/byg/models/block/cika/door/top_left_open.json +b3942ca0b572b3b005679ee1bcef19b93f9ae755 assets/byg/models/block/cika/door/top_right.json +88d46e1e3707abb461afa08d2ccc4c578efceb3d assets/byg/models/block/cika/door/top_right_open.json +98dc8e9cb7815123061a8c682726ac5a773f6d47 assets/byg/models/block/cika/fence.json +8b6083f49a1831c34079776307444d2fcbc18358 assets/byg/models/block/cika/fence_gate.json +f638cb73898d7e34488bf6f2418c94282632ed7d assets/byg/models/block/cika/fence_gate_open.json +3a447181b5ab7349088ab54eccbe891a09a93ee4 assets/byg/models/block/cika/fence_gate_wall.json +914955714e6a7eda80c0cfe3a05d03477a6f134d assets/byg/models/block/cika/fence_gate_wall_open.json +b60863536f2db53dffa10256a3a7412e1766125e assets/byg/models/block/cika/fence_inv.json +b8d6420cb74955235fe180b14404bc5703c665bf assets/byg/models/block/cika/fence_post.json +f6c098dbe71775342059a4bcf02664b294880e04 assets/byg/models/block/cika/grower_item.json +67247544e3f183ff9873bd3cc072f50fac44a921 assets/byg/models/block/cika/leaves.json +0962a86355ed237c03e18bd6cb8173052d1463ab assets/byg/models/block/cika/leaves_snowy.json +2bd9c54cb037a2e0629d520be522cc6ce7ffeb9b assets/byg/models/block/cika/log.json +d03a1afb7fac1b0f52da410e0851e3bf251bd4d5 assets/byg/models/block/cika/planks.json +6f709a15e5688506338571b74d55ef30a65b9c18 assets/byg/models/block/cika/potted_grower_item.json +502d6c3951ce3ae54e079fedfecee5469049a317 assets/byg/models/block/cika/pressure_plate.json +5a0445d466d75f0e2cd09065ae92aff96a6bc7fe assets/byg/models/block/cika/pressure_plate_down.json +f2de477fe0f6fd47e9e0adf9131d3458bced5919 assets/byg/models/block/cika/sign.json +f2e82118e20990b426284cb1ed7144710c9b50e3 assets/byg/models/block/cika/slab.json +222de390c25e2c4bad8b9547e7c87d6cbd886df2 assets/byg/models/block/cika/slab_top.json +90841ecec1b8666a2f5b15b839423025c30143c1 assets/byg/models/block/cika/stairs.json +2e16750e9ef173d7c4d4eef0bb6ac3c7913edde9 assets/byg/models/block/cika/stairs_inner.json +2767c87d9b0c93bfc1f72b76d7ae32b9075ccb6d assets/byg/models/block/cika/stairs_outer.json +55325233d2fa53b66e257518a5d9ec3e83d130fc assets/byg/models/block/cika/stripped_log.json +5ec72d05b35a54c44ed285d7be51c4122be47a5b assets/byg/models/block/cika/stripped_wood.json +cd57d94b53800309234cc4cf640778d282ef9d4f assets/byg/models/block/cika/trapdoor_bottom.json +74e6d6fe4d6ea279e79a85940a76b44109869b03 assets/byg/models/block/cika/trapdoor_open.json +a1f544a9bf0c70842c2e72878d9dd662296ae434 assets/byg/models/block/cika/trapdoor_top.json +fb23afd3751fce5682e6e16ba078220b32b62e53 assets/byg/models/block/cika/wood.json +f1496032135940e260c39e6d07e5b03e6f3a892a assets/byg/models/block/cypress/bookshelf.json +9ab1ef79a6b7aa6552f5d58ed973f4f9a4223eb0 assets/byg/models/block/cypress/button.json +9eb78e9ed277627a642689baa1d5d919f60c2f5f assets/byg/models/block/cypress/button_inventory.json +c0ea355661dfc07546b743f22e120162ba027873 assets/byg/models/block/cypress/button_pressed.json +62699bc842d69951b45c83a3ed5220f46d50d161 assets/byg/models/block/cypress/crafting_table.json +ddd00d4461f13949482f00268edfe7651428c21f assets/byg/models/block/cypress/door/bottom_left.json +0b9632a43879ed8ad251647e09e81850e07e2d0f assets/byg/models/block/cypress/door/bottom_left_open.json +c0b8114ecd1d2d11c43349b45db8d5bf981901ad assets/byg/models/block/cypress/door/bottom_right.json +b7d8baa7714cc449c975f40d19d397f720aee268 assets/byg/models/block/cypress/door/bottom_right_open.json +14cd7266072134d946f25cda7bcc1f798a029b4e assets/byg/models/block/cypress/door/top_left.json +3602c0c795cdfa8d7768b93ffb2a8b46dec1003f assets/byg/models/block/cypress/door/top_left_open.json +12661915d9468524acf1859a7ee98cca037b7db6 assets/byg/models/block/cypress/door/top_right.json +79e9878e6e17bcae69294d8a12e116b55d6b41a0 assets/byg/models/block/cypress/door/top_right_open.json +c0e40578a128a0e1d3d099eab3ac9da3e0ce68b2 assets/byg/models/block/cypress/fence.json +2ed37b826c06dae662db024264d20eba1de9cdfd assets/byg/models/block/cypress/fence_gate.json +76a89a4fa87bc0d1a5f4a821b3aeeab5268fea2d assets/byg/models/block/cypress/fence_gate_open.json +2398638741bc41ea4c41cc5d50a101c83ce28b3e assets/byg/models/block/cypress/fence_gate_wall.json +c43c10d8ef63bb82730b8d0f01e26414a8c82a2e assets/byg/models/block/cypress/fence_gate_wall_open.json +4371862760a7635b174cf8038d7a22445f8dd229 assets/byg/models/block/cypress/fence_inv.json +7533c9798d8ba7dfccfa7aacc9fd921e361b00e9 assets/byg/models/block/cypress/fence_post.json +c3f72a327b5a1cae84e1c70ef01f642e103d8004 assets/byg/models/block/cypress/grower_item.json +9c47bb00a996365d71e2d4a1ae182f68104dffdb assets/byg/models/block/cypress/leaves.json +911526f0a13033cc0e35d58eb44461588ce83791 assets/byg/models/block/cypress/leaves_snowy.json +f2dd845e7c94e081dd5575e82aa9544f52ef276e assets/byg/models/block/cypress/log.json +4bcfa66ed5bcfc3f05e49d084f36c651dd539c92 assets/byg/models/block/cypress/planks.json +440a8caad0d134b3e9a5e3823d0cb789910c48a2 assets/byg/models/block/cypress/potted_grower_item.json +462b3e03cab0cd8ec2d6135c41e772dd90f3dbf6 assets/byg/models/block/cypress/pressure_plate.json +c498c2bcf0ef3e2a55d6eb28b910c5b8d2728f37 assets/byg/models/block/cypress/pressure_plate_down.json +783504bf0cff93866f349b4cabeff060ca0d6304 assets/byg/models/block/cypress/sign.json +61004b54fa144b6f22ea88ea278d1a5892c9a9dc assets/byg/models/block/cypress/slab.json +159796253c57bf72622ae8069527d619056419e5 assets/byg/models/block/cypress/slab_top.json +84a997a98246fef884122e08aaa7d9441ae9b198 assets/byg/models/block/cypress/stairs.json +817cb5f5f9d970c1628fa92b1091aefb5d053a3b assets/byg/models/block/cypress/stairs_inner.json +6a16a9e7499304c05e3f9cc395dfffb2dcc5ff43 assets/byg/models/block/cypress/stairs_outer.json +1fcb6767f98e64bdb640590e590a685a147575f5 assets/byg/models/block/cypress/stripped_log.json +10765e8694409fb13ce831cda0555f1734a9b74f assets/byg/models/block/cypress/stripped_wood.json +e0a94cf594c69bf8e61bd949a7adae7ecbed7fcb assets/byg/models/block/cypress/trapdoor_bottom.json +541c37eb7467121f7859335666836958f55be715 assets/byg/models/block/cypress/trapdoor_open.json +b176dc62bd2fc3f5d6c98903261e7e9477263598 assets/byg/models/block/cypress/trapdoor_top.json +6286050e8579aa48732aa76ba5564443b988530d assets/byg/models/block/cypress/wood.json +658d24d6c6d365da012dcc359c2ff7e3f56a37f6 assets/byg/models/block/ebony/bookshelf.json +dbdc8bc2f98d6b4e62a2b2a24856ca4634e5f60b assets/byg/models/block/ebony/button.json +e985100f4e761e999ae028ef3f1cbca4554586cc assets/byg/models/block/ebony/button_inventory.json +f5a3f245d6ec3f6a52b80e10003f289a3253b839 assets/byg/models/block/ebony/button_pressed.json +6127f64c7cde5874fbc3a3c674c44871d5bc88a0 assets/byg/models/block/ebony/crafting_table.json +c10ce0537bbf21aa34db1d2ef3bf906d07af34a0 assets/byg/models/block/ebony/door/bottom_left.json +b3b34dccdf7fb15159e24f048563a93befb8a60a assets/byg/models/block/ebony/door/bottom_left_open.json +0afb7c38b277378a276a2d7fe3af0f5b42656d82 assets/byg/models/block/ebony/door/bottom_right.json +e406957ef5d3538243ce6f9894d445a6430fcbc9 assets/byg/models/block/ebony/door/bottom_right_open.json +fffb91f9b29a3d59d4e57172b1093ca8aabe9e50 assets/byg/models/block/ebony/door/top_left.json +942ef10baa70d05166bcf0849be79ef676e61d4b assets/byg/models/block/ebony/door/top_left_open.json +88bd3920e7b8b107e55131faf872566f1fd5ac03 assets/byg/models/block/ebony/door/top_right.json +baee857b45887f8c4018404c0db49d4fdc8579e5 assets/byg/models/block/ebony/door/top_right_open.json +e33b244b03dbbbfbed6740ead36592b6dbb42cd6 assets/byg/models/block/ebony/fence.json +cc88a139bc2bfc666abf94a714adb0b1b33d9d6f assets/byg/models/block/ebony/fence_gate.json +482697288385675e176beb1898721265ef7a737f assets/byg/models/block/ebony/fence_gate_open.json +234455ce0544cbb45f84e0614441879966af6e72 assets/byg/models/block/ebony/fence_gate_wall.json +d8cfd1043fc89e3662ca058215eeb7d2326fc904 assets/byg/models/block/ebony/fence_gate_wall_open.json +b5500bff880a91ffc5ec723291f0e198b3cdd220 assets/byg/models/block/ebony/fence_inv.json +dce9bfec4497d031f18340e53d23e2fad075e040 assets/byg/models/block/ebony/fence_post.json +244c018c97d3eb150864f7f0c75419d12754db70 assets/byg/models/block/ebony/grower_item.json +b4ca88a4ca8fb5955f794a8724fb2e95c60994b7 assets/byg/models/block/ebony/leaves.json +3311d404ed31320c0abdb1f1e195ddd11b632951 assets/byg/models/block/ebony/leaves_snowy.json +652eab7df80f47089637a23ec2954283222866fd assets/byg/models/block/ebony/log.json +c7d8d76f799198cda161d2bd4690fc0dfeb8cbf4 assets/byg/models/block/ebony/planks.json +e09246084c742aa7505c3d898c72c893538e0610 assets/byg/models/block/ebony/potted_grower_item.json +99b048dfbc67769272b6497150b402a219a40019 assets/byg/models/block/ebony/pressure_plate.json +e3a943a6e13329ac43a9419ea767960bfb32259c assets/byg/models/block/ebony/pressure_plate_down.json +a9a2f744f7581c796c9e97ae20a9f85fbb647616 assets/byg/models/block/ebony/sign.json +cf58f4e4b8197dbd885ae12b264eff028856eeb2 assets/byg/models/block/ebony/slab.json +354ac0a7939cc223167421ecda52758851639abc assets/byg/models/block/ebony/slab_top.json +8d1d4b09d49f175ec1d2912e5949a3c4e5d6dd9d assets/byg/models/block/ebony/stairs.json +10e4334a051fd22ed22807166ffddf5c179ff27e assets/byg/models/block/ebony/stairs_inner.json +7b633c60e5695705313150a796e70e143f7ca6e7 assets/byg/models/block/ebony/stairs_outer.json +147d6844c93012b9938076d7a6cc6b70ac7e8650 assets/byg/models/block/ebony/stripped_log.json +102f6c417f93d471457daa05caaa949ed99259ed assets/byg/models/block/ebony/stripped_wood.json +c4775f1c4cc530d918919c15e349f51e69885b8c assets/byg/models/block/ebony/trapdoor_bottom.json +ec1e3eb3840baf181007ff6492ba64ff50625026 assets/byg/models/block/ebony/trapdoor_open.json +c12c33d2dfdf0a654c1c5c84423d988c3a3a4d71 assets/byg/models/block/ebony/trapdoor_top.json +ac2893ceee935df8835f1cc77caad603e6cad1db assets/byg/models/block/ebony/wood.json +74973898e4648a1017a6bab20ee0b6d01f355c6f assets/byg/models/block/embur/bookshelf.json +6cc5a3f8f897d04f9326d5e74e21902ed89ba93f assets/byg/models/block/embur/button.json +b9725a8a9aafee13354c2880f3b9247537537773 assets/byg/models/block/embur/button_inventory.json +f014c9662c6eabc65cac92cc20cd5e9ec5372249 assets/byg/models/block/embur/button_pressed.json +63a4caeefc16e59931b40c960cf777282201f39d assets/byg/models/block/embur/crafting_table.json +c6d2f0530bd0c9de6f262091d9814508f7b6ddbc assets/byg/models/block/embur/door/bottom_left.json +dd16fecd5bd952b56ca007358bdd1675423a84f0 assets/byg/models/block/embur/door/bottom_left_open.json +80973531dfab10d2ace07eaa45308e128efbca35 assets/byg/models/block/embur/door/bottom_right.json +133f24502508a7b9472335ed9ec37b6c3d1eb5e9 assets/byg/models/block/embur/door/bottom_right_open.json +0a0050a5d170a384f772c4b8ef931c56cfc3bfb4 assets/byg/models/block/embur/door/top_left.json +dcf899be98e6b90eeb7cb12b417ac247c0bb3719 assets/byg/models/block/embur/door/top_left_open.json +d8cd6f0fff9c6652597c11ab8af39d71fb7246b2 assets/byg/models/block/embur/door/top_right.json +b3f72ba4b5e0016d95e49f1de4ba2049debde802 assets/byg/models/block/embur/door/top_right_open.json +6a9a6c4ac6179ee2fe4a8fd648934d0aefefc450 assets/byg/models/block/embur/fence.json +85558256ae00a780480cdfc9e9cc986e02e291f3 assets/byg/models/block/embur/fence_gate.json +f4173546e4ae6748d12c35ff3ec4288833c25328 assets/byg/models/block/embur/fence_gate_open.json +b40022c84be0686f7fc5e4374e695ca72a987bbb assets/byg/models/block/embur/fence_gate_wall.json +5b1948d029153ec7d349d9ad2046c35f22c4111c assets/byg/models/block/embur/fence_gate_wall_open.json +1bc588372e2d038a644b4fc6880162fb00406b23 assets/byg/models/block/embur/fence_inv.json +fb9d310cd1757c60b14473ab46f0023aaa7f774a assets/byg/models/block/embur/fence_post.json +f7764ee2588932140e934ce72034b7526e2f56ad assets/byg/models/block/embur/grower_item.json +93bdd7f124c8cb193fbba8a89ff2c012ee4b4ec7 assets/byg/models/block/embur/log.json +512c47ee37cdd1533bbee4eccdbe330d62c3c4e7 assets/byg/models/block/embur/planks.json +39a95c3547a165df80ff1e1b2570dc3156f0ae18 assets/byg/models/block/embur/potted_grower_item.json +10ab72679e218d771006af4f6b757c16ea05fb1c assets/byg/models/block/embur/pressure_plate.json +d09c903a858ae728123dd194b6fb1127b10a262f assets/byg/models/block/embur/pressure_plate_down.json +b6da977af5116b271bf2c075dc0a4d2ee87f2f64 assets/byg/models/block/embur/sign.json +05108e67e13b9e07b9be0948abc39422af51003f assets/byg/models/block/embur/slab.json +84cf55ef537ba0f0cf7eaf8c8a81a57262c785df assets/byg/models/block/embur/slab_top.json +a78d10613059ce9c93a0d7b338dea2ef9f5e3eb9 assets/byg/models/block/embur/stairs.json +ee8a232c1bf51e3bf0c518f5651b1cf1f6b0743c assets/byg/models/block/embur/stairs_inner.json +bb30eb410c68386f7fbdefd214ae6f56e8fd9fcf assets/byg/models/block/embur/stairs_outer.json +3165b2befe79d8133a3bcf11266616ed875c2225 assets/byg/models/block/embur/stripped_log.json +721daaa7c61b13ad6619e9b10874b94129b9670e assets/byg/models/block/embur/stripped_wood.json +7ae06d64b3a589a500c5d26751f73b2e3af1fa5b assets/byg/models/block/embur/trapdoor_bottom.json +7a85dd10a4cc9b5245a5d54495b02c50ef72f25c assets/byg/models/block/embur/trapdoor_open.json +1183728613e4b677fd37bdd40730acfd5b0a78b8 assets/byg/models/block/embur/trapdoor_top.json +c03e9d222e9c35b040dbb9dd2595f82bbc80b995 assets/byg/models/block/embur/wood.json +7dabc3cb10671c509cf8057be0d0e841bcb5efa1 assets/byg/models/block/ether/bookshelf.json +107df2b75e9edb63aae7b8ee770152bcf54a4c99 assets/byg/models/block/ether/button.json +459929ddbdb108f36bfaac029e8e2de8f294696c assets/byg/models/block/ether/button_inventory.json +f9b973de02a407860f9e8838064c744cc578fe62 assets/byg/models/block/ether/button_pressed.json +57f827eb899a5c1d020d34a6e368cd8d33101efb assets/byg/models/block/ether/crafting_table.json +ea3ad1814d3a59ba914762414c9bc7cb654e40f6 assets/byg/models/block/ether/door/bottom_left.json +883bbdc6f3fff9870d8bf4283e3689845aa9d390 assets/byg/models/block/ether/door/bottom_left_open.json +9863f63b4dd5c1f5bdc5d6715c7e86174e706b1e assets/byg/models/block/ether/door/bottom_right.json +4823b32aa89df2fc73625af5973c972dcc14ae70 assets/byg/models/block/ether/door/bottom_right_open.json +5394a27d200817fdecc101a22bda1a99f671019e assets/byg/models/block/ether/door/top_left.json +b827e5c1c7f5e655937fe983eb65af389327211b assets/byg/models/block/ether/door/top_left_open.json +7f615f3302bab8a32f3adffddc1fa09d9fd4b117 assets/byg/models/block/ether/door/top_right.json +609c4baead09f95e5a273a3d7e49618e1dd4e7f7 assets/byg/models/block/ether/door/top_right_open.json +e3664843ce19bd28d6118095b8e6537cb317aa7f assets/byg/models/block/ether/fence.json +20faddf4ecfbf522484715975d7ccbd374dacffd assets/byg/models/block/ether/fence_gate.json +2a404fc1b7f53e954f7dbb979fe830fff0c439b2 assets/byg/models/block/ether/fence_gate_open.json +1809d1800c97b91875f0ff2d14f90511f912aa64 assets/byg/models/block/ether/fence_gate_wall.json +eb102cf8e69293dd175c19e9f14ff3f95ba04b5c assets/byg/models/block/ether/fence_gate_wall_open.json +f1ac77b5d2f6a0ec82aa5b85199d1cbb6a92ef29 assets/byg/models/block/ether/fence_inv.json +26e1f8ebb556229a0261279ecf648802c2140efa assets/byg/models/block/ether/fence_post.json +dbc24200b1d4c99586481e152d4410980861638e assets/byg/models/block/ether/grower_item.json +0e1cc8d4d581187bd4c792e45d16fe97fd731159 assets/byg/models/block/ether/leaves.json +0a4e54d94d8d362234cec7da577bcca634613f0e assets/byg/models/block/ether/leaves_snowy.json +a5449c2b926e80476351dcfcc3d5c85a712296cb assets/byg/models/block/ether/log.json +8c0e7ac9fee3382cf175c5cb1ecc5eed3f00bfed assets/byg/models/block/ether/planks.json +26a9a498c30bc53491d50da2fae98a032e18baf7 assets/byg/models/block/ether/potted_grower_item.json +e535d45fd76ecc589081abd0bcfa7d806008bdf7 assets/byg/models/block/ether/pressure_plate.json +f1a92f85a89550df18661e5bb2a5f30d233c6556 assets/byg/models/block/ether/pressure_plate_down.json +e3e6c7cdc11159c7e3b0328c678f38d46f35395c assets/byg/models/block/ether/sign.json +1f6dd8f21265c3edf48860acca7bbc3800910da9 assets/byg/models/block/ether/slab.json +7ca7e570517c8ad293508510ae9ed506ffd5d006 assets/byg/models/block/ether/slab_top.json +9ff11c9507a31141f776ff5c405610bf16195b26 assets/byg/models/block/ether/stairs.json +cbbb85f8f0e6d43bbed3dd6f59b6f6e30669806f assets/byg/models/block/ether/stairs_inner.json +d9a456f5b868f64578a129a4a217fc198c736e34 assets/byg/models/block/ether/stairs_outer.json +ebbcfe56472fa015f0644b93d435344762d014b9 assets/byg/models/block/ether/stripped_log.json +10c59d04e211603fe02a75ad2248e5eb0affde11 assets/byg/models/block/ether/stripped_wood.json +05d7adc7ab3bd17dc1019c67bb9e65418ec5741a assets/byg/models/block/ether/trapdoor_bottom.json +4d0b58198de3a8865a25300ec2b373ef897e77a8 assets/byg/models/block/ether/trapdoor_open.json +6da9534823d86cc27ad27f7f37a0e436bf71ee28 assets/byg/models/block/ether/trapdoor_top.json +379fa674c825372fe5045f276d6391e98b1b4a92 assets/byg/models/block/ether/wood.json +ace31ed4c4d5770dab8abcec3e0b4291a21165c2 assets/byg/models/block/fir/bookshelf.json +f5ef71b808818794217b4e78dc2561c51615c9cb assets/byg/models/block/fir/button.json +da66360aac388918487b53df1047d997ef8478de assets/byg/models/block/fir/button_inventory.json +a58cefa9473720572f8d7852f91332057cb7e7de assets/byg/models/block/fir/button_pressed.json +0a90c43e3e173e9a33662b5d34ccb4948a18b5c7 assets/byg/models/block/fir/crafting_table.json +d678cf64dfa33b6a3d09967df54d5fc1af6fed71 assets/byg/models/block/fir/door/bottom_left.json +feb4abecee3c8289492fd4d191cfddf5162c437b assets/byg/models/block/fir/door/bottom_left_open.json +230964746579402fb72422b9cd37ea8b1ca35729 assets/byg/models/block/fir/door/bottom_right.json +cf7d3639d8f97d7eec7bd6396e452a4371ee1252 assets/byg/models/block/fir/door/bottom_right_open.json +73c2e4cbfc530760291f86b2f9f53f03a733c946 assets/byg/models/block/fir/door/top_left.json +5076a3e5fc9587c6d76fe5a710a56a9f3f0bff09 assets/byg/models/block/fir/door/top_left_open.json +9255f0fe23885d2fe7f5ca0f04b8d02e6cdd4575 assets/byg/models/block/fir/door/top_right.json +33124a4980d83be11f1ea86bb3f937543d587c1c assets/byg/models/block/fir/door/top_right_open.json +8d612da1080f93d200fd20bf6a5c0f281058aa82 assets/byg/models/block/fir/fence.json +30d97c81e71f7e504ec3bb9d6604376a35ae8b8d assets/byg/models/block/fir/fence_gate.json +7efe975f537e1aa2c6dd2444b87ac6d9199d0f2b assets/byg/models/block/fir/fence_gate_open.json +3f4ce022912d14e9bd184a2ca317389152617fdc assets/byg/models/block/fir/fence_gate_wall.json +a1ecb61030d67661e3dfa6f0ecb1706d228fdd35 assets/byg/models/block/fir/fence_gate_wall_open.json +477f881c39def5071d325cda39bd0cbf198f612f assets/byg/models/block/fir/fence_inv.json +0fd933cbcf43b37b2d0c35b6a3b57af1087e30eb assets/byg/models/block/fir/fence_post.json +621f4b57e819600469f49df77b62141b624e7ef9 assets/byg/models/block/fir/grower_item.json +287229d548f3e6484b3d6d333f1e9d79962f0367 assets/byg/models/block/fir/leaves.json +0f1b9d9b662090f6a910cf5ae06915bc1b56ac6c assets/byg/models/block/fir/leaves_snowy.json +7530d57f947a10126c1accdef65a3dd299728d1d assets/byg/models/block/fir/log.json +976319c7690ae773e8ee914cdd6a2172280beaa2 assets/byg/models/block/fir/planks.json +bed319397097c3998d1c9bed637bb9a83f02e98a assets/byg/models/block/fir/potted_grower_item.json +fb706c0116632c43334b794c3d648a011034997a assets/byg/models/block/fir/pressure_plate.json +e6b87d0b90be48356b81c6f1e011b4f800cad936 assets/byg/models/block/fir/pressure_plate_down.json +a9994ac7633eb2deadb124d8766166e9467506fe assets/byg/models/block/fir/sign.json +f5294f263a4f5abac1dd1b42a15a3e4d44f6b5cc assets/byg/models/block/fir/slab.json +ffe2026cb88df8ba35d1e8373d684e99cd9a41dc assets/byg/models/block/fir/slab_top.json +e05752fb0e65acd286c9fc9e43464e7f82152263 assets/byg/models/block/fir/stairs.json +25256e77786d9dbaaf9dbe38da4d0b2b5dc75252 assets/byg/models/block/fir/stairs_inner.json +2ed30f88506bc08eca879dec719ef669b27d4339 assets/byg/models/block/fir/stairs_outer.json +5fa61391c762fdb5eb4a7855b9ad10f02824c706 assets/byg/models/block/fir/stripped_log.json +99474ba1e0a9349a1b2615d4d55cc42db75ac957 assets/byg/models/block/fir/stripped_wood.json +7582f243bda64f4982020c5fff03061fe3d35901 assets/byg/models/block/fir/trapdoor_bottom.json +d7a373fbef99411becc1601dbb2e81d5da00c455 assets/byg/models/block/fir/trapdoor_open.json +21109c83af31783fcb9779eb8538088ca5fe93da assets/byg/models/block/fir/trapdoor_top.json +e56e4643bc65d1f2f5d3338ba7bd7ed788cd0816 assets/byg/models/block/fir/wood.json +223f44c3c064eb8844928d77e2a0319b6e8a94c4 assets/byg/models/block/green_enchanted/bookshelf.json +a1ba78be03af405f8c51470c6776e05d89a63317 assets/byg/models/block/green_enchanted/button.json +6cb7bcba210903e634e0c21a18bf1c2659026c7f assets/byg/models/block/green_enchanted/button_inventory.json +c5d8ccda6c110ba509c2b492691b5b5fc158daac assets/byg/models/block/green_enchanted/button_pressed.json +79963255588bbd4f47c95a3adf31b47057bb4621 assets/byg/models/block/green_enchanted/crafting_table.json +0c6aa3b583ead755fc1cab9af9e3e340a4219d4a assets/byg/models/block/green_enchanted/door/bottom_left.json +b27d88e06b84932d02f2564da526086aaffd8a5a assets/byg/models/block/green_enchanted/door/bottom_left_open.json +e85f2b88b7ab86ce36a10e2788e1cf66479fe811 assets/byg/models/block/green_enchanted/door/bottom_right.json +8748920a34b7455d85681d8ab8ad577e104e9ec1 assets/byg/models/block/green_enchanted/door/bottom_right_open.json +21fae7b66f06a73498be4f0a05aa4a3bdfa2aa91 assets/byg/models/block/green_enchanted/door/top_left.json +c6940ea5b9bedbaaa3a16be9c76a179ec410d909 assets/byg/models/block/green_enchanted/door/top_left_open.json +c337f1a260f442f67694830093e9129a0d115535 assets/byg/models/block/green_enchanted/door/top_right.json +ced3e6f68ef78994d6bfef78e8ed318c252b253e assets/byg/models/block/green_enchanted/door/top_right_open.json +962c3a81db776d79cbc2d7898b0e401aa062a9d7 assets/byg/models/block/green_enchanted/fence.json +0f51bdba9dde951f905299f1acf154a236866a41 assets/byg/models/block/green_enchanted/fence_gate.json +f437825998bdd8caa4d788fddcd52e5ccdce575f assets/byg/models/block/green_enchanted/fence_gate_open.json +11e83193145c72d7cbb1565212cf035db8667b9e assets/byg/models/block/green_enchanted/fence_gate_wall.json +3b381f0ab16fc5aa9f0d438df71fa0a9344d44ab assets/byg/models/block/green_enchanted/fence_gate_wall_open.json +9b82fc57531a41b0611464fbcae1884262e81f5c assets/byg/models/block/green_enchanted/fence_inv.json +e1fda1a1ce793aba65f5c6bfacb2da90d643dd0b assets/byg/models/block/green_enchanted/fence_post.json +184fc6ccb237a061cd4e11877ba322ffbb6c66d0 assets/byg/models/block/green_enchanted/grower_item.json +c4b90bbe3cef39d4147b1d4db2ae93efcdae384d assets/byg/models/block/green_enchanted/leaves.json +aa01bd783a90f64ad90f450f457788c9f750de1e assets/byg/models/block/green_enchanted/leaves_snowy.json +33d1a0355c02d3d38da523d323a835cf2132ea1f assets/byg/models/block/green_enchanted/log.json +65929ddbea35287a29f7e078a0c5c5cdc339e3a9 assets/byg/models/block/green_enchanted/planks.json +7e5354b27bf09c70c4b517fca3e3a6b7210488e5 assets/byg/models/block/green_enchanted/potted_grower_item.json +4bbb31c17bd61c599b040a86864695ab3566f8e7 assets/byg/models/block/green_enchanted/pressure_plate.json +e06e2a41954f9289ac237473982a832f609c55b0 assets/byg/models/block/green_enchanted/pressure_plate_down.json +5b8e9616e260b144fbb89fdaeaf46fc40ad4eaf3 assets/byg/models/block/green_enchanted/sign.json +19ed363dd88760b5efeccd1a728c20ce74c8f6bd assets/byg/models/block/green_enchanted/slab.json +09681307679573eb941f8ab740d2304852ab9dfd assets/byg/models/block/green_enchanted/slab_top.json +7e940393448d64d1d59f0d0345b9cd86ddc7147b assets/byg/models/block/green_enchanted/stairs.json +3ea0556a01df824349cb68f16a802a2f4af04d7a assets/byg/models/block/green_enchanted/stairs_inner.json +1892d2b04ed0c8c4a8e96bb90d3b5addca409c42 assets/byg/models/block/green_enchanted/stairs_outer.json +9719bdd19123d8e799ad4ef5409d1a5a094fa682 assets/byg/models/block/green_enchanted/stripped_log.json +b42ec4adadd59188612e77a5c17ff01bc32704da assets/byg/models/block/green_enchanted/stripped_wood.json +2c226d58b4d179e842ac0b11a091c72f544ddc34 assets/byg/models/block/green_enchanted/trapdoor_bottom.json +1c050625abe1ac61b2a357e098f10a99747ec546 assets/byg/models/block/green_enchanted/trapdoor_open.json +a82be9a8fc4fa78ed5d64c30f0e5bc17fd73a834 assets/byg/models/block/green_enchanted/trapdoor_top.json +e53a23d315161fd703a577e29014930ea941da66 assets/byg/models/block/green_enchanted/wood.json +8d4ee16fdb798abbe302230ce99f64dbfec21ae7 assets/byg/models/block/holly/bookshelf.json +360e8fa33ab83c05da337c37e14e7bc2c792b804 assets/byg/models/block/holly/button.json +8926347914982b644d2380838f71b123db29b3e6 assets/byg/models/block/holly/button_inventory.json +df37cef293674982c6c3ad45ed5756ef8e4b0e86 assets/byg/models/block/holly/button_pressed.json +e28c2092770f2d4604ff0b36eada9c2c03f6bce5 assets/byg/models/block/holly/crafting_table.json +fabe61cf5e1dd1df30a74094b7e3dc9ddd4c9d74 assets/byg/models/block/holly/door/bottom_left.json +ab39a3fddf13a0d4ee3aa833f2cbafe6b6768a51 assets/byg/models/block/holly/door/bottom_left_open.json +58eee2764b1ac0f0e67a441bcee801a3e43b4a74 assets/byg/models/block/holly/door/bottom_right.json +fa2654f2246a4d12005ea32200b18ece1dfd8286 assets/byg/models/block/holly/door/bottom_right_open.json +8047aa8ae2e36fe077d808fd71f0c0478d50b135 assets/byg/models/block/holly/door/top_left.json +1fdae1994406b6fcae270f922e2550b57bc93733 assets/byg/models/block/holly/door/top_left_open.json +ea67ba190d5a15fc2fc7086fd5649711c66e93c4 assets/byg/models/block/holly/door/top_right.json +1b8d9deebc16fdecee1fedcd4855cc08309c1ffd assets/byg/models/block/holly/door/top_right_open.json +e4c58fdf741d5d3c9a8460d9ffb99c306020a5e6 assets/byg/models/block/holly/fence.json +a58c5c3bb8cd77bd0d51d01b70d280a0d271b238 assets/byg/models/block/holly/fence_gate.json +070327baf68cafe0b106f180da6223f41226bbbc assets/byg/models/block/holly/fence_gate_open.json +66ba91efc344fbcfee8e71af5c755f108421553f assets/byg/models/block/holly/fence_gate_wall.json +c9f06ca7dd1b8a49d006535c557a68ae5fc5fc11 assets/byg/models/block/holly/fence_gate_wall_open.json +b80966c6645d030a265e6ed0874dde92043f82d0 assets/byg/models/block/holly/fence_inv.json +dc2ebe8c1223f5147926e06781ed8203d121eeb7 assets/byg/models/block/holly/fence_post.json +24db2dc17f1be6cd260dea8e43394fb0fa3f4408 assets/byg/models/block/holly/grower_item.json +4e62fa51e1703d2667a34073a531d04dd46993b8 assets/byg/models/block/holly/leaves.json +51815eb7fa517096efedb24685373d42a0783719 assets/byg/models/block/holly/leaves_snowy.json +7e575f1edf5fce1cf68a2c027aa2d4f1706fb067 assets/byg/models/block/holly/log.json +25ae301bcc5a40fce6c5aaf3b67280e9d37abdac assets/byg/models/block/holly/planks.json +835a932ac1936614edd770d1dee5a10dddb6cd77 assets/byg/models/block/holly/potted_grower_item.json +379a781da6aac103232de8c7e0d1f3cc05a0db4e assets/byg/models/block/holly/pressure_plate.json +517a04860ac9a9e8b1e5bc9d36c5ad49394a1832 assets/byg/models/block/holly/pressure_plate_down.json +493f26c524c8283b11fced7094517c0d752dd3b6 assets/byg/models/block/holly/sign.json +bff2d723290a71deb5dbb0776dac06087b66aeba assets/byg/models/block/holly/slab.json +5fa7a80b294e916dd6ee91e09b20155f7a3078e9 assets/byg/models/block/holly/slab_top.json +61b6aed3f9d0f19c550de4723e2041aafab11153 assets/byg/models/block/holly/stairs.json +9384df4b7fb0fdb5021e0566dd578398adcf456c assets/byg/models/block/holly/stairs_inner.json +5558ecd20b682fdbd6f24b8c08f8dbd23c317984 assets/byg/models/block/holly/stairs_outer.json +f0a651064829203775b34f3ef3ffa9fb9e2152f8 assets/byg/models/block/holly/stripped_log.json +19b54b862db940dd9398982618ad9676ce723cb6 assets/byg/models/block/holly/stripped_wood.json +c5e4db3b635639411a56c8b461a67a2501fe47c2 assets/byg/models/block/holly/trapdoor_bottom.json +49da59e2ae8a15a79e303ce381e253228e097a76 assets/byg/models/block/holly/trapdoor_open.json +29f59989e716b855380616a649ab1a33f1aef68a assets/byg/models/block/holly/trapdoor_top.json +45e43aef750d5e8a613c89128909e211802c43b9 assets/byg/models/block/holly/wood.json +aeceaa74cd336800a0781d173e1622449ff857e0 assets/byg/models/block/imparius/bookshelf.json +320d3dfe0b81189fc3cd065c9f2143b3ee1a1268 assets/byg/models/block/imparius/button.json +274e0a871242473f7b5be3a9124e007a4c877b2d assets/byg/models/block/imparius/button_inventory.json +6e4b21a98c8d017652389c62d86c96a532666bba assets/byg/models/block/imparius/button_pressed.json +dd13d2796651c89228b651cecbf9fcf7416855a3 assets/byg/models/block/imparius/crafting_table.json +9a234f7aa579877db3446fd4e62dcf895bc65f7c assets/byg/models/block/imparius/door/bottom_left.json +2ebb99fb13cec602718bef98fbc2ddb5a4536668 assets/byg/models/block/imparius/door/bottom_left_open.json +e53aa6d33acc219b2040b2b76a5d10c76f42f55e assets/byg/models/block/imparius/door/bottom_right.json +8de56a1898ae36db35d43237a1b11ab7f37f6b47 assets/byg/models/block/imparius/door/bottom_right_open.json +685b316997dcbb7556c1c73a1e79eb158068cdfc assets/byg/models/block/imparius/door/top_left.json +7ca32ab3aaabe1ca6650be68c79417e169e5d162 assets/byg/models/block/imparius/door/top_left_open.json +a74c113545a72fa952c06f15bece2b6f16eb7665 assets/byg/models/block/imparius/door/top_right.json +b688c0c212fcff7b26759fe1afc081e8ed5eee2c assets/byg/models/block/imparius/door/top_right_open.json +43c9ccd9da53c97ea75d2675966a3583341b0be2 assets/byg/models/block/imparius/fence.json +1c7f482cb1e52cf89feb3876f2db236d20cc7860 assets/byg/models/block/imparius/fence_gate.json +a4110f18b3ac6764b083f9e005952a279c1e316f assets/byg/models/block/imparius/fence_gate_open.json +fee1108cdb11afd9d887b0a7ea72a52c3c89fc5e assets/byg/models/block/imparius/fence_gate_wall.json +c031144960b3b3b99fd438f3d43ee970a2459c9e assets/byg/models/block/imparius/fence_gate_wall_open.json +38af0bccec6f9350fa96b457dd0ca42633ba5e7c assets/byg/models/block/imparius/fence_inv.json +aca655e3556ad7df7e6e9eeea019bda893bdbbf1 assets/byg/models/block/imparius/fence_post.json +2cd1221544bfe46433ef38955c7dd681faabd453 assets/byg/models/block/imparius/grower_item.json +fd28df17a63c9fc33092be55ca744f5d0b8e9bb7 assets/byg/models/block/imparius/log.json +ea1a7355d3f7f76e3773629464238a528b60e31a assets/byg/models/block/imparius/planks.json +fdaf43a6e95bfb7e2cf744545b899ef4dfbc16e1 assets/byg/models/block/imparius/potted_grower_item.json +4f5ff69e5471e50b4655315d076ca6180357c54b assets/byg/models/block/imparius/pressure_plate.json +9af4c66c356270d13eccf3603c6f7e30f95eaec5 assets/byg/models/block/imparius/pressure_plate_down.json +2da19065100d6351478a7a26fdaf5ab9f347cc63 assets/byg/models/block/imparius/sign.json +bfcda3a39b9aa54064dacd417f928957a19a4b31 assets/byg/models/block/imparius/slab.json +ad97ad85156248788cc4d22ce870fe2cd27bdb76 assets/byg/models/block/imparius/slab_top.json +a30773fab1b2b060818baedec0e2716b309545ac assets/byg/models/block/imparius/stairs.json +1020d99a041dae0587e120902d16180cfb733003 assets/byg/models/block/imparius/stairs_inner.json +30474f2cd85efd524bd0f96af1d5f9354ea4c461 assets/byg/models/block/imparius/stairs_outer.json +b883600f4533d3c781f6a79302ee8435cd5daa5c assets/byg/models/block/imparius/trapdoor_bottom.json +895ca7ea4160955b41dc6f6ab5fa8fc30df03e8d assets/byg/models/block/imparius/trapdoor_open.json +1a98fbc3cdb21f3007142982fd25305a1ea6582a assets/byg/models/block/imparius/trapdoor_top.json +1e963365b58e8f9be565ddf114e5a4e4b0d810db assets/byg/models/block/imparius/wood.json +9c3f5c9df7fd12243e4b766e1cebe2a6660e2a6e assets/byg/models/block/jacaranda/bookshelf.json +54f1b5a0fc44a4000153a1cb3cbc953b716a6ac9 assets/byg/models/block/jacaranda/button.json +e5a6db820fbbc7955f4a7470350c0e36b4b9ef96 assets/byg/models/block/jacaranda/button_inventory.json +dd1c1d2d444ee16c8e9716f3b3ade7f10b29b7b9 assets/byg/models/block/jacaranda/button_pressed.json +7630a8b4f00a8ab4fa2142d9e55dc0939a4086e3 assets/byg/models/block/jacaranda/crafting_table.json +510a9826d6f31179e5503abc2c8cb6f5785ed2a1 assets/byg/models/block/jacaranda/door/bottom_left.json +23c9d641c6fd784a3394df278c0326fbc10bb511 assets/byg/models/block/jacaranda/door/bottom_left_open.json +5272203c36f4c5ea8871e8af4206079444c34402 assets/byg/models/block/jacaranda/door/bottom_right.json +3cee27c611ef7f5fc6fa40d652939f165c6ebffc assets/byg/models/block/jacaranda/door/bottom_right_open.json +74d713cf896114fa80f47e39331dacd0287f6f5f assets/byg/models/block/jacaranda/door/top_left.json +db123db7ad82cd03c85ba8bb7e90092fe736b9c0 assets/byg/models/block/jacaranda/door/top_left_open.json +e29e8c42567bfa6bef81ae77b25f0205d37139a5 assets/byg/models/block/jacaranda/door/top_right.json +356dea1eac59d983a1087f22c556dab1e3b731bf assets/byg/models/block/jacaranda/door/top_right_open.json +c88f68fa92a7d384eee3e2b23c8f9ad440e52a98 assets/byg/models/block/jacaranda/fence.json +621765e12faa49e83f827ada8f56667afc0a5be2 assets/byg/models/block/jacaranda/fence_gate.json +d4aaad9a31a965c17aa47f622294955552e1bbc8 assets/byg/models/block/jacaranda/fence_gate_open.json +ef8202dc2a54719c4692f9f6c7c50411c2946807 assets/byg/models/block/jacaranda/fence_gate_wall.json +e4a43e009dbbfe567d7bd4a5ea7095b653fecb9f assets/byg/models/block/jacaranda/fence_gate_wall_open.json +7d16019dd607f6986b12aeebfd4d7c46315cf2dd assets/byg/models/block/jacaranda/fence_inv.json +a0ddf10059d8c5324f2d5b9ddcd374f41d1512c9 assets/byg/models/block/jacaranda/fence_post.json +7cd48aec138c1753ecdea979b246423e8a5a98f3 assets/byg/models/block/jacaranda/grower_item.json +d3c239336590480c05a8a6c9575a240b9cb4c9bc assets/byg/models/block/jacaranda/leaves.json +a3576b01e67c1e9521add9700f46f0f74a0bfaac assets/byg/models/block/jacaranda/leaves_snowy.json +8924d08e2bb19e92bbd4961db39c35e77b567ca7 assets/byg/models/block/jacaranda/log.json +7303b4604aa1c97b79e6c01181726d2bb922a2f9 assets/byg/models/block/jacaranda/planks.json +23753c6a124f30523fca93d4640d93b98f6899ff assets/byg/models/block/jacaranda/potted_grower_item.json +ab222d640e6c419dba9eeed2b954cff0b2488b02 assets/byg/models/block/jacaranda/pressure_plate.json +8ae84427299de80d6018da580425912d4917418d assets/byg/models/block/jacaranda/pressure_plate_down.json +4047d7a52945d9c564ec9e1accff48215bdd105b assets/byg/models/block/jacaranda/sign.json +4b6fc425481754393ccf5d1ea22a62f139a7aedd assets/byg/models/block/jacaranda/slab.json +ecffdad002532b3359d7f722320040d4cc06b04a assets/byg/models/block/jacaranda/slab_top.json +dffd96978ac95448f4176aabca03fe0fc02fee57 assets/byg/models/block/jacaranda/stairs.json +48b45f5b5de06faa2a99747947d1a3e534c5116d assets/byg/models/block/jacaranda/stairs_inner.json +41fc0bc34bf170fc7aba4b200afe9c3088d673f1 assets/byg/models/block/jacaranda/stairs_outer.json +1a81e03e1c883c7d2c8ee5a517d602381a7b5d1c assets/byg/models/block/jacaranda/stripped_log.json +19c117d13789f99fb403b3430fd0e271cc6f54d6 assets/byg/models/block/jacaranda/stripped_wood.json +4fbc89d3e91c973ba84f018485b9abcf527d2ece assets/byg/models/block/jacaranda/trapdoor_bottom.json +2ba937faf5e30ec4e2b60e3cf1f89e8dacef2731 assets/byg/models/block/jacaranda/trapdoor_open.json +0f5168d8029f81015f1c4bbb9f6b2748794dcf09 assets/byg/models/block/jacaranda/trapdoor_top.json +bf950e5597ba488148a74ccba6746a4df035b387 assets/byg/models/block/jacaranda/wood.json +ee3db876f46cbe9073c3eccd0e8d94afb21b9d99 assets/byg/models/block/lament/bookshelf.json +5f2714b0832e165f605d62fa09535bc13ca62f17 assets/byg/models/block/lament/button.json +e8ed55fa6a047ce4c2d24da37109eb3daf8c7d71 assets/byg/models/block/lament/button_inventory.json +64ae57df1ff94fef8e27ebf469bbd450a6162481 assets/byg/models/block/lament/button_pressed.json +8ab5acb851b4de2125f9ff154b251f399cb4ddb8 assets/byg/models/block/lament/crafting_table.json +8589b30fb58a73b086f34c4cb8effd56d27b967f assets/byg/models/block/lament/door/bottom_left.json +276ed3695866111cba1e1ff70ad7f5e86c159090 assets/byg/models/block/lament/door/bottom_left_open.json +597bfa3f29fd0fc49693fb19b36c7a130eba90f6 assets/byg/models/block/lament/door/bottom_right.json +a3a94fb4f0d1132b6059e1275585b6b2356d1eda assets/byg/models/block/lament/door/bottom_right_open.json +e5c6cb68dd2929a6c4e4e549c465e1249a92c39e assets/byg/models/block/lament/door/top_left.json +a8adf8f27128e8e2effde6c03248d8e0bc36c6b1 assets/byg/models/block/lament/door/top_left_open.json +3b725dfb7fbe50f4c1817e2272b58250c0ecc570 assets/byg/models/block/lament/door/top_right.json +15d7fc61b73abda3620c7442a8689310520506ff assets/byg/models/block/lament/door/top_right_open.json +54cba92b4139103a9fb6008a4b6c6164a7bde130 assets/byg/models/block/lament/fence.json +a06892b1bc9cdfe1fcc5629feafbbd964a6f31bd assets/byg/models/block/lament/fence_gate.json +645bb11c2cb2bed270568dc5e118156d0b12bde7 assets/byg/models/block/lament/fence_gate_open.json +b400a37f9e99eda8cf4223107a24ecb609c39c1d assets/byg/models/block/lament/fence_gate_wall.json +3f461accacb210c652c3a454760e8c5e5d9fc926 assets/byg/models/block/lament/fence_gate_wall_open.json +6d1bdc5a4fdf8427fe8afea956750238f1f216c7 assets/byg/models/block/lament/fence_inv.json +1aa2bd2a064781fd4e134c6f3934ca2a86650f27 assets/byg/models/block/lament/fence_post.json +bf0ef2cac34abfd56e4fea456d420cab590b71a2 assets/byg/models/block/lament/grower_item.json +e66e5716a4357cfee646159b5464cd426c11ad7c assets/byg/models/block/lament/leaves.json +0baab4d68e951d27cc734b2ba255e576d58250b9 assets/byg/models/block/lament/leaves_snowy.json +0c22ab52032dc7aca262230e96bb5e12f7259d53 assets/byg/models/block/lament/log.json +0ac9685fa43bf19adf0b3cb23908483fab0e61fc assets/byg/models/block/lament/planks.json +adddb9498a9e97751b2d1af8d0aeec1df3bdb400 assets/byg/models/block/lament/potted_grower_item.json +7e5c64f380eddc93616147cdd7b466018ba196ff assets/byg/models/block/lament/pressure_plate.json +2847f865fa63b9c79e6932de1cfbe61e20a92639 assets/byg/models/block/lament/pressure_plate_down.json +c415fec8895ccee938f52b0668ef2ee7e014278e assets/byg/models/block/lament/sign.json +76559ed737f2b5d0e3d6d4cbb846417488a40613 assets/byg/models/block/lament/slab.json +44c3509b2fcf91e53aa74df26e8fd9dada7c285b assets/byg/models/block/lament/slab_top.json +c7459d01a9e1283cebab31c31e0e2309cd0ece74 assets/byg/models/block/lament/stairs.json +4300f34881ec1493a2de415c775936781fc92333 assets/byg/models/block/lament/stairs_inner.json +b3aaaedd2f9f7160c2f17aeaa238cc6a3dc036c4 assets/byg/models/block/lament/stairs_outer.json +6fb54f3d3bdc39617e451cd3df6349beb81f541f assets/byg/models/block/lament/stripped_log.json +f06fad5ed2b282d5c79fd30b91dc78fdfed2386c assets/byg/models/block/lament/stripped_wood.json +9e6fe703aa2ce154a6ca1e905e963d4123dcc4de assets/byg/models/block/lament/trapdoor_bottom.json +3b1f58124ef66baf84d4265c32ca91c813faadb8 assets/byg/models/block/lament/trapdoor_open.json +716816ec08873a0e262c65a26f7e64bc8379e0dd assets/byg/models/block/lament/trapdoor_top.json +1236b06367903e098d79874a7e2e8a13e0044873 assets/byg/models/block/lament/wood.json +bcbfd470a04ab0672562b380054e5c984ee0af26 assets/byg/models/block/mahogany/bookshelf.json +02050cf15068722a50b16f09db595209e4e44507 assets/byg/models/block/mahogany/button.json +2e37e1673dcb4abab64855d3f091d61ddd585f0d assets/byg/models/block/mahogany/button_inventory.json +6fe38247e4f9461453b53f002434b1c05323fccc assets/byg/models/block/mahogany/button_pressed.json +6d6b1d07b25803195a77ae12290e6365e99fcd52 assets/byg/models/block/mahogany/crafting_table.json +2423560b825abf1630cc8d42fa3bc176029dd9fd assets/byg/models/block/mahogany/door/bottom_left.json +ac26268c81aa6780f2d0812806e45448b2ef17ae assets/byg/models/block/mahogany/door/bottom_left_open.json +a21eddeb8ba15adcc07eb3783493128d612c1b06 assets/byg/models/block/mahogany/door/bottom_right.json +377b175b5cffaa3ccf4cb3422c67c5723dcb8a6a assets/byg/models/block/mahogany/door/bottom_right_open.json +6fec78afe4a9be067d353cbe8eab4ca8c123cba7 assets/byg/models/block/mahogany/door/top_left.json +db050da054fde251485b60c366983be018de5189 assets/byg/models/block/mahogany/door/top_left_open.json +62b4bd6ad7c71894198e4321c2ee08b17eb36c8d assets/byg/models/block/mahogany/door/top_right.json +ff962871a58a03b9c50e7b3662c0fb88d4ffebc2 assets/byg/models/block/mahogany/door/top_right_open.json +df79f3da998d117d9d32193342f144c3305d3320 assets/byg/models/block/mahogany/fence.json +1a29e922e4ad6e1ea120bc86cb74a2a594b21bae assets/byg/models/block/mahogany/fence_gate.json +9898d1a516af1909cf4ba71146604c4ec4538ccb assets/byg/models/block/mahogany/fence_gate_open.json +1322252994a5f668ba9678ac4e2f983569680f3f assets/byg/models/block/mahogany/fence_gate_wall.json +7d17fe6a019f2ce2928ab3be98b478bed852fb4f assets/byg/models/block/mahogany/fence_gate_wall_open.json +d9a1d06d5d510555b4f95509953da2068cb4fb16 assets/byg/models/block/mahogany/fence_inv.json +2f825f21119481500572f24297765c4c6399431e assets/byg/models/block/mahogany/fence_post.json +9b888500ea537dcbe4f54d24c48271a610d45324 assets/byg/models/block/mahogany/grower_item.json +d6f0524e3c02f65935f2e359ad554befcfda8e30 assets/byg/models/block/mahogany/leaves.json +916b9b20777a5145e6c6d5dbb5fe94295981f0f6 assets/byg/models/block/mahogany/leaves_snowy.json +fd6f245ac0247222dadfc5a681c04d518932a643 assets/byg/models/block/mahogany/log.json +e66d8dd15001d0c84a1cad2c3607734e675d480f assets/byg/models/block/mahogany/planks.json +649fc664070e0573398a320795504943178b5648 assets/byg/models/block/mahogany/potted_grower_item.json +316bf136b8cc3a27649e7493740a1f74ae3bf1b2 assets/byg/models/block/mahogany/pressure_plate.json +0e2f687cd3e201dc39d6b316ab1ea9dec05fee00 assets/byg/models/block/mahogany/pressure_plate_down.json +f101d6b808a08d9453e3392c16b9bb88a696c0de assets/byg/models/block/mahogany/sign.json +22ef7258e08ec9af4fe96171460e824b5d624c5e assets/byg/models/block/mahogany/slab.json +64e75af9b588b0848d890c5ed88349c3e8028b30 assets/byg/models/block/mahogany/slab_top.json +42ca774f8864dcf19cefec1ac96d7485d35326d0 assets/byg/models/block/mahogany/stairs.json +e0f003fa32510382ca337e98b3b320d3bab45893 assets/byg/models/block/mahogany/stairs_inner.json +677bf566d48e2242dd0dc45c51ee390b091efb7e assets/byg/models/block/mahogany/stairs_outer.json +e7391be94d7f422ffd622901392c2062c708e569 assets/byg/models/block/mahogany/stripped_log.json +0b0ca8e516e9a36883fd051fdfcfc98b47884a07 assets/byg/models/block/mahogany/stripped_wood.json +8d5ff417bece162d0e1480f9193214f780692ca7 assets/byg/models/block/mahogany/trapdoor_bottom.json +5c767e71d46f28e159f0ffd69a08388bf4484a67 assets/byg/models/block/mahogany/trapdoor_open.json +3b8f672a33eb0b0d5e35aba760b4210b863b0b57 assets/byg/models/block/mahogany/trapdoor_top.json +1c25787f5a6c393a7f7fb82fc22a40f57ce7d40b assets/byg/models/block/mahogany/wood.json +dea8f8258836da0ebf6360786ce48549e535cecf assets/byg/models/block/mangrove/bookshelf.json +ca816d9705cabe4b5e0f86c7fca1c7df00796e1b assets/byg/models/block/mangrove/button.json +8e4defdec66e6d529da9bb1a0a03ed9b8a6aed97 assets/byg/models/block/mangrove/button_inventory.json +c65c2581e7db72b97b542940d91a4fee96f85e99 assets/byg/models/block/mangrove/button_pressed.json +184bddbca47da4766831cd08f87ba984155e438e assets/byg/models/block/mangrove/crafting_table.json +dcbf9ee57388238a067c73d6f9d8de00c0a74ead assets/byg/models/block/mangrove/door/bottom_left.json +10b5323078b315658c6057736bb8c359b41aaa15 assets/byg/models/block/mangrove/door/bottom_left_open.json +6bec52b8b52096fb110bc134edde96768c3259ef assets/byg/models/block/mangrove/door/bottom_right.json +7b288c6c2fb1ea32df5a66e76409875602ea28a8 assets/byg/models/block/mangrove/door/bottom_right_open.json +5ef9306b2e0e3454d7b393edd327bdf5bef64ee5 assets/byg/models/block/mangrove/door/top_left.json +4937d0a5032948348914bcb91aa846f548d1e930 assets/byg/models/block/mangrove/door/top_left_open.json +01c5af083020c7cd4122f989ed2981863de83990 assets/byg/models/block/mangrove/door/top_right.json +34af6bc8e937b3caa31418be99aaf902e776778c assets/byg/models/block/mangrove/door/top_right_open.json +50770720a4e9e2659620500d7cf834688d6b2d5a assets/byg/models/block/mangrove/fence.json +65a81296664582de20461fb69c54b2ccc186050b assets/byg/models/block/mangrove/fence_gate.json +1146334f62fdd74f4e4ae72de472956441c7e3bf assets/byg/models/block/mangrove/fence_gate_open.json +b9c44248668c1cbd00a65ca8120c6be7d87bbe27 assets/byg/models/block/mangrove/fence_gate_wall.json +f881b274ef3a9640e3b83f848567a5ca2242efd2 assets/byg/models/block/mangrove/fence_gate_wall_open.json +821c48e97532126ab802cd33518b28b6f9314b8d assets/byg/models/block/mangrove/fence_inv.json +22238f81aa51e43ae91892e8d9d2976004e4515b assets/byg/models/block/mangrove/fence_post.json +ebbf3693003140ef99a8898c2bcf56f43ae311f5 assets/byg/models/block/mangrove/grower_item.json +87fa9bc8e8656f4dcd3ea138f20c28cefee33914 assets/byg/models/block/mangrove/leaves.json +e3bfe95518477d4da47288d1c49914ed3259cc93 assets/byg/models/block/mangrove/leaves_snowy.json +6071cb1028b6dee965bf4a1555955c8c44b6a33c assets/byg/models/block/mangrove/log.json +5eaf37bb1bff0b53225f4163e14e68ed2c82642c assets/byg/models/block/mangrove/planks.json +aab00695e3897f01ec6105b0f143b6d4187dba46 assets/byg/models/block/mangrove/potted_grower_item.json +b05d2fea63450c4c06eb82069de8352d73d023ce assets/byg/models/block/mangrove/pressure_plate.json +71cf6b0166a02e8e7f916549de44e7113703682c assets/byg/models/block/mangrove/pressure_plate_down.json +b37d7b98577dca3c51e93e308e55a1eafeca3169 assets/byg/models/block/mangrove/sign.json +1e5d0af8f9c78e137062fe33fcce5b3b609eedbd assets/byg/models/block/mangrove/slab.json +d99af09ab2c019e699b7d050ce4aef101468c051 assets/byg/models/block/mangrove/slab_top.json +75c39a38404243161c281b3679530222fff6161e assets/byg/models/block/mangrove/stairs.json +49570263cefb17e6369fdac4309d4ac477ad073a assets/byg/models/block/mangrove/stairs_inner.json +150def3d17552a37b417e4b124ea9af2f1f5b807 assets/byg/models/block/mangrove/stairs_outer.json +af60ab003ad51d0d2ce1758e649079a39b56e33c assets/byg/models/block/mangrove/stripped_log.json +15773e6fed26133f0ba3c76990623b2be4589bb7 assets/byg/models/block/mangrove/stripped_wood.json +751c9e3ad389583406fce9905ba31608eeeb9773 assets/byg/models/block/mangrove/trapdoor_bottom.json +dbe14ad647a343bce8d42dc1ef3f3981d3326b62 assets/byg/models/block/mangrove/trapdoor_open.json +04f6064fbd3365f6e74c15d986bdfcd73c12d89a assets/byg/models/block/mangrove/trapdoor_top.json +1a13b23943550369f5519e622653aa211825b4c7 assets/byg/models/block/mangrove/wood.json +09d546b535b0d206e574084f2921a4694f29fd34 assets/byg/models/block/maple/bookshelf.json +246892f746c63ec78a3a2ea1cfe53e658c3f167f assets/byg/models/block/maple/button.json +67d640d21fa00545d0168cb71dd6c62a825d2dc6 assets/byg/models/block/maple/button_inventory.json +9f26923ebef1d23a5d2022df0485683fcaf7b72d assets/byg/models/block/maple/button_pressed.json +67c8310e5b472b154bf4f07a680fb32f3b76a9b4 assets/byg/models/block/maple/crafting_table.json +6cb1e5016b2e9ebe0e7c62cdbd2c80f9e4eac725 assets/byg/models/block/maple/door/bottom_left.json +4481402fb6d3ff92d7352748ec925503f0f6e67c assets/byg/models/block/maple/door/bottom_left_open.json +47558be9b71e4e1f33fbc08082b354d94afaf6fe assets/byg/models/block/maple/door/bottom_right.json +be322d121fc6cd4d571d5589ea9e5a198501f118 assets/byg/models/block/maple/door/bottom_right_open.json +015d197a992cc9cd6ad110f86a052d313ebc7c6d assets/byg/models/block/maple/door/top_left.json +eaa3a54a6d7224ab059ce1f4e6eed3e9dca730e3 assets/byg/models/block/maple/door/top_left_open.json +c1aff58341ddfc029aed951101fdc7caf86e3694 assets/byg/models/block/maple/door/top_right.json +101bc38444ee4186ff42faa0cfba4845d0b62f3b assets/byg/models/block/maple/door/top_right_open.json +a80e05bf73920f7ba285920a0461957df342c440 assets/byg/models/block/maple/fence.json +bccaef834467f9f3a9790402ae9f99a84f197421 assets/byg/models/block/maple/fence_gate.json +4ea90f397d5c06e37471d9995c1c75e38f3af94d assets/byg/models/block/maple/fence_gate_open.json +da6d2fdad67bf7be34cedc83a974aab1418951ea assets/byg/models/block/maple/fence_gate_wall.json +fb41077ee26ebedab04390777b221fb9278a79cd assets/byg/models/block/maple/fence_gate_wall_open.json +e7704b529e37ccaf324cd310da69f063830c6959 assets/byg/models/block/maple/fence_inv.json +e44a3f23da6551ec3a9474f3f95e0d06f582e63c assets/byg/models/block/maple/fence_post.json +80d5f047ddd5d9c9faec1668c798c4ce0cbaaf1b assets/byg/models/block/maple/grower_item.json +7583ea634917d89dc4706eff4bf5db54169d7437 assets/byg/models/block/maple/leaves.json +3e1e620a56344c20c802cec32659d60676593fa9 assets/byg/models/block/maple/leaves_snowy.json +f2a52dea74bb24f6de7c7c2bad7ded5ee2ae7d58 assets/byg/models/block/maple/log.json +359a7604a6e7f5e7b75ec8cda25bf05583edf9e5 assets/byg/models/block/maple/planks.json +150cee37917d9926577dc4c2d08369e27d797bc2 assets/byg/models/block/maple/potted_grower_item.json +2b2d5d3bba99c4c119f4ce7cc45833bafce0b346 assets/byg/models/block/maple/pressure_plate.json +d6b3e27ae8ed1c20f8e90541450d5996c425dc3c assets/byg/models/block/maple/pressure_plate_down.json +5549793cda2e6fdbd29565a8a0828ef90dc916a3 assets/byg/models/block/maple/sign.json +69d71e19fee98404f140488993afab52940f85fc assets/byg/models/block/maple/slab.json +87128fd892be3835ff3d1e3615a66c5789b3dea6 assets/byg/models/block/maple/slab_top.json +99cc7667f95156725ba39b99733c54d34833a343 assets/byg/models/block/maple/stairs.json +21511fb760885d12ef2d379e93f028d4185ed346 assets/byg/models/block/maple/stairs_inner.json +0938bfd14ad2d48ebab583687a03a8f9499e26b8 assets/byg/models/block/maple/stairs_outer.json +fa778a08e66ccb2b53a859314d1b365689bdf5ef assets/byg/models/block/maple/stripped_log.json +bcac775379b2e146c6c0172c9d44ecb7b7824345 assets/byg/models/block/maple/stripped_wood.json +06962b3daa115ef4fe5c76f45b62111fdf4feaf7 assets/byg/models/block/maple/trapdoor_bottom.json +8b4bfad7acdd4b6a9b0b8dc4bd9465fcab40159f assets/byg/models/block/maple/trapdoor_open.json +b28aabc165109c3c6aed77350efaebd17ec6b76b assets/byg/models/block/maple/trapdoor_top.json +8b9268d9fe28cb61c6b06f1ea0805f0fc8387053 assets/byg/models/block/maple/wood.json +b4d3920db1d3915fdbc8fb6fe67276d01525563f assets/byg/models/block/nightshade/bookshelf.json +3b35033abf0fe88a095a7cfe23e75ef910cda5c8 assets/byg/models/block/nightshade/button.json +da55fdd78efec17fd374115cf1b9b48ef844a12a assets/byg/models/block/nightshade/button_inventory.json +a5f0092495439cb9128e4a726c098086dd2f71d8 assets/byg/models/block/nightshade/button_pressed.json +94ac4de042732d45b2e3259863e5cd99685e48a4 assets/byg/models/block/nightshade/crafting_table.json +8015fda38ba55261d509215adac949ce0a347d2a assets/byg/models/block/nightshade/door/bottom_left.json +1d8fbbfd4f243343624868e5068f4154dde95112 assets/byg/models/block/nightshade/door/bottom_left_open.json +dc70c9e321e75089d168a4c9455a56cc53ac9050 assets/byg/models/block/nightshade/door/bottom_right.json +2a609984be09cbed0f0d0b2c4fabd9342962826a assets/byg/models/block/nightshade/door/bottom_right_open.json +c315c59b33c0f9dd122558e0804f798752311fd0 assets/byg/models/block/nightshade/door/top_left.json +03531e4f1acf513409ff672ade416fc3ea2be90f assets/byg/models/block/nightshade/door/top_left_open.json +c999a16b5f9cae78e3e66c5f5651c94249660d9a assets/byg/models/block/nightshade/door/top_right.json +e9ce62886a9815fcd89564e3db5f1e39dc622abc assets/byg/models/block/nightshade/door/top_right_open.json +16e8ba03bbc6c762dc70725a05210417061e7eb2 assets/byg/models/block/nightshade/fence.json +86111f153f160db20210175c53ade6bb31e22cdc assets/byg/models/block/nightshade/fence_gate.json +07bf39b8000561bbcecfad1b308b3317935e3a06 assets/byg/models/block/nightshade/fence_gate_open.json +30f67a0026e072b37183d73c960b56a308b20e1f assets/byg/models/block/nightshade/fence_gate_wall.json +525ac448dc02dbdf5703022803c0e40fb1108005 assets/byg/models/block/nightshade/fence_gate_wall_open.json +516ede8bb1e5e685f690b5e92898f89861bbfce7 assets/byg/models/block/nightshade/fence_inv.json +3f7a2a043eb3f8e0fdacb584eb800ceca335c799 assets/byg/models/block/nightshade/fence_post.json +92dfb61e78ba7343e5759ccc9edfaa730be854b2 assets/byg/models/block/nightshade/grower_item.json +ced607eab30aaf0047ff9f5ece3add43c5a3b6cb assets/byg/models/block/nightshade/leaves.json +fe3310f0131b43f57d768f1b227fd6ca60f06836 assets/byg/models/block/nightshade/leaves_snowy.json +e7a259ec1c92a5363b493f20f9a3a136c626683d assets/byg/models/block/nightshade/log.json +94ea35d8ad461289339425bdc0c6a82f432c9c04 assets/byg/models/block/nightshade/planks.json +5ad66d6b767b99ead1c6d6e4a37c028fda660d02 assets/byg/models/block/nightshade/potted_grower_item.json +508c29d4ad43d30461debb7a02cebe1741ce85d5 assets/byg/models/block/nightshade/pressure_plate.json +370ee4459ef1991068b987b27ac35cb3b441f8b7 assets/byg/models/block/nightshade/pressure_plate_down.json +54f209e495a237060913916e84271dbfe2cc189d assets/byg/models/block/nightshade/sign.json +c11acf819e7ba9c7c01440609bae4732e0fc421e assets/byg/models/block/nightshade/slab.json +79a0f680e3ead5d85ac026a1ae2a9c275b49e942 assets/byg/models/block/nightshade/slab_top.json +52c3957cee6f9734104f53b13e48b59f4addc525 assets/byg/models/block/nightshade/stairs.json +d71a4309e4b2a20f2aae704cc334b1212d64a154 assets/byg/models/block/nightshade/stairs_inner.json +02f3b8fe876bd960251e4a6691ef999e4b572eca assets/byg/models/block/nightshade/stairs_outer.json +a26ac3e05bfad586cd2ad3ba8a982d52f5a70752 assets/byg/models/block/nightshade/stripped_log.json +0cfdea30e460b331d5790039605d6e0d1c749dad assets/byg/models/block/nightshade/stripped_wood.json +20921df1a73f40d813b7a46fe26967d13eb457d6 assets/byg/models/block/nightshade/trapdoor_bottom.json +b1185b68eb8537f506e0c2576383a201a63f2bb9 assets/byg/models/block/nightshade/trapdoor_open.json +afe4182eb96a97c14318598c1a25ceeba7d3516e assets/byg/models/block/nightshade/trapdoor_top.json +f563020890b9f7e950908b650a04e21a49fc9129 assets/byg/models/block/nightshade/wood.json +9222f9384e4c5f9d90e3f52ef104b03ccd8744dc assets/byg/models/block/palm/bookshelf.json +82e169c988fd24525bf401a0ad4a3b6751e5f6ca assets/byg/models/block/palm/button.json +c823d3638b3f3ae1883b5ae6f1e1d3ccd23d13a1 assets/byg/models/block/palm/button_inventory.json +79a7fd497e8365434a46cafd8b373bbb25ab7dd7 assets/byg/models/block/palm/button_pressed.json +96f062a8b3f05753aaaab0c78572a19a25b3643f assets/byg/models/block/palm/crafting_table.json +b99ee72cec46f72d48a8a7b123f8d208fe7a7e35 assets/byg/models/block/palm/door/bottom_left.json +a23cd18375b777c0a48ec5e266b2f761fc0bb6b1 assets/byg/models/block/palm/door/bottom_left_open.json +5ac81750eb279b1418061e0af20dc9348b7527ae assets/byg/models/block/palm/door/bottom_right.json +c13c3b3965683a6f2511753d117e11f3ca335cdd assets/byg/models/block/palm/door/bottom_right_open.json +4f1ea54c9a4f0a22262892a09110cf2636a0a35d assets/byg/models/block/palm/door/top_left.json +798ab60155d0d4e6d84f73b9c0002520a6006ef5 assets/byg/models/block/palm/door/top_left_open.json +5847bb7cbeec0ea674e5f6cbc238e633e5a66b3b assets/byg/models/block/palm/door/top_right.json +5f03d4c3823079a5dc7360e3eaffacdc0d13bdee assets/byg/models/block/palm/door/top_right_open.json +7d52229c50a28df1dfa66236df3a0ae32b154d96 assets/byg/models/block/palm/fence.json +abad4912a1d4d504c9d6017137430a4f6abf24f8 assets/byg/models/block/palm/fence_gate.json +b8e38b12912218b80444b9cd1f717b6a2311683f assets/byg/models/block/palm/fence_gate_open.json +ac5f6dd9d33d501d38f859639e30b22f08e98435 assets/byg/models/block/palm/fence_gate_wall.json +65dc301477e38d58291958864a6fe0888fefb9d5 assets/byg/models/block/palm/fence_gate_wall_open.json +3630c02bad5200a55834e9db31500b83a0be4a24 assets/byg/models/block/palm/fence_inv.json +69ab1ecc61f87f27da9e5c20a03fb05a4b8b9c54 assets/byg/models/block/palm/fence_post.json +a0edea552effccd4046b3f97c6e635c92496faa0 assets/byg/models/block/palm/grower_item.json +dcc8ed14b5d86ed58cf7b5858b2f2bd911e12b9b assets/byg/models/block/palm/leaves.json +0a111e12089387c605c1c779db8ba60719c90aa6 assets/byg/models/block/palm/leaves_snowy.json +1d306fb24a91dc4038060f6f98f14937bb60289f assets/byg/models/block/palm/log.json +01147ace0c2a546e7204c65dfc1137040fc24300 assets/byg/models/block/palm/planks.json +1331cad9c52fd0ac626a189c1b648c0ff53fd111 assets/byg/models/block/palm/potted_grower_item.json +b6d0a8b105d4eb3daeba017ee4225baaabbc043e assets/byg/models/block/palm/pressure_plate.json +a79635b18e224d5dc76568f04a7e6633d7f61153 assets/byg/models/block/palm/pressure_plate_down.json +47f71e6158a359edbc0dc4fca602ba0b6efdcd28 assets/byg/models/block/palm/sign.json +f1ef3d3c3638466613fbbc792d35467a851cb7f9 assets/byg/models/block/palm/slab.json +9119516fd966598a88e560c826ea09175fd86c62 assets/byg/models/block/palm/slab_top.json +37839919bdd1b59142237a3574081fe161a9754e assets/byg/models/block/palm/stairs.json +00303be7064e01c02b546e790d443ec29736dbc7 assets/byg/models/block/palm/stairs_inner.json +efb612d615d5e44d60140ef78ac51d64e302cc63 assets/byg/models/block/palm/stairs_outer.json +0965ec3033b675299a8b452bd1557aa35996d211 assets/byg/models/block/palm/stripped_log.json +6439dbe1b4a3ceb07663d49791ed9c1338a19e2e assets/byg/models/block/palm/stripped_wood.json +37254f3dea45f25f6af71595831323cc37300420 assets/byg/models/block/palm/trapdoor_bottom.json +e138c4019ac15055adf810fbcf372997d00f7a0a assets/byg/models/block/palm/trapdoor_open.json +7f9c443939aacd26eb154bf49c0f7d20aebe2062 assets/byg/models/block/palm/trapdoor_top.json +06ad447e0c5788793970b2ad73a926a0acf1e678 assets/byg/models/block/palm/wood.json +269f849a48bc34e0fa6511962b0a44633a7fc8ab assets/byg/models/block/pine/bookshelf.json +00a5012ad2eb5a2f288b23511956bd9a1c826788 assets/byg/models/block/pine/button.json +edf8ade38830adeb8fa1e0d9678ab6aa9681c06d assets/byg/models/block/pine/button_inventory.json +653fdeeda9548e84703a4bac2ab7ac8c6c497dbc assets/byg/models/block/pine/button_pressed.json +297c2c6a99ee178a82f0372da431193ead12d664 assets/byg/models/block/pine/crafting_table.json +69273767b4d3414b9b0562e57ba9aff60f3cd16d assets/byg/models/block/pine/door/bottom_left.json +ba40a2699abda5229dd804fc955c7cb0a9d56a0e assets/byg/models/block/pine/door/bottom_left_open.json +568fc4fee9bd5226a1a60438ce44c85d44dcc1b9 assets/byg/models/block/pine/door/bottom_right.json +9105fecbe9db4e36bab294e17fe5dee6b6fb13e3 assets/byg/models/block/pine/door/bottom_right_open.json +a5dfbb14d5af78c84b7ac1545a537c5f38e086c0 assets/byg/models/block/pine/door/top_left.json +181a0e2e0f23b5eb274e703ad48c608c92b315da assets/byg/models/block/pine/door/top_left_open.json +dd6c1be8006ca1e3536cd404158a966fb0998bae assets/byg/models/block/pine/door/top_right.json +ad4acb3bced123f712113940d40366a9005e98e6 assets/byg/models/block/pine/door/top_right_open.json +08d4b39b416ea9fdbaf0002b4f3648671b62e571 assets/byg/models/block/pine/fence.json +9a89cd7f010d23737c3516dfe0c8f081b406c322 assets/byg/models/block/pine/fence_gate.json +585ab2bd5e69ab8a95dd0dfb9f4793997c73f3f7 assets/byg/models/block/pine/fence_gate_open.json +b69f476027937e98459c5d77f070af35c3613158 assets/byg/models/block/pine/fence_gate_wall.json +225126eb30c81f2d97877d64e56de459e299ed8f assets/byg/models/block/pine/fence_gate_wall_open.json +77c983f5948b89d5699e069c46e8771a25d08dee assets/byg/models/block/pine/fence_inv.json +9ffcc1cb1c0893a2778a630a52b6cb2674599f64 assets/byg/models/block/pine/fence_post.json +5d34f5f613255a9141cd965f1825f855f4d644fd assets/byg/models/block/pine/grower_item.json +90b33e6f46618368ec6dac7c951cef4ca7fd5ed3 assets/byg/models/block/pine/leaves.json +999988c3100554d4726c840a24639a338ed505fa assets/byg/models/block/pine/leaves_snowy.json +efd57134f3340b3e5530f428022d42443a528c97 assets/byg/models/block/pine/log.json +9384e38da882d5e8d48954f62509d71545c106df assets/byg/models/block/pine/planks.json +78fb82d997fbc05e1db62ef88112759dda310fda assets/byg/models/block/pine/potted_grower_item.json +3d3663a4b7bf0851b2993c58d76fe40523673476 assets/byg/models/block/pine/pressure_plate.json +3a37aaa229995dd13ddc20defa790d743c2929c1 assets/byg/models/block/pine/pressure_plate_down.json +64e21a442fb9744f9d104b568a44a915a7a5f8e7 assets/byg/models/block/pine/sign.json +ee3ab5133a55ba528ec6dc4e2dd5b49462b7e400 assets/byg/models/block/pine/slab.json +9a721e401bfe7fcec37870786b79e62262d80040 assets/byg/models/block/pine/slab_top.json +7909fba602687ef583e80a0ea3e025baa3818ee0 assets/byg/models/block/pine/stairs.json +85162fbaba79b4262bd27a1d75cf18a5183908f9 assets/byg/models/block/pine/stairs_inner.json +90e9a8eddb17bac73a0b0fd504ed13d63c055145 assets/byg/models/block/pine/stairs_outer.json +b99317ecd07758fa46e20756d68a98485d8ccba7 assets/byg/models/block/pine/stripped_log.json +6e214006f1a2de94f1bf2114936ad8b6288b96b9 assets/byg/models/block/pine/stripped_wood.json +4005dee2ccaf1085cf5eb8f17ce2e59c7804be53 assets/byg/models/block/pine/trapdoor_bottom.json +9ee6562202d3d9e1347672eeeba1bb37a201c0f1 assets/byg/models/block/pine/trapdoor_open.json +fafa85baaf4023188847afacb8d08334bfb55605 assets/byg/models/block/pine/trapdoor_top.json +4f5b1fab6d6d66a052e47233031df2baa7a5fe7c assets/byg/models/block/pine/wood.json +f123552d2b21ec4f151ae978be01d95c376cbb54 assets/byg/models/block/rainbow_eucalyptus/bookshelf.json +ef06ee920acd9f4a1e1838f022000983dd454ffb assets/byg/models/block/rainbow_eucalyptus/button.json +1e9d944b4e797e6f97e5e7ba9defc07065c6addc assets/byg/models/block/rainbow_eucalyptus/button_inventory.json +591cdeae7769327f4fffd7d8767b6ce156bf5790 assets/byg/models/block/rainbow_eucalyptus/button_pressed.json +6edb6d78fce184c5b9f8c7ecf5c06fa0871ea7e3 assets/byg/models/block/rainbow_eucalyptus/crafting_table.json +b60b7fccdcf3901a5a19f276eb1e50342cbb1bcf assets/byg/models/block/rainbow_eucalyptus/door/bottom_left.json +9ff08aa6508a833a5ea7873c705a19dfe922834d assets/byg/models/block/rainbow_eucalyptus/door/bottom_left_open.json +ff4157e00a516617b0b3767bf15422bd54cd07c2 assets/byg/models/block/rainbow_eucalyptus/door/bottom_right.json +ab92e8a5c983814c6439faf2751d04adbbac44f9 assets/byg/models/block/rainbow_eucalyptus/door/bottom_right_open.json +3adeb67cef994ed17b43ef25d51f9dd8b4d91b8c assets/byg/models/block/rainbow_eucalyptus/door/top_left.json +bdd7ac9f63a303458660dd2d02dd5489a63e1247 assets/byg/models/block/rainbow_eucalyptus/door/top_left_open.json +33db54da746645fb2ff90082cb8c3cee2414f4fc assets/byg/models/block/rainbow_eucalyptus/door/top_right.json +e7f20b0ffb84cfa3b91cd79bc8c93c4b3bef6954 assets/byg/models/block/rainbow_eucalyptus/door/top_right_open.json +11aff70655dece26b03d6c098c6172ba53127662 assets/byg/models/block/rainbow_eucalyptus/fence.json +4f7880e54ae42572b6eefff73513737f7dc498ce assets/byg/models/block/rainbow_eucalyptus/fence_gate.json +04fc11edf92ec535fc85bfb951b0728aafe147f5 assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json +e94c0c28a49cc81d80f80a6abc07bd71c59ad176 assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json +0aeae7db35e85059b563d880d4eb41caca9ddbd2 assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json +017355d840e88babf7adbdf44a2bdbf22068e29c assets/byg/models/block/rainbow_eucalyptus/fence_inv.json +a8b6ed6e9a6485ef65cbb8a991466ba6b71c7d02 assets/byg/models/block/rainbow_eucalyptus/fence_post.json +df7cc51a40ee5bce479eab40dcb345fd8b7b2622 assets/byg/models/block/rainbow_eucalyptus/grower_item.json +7779b1b1ef91f77510e348860910bbfbbc7a427f assets/byg/models/block/rainbow_eucalyptus/leaves.json +9947bd292c19c1847dccaf196d73132d74dc7493 assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json +997386d559898328c2c97a38f8e6d1cae5cf9652 assets/byg/models/block/rainbow_eucalyptus/log.json +7aa84e75aef7d19be26a6140bafee69904c6bf10 assets/byg/models/block/rainbow_eucalyptus/planks.json +2780e23278bfc9f17e2c6d532f21e22f91aafda2 assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json +ff633d01febf1a3e7f727ef7265f60c050b1df38 assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json +1b598d6035a40edec50c44b35bb4c493f8a72fa6 assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json +264f57a4bf03eeda5526becb979c300271607705 assets/byg/models/block/rainbow_eucalyptus/sign.json +2e8b29796f0a9eb2599b98fbea1f8b6c83ae3dd3 assets/byg/models/block/rainbow_eucalyptus/slab.json +3e03042178e6c94af39379644b167e5b2c2408ad assets/byg/models/block/rainbow_eucalyptus/slab_top.json +6dd893e9c99ba48a58cd5e03e96bb65552520492 assets/byg/models/block/rainbow_eucalyptus/stairs.json +39fa88651cb6b35f8307a84b81e4dbece0ede343 assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json +f1463fe061c97c81abcd6996acedeecde77fd7d2 assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json +d28b9af7f439fe86dbbcdd18b85b6ff2f176b900 assets/byg/models/block/rainbow_eucalyptus/stripped_log.json +cbbdb7274388b86e590dfe58c66d5021fab63e8b assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json +4b2a7c8b70903e1cca6f983525efe072a412d805 assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json +2d28d200158bde7dfe83c16b24beb57e730c41aa assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json +117d9f3407b08478b702ee0b20fb8e56e1c2bf50 assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json +d66ce0b06b6a17bce84fd0491fca384d01db25be assets/byg/models/block/rainbow_eucalyptus/wood.json +3c24c1d70e6168c162149a897a10eebdee7af396 assets/byg/models/block/redwood/bookshelf.json +aed0419291814191e6243f7363864522b29a2dff assets/byg/models/block/redwood/button.json +436be06eed78cd2ea2aa7266c210d42373ab036f assets/byg/models/block/redwood/button_inventory.json +3327c102a7274b336ea7b429a1db0ede7c0feb11 assets/byg/models/block/redwood/button_pressed.json +f5385e65ddbd928a81e282333cda846db66eacb2 assets/byg/models/block/redwood/crafting_table.json +d9c0cfe922d07423eb2c02fa55a5008e4d473d55 assets/byg/models/block/redwood/door/bottom_left.json +d4ce4f7e9b214caa0b514f391bd31b7253953792 assets/byg/models/block/redwood/door/bottom_left_open.json +f821795ecbabd32cbf632d0f3007f146d1c6e3cf assets/byg/models/block/redwood/door/bottom_right.json +78e964964043db1a5750bd6835962d577fa92d03 assets/byg/models/block/redwood/door/bottom_right_open.json +7025dc7290def5b8d5d6fef3566554a2771dffcd assets/byg/models/block/redwood/door/top_left.json +1d3c42196846f4b7f41bca1b13ff1c088c0f355a assets/byg/models/block/redwood/door/top_left_open.json +87ba66f88518473ff47440b2f8dc05dc600ae263 assets/byg/models/block/redwood/door/top_right.json +2022f5ba675569c053503ea2be334697da483226 assets/byg/models/block/redwood/door/top_right_open.json +7bf354ab54220525ced788788ca8d24a3f4a98e9 assets/byg/models/block/redwood/fence.json +b8c9796c564264b0fa3342800f71b8ca967404ef assets/byg/models/block/redwood/fence_gate.json +79b911d463f9eb023447310affd37d7ca8d31d82 assets/byg/models/block/redwood/fence_gate_open.json +7e6d552e006fca787e71970f2e46d9e4638442b9 assets/byg/models/block/redwood/fence_gate_wall.json +bb984550f86922d9c68d352dfbfd343937b6780c assets/byg/models/block/redwood/fence_gate_wall_open.json +3234c8f60229007cd99a847e4ffd368ef4d569a6 assets/byg/models/block/redwood/fence_inv.json +b2d99dada192e951ed24cfd8b76816c8f2425c82 assets/byg/models/block/redwood/fence_post.json +28ca84b67e7ce45cd3f958eaa289ff063f1655ee assets/byg/models/block/redwood/grower_item.json +213ebcc2fe8384c2b0239b8732ac4e69ee67ff2d assets/byg/models/block/redwood/leaves.json +cade209418b1b7a7ded9bafa5d219eb860b4d3b2 assets/byg/models/block/redwood/leaves_snowy.json +b5b556e42be4908424e6e42aa0e8d45c6663e399 assets/byg/models/block/redwood/log.json +a34285af6c5d3140560c00b7ea78a27ccc57f93e assets/byg/models/block/redwood/planks.json +39347133a63d6fac16fd3c70e37dc8d21883a80a assets/byg/models/block/redwood/potted_grower_item.json +ba59be395c2c9c52e1b42fc9fd26333fbef9e7e7 assets/byg/models/block/redwood/pressure_plate.json +fc647b614e571f6761d0e9b17b9b4358e65a1e04 assets/byg/models/block/redwood/pressure_plate_down.json +eab0d823c6883b3eac70cec6f1b921c7f71dd194 assets/byg/models/block/redwood/sign.json +c7e3a582aade1b9b705b1dbabff70f7e11b5d3c8 assets/byg/models/block/redwood/slab.json +db7a113dc5d76c63a1367d800e997b326a3d1312 assets/byg/models/block/redwood/slab_top.json +3da7b443aa81bed81d743f6a095c89bb9f71fc6f assets/byg/models/block/redwood/stairs.json +d4a766b917f8173ec7de05cf76ba6eb2927fd151 assets/byg/models/block/redwood/stairs_inner.json +7b93607a612d80d704cfff9e7d9335a4770e017c assets/byg/models/block/redwood/stairs_outer.json +978687f7ed39c37819eae8fc1f6b5c9116b886b1 assets/byg/models/block/redwood/stripped_log.json +df891d8a52296327c508010080cf99fda26a245d assets/byg/models/block/redwood/stripped_wood.json +6e1f062d8c64e1bcefd9a439d714354aceb0168b assets/byg/models/block/redwood/trapdoor_bottom.json +8d2965adf87b4a984d2cef6dafe48d4d3b4473e5 assets/byg/models/block/redwood/trapdoor_open.json +f03fa2a43852307901cf89f69134e461097c809a assets/byg/models/block/redwood/trapdoor_top.json +ee3c61dfb275cdca0e863f83f5152ab776a8ee0a assets/byg/models/block/redwood/wood.json +e2d940e66cab6957725d4a68a3bad0f8c4331eee assets/byg/models/block/skyris/bookshelf.json +9b95ee2c0b062576628e10a21c78b78856ee58b9 assets/byg/models/block/skyris/button.json +14ee619b311928083b187353180bd283d22d8447 assets/byg/models/block/skyris/button_inventory.json +cf3b7349b9fe2561566fee1590823b302754ab8a assets/byg/models/block/skyris/button_pressed.json +571f5e0180c7dad398411e568a61f9f35cce2913 assets/byg/models/block/skyris/crafting_table.json +c91970cbaf6c693db9ed3cc39cc40238ca9f2948 assets/byg/models/block/skyris/door/bottom_left.json +0a0a3f58d48963b346697f7deee5962704696a42 assets/byg/models/block/skyris/door/bottom_left_open.json +3ae51c82a9facbb5cc2480483a0e9b5bfd7a8e4a assets/byg/models/block/skyris/door/bottom_right.json +bfe247d554243125548956d98755a5874f727c97 assets/byg/models/block/skyris/door/bottom_right_open.json +66fc5f1177ef405a2f598aaefd70c8fc1ee105ad assets/byg/models/block/skyris/door/top_left.json +6cb48dbd2cecab435751988816d8e5ad40c24e76 assets/byg/models/block/skyris/door/top_left_open.json +e1acb276be662e45a21fcb5013b60c8be84b47f9 assets/byg/models/block/skyris/door/top_right.json +ab74ef657ba8ee0216dbab4d305e108c2019b61f assets/byg/models/block/skyris/door/top_right_open.json +5f81ed07e9c45247ae7ca240f143ae52788fcd6e assets/byg/models/block/skyris/fence.json +dc1e7cbed7c7b2791d24c86e67de91a397018edc assets/byg/models/block/skyris/fence_gate.json +f7768585c74e1cabe1d3fc27c73c839160fc269c assets/byg/models/block/skyris/fence_gate_open.json +925730bfbb546e9a1293dcac7fc1549bfd08dd39 assets/byg/models/block/skyris/fence_gate_wall.json +4d1f6f82bbc69174cc5e739bfed5b8d9957a45c3 assets/byg/models/block/skyris/fence_gate_wall_open.json +1eaa31dce56d95aee453356030436d6e3de20792 assets/byg/models/block/skyris/fence_inv.json +d71a172c8e72a91159f7d79a4ec856117e60cc4d assets/byg/models/block/skyris/fence_post.json +e1416bff9f5dccecf9b0eec51973e79ffd8f9cd0 assets/byg/models/block/skyris/grower_item.json +55da22f4c03f047ef7c07cffc835214af34b3ecd assets/byg/models/block/skyris/leaves.json +7ccab9d1ba77ff41f1000ef8c51c0ed77526fd4f assets/byg/models/block/skyris/leaves_snowy.json +f6f82218da66db313dc9e85025cab13c9bfccfab assets/byg/models/block/skyris/log.json +1d1db24225c817047893b3587a77bcec2acfe174 assets/byg/models/block/skyris/planks.json +4aaf68299f84cfd00657a135eba086b7e1bb7000 assets/byg/models/block/skyris/potted_grower_item.json +401e48ee4a825a71745e09493e585a78af9f55d3 assets/byg/models/block/skyris/pressure_plate.json +413e395350918800d36658fa98a5df5342849488 assets/byg/models/block/skyris/pressure_plate_down.json +976febc22f6536a1a87cc4f0b25437cd6a7c79c8 assets/byg/models/block/skyris/sign.json +d88df67a2534753232364891f34754cdac089903 assets/byg/models/block/skyris/slab.json +32b61ea42ecbe391d18c28c669eb848df4a7dd96 assets/byg/models/block/skyris/slab_top.json +5ba9d7eb47cd126c168e92be6cc45f42e5410bef assets/byg/models/block/skyris/stairs.json +ea8fe1f17fbded019ec08ccfa8b661662860a6f4 assets/byg/models/block/skyris/stairs_inner.json +b37030875edb0be55a33daaebce2e4378b74ac91 assets/byg/models/block/skyris/stairs_outer.json +39ca98eebeec5c713356df99bd43b5a9460b0d9f assets/byg/models/block/skyris/stripped_log.json +4fa98b32e81a1c2da2e7579d630d4bc1da84cf14 assets/byg/models/block/skyris/stripped_wood.json +46f2eb62044633f5111b3e45f39f3aa1df140c09 assets/byg/models/block/skyris/trapdoor_bottom.json +8d088a7c8af1799c03d3dd50b32c3892fd9e6325 assets/byg/models/block/skyris/trapdoor_open.json +d5d3dbb642bf6717b6836c6da021418d1f866916 assets/byg/models/block/skyris/trapdoor_top.json +9b8ad903afa1083bf782d5687dd2250982badcf6 assets/byg/models/block/skyris/wood.json +09712579654d130c1853ca65c2d67f175b5dbe3f assets/byg/models/block/sythian/bookshelf.json +19d67b8b669558a43e13393a0a89641ffb47fe66 assets/byg/models/block/sythian/button.json +b12b5ba5943ebc17dcfe4fe1c4a79acef12101b1 assets/byg/models/block/sythian/button_inventory.json +157569cdff3d1b2ad4a5e83ab2dc788f8f7a3017 assets/byg/models/block/sythian/button_pressed.json +1b0d1546faadac707861490111bfb8611417a899 assets/byg/models/block/sythian/crafting_table.json +a1d8606c5f6bbeb70f842bae6d7c33a4504cba5a assets/byg/models/block/sythian/door/bottom_left.json +944a7483db46963e003e7e7fdcfe107fc93c7090 assets/byg/models/block/sythian/door/bottom_left_open.json +9e4d15a4f7560eae2fd05865eddf5766cef55704 assets/byg/models/block/sythian/door/bottom_right.json +615b5b552632d0a25a45b54162631b48190ffb15 assets/byg/models/block/sythian/door/bottom_right_open.json +acc74a3646bb5b828d18d0ba6ed6905523fed166 assets/byg/models/block/sythian/door/top_left.json +05da1dbbca22b0500080584536bea2aed34001cc assets/byg/models/block/sythian/door/top_left_open.json +e89e6b416dc273beefe51f456ceec3644556bc09 assets/byg/models/block/sythian/door/top_right.json +c2185649d3739bab60d51f58e666ce49815d8b7e assets/byg/models/block/sythian/door/top_right_open.json +d3f6e951eeb7a4ccd6dbe25833f297a1ab33db19 assets/byg/models/block/sythian/fence.json +3eb89c60c4de0c06bed3f50a1d40616fa8f509f7 assets/byg/models/block/sythian/fence_gate.json +5fac54bc58af183ec2baca0153bc250d4bf90c55 assets/byg/models/block/sythian/fence_gate_open.json +e2b85532e0d72968ba5b32711054d605378d080f assets/byg/models/block/sythian/fence_gate_wall.json +43ceea3139a85daa2f8608116f74521c1a49171a assets/byg/models/block/sythian/fence_gate_wall_open.json +d05c0fa90289cdaa21b45e3eea00891d5439459e assets/byg/models/block/sythian/fence_inv.json +e2a35351b7a549bd83553dea816e64bb55e2c7a8 assets/byg/models/block/sythian/fence_post.json +9e1487b5621fe66a147b17438513d3687adc07fa assets/byg/models/block/sythian/grower_item.json +4323f7942c1099dc9cdcb18196cd0196ef14fda9 assets/byg/models/block/sythian/leaves.json +14a483be4a817ee38bdd763c4b160f9628798ef8 assets/byg/models/block/sythian/leaves_snowy.json +8d8968a7559a68bdcad6da029d1ef256b0055ee2 assets/byg/models/block/sythian/log.json +e76b26064ec37f50be47222ce684af9c82db4ab4 assets/byg/models/block/sythian/planks.json +5e9be3856ea2761ab79955ace6904d99a69065d2 assets/byg/models/block/sythian/potted_grower_item.json +4809f7391b9ed240a4e728f1db4bcd1353af582a assets/byg/models/block/sythian/pressure_plate.json +63d18dba4b276b8e1cedb4a5fa9c7b835c1450be assets/byg/models/block/sythian/pressure_plate_down.json +bef613812412b11e4557d9e3726bcaab1d230cd4 assets/byg/models/block/sythian/sign.json +8d8936234629e56a2505e259db247083c94e4f95 assets/byg/models/block/sythian/slab.json +1a79e502f1f46b8aa26ddf89f60aeb1c9cc1fd68 assets/byg/models/block/sythian/slab_top.json +0872e4d045c11b20175beb3bda39f6c237aaf8d4 assets/byg/models/block/sythian/stairs.json +d96cf6c94c87e6de90c3d0466d136b65b14f4ba3 assets/byg/models/block/sythian/stairs_inner.json +0e3e8ce5d0d48e781ed787e6035bf972907e2a94 assets/byg/models/block/sythian/stairs_outer.json +af0e8e2b909cc37b92828562d1bcbc60a08a540d assets/byg/models/block/sythian/stripped_log.json +e6dcedbb013d1527c70a2907c93991d4a24cdace assets/byg/models/block/sythian/stripped_wood.json +6f5a19ca9c5db4c8f7c28fa9369f4ef30674aa05 assets/byg/models/block/sythian/trapdoor_bottom.json +e2569103725a242d2c40bab12a65dadc951e032c assets/byg/models/block/sythian/trapdoor_open.json +420794f67b54d9bc5b99306e8f5e1581e2111b22 assets/byg/models/block/sythian/trapdoor_top.json +beca144c6ba07d430d6753f3784ec03197d1ceb2 assets/byg/models/block/sythian/wood.json +b5eb55bcbae738c1610ae4ea0afce20c4a8801bf assets/byg/models/block/willow/bookshelf.json +6e81b78225224d0c7ad4e4684eb07af84427d625 assets/byg/models/block/willow/button.json +a1b67539c14d2d77221e60c48a78996343f59046 assets/byg/models/block/willow/button_inventory.json +e2736e8333cd91cde8571abc1465d6501d198188 assets/byg/models/block/willow/button_pressed.json +ad1dea0d1a3140dfdb1ee9bfab4dcd7753d7434c assets/byg/models/block/willow/crafting_table.json +10d8597d12378adbbf2bad8a381e51585ed27144 assets/byg/models/block/willow/door/bottom_left.json +ab1c685fecbe702459dead6b0a8ca2af5961ec4f assets/byg/models/block/willow/door/bottom_left_open.json +8e1e1ce7e4bb405e669cde8ff5c8784c807ce96e assets/byg/models/block/willow/door/bottom_right.json +7d64d75e22e8bc8ad1179b93e3ff18ee3f830efd assets/byg/models/block/willow/door/bottom_right_open.json +19558889a6db4ab689a9acc2ce53fbbf4ef2ab51 assets/byg/models/block/willow/door/top_left.json +c166078fc293cb1e3b31cfb8d8d2a4c08a4fa41a assets/byg/models/block/willow/door/top_left_open.json +4324960dd38d023f99f12f4eac1f3912d68f3a44 assets/byg/models/block/willow/door/top_right.json +9dfa9f4e6cc351cb0f242dee22a8003bfc2f814b assets/byg/models/block/willow/door/top_right_open.json +0e11e6ebe3c88fd9310a00a72861e873da26c964 assets/byg/models/block/willow/fence.json +14744f433b238ed7f1b8a95509fb982a54146a47 assets/byg/models/block/willow/fence_gate.json +204971b8937d4c641df82fd15bae4edff5443367 assets/byg/models/block/willow/fence_gate_open.json +e41c750c5451a2863afcca4a461df1e4144c0f2a assets/byg/models/block/willow/fence_gate_wall.json +bed6c874f9c813e94a244c6192225599434b593b assets/byg/models/block/willow/fence_gate_wall_open.json +0e7d7c3ef9a3dae35efa8e9a4dba6e69a95aec41 assets/byg/models/block/willow/fence_inv.json +c415fa1ff62f86b597682fed335ef79e4b15a0db assets/byg/models/block/willow/fence_post.json +df863fa6721b152c49e88f294b7c90f50999d44d assets/byg/models/block/willow/grower_item.json +c53f450a87aef83c6069d6507fffb6d514125e77 assets/byg/models/block/willow/leaves.json +1fb90e9adf8647bdd80d0629e59aaa1ab72149e2 assets/byg/models/block/willow/leaves_snowy.json +cca641308f02e38d4cbd3f460e01edb88c30fac5 assets/byg/models/block/willow/log.json +d4c686f674d986ac55f257327d606cfb36a649d1 assets/byg/models/block/willow/planks.json +8b46445f5d6eecf765f6bc2026e74b804638877d assets/byg/models/block/willow/potted_grower_item.json +df2a096340989a25ea9e48c4f512d4e8872a0bb6 assets/byg/models/block/willow/pressure_plate.json +3eb69b11be6983ee753abcbde4fcc6d067c0adf2 assets/byg/models/block/willow/pressure_plate_down.json +ad854d09bbf9fbfc271370954d5b0b59521aefac assets/byg/models/block/willow/sign.json +4de38c89669488acf4027e5e1295a3d1d3b0aa1d assets/byg/models/block/willow/slab.json +658657d131dcce87bc7b9a9a4d2f23f5f9d4a062 assets/byg/models/block/willow/slab_top.json +4aa4d2eac93c5e08a0ac84ce9f3c4897e5ee027e assets/byg/models/block/willow/stairs.json +014a9fe03b9036b64eba4331af2bd23472b69fde assets/byg/models/block/willow/stairs_inner.json +1aa9221ed937bbe064d59311d4067da728e98538 assets/byg/models/block/willow/stairs_outer.json +12e0725f4a648c4df61d5bbe3e12b54491139906 assets/byg/models/block/willow/stripped_log.json +3cd06bcc45d46673729e5ba1fc6c07ffe6fdbb47 assets/byg/models/block/willow/stripped_wood.json +c0236e6fc214aa09a6770f25b87155ad48e21c12 assets/byg/models/block/willow/trapdoor_bottom.json +6230d832f43bd7e5ed759fd2a4364155e76aee04 assets/byg/models/block/willow/trapdoor_open.json +920b2994e4afee66f3b938888f41f9064751cb17 assets/byg/models/block/willow/trapdoor_top.json +e43ba7525acdbcac88f6cf09605a524aff60d99c assets/byg/models/block/willow/wood.json +49ed0fd5bdefb444a241e6d080ccf8385ec87c6a assets/byg/models/block/witch_hazel/bookshelf.json +c4f46378da193ede0548821587bee6e8728892d3 assets/byg/models/block/witch_hazel/button.json +60dc5352b1445ab305ecc3de298eb31f5d22a275 assets/byg/models/block/witch_hazel/button_inventory.json +45e4d496377e7f05e3b5017601227a8d13967975 assets/byg/models/block/witch_hazel/button_pressed.json +ddd76484b603d87511676b76c6f143625764cd97 assets/byg/models/block/witch_hazel/crafting_table.json +9c1e8aa0a9ca03e97a03b690870b4dadd80993c8 assets/byg/models/block/witch_hazel/door/bottom_left.json +63222e3466fa29dcd010bf59a80215b76ab32a4d assets/byg/models/block/witch_hazel/door/bottom_left_open.json +e4873c722d1dfbde545902ee4c9a8aa323681693 assets/byg/models/block/witch_hazel/door/bottom_right.json +26998db2db1741abd72aa9778b770bf284952675 assets/byg/models/block/witch_hazel/door/bottom_right_open.json +11a9e6944ea913e9bf4641e57f10eb6111ca248d assets/byg/models/block/witch_hazel/door/top_left.json +a6ea66c6a4d3e1bd5e54029f5101de9d9db596a2 assets/byg/models/block/witch_hazel/door/top_left_open.json +d3a43368f93111614e63e6b9ec9415d39d5cb33e assets/byg/models/block/witch_hazel/door/top_right.json +17677400376652b9d902b7897959c61b0b53ff83 assets/byg/models/block/witch_hazel/door/top_right_open.json +0bedda7e4c04e59085d4ddc8516c26d0d1509e31 assets/byg/models/block/witch_hazel/fence.json +8e3de724ccac72bb3a3bc71cb43a64d3d2449412 assets/byg/models/block/witch_hazel/fence_gate.json +ad7b76f54f3a54e9d24941bc3184ec076eee0120 assets/byg/models/block/witch_hazel/fence_gate_open.json +23cbd603ed0be51477ee3a18a5956de536903ce5 assets/byg/models/block/witch_hazel/fence_gate_wall.json +ea2314c05a035b0558926d4c3c2f251c64757266 assets/byg/models/block/witch_hazel/fence_gate_wall_open.json +cac519c3ffd28d65387da45a3fd2de03deed61fd assets/byg/models/block/witch_hazel/fence_inv.json +de93835895d592ab8cda8f6d74f6105ba59e5086 assets/byg/models/block/witch_hazel/fence_post.json +d2d1cdc797dc6b73439a0b6a85a36d1a6d7adc1b assets/byg/models/block/witch_hazel/grower_item.json +7e87c5ea9424bf5c2304f0fa2904ae129908ebc0 assets/byg/models/block/witch_hazel/leaves.json +c7dd4986d32cc5ccb6225d78f7808952eebd6e40 assets/byg/models/block/witch_hazel/leaves_snowy.json +84896f19b4c91ef2ba6eed2a5b4216d0704a0bb5 assets/byg/models/block/witch_hazel/log.json +015d3cdbf0d144debcd07a2d77c316ea5996f909 assets/byg/models/block/witch_hazel/planks.json +fae2d1d7ecea4fd53a7f1b705357fe8e1ac9bea7 assets/byg/models/block/witch_hazel/potted_grower_item.json +55cb4a2c24a70f30954c2280472ee787145b85c0 assets/byg/models/block/witch_hazel/pressure_plate.json +fc937a3e8c2ebb6aae9c01ed5237d83c6c214b3b assets/byg/models/block/witch_hazel/pressure_plate_down.json +2c9ac88ff718b1c13678d039d95ed04f594b575b assets/byg/models/block/witch_hazel/sign.json +389eb18be5406f8d837e339b6c5713fb131e66e0 assets/byg/models/block/witch_hazel/slab.json +b6853df861c373ca9fdcbaaf230dfd7762ea7a01 assets/byg/models/block/witch_hazel/slab_top.json +80b7966cc8a394cae98262bf3969a367cbe39b84 assets/byg/models/block/witch_hazel/stairs.json +3400d23f81f1513a798dca2b53f99a760172a686 assets/byg/models/block/witch_hazel/stairs_inner.json +8b854631d1a9bf9a36b49fdea244c92dc452a77d assets/byg/models/block/witch_hazel/stairs_outer.json +e484718e3cb3c68a85807bba0a86b126d896824f assets/byg/models/block/witch_hazel/stripped_log.json +a7309f84647fc093929401b2d894831c0036e732 assets/byg/models/block/witch_hazel/stripped_wood.json +99c47ad7d3525873d17e066ae85017232c1d73bd assets/byg/models/block/witch_hazel/trapdoor_bottom.json +0dd7120ceb2d9b873f0c2c99e3f0be9b09272866 assets/byg/models/block/witch_hazel/trapdoor_open.json +86bd1805369ae14d41bc9ac0b04be68ff2203713 assets/byg/models/block/witch_hazel/trapdoor_top.json +3a1d3d01aacef73c102f37ae6288eb778ca1d36f assets/byg/models/block/witch_hazel/wood.json +2f81019f5a5a4acd0dca3bb90f33aff7b57e9635 assets/byg/models/block/zelkova/bookshelf.json +97211d373e7176b51295f6fae1fe240cbb23fcab assets/byg/models/block/zelkova/button.json +27a96f2c79060e7c6e6dd51b6c294028d46ceba6 assets/byg/models/block/zelkova/button_inventory.json +4228607fade64471ae214cabb712952e6783cfed assets/byg/models/block/zelkova/button_pressed.json +e4bb89baca3aa42ed71bdb93145ac2d60e0ea75e assets/byg/models/block/zelkova/crafting_table.json +0f6b4ac592d61ba0dc555253be1cc8d5a8dfcccc assets/byg/models/block/zelkova/door/bottom_left.json +7d0d354dd666bc1b4502f4b441c79f88067dc06d assets/byg/models/block/zelkova/door/bottom_left_open.json +823830a21963dc600d5dd5fb653e3801cd7f3a5e assets/byg/models/block/zelkova/door/bottom_right.json +ccee9fbc087ba8b0d8ffae822b63d60175b9e9d2 assets/byg/models/block/zelkova/door/bottom_right_open.json +43a3be33c058b764a777a7180c77f3d463858d58 assets/byg/models/block/zelkova/door/top_left.json +bab44c2a4b301237f335168c1ab7e6adce899800 assets/byg/models/block/zelkova/door/top_left_open.json +aa6094ca160d09a68c586b4e1facad63f77e5dac assets/byg/models/block/zelkova/door/top_right.json +d43ac29f21c9b100f33f65b25602d8480d8e036f assets/byg/models/block/zelkova/door/top_right_open.json +ef09f667e341ee6dc16983be0b04b94ca9c7c148 assets/byg/models/block/zelkova/fence.json +4d5e36a0812a36a6f6396327b31138c2e0d9f2e2 assets/byg/models/block/zelkova/fence_gate.json +bee9ee2917d06347c4d9c613336d2eb4e4cbd745 assets/byg/models/block/zelkova/fence_gate_open.json +41c65b03d9a14ab6f85622a9e5d4ef545f3e0405 assets/byg/models/block/zelkova/fence_gate_wall.json +b2dde279b46c81923da6141f163a329bf421040e assets/byg/models/block/zelkova/fence_gate_wall_open.json +297bd38c3f7bb80ecb1d9b187deb60e20a1f27e5 assets/byg/models/block/zelkova/fence_inv.json +49e87bebb1292436f034d8b681d2b6680bb80e8b assets/byg/models/block/zelkova/fence_post.json +89333ac7a4a16da6013e345899b89d9fdb456e5a assets/byg/models/block/zelkova/grower_item.json +dccd622294520b4f91f2df269886aed301393b0f assets/byg/models/block/zelkova/leaves.json +8da09d7e0d4129450a612864f6f52d1d94466558 assets/byg/models/block/zelkova/leaves_snowy.json +624b03dba57b39b63a82049260e0ed42dfe2b658 assets/byg/models/block/zelkova/log.json +2b8bb89a8c69ea40bb58d531a9829f5137185f1b assets/byg/models/block/zelkova/planks.json +547c655acbd329feef88d77e42415fa9cbe693e1 assets/byg/models/block/zelkova/potted_grower_item.json +8941134678687b4414d34e5132dbfb8a3f384195 assets/byg/models/block/zelkova/pressure_plate.json +ca13daccd4ecd42c90092ce4a01a0529698d2f07 assets/byg/models/block/zelkova/pressure_plate_down.json +2e712b9a788d22225fe0832cf842856fd7e546b4 assets/byg/models/block/zelkova/sign.json +2c1be07279695e57e3887eedb18433f4096b9a3a assets/byg/models/block/zelkova/slab.json +2e47d17b4b70ebe9afa9e141d71a24786e0eae72 assets/byg/models/block/zelkova/slab_top.json +1c90e52d1ee963c58da15ebd9dc378ca90b44940 assets/byg/models/block/zelkova/stairs.json +581ab6573c9ebea3e6b48804d36d3871ebab459c assets/byg/models/block/zelkova/stairs_inner.json +a9aefb0fbe9c22fd59819a4ff957169f4c8c597e assets/byg/models/block/zelkova/stairs_outer.json +83cc7bdc818f93180555ad766a725cdec872d759 assets/byg/models/block/zelkova/stripped_log.json +0e6af6eff5f773da8b6f345e36ccebae98d5ae7b assets/byg/models/block/zelkova/stripped_wood.json +64ca2e85d424d428569e3a8e737dfd938915f8f3 assets/byg/models/block/zelkova/trapdoor_bottom.json +81f6ad4f36f2b3e4685583c09431e8d88f7569b5 assets/byg/models/block/zelkova/trapdoor_open.json +995154689030e80f78a064f516999b32279d59c1 assets/byg/models/block/zelkova/trapdoor_top.json +298011c2cdd930b214f818e27c078b1f1b738e9c assets/byg/models/block/zelkova/wood.json +c59c855c3483e035418477735162f5f4d4103938 assets/byg/models/item/aspen_boat.json +e96931125953adc2b0ad974bf8a12f83a9b9bb22 assets/byg/models/item/aspen_bookshelf.json +12632c54b037c77111f016aeed7b652fce7d73d1 assets/byg/models/item/aspen_button.json +e725a1e20779c70ce2a4f1dc18fc1d1bed5acfc6 assets/byg/models/item/aspen_crafting_table.json +0b3ec950f14d389b261a059cedb1f30e026b1391 assets/byg/models/item/aspen_door.json +d326011ab1ea5a4684d82c620119d165eaf1d83d assets/byg/models/item/aspen_fence.json +fccd81e9f5c8cd5e13f95f37d0bef68f8724b34b assets/byg/models/item/aspen_fence_gate.json +1991fa0d31d725d114296237865edd57a4fd3dd7 assets/byg/models/item/aspen_leaves.json +5ea2c7458f2fda13a21c440c19b512b7aae09587 assets/byg/models/item/aspen_log.json +20843bfad3ab2f66c7006bfe1b55d8a6c72e19aa assets/byg/models/item/aspen_planks.json +d11d0a53e7c0164465ef09f906cdfaaa0daf040e assets/byg/models/item/aspen_pressure_plate.json +4c9e841c0011ac64b27ec7fa3464552c64aab0cc assets/byg/models/item/aspen_sapling.json +9a825cf5f522f6105b355c5f6babfc79bc5f4933 assets/byg/models/item/aspen_sign.json +d7508bf61e805a13c7bcb0a9ad44a49df13a38ca assets/byg/models/item/aspen_slab.json +520bbe7f995e2650b0f352d488c2e6c82dade826 assets/byg/models/item/aspen_stairs.json +8fa94773ddb7f53a58b122754038be1a5977b359 assets/byg/models/item/aspen_trapdoor.json +2bce14b50a5218af27b70ff3ae9ded8cb1475721 assets/byg/models/item/aspen_wood.json +28c81ae4ccc02932558d23ebf6387a2da91ca949 assets/byg/models/item/baobab_boat.json +b0f851bd7aea65fb888a86ec392cc885c7084c2d assets/byg/models/item/baobab_bookshelf.json +c525d38320a839e38ccbfffd63605290b9a84e39 assets/byg/models/item/baobab_button.json +74c4b8669c2beb1c6b513b61b368c602427a38c9 assets/byg/models/item/baobab_crafting_table.json +7df3cecd4164bc80073e2621edb6e4b3931f8952 assets/byg/models/item/baobab_door.json +ef9d9874ce07c1acb41c63d2e6359b1707c959fe assets/byg/models/item/baobab_fence.json +4e902050818d413e01cada88fe712ed2cb5f6341 assets/byg/models/item/baobab_fence_gate.json +5350aa6c919b33c00839a221feb914b213358cdf assets/byg/models/item/baobab_leaves.json +e3b57eeb5830d2923c8ec943ec38fa26a913b722 assets/byg/models/item/baobab_log.json +9d5b99bdbd9ed13dfb9abe7b04c2d35846914c24 assets/byg/models/item/baobab_planks.json +1183cca9bc426541bf420c37c573bd311d564676 assets/byg/models/item/baobab_pressure_plate.json +5538b4dec08bb8bcb88a00f5a96d2e03063faecc assets/byg/models/item/baobab_sapling.json +0fa378e82e79763f4e03629d58676bb163dbb4af assets/byg/models/item/baobab_sign.json +bbd2777ed96340acd433dcf7007eafac23a10c9c assets/byg/models/item/baobab_slab.json +0181f86284e1c983747a0c12ae6d5d40917cca0b assets/byg/models/item/baobab_stairs.json +06e9ec29dd169bef51ab4f18c060ecbb33a6f574 assets/byg/models/item/baobab_trapdoor.json +f677bfb55ac1d959fda1d4265b27d5a60f4846fc assets/byg/models/item/baobab_wood.json +9cb2a1e703a5fc6f58121c27bd830057980bb64c assets/byg/models/item/blue_enchanted_boat.json +27d44c7d76f36dd12da6727e2f5da82787e78834 assets/byg/models/item/blue_enchanted_bookshelf.json +9631471e7d7d783f7a166372161741e69197f2a5 assets/byg/models/item/blue_enchanted_button.json +376e1d1ca1eae0282e94afff58aa000e515b238d assets/byg/models/item/blue_enchanted_crafting_table.json +0529ad13e4e368eafeb40a7a4e1e7a84b7c90e07 assets/byg/models/item/blue_enchanted_door.json +5b95ee500f2fd4d0fbc8628bff240da4a4f5c272 assets/byg/models/item/blue_enchanted_fence.json +4a05a8812edfda258c7137cd6a6c3bcc2ab9db43 assets/byg/models/item/blue_enchanted_fence_gate.json +454918d623bbfff33958f1976f4ef9dd61abd03c assets/byg/models/item/blue_enchanted_leaves.json +47eab31b4b97aaba8cab55ba5eb69b4aa6fb2430 assets/byg/models/item/blue_enchanted_log.json +3d3afee5062b4ebe87ee9141371ba38d65eb1c7d assets/byg/models/item/blue_enchanted_planks.json +904c20c313e8d0fb74c244710457f687d59ed3c7 assets/byg/models/item/blue_enchanted_pressure_plate.json +cd3c4c7b1997b6e7b0b0fcc8fc64a41e83fc49c7 assets/byg/models/item/blue_enchanted_sapling.json +f6dd565221420ea837358a3413204d4b44c01dec assets/byg/models/item/blue_enchanted_sign.json +c3b9b572abbf592f3d7277eddd8f2b9adf42b27f assets/byg/models/item/blue_enchanted_slab.json +d63c47b2b98ab4656adef6cc95ed18d73830b6dd assets/byg/models/item/blue_enchanted_stairs.json +602ce25bdc2fe229d0f32fc3ad42eb337b93f2f6 assets/byg/models/item/blue_enchanted_trapdoor.json +3c0a24149b24dc1ab55362d852f98b01086e739f assets/byg/models/item/blue_enchanted_wood.json +5876dcd6236b2fa81e75119b7858ecfe4b203d50 assets/byg/models/item/bulbis_bookshelf.json +74c13189b9803f3026d6e952fd47ab0730cff98d assets/byg/models/item/bulbis_button.json +b922a925597194f57b6844b7059c480200bb929e assets/byg/models/item/bulbis_crafting_table.json +683000213ab14f44895233e16f374349e18bbb68 assets/byg/models/item/bulbis_door.json +8c419365b7c0ec91122505b8ef8415df4a9ba485 assets/byg/models/item/bulbis_fence.json +53d03d51f8f80fd29aa9706b8c437b0892b57404 assets/byg/models/item/bulbis_fence_gate.json +4c865d8967cdc2cf36a0df25455f5490ee0381e7 assets/byg/models/item/bulbis_oddity.json +a86ae289b8667be6f48b8865fac5b8c7f839e3d7 assets/byg/models/item/bulbis_planks.json +7a47ffbaeae42fdda1185b5aef9628ceebfa9a0a assets/byg/models/item/bulbis_pressure_plate.json +56e98a868c5e5e6d77ba5509e42affa107c14053 assets/byg/models/item/bulbis_sign.json +5303d898805174e4b036ea85679fd6997368f6cc assets/byg/models/item/bulbis_slab.json +d0df91517ada9cecac47d3292d63e35a82b77f01 assets/byg/models/item/bulbis_stairs.json +ea9349be9b7fa1d9b68233e401ca244e39852758 assets/byg/models/item/bulbis_stem.json +f93bdf76f16bae610a14d6ad1413d46d5aba20d9 assets/byg/models/item/bulbis_trapdoor.json +f3eb0d95e6ef540f149441e2f2a5ff4df358b4b3 assets/byg/models/item/bulbis_wood.json +0338b9d21df15265386e2e74b1b05a3fb772b18d assets/byg/models/item/cherry_boat.json +b8bd9752e1a8dfc7c2ea221ce18e3bbb9ab179da assets/byg/models/item/cherry_bookshelf.json +5440442dd6330f31e015d4c51da29540249e1e3f assets/byg/models/item/cherry_button.json +ab320be074dcc65bd316de9430d7720a63ceaeed assets/byg/models/item/cherry_crafting_table.json +b11953ee072f2acd58041a97e611e8a535a0ef28 assets/byg/models/item/cherry_door.json +d3ef396329e3ad4caee9add9bba84991eaf957e8 assets/byg/models/item/cherry_fence.json +7a03b39987f197a61d4135a6bf0a4c470e2a1a23 assets/byg/models/item/cherry_fence_gate.json +597af9e5745da3d7c1955bfe9525f6088fa3ae35 assets/byg/models/item/cherry_log.json +321769a1e1c70dc2464d1fed19b269788b256519 assets/byg/models/item/cherry_planks.json +7db6a4616a2bf534ffc49ccb4560f8e66ba97941 assets/byg/models/item/cherry_pressure_plate.json +dd2510810465792b669b68914198813d956e012d assets/byg/models/item/cherry_sign.json +b34e0575167f1bd1194ddb2a3a202dfb099d5226 assets/byg/models/item/cherry_slab.json +a3034f75cd64912a17100a7fadaf37219b61ec61 assets/byg/models/item/cherry_stairs.json +cdc05adc778cb02d14130fee39581afed4e26cb2 assets/byg/models/item/cherry_trapdoor.json +fa6e7c95d9624c1f105b033e7f7864332b99dec2 assets/byg/models/item/cherry_wood.json +bf2612a476098b8cb45a8b535446f76708eb217a assets/byg/models/item/cika_boat.json +8b2b47ef3312fcaa97a1c89ae5ea20f53f2f968c assets/byg/models/item/cika_bookshelf.json +762b8f8c3b1467aee1a3138819dd9774398fb2cb assets/byg/models/item/cika_button.json +bf697df28c12215daf182b96ffd3d1fee8ceee70 assets/byg/models/item/cika_crafting_table.json +d9e9d097456b81df9a10ff57aef1705771b9bcfe assets/byg/models/item/cika_door.json +967fa383ec44f9d9c163a3118ad0467c9010580b assets/byg/models/item/cika_fence.json +6e34e882a73ac1444095026bb4d7b86171480b68 assets/byg/models/item/cika_fence_gate.json +6b780cc463d1c8ce49a84675ac3ce2ee57958acf assets/byg/models/item/cika_leaves.json +cfd6f0d48f63106b657abaccf0b9d552cf44794d assets/byg/models/item/cika_log.json +de1f4b3f02a53a87731dc1a3d083564c1e6a8c55 assets/byg/models/item/cika_planks.json +a7388781b9a8316b3b5102f7420de6aef235fe14 assets/byg/models/item/cika_pressure_plate.json +f22d2f09c9d601e77ae08375ba361349fd4a985b assets/byg/models/item/cika_sapling.json +17f0cff2d861960c9022a2a0b793e909925d1309 assets/byg/models/item/cika_sign.json +c0db6f399cd3411ef003a94ff670b11d6aec6d33 assets/byg/models/item/cika_slab.json +75ca61d4a63cde58dee9a166f48120708d1be569 assets/byg/models/item/cika_stairs.json +00b7cdf959a5d0fccfb5bb603fca41f5ac6cc6c0 assets/byg/models/item/cika_trapdoor.json +0fbe155b335077af4ddbbce005ff5f039f179e8e assets/byg/models/item/cika_wood.json +44b0be5c987b832571a4643020525d80a448c4bb assets/byg/models/item/cypress_boat.json +52497b715b4e823e7676a51ec7018cb0fbe9ec64 assets/byg/models/item/cypress_bookshelf.json +0fa40a7795607c2147297bed8dea901b88789583 assets/byg/models/item/cypress_button.json +0d98b6d0c1f47c4f97c529127dfb2eef3853bd18 assets/byg/models/item/cypress_crafting_table.json +b98b28521d55c50ec61eb4aa87c983ef6120e131 assets/byg/models/item/cypress_door.json +6ea5b4298750d5fef7183291d5e94e50cbea7ee0 assets/byg/models/item/cypress_fence.json +7b06fdfe516eb768984d428e10b7faec86e22be7 assets/byg/models/item/cypress_fence_gate.json +d7b7c2f0c6adcd6a6f95abdeb680f27633092c83 assets/byg/models/item/cypress_leaves.json +96ca54cec0c46c3dc231969f08d43664f04c420c assets/byg/models/item/cypress_log.json +29572a3cb60683e5dd9a8df5b9dc37da4ec45a0e assets/byg/models/item/cypress_planks.json +116fa10c12536e8e0b306903c38ff226a3d6ecaf assets/byg/models/item/cypress_pressure_plate.json +26cf3b817f143e94c38c5fc4c318a49a105e534e assets/byg/models/item/cypress_sapling.json +60eaa177bd8268571d1d9765f7bbb974a76aa6d6 assets/byg/models/item/cypress_sign.json +b4968aec16102adaf1485ab2100310ae43b43868 assets/byg/models/item/cypress_slab.json +4796775123772ac51beb12e259a968247c28cc43 assets/byg/models/item/cypress_stairs.json +3a102c72b3d1f3d471492b5c32cf4e55149051ba assets/byg/models/item/cypress_trapdoor.json +b3c4533a5523f0ffe7e27042109f3acd98002a65 assets/byg/models/item/cypress_wood.json +974844f5a6b29496c7a1bdee35ffb5b8073cac89 assets/byg/models/item/ebony_boat.json +46a5e1737d14b5a31508f62029aac921af3b4d03 assets/byg/models/item/ebony_bookshelf.json +9c4e38d9e89f48da6e1afa5828e5fb84d813ae2b assets/byg/models/item/ebony_button.json +31a04ee1fcbb30e75468a2959a0106c843863f0a assets/byg/models/item/ebony_crafting_table.json +565544fff962143e7d8a976428f3f4cae9c9ebca assets/byg/models/item/ebony_door.json +cddf60768c51ec39484fc40754fa2e977ac34a84 assets/byg/models/item/ebony_fence.json +f3f8719a4dd990361ea97e4e02ac7fa117bc14b5 assets/byg/models/item/ebony_fence_gate.json +28163b41765b9aed03e943688dadcd3deb277b9e assets/byg/models/item/ebony_leaves.json +8454ffe01558ad0f71c0429cd10c472d4b443abc assets/byg/models/item/ebony_log.json +e7b61adcddcb043c802f197ef034818f9b54acbc assets/byg/models/item/ebony_planks.json +97e62f21019a0e2a4071866edee58674f886a18b assets/byg/models/item/ebony_pressure_plate.json +dbd15c512017164b56df81afd0adaf609313a1c8 assets/byg/models/item/ebony_sapling.json +6201f8b282f40679a26b73979545ae72e74e52a2 assets/byg/models/item/ebony_sign.json +6bdd33fcbfc8e357f313450427c1aab9f5932143 assets/byg/models/item/ebony_slab.json +3d638800c7871e8581dbe564c9fe16a2cbdddeaa assets/byg/models/item/ebony_stairs.json +f832cfc13af614269a51bb011164f847df61bb88 assets/byg/models/item/ebony_trapdoor.json +1dea256f05fda11f5aeb9b154d3fadb843767136 assets/byg/models/item/ebony_wood.json +496e17de5970fb807ec718fda88740752d9c59fb assets/byg/models/item/embur_bookshelf.json +dfa67985d20126fe2a9ef3648ed7040c247fca90 assets/byg/models/item/embur_button.json +8ed704c0af7415c879b201e97d9914120192c7e9 assets/byg/models/item/embur_crafting_table.json +68e43127d33dcbc3e767fd0ddc6691231b9c27c4 assets/byg/models/item/embur_door.json +ae3cd1f038a57a8b57b8202bc1c57ca53b4b0a89 assets/byg/models/item/embur_fence.json +caf462db7bcc06e32ac3e940b81da02db1b98883 assets/byg/models/item/embur_fence_gate.json +dac9343c176e298e2e239c4179b4467a8b0d79fe assets/byg/models/item/embur_hyphae.json +80e1290a82ec8d0f177bd9d63322e3e5a000d8f3 assets/byg/models/item/embur_pedu.json +e53430e05d6b2b49ba60387cacd1e8572d812886 assets/byg/models/item/embur_planks.json +9098af6dbece39b53622f012de4116ec09882a1b assets/byg/models/item/embur_pressure_plate.json +c03dd6bd7d51ca4ff2b320099b0e83c2d3f09452 assets/byg/models/item/embur_sign.json +8c89c04ee922ef726f1dd833ecc846c9e54a61fd assets/byg/models/item/embur_slab.json +14eba61641a65d1da2acedb189823b28a5d30d1a assets/byg/models/item/embur_stairs.json +440e09938b310617c75dd44dd08d05cd40940dd0 assets/byg/models/item/embur_trapdoor.json +bcfbfa33330fa8a11efbcbad4aa4a12fc3b6569f assets/byg/models/item/embur_wart.json +9638024f54e683ea16b58e280700fc81a11bd7a6 assets/byg/models/item/ether_bookshelf.json +7fe341d90d0dbdf56b14ad130a5f7b324a8952e2 assets/byg/models/item/ether_button.json +1af4a76d1ab2b2eb82f9ba3434ab9314502c9237 assets/byg/models/item/ether_crafting_table.json +7a413a5e5b01dd5b74d834726104729eca720557 assets/byg/models/item/ether_door.json +31330fbb591f35a9489e3bec624777b5990f644f assets/byg/models/item/ether_fence.json +7b98bd0caf3b02478a7125e0a298a36afd6b289a assets/byg/models/item/ether_fence_gate.json +be71ed11e739217adf0d0b2aa6758f1a2c1f140c assets/byg/models/item/ether_leaves.json +590631597c695965adeeb96fa389867d0522b791 assets/byg/models/item/ether_log.json +d1f1ab7b3c77cef74c2697e76fa8306685e21829 assets/byg/models/item/ether_planks.json +4d75485f56aa851d6b2a6b3097c71a6db9a4d88c assets/byg/models/item/ether_pressure_plate.json +035dbb93066d8b735bfc95c12cf681d437feede4 assets/byg/models/item/ether_sapling.json +08fd43dd98ceca9332de3b700425ec9476b9b7d5 assets/byg/models/item/ether_sign.json +cfd0999a94dff43a792ed425f9ab6d962581675c assets/byg/models/item/ether_slab.json +67e4421e0cdf5097423f8b68ee99bdeb3a3c5b81 assets/byg/models/item/ether_stairs.json +27428d3a1aa72c58804330029ce36917349fcc9d assets/byg/models/item/ether_trapdoor.json +9ad52f086d1a154e9f9eded89aa5b8de490b8283 assets/byg/models/item/ether_wood.json +c0dbe843fc787a50daf111270babccca32b96c3a assets/byg/models/item/fir_boat.json +90452ac07c2feae36813e221b2317e5b359acc12 assets/byg/models/item/fir_bookshelf.json +ac68a6fa2c9bb84889b68fa83dfcf056bae2fd3c assets/byg/models/item/fir_button.json +fb660fe4e054e003521e8f811d647f7686965d8f assets/byg/models/item/fir_crafting_table.json +90d25fead7584a5d35b4abfbc63632bb1036bd59 assets/byg/models/item/fir_door.json +5b21948fb1eb86764d2aeea49fd8c6a4ed6ada41 assets/byg/models/item/fir_fence.json +7c34bcdf514d6097e0f0632110e5501ac7c3d08a assets/byg/models/item/fir_fence_gate.json +0c86751b51b32094a39d9308a7845b026bb6ee86 assets/byg/models/item/fir_leaves.json +fab4c2b319599f719afe011b5181b97a2e82fcc3 assets/byg/models/item/fir_log.json +40d125a5b1d5b2e04e0c11fabc3a3ae9503c8ed3 assets/byg/models/item/fir_planks.json +230808fb207e2db1ddd45257363940fa81dfe8e8 assets/byg/models/item/fir_pressure_plate.json +ca2259f9f8f88dfd592ddd984ad242735e278477 assets/byg/models/item/fir_sapling.json +4eb40eb7770fdbf31db1d60bfd4690ce0f4efc4b assets/byg/models/item/fir_sign.json +1ef520e11148a1e129e1b677c6f8bb8683b95ff6 assets/byg/models/item/fir_slab.json +d94255f0fa9a3948e832634be1267e38a19ba051 assets/byg/models/item/fir_stairs.json +fadeeb359142c1a0c2d4f714723037eef01053e3 assets/byg/models/item/fir_trapdoor.json +94c1af4972596d973a572532516704cc8bcbde23 assets/byg/models/item/fir_wood.json +7ed912a4af3b35a08730e1eda1b575a2c77126a6 assets/byg/models/item/green_enchanted_boat.json +5c80362ae021370d99a4d985d086d9e857a03bc9 assets/byg/models/item/green_enchanted_bookshelf.json +f284ffd2847b5679072e77d2987765198bfc955d assets/byg/models/item/green_enchanted_button.json +f382dcd68c2bced77ba3f0888462cd7e5be09721 assets/byg/models/item/green_enchanted_crafting_table.json +e9f0ed81090b1d1b4b44c951d17e72cf187d7439 assets/byg/models/item/green_enchanted_door.json +19d9109b5c2bf6977047845e53751bc119726d69 assets/byg/models/item/green_enchanted_fence.json +7787920c951d0b12de1f1f05dfa4092de91609e6 assets/byg/models/item/green_enchanted_fence_gate.json +05f6e1db2ecfb0972852a2eb16303cc2bd878089 assets/byg/models/item/green_enchanted_leaves.json +379ad2bb55e506ef0ca88126da10c21083a3acf1 assets/byg/models/item/green_enchanted_log.json +fb4d7378d4cff00846e5db33227ef3a404490252 assets/byg/models/item/green_enchanted_planks.json +86b0d9a75f29e9fd4b2936845ad283c0d28c230e assets/byg/models/item/green_enchanted_pressure_plate.json +d2fc589abca32b146ac92a06f0053a8d7fed9225 assets/byg/models/item/green_enchanted_sapling.json +4ccb06261655b9294613b274cb4473ee772a7f6b assets/byg/models/item/green_enchanted_sign.json +04ad8e65b4de45e4c71af17a90d21fe68229804a assets/byg/models/item/green_enchanted_slab.json +98c63eb05e7d975d67fc663d1e63c8c14f3fdfb3 assets/byg/models/item/green_enchanted_stairs.json +af6120ee7831e3f6ed2d2a0a9760fb8d4fc63101 assets/byg/models/item/green_enchanted_trapdoor.json +9f159570c9febe22d92c5416a9a21aa275f54da3 assets/byg/models/item/green_enchanted_wood.json +4aa4537983faba3b4db1f939357491e775ccfa40 assets/byg/models/item/holly_boat.json +e948b4c7475abf5fc4ad9486aae50350275dc472 assets/byg/models/item/holly_bookshelf.json +56ff4198f5485ea5d499b6f84889998962bd7afb assets/byg/models/item/holly_button.json +db995fe63cbea6defddf2b4d9d125980e425d040 assets/byg/models/item/holly_crafting_table.json +13e053cd9a407fcea4ee4dcd06f8c85125e642c3 assets/byg/models/item/holly_door.json +68936592803d64714911ea6c65633d8e8f15062d assets/byg/models/item/holly_fence.json +95cd2618b97be863bfbea25a3984d20b3e02d0bc assets/byg/models/item/holly_fence_gate.json +c5ad2661588620d7a040ace7fbf4c4b1beeb38c8 assets/byg/models/item/holly_leaves.json +b1093f68294d4755e06860f5c7d608ce8a9f949c assets/byg/models/item/holly_log.json +cca8fdc967393692a0b0a62dcc786690c826ddf3 assets/byg/models/item/holly_planks.json +667c9e29fcaf5de9ccc5acf57e951dc194b75b7e assets/byg/models/item/holly_pressure_plate.json +846371b31411db8a4454b8cc1342734155e875c6 assets/byg/models/item/holly_sapling.json +8a1319747ae6e0e9a1b892bbeca0b6a3f12f626f assets/byg/models/item/holly_sign.json +1a6fa4cf27d9b0a18bff243f960f010ca0b46bcd assets/byg/models/item/holly_slab.json +00d35d869cc4b4bd3e0e90af6791b6ff7c33a829 assets/byg/models/item/holly_stairs.json +50fcfa29353b1e507fe81f5db147250253afdeb6 assets/byg/models/item/holly_trapdoor.json +b97310044b508814812a8d8b85046b004f0acd66 assets/byg/models/item/holly_wood.json +7d25f7490b20c16886ec31819bf93787557c5740 assets/byg/models/item/imparius_bookshelf.json +0b31e5036e8761f7a4aa99fbb25cc17f44487192 assets/byg/models/item/imparius_button.json +c026ab6c8e4426f788f6f9f57e9a4d2faa5684e2 assets/byg/models/item/imparius_crafting_table.json +5c9cea77bc3aed7c8394af38d57a2f53b637d69d assets/byg/models/item/imparius_door.json +c602da30320970b0a8517a7f9cfcfb303d5eac5f assets/byg/models/item/imparius_fence.json +b7eda701d429247c0cd506d4f98ae138375220c1 assets/byg/models/item/imparius_fence_gate.json +e0440af44b713a185048af260535bc3562164a26 assets/byg/models/item/imparius_hyphae.json +493d02b23bcfe29a054c178a048598d5bf8402d7 assets/byg/models/item/imparius_mushroom.json +4a1fee8b2131e0783b5ed7f82397b237ebce6b06 assets/byg/models/item/imparius_planks.json +dc81269b1e5b20fdb61266cd19d4d0342a867df3 assets/byg/models/item/imparius_pressure_plate.json +fe3bb2d506ebd3d13051be98b330229f1f1a37ca assets/byg/models/item/imparius_sign.json +0145497866f5a16341a83a7808b3be7feed8abd3 assets/byg/models/item/imparius_slab.json +f265da33b44707372e63104418a1a18665883fbd assets/byg/models/item/imparius_stairs.json +b84c8d20bcfb2dedc7149b882382d6f54de56913 assets/byg/models/item/imparius_stem.json +225c12373d9932e20d69de3612f290a783d8ce6b assets/byg/models/item/imparius_trapdoor.json +2a44efa885eba1ec5c039058abc66c68e4911c4a assets/byg/models/item/jacaranda_boat.json +dc5b5592fb47a5dd254a6d152b20c10054e7fdf5 assets/byg/models/item/jacaranda_bookshelf.json +72942e66de0482d87c1a226854cd13326eb4d6a5 assets/byg/models/item/jacaranda_button.json +43eed355e8ca27b83039654df90cabe6968387ed assets/byg/models/item/jacaranda_crafting_table.json +ef149ebcc09592b1ce58c20cefdc754f17bb2698 assets/byg/models/item/jacaranda_door.json +0144a4bb49bdfd0aa1f5a4fd966300bd1d531142 assets/byg/models/item/jacaranda_fence.json +922c8d5032f1525bcff9e9c471fa2417447e5652 assets/byg/models/item/jacaranda_fence_gate.json +afd95b2508f12c4dd19515d00a341e8e3e33aca7 assets/byg/models/item/jacaranda_leaves.json +a29453db7737acfd1fb1c7899a65cd9f6dffeae4 assets/byg/models/item/jacaranda_log.json +4cb886928551b47f03b67b2aabc9e75a43460aa8 assets/byg/models/item/jacaranda_planks.json +99d1e05193a5ca1232f4f2c714fabc646a4bf7b3 assets/byg/models/item/jacaranda_pressure_plate.json +529832efb1a135b9b14855b186c47e184f6141dc assets/byg/models/item/jacaranda_sapling.json +3efe64f7a6111db1ffede08e0dc0bf7197ec56f0 assets/byg/models/item/jacaranda_sign.json +22d9e123ed72a87180b0b6ead030e6d6897e17ee assets/byg/models/item/jacaranda_slab.json +7556f3f5cbf8cd52d9316e3fba421820af68ff0f assets/byg/models/item/jacaranda_stairs.json +6a9b31f86db18af1bdb0529475ca156b9dfa3678 assets/byg/models/item/jacaranda_trapdoor.json +2b3ab205d68259ab15dd7f81184e590ced75aef3 assets/byg/models/item/jacaranda_wood.json +4f8891fab6af04d4d785ba277cf43b3f56250579 assets/byg/models/item/lament_bookshelf.json +bc0961097f406016862079afee42d8aced1b566e assets/byg/models/item/lament_button.json +0db76bdcc9ff2079a33402e1bf019e653b1efac4 assets/byg/models/item/lament_crafting_table.json +6cad2698670b70131d29825a5e8adaf1fa8c08b6 assets/byg/models/item/lament_door.json +47e42284b0c12ae73624c25b9ac32f5041cf21e6 assets/byg/models/item/lament_fence.json +53e5b3c6e3bfc18c00b78efcc0cf623b47f7905a assets/byg/models/item/lament_fence_gate.json +74cbbab0f8b3ed1343f4ff3610305f56c187cf86 assets/byg/models/item/lament_leaves.json +a0f82e87b5dfbccdf00a9f090c707689b51bec10 assets/byg/models/item/lament_log.json +d9725c8f5b08c8cff253879f3e6d2641efcdb474 assets/byg/models/item/lament_planks.json +3b3d62f8034d66df741894f0fc7003c61fab8fdb assets/byg/models/item/lament_pressure_plate.json +fdbfd749290e1cbef64ba42b88fece3c725dad1d assets/byg/models/item/lament_sapling.json +89a1098692483b9b39d0b4a830f83ce2e0c982be assets/byg/models/item/lament_sign.json +ce373731da50a9d7a791104ae44fd3b81bc3c11f assets/byg/models/item/lament_slab.json +93b3693d320a534e75ffd4901a8cd3fc24af2f31 assets/byg/models/item/lament_stairs.json +532445240defa448d25ba568e1762ff153a3996a assets/byg/models/item/lament_trapdoor.json +53f461f7ab8ef5d9100abf18e46d19aa038d4f33 assets/byg/models/item/lament_wood.json +09c6cf1c129de3b40eb58f77ec9affd20e267b70 assets/byg/models/item/mahogany_boat.json +6338b549836a53bab83fd4fc8e59cdc56b9fd101 assets/byg/models/item/mahogany_bookshelf.json +be1f79d93759a4e262183a7d958d83d90cd1c109 assets/byg/models/item/mahogany_button.json +a53a80fb32ca407f4f85bd89f8fab6ff5c2aaf3c assets/byg/models/item/mahogany_crafting_table.json +b8883a6a36b847605e3e8eac25bd902babced351 assets/byg/models/item/mahogany_door.json +a4b907be101dd9bd9036aef66b63fb7a54e7690a assets/byg/models/item/mahogany_fence.json +4cff6c5b2af885a3199f70d1cb024df411199bdc assets/byg/models/item/mahogany_fence_gate.json +bb1e49f2dfbdcc18635aacb249058da09c7934d7 assets/byg/models/item/mahogany_leaves.json +280b5165172f4ba2d8a9811a7689f831193cce74 assets/byg/models/item/mahogany_log.json +63488e60e57aa63bc1903f5b022255791648a57c assets/byg/models/item/mahogany_planks.json +93d6066d5dccb10226a4464f9b7e7fff5537144d assets/byg/models/item/mahogany_pressure_plate.json +2438f9be5d947d70e11603a27f9e58aca86fae50 assets/byg/models/item/mahogany_sapling.json +ff23f8ff0412217b08ae44449cc8f59bdf9fd17b assets/byg/models/item/mahogany_sign.json +9054f13944fceb376ecf6e2cc5822b4e72e5ff4a assets/byg/models/item/mahogany_slab.json +38016f0f21295b271808dfafe62490d6ce7d0b95 assets/byg/models/item/mahogany_stairs.json +1f4807f0d6c9d8b41309430315511cfd103cd5ef assets/byg/models/item/mahogany_trapdoor.json +dd10152e7b1566ef8084113c1a9b041d37a6dd75 assets/byg/models/item/mahogany_wood.json +fd2e8c2340e6d84db8424a535413bf19262cdc98 assets/byg/models/item/mangrove_boat.json +d9312a1377a77bb3c0133b5e01e8eb6c584f3409 assets/byg/models/item/mangrove_bookshelf.json +3ab37caaac157fc2a90182df0a56dd267ef4ff6a assets/byg/models/item/mangrove_button.json +28149dd2d738933c5f5468b08cab4b5d796b109b assets/byg/models/item/mangrove_crafting_table.json +40b3e02048e01f40a4b49aee7fc632a52e5795be assets/byg/models/item/mangrove_door.json +08bfabb7a23457e0f2c59a6769021023ff53f28a assets/byg/models/item/mangrove_fence.json +c4fa62dbdc81c85cd32310a66003790195fef417 assets/byg/models/item/mangrove_fence_gate.json +f01d9edebb7a644d621ba231ab80bb11df87d3ac assets/byg/models/item/mangrove_leaves.json +664e1630ed14cebd04eac759a22bbd708956e31f assets/byg/models/item/mangrove_log.json +4e22803de77a224f43bf56f7eda6c048d0bc6345 assets/byg/models/item/mangrove_planks.json +dbdbd9960f560a37db2af2a4a6b0d49d2e816508 assets/byg/models/item/mangrove_pressure_plate.json +3759a27eba26939f8c58d8555400f3ebfb7d8545 assets/byg/models/item/mangrove_sapling.json +3db70127049b7d5a9d036ddc721639cd421c9920 assets/byg/models/item/mangrove_sign.json +93be0e5c4b32719f69f9d7596eab5d41dcd9f105 assets/byg/models/item/mangrove_slab.json +9ab9fc17908fe2df0b08e5993236d01946b93ee0 assets/byg/models/item/mangrove_stairs.json +a48751d0bcaeca8ee2325b5d3074efe8054dea17 assets/byg/models/item/mangrove_trapdoor.json +cef69c743e35d4ec391600825c4af912e60016ef assets/byg/models/item/mangrove_wood.json +57abcb91bb7d937e20a5891912248b9c5e360ada assets/byg/models/item/maple_boat.json +ca96631b5f2bed644559a4330bb791443b2883d9 assets/byg/models/item/maple_bookshelf.json +cf66c45ef7d5a075e712b07b1bc26b1721c1aeba assets/byg/models/item/maple_button.json +37ef2f72155a25bf5d4be9f37854778d6cebe340 assets/byg/models/item/maple_crafting_table.json +eb493fc1ce5851b6e306e0f3ff3433f6c7f8d5e0 assets/byg/models/item/maple_door.json +862a2570775ccb9fa69bfabd6e0ab70b36e81842 assets/byg/models/item/maple_fence.json +c242768927c7d1519587f61e14e8e280b068f982 assets/byg/models/item/maple_fence_gate.json +ff0fa56d3a58e9653c9ea4b373e1b9683cbb1301 assets/byg/models/item/maple_leaves.json +be75d54fe88d21eb07fff11ff6be520a259ca482 assets/byg/models/item/maple_log.json +4fa5efe389f7e53a5dabeacac1c9e8bcbf878427 assets/byg/models/item/maple_planks.json +25c150427de715b5609dc5b5f254611296f08a54 assets/byg/models/item/maple_pressure_plate.json +21e23a526bcacc6afa724233a94ee4116338a609 assets/byg/models/item/maple_sapling.json +1e97b39064e4b1e7d71fcc2838b892dc4af39968 assets/byg/models/item/maple_sign.json +e92523196f382c0c52c94c1fcc013aeba93a99eb assets/byg/models/item/maple_slab.json +017dd69d2c55c81a51f7ae0ec3a6d3443f41c24f assets/byg/models/item/maple_stairs.json +f4c47a1410d842b0c56a4e8d814b698e7797ef5e assets/byg/models/item/maple_trapdoor.json +f778d1e79f8c38657a8bd09fd865b9920a0b78d7 assets/byg/models/item/maple_wood.json +751f4bf0e1c654952b466c4eda9b69c4f433d040 assets/byg/models/item/nightshade_bookshelf.json +14a5060d41f360169b92dd87a729a5f1a7479250 assets/byg/models/item/nightshade_button.json +eec41cbd29c46fd6453bd2bd506b71642e4d5bb9 assets/byg/models/item/nightshade_crafting_table.json +a1b864451d8153871c824c57c2c04eea679792a9 assets/byg/models/item/nightshade_door.json +1bd7c98870cbf1deb36093536959bd7f3f617697 assets/byg/models/item/nightshade_fence.json +b4761416dcaa17a15453931b3a0be08d61debd06 assets/byg/models/item/nightshade_fence_gate.json +d3f53a12d67a74fcdb30242018c03b62c6fbba08 assets/byg/models/item/nightshade_leaves.json +020bd65a83e217dc94d7c2605e54f5788ca377a7 assets/byg/models/item/nightshade_log.json +dd17ff59e694ac00689a5e40d619c57ffddbb312 assets/byg/models/item/nightshade_planks.json +0c4007b7a71253165213b6dd176db4f1d7ad50b7 assets/byg/models/item/nightshade_pressure_plate.json +ead85c873cf74c67c932148f619cf34aeb85844b assets/byg/models/item/nightshade_sapling.json +3cbd526b53fe538a0f62ed15c378614e3b27b3e4 assets/byg/models/item/nightshade_sign.json +b96cacde23a08a070adb72954d251c00b96b4d9d assets/byg/models/item/nightshade_slab.json +cfda073950857db1df311c21c0508b550a9637df assets/byg/models/item/nightshade_stairs.json +c3a0a34d089c4b3e40ca50a485b36011397b1449 assets/byg/models/item/nightshade_trapdoor.json +aaad11ecf4e340cd5ccb092d546b8c0d78fe993e assets/byg/models/item/nightshade_wood.json +d20cdf591bcc3c49286ff6910087387dd3d4a1b9 assets/byg/models/item/palm_boat.json +12b0740d842c335e507993477446afc23b96fdff assets/byg/models/item/palm_bookshelf.json +958e44ed66429eee9b8d093a6e3a9a2253419b94 assets/byg/models/item/palm_button.json +f0f84245726e29019cf11f0e2d157da0aaa0ed4c assets/byg/models/item/palm_crafting_table.json +2b6efb3710b042d096a96cf17a572033cfed4c64 assets/byg/models/item/palm_door.json +c138928d6c4bef95cf0eacd0cddb0c459b676892 assets/byg/models/item/palm_fence.json +4cf890c35c077c37a4a6a3b9a7759af6a7bcd9ed assets/byg/models/item/palm_fence_gate.json +677af4384c6f4123a549b93b463a0c8e21dee475 assets/byg/models/item/palm_leaves.json +aa8e161ee723e34550f5e857e3183bceb8ce8b3b assets/byg/models/item/palm_log.json +e48bc5b794ea657c4da0a28090b033e57365de5c assets/byg/models/item/palm_planks.json +618784dc5346f24975ac2241208849a42d3afc32 assets/byg/models/item/palm_pressure_plate.json +ee2aa71605f412e97190c9f42fc37d5f78277547 assets/byg/models/item/palm_sapling.json +9327a5764258d5057a110ec460e7d7453940726c assets/byg/models/item/palm_sign.json +b924a9bf3ffbddc1988dae4b00e15711c2d7c133 assets/byg/models/item/palm_slab.json +cd743c7d9ff653a0aa90e42af96e1d0e7b638346 assets/byg/models/item/palm_stairs.json +bbd66394a78d109eef20cd38a41a1d366667cd57 assets/byg/models/item/palm_trapdoor.json +7394da66d7c411cb939d9ffbfa3f06e293d7fb2f assets/byg/models/item/palm_wood.json +74dafb7f323044436cfefa9e8dac00b5fe27325b assets/byg/models/item/pine_boat.json +8f18ecb9b21158f7e0a3511a136b582c6633c393 assets/byg/models/item/pine_bookshelf.json +3b66bebdaedfdc0e881848cd6dfb56ee6ffb4067 assets/byg/models/item/pine_button.json +a6df8d168be4c6dd49db62ff67230240b096f12f assets/byg/models/item/pine_crafting_table.json +947a01cb3dfbf814d9fc89044ea6a90c22fa67b4 assets/byg/models/item/pine_door.json +9eac6960ed44715e11f15ebf7082f52455f62b0a assets/byg/models/item/pine_fence.json +9286959dc24942ace13abe8dbcfeb080ba694506 assets/byg/models/item/pine_fence_gate.json +51659e77ec7d9dee93a8f9cf6b13d05fee222cc8 assets/byg/models/item/pine_leaves.json +8a91722d87330535f9d33d78f5b5f8be0ffe714c assets/byg/models/item/pine_log.json +f88b6f34595b563a620bd240782e3f41f3ed0838 assets/byg/models/item/pine_planks.json +6ec27af0f76eb102ffdada71825074f286ab9440 assets/byg/models/item/pine_pressure_plate.json +3a176e47afa166ad71d71629a43e5d7579c44675 assets/byg/models/item/pine_sapling.json +cd67848e655f1437f7b4c2dd0e8f700b49b33ee9 assets/byg/models/item/pine_sign.json +6763af23605d2980ad2254a3f12bbd213c6a1baf assets/byg/models/item/pine_slab.json +af4ac987cdf1c54baca931075a32a84d62db5e10 assets/byg/models/item/pine_stairs.json +84848f44762e73a29153e8b46f120fabef9de152 assets/byg/models/item/pine_trapdoor.json +822197648521aebc64d7968d6217fcdef1ab365b assets/byg/models/item/pine_wood.json +99e7dcace0f1979953145af964301f0af7316086 assets/byg/models/item/rainbow_eucalyptus_boat.json +41fd451a0a9210ebf2c11089516c339d23427e2e assets/byg/models/item/rainbow_eucalyptus_bookshelf.json +5f2b59c634a9d560e1c43e5604526d2ef0868371 assets/byg/models/item/rainbow_eucalyptus_button.json +f8b6fa18d96d5c9d256da77436f4bf99538a004b assets/byg/models/item/rainbow_eucalyptus_crafting_table.json +5087342ebf0c2319a4e3745c5824aa383c11f601 assets/byg/models/item/rainbow_eucalyptus_door.json +e077b5f9a48f9cb2b7ec9981856a62851646bea4 assets/byg/models/item/rainbow_eucalyptus_fence.json +62ac2326c8664a30d8f52e77e4c8b5d0efc73517 assets/byg/models/item/rainbow_eucalyptus_fence_gate.json +d492c508c1ddf219749ef28a5229ef661b69c1b3 assets/byg/models/item/rainbow_eucalyptus_leaves.json +243988612f2da5c0d78ba7cab60cfdccc1c72eff assets/byg/models/item/rainbow_eucalyptus_log.json +fbff3125cb2e04b30d29cca1ab53c349ddad3fe6 assets/byg/models/item/rainbow_eucalyptus_planks.json +c5174f2296f28c9e9a3c1eb186c6b1f9f9626615 assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json +d9561bb995809f31ac0076702d5a5988e3d29b54 assets/byg/models/item/rainbow_eucalyptus_sapling.json +bec047901a5c13e65facef827b64e637bc60f637 assets/byg/models/item/rainbow_eucalyptus_sign.json +8cfaba932b2f7d2da7219e4737425003ed784863 assets/byg/models/item/rainbow_eucalyptus_slab.json +8d436b9060bbf9050a77cf20f43ce2c8b601cd34 assets/byg/models/item/rainbow_eucalyptus_stairs.json +f630a8b67110494605086ad3bd5b4fd8a0eafbf3 assets/byg/models/item/rainbow_eucalyptus_trapdoor.json +e88891129ad82836327e40ae4eeecbea20d0f6a5 assets/byg/models/item/rainbow_eucalyptus_wood.json +2f014b903d733e9465fe0a74310c75bf73aa86a3 assets/byg/models/item/redwood_boat.json +c0c659075e65538d82680ec96754afe8b5327bde assets/byg/models/item/redwood_bookshelf.json +a0dbd5c75d8967473fb2821f923f53104055dddb assets/byg/models/item/redwood_button.json +1680c0cc02b84f8a2b5851f47053149a4c3ef852 assets/byg/models/item/redwood_crafting_table.json +a38c55bfa3ae6b3417e31f6a287b9072f2728b06 assets/byg/models/item/redwood_door.json +8a4164ef26ee6daa8e2714b102b3c9be8e5d59bd assets/byg/models/item/redwood_fence.json +10f825746a834a94b3c8269164f685b025dbc566 assets/byg/models/item/redwood_fence_gate.json +48ed121da26ac11cf90549dd0c6ea77fe55d32ba assets/byg/models/item/redwood_leaves.json +12cd15a745033cb148a7a9d92c49681dd0816390 assets/byg/models/item/redwood_log.json +0a2b39101eb37a3285a562e90a44c29116440152 assets/byg/models/item/redwood_planks.json +519576761a3e05381222b7ace438fb3b05ebfb13 assets/byg/models/item/redwood_pressure_plate.json +469a2cb310fb68b081910fb31e47364d072d995d assets/byg/models/item/redwood_sapling.json +f8346eaeb6571fe15314e97267f29509a3b1a131 assets/byg/models/item/redwood_sign.json +3e4357f72b69a7cae36619bb52a1821b97a54a44 assets/byg/models/item/redwood_slab.json +7e1201d6db3e54578f62e4579d0de57e02c5ecd9 assets/byg/models/item/redwood_stairs.json +0d113ead2c27a40fa56c216f10d24d0ae3e15fd9 assets/byg/models/item/redwood_trapdoor.json +0361f95981a5539d65c700d9b9976c3a96131936 assets/byg/models/item/redwood_wood.json +c6dbd5d2ad5e2e5e7aabd0fa1669599e974159e8 assets/byg/models/item/skyris_boat.json +d10d816e7094a0690e657daae288df6944a673be assets/byg/models/item/skyris_bookshelf.json +f78f1f30587ebfcc9521503679842f2319bc53a5 assets/byg/models/item/skyris_button.json +4e75ea8753a180a9eed27d426ec956b96717c694 assets/byg/models/item/skyris_crafting_table.json +1603ea35504304739553973633b13ec66233e716 assets/byg/models/item/skyris_door.json +7feb9b36241fd7cd1c945dc833233936d55dc611 assets/byg/models/item/skyris_fence.json +9c9c185a3d706ea8893cd92b77f949f79849c467 assets/byg/models/item/skyris_fence_gate.json +5f427a52739a553be563f19a140c9d9071e4d0dc assets/byg/models/item/skyris_leaves.json +00c94739fb6e9620b2916ff27fb6f7baace4f064 assets/byg/models/item/skyris_log.json +dd91ca9ae3b72e02a9a987304c561f6833cd825a assets/byg/models/item/skyris_planks.json +d773c89b1792b54607a766a9358b8e6bee0cf64a assets/byg/models/item/skyris_pressure_plate.json +691aa2739ae9fbaa80b7b2d6adad23fbaf218106 assets/byg/models/item/skyris_sapling.json +64eceb43d0db1482b23602bc4b5e43ae9a24f542 assets/byg/models/item/skyris_sign.json +c7acfdcc1baa4c876ec5bd993b94ce08683c4a36 assets/byg/models/item/skyris_slab.json +309661c6a950ecaa29db5e0116cf27627a6ef48d assets/byg/models/item/skyris_stairs.json +8e68209f4010040ea728a6a507423389dc9c2238 assets/byg/models/item/skyris_trapdoor.json +26df9eaf54804a707c18d71a16db890f32afd62b assets/byg/models/item/skyris_wood.json +1bcfa0a1cc331b3f3b077e511aa0a6b596d436aa assets/byg/models/item/stripped_aspen_log.json +310f43ca4bb5b6495310ee0f45cad3f17cfbe9b3 assets/byg/models/item/stripped_aspen_wood.json +fc1f091cda80f728a0a0329a3c4b1e078477bda5 assets/byg/models/item/stripped_baobab_log.json +d6556c2f89421570b0bd0127e0743f99150c0a93 assets/byg/models/item/stripped_baobab_wood.json +ab0168a3fd9fb1e983e8fa132ef9197866478799 assets/byg/models/item/stripped_blue_enchanted_log.json +c99cb1afbbcc13ac209c9787857b9f70b33a362f assets/byg/models/item/stripped_blue_enchanted_wood.json +ececb403c8da6e92c0c367761772141f8563d692 assets/byg/models/item/stripped_bulbis_stem.json +45d1a392e70f4474c40cee50c08cff8778467808 assets/byg/models/item/stripped_bulbis_wood.json +cc11a1be65b2c53c96792eb2267b21765be53eea assets/byg/models/item/stripped_cherry_log.json +6d5d4d9f76afe7f9ada520eda1e8ea6e9c62309a assets/byg/models/item/stripped_cherry_wood.json +67db3ffce8cc3f067530aa3f8c8a07e2623e2ce0 assets/byg/models/item/stripped_cika_log.json +0528b726ea7b0ecc4907a733fb46c6ef00fd1822 assets/byg/models/item/stripped_cika_wood.json +226d9c338c70fe26b7fe41bdaa2060cab43ce1a2 assets/byg/models/item/stripped_cypress_log.json +7afbe00b589fa72695b5164222fb4652358d0102 assets/byg/models/item/stripped_cypress_wood.json +e1ab345f8e0eeea40867bc303e2aee5e8cd3656d assets/byg/models/item/stripped_ebony_log.json +6897499cf9c7c20b647ffead12862836a63c9252 assets/byg/models/item/stripped_ebony_wood.json +f5e2e5fbae75f5a3b956c62570ba90837c8b485e assets/byg/models/item/stripped_embur_hyphae.json +bc308fbf8ffa06bc2159e72f2dbed69848abc6c5 assets/byg/models/item/stripped_embur_pedu.json +2f3864295208bade50c3566ee0f1b4c0c2e0eb65 assets/byg/models/item/stripped_ether_log.json +be2f1e111ff94bfd6f689c186745916b786228ce assets/byg/models/item/stripped_ether_wood.json +aa21f2abdde3b65e02e1a09daa85f584c6a237e4 assets/byg/models/item/stripped_fir_log.json +9af9dbcd5530b3a8df7cbcef63392017d8f546e6 assets/byg/models/item/stripped_fir_wood.json +48c741505b7164f5a665deb09c86b30e3c4cfed3 assets/byg/models/item/stripped_green_enchanted_log.json +a87ec2cf158c1109c1186db48118cc484531734c assets/byg/models/item/stripped_green_enchanted_wood.json +26d586f77b31dd70e22f55c144dc9bc679636e42 assets/byg/models/item/stripped_holly_log.json +0f1d4b8407686bee9f3b1b2016145e754440ab6d assets/byg/models/item/stripped_holly_wood.json +d4732d5f98c772d6bb7c9568627dfbd12fcac572 assets/byg/models/item/stripped_jacaranda_log.json +e1635af5222cf6eead6e3f1cb8dd4cf776b03b48 assets/byg/models/item/stripped_jacaranda_wood.json +f571251bdf2c9558daeb1446216dc7eec3f219d6 assets/byg/models/item/stripped_lament_log.json +8df28ada7c6abce61dd01672b22e3ea18bf6e481 assets/byg/models/item/stripped_lament_wood.json +fdeeaacaf48b32b669678024d6968980e0c7cc20 assets/byg/models/item/stripped_mahogany_log.json +fdb640ced7b157aa93f7b0f91d06d4cbd6999c11 assets/byg/models/item/stripped_mahogany_wood.json +7c822b665a782020b3e2867b8435871bafe5fca5 assets/byg/models/item/stripped_mangrove_log.json +3df2859cef94c649769391950b96beb0b47984c1 assets/byg/models/item/stripped_mangrove_wood.json +a1139d0884ffa249545641616a63c06c37732674 assets/byg/models/item/stripped_maple_log.json +155963fa3cd87c65b7f14e04a7c5cd246acd037b assets/byg/models/item/stripped_maple_wood.json +e9f50b04f015150a5c8e22091969eac10e982b37 assets/byg/models/item/stripped_nightshade_log.json +0626b71e78b60513ba9c950cb75019dc4d8df6b1 assets/byg/models/item/stripped_nightshade_wood.json +fb8036f9f54bdb88574148ca14ae76c77de88d33 assets/byg/models/item/stripped_palm_log.json +32725cd38419c4faa267bcf91bcc3908fbdea473 assets/byg/models/item/stripped_palm_wood.json +b8044689a5626a75a17d1ca580a421a661f85db3 assets/byg/models/item/stripped_pine_log.json +cbfd932c4a176598e5fb6846fa4f53d0a20dcaaf assets/byg/models/item/stripped_pine_wood.json +d277ce50c8c254d016044d579788ba362c22ffd4 assets/byg/models/item/stripped_rainbow_eucalyptus_log.json +404d33f7c856f5cb6d5e10b86e8947210c9652f1 assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json +bf7cbb85690496c80b67aada23e0a8c69c036138 assets/byg/models/item/stripped_redwood_log.json +a83aa797f5aa2136dc27ea4e4c1f906cad4659fc assets/byg/models/item/stripped_redwood_wood.json +322963c44afdcef57f26be41d2019d9d9b2e5c0d assets/byg/models/item/stripped_skyris_log.json +18dbe722057e2a3f98a4d801bb3a8507956e630c assets/byg/models/item/stripped_skyris_wood.json +8fa26f8854549ce471dca64f03c127c81ad8702a assets/byg/models/item/stripped_sythian_hyphae.json +c0f63f99e86316b8d3f3f569fc0080e174db5279 assets/byg/models/item/stripped_sythian_stem.json +c13d5d6485f71c1988b157fb1c322ed0e6cb3074 assets/byg/models/item/stripped_willow_log.json +0f9d2ccee23368f53e372aafdbfdd437987a5e88 assets/byg/models/item/stripped_willow_wood.json +d9c31239389e87c0f7b02d202774c94e01c3a173 assets/byg/models/item/stripped_witch_hazel_log.json +5ba3df0532254de55e4d4af5358f1283d49f58e8 assets/byg/models/item/stripped_witch_hazel_wood.json +113ee355463c5f9b2edf85a7b298f6be264ff271 assets/byg/models/item/stripped_zelkova_log.json +16cc71b25f774affb68ef70ba8513f30ce285c8a assets/byg/models/item/stripped_zelkova_wood.json +a110508b04c3e66dbab14919f73fb1ebeaccb45b assets/byg/models/item/sythian_bookshelf.json +90d488202e9c9625e6499c5e78cd8119cca0fd0b assets/byg/models/item/sythian_button.json +6ae3a3d56879faf37d8c3de843b7a62dd52c4ee3 assets/byg/models/item/sythian_crafting_table.json +40fdedf3e5f3629d28b3182a031b18d0e2cd74a8 assets/byg/models/item/sythian_door.json +3116e8f539204a71c88fe7cc6525d7a036dc0dd9 assets/byg/models/item/sythian_fence.json +d32d057c0e7f9198d8794dcf038f3ffec90cd04f assets/byg/models/item/sythian_fence_gate.json +c229aa7d516530c1e17955ecaea332b2d0790536 assets/byg/models/item/sythian_fungus.json +8699b02e9c30a45fbe9151c875c1af85d91c31db assets/byg/models/item/sythian_hyphae.json +6959349015a40ebb697601f20dcd1b51c284f559 assets/byg/models/item/sythian_planks.json +2092590968eb627a1821c9e6a2ee5ca134d8e03e assets/byg/models/item/sythian_pressure_plate.json +8c44911f7739ea80c4400287417061ff0508b1c9 assets/byg/models/item/sythian_sign.json +88351808b8bfdfc73578b0c1edcdd6021c5ddf50 assets/byg/models/item/sythian_slab.json +555d592440a1b8fc333a5347a0fa3c6063164889 assets/byg/models/item/sythian_stairs.json +0dcbbdfcfa0db022b4d7e7efb2f9d41b21a95de9 assets/byg/models/item/sythian_stem.json +56bc241b8a43d74aede888dda397f5bc30ad1bba assets/byg/models/item/sythian_trapdoor.json +38a9449bd57e8c8f56ace5418eaaaad4b2c4ce03 assets/byg/models/item/sythian_wart_block.json +b95d8eebd2228f28e9198e652cf35ec522043c82 assets/byg/models/item/willow_boat.json +18c7564d9c5d0a0bfecc06d64e650822d3356169 assets/byg/models/item/willow_bookshelf.json +2fb6e478275df521b77fe089a33e647784be32d2 assets/byg/models/item/willow_button.json +c77156bc17712648f16b71cd465975a23d714ce1 assets/byg/models/item/willow_crafting_table.json +8bb6252683869506664328c93f786711c7eb10ea assets/byg/models/item/willow_door.json +4bb1a68a14ba088980f0589e119dcbebeb87a229 assets/byg/models/item/willow_fence.json +c0e7eb5bec9ead9bfd3da98cec284ecd7139fa5e assets/byg/models/item/willow_fence_gate.json +a41b95628b5b2956eec6d9318e081a95bbc104f5 assets/byg/models/item/willow_leaves.json +98a78b612933910ca60d0cbec1b0dafd4332e971 assets/byg/models/item/willow_log.json +af57f3cc726642997d3c8d5371b355d184ea3981 assets/byg/models/item/willow_planks.json +b6247e22e9ccf6b05cc54f593e5c3a6d713a72c4 assets/byg/models/item/willow_pressure_plate.json +49989fe741ff735f47d43a1abf1f50a1a2a58077 assets/byg/models/item/willow_sapling.json +3342af62b71d10ce861881f0f1ea4fa3f6f3bb4d assets/byg/models/item/willow_sign.json +d81ae7698ac931a1d1a4ce1ea30d636c3d600de9 assets/byg/models/item/willow_slab.json +55e78cfbba4c52f2b31d92309b257d7b1839ada1 assets/byg/models/item/willow_stairs.json +0faaf368461a9b05a9fcb392dad94a025f10a2ea assets/byg/models/item/willow_trapdoor.json +0cbf161da8478f3c669e816687c8957d492aae40 assets/byg/models/item/willow_wood.json +fd0b52b6b143f978c10edaab4df44a6da0a4d1df assets/byg/models/item/witch_hazel_boat.json +c2fcd7fc8321daddc9953f6a1367d69a36881c1c assets/byg/models/item/witch_hazel_bookshelf.json +db5f5767a0c8af4ff1704f3aab4b99b3dc18b501 assets/byg/models/item/witch_hazel_button.json +00fb726c0691eb2785fae178a73cdcb3ab229a8b assets/byg/models/item/witch_hazel_crafting_table.json +045783afdf970b1ef2b20c62ef2518d72bf0ae3d assets/byg/models/item/witch_hazel_door.json +8ecdf98165fc5362a84ef1a91b003bd5ad72edc1 assets/byg/models/item/witch_hazel_fence.json +a72bf68f8ae9f806cf63a7f62e394b1cd379f69c assets/byg/models/item/witch_hazel_fence_gate.json +521d2eb733b3b866f6320642c5701fb997c682be assets/byg/models/item/witch_hazel_leaves.json +da9dd71ede53844f36e6ef77c8e6890f81093b48 assets/byg/models/item/witch_hazel_log.json +b43db44796bcd9f4a0bc0eb873c96ed1272c04ea assets/byg/models/item/witch_hazel_planks.json +b4826d71b3be072b95ed3e3ae24a92cddbe48759 assets/byg/models/item/witch_hazel_pressure_plate.json +443be3ec2638649ba5983a2df318d781fa4f3c33 assets/byg/models/item/witch_hazel_sapling.json +0ba3db13f07d8165443e0151bc01a92071838022 assets/byg/models/item/witch_hazel_sign.json +994bc06d4089bd7fb447db92669a160eb68c05a6 assets/byg/models/item/witch_hazel_slab.json +d3562772c69b9f3ee62df7677899bbf34c1d4d55 assets/byg/models/item/witch_hazel_stairs.json +dc2ef4b093873a827543e08128fc219ad4be294b assets/byg/models/item/witch_hazel_trapdoor.json +7604b2d708e0a0230b08d4fe6fc7edd7ca13e4db assets/byg/models/item/witch_hazel_wood.json +f3fcce082644a23b11b38a2d99ecd3269d6a15c7 assets/byg/models/item/zelkova_boat.json +e10ecab657133223a630b84a7bdd089b279acba3 assets/byg/models/item/zelkova_bookshelf.json +db35c848debfb6138e73ac3560141e18834820c7 assets/byg/models/item/zelkova_button.json +fcda0a2d9159d3e1ba651308e7a7df6aaaf66ad5 assets/byg/models/item/zelkova_crafting_table.json +9793d791b77a2bb5ea92e37be962f67ba3fa9cb0 assets/byg/models/item/zelkova_door.json +df3aa6fd0eacf38e5332ff390b9e76d574a577c9 assets/byg/models/item/zelkova_fence.json +b0d3d3e07b01aa61867befee24db66f0c005e908 assets/byg/models/item/zelkova_fence_gate.json +f0ce164fa11cbc95a2c6a0c5e3873cf19f8d6ee1 assets/byg/models/item/zelkova_leaves.json +3d8927b25773fdde2db7177652ef6e6c453dc787 assets/byg/models/item/zelkova_log.json +1be4ce942c7bbfde835e770808dad7f79cf16cc3 assets/byg/models/item/zelkova_planks.json +f084e6b76ad3a603c919017894ceb56c9776c2ca assets/byg/models/item/zelkova_pressure_plate.json +01d7552849748c6e179b0eeb609f3a5de45d518d assets/byg/models/item/zelkova_sapling.json +6d923f15f0f8dd92964ffc6b7a556c469d092cb9 assets/byg/models/item/zelkova_sign.json +06399711be4606d51b756ee267fdddf2ed6a048b assets/byg/models/item/zelkova_slab.json +defe60a7836ccd2668fdc32f7f49eee25a294b16 assets/byg/models/item/zelkova_stairs.json +c8109e961e316dcb8b90558e90aa62475ab5b7f5 assets/byg/models/item/zelkova_trapdoor.json +137cb37c2152a08519cd35a6636e4ac8ae9676f6 assets/byg/models/item/zelkova_wood.json diff --git a/Common/src/generated/resources/.cache/55f0273cb61243ff3d2fde23212f03e66541da02 b/Common/src/generated/resources/.cache/55f0273cb61243ff3d2fde23212f03e66541da02 new file mode 100644 index 0000000000..9646541ab5 --- /dev/null +++ b/Common/src/generated/resources/.cache/55f0273cb61243ff3d2fde23212f03e66541da02 @@ -0,0 +1,12 @@ +// 1.19 2022-06-08T20:08:31.2354189 Tags for minecraft:worldgen/biome +6cc6bbeed1e76b86e19778599833ffc6947f37b7 data/byg/tags/worldgen/biome/is_badlands.json +b24ef34a109b7a0130d45bc1cae8985c1d23ed3d data/byg/tags/worldgen/biome/is_beach.json +3fdfa324e33d2a75deb00dc8f60158378d8be46a data/byg/tags/worldgen/biome/is_dead.json +d45f84365bbb29a3e48930be3be0f2d188393c76 data/byg/tags/worldgen/biome/is_deep_ocean.json +0be07ca2db98cd997cdfdfb2910a3bf76c2b6f4a data/byg/tags/worldgen/biome/is_icy.json +d45f84365bbb29a3e48930be3be0f2d188393c76 data/byg/tags/worldgen/biome/is_ocean.json +0a7b9bb6207b9074a416b486d350789068c02a96 data/byg/tags/worldgen/biome/is_sandy.json +5cdb77eeb9e031625f4ff14e94ede71165c429f2 data/byg/tags/worldgen/biome/is_snowy.json +3408dd4a796176c66f0b327461e22898513f6323 data/byg/tags/worldgen/biome/is_spooky.json +5f87c31275c554460ff6db9d9b724876355c32fd data/byg/tags/worldgen/biome/is_swamp.json +3fdfa324e33d2a75deb00dc8f60158378d8be46a data/byg/tags/worldgen/biome/is_wasteland.json diff --git a/Common/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Common/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 new file mode 100644 index 0000000000..deda509d43 --- /dev/null +++ b/Common/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -0,0 +1,588 @@ +// 1.19 2022-06-08T20:08:31.2204232 LootTables +4f0aa76b3b0d3b72b62ae9ff41b93182a24e80c0 data/byg/loot_tables/blocks/aspen_bookshelf.json +20ca431b632c73966682eb62fb114d56509ba246 data/byg/loot_tables/blocks/aspen_button.json +64328fd566cd8f2ec659468e124758f165405efa data/byg/loot_tables/blocks/aspen_crafting_table.json +1c46c58f405d1afe8390f515ef5470bf63ffe0b5 data/byg/loot_tables/blocks/aspen_door.json +ab96c04e32f9258ab1a5c59c4e07ff5dcd9242ff data/byg/loot_tables/blocks/aspen_fence.json +69419f7f6349f3e47be5255d0a35c02cd5a39955 data/byg/loot_tables/blocks/aspen_fence_gate.json +bd24cf07f41a79a06d5b8d855cb0e2f111ec88f3 data/byg/loot_tables/blocks/aspen_leaves.json +f1c9acf1b8d99767a402c4241c2b2d1b349c3eb4 data/byg/loot_tables/blocks/aspen_log.json +492a7be05db6fe7531592e2f3f1fb2f769301733 data/byg/loot_tables/blocks/aspen_planks.json +d3ebb67e38c428a7e295898f0a4c3de388e4cdaf data/byg/loot_tables/blocks/aspen_pressure_plate.json +59a6aa028c7236f7bd98f6b4e8dfc84d6a2c8924 data/byg/loot_tables/blocks/aspen_sapling.json +bd967fb2280a1a01abc1b333a4a6da37010dfba1 data/byg/loot_tables/blocks/aspen_sign.json +d3ec1024090ff07fa069b672d972741cb2eb4bca data/byg/loot_tables/blocks/aspen_slab.json +d18f203e8de63c2d59374daa596fb121bf388235 data/byg/loot_tables/blocks/aspen_stairs.json +461377b34a5bd319b26b9f32ea20ad7ae0d19b74 data/byg/loot_tables/blocks/aspen_trapdoor.json +5d410f3b61b11bced71685c32f38ef3db9f89eaf data/byg/loot_tables/blocks/aspen_wood.json +bf6c8c9764da0644dbda61e360afdd11d9e8757d data/byg/loot_tables/blocks/baobab_bookshelf.json +90cc72365e5e3a51f679ae5dddf4e622ea0bf251 data/byg/loot_tables/blocks/baobab_button.json +7ce8087b4f25375f9e69bf193a3c55792bcc5760 data/byg/loot_tables/blocks/baobab_crafting_table.json +f50bd968a73fd8089e5936fa1ad1550575fc2638 data/byg/loot_tables/blocks/baobab_door.json +ee0c1a80b1183b0321a382e22e2b553959144c0c data/byg/loot_tables/blocks/baobab_fence.json +8c10b14ae825fe8868cef6170989b4bceece6907 data/byg/loot_tables/blocks/baobab_fence_gate.json +edf7441d7c8e73d197fbf3a0102157a910480908 data/byg/loot_tables/blocks/baobab_leaves.json +22a67d561e768fdc4079d3d260c2939a973f4ec4 data/byg/loot_tables/blocks/baobab_log.json +4513fa87bc6107932adac4aada3107d3a5189d46 data/byg/loot_tables/blocks/baobab_planks.json +3169f731368d12228354a6e3dc10397b88ff0e98 data/byg/loot_tables/blocks/baobab_pressure_plate.json +7aac7b93c7bd806af67aadc38d398bc296605ca8 data/byg/loot_tables/blocks/baobab_sapling.json +e56df72108011831862a7dd3265ee1b40308dc1c data/byg/loot_tables/blocks/baobab_sign.json +bb6fc492243d395ca95443361a670457203ae894 data/byg/loot_tables/blocks/baobab_slab.json +ae11170869af7df2c76080ef803ee1ad57a46a6c data/byg/loot_tables/blocks/baobab_stairs.json +e51faa785b0a3154178dabd4e5923589ecf6e215 data/byg/loot_tables/blocks/baobab_trapdoor.json +5b308c40c1da7009aae8a080f8434f38baffe9ff data/byg/loot_tables/blocks/baobab_wood.json +513b80bf6c9a1c062afb58e6eb0fef983ac6873b data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json +47899f17577304bfb384418aaef6eb1f737badc4 data/byg/loot_tables/blocks/blue_enchanted_button.json +57d3e8c31da1415d1bd0febdcf8cd59fcd9d62a9 data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json +2f42027b5f3afba5980383ee7feb80406591413d data/byg/loot_tables/blocks/blue_enchanted_door.json +564c6d6f909846fed762ae95233e8c46b74f39bb data/byg/loot_tables/blocks/blue_enchanted_fence.json +81bf80e57a1d06659fbef558b502ec5c31fa94d2 data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json +8911aabd3853e2eb5c407041bd0a081b01575193 data/byg/loot_tables/blocks/blue_enchanted_leaves.json +66978ccc83ff00cdc5832df7ed0cd43d0ea37689 data/byg/loot_tables/blocks/blue_enchanted_log.json +67b4085088e3e82eaa12600ee41ad37d6f7aa9f3 data/byg/loot_tables/blocks/blue_enchanted_planks.json +12934813cd5e04b5080da697ebedf003c3a9e832 data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json +0d1681b4b578cf034f34b573a36b3d390fae590b data/byg/loot_tables/blocks/blue_enchanted_sapling.json +bcd47723af53116081ce6028243ead5a908c49f8 data/byg/loot_tables/blocks/blue_enchanted_sign.json +19a7a3a83e0c65375c7b990dc058b70a1441c308 data/byg/loot_tables/blocks/blue_enchanted_slab.json +0f069d864ba0bb0345a041f8f4048ba5a43335cf data/byg/loot_tables/blocks/blue_enchanted_stairs.json +a54c79716c0220bd675688da40527c9edb0602b8 data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json +057f0ed0b5006877f4a0592c365f8ed7810bd924 data/byg/loot_tables/blocks/blue_enchanted_wood.json +0c5cb822db3a9829b0620f29da63d1045629fa67 data/byg/loot_tables/blocks/bulbis_bookshelf.json +595381501134bb13a4ee765a9315ba604064d169 data/byg/loot_tables/blocks/bulbis_button.json +e01348dc0357b0c8c47ff3a62cc556c8b888a71b data/byg/loot_tables/blocks/bulbis_crafting_table.json +ad899f12b1499ff40afd1a9d9bbfda1d7690e2e9 data/byg/loot_tables/blocks/bulbis_door.json +dd2dffeaabc3fa13171969a2ef330c5b9487be41 data/byg/loot_tables/blocks/bulbis_fence.json +1be5d147f7ccf2e2a6eedd380a2a38d5502943a4 data/byg/loot_tables/blocks/bulbis_fence_gate.json +74631a3151f3b2a36c30b868a289658450189677 data/byg/loot_tables/blocks/bulbis_oddity.json +c461f68e2240cbd078b34c482e6696353332a873 data/byg/loot_tables/blocks/bulbis_planks.json +6674ce482edc3d32b357fbf6e4877cbbd7f6dbc4 data/byg/loot_tables/blocks/bulbis_pressure_plate.json +9d882e8ff0cef2c29c6c43a02fd14fea1a5319b9 data/byg/loot_tables/blocks/bulbis_sign.json +07b51baed67ba30ae75d2c494d0520376457d685 data/byg/loot_tables/blocks/bulbis_slab.json +6211f402d284195f0778f3bfe5710a58c1fad342 data/byg/loot_tables/blocks/bulbis_stairs.json +86d55439b962ecd2d4658043dbd9027118031600 data/byg/loot_tables/blocks/bulbis_stem.json +eba7ee9517ff4e3057f332593963186a3228854a data/byg/loot_tables/blocks/bulbis_trapdoor.json +d7be00dfe0094a7238c054fd169480be05f11fb2 data/byg/loot_tables/blocks/bulbis_wood.json +b5e5e61fc189f7e93e5f01948365267eadd50d85 data/byg/loot_tables/blocks/cherry_bookshelf.json +49139760e2a1305e4594e0eb30a5cd70a39b74d8 data/byg/loot_tables/blocks/cherry_button.json +8d293de2161113fb7fdba40412777e7d51dde49e data/byg/loot_tables/blocks/cherry_crafting_table.json +f8231633a7af9e108d688449a9d991562bb1e438 data/byg/loot_tables/blocks/cherry_door.json +1e790e6c46303a045fdee744a79807dd20bfd784 data/byg/loot_tables/blocks/cherry_fence.json +ee814b1a0941dd759f759cbd54e4c57218a2bc30 data/byg/loot_tables/blocks/cherry_fence_gate.json +dbfb4d8108716b6dba23068ed0992d48b1663406 data/byg/loot_tables/blocks/cherry_log.json +5c522ebbba2d329398fc7492a179dd42d7f61cfa data/byg/loot_tables/blocks/cherry_planks.json +1dbe66558c57a924dcf63bcb406944087f5606d3 data/byg/loot_tables/blocks/cherry_pressure_plate.json +0822fb04327028c9b85e4a627f97ac599e3f7211 data/byg/loot_tables/blocks/cherry_sign.json +ea71277b65c118cceec88878b09f84910c0dbef2 data/byg/loot_tables/blocks/cherry_slab.json +290721066f81c28e5297e32dcc83e3a05b10b557 data/byg/loot_tables/blocks/cherry_stairs.json +8c17c9488fd135bd9d97f28f4fb93f382af14fc1 data/byg/loot_tables/blocks/cherry_trapdoor.json +7295a76982b819a8c179eb2eba83ee2b07d6b1d0 data/byg/loot_tables/blocks/cherry_wood.json +59442b7de1f556c5f119b2fd39a6199760af0740 data/byg/loot_tables/blocks/cika_bookshelf.json +12d8988ee520e5ea93a93ceb66bf17c0cd625f07 data/byg/loot_tables/blocks/cika_button.json +675e1dbd42eb7f23174c9789ec5c382b2a6940fa data/byg/loot_tables/blocks/cika_crafting_table.json +57218301da8352a3d3b13db33ed5f577bd67940f data/byg/loot_tables/blocks/cika_door.json +a493c4a5e2e853e966b80e3b0b19e4e5b6e154cc data/byg/loot_tables/blocks/cika_fence.json +84abe257a186c35df8ccf5f97c90755621238499 data/byg/loot_tables/blocks/cika_fence_gate.json +55df31569f95b13198f151682a70b95652cae9c8 data/byg/loot_tables/blocks/cika_leaves.json +00587f01878b3edf9189317fb77a25079ff33cf2 data/byg/loot_tables/blocks/cika_log.json +821647bc3bcfed541aaef76b688d1f5c9980bc9e data/byg/loot_tables/blocks/cika_planks.json +88bacfb36c2bd4870af1a8a1599666e1ce1dd1a6 data/byg/loot_tables/blocks/cika_pressure_plate.json +4b252abfa8d2b7da5d962dee442754fd2a8e0691 data/byg/loot_tables/blocks/cika_sapling.json +51293e5484b4090f1cd569e840387823487512ea data/byg/loot_tables/blocks/cika_sign.json +970b89fda27cca7e218f13b30e301c4110f9ce27 data/byg/loot_tables/blocks/cika_slab.json +02ffb96ed8c6f130521edff09a35e27435d6e1ce data/byg/loot_tables/blocks/cika_stairs.json +e368d2717d02580ba979c1104655c7021f917c10 data/byg/loot_tables/blocks/cika_trapdoor.json +9b0d8efd2287b02acb4f202f64ba4dd31aff78e8 data/byg/loot_tables/blocks/cika_wood.json +2a987d4b82da48bc2bb4a4f40ea9aa022fad0243 data/byg/loot_tables/blocks/cypress_bookshelf.json +d6c8173c96eb7ad2017839ad9b01bea40b12b3a9 data/byg/loot_tables/blocks/cypress_button.json +1b1fa295ca6f787e315c51e5e7add80dd0509c2e data/byg/loot_tables/blocks/cypress_crafting_table.json +96912762a8994c359445b50140f67efdd5f8f6e9 data/byg/loot_tables/blocks/cypress_door.json +2cb5a41b65b10b1740d3569d391a02cf5db1d084 data/byg/loot_tables/blocks/cypress_fence.json +3e78103c31307f1ce330552cd16f72b7e92a6194 data/byg/loot_tables/blocks/cypress_fence_gate.json +4a62e2e0339f29a0376d95fc3f2816a79b93f992 data/byg/loot_tables/blocks/cypress_leaves.json +0e63980dbb0de05135b58d1a48db4df982e2c1ec data/byg/loot_tables/blocks/cypress_log.json +7992e0e4b6cb7ca9738c03637b1dcb33d424d6fa data/byg/loot_tables/blocks/cypress_planks.json +89ab7c6662275e830254800e2aa944a42381ba09 data/byg/loot_tables/blocks/cypress_pressure_plate.json +328750bd67e32e8135bbbc951766d7d27050976b data/byg/loot_tables/blocks/cypress_sapling.json +a3603512c15df50f9f87a48eea8d50e3ece6bf33 data/byg/loot_tables/blocks/cypress_sign.json +2a26abe5921371645d5c29ba228a2df7c5a6c005 data/byg/loot_tables/blocks/cypress_slab.json +4e521427bd0f715ab00dd317e4cffd3a63715055 data/byg/loot_tables/blocks/cypress_stairs.json +411f1f96671e9f32cfb389f753e51627b0755744 data/byg/loot_tables/blocks/cypress_trapdoor.json +cc9b054fd754fe661b851fdccab29ae698fa5667 data/byg/loot_tables/blocks/cypress_wood.json +3ee0a618d9811ececfae74b3233d817b59d05c03 data/byg/loot_tables/blocks/ebony_bookshelf.json +ba378e78ad1c6544d9a68bdff373146f38b2bd50 data/byg/loot_tables/blocks/ebony_button.json +3bd81f5f13742fde6cb6bed10df0d5f8be5230a2 data/byg/loot_tables/blocks/ebony_crafting_table.json +805323f4b0f71a2737ebc7693bc27f751dc9fdeb data/byg/loot_tables/blocks/ebony_door.json +dab7a87c949f8898446c2e0479849264e03776f4 data/byg/loot_tables/blocks/ebony_fence.json +354f7594975c7a1d11813e18d913cf620205b454 data/byg/loot_tables/blocks/ebony_fence_gate.json +af29295ccf2ef1198cdeac8447acb24244600b47 data/byg/loot_tables/blocks/ebony_leaves.json +eb29e5912d02f647a4f30e67ca48e1a6acd8141f data/byg/loot_tables/blocks/ebony_log.json +5e5915f7b4071f00a04cc38d0de945a57805a846 data/byg/loot_tables/blocks/ebony_planks.json +ed99a88b40747c91bd0b9ebf4f6ecb31038ec9be data/byg/loot_tables/blocks/ebony_pressure_plate.json +4f8a5ccb39aceb55ffd8fe96e626bddb7f37a122 data/byg/loot_tables/blocks/ebony_sapling.json +890491e06ac8ddb3e260426ba122b8bdb5285a86 data/byg/loot_tables/blocks/ebony_sign.json +3f4f0d31c0d7a807d3ac06c85c0fc7f49f19e4fd data/byg/loot_tables/blocks/ebony_slab.json +472d403b4c2af4d15037eb5fd6029b805e3d2be7 data/byg/loot_tables/blocks/ebony_stairs.json +4f8a86a164127df05164de17d5367190210f5eb7 data/byg/loot_tables/blocks/ebony_trapdoor.json +b69232a66f52aa28328bd38ec4899e37433538af data/byg/loot_tables/blocks/ebony_wood.json +0168f2e2384caaf8fc22f47673991481b6221fe5 data/byg/loot_tables/blocks/embur_bookshelf.json +b7f85dc85fb37f53cff06087d75ef4482a048911 data/byg/loot_tables/blocks/embur_button.json +9395cbef764c8c16172e89f8ec25226dcb5a8a4b data/byg/loot_tables/blocks/embur_crafting_table.json +e7af1a80adc7aec4f0da35266a60e328c6da0deb data/byg/loot_tables/blocks/embur_door.json +db3df958cd5ee0ee95ec71517504dfd312474fdf data/byg/loot_tables/blocks/embur_fence.json +9dc9a13ae5457416956c881d846d987965d33d94 data/byg/loot_tables/blocks/embur_fence_gate.json +a3350dd5fcbb530ac629ebbee0c293cb61a789e4 data/byg/loot_tables/blocks/embur_hyphae.json +fa9e32d68f5b7808734ee9b05b254f5c854d0b7d data/byg/loot_tables/blocks/embur_pedu.json +ad3b61d1ac1ae72c11d0063892f1237e0db9f01b data/byg/loot_tables/blocks/embur_planks.json +90c0aef255c9bb72581bdda988567a0d0a030332 data/byg/loot_tables/blocks/embur_pressure_plate.json +0adf4644e1a7ad8d0e91d0c09a50dcdf4f6c1b34 data/byg/loot_tables/blocks/embur_sign.json +3767acdaa7aa00e41e43f82d24dc2918a5065cb2 data/byg/loot_tables/blocks/embur_slab.json +10b81ac964bddb26ba24795ec3b84e48e39baf0d data/byg/loot_tables/blocks/embur_stairs.json +1a8d14bfb2189d164579491f118ef4ced6e93c82 data/byg/loot_tables/blocks/embur_trapdoor.json +95237f1e078a532c3d3be4ec12eaa4e19eceb3e6 data/byg/loot_tables/blocks/embur_wart.json +6dab609b4aca04dd11d471d868c5327a259b4993 data/byg/loot_tables/blocks/ether_bookshelf.json +de31bf45cf261536916dce7ff0575bc91acd772c data/byg/loot_tables/blocks/ether_button.json +eb8ff40507f2c478cdbed14cb93ce902d801f81e data/byg/loot_tables/blocks/ether_crafting_table.json +13039c73b18a31b37073b6225e92e9313022e3b9 data/byg/loot_tables/blocks/ether_door.json +544618786c19bc26e7d0dd91a09c92a8cc5c5d97 data/byg/loot_tables/blocks/ether_fence.json +2b763bc11728312d1ecb7add70d86af6fd965679 data/byg/loot_tables/blocks/ether_fence_gate.json +b663943b9433c5da649dbda297c68229e9c590bc data/byg/loot_tables/blocks/ether_leaves.json +43bc869c206afa1599f1baa3ee5644a633f15049 data/byg/loot_tables/blocks/ether_log.json +e503f50800df558be93f2e0a753037a9e1d2d18d data/byg/loot_tables/blocks/ether_planks.json +4b6b086da91237548b09966d47a9739297889700 data/byg/loot_tables/blocks/ether_pressure_plate.json +b9208a42125e3e73df4af3af11087115ff3313d9 data/byg/loot_tables/blocks/ether_sapling.json +f8fe8bbe6e79f717b73b07f5d65ad30d3bb5a730 data/byg/loot_tables/blocks/ether_sign.json +433fdf26f9824266a03c165e19b339d29c0ff844 data/byg/loot_tables/blocks/ether_slab.json +7bc0058d886b6dc208e3eabe70a065acdd0f1a21 data/byg/loot_tables/blocks/ether_stairs.json +091865af7e13ea37079c239047475b32446916fe data/byg/loot_tables/blocks/ether_trapdoor.json +d3044891c38a54013af2fd0348a36e5eaa62a80d data/byg/loot_tables/blocks/ether_wood.json +e4d12e17ac553d5173066ddc3624acb1ca3f4139 data/byg/loot_tables/blocks/fir_bookshelf.json +5874245921d373b55130cfd8eb5564b3fc3d4c54 data/byg/loot_tables/blocks/fir_button.json +0fad79017c381ff2e74d8fe899eab833a68885e2 data/byg/loot_tables/blocks/fir_crafting_table.json +f2c9f169ecd840d2a1a2909665a45103eeac5ad1 data/byg/loot_tables/blocks/fir_door.json +e19a33b206b462e7d0f3af1f996b40c2d06196b6 data/byg/loot_tables/blocks/fir_fence.json +9efed1538210e75ac740f40b150ab79b119ebc1c data/byg/loot_tables/blocks/fir_fence_gate.json +14de6602574f27426d1032f128f2c8f3bbbaaac7 data/byg/loot_tables/blocks/fir_leaves.json +246adac2b18d13697cd972677dc53e520d5cd6dd data/byg/loot_tables/blocks/fir_log.json +1476e32517cb4cd7d05a6de23272f6f26df47702 data/byg/loot_tables/blocks/fir_planks.json +cd8984a9647d0c9b993749d5410b5752d9ecf3d7 data/byg/loot_tables/blocks/fir_pressure_plate.json +996021484b35ae60cda9d0c4c41cd440960cafb5 data/byg/loot_tables/blocks/fir_sapling.json +20a622c0f60db8c438361e98b01d3ba959aba4d8 data/byg/loot_tables/blocks/fir_sign.json +e0532780cf27bed093c40c85bb481281b15c1df9 data/byg/loot_tables/blocks/fir_slab.json +2feed78295b8ce019943fcc11529410a7c8c1558 data/byg/loot_tables/blocks/fir_stairs.json +97e07ad024ac7940e407c3ff19cc17c590958136 data/byg/loot_tables/blocks/fir_trapdoor.json +c9207205d9bcb4bd4670fa0a5d9e1e2aaafadc1a data/byg/loot_tables/blocks/fir_wood.json +6c7d16dc5d635e62e8661f66b0f67fbb35cf048d data/byg/loot_tables/blocks/green_enchanted_bookshelf.json +b549f3488c7fecf29ab4e79ff11b42778eaaae2a data/byg/loot_tables/blocks/green_enchanted_button.json +0e75b4976a43a32966f4a36d949fb35d99c2e0bb data/byg/loot_tables/blocks/green_enchanted_crafting_table.json +5fe25931a0f2e761fe437e893d6a2911fcec80a8 data/byg/loot_tables/blocks/green_enchanted_door.json +398931f18eede2a8c3504af241e1c2bf6d4c21a8 data/byg/loot_tables/blocks/green_enchanted_fence.json +c31eb2bc4be1e7298a6f06f90a91bf9fdc5f78bb data/byg/loot_tables/blocks/green_enchanted_fence_gate.json +5e84ede77476074613cf2adb48008332fbac27bd data/byg/loot_tables/blocks/green_enchanted_leaves.json +5ad755f54796da38121eaa71f8dc06720f39b265 data/byg/loot_tables/blocks/green_enchanted_log.json +06fdf93f7007e906a53e40d0027b5c30648d56aa data/byg/loot_tables/blocks/green_enchanted_planks.json +e5b1ee5302721c12b1f1ac5c3c0b826a90548f6d data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json +0a4fe5c3894fd0a2339cb993e67c31cd31aabfa6 data/byg/loot_tables/blocks/green_enchanted_sapling.json +e5a4e177d936c1036e0f143b8d94f5ddbbd59d32 data/byg/loot_tables/blocks/green_enchanted_sign.json +f83fe4d2fbd3a581e0bf532d576f9914572c94ea data/byg/loot_tables/blocks/green_enchanted_slab.json +2adea58c0ccc8e618bec4d9c91fa98121d0ae275 data/byg/loot_tables/blocks/green_enchanted_stairs.json +c700c1692e91d3aede561b5a60a8cc0564943f49 data/byg/loot_tables/blocks/green_enchanted_trapdoor.json +dad206dce3791f68b071fd91bef6ed133949028d data/byg/loot_tables/blocks/green_enchanted_wood.json +6aab293227a699e18172892422925a3bd2c97216 data/byg/loot_tables/blocks/holly_bookshelf.json +fdb353fcfb9fdb2e2dcc12e5f17bc21f3f2fec5e data/byg/loot_tables/blocks/holly_button.json +949bd326325602518a3947a5944b17dbb6ddb8d7 data/byg/loot_tables/blocks/holly_crafting_table.json +face99833ef5c575a2bab9a0afe657015130e55e data/byg/loot_tables/blocks/holly_door.json +6e7d5c2674a68cddb929ad987e28d89b1c1e1ac7 data/byg/loot_tables/blocks/holly_fence.json +40506545ca9afc7b4d46c19494a854dfc6dcda36 data/byg/loot_tables/blocks/holly_fence_gate.json +9cfbb9e0e95b3caf0a561929d3a1551d0c5e5485 data/byg/loot_tables/blocks/holly_leaves.json +06a596434b57f4fa2c4d4de7a36398902470c49e data/byg/loot_tables/blocks/holly_log.json +cd96eef572ba4ca1ff83fdf57f2cf94096dbf07b data/byg/loot_tables/blocks/holly_planks.json +1a71c8a9264268015e369cd11f43497ca0374e16 data/byg/loot_tables/blocks/holly_pressure_plate.json +7885f03952cf97839a71d10bb9c9c348c9aef35f data/byg/loot_tables/blocks/holly_sapling.json +212230ee0e3e98fcb81d04e8e368313af8d4b0f8 data/byg/loot_tables/blocks/holly_sign.json +c9e9ef04edff91ff8c47bfab23f123b9503947f1 data/byg/loot_tables/blocks/holly_slab.json +65fe80bb4d0eff662e3309232a7be24dc4e0b4c2 data/byg/loot_tables/blocks/holly_stairs.json +a38dba0608bd03cc1466f8664a51c93c9e79f917 data/byg/loot_tables/blocks/holly_trapdoor.json +cf8a3f98c0a18f76fa639ef44ac2048dee402e80 data/byg/loot_tables/blocks/holly_wood.json +617d1ff1355df8cd85bcfbc580f27e4c134aa400 data/byg/loot_tables/blocks/imparius_bookshelf.json +b3333f84cc5591023f1302010214689344fed46e data/byg/loot_tables/blocks/imparius_button.json +0c07fdc66902907586ae5b18a577a04af9192ef3 data/byg/loot_tables/blocks/imparius_crafting_table.json +5b10c88e9a663f20eb36c56065e04bc53c5cb1e4 data/byg/loot_tables/blocks/imparius_door.json +9d176d75dd8b746c9b0e1ffd4effaf2762dcdb15 data/byg/loot_tables/blocks/imparius_fence.json +8f87a28f8b66d4a7243a7f9838defee31e3c19ac data/byg/loot_tables/blocks/imparius_fence_gate.json +c07ea3ed770aabf2d5b66d4adca7a64c1e6672b1 data/byg/loot_tables/blocks/imparius_hyphae.json +1088cec601916a675db4e11c983b7d640eef06fa data/byg/loot_tables/blocks/imparius_mushroom.json +56d858a569070ed18176e11b6772617e4f21c593 data/byg/loot_tables/blocks/imparius_planks.json +973ef7f2229f184ecf3a5628f537fc8d0837edc7 data/byg/loot_tables/blocks/imparius_pressure_plate.json +0cd40c8b2f29362439a74d019c3cc8858a9abf9c data/byg/loot_tables/blocks/imparius_sign.json +a8feab04e213ef0c5264fdbbdf4a8429eafb138e data/byg/loot_tables/blocks/imparius_slab.json +93f9d3368bc25ee99f2bdc516da9275be7eb7311 data/byg/loot_tables/blocks/imparius_stairs.json +6969fb304a608e455ea0fe150f278f18eb2c477b data/byg/loot_tables/blocks/imparius_stem.json +ba29b9a27f4f46322e873ec8f90aff1d43310f49 data/byg/loot_tables/blocks/imparius_trapdoor.json +c29a661f6985855f0bd2a3bc112c327a97c31b37 data/byg/loot_tables/blocks/jacaranda_bookshelf.json +c58443d24afbd68f3f0ab4d935dcc69749e54f8a data/byg/loot_tables/blocks/jacaranda_button.json +b68d3e13b7b537de545e6d5c6dbbf455a81f5e82 data/byg/loot_tables/blocks/jacaranda_crafting_table.json +f1e20eb713fb36a3b09dff4f450ebb17ff31ffcd data/byg/loot_tables/blocks/jacaranda_door.json +4ff2eca2881000578b3feaf8b295fe32fd4509bf data/byg/loot_tables/blocks/jacaranda_fence.json +f18cdeff16b8689765be6e10533a291f0f09f355 data/byg/loot_tables/blocks/jacaranda_fence_gate.json +680a1325624cade3da619beb51e3fd81b5bbb304 data/byg/loot_tables/blocks/jacaranda_leaves.json +f1cbcc46454c4c1601be19bc6563c89493b91657 data/byg/loot_tables/blocks/jacaranda_log.json +a11e9d79661715cd5e587a5aeb13531338f4b999 data/byg/loot_tables/blocks/jacaranda_planks.json +6741c6a9f2206e97f8e73d79b98df205383e2e33 data/byg/loot_tables/blocks/jacaranda_pressure_plate.json +22cc947f670133aa5b644493f376a595ce2c2689 data/byg/loot_tables/blocks/jacaranda_sapling.json +90fb8605bb2b00370fdfa9fc091fb3b57fd711f5 data/byg/loot_tables/blocks/jacaranda_sign.json +b957d0daf4d30bc371849cfe57250c53136fb542 data/byg/loot_tables/blocks/jacaranda_slab.json +3e6f04a70599d6a1b5b48c7bcde304c294ecd4f5 data/byg/loot_tables/blocks/jacaranda_stairs.json +a5d17a8dc75396117da27bd6f39eb2f93942938c data/byg/loot_tables/blocks/jacaranda_trapdoor.json +c693be4ae360082f75afb332d34a1403275d1133 data/byg/loot_tables/blocks/jacaranda_wood.json +1f7307feaa7c5f88d79bf6192c051c71fcd903b4 data/byg/loot_tables/blocks/lament_bookshelf.json +c2ec7490964611152bd8d201829ca2322dd1f144 data/byg/loot_tables/blocks/lament_button.json +29ab02e85355cfe1eaeea88cbebfa84d1c47f6bf data/byg/loot_tables/blocks/lament_crafting_table.json +2c816bad3d38065398927b88f8b11ee39d0e236e data/byg/loot_tables/blocks/lament_door.json +a5e0f9558d180411a4fea52386ff01bda0f6ec35 data/byg/loot_tables/blocks/lament_fence.json +bef7c968e9982430ffbfcde8fe2930f385382c82 data/byg/loot_tables/blocks/lament_fence_gate.json +2ed5076614ef346ab5f291bbc9f8de855fb18695 data/byg/loot_tables/blocks/lament_leaves.json +358ef0d6794b61d64a0c91ff92311e6e63929d22 data/byg/loot_tables/blocks/lament_log.json +4513d6d811cfdf1c11792f6255bf287ecc3c6588 data/byg/loot_tables/blocks/lament_planks.json +d417ba84a2a9f24556965851dcc50ee9c197d1f5 data/byg/loot_tables/blocks/lament_pressure_plate.json +877369b20bececa64c06894cd49f4ccf1d4dc093 data/byg/loot_tables/blocks/lament_sapling.json +561602e5a6dbbd8003a80e4b3e5227172a976df3 data/byg/loot_tables/blocks/lament_sign.json +ebdbd9cdfe68d2835ebd9d8c1cd036af146a458f data/byg/loot_tables/blocks/lament_slab.json +635568303f5a683c088c8cb80c6e94d42f5e3a81 data/byg/loot_tables/blocks/lament_stairs.json +2299005441ef2e8929f870bf4582abc214789810 data/byg/loot_tables/blocks/lament_trapdoor.json +ff1f2a78fba8a4f529341f0a07f3c8a435fd16c0 data/byg/loot_tables/blocks/lament_wood.json +263f650c56365b5419bda77c9b9f8a778a24e48d data/byg/loot_tables/blocks/mahogany_bookshelf.json +3dc8f63f085946637ffec8beb7e4198b2e692259 data/byg/loot_tables/blocks/mahogany_button.json +e0ce5a418728f6841b622ab683eb0d78b4a90aa4 data/byg/loot_tables/blocks/mahogany_crafting_table.json +049aaee5656c6e535d5910e2bfe1e5e5277774ba data/byg/loot_tables/blocks/mahogany_door.json +c2a4ea12f0bab802c579588b60ebad97263c70e5 data/byg/loot_tables/blocks/mahogany_fence.json +3d8dbcdcef4188023c50a508446d368e79e86b78 data/byg/loot_tables/blocks/mahogany_fence_gate.json +50e61963e5cb6f07dfbb8b100d91c736feb1dc1e data/byg/loot_tables/blocks/mahogany_leaves.json +e38ad99499e046e24350f41fefb885aebdeaaec8 data/byg/loot_tables/blocks/mahogany_log.json +d3181fe10361c6592d63a6bf0d66ca24380a1306 data/byg/loot_tables/blocks/mahogany_planks.json +9cfd63b5117c4a803855812ec754fbc280ceb4bb data/byg/loot_tables/blocks/mahogany_pressure_plate.json +e8f1b378ec7c1b308b64b6926c3ead209720472e data/byg/loot_tables/blocks/mahogany_sapling.json +860aacca273f54788a4e56b4f5825381910780a6 data/byg/loot_tables/blocks/mahogany_sign.json +e757ae3e488a2fea6b7207bf3b2b7ff7e47d5111 data/byg/loot_tables/blocks/mahogany_slab.json +d2025adccf79adac59eb72abf05c66e564952f8f data/byg/loot_tables/blocks/mahogany_stairs.json +c042a000aa5cd9c04279744b10819d09d6070896 data/byg/loot_tables/blocks/mahogany_trapdoor.json +2b07688b37538dbc64735151c2fda483459462b1 data/byg/loot_tables/blocks/mahogany_wood.json +5869e37e37b598ad21316760283878b287b4dac5 data/byg/loot_tables/blocks/mangrove_bookshelf.json +52619fa68addf54013450eb2a0e69f1de703d41f data/byg/loot_tables/blocks/mangrove_button.json +804d27a8c25f02570199b1893e9855aed9afc00f data/byg/loot_tables/blocks/mangrove_crafting_table.json +a1214ffaad5f0823ea924f1805be28b3cdd8ff3d data/byg/loot_tables/blocks/mangrove_door.json +4cb5483007a41af573ac7345764317c62f42529c data/byg/loot_tables/blocks/mangrove_fence.json +0a139d8311b6625e39259c803572c3c6d0390a94 data/byg/loot_tables/blocks/mangrove_fence_gate.json +a39c0519905ec44733602463ab886f6141e9ac59 data/byg/loot_tables/blocks/mangrove_leaves.json +8d944d95e1b9915953f42923f232730fcf9c8967 data/byg/loot_tables/blocks/mangrove_log.json +1d2cd585449fcbf6d5e26f627e1812433f726b11 data/byg/loot_tables/blocks/mangrove_planks.json +11a71566091979cf49c3b1921795e465ac1062d7 data/byg/loot_tables/blocks/mangrove_pressure_plate.json +666d791bb9344fe836ef2c08ebe83e9369b24444 data/byg/loot_tables/blocks/mangrove_sapling.json +f2a2b07d12a4ed1cb862cbbc6fa71ee34e760837 data/byg/loot_tables/blocks/mangrove_sign.json +a5366c49bccd5e890c639b9e547281f8048a3074 data/byg/loot_tables/blocks/mangrove_slab.json +c9076179a500f5b6462dab1d6f32f9ce59a111bf data/byg/loot_tables/blocks/mangrove_stairs.json +5a315e07623694581afb25388037c109c1cb401f data/byg/loot_tables/blocks/mangrove_trapdoor.json +350164e66ece2a6f74fc9d87baefd5be8270039b data/byg/loot_tables/blocks/mangrove_wood.json +629984e659006ebf6e2c805b02a108190cc41156 data/byg/loot_tables/blocks/maple_bookshelf.json +2ecf86915d1c3f6c7ad5d1628b3ac66435d542fb data/byg/loot_tables/blocks/maple_button.json +5e9156759cdc6e854de983cfed5f5a72101c2f56 data/byg/loot_tables/blocks/maple_crafting_table.json +a10dbefb9f1457e892ac8d858eb4b3626bc8dca3 data/byg/loot_tables/blocks/maple_door.json +c9cbc3090fe574851fa403c9ceb31a7000c64e16 data/byg/loot_tables/blocks/maple_fence.json +bf00fd4c5eddd0103ca1681bc3bdf5bf84306a59 data/byg/loot_tables/blocks/maple_fence_gate.json +b2da95eb3f0b9b33cf0c6a8cddf2051fbbe6c97a data/byg/loot_tables/blocks/maple_leaves.json +bd557dedf878cf1af23d2b4cc02b11fdd493a263 data/byg/loot_tables/blocks/maple_log.json +2a63c6f1cc7ff86f2ddd9e399ca55ae60a281a5e data/byg/loot_tables/blocks/maple_planks.json +adc76095aace1eb83000def7e2498490b9363ba8 data/byg/loot_tables/blocks/maple_pressure_plate.json +2b67057c6123b6f0b590ab15d5ed7a1b0928e0a0 data/byg/loot_tables/blocks/maple_sapling.json +2a345a430420ceea2890592d2cd85870c88b85c5 data/byg/loot_tables/blocks/maple_sign.json +3ef085da276494e2cf2de893c6743d3c32d10347 data/byg/loot_tables/blocks/maple_slab.json +a5fb1860c9c52be08b0e91a84a9792b1cee1090c data/byg/loot_tables/blocks/maple_stairs.json +66d432c83687230d4e50fd57963f232f2842d1d4 data/byg/loot_tables/blocks/maple_trapdoor.json +8876403851e5b963ac21b9a2ed051adaded220c1 data/byg/loot_tables/blocks/maple_wood.json +4702d5c0f6a2b25b4f302973d2c4f555af1341fd data/byg/loot_tables/blocks/nightshade_bookshelf.json +814c8ac39feac05aae58e360802d972a10212d8b data/byg/loot_tables/blocks/nightshade_button.json +4519752a66291c05e25ccc18bfb3c140c6734274 data/byg/loot_tables/blocks/nightshade_crafting_table.json +0c8c0215ea945ffc9bf04002d890d64f98b604ae data/byg/loot_tables/blocks/nightshade_door.json +a132dec792ace6cfabc68dccbb58e390a2cb8b93 data/byg/loot_tables/blocks/nightshade_fence.json +44d8801c350354218dbd4a53a8a31a1ac355287f data/byg/loot_tables/blocks/nightshade_fence_gate.json +cb601489fd02c84f162ff6bf5665ef9524618881 data/byg/loot_tables/blocks/nightshade_leaves.json +ca45f5a8939ac2a2c236d56ced6a5da94a5ccc9a data/byg/loot_tables/blocks/nightshade_log.json +aac01b585a366d2ce73e64901e387ba17e1b7493 data/byg/loot_tables/blocks/nightshade_planks.json +41bebeaa015eec6dbbeb47dacb2e0265d537879c data/byg/loot_tables/blocks/nightshade_pressure_plate.json +77cf75bd900ef2c6d12d48f3c9656499c77fdd27 data/byg/loot_tables/blocks/nightshade_sapling.json +f34e8175e83063621b4ad7889fde88c61e050aa4 data/byg/loot_tables/blocks/nightshade_sign.json +94494fd5fe8a360a3a4d9ca42dd627acb16b0abf data/byg/loot_tables/blocks/nightshade_slab.json +27aae129c1fb02ed5716ea63def045cca3da2121 data/byg/loot_tables/blocks/nightshade_stairs.json +ec1f62abdf0591417697f9282b1ece0883da1413 data/byg/loot_tables/blocks/nightshade_trapdoor.json +0715d28bcfd4da6d6f08b77f6ecb36916a0d1a48 data/byg/loot_tables/blocks/nightshade_wood.json +c14b49e5dab22aa4a8daf12967465bfe0e355e06 data/byg/loot_tables/blocks/palm_bookshelf.json +becfcc753b7e290a1e16e46e438407d674eb17a1 data/byg/loot_tables/blocks/palm_button.json +1ca4053aa7c7d1b0d9f340f6ef56eee4d95ddb1c data/byg/loot_tables/blocks/palm_crafting_table.json +0f6c58721a9df14985003cf8cb5ac243c2e8b8b7 data/byg/loot_tables/blocks/palm_door.json +66a55df51160212bf720178edfe4834f79075306 data/byg/loot_tables/blocks/palm_fence.json +53890d04c1e7859fbb12279e6a2aae375fbc0ba9 data/byg/loot_tables/blocks/palm_fence_gate.json +f7e3012b58003cdea40fe9ced9b2c61f81c1c657 data/byg/loot_tables/blocks/palm_leaves.json +d57c94805a9e752de06de36a9f3a47d30add395e data/byg/loot_tables/blocks/palm_log.json +0c83cae2ca6373b5a9b63e8e10e9800554efdb83 data/byg/loot_tables/blocks/palm_planks.json +6a218b9459b19d60594174ff5ccce7414f9cac3b data/byg/loot_tables/blocks/palm_pressure_plate.json +72a6f0da7393777b7e44a5d90be190102b34e875 data/byg/loot_tables/blocks/palm_sapling.json +efadd140742c5f8038205b486dcdeee6ff04b5ef data/byg/loot_tables/blocks/palm_sign.json +b9bb916c422a166d0018176889d87f737269b5ae data/byg/loot_tables/blocks/palm_slab.json +7d898de55d16b98e4f648183a540153ef8f9d5e4 data/byg/loot_tables/blocks/palm_stairs.json +b4071bc2dced2987785b5caad366db7d5a3cf54a data/byg/loot_tables/blocks/palm_trapdoor.json +16caf1e2ea77633ea66fef0e438f3cefa4842b12 data/byg/loot_tables/blocks/palm_wood.json +69771a99a92c025c6e3c5207e3af826969b9a231 data/byg/loot_tables/blocks/pine_bookshelf.json +ca609743f70fc0985a442ec42a6427f1487e86bb data/byg/loot_tables/blocks/pine_button.json +eff456dae9b7543e31f464100c0e77da33dd6c58 data/byg/loot_tables/blocks/pine_crafting_table.json +51ef2257ad09a075b1d11cc012d83f44a65ca543 data/byg/loot_tables/blocks/pine_door.json +c64f58c59f3a9f54a6bfca8685da6f756db08c3b data/byg/loot_tables/blocks/pine_fence.json +03cf20339dabe3e8a15df4e0be88a67d7a447c71 data/byg/loot_tables/blocks/pine_fence_gate.json +ed6fecef9a5041e1578541513b41fe99a333126e data/byg/loot_tables/blocks/pine_leaves.json +166ce1afa4c38eab18e7c4fea9526c443e1ed130 data/byg/loot_tables/blocks/pine_log.json +369d43949a2db83091b6e5b6391f96a475f004dc data/byg/loot_tables/blocks/pine_planks.json +e623ca89843e1c7b1c0d7a6481d475e9709426b1 data/byg/loot_tables/blocks/pine_pressure_plate.json +8536e4138de16178af5fac53345ed1402f026004 data/byg/loot_tables/blocks/pine_sapling.json +c5141fae535dd171f40f0114d72d30dfe08af503 data/byg/loot_tables/blocks/pine_sign.json +3a6ff1f257d5cbd4094578afa36092c766cd591d data/byg/loot_tables/blocks/pine_slab.json +e347a4aa2c1562ae95bc58b6a372ef1eccc88088 data/byg/loot_tables/blocks/pine_stairs.json +cbf438d48ea50c26c461e950b192d1a66823c4ac data/byg/loot_tables/blocks/pine_trapdoor.json +896ad8d7a99b6e98c56f7230c9ce67e79637512c data/byg/loot_tables/blocks/pine_wood.json +2fa63b2a5396d4df603e92b8b29b4c4384931631 data/byg/loot_tables/blocks/potted_aspen_sapling.json +4598327410879804065f322c19f9c0d8684f53ce data/byg/loot_tables/blocks/potted_baobab_sapling.json +e188596154d068bf9b0fdb67c4de29eb15b29df2 data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +0d537fb41122fa2f964fb643188640b46d33459a data/byg/loot_tables/blocks/potted_bulbis_oddity.json +2f816d4b4dda73dc4988569c49b409719b62a67b data/byg/loot_tables/blocks/potted_cika_sapling.json +e73aa66de96bcd5fb97a5c49259e0b11f58c039b data/byg/loot_tables/blocks/potted_cypress_sapling.json +f44f25b14f30dbcd461a250538a8c4652da4824c data/byg/loot_tables/blocks/potted_ebony_sapling.json +7600e1261afe20d390231d4c21b647a996ed6ec5 data/byg/loot_tables/blocks/potted_embur_wart.json +35a0c47f2c808513eb3fb4a3b0bb02b9be8ce29f data/byg/loot_tables/blocks/potted_ether_sapling.json +3b238b200a850dc0703d9425e2e6ea591ca9a4f5 data/byg/loot_tables/blocks/potted_fir_sapling.json +59869c3299254295a5c866968304b3f6aff10eb1 data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +e5a110ae7b7d29754b9a0c6b4e03721f9a26a757 data/byg/loot_tables/blocks/potted_holly_sapling.json +ddf8ba1fc574c5c51d474a30377997c8143e741d data/byg/loot_tables/blocks/potted_imparius_mushroom.json +17fedd4338082fe97deebe6ac0818bf70a71172c data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +46e753bd01c2c1985dd5e556b25115f064165cb6 data/byg/loot_tables/blocks/potted_lament_sapling.json +14b0a26155ceb8a7041915d8824d7b8b79ae123e data/byg/loot_tables/blocks/potted_mahogany_sapling.json +a7b47f228cd368c876c8d4f5e0a83e826680b4d1 data/byg/loot_tables/blocks/potted_mangrove_sapling.json +8feb24cfac7fd85e766f1802970841b37c82e9a9 data/byg/loot_tables/blocks/potted_maple_sapling.json +f115466193e5ed91aa7d60441b52fbaf55da3cc3 data/byg/loot_tables/blocks/potted_nightshade_sapling.json +f126695a980af68fafced7cf847162e8ad14c28c data/byg/loot_tables/blocks/potted_palm_sapling.json +a8f3f2f0d2d1f3c1faf11a6fbc8c1768f6ec64ce data/byg/loot_tables/blocks/potted_pine_sapling.json +23abe8a7df07c858356a16be779fcba0812d1040 data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +e7e9a31f5c23490cbe0f1b86092d03a467c7c245 data/byg/loot_tables/blocks/potted_redwood_sapling.json +bcbbef40cced55d185fed04d702c4b1d15815b15 data/byg/loot_tables/blocks/potted_skyris_sapling.json +3d8f35f5a96974cb3c6462114d181cf57dc0b7c0 data/byg/loot_tables/blocks/potted_sythian_fungus.json +df3baa1a201825baa9ffccbbb4f5e0ff6828942f data/byg/loot_tables/blocks/potted_willow_sapling.json +7eab2d8e9558405fd0b700f44b7fc9077202b00e data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +ab741845ed79c234b34ea746501eaa7bea947aac data/byg/loot_tables/blocks/potted_zelkova_sapling.json +8d49a90b3bae40eb265a8bc44b539c3320feb4a3 data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json +02d83f0dacca85de927f21f83743dd1609020f97 data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json +9506126bd7dd8d8880e524a88bbea6d5863d3732 data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json +53b2787e5ce2e68994ff27b48fad93ac05235918 data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json +18855e189b011b9033f6315c93dd1321bc7c744a data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json +121dfa4d1b65ffd9b7e38575ecb897d59b393203 data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json +aa73e4168999be179e853bbb6af70c757806cfd4 data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json +43dc25e9bea43bb38a04ec58b89ca106ab8ca675 data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json +0c12c14310b75ac11cb725abc693397c99caab88 data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json +77bddc1c49a00a9d0bdeddc6b7317c4538e62504 data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json +6c7cb395ef6dd64f2b8e1c1f73bf4327956963c5 data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json +02f67f3f8c312c52fd216e77b3a3de1bb73668be data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json +472dd94a82c6019b191cfe335b3fa969d5e4a298 data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json +88863e3c03b768cc129b747c99fcaa93624b5110 data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json +1b0125affd95cd9601072ff32c6dfb086cabb0d9 data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json +2cb6689a4e66c0ee680d200339eefcd1d377fcf7 data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json +49bfaa31c5b75297e358d997da7cb4e19130541a data/byg/loot_tables/blocks/redwood_bookshelf.json +121e98d8d80f538bf8dd6c580a0aca105167f63c data/byg/loot_tables/blocks/redwood_button.json +b956057519dbb32cb6cc5582daf91f501518e69d data/byg/loot_tables/blocks/redwood_crafting_table.json +8f983cf94ca293fe46e802059cd46fd09303c676 data/byg/loot_tables/blocks/redwood_door.json +b8622afd70f721d70f9735f8f41f6161ce07932a data/byg/loot_tables/blocks/redwood_fence.json +d36fa062591fef88b9afb6eaade9fe799c0df688 data/byg/loot_tables/blocks/redwood_fence_gate.json +cb807859ae592f9f09420a883b9b209063dfa380 data/byg/loot_tables/blocks/redwood_leaves.json +91c81a3d73ea22471100ce233070e50abcf54620 data/byg/loot_tables/blocks/redwood_log.json +e64eadd0897ef81e6920b0f92f33ecba4cafc71b data/byg/loot_tables/blocks/redwood_planks.json +7d0b45520b0ef40da1c43af86d348522f28f7d96 data/byg/loot_tables/blocks/redwood_pressure_plate.json +48b3a4281a17210383f1888c1fd759df48050891 data/byg/loot_tables/blocks/redwood_sapling.json +4b8525de77cebb2850c7da06350cbef1a3f51a6f data/byg/loot_tables/blocks/redwood_sign.json +d525f6c17ac4f5fe3125464f7f71fcedf46fdd5f data/byg/loot_tables/blocks/redwood_slab.json +d54215bbf698373a42adc0705a9367ca7d73845b data/byg/loot_tables/blocks/redwood_stairs.json +479d7a7cc08908e7ac176efdcd26525640740fdc data/byg/loot_tables/blocks/redwood_trapdoor.json +7ccc60933bdb980ad6e9bcab28ca7655fb41bbf0 data/byg/loot_tables/blocks/redwood_wood.json +91efbd985fd63fd25c6f25c3597d8eebb3fc7db1 data/byg/loot_tables/blocks/skyris_bookshelf.json +d3961017f34e41d9eb821094e856ead66b5c4119 data/byg/loot_tables/blocks/skyris_button.json +7f260704b1deddb48f7a99707cafd18284ce6ddf data/byg/loot_tables/blocks/skyris_crafting_table.json +4cb5f20adc05ca10866da36014d4cf64e5648f2a data/byg/loot_tables/blocks/skyris_door.json +676e6049bb483037c0f52b8057d36e2d31f5e5fb data/byg/loot_tables/blocks/skyris_fence.json +616c32365eaba0aed57c659ea6dae5e80af45b62 data/byg/loot_tables/blocks/skyris_fence_gate.json +e33fe2f812481dd575c9c99adae878b128f7db35 data/byg/loot_tables/blocks/skyris_leaves.json +fe1757223e24036a46e365f2344c28d190dbc743 data/byg/loot_tables/blocks/skyris_log.json +a5e8ed960f51bd99e0917cbcdbe8ffe5c74d3573 data/byg/loot_tables/blocks/skyris_planks.json +b0a214f7417b98170c5e7d0f802bc097d6029107 data/byg/loot_tables/blocks/skyris_pressure_plate.json +593dceb740f7189fcefd5dd49565fe430efacfb1 data/byg/loot_tables/blocks/skyris_sapling.json +740fa66a782f3f645349b5ab9e24626a366708cf data/byg/loot_tables/blocks/skyris_sign.json +8ee20f84fc51358c502b428749704464c3335f04 data/byg/loot_tables/blocks/skyris_slab.json +bdc36464b70414d89bbdf1c8b405f21e2dbcf3dc data/byg/loot_tables/blocks/skyris_stairs.json +7cfd8e78547b45a5424ec8b8d8eeea54c58ddeea data/byg/loot_tables/blocks/skyris_trapdoor.json +6d3d480b2432555ccf40e4ebbeaed68ea8a682ce data/byg/loot_tables/blocks/skyris_wood.json +5ef76a316a8485f4e2e3a7205bda21bcef29b2b7 data/byg/loot_tables/blocks/stripped_aspen_log.json +bc47959552a854b507bbf833c3079fe09a41aa59 data/byg/loot_tables/blocks/stripped_aspen_wood.json +93ba6a79fb6ebfbf890bac1b5f3fee35bb4fc4ae data/byg/loot_tables/blocks/stripped_baobab_log.json +610583b23137bea180a27b0dad08c1c93a4ebc85 data/byg/loot_tables/blocks/stripped_baobab_wood.json +13fefdfa550f7db3002f7c8c22650a629b1029a1 data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json +eabc9af8cc41ab247b2c60bc808d1527353fc3e9 data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json +62498ea21be17288fd483e5f18ecc4278dcb244d data/byg/loot_tables/blocks/stripped_bulbis_stem.json +5c2bcef1f5d2816d91cebcbcb88d5a5aa3975594 data/byg/loot_tables/blocks/stripped_bulbis_wood.json +272f7601c687565dee4a2eab5125a6c40cfcb89e data/byg/loot_tables/blocks/stripped_cherry_log.json +73630e30dea0f24634654caee145dbe3c933dd3d data/byg/loot_tables/blocks/stripped_cherry_wood.json +0038ad7f5fc470b2a59326e4b5d6a6e8ffc1708c data/byg/loot_tables/blocks/stripped_cika_log.json +e8824b1e70d41d7ef3722160d2d8919deb70b0ed data/byg/loot_tables/blocks/stripped_cika_wood.json +5010b3eb12f9ef80d8c7c36e36be66f4c9963566 data/byg/loot_tables/blocks/stripped_cypress_log.json +feb2c36deaced4364d139dc2928b4038f7ce3ce3 data/byg/loot_tables/blocks/stripped_cypress_wood.json +eea37c76eae0762984fdff3bb89aa5648c360d60 data/byg/loot_tables/blocks/stripped_ebony_log.json +fb60936a9da74e026c299229c1446b06c08c82ff data/byg/loot_tables/blocks/stripped_ebony_wood.json +c14e4b7a10771b78d430bcb2a997f4360f4af003 data/byg/loot_tables/blocks/stripped_embur_hyphae.json +8ca336b2520a81db1e4bff9b610fc085027e75d7 data/byg/loot_tables/blocks/stripped_embur_pedu.json +418a232fe0d65fd131dfc4d53bcdc8e0b808a4b8 data/byg/loot_tables/blocks/stripped_ether_log.json +39df1b64445ddc98e8670238147070ee5450995d data/byg/loot_tables/blocks/stripped_ether_wood.json +8da1d117975ba312361f67c7d564b43dd6013ab8 data/byg/loot_tables/blocks/stripped_fir_log.json +35156c9a5006bb2a99cebbc7bfe441a634163e48 data/byg/loot_tables/blocks/stripped_fir_wood.json +291d67db47eb15b9020671cf677f62a64e57f4b5 data/byg/loot_tables/blocks/stripped_green_enchanted_log.json +07c7ec00360cd482275bce265ce800a03584ef20 data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json +4f9184a6e8ebeba35714eb1c11d352b76449db04 data/byg/loot_tables/blocks/stripped_holly_log.json +3bf32bd3591b1c62347aa46878c6813c0bde5b6d data/byg/loot_tables/blocks/stripped_holly_wood.json +4c62bbbc0c94103c533c8a0d95175806e1a45823 data/byg/loot_tables/blocks/stripped_jacaranda_log.json +f68a1a4d22d8695f77aa686e243fc7464343fa51 data/byg/loot_tables/blocks/stripped_jacaranda_wood.json +bf01d57d614c7558335ba62bd35eca41c0eeb5b3 data/byg/loot_tables/blocks/stripped_lament_log.json +ea40025e87e5472e8580caa1d4daed4221536834 data/byg/loot_tables/blocks/stripped_lament_wood.json +ae57aa82c72fc314beb67cfb3baff2c0fad182b8 data/byg/loot_tables/blocks/stripped_mahogany_log.json +2e726d5322aeaff07ca922b14a36a801f2f97497 data/byg/loot_tables/blocks/stripped_mahogany_wood.json +f04df1f753d569ca8c2d4767e95b6bb2a7cd00f6 data/byg/loot_tables/blocks/stripped_mangrove_log.json +f3fe5393e39a908ea07e55ec3ee01f1981a52cd9 data/byg/loot_tables/blocks/stripped_mangrove_wood.json +6310b91609f8d8d422e0c797fd69b1f89576a6c4 data/byg/loot_tables/blocks/stripped_maple_log.json +b39bfd7c9dc5bb956153449ff50734a78f7c1ec2 data/byg/loot_tables/blocks/stripped_maple_wood.json +58cc26ce90d9871726623b40477ac60469f5ac7d data/byg/loot_tables/blocks/stripped_nightshade_log.json +cc1544ba37c016cf6dded99d62b72395ed2f81fc data/byg/loot_tables/blocks/stripped_nightshade_wood.json +507ebd999a19976973da2d6708c506d8fbbdca9e data/byg/loot_tables/blocks/stripped_palm_log.json +d498e4db4580ab26f0ef1bd444d77e68220f16f7 data/byg/loot_tables/blocks/stripped_palm_wood.json +f150a64f6b649eb0e0893e83140f8d287034f34b data/byg/loot_tables/blocks/stripped_pine_log.json +e41acbad37c0e5ebeac6b7ff94febe8ed69bc0a2 data/byg/loot_tables/blocks/stripped_pine_wood.json +baddc8c1f26167c6df16ab09228f694e46ab19a0 data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json +1d8e6b3783c1ff5a9c7b42e2004a007f8e00584b data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json +02a3f6a545a2154b599f421c845b89d4ce5457a1 data/byg/loot_tables/blocks/stripped_redwood_log.json +452d9df07e7adb86a4b2471dd8201d6a13c312bb data/byg/loot_tables/blocks/stripped_redwood_wood.json +100242d178f81b95ad2399ba2401a3e55d2c5a01 data/byg/loot_tables/blocks/stripped_skyris_log.json +356739c536d7842e1af6da94ad2cc6a6634e0eca data/byg/loot_tables/blocks/stripped_skyris_wood.json +7b07c0fc37b65f9190e547aeff7e9bde4695a048 data/byg/loot_tables/blocks/stripped_sythian_hyphae.json +aba97c5691d9f3afb03f7862a0d21d96338666a9 data/byg/loot_tables/blocks/stripped_sythian_stem.json +81b852d0ff060275e2904d2d494b619f780e30d5 data/byg/loot_tables/blocks/stripped_willow_log.json +153a9cf667bde1c1a06c2e19ab5a14bd18b9c470 data/byg/loot_tables/blocks/stripped_willow_wood.json +6430eaceb4675aa34ecc9c94eeee677cce52e538 data/byg/loot_tables/blocks/stripped_witch_hazel_log.json +cfc833d35f938804e6e717939e44368149f717b4 data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json +ed0ee344b94cc403225b51fd93cf11bd8d5108f2 data/byg/loot_tables/blocks/stripped_zelkova_log.json +fbbf656f11719ab40e555af7dc0d532645544867 data/byg/loot_tables/blocks/stripped_zelkova_wood.json +d07c4ae23777d516a0eb4d5acbe2c7866f40761f data/byg/loot_tables/blocks/sythian_bookshelf.json +a7e6ebd75221dea9dcfcab1d97c0c4240bd07993 data/byg/loot_tables/blocks/sythian_button.json +6cdc150b4a3beda6d0ceba406d23c4cd475adf54 data/byg/loot_tables/blocks/sythian_crafting_table.json +7909c65c275b363b316b4e6d7e9e40c677fa2fc2 data/byg/loot_tables/blocks/sythian_door.json +4ea3f343f263a34501c0fe5bd2c5222c7a0cfb24 data/byg/loot_tables/blocks/sythian_fence.json +0dc8b56e810fe9961aa211bb44dc30fce19ab32a data/byg/loot_tables/blocks/sythian_fence_gate.json +c20eac36af7643482cce91ee5cf591348437a03b data/byg/loot_tables/blocks/sythian_fungus.json +f35e85f9b5d03a5d747c23f9eb333bf4a8211ec1 data/byg/loot_tables/blocks/sythian_hyphae.json +cc10ec2c107dd972a258d411da24ba2fbf81abf9 data/byg/loot_tables/blocks/sythian_planks.json +25cd7b016224b5bfa6508f2aeed8aaff67c2d6c0 data/byg/loot_tables/blocks/sythian_pressure_plate.json +5c7369e685e60eb169f282d69df3d976d7969a4a data/byg/loot_tables/blocks/sythian_sign.json +db3a11d9d7e5eccafe470a39dee35cafbe3de622 data/byg/loot_tables/blocks/sythian_slab.json +21fe4eb01e40ef6fb469d510def0e8b53f2ed93c data/byg/loot_tables/blocks/sythian_stairs.json +cd8f0834dea148888dfd0f6ac54dcd7bfec25b0e data/byg/loot_tables/blocks/sythian_stem.json +30cf698f629b0e352b9fd5f8026281294383c448 data/byg/loot_tables/blocks/sythian_trapdoor.json +14f6e7711ac55e8a04f1e5765135f59d6f40a2b3 data/byg/loot_tables/blocks/sythian_wart_block.json +e87556a2eb4fc7d7b5fcc438cd2f112fb67acdad data/byg/loot_tables/blocks/willow_bookshelf.json +403869ae0e7439b12630efd9bafd2d7dca05e818 data/byg/loot_tables/blocks/willow_button.json +47cc696555d0ba43ffbb00ea2b8a7002358f7850 data/byg/loot_tables/blocks/willow_crafting_table.json +90fe7f21e60f0df3b73430664f2966bf5784fb3e data/byg/loot_tables/blocks/willow_door.json +104295fd76e910b41732e70c46958d0b21964a0e data/byg/loot_tables/blocks/willow_fence.json +ab8c2c1c9db23fe31349d2ce55252fcaa9c207c7 data/byg/loot_tables/blocks/willow_fence_gate.json +f938cba519ecfcf8ab1f86394e7eca5cdeff50a2 data/byg/loot_tables/blocks/willow_leaves.json +f81f0bea8293882296b9e93a911954660149bab9 data/byg/loot_tables/blocks/willow_log.json +59e0fb1a542ab13a3f687577c6dbdf572c3094f0 data/byg/loot_tables/blocks/willow_planks.json +df93639d00a5eff505ab254fc354b45bc6f104bb data/byg/loot_tables/blocks/willow_pressure_plate.json +321d93e80b1637b99a001cd79ba78b08cd9d1bef data/byg/loot_tables/blocks/willow_sapling.json +ec8a1ecb124219f072026a225f1dfbff9ec6aeb3 data/byg/loot_tables/blocks/willow_sign.json +cbb60737e8ee1844ec5af98d03484d19a475ebf0 data/byg/loot_tables/blocks/willow_slab.json +0a013cfdaf4665c2b732281c5da7047d3f7a9526 data/byg/loot_tables/blocks/willow_stairs.json +c72bfb8ba08de5e77e68351b65b0a3aabf6176ff data/byg/loot_tables/blocks/willow_trapdoor.json +ffb147fbd6bd9ad19e0ffcc514c54a3322e92310 data/byg/loot_tables/blocks/willow_wood.json +d6f31fe88ddb86c63a80bb2ffaf5899f5ac293cc data/byg/loot_tables/blocks/witch_hazel_bookshelf.json +50e9d1fcd4b9f296f7452542065f05e76eb64039 data/byg/loot_tables/blocks/witch_hazel_button.json +019b5d3bd77e696df50ced996486a5ff0b7568c5 data/byg/loot_tables/blocks/witch_hazel_crafting_table.json +6ba8bc27bf18b4ff1e868cccadaf07f78eae26d1 data/byg/loot_tables/blocks/witch_hazel_door.json +4fa5c031cd690a8ba0554362fbd6580042262976 data/byg/loot_tables/blocks/witch_hazel_fence.json +598ef4c895a1ae43456c87eeed0fa581da28c32e data/byg/loot_tables/blocks/witch_hazel_fence_gate.json +fec0a14825ff7e052f440ac7590dcf572924e42f data/byg/loot_tables/blocks/witch_hazel_leaves.json +3cb8383942b3cdfeb5879679c09b728b0c1ddd00 data/byg/loot_tables/blocks/witch_hazel_log.json +318971ca9db9e26556a15ad1af46fa4919d916fa data/byg/loot_tables/blocks/witch_hazel_planks.json +9e45d49820dff15d55bed8612f910cc173b61332 data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json +e99ddd565daa639663d5545a57ca2c0e8100028c data/byg/loot_tables/blocks/witch_hazel_sapling.json +cadd74d5b837718cf8975413d47a524f8b47fe18 data/byg/loot_tables/blocks/witch_hazel_sign.json +0b65a957fcc9c645248fa13db43530db2dec44fd data/byg/loot_tables/blocks/witch_hazel_slab.json +851643011b47794b6da2643ed4b69ee0ae2a1621 data/byg/loot_tables/blocks/witch_hazel_stairs.json +a982ca0d324a13bdb5a4825d5a08b279c8df03cc data/byg/loot_tables/blocks/witch_hazel_trapdoor.json +7a971e6751c9a0366fc0582d78eef8af7c658d1a data/byg/loot_tables/blocks/witch_hazel_wood.json +0d18f8a8bd5db7621560a09716559fd6bc76314a data/byg/loot_tables/blocks/zelkova_bookshelf.json +9f3156b9b0cb637fbdf34301260ad626522b46e7 data/byg/loot_tables/blocks/zelkova_button.json +d2ed334d9e9fc92c9301ee37abd5bed43e0c89a4 data/byg/loot_tables/blocks/zelkova_crafting_table.json +efefbcce908cc0037778dd140d05ecc05ad2356e data/byg/loot_tables/blocks/zelkova_door.json +93928d29f4caf853fb88b65746f18471228e9142 data/byg/loot_tables/blocks/zelkova_fence.json +d908bc6a3771d646a908d12a13e6c30fd6a61922 data/byg/loot_tables/blocks/zelkova_fence_gate.json +c7218f08c9fb8512e287259ab8ebe11d52c63bb2 data/byg/loot_tables/blocks/zelkova_leaves.json +4fb53205b15a29e2cb4ae91aa2d06ce31d702fbf data/byg/loot_tables/blocks/zelkova_log.json +29860f34cf259e9d2dd494c76694594552445346 data/byg/loot_tables/blocks/zelkova_planks.json +4a2813e8feb10e7106a32429a9f16ec322fa13d2 data/byg/loot_tables/blocks/zelkova_pressure_plate.json +e88064dd4aead6e372d0b03071eaf53d97b82e8c data/byg/loot_tables/blocks/zelkova_sapling.json +2e722322982f16919279cf19d5ddff2fca5d9f8f data/byg/loot_tables/blocks/zelkova_sign.json +7c00a37cc917ffd5d40754add35a64a26851f8a8 data/byg/loot_tables/blocks/zelkova_slab.json +6065ebb60c7982e876c15c4593febdff1ba00259 data/byg/loot_tables/blocks/zelkova_stairs.json +21bb4e650c8065b37ff6d013d713661d9e772d59 data/byg/loot_tables/blocks/zelkova_trapdoor.json +a44f8d0676ba0c8f2c9c78e71b8f7378e98e4c24 data/byg/loot_tables/blocks/zelkova_wood.json +9636880617a31bfe1b27464a41abe484fbb3bee9 data/byg/loot_tables/boats/aspen.json +4bfd39f6ae26126bcf86afb575dcc55a6a262a05 data/byg/loot_tables/boats/aspen_fall.json +1a4c7d6ba75b165f816478052cf95851aeb9c274 data/byg/loot_tables/boats/baobab.json +1a633e02b9b50f29b0143ff8699971b6797a745b data/byg/loot_tables/boats/baobab_fall.json +12ba02594bde7ff2a621d47e7bed3257bcee87e7 data/byg/loot_tables/boats/blue_enchanted.json +77cf9112bb5d5930b57b67f9c3e0da25385265a4 data/byg/loot_tables/boats/blue_enchanted_fall.json +9624bb1ea2df19c172ccf25a16fc00824e414ece data/byg/loot_tables/boats/cherry.json +5ec8f1245885341f07f8e30ff03b42b242379855 data/byg/loot_tables/boats/cherry_fall.json +af7a855231cf4fc7415f2325d72648c9c1756616 data/byg/loot_tables/boats/cika.json +172ecaee88d7b2bb9622b104d22c80b85bdafd60 data/byg/loot_tables/boats/cika_fall.json +9d017bdc4e000c4815c1cafa95eed68bb8604249 data/byg/loot_tables/boats/cypress.json +465ee937aab922d70d7095c3d29e2f21c2879638 data/byg/loot_tables/boats/cypress_fall.json +54ea95b37afdf36146f5e91c4abdf604ed9fe57d data/byg/loot_tables/boats/ebony.json +14c0b98cc4664b629dcac8836d9797db0918a4f3 data/byg/loot_tables/boats/ebony_fall.json +1fb60656cc37fbde6b3dba31398848fa30e83c67 data/byg/loot_tables/boats/fir.json +8871280635d013aae37e4241fbea0fedd434a97a data/byg/loot_tables/boats/fir_fall.json +fb7106cd7cc8d030f2b1f3970de7eed8706f57f9 data/byg/loot_tables/boats/green_enchanted.json +04ad000c8147da86490148600660bfb95b3b9044 data/byg/loot_tables/boats/green_enchanted_fall.json +bcd5978a79411f58cfdc04b1846a7737828f7bae data/byg/loot_tables/boats/holly.json +20d8d4e8e9d9a23c841070f7b6d74261b0c01290 data/byg/loot_tables/boats/holly_fall.json +078e624b27cd20a96d3d3ebd324e171e73742c15 data/byg/loot_tables/boats/jacaranda.json +f151db40079ca49b38b196409e6bab7e6ce75e90 data/byg/loot_tables/boats/jacaranda_fall.json +3d1631963146efaadf0b73f2fe2c6e647b63cdc5 data/byg/loot_tables/boats/mahogony.json +afd175c8da008caa33345a96bbf1f52988066e51 data/byg/loot_tables/boats/mahogony_fall.json +215f69f19fd5253a40425075ea314b1d2feab764 data/byg/loot_tables/boats/mangrove.json +023c81d66427ca6ff49e9d6992dcc4c976d6c38e data/byg/loot_tables/boats/mangrove_fall.json +ee49fd07efe84f9d4f1511027e99899578c7b701 data/byg/loot_tables/boats/maple.json +47cf013ffed9a170c82620d042095c4e0f633337 data/byg/loot_tables/boats/maple_fall.json +fc9c47fd053a5675dd851366847b69f910d98e3a data/byg/loot_tables/boats/palm.json +48daca65b3e03fbe818f9366febcc05b5e500fcd data/byg/loot_tables/boats/palm_fall.json +5a36f701641226dbfa9b7d9297b6117d9603dab2 data/byg/loot_tables/boats/pine.json +341c229e5943555f58ee2930039cd1c691e527b2 data/byg/loot_tables/boats/pine_fall.json +8ac59fa05b8791be5e92b2e1b8b16ec198f668f3 data/byg/loot_tables/boats/rainbow_eucalyptus.json +1a83ddf30fc87a8682192f9ec1e2a1d7d51910cc data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json +e74d5cde279f1803001a6333225702ba89701472 data/byg/loot_tables/boats/redwood.json +cb1c39cfd5094b0560a9da941c8ef607b059140c data/byg/loot_tables/boats/redwood_fall.json +b263181317ebd1f1ba94526191e6402158262d9d data/byg/loot_tables/boats/skyris.json +0a7cb812236202fb10911ec0a266e2cbc30063a2 data/byg/loot_tables/boats/skyris_fall.json +d41851b3d9e57b23c4e7517d3463a0f20a3f1b32 data/byg/loot_tables/boats/willow.json +2142d5f852033d5076cb263fc12966da3eb1dc1e data/byg/loot_tables/boats/willow_fall.json +a9ad597cbf88e1bf8b384cfdde4503e495317d75 data/byg/loot_tables/boats/witch_hazel.json +475a5d406e54eaa253da01d4ca6cdd3ff4848ba8 data/byg/loot_tables/boats/witch_hazel_fall.json +f8b111b0258a07637e461adc2aa390246df42b83 data/byg/loot_tables/boats/zelkova.json +f8739f49cb594f0982bc28c74fe7f641ea2ae4c6 data/byg/loot_tables/boats/zelkova_fall.json diff --git a/Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e new file mode 100644 index 0000000000..424c9795a6 --- /dev/null +++ b/Common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -0,0 +1,799 @@ +// 1.19 2022-06-08T20:08:31.2004208 Recipes +040b7c1b600131476663831b3614628b2e16af6e data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json +e5085099800fbd56da4c8693ad329f0169af037b data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json +8396df911bffe2542072c233d2d132fb49c809f0 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json +4c3b1fad994749c496f504a1cb869684589adbe5 data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json +f10c0bffa29d07d6186143642dafebda42b3293f data/byg/advancements/recipes/byg.byg/wood/aspen/door.json +fe6d13420558aa65fe9ac1a49a7d3c15547e95b9 data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json +3831ae76ab56582e886b8e33ea6e3d103a84a0d5 data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json +a52e1984fef268c301d3a010e3c713ef889261f6 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json +ae04360f7a888634994853d55ddab9e225b05f3d data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json +c00d1d54058c75c1065ccab4796af656ee4b29f7 data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json +f98f056046ca6be5b29110963d29e07d63895526 data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json +1e114cf35dc84212dadf93f8e414395f18df6eda data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json +6fdda6a7c7d79f8d067c2789ca28245cf8c350ad data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json +46b36917b7f344c092126b81ddca114f65458048 data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json +8f9815ccde9e71ac2d4f33756e30112b298fd818 data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json +9cbf4acae1528078df84dd9a5318115b2a1648a5 data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json +750fa5259c9600a4e48f29f472c8e3c1bf410ee3 data/byg/advancements/recipes/byg.byg/wood/baobab/button.json +33bd44a01e723db2659f3aa143aa397b045dedee data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json +b7ae3da3169da13eef3126fe6d85048f8389e15d data/byg/advancements/recipes/byg.byg/wood/baobab/door.json +e39789c161f363a0be84c330c3808bb505e6728e data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json +b415ab480eec9889fb76779e8bebcc50dbdf1384 data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json +48ee578deef02b7125580a878711cde849c5b8ed data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json +833c85bb50a7ec72f9f8deec3f64a70425bb4fd1 data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json +3e54770c4c114484b8b808d1999c28d54cbaf8e5 data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json +95d424a44fc3e2af90f9512697119ae6291562bc data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json +e7efa761ea7fc61d52d564454eca07ea5fa2dddc data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json +cbb32a1b379f0807c4bee068fea8e721f2ac9b34 data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json +d3d72812481a9be8ad7c13e88ffa704559f0bac5 data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json +8013be0c2fa7ca2b59894a2b4ef1f141fbbf3be6 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json +7c9f6a7fd9549ae87418c42346698fc1534fe2d3 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json +d04d44cb562e48c03a187cc33d69da56768a0f41 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json +6e50c357464b54e4cc36425d6e7d76638ae95743 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json +31dbc2d1d85cbb071ae8cdd024421890dee21d02 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json +f0695fee1fd94c4dd5ad0ae444ca2c99df71a0fd data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json +18a8b18e5ae8454efe4c49a0c752ab2bb82f2876 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json +2b2739310a04304cfdcb1b4ea4bc599b907dde0b data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json +ff24b5176adc5980b7e7527b633a85c5bab2a88c data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json +3985c616dc2eda39fcaeda2881eec73b60622376 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json +30078d49bbef406600dfad7c95f5e3671ab153ed data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json +d2772afb028f1faa728923d7f8bca7fd57586229 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json +d954b04509a527438537d32f1a8ee924adb4560b data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json +0d6b4cef608a74aafb46ec2636c0948de53af177 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json +abb84320029dd13a549db85655d5e5a0eb9c0e4c data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json +e8ef2bb6e4619a34e733a06a5117f355283230a5 data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json +1be444eb29ac413b248d67308de04ec31f013801 data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json +2b6e888fa67be94a5adfcde1a0be72f7fcc14d18 data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json +58f2147d5bd2bb3068d326e52919a603c1b05c37 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json +0298da40551e23b3cba18952ca5e454917f36831 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json +a348c1404e93dfd21c6db6bee532e591395f6e99 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json +701e52fa832bd6d6e90f7022c665a09196bfd88e data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json +a060aff4998f02179996f87f3010bf9e49942ec1 data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json +03fe9c36c1c54fb60d50195b26b3de5ef7b66587 data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json +f0e1500c1b50c96431ee08898970eccbd14ed0b7 data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json +dea056103aa5687e35d08dc7a7381ebff608a78d data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json +1b199230a146d0aa07ed11c30c01d7958d47ea5f data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json +6d4826a3db1f5eb9fb9d866b6edafc8b0fac5c9d data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json +026f61607e87f8f6785a06dd85d5a54d5007d4c7 data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json +4cc6b89acf76953fc25fad0bc095f855a995d753 data/byg/advancements/recipes/byg.byg/wood/cherry/button.json +97700693e44f848e3d5d2dcc9cd041bba92a25d7 data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json +f8a33d51ea7a583c10eef47a9cd2f3c5b27a91aa data/byg/advancements/recipes/byg.byg/wood/cherry/door.json +3cd0942870dd967073a125c3beb42358642d51fd data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json +aebd398d542b2f95ac7e434c156b03acabcb5927 data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json +b8f0a0cc0174b5427ccbb1defd9133e7d79365cc data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json +41000ebf14c3a445787de64cb104d405a52ea86d data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json +0b233d4f365d13b5f0c8c88da52cd9264534b1a1 data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json +7d130d03453a351a4c2e51c8a3accff4c84d4d6a data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json +8de283f7604f1e2109804a365d5809f8864adad6 data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json +ab7fcc005b126d0b84a4fb3b31a6ee44db3ff497 data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json +1c87e8cfcbd8299a633906515475a9a36245005f data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json +5a9782edf4b4f95135936eaa9fb7f02d306b64d5 data/byg/advancements/recipes/byg.byg/wood/cika/boat.json +5667cee000bf59cf90eaab04006f9d84b3bec62d data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json +5568e00850120c8d0a2888202e14544f1cab445e data/byg/advancements/recipes/byg.byg/wood/cika/button.json +74f7cfedb413f5db932417c47b820a9763cd18f2 data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json +50c23302d2f27fb9cfb4ee1e760c5b3ac76e9128 data/byg/advancements/recipes/byg.byg/wood/cika/door.json +daac4d4ed1bc14e8e8e48534c6e096bcf8af609a data/byg/advancements/recipes/byg.byg/wood/cika/fence.json +d6ec4026d0306ec6684821b5def7b9eaca749771 data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json +41372fc90b2358b0c98b1f838ae609998aa8bdd5 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json +035340cdc7263b7e3fa54d879bf2d4d03ecab0de data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json +b72f2cf78e9b813bbbec855c7b1e28f0cf15a6a2 data/byg/advancements/recipes/byg.byg/wood/cika/sign.json +584105547faabe8121599c76805794365e255f22 data/byg/advancements/recipes/byg.byg/wood/cika/slab.json +9a61147db2c6c4a792d6f553d01cfd00a4f9fa35 data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json +73418984c977cf16d52d648ff96be8f5e9e6a188 data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json +092666af2c8cbbdba1ca0a13c2e3952d8e485eac data/byg/advancements/recipes/byg.byg/wood/cika/wood.json +5d3191e4b264de8837100a79a398b6e232168ae9 data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json +c60a17a65eb3ce6968b2de4dd39bf484a5ddf04f data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json +7c9a2b8bc49f3d23b6d475bd954dab7076364994 data/byg/advancements/recipes/byg.byg/wood/cypress/button.json +d1309066d46aa18f9d352d5e277122076cfed133 data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json +a477b8ffd67525b3cc75d63fc5d28b0f7de65f49 data/byg/advancements/recipes/byg.byg/wood/cypress/door.json +28d07fd368244cb22ccd42619f902769652561fc data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json +d19e310ecf37151d24ad86cc8e43f7c60cdb22a3 data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json +ad82fecfe9fa6312b14a803cae3765309dd07903 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json +ba7b96ed365a0809ed6ed74af6496f1948a13af3 data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json +8f652eb8500a743b4e2701777090e8b5e7385036 data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json +77498b192b70eef88f13b41654ffb76bba4d94eb data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json +fe6ba52695f44b6e94ede724ba8ca250401bf127 data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json +1d6cd73f3238b52501dacc02b1271629f3f176a6 data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json +4d7e1d700eccda8b4f9e70d4dd8af3eb008662df data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json +7b5ae38bccd6482afde0578d6a7f71f80b3c1230 data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json +ac3ef9995efd0b15e01ea6988b5a265590586458 data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json +9fad94bca4bfa4e934a7ad5e434404ee4f0a2a2d data/byg/advancements/recipes/byg.byg/wood/ebony/button.json +e23c452f7267197a7c8d3a03645566504fb1dc05 data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json +75aba7dcb0f093c3fb01bc498a3d9f7757a00d9c data/byg/advancements/recipes/byg.byg/wood/ebony/door.json +c93bb5e76243038ea6641379edde02b1580b59e7 data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json +34a20e13d75938fdd177a2e5786623a6e76654a1 data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json +f71812eeffd7ce4c988d75c652334d6a5b2ef711 data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json +35f0c4935332fc8639e30a0c57cecc65f2401f67 data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json +a27cc13c5d354566d6d43bce5fb107cab52a7535 data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json +5e03b2d15fc12e384e4d786284230c9be67cf787 data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json +37e5cd25f7e8ba58d5134b05f894b1fe55afbbf0 data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json +5c017dfcd9bcd88bdf63bc0618e3743d16a32b6a data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json +9c3840fd92ec89df00debb615abd3cc4721423d5 data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json +b19a9efae284fce707a02b79ddb48a36a809fda1 data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json +e7a575de25cf8d02bfa01e3fad733655369455b4 data/byg/advancements/recipes/byg.byg/wood/embur/button.json +6f61fa395f1129448f9115db59fb164665e6b2d7 data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json +e3e4efdb4943d7ffdf693bdf1ec7f9488b283a11 data/byg/advancements/recipes/byg.byg/wood/embur/door.json +d9848fa82272845f0c594a02ecb22d554926be68 data/byg/advancements/recipes/byg.byg/wood/embur/fence.json +fa9036a5f47cbee5b6daf06bac7e92d3bd209c4c data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json +e86d5dec93c5d194644cbc5a2d9ab114d83131df data/byg/advancements/recipes/byg.byg/wood/embur/planks.json +3734b934078fcad0088b8e41d05af944e651f5cb data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json +9babc16ff68fb221b8553064938644a1d9fea912 data/byg/advancements/recipes/byg.byg/wood/embur/sign.json +975754ae3ca851088a261765df7dcd68148f4bd5 data/byg/advancements/recipes/byg.byg/wood/embur/slab.json +64fd39925d9a84ff69e7af4c5f75e74038a82eba data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json +8b81f5e82c3d9dc6d9446b9928beeeeb63faf781 data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json +d34207d36aa370d44aecb02765bcfdf1929b16b3 data/byg/advancements/recipes/byg.byg/wood/embur/wood.json +532d5e306ef82598c660401e5b634fa5dec31ebc data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json +0f3db3edc14ea35e659bc5f46956db01191e46dc data/byg/advancements/recipes/byg.byg/wood/ether/button.json +fa04237534cf658183ca8c88e843e250bd960d12 data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json +1e69fbfce32207f4bcbc1d13362fb107a24f2d91 data/byg/advancements/recipes/byg.byg/wood/ether/door.json +a34fe78d9c80bb2606eaf725dabc50bf59bbfd83 data/byg/advancements/recipes/byg.byg/wood/ether/fence.json +154a5ec1724a2b5fc0e7eb190a7e8cbe73263a63 data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json +ad46e105dbb177e19b6ec43af2746cefd3f2682d data/byg/advancements/recipes/byg.byg/wood/ether/planks.json +f82cd596026255d8e9de9047edc2752841887aca data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json +dfaa06184d6e9aa9fc9d44cf32420bb73fca3c86 data/byg/advancements/recipes/byg.byg/wood/ether/sign.json +cbd6b027662cde635ad6dd3f58c5e735f520c4f5 data/byg/advancements/recipes/byg.byg/wood/ether/slab.json +19eff3d333d2e528ab7412c696c52aab8cc0eced data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json +60a61e3c9a6100d5bd23468fbb9b9492913b2628 data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json +131087b5ab62a0e683169e473a04973f3ac47acf data/byg/advancements/recipes/byg.byg/wood/ether/wood.json +755fdc8200d99993a9965c6fd989894ff93403a0 data/byg/advancements/recipes/byg.byg/wood/fir/boat.json +696b72c4859a16c5c4bf4640329fd0cb8cda38b0 data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json +19b58567aaf9f46d24c6b86544371a174f9cc0dc data/byg/advancements/recipes/byg.byg/wood/fir/button.json +406b0c440cba44ee6b648fa180d5445c4cf83516 data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json +a47a42a4bcfa1100ceb40a747d9e84447e031ed8 data/byg/advancements/recipes/byg.byg/wood/fir/door.json +ce0ae8da3cd63b476ebbb106f2eecbc4a370fa8b data/byg/advancements/recipes/byg.byg/wood/fir/fence.json +000cf5690c614fab147f7789d8704544a7b20c58 data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json +a8f28bde8fa832ab2c95a1c720e8c5a1fc37d07b data/byg/advancements/recipes/byg.byg/wood/fir/planks.json +891b41fc7c80e74002906d37ba02f18b981afaaa data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json +db3025105aa9b62bc2dda6adc3a79414dca699bd data/byg/advancements/recipes/byg.byg/wood/fir/sign.json +bf37ff586dbf524259bdb542092c6ff7f4856b1f data/byg/advancements/recipes/byg.byg/wood/fir/slab.json +9309dfef936d10709895c018014880e9dd06a84b data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json +a42e1d38c21f077dd7cbe46baf6f57519456e435 data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json +1502a3d729b893fb406b679ae6fda03fc4d4f615 data/byg/advancements/recipes/byg.byg/wood/fir/wood.json +85eca1527b4ea9e3a8afe4d9ea0f16628a6d3658 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json +d0e8a1ebe738d9fa85069b256dfec9dda5c1ee62 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json +43eaab8299d3f1ec11ee8a5979fcf538aa5858e4 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json +d14966cf24a6cda3bae9ead286a7d9b41471b2b7 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json +5369d0378b8f806e3e43f0712e0ac977cd0bc7fc data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json +f6f30c29837842fe9e4a3c00c6e5b8d21c9fa52b data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json +1db8a4a9fd3cd8eda542f5a52ac3757ca01e2dfa data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json +114f2cfb3369db5c1e0a0c1928c5e2fa093d2b79 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json +d420cd6475b29b52b3ae8a493c40056ab502a341 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json +c220764532d38e25f7553b3061e81ddf022609b5 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json +5c4fbe20b0e691fe670dc3f13bd037285bba3ab3 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json +a4a45cc8a2ff25fb5ba5c8a920d5360979ecc1c5 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json +00007691ea4e18f253531da0b1757d8db7bd1f81 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json +0059c6c996e6c2b7b0fd6bdddfe5d343892760ce data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json +b68b60e69b1fb721b0b2bed85689d96ae9d1c919 data/byg/advancements/recipes/byg.byg/wood/holly/boat.json +89c56b903d6721882710615762a3c223eff863ae data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json +b2f0b639da745bfa82d6454f6f2820b29cec0138 data/byg/advancements/recipes/byg.byg/wood/holly/button.json +11257144fb8ee99d63614e3f2711d904fa805547 data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json +25724db66f8da3d7b382dad8a51475f4e0f2e47f data/byg/advancements/recipes/byg.byg/wood/holly/door.json +a87d2077ecc021001d488bc334e91923fdc939d4 data/byg/advancements/recipes/byg.byg/wood/holly/fence.json +a88b158c3c70eede394dd09088f1e2a54e8955a7 data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json +aee39b56b2ea3730f2a6f89262c526a6dde021a0 data/byg/advancements/recipes/byg.byg/wood/holly/planks.json +95536b65f99a7630dfa193035956f7ec1abe77b0 data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json +e9d034aa5ff00ff396ebccc3015421687529b756 data/byg/advancements/recipes/byg.byg/wood/holly/sign.json +bd7ab93f3ebe514fce6fe2b1820e7ade09754bb8 data/byg/advancements/recipes/byg.byg/wood/holly/slab.json +61a4df28d7eb924433812a21b4abfe683bb99fbe data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json +dd72edd46e254466ade263f5a5518333d1c2d1a8 data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json +9ffaadde7ab5b75b91396e56da54ed843b5110fa data/byg/advancements/recipes/byg.byg/wood/holly/wood.json +3abaec6418ffa91d2dd27b151dab09670aa1de41 data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json +1282a956eae1dd7f57008971b5328342091b9b56 data/byg/advancements/recipes/byg.byg/wood/imparius/button.json +48f2f2ae6446729c7e7897745dcd7bd78d32f765 data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json +896518ab0adae66fea6093cefcc2d451fb4a5566 data/byg/advancements/recipes/byg.byg/wood/imparius/door.json +73375a521ac442c3bde51d52ed0e28cabca085be data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json +2faa8b78951438f114ea1b2f8c4488f430a6794c data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json +8266bc1e96063447851ad93de1a8dfd361bf778a data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json +c78eb1909bee88946921c0a1deaa8e9c94beee86 data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json +851eeb3e2fa11a157ef2b9ecabe2be6b68f6ecd9 data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json +b6e8e544e9f6435a13b25a5b932b514f679add2c data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json +fe2bdada382f0fe6a5e6fb0b1f04be5689d8cb8a data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json +515c5f22062b75e71da562a65acade43ee758578 data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json +138542f620dcdddefcaedb8ceed6ed2434cfd643 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json +619dcb2ab877ad74c3f4757219435329f33a04ed data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json +b9ef475bc1efbecfbee821714d1248aa67dd5708 data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json +9f56a533ca5f04fac18e17ad59d9aff3f5750b67 data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json +c4939611fe88218b68bc9a067abe55fd00f2a00c data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json +0c127883073a7da290dada7cde808e49c53b4a64 data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json +225573f31111c06b82e295fb028d812ef6f9582c data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json +9e80443e5b7677d5df4b1db7cd25091bc7ca6fc5 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json +c02317d7272ffb4af6de0e184467a0b345b36c8b data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json +97df91617b890ea687165542b74cb853875f3ed8 data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json +2b5c48c4050abd5a9c0ade6d06801d95a68326af data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json +b79bc5cac3b5e098f6120feb36d020fcc52c63cd data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json +824fea88cb9815c3d2d30a59e2de35a1fc789bbf data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json +5a82b84b69fe0b3893901f7c9e1c1b6377046e68 data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json +ac9d9e7f7a884cfc94f3b53c35d25fb9f6b287f0 data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json +9ab37d9ae54e951b686350bcb3253851f2ae2a3c data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json +24e23fdac7059cd56532d9f2ed939527eea07c25 data/byg/advancements/recipes/byg.byg/wood/lament/button.json +7b645833099aef6f03d1b6576b6456cfa3ce9827 data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json +56821f8bf8201b0063304fd8accf47c03677d76a data/byg/advancements/recipes/byg.byg/wood/lament/door.json +e8eb7d7e77307ae9208b2501b3e20145d9d0c227 data/byg/advancements/recipes/byg.byg/wood/lament/fence.json +8619c5618171b4ff186a344150e80486e7e136d0 data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json +58a188baab3c77bfb74cedd0e94334d94d7b134c data/byg/advancements/recipes/byg.byg/wood/lament/planks.json +2be7312a27dd2486d9148df242a4aaa1bb730038 data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json +933f52c8e0e8fcc30061790cbdc472317d16da91 data/byg/advancements/recipes/byg.byg/wood/lament/sign.json +b6e9531737446d2cf3ff649836174e480a625763 data/byg/advancements/recipes/byg.byg/wood/lament/slab.json +b2c99758028dc74b53a3fd2f2316c10155b39bfc data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json +75f692f48d8070d7b8603945a59e447206339c87 data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json +869ef4886759d94b172ed7922a0f62be565ec8a6 data/byg/advancements/recipes/byg.byg/wood/lament/wood.json +a85b0baf9d95a8aef1c847f70659abcbd06f91c7 data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json +9c116e34b962b9e7bbdde95b726abf7d808f8f8e data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json +4eb1101aa377151ca25a48c6899023dd6a462b9e data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json +ec9b14026bfc1dd9c24d69577e7bf62f9995d60a data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json +fb90769e5bf098dace60aa0c71bc45f8b2127e30 data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json +1ce4bb5caf8f10ce75e7c125634afff0d08c2245 data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json +9e617de9db65c620ea9603a81f138144a32eb231 data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json +030e9eefaf3f76593e3430b38a16a5ca766272f6 data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json +841299e062a226295479165419c7575786ba2173 data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json +97384d11d01fc0e23cdadcae004b2b33f436a65f data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json +8ec1c6e92172e1b0d8cff66ddfe653819ae7f87c data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json +6f04474859ea617322c2e9331a8ce003bdf4ae7e data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json +2ce6b037613e9b1b581fd91bd04212398c2a6520 data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json +df622e0c0ec116138db9b631563b6e6b05e1e068 data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json +bf11a127e1015f6ede92d90c10f705dac7ab6183 data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json +a8582a190c303a47253b2c7e0ebfee4179789c24 data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json +aaac36b93d24006cff095496d0b42fe83e75f81e data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json +336da6760a73746b7f24b396de75ab170abbc504 data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json +2dd944b5fd8512608532ceb4df2d6ed83b66ee44 data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json +185b6e8089af6a2bfe96744bbdc0d79d4705f1a8 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json +0e281dcb34e728f6c982caafeaff9167a03a4f2f data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json +27c09ca9d9da1d62ef47e789af50a1b679cb3629 data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json +0663125412ec8c5dd253398439b588f6f2a0c9b1 data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json +bb74e62d738f079c60bb782e0085e34022b18a1c data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json +3fdd6dd3119ce6c6f17b622efacc6e3164ac1ff3 data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json +c1989560c57c0b5fa3bd513de33dab51ee3d4b0a data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json +bbc51a6861ddf3d1864b5d727a86487ed37eaef2 data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json +6cc8456d306f201c09e69eff1b92ef5ef3923457 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json +349f6733be517992df272d783812607825fcdc1a data/byg/advancements/recipes/byg.byg/wood/maple/boat.json +85e2317e28e5dda06eaa7fd1b438ac1ebbb8689e data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json +9c9bd643abff0d68dddeba93ea2acea1931a3c2a data/byg/advancements/recipes/byg.byg/wood/maple/button.json +0f6812af925e1594f83e66f0500cf16d6582b66d data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json +253fa1f933ff2a1ec045318daae005f48b0e1891 data/byg/advancements/recipes/byg.byg/wood/maple/door.json +5a9b718dc1fdb5f7821f1a60355f3bbbfa18cc9f data/byg/advancements/recipes/byg.byg/wood/maple/fence.json +c8e2b6886edb32c0eaa04471846f2a89ce6dc81b data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json +6ab58cf2354656b62bed834dcbf9a4d228e26913 data/byg/advancements/recipes/byg.byg/wood/maple/planks.json +1afb6220b649c285418aaeda7d7a18be5fdf141e data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json +9e744b940fede7d50f75b98e29a2146ee54aed2d data/byg/advancements/recipes/byg.byg/wood/maple/sign.json +1e4ea35c24f9379866d2d7619c48ee0e7c05c8f6 data/byg/advancements/recipes/byg.byg/wood/maple/slab.json +8ed8e5d3fee1a5534ecbc56327d7753b410eb7b5 data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json +758c2b478536c86a801d6d228fc3657a1e5fa75b data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json +4405d1743099d7894ef72425347743d9ace3173f data/byg/advancements/recipes/byg.byg/wood/maple/wood.json +9187db766b31d3232684a71aeb50b35274f82ddd data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json +dd74685e2602194c07504f99fa8f901e49465949 data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json +1834a02ceb2a71026d93d4cffb7af1dad44f6471 data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json +849e3bb47b3a6b702c62acc026007cc33c39e7ea data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json +375980823365e7c8f91701942f7bd88cc6fe0b88 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json +30cb64c9fa37002c0f4ddc02e696a1b3b66f23a7 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json +bc58e92503a93ae1fe54223bc81ba4a67833eaa6 data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json +dce647f37ea9c2418faadce77de47f471d990a03 data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json +b0fc76b0b8140620a0ac5a3b3666123f90672dd8 data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json +60622933195b9ff55bb681863739ce13e3811da1 data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json +a3b29a707b86cdc7b1c0051baad0ab9d6eb6ff3c data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json +cafb5553e0f5c82b7ccf03d2d2bbcd29eed99847 data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json +86a106e96baffdf7cfd5ddf77998412e0de2c8c0 data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json +b3487fb3e5b147ed4bbe578929b3901f894de49a data/byg/advancements/recipes/byg.byg/wood/palm/boat.json +d979e8875b60482de798549d50f16fb3c070c6b1 data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json +79977cea1c1de1a1454d99a01c582cdc535a8b13 data/byg/advancements/recipes/byg.byg/wood/palm/button.json +17072cbeda1057a24fb3bbcc0708f2a2dfd3b56d data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json +e4e120e1a2938857ba83d1e1f88cbebf04d64257 data/byg/advancements/recipes/byg.byg/wood/palm/door.json +d6debd1163ad4b39137f98de0ebdf33b13ece7bb data/byg/advancements/recipes/byg.byg/wood/palm/fence.json +1e8018b6e225068a080faa8160b9c6874e67c6c8 data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json +df95bfdc0df8dcca4e58d95f61d0420d4ff767c6 data/byg/advancements/recipes/byg.byg/wood/palm/planks.json +892dd7c02aee959eb93e5b4466c7bb1c90fb8aa8 data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json +01cdd7258932b98f3fe32c9ceca0914340500d69 data/byg/advancements/recipes/byg.byg/wood/palm/sign.json +2ba8a3a43ff08cc813737c78a95a7decc93282fb data/byg/advancements/recipes/byg.byg/wood/palm/slab.json +a6d0af74db7553c0c70b7fe9c538528d91a41a34 data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json +60d938b42de366c0e8e7ec63e81336f14dd60cfe data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json +5d33062da53f01ab46d467ebf8120c83632a9864 data/byg/advancements/recipes/byg.byg/wood/palm/wood.json +2dc871a851088a99fcb741c672ddfee7978824f8 data/byg/advancements/recipes/byg.byg/wood/pine/boat.json +8a09e79dfec0565db31ec5f0f0e9e7c0d9e698a9 data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json +2f3d8e46d1b7a204636cdb7498deba686b97a705 data/byg/advancements/recipes/byg.byg/wood/pine/button.json +b6e584ad073d11a499574c0b0b25706ebe74baf5 data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json +b1435c6b3ab6585bb1251861ca15eb606824c0a3 data/byg/advancements/recipes/byg.byg/wood/pine/door.json +2b93aec7874df4f3aac90669810b07edd9a2d93c data/byg/advancements/recipes/byg.byg/wood/pine/fence.json +8d475ab576aebac8f71ae7e1108f909c74fb7647 data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json +dfd8aa7673a82cb5eded46abcb276f0335a1c585 data/byg/advancements/recipes/byg.byg/wood/pine/planks.json +2b7551c06d0465cd0657d1ecda95e94b32a01693 data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json +628392530d6b1c444e3f4ec322dc52a5a530bd38 data/byg/advancements/recipes/byg.byg/wood/pine/sign.json +a34323c0a2f0d1e7b859efefc22970a12818bf56 data/byg/advancements/recipes/byg.byg/wood/pine/slab.json +ec20f57999f2ee862495faea72f08bc9c0c8730e data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json +c227da77408018678aead45eaee814867852eedd data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json +0709497028f620b3d449c309a42d4d9fe54a7eb4 data/byg/advancements/recipes/byg.byg/wood/pine/wood.json +441661cf9391ba81f1e1ddb353cdea04e4c07628 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json +e03691dcf6b16d1fa849d018a609efedb2dc96d7 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json +306db42b4a78c4abd8d3e14b3018b154c103393a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json +5bbad0ebc0ec7e437e2d3337b4c2fa0bed4795e9 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json +038230696422d9481c25a5ddaf0fd71b7509d794 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json +3ff6397ab8329ae52c8c36ded024103cd71d4a6a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json +eb933f1a16c9c5cc91c92cc14e9538f7ffbe248c data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json +caed2787340d6af7d9ac38d6ae89f90fbf36bef9 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json +4466c7ba3d405788332d0e9b6ca0dafd6fb0ae49 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json +0eccfc6abfc722e43bc4a00198c4d73b9ca69d3b data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json +e87342390f7df799e86628762215bf92b113f179 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json +9dd07f31dc938687b059dae6c50246a6071fa342 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json +b681fd0ab8684e6c9e065cab8602118455cf185d data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json +f5ff443440af2d9a397a879c48c960c580a31060 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json +983b3ce4e2a44ccdbd528ed6c49d01b238790731 data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json +abfdfbe907eeeea59ffd0d0af9d763533ee1f5bc data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json +1295dcc1a5e8c7871d70e0d193c836acd2d653b4 data/byg/advancements/recipes/byg.byg/wood/redwood/button.json +9cbfef58d64d85a100df18e299d7048dfb66f572 data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json +97ad2357280ba4938888978c3cd09f8e02f9f05c data/byg/advancements/recipes/byg.byg/wood/redwood/door.json +47f19d77af8d7aad11e5cf19ffec1b2483f6d3a0 data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json +d8d9baa951883dc628391550943c727879ffd02b data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json +57b8cccce1d5d24fed817493956ef2bbf6b74930 data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json +503edee08d8825be9a949fcbbbecba7229931b30 data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json +d97002b521594b28f41529cad27aa1705a3cc5cf data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json +46bac4b3092f1f29b72fdc08dc0ae42134ff2458 data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json +c29b08ff663a4f21c9b75b3aeab3b293e6646035 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json +4cc5cfd725cc3ff80ba7a82a5671315aa3987314 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json +e1bd8a1a409d59f80452fbb8591033e88d90647e data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json +10a5ad8e4f86173cf65091afc6053063691d2483 data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json +4005609577e289833df05af9d945e9379f7397ea data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json +2df24be5f9e2e4f8e76bb2b938732b412fa9a937 data/byg/advancements/recipes/byg.byg/wood/skyris/button.json +a5d7eb2c7ec73bba8c023e3011f057a913afdc8d data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json +b8384532aaa8944a941a0e059d8c0a5f1130f833 data/byg/advancements/recipes/byg.byg/wood/skyris/door.json +11be1ece318f6cb5f49dcbe2bf3aced78cae7bc0 data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json +1b3cf78355fe97d74d568870b6d0ec03eeaf2899 data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json +3c141fa85cc0df01b32bd84757315b95e7c40041 data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json +0c29df6076fb283804ea72c52c0bb7b06fcede2d data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json +736c21ab9aa9263c3cc55c49db53906fbd857048 data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json +eefec419005125b9c2219ed06becb95881684363 data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json +e9588ae36b416c552b6924c5457bdb4ba63f342a data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json +b830b4c7b598b39f3eb34a6d2e465ca6ce613ca0 data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json +5849938d2ef35154755864406cafefb48b90319a data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json +8040d74e4ef444467cc470129c5d5a38c20df812 data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json +95099d326b66fb60b223b301fe05d4605fe9fe36 data/byg/advancements/recipes/byg.byg/wood/sythian/button.json +5154d151cf856eeffb57b817a564c14eab8de6de data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json +508f97424421fb7909616817780c4f4a84a98d6b data/byg/advancements/recipes/byg.byg/wood/sythian/door.json +34b312c75d5de529de869a3714f65bb56d9cae63 data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json +4c6ce72bc72bb7df98efe59d9a43d400faf60a6d data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json +78d4717b5260650adb63a96003db9d55be3b3849 data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json +f1534f32491043a509ed5e9022d8df8034e2df36 data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json +c9089afdee486de6fd92d7213146ceb1dd879878 data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json +50c6003925ee200402ee27de7b42b4eafcc0ae26 data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json +9ee97b0d817ea4ecff38c3c56f0fa084339a8eaa data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json +f415415a5e27d919782c9b02cc7467609cecba00 data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json +d18369be60a80cd041abba3b1d4a465b24572196 data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json +3e9c3940c3e91080f81bbe66f192e25d8e520d4a data/byg/advancements/recipes/byg.byg/wood/willow/boat.json +512675ce25429e1b3acd987a5db1937e6e17b4a4 data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json +b2973b22006ba8ee8e801b9ef2efdbf41a71275e data/byg/advancements/recipes/byg.byg/wood/willow/button.json +81a6eb0c91516b6501fac092081c9d13d97378e2 data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json +4f9e1560c555738806ad9e1017aeb06a418feff8 data/byg/advancements/recipes/byg.byg/wood/willow/door.json +a01cf97215442adb0dbc9e748d145c92a89fcd54 data/byg/advancements/recipes/byg.byg/wood/willow/fence.json +2c42b4e99e5589ad3e1757ac9d5fdd3c8c1e83d9 data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json +c63cb704f50dff0c58ea8b8c9ecfe44613c13500 data/byg/advancements/recipes/byg.byg/wood/willow/planks.json +a74de7f802969717d6f585a009fbaadb5a5ccbc2 data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json +b8a8b07c8e8cf729bc741f32ded91d2498bc16e8 data/byg/advancements/recipes/byg.byg/wood/willow/sign.json +db3a4c2f8cbcce4cf514bd9a7b88f07063428ab1 data/byg/advancements/recipes/byg.byg/wood/willow/slab.json +c70881e6dcb320660ed51f135c2fa6663c0ff958 data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json +cf3c653298b3239d2471a18268ebf64059d25aa6 data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json +eefdd68159d9173dba476a4f193e920ef671da42 data/byg/advancements/recipes/byg.byg/wood/willow/wood.json +3f0e150fbee7335648a35f6ffa9f6260109484ec data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json +32b26523f9eaba4c35123dc7b237d6b548900402 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json +f1722c40754c917ff220eee63fd1f1631cd3f115 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json +716eececae6ef11fe3080a9f82921f638725529e data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json +6d43a610bfb7e3021d4728c7b5bce7972087aa54 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json +bbcb8e0f2d746781af42dc80de2cb7b30e4150e7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json +052d3ed164ec52fdb1f8966e4951dd3752771f23 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json +87ec07732f4df0afdeec40303cc530abd115aa69 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json +5b96369fd5677b51c11a54d664c032b25f98e561 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json +34a925ef3b49ab23346f29e83a4e3869f213698e data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json +6ab44c51e8b3f086300d3a45c080d6897aeebca2 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json +44562f23da2e636cb62478baa0ff7aeaa8004ec6 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json +80ff434f5d85a10c99b8e8dab2a86c9c8907a685 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json +ce9f44dc0fae9b1f4fd1dbe500953200bb028d51 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json +d5aebd3153ca9bf552fef99f85c4d78e82b08613 data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json +c58d59879cd5e7a5a9a10856ef432fdf2730bcdc data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json +c56dc19fb18ace83113c5cf26158ce2e3ddf6d57 data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json +5063e429e797f54ff5efeb7808845b588a2bd6ac data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json +1d37360726454e1eab42855cb18c085dc78772c4 data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json +da774e1bf33da51be947379da7a883508f0e2afd data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json +5297464074600cd345f0371f1a49dc69fdad5e80 data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json +5d93824a63ed16e3de24bcbe73cf9af1ead0e7a0 data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json +c5b2a8b964e1f34344dd5571555793ca0154d333 data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json +30d4e82896589c2fc9b0d444d5ef04cc340a9fff data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json +146fda0678d021bfe0ab0fc2f90943d6a6b4d1e8 data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json +5d47e2e9dacce11acbe8dee3a6bef8cf3f8b4b5e data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json +bbeefafac74edb0d46cb37be017b9eb4517f38bb data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json +7210b8fe8730cd7849e838e1d95fb48df3914e85 data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json +832d1c7fb7f2e6ea9bee2fc6572ff682a46b6634 data/byg/recipes/wood/aspen/boat.json +de55cdeff38b2adb2943a845acb0b65c37ecfd31 data/byg/recipes/wood/aspen/bookshelf.json +5291ebc52c9c5b52cbbb6e124e394dd82d44df88 data/byg/recipes/wood/aspen/button.json +37ca5f1f1fee5784e036e2fa313ab23a86350e4b data/byg/recipes/wood/aspen/crafting_table.json +d56051fc76112a7a25ff230642b63f5c15dfcac4 data/byg/recipes/wood/aspen/door.json +d66b22caa9665c327bd04a9f2e34a2dbbd4a31bd data/byg/recipes/wood/aspen/fence.json +75464736942ca032802788e40194c279c118dec8 data/byg/recipes/wood/aspen/fence_gate.json +f2e86c484b71307fb5d2bb460faeed7241e90fbb data/byg/recipes/wood/aspen/planks.json +657c43ede97b18029c6f930c11d03a3dc1a15551 data/byg/recipes/wood/aspen/pressure_plate.json +8e73b5b0ff7f2d1f87ed02657f22f1d882cda8c9 data/byg/recipes/wood/aspen/sign.json +48a152d59706592bebdfaceb955aa3d194860557 data/byg/recipes/wood/aspen/slab.json +d44da8c1fc1d25478e2fe0bb9e06c48e7e0e1b8e data/byg/recipes/wood/aspen/stairs.json +70cb9a960effea98a65842fba0de5745df3a38c6 data/byg/recipes/wood/aspen/trapdoor.json +8fe7f981da1d83c152ee577ff3cdb2b8ae57950c data/byg/recipes/wood/aspen/wood.json +102a394f10d218bdeeeeda28bd307d4232090d17 data/byg/recipes/wood/baobab/boat.json +180aad345acba86e30793f2e24f33c2931357ce3 data/byg/recipes/wood/baobab/bookshelf.json +ff30d27d475f1394887611be1a733b750304d017 data/byg/recipes/wood/baobab/button.json +9f7214ccc0d304dae2bed65365089bfb3aa60a41 data/byg/recipes/wood/baobab/crafting_table.json +191c8072e9ee8909f65322eeb3774d82a36579e6 data/byg/recipes/wood/baobab/door.json +a8fef354e1bcad40abb64b6516f948072f270951 data/byg/recipes/wood/baobab/fence.json +9ce6e55ea808d695cdec31c18bca1e21fe8cfa25 data/byg/recipes/wood/baobab/fence_gate.json +8626e93e932acd5333a88f949e0f6a0d24f7bd7f data/byg/recipes/wood/baobab/planks.json +983cc62cd3dcd9c3b5b39058ea64c7092596e047 data/byg/recipes/wood/baobab/pressure_plate.json +981aa9299748160eac115053272031035716d8df data/byg/recipes/wood/baobab/sign.json +7ba0f4f88e43b05d4fbe2fc3b38735789c8336b7 data/byg/recipes/wood/baobab/slab.json +c7c52725a6ea0160d143a1c6e84b74c85aab5dac data/byg/recipes/wood/baobab/stairs.json +dd73efc98689e3de0f5c72db59a8fd6f098c75f3 data/byg/recipes/wood/baobab/trapdoor.json +3b13e77424a5f95deff8764c6b6f310da6d6ab33 data/byg/recipes/wood/baobab/wood.json +257c890c34de1dd23bbd1416a8a062bc847f7e3b data/byg/recipes/wood/blue_enchanted/boat.json +1e82f92266425519a0a2ea12c0b7e73c4b30d259 data/byg/recipes/wood/blue_enchanted/bookshelf.json +b3f3966ee895c3d28709e6a4924f9c557270057c data/byg/recipes/wood/blue_enchanted/button.json +3563617b6735c15fbaa0ea0aa62b08da35d69853 data/byg/recipes/wood/blue_enchanted/crafting_table.json +cbad7e748b694652329563dc355baaa3d755b8f1 data/byg/recipes/wood/blue_enchanted/door.json +f54dfbca09fdc8f9c7e9e95a4eb34a6e67b92014 data/byg/recipes/wood/blue_enchanted/fence.json +2c6c1c682e5fac49d3bcef9978e9a00d1ea1f3a1 data/byg/recipes/wood/blue_enchanted/fence_gate.json +d60b8e918db7605b7e6d07f3a36fe54eb485fd4b data/byg/recipes/wood/blue_enchanted/planks.json +93af6b908fe06557b1e8636b229bb3b13534a2bd data/byg/recipes/wood/blue_enchanted/pressure_plate.json +a391d3bcf2860bf08bab7b6617558368941cb976 data/byg/recipes/wood/blue_enchanted/sign.json +1662da686cbd304ce15f622bee619bac4406c3d7 data/byg/recipes/wood/blue_enchanted/slab.json +d2e0486ffcfc2220935d3785781dc80c41eff189 data/byg/recipes/wood/blue_enchanted/stairs.json +9585d889266a13643b42cebd0de79621d9ddb850 data/byg/recipes/wood/blue_enchanted/trapdoor.json +ffba076eb1969e8d28201c41e94edbb3abcd8f6a data/byg/recipes/wood/blue_enchanted/wood.json +3c463b52d498586f4ee91d4a5a56685ddfa4e17d data/byg/recipes/wood/bulbis/bookshelf.json +b32ddf95eb305fe65f171ea829ec994c54500d86 data/byg/recipes/wood/bulbis/button.json +f22da35850a13e038b9aec2af440a11e56d12c5e data/byg/recipes/wood/bulbis/crafting_table.json +20dd60505686666ef1a131e9c16649d18d28af07 data/byg/recipes/wood/bulbis/door.json +2e7198ad72d899af8e340f4170914f5f4119d21b data/byg/recipes/wood/bulbis/fence.json +41e7ba5448016f0e846813205c44223d677890dc data/byg/recipes/wood/bulbis/fence_gate.json +739a3a573c14825b86dcf2e11d887740331dcc3a data/byg/recipes/wood/bulbis/planks.json +b976cda414ece545a5ea6ae7ff923f062f68f3b9 data/byg/recipes/wood/bulbis/pressure_plate.json +ec4beb4da0517decfcd3b82c1846687059461abd data/byg/recipes/wood/bulbis/sign.json +a1adb2b1b8b24b51f0a87621795f9e6f0072770f data/byg/recipes/wood/bulbis/slab.json +b8b89d506094a2faec786effa5f852fa932738b4 data/byg/recipes/wood/bulbis/stairs.json +2aaa9a76ab0a9d0d4a9d24614058d310427156ba data/byg/recipes/wood/bulbis/trapdoor.json +de3391461aed36a2c7cbcc52187b800ca37a8200 data/byg/recipes/wood/bulbis/wood.json +a6b4549650cf796b25dc34d028caad54e9844732 data/byg/recipes/wood/cherry/boat.json +b1c1cb13a523e224bfea78dc2d26ba7c8de400cf data/byg/recipes/wood/cherry/bookshelf.json +58694f40b725d11fe959d7cb13ae38a066be7749 data/byg/recipes/wood/cherry/button.json +83b0e2465c3797a07b4011ec362de42818e21451 data/byg/recipes/wood/cherry/crafting_table.json +bb3ef8770215c98b2b06e3237bf5f8846f893a0e data/byg/recipes/wood/cherry/door.json +1df3220726736f57028385ce0364870e5571bc14 data/byg/recipes/wood/cherry/fence.json +8299e153f801935910912fe482776a8c31d91160 data/byg/recipes/wood/cherry/fence_gate.json +598c4d9f7162d6d3a5f999456607db86cb881854 data/byg/recipes/wood/cherry/planks.json +dd3800c066abd89e7359f87071319daa589b20de data/byg/recipes/wood/cherry/pressure_plate.json +e4c60814398565c811fd0615d7893ef408461750 data/byg/recipes/wood/cherry/sign.json +4e13bdbf99dcf579eba0d11151d5b1e9f5d3e04d data/byg/recipes/wood/cherry/slab.json +435dce5324a086265e4cebbb70dd6b5a26991d34 data/byg/recipes/wood/cherry/stairs.json +25559ed8b11cb509915fa1bfa3326943187a6f9a data/byg/recipes/wood/cherry/trapdoor.json +db9608c0e655f26bde4352d02476bbd95bafe91a data/byg/recipes/wood/cherry/wood.json +2194d30a24dc8fc031043e0c83a143970c9ddf54 data/byg/recipes/wood/cika/boat.json +5ace53e63af8d4efd6c081a659ec4c4f875f83fd data/byg/recipes/wood/cika/bookshelf.json +82fcd2fa1aaa532b54fa5d3c257b43308a960f63 data/byg/recipes/wood/cika/button.json +218362fc04060cadde7252512d3375a8f90dc6b6 data/byg/recipes/wood/cika/crafting_table.json +be961fd157b29ca334c4583c7f820af814bae482 data/byg/recipes/wood/cika/door.json +084c648747a2ca03ea51b740c6a574db81a6de93 data/byg/recipes/wood/cika/fence.json +defef99a8fc3f67f9206a0d5e7085af76d7498de data/byg/recipes/wood/cika/fence_gate.json +729cb65d1745222c15d36956c2c45454a929adca data/byg/recipes/wood/cika/planks.json +718707cb2fa6d57c0e1e1f156c05e56fb648c5ba data/byg/recipes/wood/cika/pressure_plate.json +c9f0e4d51ed17a635cdba91258cf7b79ba2127b3 data/byg/recipes/wood/cika/sign.json +3d97ed710e4a36e238720311e95242a613a89e8d data/byg/recipes/wood/cika/slab.json +16586f4d2d441f3bafef496dc71721fee8182ebe data/byg/recipes/wood/cika/stairs.json +69b7cf4f8819c252233a91547425944ed1fdb599 data/byg/recipes/wood/cika/trapdoor.json +99870b5028f63a8eae9e3e430f25838a0a552309 data/byg/recipes/wood/cika/wood.json +e4bb0834349e5052187562e5cb848f099214a318 data/byg/recipes/wood/cypress/boat.json +a6e2d45672f0b676a378d7750eb8f6659da13f87 data/byg/recipes/wood/cypress/bookshelf.json +36cf9f1b9689d88c8007dd37522f526bf5fed421 data/byg/recipes/wood/cypress/button.json +fe788220d92dd124a6fe52e4354ec23450c395dc data/byg/recipes/wood/cypress/crafting_table.json +66787ee4ad678ea7df61b3ed3087314e1631f5ce data/byg/recipes/wood/cypress/door.json +60ee53ddf07d36ba3e636d7612d7770ee008bab9 data/byg/recipes/wood/cypress/fence.json +722c62f86a239af20dc37557d9814049a9ba0cdb data/byg/recipes/wood/cypress/fence_gate.json +e5fe9789041e3e3bfd9bffc057a4018768a8e75e data/byg/recipes/wood/cypress/planks.json +e20244ad9871efaabc06795ae476995c737dec77 data/byg/recipes/wood/cypress/pressure_plate.json +ca2dc886b5c81e191b1a72d55934ea8d8d7ce674 data/byg/recipes/wood/cypress/sign.json +ffa07d6155a9320aa4c5a9daaecfb16d1ab6a96d data/byg/recipes/wood/cypress/slab.json +b14487a228b028475c02f09a7ad53dbb14240bdd data/byg/recipes/wood/cypress/stairs.json +49a1dfeaf4bd827208af6b39bf941ea503d4cbc4 data/byg/recipes/wood/cypress/trapdoor.json +cc0128f3470feff3ff956595b4f6a74ad3281d3e data/byg/recipes/wood/cypress/wood.json +1fec7a83be427319d1bdf0fac32769d243258910 data/byg/recipes/wood/ebony/boat.json +49dafe29ab304558a46a9b3b1eb8a88ab6c8c7be data/byg/recipes/wood/ebony/bookshelf.json +c4446e66da68a8c3f80c56966a1676d47df55f55 data/byg/recipes/wood/ebony/button.json +66f695e01405771f1183e3b42b2cdd08aafa0d33 data/byg/recipes/wood/ebony/crafting_table.json +ebb3932344aa81c3e6abc28b5afec0886db5ad1a data/byg/recipes/wood/ebony/door.json +90af85f449cd9ee16a33cca8b2d02249f504709c data/byg/recipes/wood/ebony/fence.json +29618de3ab171eb49b5d9f8c250c62c1ab856e3a data/byg/recipes/wood/ebony/fence_gate.json +07e77a526db1cb59276a53277e8d48a4a7b3d385 data/byg/recipes/wood/ebony/planks.json +5fbd70ce8947d26d535e2a7f4a436d2600aa0ab1 data/byg/recipes/wood/ebony/pressure_plate.json +01ebd9f4902dd570c7043ab81dd9e8eedc3679e1 data/byg/recipes/wood/ebony/sign.json +ba927d2bd614379afc92251a9a3730d780e67e4c data/byg/recipes/wood/ebony/slab.json +1b40d0e1ce0565fc262de966dc7be589cf89f124 data/byg/recipes/wood/ebony/stairs.json +e7010b77d78f21208564a86c02751985faca7de6 data/byg/recipes/wood/ebony/trapdoor.json +e10eb87393fed57cf92cca52ce1e825999555663 data/byg/recipes/wood/ebony/wood.json +345cd97c1a3e508005ee9b05ef8dccda6d017644 data/byg/recipes/wood/embur/bookshelf.json +b008be45a28ef0c372cd44523ce5ea623bfea276 data/byg/recipes/wood/embur/button.json +c9eaa7344bbd9489b3b465bf267c03873ad5fdc2 data/byg/recipes/wood/embur/crafting_table.json +a2aacfda1481eec964d0ef46e7b7fdc2b3313740 data/byg/recipes/wood/embur/door.json +3de0c26790e6e77e84216e653b08f69e9c954557 data/byg/recipes/wood/embur/fence.json +7ad64f53c2bb4ad96a04d2878ec8c72870a24aef data/byg/recipes/wood/embur/fence_gate.json +5bda66b85aa5a4ebb142654c22595af3ae6a9f86 data/byg/recipes/wood/embur/planks.json +60033bb134c22fb1a3c09ff1f62bd241f4ce9306 data/byg/recipes/wood/embur/pressure_plate.json +c21a2329ef6dbee1af4fc3cabae5e4b588234376 data/byg/recipes/wood/embur/sign.json +928bdd18bc819e7e2a5113626dcf1575d0a32c6e data/byg/recipes/wood/embur/slab.json +e4941d6d7b331e5fbc58a58ad677713d581306d2 data/byg/recipes/wood/embur/stairs.json +bb5868770661d5f65938976de876a96529d76223 data/byg/recipes/wood/embur/trapdoor.json +c7c6da99ec99791b3f4f3e9c588436e9627805a3 data/byg/recipes/wood/embur/wood.json +5cc9f13bc08bdedf7c4519f3a3f73268e1f2012e data/byg/recipes/wood/ether/bookshelf.json +2ec0af768f07f8bde9bf9e363be25f8c48e869d6 data/byg/recipes/wood/ether/button.json +51c53f38eaae5d62e42b4336b02d9293fc531c4b data/byg/recipes/wood/ether/crafting_table.json +5669d7d14efb3936b6406ee8a1f4d4e5d90efc44 data/byg/recipes/wood/ether/door.json +a3c8f1503f5554ea51c9e147a1625dfac8fa7cbb data/byg/recipes/wood/ether/fence.json +41806853a1b5b9d22375eca378c481150037ee6e data/byg/recipes/wood/ether/fence_gate.json +f67d9e2a99d595dee1af759a9b067a684e6ec27c data/byg/recipes/wood/ether/planks.json +9b573cbab6be0072964d24cc3ae9b1171180ccdd data/byg/recipes/wood/ether/pressure_plate.json +cb75cb85a8f337d24a232055d34ba8e051f270d5 data/byg/recipes/wood/ether/sign.json +574092324f37ae7f9f55aff9b77b6a1b96d6ee27 data/byg/recipes/wood/ether/slab.json +190da4b310100abffce63aa6d8b8c930a69f7e10 data/byg/recipes/wood/ether/stairs.json +12ee15bc63b65f03072bbb5bbee4bcc51eafac9c data/byg/recipes/wood/ether/trapdoor.json +9ae8f000b1de2d8829e3f87aeffa12ed7bffdb17 data/byg/recipes/wood/ether/wood.json +10dd4c3b3ff923d03301087ee9d8e01ec6fa2494 data/byg/recipes/wood/fir/boat.json +37849257b22f413402f1a1d9deaaa10e48a59dbe data/byg/recipes/wood/fir/bookshelf.json +1bda4a121d8f1111710aabb4d2862adafa11fc48 data/byg/recipes/wood/fir/button.json +18a066a282c75e24816f48011a15e481f43094be data/byg/recipes/wood/fir/crafting_table.json +7cae957344c3ca77fc6527018d33312de4f9b2bb data/byg/recipes/wood/fir/door.json +2c359e578eaa04a82bde65f28bcd7124119b7aaf data/byg/recipes/wood/fir/fence.json +73693dc3d2e335a80da79b5c519b20ef591a181c data/byg/recipes/wood/fir/fence_gate.json +b8355c8c055badb1922052d37b12544dd08149ef data/byg/recipes/wood/fir/planks.json +48a75f59256a16692e7968b76d1f2ec90ac8c483 data/byg/recipes/wood/fir/pressure_plate.json +aa12f91f3ac41f6209556e04e6301169b3eb692b data/byg/recipes/wood/fir/sign.json +443b6d04295a95ec326b38e859c780d8aaf09aaf data/byg/recipes/wood/fir/slab.json +8658a5c3c37b4eeb31f08aae42b902e8292abf21 data/byg/recipes/wood/fir/stairs.json +4e990ed36f9ec9f7a1be55dc70bbbb072ba4a7d6 data/byg/recipes/wood/fir/trapdoor.json +4eb831f1c11ae380191fc2cd0c92fa2d8b828752 data/byg/recipes/wood/fir/wood.json +239ebce206dd81501bb05865ba5a8e562a4b6f32 data/byg/recipes/wood/green_enchanted/boat.json +e638953e0092972d26bf88bef7107244a84a5ccc data/byg/recipes/wood/green_enchanted/bookshelf.json +dfc32e887de610c027cd0438c125146376e54aef data/byg/recipes/wood/green_enchanted/button.json +685717b92ccc3e96ca9959d979eb73c5d8592434 data/byg/recipes/wood/green_enchanted/crafting_table.json +3df7912b5bd262d3b34d65c3d1a91eb6c079e889 data/byg/recipes/wood/green_enchanted/door.json +d7a42a585c26514a6cbe031ec0dd87afc987e2f3 data/byg/recipes/wood/green_enchanted/fence.json +c80b49607dc1116e372d19e61093649e0495fe9d data/byg/recipes/wood/green_enchanted/fence_gate.json +13dbde422899451d2c634cfb7679ca54895ba60b data/byg/recipes/wood/green_enchanted/planks.json +a3e07fb20f354bc4d5c7ad4c63f55c832897ea62 data/byg/recipes/wood/green_enchanted/pressure_plate.json +b2bd4f6636441c0dd51d538e7bcb108019e67c55 data/byg/recipes/wood/green_enchanted/sign.json +26d60c24530ad986538e9a762e95b7c97e53a378 data/byg/recipes/wood/green_enchanted/slab.json +213894eaf1cae2e36433bc5c8dc7738a13066743 data/byg/recipes/wood/green_enchanted/stairs.json +6965a88c72d0523bb6dce3a7ce95ffd3468b2d8c data/byg/recipes/wood/green_enchanted/trapdoor.json +051aa3b9d1b94d2113242397c4f52bb431d6dbfa data/byg/recipes/wood/green_enchanted/wood.json +edbc418a58548ba901da6d9b3f401261863baf8c data/byg/recipes/wood/holly/boat.json +45750c1fcef96afb9e2d6c612ba168f219bb2be9 data/byg/recipes/wood/holly/bookshelf.json +75113a2f04e64b004c78c692e5b26fa1afb5cf4a data/byg/recipes/wood/holly/button.json +8c169e709d0e9a024acf2de364f53ec78be028ee data/byg/recipes/wood/holly/crafting_table.json +ab18b8dfba27a474487aa28c0ca96c5ee7ab490b data/byg/recipes/wood/holly/door.json +ae7612f8695d8053d9a1b1fa1c055819064757dc data/byg/recipes/wood/holly/fence.json +f5e5ce818d9276bc4c64fd69680331f942a7479e data/byg/recipes/wood/holly/fence_gate.json +f5f83b483d45f553715034c0129fd7e4b17d633b data/byg/recipes/wood/holly/planks.json +8449313ec219c41aecb4ebd94e5157c5920a8c9d data/byg/recipes/wood/holly/pressure_plate.json +356097a4b802fa2afbb4faf82adf09047470df06 data/byg/recipes/wood/holly/sign.json +177f5770dfcaa42f1971e5ded5a6f582c320bf08 data/byg/recipes/wood/holly/slab.json +3241becfcb867024bb40870cc6f6e46c7e1133b1 data/byg/recipes/wood/holly/stairs.json +19f00b1955c1b9aaddd459b835e6984716353dc1 data/byg/recipes/wood/holly/trapdoor.json +337c6d36ffb5eec6ad0e5970a18ec09fdda5afcc data/byg/recipes/wood/holly/wood.json +a5c87ce8c596138992f8e7584e9ab0466a4ba5d1 data/byg/recipes/wood/imparius/bookshelf.json +75134c272224d66077934a8542c99e941cc81857 data/byg/recipes/wood/imparius/button.json +7915df76e24e5a75b8c5bb65cecee20227465cd4 data/byg/recipes/wood/imparius/crafting_table.json +88e6a29b83b0442d307f9a1a57843214b400d89f data/byg/recipes/wood/imparius/door.json +56ba6117b3556bf02cf45b55dfd1f5f99471a2d7 data/byg/recipes/wood/imparius/fence.json +2ca76e6ba864f35b79e59c73dca95cc8de8d35be data/byg/recipes/wood/imparius/fence_gate.json +2f4fb081e5fc68d30754bf621a9892623d609c8e data/byg/recipes/wood/imparius/planks.json +2492c98b52408cadd7422b5fc51481fc1c4debe0 data/byg/recipes/wood/imparius/pressure_plate.json +baa89b63c2d1ca4fcfcae67aee7e672bcb97a705 data/byg/recipes/wood/imparius/sign.json +4412fb6a7a6d4e9597e5f1371873ab5aad48f604 data/byg/recipes/wood/imparius/slab.json +2a0f759702fca986c08caced2e89a7444c622165 data/byg/recipes/wood/imparius/stairs.json +6258572ac8b5f12c5b16986431e1eb822d9cc53f data/byg/recipes/wood/imparius/trapdoor.json +64f624a1284f1607bcbd8abd9fc3fded85a6823d data/byg/recipes/wood/imparius/wood.json +344c8fa2d6aa8f10b9bfde594d80c355995fc0f4 data/byg/recipes/wood/jacaranda/boat.json +d04d259feb58b1b30a8339f6006f94e961b7e9ce data/byg/recipes/wood/jacaranda/bookshelf.json +61a9ab58a4addd9bad8be05c1f11d77961cf7004 data/byg/recipes/wood/jacaranda/button.json +c92a75a81248f06f420ffbc6b68d14e6b4d06978 data/byg/recipes/wood/jacaranda/crafting_table.json +c142443be85502a1f98b9a44cdbf482f5bf16432 data/byg/recipes/wood/jacaranda/door.json +93a1020dbc1f0debf2bd38a7f9b288c4d3bf8c66 data/byg/recipes/wood/jacaranda/fence.json +88159a91e40f0f578c50b619821ff06fc3bf9af1 data/byg/recipes/wood/jacaranda/fence_gate.json +1b8356dee1398dd892122bf45058092571477815 data/byg/recipes/wood/jacaranda/planks.json +31b177fbe5672aaae899806118345bd4fba7df56 data/byg/recipes/wood/jacaranda/pressure_plate.json +24696debdf6d1765c666fd49b476f58c0cdce618 data/byg/recipes/wood/jacaranda/sign.json +18266122c9c0bcc103623f7f383283ccc2447985 data/byg/recipes/wood/jacaranda/slab.json +4ce468ed6ead70926428dcaffc8a8f5b057ff715 data/byg/recipes/wood/jacaranda/stairs.json +0762379d3967d4d1bde57086cc387dc43d4cc641 data/byg/recipes/wood/jacaranda/trapdoor.json +0436308a88ea121e9d2d49382abcddadb61d0a0a data/byg/recipes/wood/jacaranda/wood.json +07f88d9639c24a940ef7f2bdee7f86a6d209a47a data/byg/recipes/wood/lament/bookshelf.json +df489c3490f82aac4ce81ee32fc88c61ddf0ca84 data/byg/recipes/wood/lament/button.json +97cb72707cda5d4c3e03f8754b16a1e387db3783 data/byg/recipes/wood/lament/crafting_table.json +d0c14b16f047f7ddfe4602f480f2a826e1ed925e data/byg/recipes/wood/lament/door.json +ae50821d250d8435060ca3d35bd0fef386a0e8c4 data/byg/recipes/wood/lament/fence.json +be866ceacaa26c439c1075d7cd301ff1bf07e00b data/byg/recipes/wood/lament/fence_gate.json +94eb6b9162c19a615e70ebd1f8828c9ca0261bd2 data/byg/recipes/wood/lament/planks.json +38fe4ac6ef095c8413658eb5b85d73b5a32273bd data/byg/recipes/wood/lament/pressure_plate.json +b66aff9d4ee583a825d51343941aa247aacba14e data/byg/recipes/wood/lament/sign.json +cd0367574124f5bf84ffd332145d4017193da3cf data/byg/recipes/wood/lament/slab.json +378ec47a6844439e76939bc0fec344c3f52f6b2c data/byg/recipes/wood/lament/stairs.json +e4f222ee49a7b52c90136b78443c6eee08f7b779 data/byg/recipes/wood/lament/trapdoor.json +6d96968d6511821df7eae957da7ba2f40e438972 data/byg/recipes/wood/lament/wood.json +3583129bc4a509961a1062f640645fda4318c039 data/byg/recipes/wood/mahogany/boat.json +c8fe7d730ddd567dbf9d71fbc786556e100d349a data/byg/recipes/wood/mahogany/bookshelf.json +431af4ee6543b0c988206a5ca6748752b21272e6 data/byg/recipes/wood/mahogany/button.json +8b8fb3693bcfde6834a679f01b550285e9f487b3 data/byg/recipes/wood/mahogany/crafting_table.json +820cd3dc57a14ac50964ef26b2ceb3717b2a509c data/byg/recipes/wood/mahogany/door.json +9daa94009851ecf2cecf95feefe9a5d8f54fc8b1 data/byg/recipes/wood/mahogany/fence.json +c216c1e18c824554816fc63678d783a47f1f73ab data/byg/recipes/wood/mahogany/fence_gate.json +fae72906882df7766b8a9e60189c805fb92f4234 data/byg/recipes/wood/mahogany/planks.json +a79b3565f74693571d469787315f2c217594ea2c data/byg/recipes/wood/mahogany/pressure_plate.json +ad2b4145b2db990567cb47d221abc7532deaae5f data/byg/recipes/wood/mahogany/sign.json +c37da99d0eeb6a9ea1eecc78dc483fd65ac74464 data/byg/recipes/wood/mahogany/slab.json +0874a0325b32f03541831520434135adeaf12ff0 data/byg/recipes/wood/mahogany/stairs.json +cba00bd01caa60a199b6707e936db57dedf46585 data/byg/recipes/wood/mahogany/trapdoor.json +8319778103bae089f65ad20bebdcafd5c9d86662 data/byg/recipes/wood/mahogany/wood.json +e83004ed45763079488fd5910eb44dded03d60ea data/byg/recipes/wood/mangrove/boat.json +ee65e91fe8333b931497cdb11e24937db8000908 data/byg/recipes/wood/mangrove/bookshelf.json +6998c44557f1df682b2ecb86f5ef0b27090beb11 data/byg/recipes/wood/mangrove/button.json +55d9c98bcfd2fca7f62bd8f8f89f3bad67167e82 data/byg/recipes/wood/mangrove/crafting_table.json +986ee9845f38e73066bda81e6ee90cde0607a897 data/byg/recipes/wood/mangrove/door.json +eeadba00813c23bb57a473851437129c0cd1cd6d data/byg/recipes/wood/mangrove/fence.json +7409e50e2a7fa656c01bd8972296ae55f7b3e53d data/byg/recipes/wood/mangrove/fence_gate.json +bcd51b0d463264d3e9dd418ccbbab8082873219f data/byg/recipes/wood/mangrove/planks.json +28dc86699b8bfc020759d5bbbdb66a3a2ca7e48b data/byg/recipes/wood/mangrove/pressure_plate.json +b5ce6643cd2f5ec68558da713f0aff47e8db5f96 data/byg/recipes/wood/mangrove/sign.json +bba78e262e9aa65b72a17af2f4470951f5aa2d30 data/byg/recipes/wood/mangrove/slab.json +eac4c35d2e21eba38d380b42fa780e2e2d15930b data/byg/recipes/wood/mangrove/stairs.json +6885f6e98f1d59c8dc5b0dcdc15930c7e61af08a data/byg/recipes/wood/mangrove/trapdoor.json +8fb570bf95d5dfb5c6a7fa3412ae25c435688c35 data/byg/recipes/wood/mangrove/wood.json +29e5c4876bd778668aa3c61842bf232a2bd6fd94 data/byg/recipes/wood/maple/boat.json +b0fcb7f8b5a378d0fa9584083fffac79f747fb8f data/byg/recipes/wood/maple/bookshelf.json +688f6e95fbaf379c491f96365170d6abca5ae963 data/byg/recipes/wood/maple/button.json +76eaed71608a03309ac1cbbf96f161fb29a76689 data/byg/recipes/wood/maple/crafting_table.json +fd9554c221c5988b7801b4fa00350e9e84074445 data/byg/recipes/wood/maple/door.json +1e97e412ec092ad718672eaf8f3409a88d72dd83 data/byg/recipes/wood/maple/fence.json +cd7a420d3decb07173b43b0e529952fc97f24384 data/byg/recipes/wood/maple/fence_gate.json +ab9c6f0ad2ddee1b59f484a3c174a3ebcd32c0a2 data/byg/recipes/wood/maple/planks.json +c415f0d28b31416ac7007ed57153069a28254ed2 data/byg/recipes/wood/maple/pressure_plate.json +b34d844e56b4480767236a448b78e5ecc28a3ede data/byg/recipes/wood/maple/sign.json +af47be95aac4211b95c0d74336f58fc2273e4b58 data/byg/recipes/wood/maple/slab.json +0bb80c44c2f4ab7aacdccdc7a5104d80127044ec data/byg/recipes/wood/maple/stairs.json +3f4bec8a58b1b610c08fc93f46af4d65491ba6bd data/byg/recipes/wood/maple/trapdoor.json +3f43dc63ccbd60b2748721e0aa69ebefd7d71909 data/byg/recipes/wood/maple/wood.json +4d9cdbc5040a2c72ac8cee120dac39febaba7308 data/byg/recipes/wood/nightshade/bookshelf.json +19ca9014f9dcf51b910cb9d1a46d5f3491c638fa data/byg/recipes/wood/nightshade/button.json +6ae959f3cb1737705f877069eb3385468ca07969 data/byg/recipes/wood/nightshade/crafting_table.json +b69b169b23330cb127f7fddf6be181093a79af2b data/byg/recipes/wood/nightshade/door.json +fc50d5b969f0187aeb5ac6f5890d9501070df44d data/byg/recipes/wood/nightshade/fence.json +34b32579979e6bc7ab98353620199528d52f44ef data/byg/recipes/wood/nightshade/fence_gate.json +722883f847d6bc9dea56bf5df4c34857e1542dbe data/byg/recipes/wood/nightshade/planks.json +fa20dd49ccc37162c7d99278cb19fb6f67b4702a data/byg/recipes/wood/nightshade/pressure_plate.json +850a0cd8ec48f5ca84e084706a4ff873d1a3fb81 data/byg/recipes/wood/nightshade/sign.json +ebd969ff19261e1a802a7261db04e04dae3e882c data/byg/recipes/wood/nightshade/slab.json +a89d0fa38621e25886257d933dd6b85ac959b2a3 data/byg/recipes/wood/nightshade/stairs.json +d29191ce031a30a6fa53e3c06fe68d20f97d255e data/byg/recipes/wood/nightshade/trapdoor.json +86efbde9a010f32a560f2ebb40ed6ec31e592857 data/byg/recipes/wood/nightshade/wood.json +83fbee3abf003fafb3e263101d4c89070127778e data/byg/recipes/wood/palm/boat.json +038c7b9a4427a73dfc49628e0bbd0bf6b41bcf40 data/byg/recipes/wood/palm/bookshelf.json +f05e0c4c2dd3901053810b2467ed218b8e67eaff data/byg/recipes/wood/palm/button.json +09945888ea40280481811b3c15cedd920bea187a data/byg/recipes/wood/palm/crafting_table.json +998cfeb04de0574031afe140fab79acc8b726e26 data/byg/recipes/wood/palm/door.json +7c3737ec3f9f5744905587a4fcd4fcdfaa958062 data/byg/recipes/wood/palm/fence.json +df61cd41760dc81a7e271e1a6789d7382bdb4f55 data/byg/recipes/wood/palm/fence_gate.json +d90271e1961c35396695a7845d68b8c2024f739c data/byg/recipes/wood/palm/planks.json +0faac6b5154b0e2d99e6e1e152a986a34860d9d7 data/byg/recipes/wood/palm/pressure_plate.json +97d74f813f690abc06e721c756745a58731f58fc data/byg/recipes/wood/palm/sign.json +122032488e23e0691e72a283767e4abe2e0a67d2 data/byg/recipes/wood/palm/slab.json +399922827c27cb66be2f3da7bced6b43e28860a6 data/byg/recipes/wood/palm/stairs.json +d6be3332892c4620facbf25a35d85bceb1b475eb data/byg/recipes/wood/palm/trapdoor.json +bcc047b050fb9e9ffe84f5d0a70c2e70e79d6ae0 data/byg/recipes/wood/palm/wood.json +5319e7f356a2855e01ff263f1775d15443f25ec5 data/byg/recipes/wood/pine/boat.json +e4e96213fc51f43cf0d04950a45c4d9395389dcc data/byg/recipes/wood/pine/bookshelf.json +ae995b9db2c3c709e5d44f53d39e7acc2e15ba1d data/byg/recipes/wood/pine/button.json +9cdbc3425f9d3756fa4f48c1d29bc47623047a4c data/byg/recipes/wood/pine/crafting_table.json +bd6b48115046355f986bf514afac1df73c351db9 data/byg/recipes/wood/pine/door.json +da6b90fa8e2df1136763d0a7984e130b970e6946 data/byg/recipes/wood/pine/fence.json +c7ccf81418bd4738521b1396836651132c468133 data/byg/recipes/wood/pine/fence_gate.json +c1fc9ddddc60e978da9bd84cd01b4409ccf830b9 data/byg/recipes/wood/pine/planks.json +ef8ce2ec7c64d983b2503da7ef522ef123d1ad15 data/byg/recipes/wood/pine/pressure_plate.json +d70d8bbae183b901bab65976f1ba4650377f20bf data/byg/recipes/wood/pine/sign.json +230302f65c611a6d4c94d07ca438329cdd9f2718 data/byg/recipes/wood/pine/slab.json +88e2b1e717916c88becf7df3ac21dab77e199aff data/byg/recipes/wood/pine/stairs.json +64278f5bad494e4a6263b4f6dbacea6058268776 data/byg/recipes/wood/pine/trapdoor.json +e018edce893a1348b37e229e45d3879fbc2ae33f data/byg/recipes/wood/pine/wood.json +d9f3cc53b2ca42495d9679a931c184a84e5355c6 data/byg/recipes/wood/rainbow_eucalyptus/boat.json +9cfccc058c769a08ef46423f6d4594c851ebca23 data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json +9ac8adc16e31885a344b33275e878deb1c5cb380 data/byg/recipes/wood/rainbow_eucalyptus/button.json +0ea2c8fece4004cb1fc221962e0e8b926209ffd2 data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json +f38590ec4bd70c336432783602cd225fa201e65e data/byg/recipes/wood/rainbow_eucalyptus/door.json +4efae0262b56286d6536c13a42578559c1176d00 data/byg/recipes/wood/rainbow_eucalyptus/fence.json +a0bd1ffa30d832dd2e115c8b64f0d3554358b8ee data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json +d13db3857087c115b38f7455fbadca458cb81946 data/byg/recipes/wood/rainbow_eucalyptus/planks.json +da9aa7ceff21828f6218b8b793eaafccca2587a9 data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json +4f7dbd753e8e6240c31939ef31d323c6c2b9dde6 data/byg/recipes/wood/rainbow_eucalyptus/sign.json +58887a36a80b2cd303d83246ef56b6dfad74155d data/byg/recipes/wood/rainbow_eucalyptus/slab.json +0077ee8e8b74ec68997aec03c81f3e2cb3b927ae data/byg/recipes/wood/rainbow_eucalyptus/stairs.json +3d70d5409f38e2cc7a1d3c976184c918f0f9523a data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json +e6cb4309e98047ddd1ff5db7349394aa062dd8a1 data/byg/recipes/wood/rainbow_eucalyptus/wood.json +08e82c95f75bb3c7118310a62a7b08eb7a8e097e data/byg/recipes/wood/redwood/boat.json +a3a04ba8f8c19fcf44ca6cdfd74eb7944e7077cc data/byg/recipes/wood/redwood/bookshelf.json +01129f26f7ad391c7f605b6064e8a2fdb2b72ebc data/byg/recipes/wood/redwood/button.json +7ccb4556709ee719906faa88a800f1dcf337797a data/byg/recipes/wood/redwood/crafting_table.json +2e888faeecb9f2cb2f4edd013d2148a11c02d359 data/byg/recipes/wood/redwood/door.json +ac00741fca343645191d74c2947d8a7eba8f503e data/byg/recipes/wood/redwood/fence.json +e443a46524e986658f235a0e5ea8a3cba6a967b8 data/byg/recipes/wood/redwood/fence_gate.json +ba3da7ecb9a27d2ccf7e8e5cba4131db17009cf2 data/byg/recipes/wood/redwood/planks.json +aaf47a6f8eb4c199ceec8398d1b45dca01a56868 data/byg/recipes/wood/redwood/pressure_plate.json +6204a234c47081986d739621f120e07a5fdeef86 data/byg/recipes/wood/redwood/sign.json +d1d283e86fce14cfaf3be5edf7d085ce3ee90d68 data/byg/recipes/wood/redwood/slab.json +7aea0816de7201172178cc9964a4b4329efae80f data/byg/recipes/wood/redwood/stairs.json +5681d98d760bb2b5b76abf8348d765b6aee40bae data/byg/recipes/wood/redwood/trapdoor.json +ba062e4b917f7a61e1f29a993b31cbf5d403ce23 data/byg/recipes/wood/redwood/wood.json +ec7cc69e334fe00e1d470efd9138851831c10ad3 data/byg/recipes/wood/skyris/boat.json +f57d62fd7b387c1ed6a254eab2da1b238a8477a6 data/byg/recipes/wood/skyris/bookshelf.json +ce0ae2f35eca46e2003170232499a4234bf3c551 data/byg/recipes/wood/skyris/button.json +641ba363927ad1c04c6479cccce87521e823bbc0 data/byg/recipes/wood/skyris/crafting_table.json +79d6e5d5d8bc9c2b0247f9e12d59595e6ace64f3 data/byg/recipes/wood/skyris/door.json +a844ff1225b4ebec426f5590c1423b7911a164e5 data/byg/recipes/wood/skyris/fence.json +eeff5ac68741d7060cca1312738ac5b2ffc92d3a data/byg/recipes/wood/skyris/fence_gate.json +ac158202ced358a33db3cd47148445abaf710c8f data/byg/recipes/wood/skyris/planks.json +90af3543adad7d0aa05af334e75a9787ff7daa5d data/byg/recipes/wood/skyris/pressure_plate.json +e3afe2b6d07f7cdae908657169d01504034bd894 data/byg/recipes/wood/skyris/sign.json +89615d92ee65de50df11608aa3516be666775376 data/byg/recipes/wood/skyris/slab.json +829b4efdc0346c0b654d5297d2ed298d7fdee869 data/byg/recipes/wood/skyris/stairs.json +1907e186a0571d4518d2d812000ea75147ed45aa data/byg/recipes/wood/skyris/trapdoor.json +48a65085aab1ea490d114898ce3d5ff81bdf6247 data/byg/recipes/wood/skyris/wood.json +10f7d05e1fcbe446258076f1072007cd7bd67cf2 data/byg/recipes/wood/sythian/bookshelf.json +deddb2add561b40dec4942a43623e3f2424d1022 data/byg/recipes/wood/sythian/button.json +6ccb2e5e004390ec123ff255e21eb89dcb32df9f data/byg/recipes/wood/sythian/crafting_table.json +86525dcdfa29931296ef10f90024c5012db1ae5f data/byg/recipes/wood/sythian/door.json +baf2d603c887f18f77c85618f1c47a533b11c91c data/byg/recipes/wood/sythian/fence.json +d5b2f95d5d502f6fe32775ba7347784cb8597253 data/byg/recipes/wood/sythian/fence_gate.json +b373aed7967d789c924f6d988489c84ff4f2fe95 data/byg/recipes/wood/sythian/planks.json +f46aeae9cb75d850f3b7541a3abaa489fd4555f1 data/byg/recipes/wood/sythian/pressure_plate.json +d2b59770c7d7e2e45d5654fd1874486080dd8d7b data/byg/recipes/wood/sythian/sign.json +eed396f7ef9a2607ab77681c4bc6bb88cf3a6ad2 data/byg/recipes/wood/sythian/slab.json +81382c54d8680a717ee06c1c6fc562371238dc24 data/byg/recipes/wood/sythian/stairs.json +beaf453c94627af60bc67c0cc4426c8883051f30 data/byg/recipes/wood/sythian/trapdoor.json +1874ac60fb19ea9274a1123078f862f9cb5bed74 data/byg/recipes/wood/sythian/wood.json +1394ec8ac6f993f1c4a7ee6b48079bebe7fdfd31 data/byg/recipes/wood/willow/boat.json +0ff359bf0e17415b705431edb4372a08167d7738 data/byg/recipes/wood/willow/bookshelf.json +cc89e9786097bca4658fcdb87e6a6018433a1888 data/byg/recipes/wood/willow/button.json +083f59cf8e2879f13c98eff571e880af0dc2650a data/byg/recipes/wood/willow/crafting_table.json +7349ee63baab1456b9f1a8f300827b3df946f754 data/byg/recipes/wood/willow/door.json +a5eb17c738522fd2b0e6bc0d4eb40295821f371d data/byg/recipes/wood/willow/fence.json +116c1308887f7ace62a08611152597a9c7bb94e8 data/byg/recipes/wood/willow/fence_gate.json +a95ff4b7e110975dc973a9a072e7422c5b2b4ced data/byg/recipes/wood/willow/planks.json +97feba90744cad9f9b3b54dbc80133d0ff6e346b data/byg/recipes/wood/willow/pressure_plate.json +7399bec03435853dea6edf3a5a8d80f5003628d4 data/byg/recipes/wood/willow/sign.json +da1f6704888d4e79bd9fce1da6eebe807389bfe6 data/byg/recipes/wood/willow/slab.json +ced5b2675818b7560e722c4cd13dfa298aa5ac29 data/byg/recipes/wood/willow/stairs.json +a2b2e7d93947cff6fb7eff4da84b68e5f5018d23 data/byg/recipes/wood/willow/trapdoor.json +ea0803f163d6f95b9df29ff1fdc31bdbb1ba90db data/byg/recipes/wood/willow/wood.json +53ff21ce7db7b40d47ed099cf4eefecf769453f1 data/byg/recipes/wood/witch_hazel/boat.json +4c77051db305360bda4904e1e778d0df90fffd25 data/byg/recipes/wood/witch_hazel/bookshelf.json +abd27c4de2ac1c124e215d5a0a4b5e7e3cb4b996 data/byg/recipes/wood/witch_hazel/button.json +b6d464e989f403cbf306d66eb7b617c3dd1d9561 data/byg/recipes/wood/witch_hazel/crafting_table.json +df8e6409f48d7d01d089db85cdcff02aed4991d4 data/byg/recipes/wood/witch_hazel/door.json +f7f1c4a2837771c4bb2d5e04fff79c96b564dd1f data/byg/recipes/wood/witch_hazel/fence.json +37334b59446ba03ba691e3c8dbfb11dd9af1fa31 data/byg/recipes/wood/witch_hazel/fence_gate.json +c9739f43c235fdca0d3d6bca32646bc4ca5b1279 data/byg/recipes/wood/witch_hazel/planks.json +9d271c49f71a115c05bd17a1b875d8a1b6112704 data/byg/recipes/wood/witch_hazel/pressure_plate.json +6745ce1b729e74547707d0503509bbf570c0d0e1 data/byg/recipes/wood/witch_hazel/sign.json +dadc3dc3247e5e78daf0cd078aeef81301f3a555 data/byg/recipes/wood/witch_hazel/slab.json +66de8112caef7c9cb70ead9bca450b364c7a8307 data/byg/recipes/wood/witch_hazel/stairs.json +ebf80eb02baac270f647ce7559d73a9a1cdfb014 data/byg/recipes/wood/witch_hazel/trapdoor.json +a15887a8967fcf348f7597acb132178a826deb2d data/byg/recipes/wood/witch_hazel/wood.json +720ab15856f60bbf33faf83142cb93195bec9524 data/byg/recipes/wood/zelkova/boat.json +208279313aefae7e090dc5f33119c7f32f6dc024 data/byg/recipes/wood/zelkova/bookshelf.json +5c5c27712699087ffd6085d48071e948b4729345 data/byg/recipes/wood/zelkova/button.json +d3606368c70f8f191199c0b55a896fb7c0008777 data/byg/recipes/wood/zelkova/crafting_table.json +03c9851f9851b79f693917524b9779fa5ed10ef6 data/byg/recipes/wood/zelkova/door.json +ca73a5c3c358fe90ba751a803a8e5bb4b221858e data/byg/recipes/wood/zelkova/fence.json +3679d8de47f3e7845bbea240005719b41a59c62e data/byg/recipes/wood/zelkova/fence_gate.json +3642cc2c415903299d3781639103ded91e5ee249 data/byg/recipes/wood/zelkova/planks.json +1bc57e126d14911fda8c2e35765c1d91c00a73dc data/byg/recipes/wood/zelkova/pressure_plate.json +d5e28cf262da8569f15b9cb9e09ddafb40697f70 data/byg/recipes/wood/zelkova/sign.json +4f266a32883f0b3a908c84cc951bf14ea6935e6b data/byg/recipes/wood/zelkova/slab.json +d6b2b6e208f53d905e6b9e57738dea4be2d022e1 data/byg/recipes/wood/zelkova/stairs.json +567ebb9fc318e963be8fec0b4a8b1726b9eca7ca data/byg/recipes/wood/zelkova/trapdoor.json +d53fa694e946bcc9863b30f23ba891dde6910575 data/byg/recipes/wood/zelkova/wood.json diff --git a/Common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/Common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 new file mode 100644 index 0000000000..2d60b6a8ff --- /dev/null +++ b/Common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -0,0 +1,2 @@ +// 1.19 2022-06-08T20:08:31.238424 Languages: en_us +d367daae9a10cf2ba422630aedb1ecf2e9dcb515 assets/byg/lang/en_us.json diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache deleted file mode 100644 index 29cea9017f..0000000000 --- a/Common/src/generated/resources/.cache/cache +++ /dev/null @@ -1,3779 +0,0 @@ -b30f441c3c157109846ed8b851ae3fd1a8c7436a assets/byg/blockstates/aspen_bookshelf.json -b5c900c1aac808526360ed0175a497b1a382b433 assets/byg/blockstates/aspen_button.json -fd3329c171e82f85a18f706ba33da293d70445c8 assets/byg/blockstates/aspen_crafting_table.json -347ecc08e06663236f3c17c3bedd68378a19f4e1 assets/byg/blockstates/aspen_door.json -1062037f8303186ebdee325277f3536a5c1598f8 assets/byg/blockstates/aspen_fence.json -9102ffbed0ac6db820bc9669b9a93da58866cff7 assets/byg/blockstates/aspen_fence_gate.json -29d25252851409b25de70e0ba0211509fefcdc9f assets/byg/blockstates/aspen_leaves.json -5f5ca758a60e2c53d600c1cffd7962c03ca4b840 assets/byg/blockstates/aspen_log.json -48cdfbae2ce7ca6707f724911272fe81f9d8ddf1 assets/byg/blockstates/aspen_planks.json -cdc7e6b1223736a93f84dceb1576768bb9e48230 assets/byg/blockstates/aspen_pressure_plate.json -ad4ce10bc6c38899edd4bfec7d1a51b40e564f16 assets/byg/blockstates/aspen_sapling.json -d768f4b91cf938390d5f98a19f96af1925f93184 assets/byg/blockstates/aspen_sign.json -5df218daa64d454008ee4627af709c02f76e1fc5 assets/byg/blockstates/aspen_slab.json -ebc382c911294f10130ea6accdd3bbe6d04fa01e assets/byg/blockstates/aspen_stairs.json -a1cf8cc2fd4e08745aaedb95ca8d8aa565c532b9 assets/byg/blockstates/aspen_trapdoor.json -d768f4b91cf938390d5f98a19f96af1925f93184 assets/byg/blockstates/aspen_wall_sign.json -9ed8e80457466b15e98e82b2d6c9811ac8cdc009 assets/byg/blockstates/aspen_wood.json -9b530553a60965f2c1d6df95e793ca5d5df668e7 assets/byg/blockstates/baobab_bookshelf.json -9494e776824d175009ab0c64293294a955c2b1d6 assets/byg/blockstates/baobab_button.json -a29d366559c6ddc55a2edbb7c31ffa202a6a967d assets/byg/blockstates/baobab_crafting_table.json -d58aa83bb3250da16d7658371ecb2e27cbe44074 assets/byg/blockstates/baobab_door.json -3e6fce83ee8e0c3f83ef1a4764cfba79439723de assets/byg/blockstates/baobab_fence.json -11d39189a8f092501cbf9c41d92ec8f99747c96f assets/byg/blockstates/baobab_fence_gate.json -cb8e0c689ba19dc671b9fbb7810e2f1bc3c2ece4 assets/byg/blockstates/baobab_leaves.json -75f715480b91e2e6daec947096217326ba39ea3d assets/byg/blockstates/baobab_log.json -71b82ac2d1698b5da5848e78d364b140f6ae696f assets/byg/blockstates/baobab_planks.json -8b556ed43bcfaddb28ddb4dad0724c2489c9e1e4 assets/byg/blockstates/baobab_pressure_plate.json -9a7979c28f981ba020325dafa75220ebc62a016d assets/byg/blockstates/baobab_sapling.json -4e91b8cd5a76ed73dbfdc4951092e7d92b52e2e7 assets/byg/blockstates/baobab_sign.json -5a90e48e6353dd15f5a1c9f676049550965a1599 assets/byg/blockstates/baobab_slab.json -46bc1593dab72984f0f50b93879ff5e72529b25a assets/byg/blockstates/baobab_stairs.json -9d16692195b2262dc3f385ff20dc0441d69498ae assets/byg/blockstates/baobab_trapdoor.json -4e91b8cd5a76ed73dbfdc4951092e7d92b52e2e7 assets/byg/blockstates/baobab_wall_sign.json -a407a88762140e840178fe0cc1a9f2fa6fdd7782 assets/byg/blockstates/baobab_wood.json -456c6bb8f7cced890ba8c4bc49319b70d2e9fb97 assets/byg/blockstates/blue_enchanted_bookshelf.json -22ab3ec5237ade7b7763133ce7c0ed28bb28576a assets/byg/blockstates/blue_enchanted_button.json -aea28f311eec3ba4950d8fef2ef809de55b5ebe0 assets/byg/blockstates/blue_enchanted_crafting_table.json -6f06579f4504cbfb171aa9b57c3529f9f83d1ea8 assets/byg/blockstates/blue_enchanted_door.json -a8c0e87fb742bb27bd421145b35983ee3ed5b28e assets/byg/blockstates/blue_enchanted_fence.json -1fdcdad4d62f7529880aef2e8469753b241e61a2 assets/byg/blockstates/blue_enchanted_fence_gate.json -5abfba409f2ab105c80413dc1d386dcf2582a41d assets/byg/blockstates/blue_enchanted_leaves.json -beda7164cea919a803a0860ca97834050fda4120 assets/byg/blockstates/blue_enchanted_log.json -b1446b58b1422b8fa6fe2c743db666a5f3912d73 assets/byg/blockstates/blue_enchanted_planks.json -77e5d35fe49fc200e0c5ae18acb24645fcef1610 assets/byg/blockstates/blue_enchanted_pressure_plate.json -64e13153b23b1bd0b36e3921911497736cc30fe1 assets/byg/blockstates/blue_enchanted_sapling.json -cf17ce200fab89d820ef551d517af3714c9eff5a assets/byg/blockstates/blue_enchanted_sign.json -845c52c88cea1f36eec88599489d6bd6da3d3dc0 assets/byg/blockstates/blue_enchanted_slab.json -b663397ca131c3809a264273db49bb3cbaa804f6 assets/byg/blockstates/blue_enchanted_stairs.json -ca04d4d0c482f697ac997c18cd672872d6d5574b assets/byg/blockstates/blue_enchanted_trapdoor.json -cf17ce200fab89d820ef551d517af3714c9eff5a assets/byg/blockstates/blue_enchanted_wall_sign.json -84b6d65765fdd81c70b72b26aaacf8356b43de40 assets/byg/blockstates/blue_enchanted_wood.json -11d9fdb3f3fb28605dc1813efddbc0769c7376e7 assets/byg/blockstates/bulbis_bookshelf.json -cdc4bb75ce5f65a4105e76f022b24c022329daaa assets/byg/blockstates/bulbis_button.json -d642426ccac836b099d80eb6f7839e11c9d9fa75 assets/byg/blockstates/bulbis_crafting_table.json -7bc91cf41467018ce962141aeaf6ef636a3f863d assets/byg/blockstates/bulbis_door.json -05ea3dbc2d1cf74164eccace12632d07284bebfd assets/byg/blockstates/bulbis_fence.json -52f49d50d9a2b1ff65a4ef5579ae87edfe01fa68 assets/byg/blockstates/bulbis_fence_gate.json -aa3dce03f95ffb3e493723b4af57796446bd06a5 assets/byg/blockstates/bulbis_oddity.json -650dfec098bab994309a39150c03ba8bb96103cf assets/byg/blockstates/bulbis_planks.json -93cd0d54e1ed8a0ed2fb7846904e437aa050cf7b assets/byg/blockstates/bulbis_pressure_plate.json -1a25674ee9800d2233a6a2aa76aa83930b7d3b2b assets/byg/blockstates/bulbis_sign.json -5421ac9b41c223ebab50565824a59307cc9d2662 assets/byg/blockstates/bulbis_slab.json -cd66b534707514f920646728e836d22ba63aba3e assets/byg/blockstates/bulbis_stairs.json -f8b44875c14d68e47f7509fb5c6810ac7a0fd05c assets/byg/blockstates/bulbis_stem.json -403946f133711ef34624713f7cb037cc9d4bd29a assets/byg/blockstates/bulbis_trapdoor.json -1a25674ee9800d2233a6a2aa76aa83930b7d3b2b assets/byg/blockstates/bulbis_wall_sign.json -34437c30c0b1bd9773f1be8e10c8d4dfec37f8a8 assets/byg/blockstates/bulbis_wood.json -2d2f9344172d4eec4cf91ae111dc0c6a942ae8f7 assets/byg/blockstates/cherry_bookshelf.json -9237e75502db78f6682e07002fc8f0257f8039da assets/byg/blockstates/cherry_button.json -c5c78b48d2a9c2a535b213b11d404295fc417f6e assets/byg/blockstates/cherry_crafting_table.json -30dc7678a7d74626d9baacba655550f1f8ea8334 assets/byg/blockstates/cherry_door.json -7837301596305f89a623a2e8f00ae80d4b69c68d assets/byg/blockstates/cherry_fence.json -5f4004b4ebee91256b09d5170dc6000b6482f836 assets/byg/blockstates/cherry_fence_gate.json -cac2a6bdf27098f538aad8afa1ef7a4e197d36e6 assets/byg/blockstates/cherry_log.json -b358d54ecbc20cd095b8a3190ecd0b6e5e92d8a1 assets/byg/blockstates/cherry_planks.json -18a4e50ded54706438caa3fdbab555de8b887375 assets/byg/blockstates/cherry_pressure_plate.json -feb5af5c0292b50ae7e087baaf51afabece5071e assets/byg/blockstates/cherry_sign.json -13b503f19ea9f6b51671fbd47d4222676aab3a9d assets/byg/blockstates/cherry_slab.json -030349e42e73bbffc5fbdc60e2fb86c923a78355 assets/byg/blockstates/cherry_stairs.json -751ced15dcb317710bc594b5345beeef56e1615b assets/byg/blockstates/cherry_trapdoor.json -feb5af5c0292b50ae7e087baaf51afabece5071e assets/byg/blockstates/cherry_wall_sign.json -8093ed1c2a68e88868b09c31773f388295496eff assets/byg/blockstates/cherry_wood.json -4a3ba90f77e5b20c00636a9fddbdcdaa95556993 assets/byg/blockstates/cika_bookshelf.json -51eb709f9dd4702a5060327b3508fff7aeffd7ed assets/byg/blockstates/cika_button.json -30516f8e13ffb9c627bc8d5183b1b5fd00b18174 assets/byg/blockstates/cika_crafting_table.json -6031c903fd27b042a8c096093512cce235c254c4 assets/byg/blockstates/cika_door.json -cf27985827685ce0c53261402375bd0d7aa1ad38 assets/byg/blockstates/cika_fence.json -d46011fcb0eb1a993ba87cf2b70058331e5ba961 assets/byg/blockstates/cika_fence_gate.json -2437bbe06265b1d51a2bbedc21303b8a882a39ad assets/byg/blockstates/cika_leaves.json -2f4988eae476c2e0f08cb478c437ef572e360dcb assets/byg/blockstates/cika_log.json -233e151eb926da2ca9c1bf144ee815fc55c043ed assets/byg/blockstates/cika_planks.json -bc03f8c8b0e1bf4d2b3887e06ba7d7cb0701454b assets/byg/blockstates/cika_pressure_plate.json -1faa7bd9a8275098243926345e4b17a5d6041a45 assets/byg/blockstates/cika_sapling.json -8045860071e013ddfcfad74e8891f47b1afadf01 assets/byg/blockstates/cika_sign.json -34f068c89083814a3829f44ef7721bce9776971b assets/byg/blockstates/cika_slab.json -2c4e481c519b39c19fef8943c401c33447bba0fc assets/byg/blockstates/cika_stairs.json -51180b1bd9b44f829879c95433794894f904ea66 assets/byg/blockstates/cika_trapdoor.json -8045860071e013ddfcfad74e8891f47b1afadf01 assets/byg/blockstates/cika_wall_sign.json -e44b08dca8032672db8b041d632dbcd3be644817 assets/byg/blockstates/cika_wood.json -2f90dccadf676a68cc434d058f16c1745f436fc2 assets/byg/blockstates/cypress_bookshelf.json -7f11b23b79d4ad7decd6a688a1de3b9cc6dfdf40 assets/byg/blockstates/cypress_button.json -9ae2c63c958ade5f3c3c8fb085dc799b6d3e3700 assets/byg/blockstates/cypress_crafting_table.json -a054c568abd58f389f30bc647c4bd92db63210dd assets/byg/blockstates/cypress_door.json -b2fd9cbc00821348f1c6a01570a99c6068f8cd31 assets/byg/blockstates/cypress_fence.json -050aae7a7841ea65d45c2e3d3cbf119ba89afabb assets/byg/blockstates/cypress_fence_gate.json -b68b8479abbd2fcb55d41803b00a7c86dc98107f assets/byg/blockstates/cypress_leaves.json -64ea91cd921cae787bcc4b1e9ae565729d3cf836 assets/byg/blockstates/cypress_log.json -05846aded161d6f08b10912c0d5bec70ba657cfb assets/byg/blockstates/cypress_planks.json -0434a174a2be6e8bc6aa359c67a1fc07979c50f8 assets/byg/blockstates/cypress_pressure_plate.json -030b18e58869eb145cca6b43d0a269fcd1c0f459 assets/byg/blockstates/cypress_sapling.json -7aae5fba81e44a5834172b09de267ec6ca6e9234 assets/byg/blockstates/cypress_sign.json -18cbd38b265803125299f381d554825cf576e8e9 assets/byg/blockstates/cypress_slab.json -9cc116b20eb50e84ac9b35ba9261fa40d90c990a assets/byg/blockstates/cypress_stairs.json -fe5812f696dfecd2386017c2e904d584d651918b assets/byg/blockstates/cypress_trapdoor.json -7aae5fba81e44a5834172b09de267ec6ca6e9234 assets/byg/blockstates/cypress_wall_sign.json -5be9d15a21ae48ba0049c936da8eeddb83209941 assets/byg/blockstates/cypress_wood.json -0b58b77abeede946897bbe25202bee8368c9d22f assets/byg/blockstates/ebony_bookshelf.json -114efca25fa48660b167082279d1e00a1acd4860 assets/byg/blockstates/ebony_button.json -14075432b69c040e98b3a7e334647f0ad3da71ec assets/byg/blockstates/ebony_crafting_table.json -70bdc383654cb23af3b27ce400b2832349936aa5 assets/byg/blockstates/ebony_door.json -6c61f8ffa9fde9c16aa710bef6bb1e5ae739aa49 assets/byg/blockstates/ebony_fence.json -7f5a17bb8734ffa2664ecfe792d8936417286f17 assets/byg/blockstates/ebony_fence_gate.json -d74089c995e6affbc74a457cff279aaa1ac02a46 assets/byg/blockstates/ebony_leaves.json -68e5d032896e80ea64fd5ba48c6a8b0e9e009c7f assets/byg/blockstates/ebony_log.json -8b3aaf18e34e22e4f13e124a3b28aed80666de91 assets/byg/blockstates/ebony_planks.json -34f5626530e0f3a2a677cef41c1735d250e643ee assets/byg/blockstates/ebony_pressure_plate.json -1d6db1f12bffcadbba4b578c13e1aed3210760a7 assets/byg/blockstates/ebony_sapling.json -382de3b3080da62d15f36234386f0614c8bcb739 assets/byg/blockstates/ebony_sign.json -d698358e14d5b800a34701c887b3c102420d37db assets/byg/blockstates/ebony_slab.json -159597001403dce617cec0b09015229f82a692fa assets/byg/blockstates/ebony_stairs.json -7093b45027148af44c5a09e2dd072b01d4cc0dd0 assets/byg/blockstates/ebony_trapdoor.json -382de3b3080da62d15f36234386f0614c8bcb739 assets/byg/blockstates/ebony_wall_sign.json -e4fce75058f0bed17802a560173dd228e2ea36d9 assets/byg/blockstates/ebony_wood.json -200459a4e3443e80749671ca91140e98546574ac assets/byg/blockstates/embur_bookshelf.json -bbec1f7607f6b94ca03945848b01f04561b2c323 assets/byg/blockstates/embur_button.json -512bea274ea8d1bb4b92ce997aedce20610a3d54 assets/byg/blockstates/embur_crafting_table.json -e7dd6c47208c5ad4bb856bdd5931a6151a0602c5 assets/byg/blockstates/embur_door.json -d6313fcb9d257839feb4117b7f284d7658932720 assets/byg/blockstates/embur_fence.json -f8cff1e012779ef2568929c38ea45d880efce0dc assets/byg/blockstates/embur_fence_gate.json -46e831a1dba9de011c9322957107a5c1d062dd2a assets/byg/blockstates/embur_hyphae.json -b6d9488386debda019aece59c0634c2c24258736 assets/byg/blockstates/embur_pedu.json -8b239412b7b13874dd0a12acd09dce1a10cbc851 assets/byg/blockstates/embur_planks.json -8c5ddd130c78b32e4e39a821d24119707d76040c assets/byg/blockstates/embur_pressure_plate.json -beaebacfa6deeb4a29e7f88bdd14720fc078916c assets/byg/blockstates/embur_sign.json -cacd2f9cf0ff0c18fcda66fce0eb2624d46a80d8 assets/byg/blockstates/embur_slab.json -94999f2516a5f601dd7dd9370b5689d4f0b917f4 assets/byg/blockstates/embur_stairs.json -3c2e6d1f27880ebfd5c437976e3e23c8a0c85998 assets/byg/blockstates/embur_trapdoor.json -beaebacfa6deeb4a29e7f88bdd14720fc078916c assets/byg/blockstates/embur_wall_sign.json -bbfdcfa6e93d2a9e423eb19f06880fa3c644c8c9 assets/byg/blockstates/embur_wart.json -75c61f404bef1a779353a845d1a3b5174e8928d7 assets/byg/blockstates/ether_bookshelf.json -9d909276a22226136fe241f263e0b4075ef2b987 assets/byg/blockstates/ether_button.json -02861206e3db5520606113efda73aaee0a2d9252 assets/byg/blockstates/ether_crafting_table.json -da55907f64fafb7b6dee2e2a711baebc50bf94e6 assets/byg/blockstates/ether_door.json -83814c68b112d7c4971b1ab274187057f9a10c6f assets/byg/blockstates/ether_fence.json -f9700f487572abb2236c67b992bbbbbf4ad26f0e assets/byg/blockstates/ether_fence_gate.json -38fd59128606055cd47f9d0f5e7dd9a838abad97 assets/byg/blockstates/ether_leaves.json -309ff34d42e5b2d1e09d8c828ed5518797e31cfd assets/byg/blockstates/ether_log.json -b5a493a4bd9575237f481905be4881c84339bf48 assets/byg/blockstates/ether_planks.json -37133b061949020bea2906138e83bb1df54e1031 assets/byg/blockstates/ether_pressure_plate.json -3e292be23042770314b45bfb2bffecf994ff4fed assets/byg/blockstates/ether_sapling.json -32114613835bd8e9f408927f04155d9cc9f485f9 assets/byg/blockstates/ether_sign.json -3079fa76d05999a8c0c0e531f6de4a84d12e8824 assets/byg/blockstates/ether_slab.json -3747906a8ae92fb238b2519cfa6fc46a8c55de04 assets/byg/blockstates/ether_stairs.json -80082439073ab19d72bb92807b6cef3bf7f2882a assets/byg/blockstates/ether_trapdoor.json -32114613835bd8e9f408927f04155d9cc9f485f9 assets/byg/blockstates/ether_wall_sign.json -e3e77c7b000f51269b5f67ecddc512ec96ea05ae assets/byg/blockstates/ether_wood.json -f664d6bc826b44c0d13d33f27f57a59e7560edf0 assets/byg/blockstates/fir_bookshelf.json -156771fc3a906babe8931d717fb39aceef675330 assets/byg/blockstates/fir_button.json -33b5cf1acf9ae829ba7cb65eb1b234315d7d85af assets/byg/blockstates/fir_crafting_table.json -2e43e224bc6bfdd260679cf5c95ac2055523024e assets/byg/blockstates/fir_door.json -082b1775bdb12abcaadf082548ce31498f8f1c68 assets/byg/blockstates/fir_fence.json -97884fc7522e744734612008fba109a49a1332a3 assets/byg/blockstates/fir_fence_gate.json -306bbaf05ba93fa40abdf5778a659bdbebd98518 assets/byg/blockstates/fir_leaves.json -5dbaafdcf890391e0104adb2be671bd42e4afcc7 assets/byg/blockstates/fir_log.json -26a3185d0554c29d7513d597f0484b1ec4c4dabe assets/byg/blockstates/fir_planks.json -a542a26d6211372337d75f448ffcb1064df92d3a assets/byg/blockstates/fir_pressure_plate.json -d3f83cdcf37f10a09f81aaa8f906aeeb56aedfbf assets/byg/blockstates/fir_sapling.json -d1ba1f62bd8514d6dfcd0207f67db947ff634674 assets/byg/blockstates/fir_sign.json -aeca1210198d02e88eaa523732a4b57cd048a947 assets/byg/blockstates/fir_slab.json -ec0a00c28a345cd8e7651bf0d04ccdf9eed4a44a assets/byg/blockstates/fir_stairs.json -483d7c57d329f15846ba349f1e230bce57682388 assets/byg/blockstates/fir_trapdoor.json -d1ba1f62bd8514d6dfcd0207f67db947ff634674 assets/byg/blockstates/fir_wall_sign.json -491c543c8068f56f78c7a819a2037d1d7e07eed2 assets/byg/blockstates/fir_wood.json -9943f7e2bc7314068fe2d79f4c84b924cb7a0c59 assets/byg/blockstates/green_enchanted_bookshelf.json -04b2a6e84f0c0a930d5d119e5a23f44821f3544d assets/byg/blockstates/green_enchanted_button.json -67c51071904ce0110550b5107e8887987043220c assets/byg/blockstates/green_enchanted_crafting_table.json -a5701ba522045183b41b115f78182d036c3adcce assets/byg/blockstates/green_enchanted_door.json -24c2fc4ab9a92ee26f5f9b9b3e4ba632ae1fca31 assets/byg/blockstates/green_enchanted_fence.json -5cd8bc0e467abb59e3e2489f306426e5d73453ac assets/byg/blockstates/green_enchanted_fence_gate.json -2ae3136bc890f8c9e8fbbfc3593c101393f9713b assets/byg/blockstates/green_enchanted_leaves.json -be960e54effc1b98eade1fb85034e63178f87090 assets/byg/blockstates/green_enchanted_log.json -db16b4281215de072da9fcdfa8a2e2d4f1c59e26 assets/byg/blockstates/green_enchanted_planks.json -29a1710526195079af4cdb764472b3467878855d assets/byg/blockstates/green_enchanted_pressure_plate.json -b8897b9101242e862efad4ff38bba82e3cf41f9d assets/byg/blockstates/green_enchanted_sapling.json -7c66b207ec549557bf26f693d948985e8e5968d3 assets/byg/blockstates/green_enchanted_sign.json -f7bb14615da3a0ea429d490f10cae1afb5845ab4 assets/byg/blockstates/green_enchanted_slab.json -e5e737a8dd8245a48d5a7ee0e959371e97c74ab1 assets/byg/blockstates/green_enchanted_stairs.json -4c28fe14767bd0b394d50f8cfc4324b2af6e895a assets/byg/blockstates/green_enchanted_trapdoor.json -7c66b207ec549557bf26f693d948985e8e5968d3 assets/byg/blockstates/green_enchanted_wall_sign.json -f983f31f409c8107060d6869689d426cef3aacc1 assets/byg/blockstates/green_enchanted_wood.json -b32d0d43ebd88a4bfe468169f24c16d42579f0d7 assets/byg/blockstates/holly_bookshelf.json -198f588b7cb0580ad5ffa48eb728be5a77d7a737 assets/byg/blockstates/holly_button.json -2cce94d6eaa74cbb964b3ba950d286b0082ce82b assets/byg/blockstates/holly_crafting_table.json -87107c171b4c12de8047c25b4118c3fad97ff0c5 assets/byg/blockstates/holly_door.json -1e0d1cb27c47deedb0b594daf1ad96664bc403a1 assets/byg/blockstates/holly_fence.json -c98a61362134c539fa7b3e1c3fbc7a5c4bf29deb assets/byg/blockstates/holly_fence_gate.json -e645b36d4b6491a69555e368685a0a24b5647504 assets/byg/blockstates/holly_leaves.json -acbd15065101f8af93ae367afe071f77b20a8a2e assets/byg/blockstates/holly_log.json -0780b1088202c3522489e6ef57c9b998dcffd05f assets/byg/blockstates/holly_planks.json -d61b3d8e97c943b200e94e10360a2991cd34a96d assets/byg/blockstates/holly_pressure_plate.json -a6d91c6966dcd3f969e18ea0b9261280e5f42053 assets/byg/blockstates/holly_sapling.json -1f91718ee98b8e0dd766b60cbde946d9a5f9941c assets/byg/blockstates/holly_sign.json -3bd67e3d60b1f435af6e6f2acba3d70cea8b2174 assets/byg/blockstates/holly_slab.json -771a50f13aef7502407cf2700b527d00262600d7 assets/byg/blockstates/holly_stairs.json -9d50a7d25751f6827b7f95531c2d8e6945dc8619 assets/byg/blockstates/holly_trapdoor.json -1f91718ee98b8e0dd766b60cbde946d9a5f9941c assets/byg/blockstates/holly_wall_sign.json -4f6f2c53fc3e2eabed9d63477e8acb35645fb696 assets/byg/blockstates/holly_wood.json -9cbc47409067352e5896d895c7abce4bcae0ffa8 assets/byg/blockstates/imparius_bookshelf.json -15c7dbe3e482190440242b2f2c76c013556e9605 assets/byg/blockstates/imparius_button.json -66e7425c2020c136138f201825aff3d499721428 assets/byg/blockstates/imparius_crafting_table.json -fc97fb03f56ab2a615f455454578f5d149a537ca assets/byg/blockstates/imparius_door.json -4cab2772b2e557e13e8df7dd485ea5aa78104509 assets/byg/blockstates/imparius_fence.json -b62d39c9e83e6947b28154c3e785c7ed34822233 assets/byg/blockstates/imparius_fence_gate.json -a53e3318418c7549ac4fac5826fff3fc149fc4fe assets/byg/blockstates/imparius_hyphae.json -9cd32a084fec1d5cb33d62ef4b9b80ee22370827 assets/byg/blockstates/imparius_mushroom.json -a4fe9c5cd4d85b0e6510cd4ebd369cd96d94e5bc assets/byg/blockstates/imparius_planks.json -c9b9f0a963d973c3dcd42524518548aa1d94ed97 assets/byg/blockstates/imparius_pressure_plate.json -6b9e1bac882dca8f69daa12849242e0352d44709 assets/byg/blockstates/imparius_sign.json -5ee8423214cb57c829d3a3ae3d4bd35312c293e6 assets/byg/blockstates/imparius_slab.json -bddd34ff15d49cf1495edbe287c941e8bffc75e6 assets/byg/blockstates/imparius_stairs.json -4e166d7620a7926a7142493a38a2ff5bfbd1e357 assets/byg/blockstates/imparius_stem.json -5c2271363055a6487629c16e9153a4aaf34b1d29 assets/byg/blockstates/imparius_trapdoor.json -6b9e1bac882dca8f69daa12849242e0352d44709 assets/byg/blockstates/imparius_wall_sign.json -2698ab6bf7752a084c60ca8b4373cedcb4c4cf52 assets/byg/blockstates/jacaranda_bookshelf.json -e36e83906ab21e33a7eb10159e835321bb8147d8 assets/byg/blockstates/jacaranda_button.json -92fe11ffeb6f855b92717d1e49ca483bd22b06ea assets/byg/blockstates/jacaranda_crafting_table.json -20567f28d3199a8518df9fcd4013a0cb3e8cf3b7 assets/byg/blockstates/jacaranda_door.json -b90a2358ad71914db8a0dddff012822feee9fed8 assets/byg/blockstates/jacaranda_fence.json -5b5e650aaca946a1790daab441d0312b42b9b974 assets/byg/blockstates/jacaranda_fence_gate.json -107b33016b7a7f95712f49914ee1e4389359bdf2 assets/byg/blockstates/jacaranda_leaves.json -052a85aa0ed5b9de3f45d3504be690ab96dc38bf assets/byg/blockstates/jacaranda_log.json -62da5c17355c7cc14a44c3ca60f6ebe488397b46 assets/byg/blockstates/jacaranda_planks.json -b5f013629695fa9d81cf37ce3d7b3aef39223f8d assets/byg/blockstates/jacaranda_pressure_plate.json -42e60d6faf7650b0b01bb40ca2f1ced3e3414608 assets/byg/blockstates/jacaranda_sapling.json -1676a8c9c77db5371489a72dc5a2b857338c33f5 assets/byg/blockstates/jacaranda_sign.json -41416df158f3e814f5b4a57b4db8b6c1e7164ea7 assets/byg/blockstates/jacaranda_slab.json -80b6eab6b2fe7b9fabff58228badd698a5950e6b assets/byg/blockstates/jacaranda_stairs.json -10b8837262a81bf6c5c4cab22475a650c605c215 assets/byg/blockstates/jacaranda_trapdoor.json -1676a8c9c77db5371489a72dc5a2b857338c33f5 assets/byg/blockstates/jacaranda_wall_sign.json -1bfea42e7470aa0c5bee7a49c9975f51e9b6ab5f assets/byg/blockstates/jacaranda_wood.json -f6e0d7a87643e75508857bc72c746d07f316042a assets/byg/blockstates/lament_bookshelf.json -caa05c4828bed24692853c4b9260c69e4998251f assets/byg/blockstates/lament_button.json -10a39a99c8fd6a0dd496c6aab8be82e62eff9c91 assets/byg/blockstates/lament_crafting_table.json -4f3f1dac6c3697a3e1500bdf0024a160ad7dc66f assets/byg/blockstates/lament_door.json -5d4a15172c044f8bb8d5e6f439b4e749b52c5746 assets/byg/blockstates/lament_fence.json -9212d99b2465d58c9190eae3f2242bd44c688b5a assets/byg/blockstates/lament_fence_gate.json -28f881bbefb38570cb2701e7c42df794ab718e73 assets/byg/blockstates/lament_leaves.json -81dfb5141345deb982a104dc43b184f1577b6315 assets/byg/blockstates/lament_log.json -52c6a6d2e0f317d9f30cb748a10b33c6b058c872 assets/byg/blockstates/lament_planks.json -bb985fb2f9a8d1530a65648040902e87a8f2e8b1 assets/byg/blockstates/lament_pressure_plate.json -06ed38a42cc419a534647531555bc3cff01ff5a6 assets/byg/blockstates/lament_sapling.json -5b827e7cf1215e64844017aac998b645abcdbee2 assets/byg/blockstates/lament_sign.json -882a9b685f0f8137d8ef7dfee88c2199fe3f06ea assets/byg/blockstates/lament_slab.json -84c408b0e266dc3c8571d47fa62a2627859a15be assets/byg/blockstates/lament_stairs.json -d6abdc6c0bab9b113e4dcaac2e18818692edca76 assets/byg/blockstates/lament_trapdoor.json -5b827e7cf1215e64844017aac998b645abcdbee2 assets/byg/blockstates/lament_wall_sign.json -6e77caae650e9b1c2ae60439cf51780ea48f8148 assets/byg/blockstates/lament_wood.json -2d64b1e97d9895e66e98faca798866a4ebaee335 assets/byg/blockstates/mahogany_bookshelf.json -718f7b42d87527834f70aa7918447aa98ca7b2a1 assets/byg/blockstates/mahogany_button.json -6f41668ba9e74ca53c6015d50ab82fa974538b89 assets/byg/blockstates/mahogany_crafting_table.json -60ce84a6ba354e97d1d722eb75b807cd94657417 assets/byg/blockstates/mahogany_door.json -6f26d59749aa9ec3c6eaf295afd9a4794d078101 assets/byg/blockstates/mahogany_fence.json -215e498d7d36ad76e71f4f62568d71bf274be85d assets/byg/blockstates/mahogany_fence_gate.json -259c93c1fbce5626b84195720fa59e85b30a2746 assets/byg/blockstates/mahogany_leaves.json -e4d5c8d1f36b4a2a2db3a5f46f44e5d641f68d0f assets/byg/blockstates/mahogany_log.json -b98b6eaea45f5d641cbf8b9371aa4f81ff7f4f07 assets/byg/blockstates/mahogany_planks.json -eb8047b6ffe533f77ea8804aed51564ba69d7b85 assets/byg/blockstates/mahogany_pressure_plate.json -a5a996bdf644ffa4075527c9beaff965d19dce71 assets/byg/blockstates/mahogany_sapling.json -a16db3449dd497dd4e3f5151940b4af0bbd2c8b9 assets/byg/blockstates/mahogany_sign.json -986dfe68d719cc2529ad0d029769ab172f2c9adf assets/byg/blockstates/mahogany_slab.json -19c1800a72a941de5e8348d2badfab0d994fb74d assets/byg/blockstates/mahogany_stairs.json -0b44391beb743408a6adc0dec3e8295b67b1cf7e assets/byg/blockstates/mahogany_trapdoor.json -a16db3449dd497dd4e3f5151940b4af0bbd2c8b9 assets/byg/blockstates/mahogany_wall_sign.json -968339c9821aa2fb276e8b8939fb2358ed4d1120 assets/byg/blockstates/mahogany_wood.json -803d7b6e47598ac0b27596620c4c7a18b149b045 assets/byg/blockstates/mangrove_bookshelf.json -fb877e5603e8bf1df87634856397c7253bfe3c7d assets/byg/blockstates/mangrove_button.json -692070740510de92a95476f38ff6d0643370283d assets/byg/blockstates/mangrove_crafting_table.json -5c519fdcbc8af56da26c47ba43e27b89ad428b60 assets/byg/blockstates/mangrove_door.json -d5b8e983181b9c6b3ad3c959f0c50f66d4a0c122 assets/byg/blockstates/mangrove_fence.json -077d8ad9a649d975a7ea4ac0ef9262c4a5a49fc6 assets/byg/blockstates/mangrove_fence_gate.json -065aa9e1eee92080b502986c4128ed5d08f6c896 assets/byg/blockstates/mangrove_leaves.json -e315b86163ca8ebc6d226e87591d7d0347ec8144 assets/byg/blockstates/mangrove_log.json -76007e43389833ec5a4f3d8bdd6e61aeec5f7d4c assets/byg/blockstates/mangrove_planks.json -b11bb0f54a42d1e98910783e570b3bedf82a0477 assets/byg/blockstates/mangrove_pressure_plate.json -a40ff5007072afce4cf01e007b8b248c64ca2b0e assets/byg/blockstates/mangrove_sapling.json -69529951e48e9ef87deda9b72b4b85c3a9ab8d98 assets/byg/blockstates/mangrove_sign.json -b9b82a92ccaab188fc6116195e2a86c93913e235 assets/byg/blockstates/mangrove_slab.json -91ffb5f2614334e1aca2468f1cc7b5a45c2e2c40 assets/byg/blockstates/mangrove_stairs.json -2f3d7cfa883beb4113263201b521ab7e53b0d29d assets/byg/blockstates/mangrove_trapdoor.json -69529951e48e9ef87deda9b72b4b85c3a9ab8d98 assets/byg/blockstates/mangrove_wall_sign.json -ae0c3c303c806e8d7703ec8843685d3026ceb230 assets/byg/blockstates/mangrove_wood.json -bfae166b196aba9ceccf9af2cca32824b97c2a60 assets/byg/blockstates/maple_bookshelf.json -c597a3580215e9b8811f71a57d44377ecb43d83f assets/byg/blockstates/maple_button.json -bad56a0d46fbe147efee8357c7fdd65e542cca14 assets/byg/blockstates/maple_crafting_table.json -deca38cd2f440755be28c418ceb3c3cfc40a927c assets/byg/blockstates/maple_door.json -633b96e55dcc0c619c2de73986d752f63b408b94 assets/byg/blockstates/maple_fence.json -f954e9776589a558344e537cff942e360f97a0db assets/byg/blockstates/maple_fence_gate.json -c3b35776049ce2fd2b71aa137ddcbc338c512963 assets/byg/blockstates/maple_leaves.json -6c488905f1c82c319d40b1502981b5bb8f7e8bd0 assets/byg/blockstates/maple_log.json -aab324e83e940721a756037cfd1ff30f104a962d assets/byg/blockstates/maple_planks.json -0f863550d93d116773107a054f6e03f6931c9846 assets/byg/blockstates/maple_pressure_plate.json -cc26d57d0ebd2685146d15ca9b5cd2f19b2055a9 assets/byg/blockstates/maple_sapling.json -2031c6fc8d816cfae216c3d4ebeb6a15876097f2 assets/byg/blockstates/maple_sign.json -68f4969779462c493e37a2266227bca049cf47d4 assets/byg/blockstates/maple_slab.json -a520d2347347d6afc506223042acb65cd879b219 assets/byg/blockstates/maple_stairs.json -eeb76e6475d6f81224729eafd69d73390c5218b6 assets/byg/blockstates/maple_trapdoor.json -2031c6fc8d816cfae216c3d4ebeb6a15876097f2 assets/byg/blockstates/maple_wall_sign.json -bc0abb64cb9f89b4cbd46a7c8f3b9e3c8363a181 assets/byg/blockstates/maple_wood.json -e3c8c0da0697aaebb9f76d2618f106fe69dddf5b assets/byg/blockstates/nightshade_bookshelf.json -f980fdf26bf1bacc6e836f8d88c7da0887d25666 assets/byg/blockstates/nightshade_button.json -8ada93135e307c6e47ff8da6c9e0450be6341d67 assets/byg/blockstates/nightshade_crafting_table.json -66b563297ad2545829979c0677473b933a385ec4 assets/byg/blockstates/nightshade_door.json -90eaf53722d00b08a1b7837ed8ea591dc6cd7267 assets/byg/blockstates/nightshade_fence.json -fbf2ee152cf1a40dbfffefb8e676548844926035 assets/byg/blockstates/nightshade_fence_gate.json -7706b3d69ef59793419cb6f9923f5260f7c0d926 assets/byg/blockstates/nightshade_leaves.json -0463fc1acd3e6b00e85d258507fe0f5b5a388449 assets/byg/blockstates/nightshade_log.json -f72d36bbef65070cb6c98c4581ffe71fb6cc594c assets/byg/blockstates/nightshade_planks.json -edee3a910e024b1e32df182a6e9e8a7524fd19bf assets/byg/blockstates/nightshade_pressure_plate.json -8c538dc83d44a1a26e181c80770aa785284b8cc5 assets/byg/blockstates/nightshade_sapling.json -96d9c67c2dbfec4947e5f9e69ee4caa4b046ae61 assets/byg/blockstates/nightshade_sign.json -b9fd1936b96d5fbae7648f89780c3a15b5bee37a assets/byg/blockstates/nightshade_slab.json -375d07dc3e9003cbd2d120852273f5a3195d859b assets/byg/blockstates/nightshade_stairs.json -9e49ef504ee4f33a01be932dd3b4018e2351dfbc assets/byg/blockstates/nightshade_trapdoor.json -96d9c67c2dbfec4947e5f9e69ee4caa4b046ae61 assets/byg/blockstates/nightshade_wall_sign.json -24a7287b9b433eb0474fc44c2f83c33855c36202 assets/byg/blockstates/nightshade_wood.json -f0a003b2821eb17ac9cf27388185f531cefe7653 assets/byg/blockstates/palm_bookshelf.json -3466ff62b97c684f6d8ff7abe5a8a3d96b429a90 assets/byg/blockstates/palm_button.json -61377cd034b199721da044ffd0c875a6b49cc67c assets/byg/blockstates/palm_crafting_table.json -46869def95ae3b506c15a80776886f4bb3c0dac7 assets/byg/blockstates/palm_door.json -93ad90e8289647bbaa141ed6a637bf2dc058ae32 assets/byg/blockstates/palm_fence.json -e335d52b5e98babb8b8a4389d9131d3f0041536c assets/byg/blockstates/palm_fence_gate.json -d5944807706686943c85d74ea46f95427d90a745 assets/byg/blockstates/palm_leaves.json -2acdc031d487058d845c3329a3827f15d82fe7b0 assets/byg/blockstates/palm_log.json -298d4def743ce4e5ce7c003a7b49c0f7330303ea assets/byg/blockstates/palm_planks.json -45478de6055e297c3e7c48cea64ed01c7d467bda assets/byg/blockstates/palm_pressure_plate.json -41da9cc7e22e224aad2c6e70289dcc24cd118dc6 assets/byg/blockstates/palm_sapling.json -ec93fdf2a59b225ba0aad8d99e264559a594aa17 assets/byg/blockstates/palm_sign.json -924d7256dc908c9220adb0dccb093c6139706005 assets/byg/blockstates/palm_slab.json -7ea376d4c1145b038ecc0ca79323c3f058b761a6 assets/byg/blockstates/palm_stairs.json -6b58b359208df4fcf6bca915b553ff5651edcf74 assets/byg/blockstates/palm_trapdoor.json -ec93fdf2a59b225ba0aad8d99e264559a594aa17 assets/byg/blockstates/palm_wall_sign.json -c457911d73a2555da1376d374044c87d794f090c assets/byg/blockstates/palm_wood.json -8842cf1eb81bdc4638df8c043ddc03a9f58fec74 assets/byg/blockstates/pine_bookshelf.json -94f66dd2c294da9bf5b9ba4887501310cef618fd assets/byg/blockstates/pine_button.json -70befa552262fc314d1942e62a11009466f75a13 assets/byg/blockstates/pine_crafting_table.json -c46bfb50138413abc29eb139f2cdba0b04407dc5 assets/byg/blockstates/pine_door.json -96c5d91fc6549443c4bcb7473c675eef82d3be5d assets/byg/blockstates/pine_fence.json -bb6d184c956d8c07badb71813d6f932b7708f04c assets/byg/blockstates/pine_fence_gate.json -82e27758a251e21a12151e21574a11c32e21436f assets/byg/blockstates/pine_leaves.json -873ad55f7764c4f69e1a391bf4257f711b7e060a assets/byg/blockstates/pine_log.json -36fda5cab1cf57cdbacd3a6bd5600737423406d2 assets/byg/blockstates/pine_planks.json -cd69f0063fff124a2c723fe08c3c43503189f5ae assets/byg/blockstates/pine_pressure_plate.json -449927b5a2fd20b5de00ba9e0f539b2765efba7f assets/byg/blockstates/pine_sapling.json -0c3027e34e74fcbbb1d15dc1bce7eec82be1bba5 assets/byg/blockstates/pine_sign.json -dea74144da93023c2b52f18f04904bf25bcd9a56 assets/byg/blockstates/pine_slab.json -ccf77c708569ce44463425705f001bef06ea6306 assets/byg/blockstates/pine_stairs.json -ee66dcb4bdcfd98d859a0cd8a5cb6a702f263c17 assets/byg/blockstates/pine_trapdoor.json -0c3027e34e74fcbbb1d15dc1bce7eec82be1bba5 assets/byg/blockstates/pine_wall_sign.json -5cb8488fa26b7fe8a2bec41747add021dc4153e1 assets/byg/blockstates/pine_wood.json -6d44086ea85724b1f3b307509568cebfba0b2040 assets/byg/blockstates/potted_aspen_sapling.json -0608c01318344276c9d61e98f34cac6069ec0652 assets/byg/blockstates/potted_baobab_sapling.json -8a431bd8c59b23ce712e22aa85b7b0b7f81eec9e assets/byg/blockstates/potted_blue_enchanted_sapling.json -624de194bb14da04c1db2f9afab7303374295042 assets/byg/blockstates/potted_bulbis_oddity.json -78306c6290a1e8830eb32714c2750c6b856014b3 assets/byg/blockstates/potted_cika_sapling.json -898f5654b6ae776d1603f8dcc50a8c2e6a85b852 assets/byg/blockstates/potted_cypress_sapling.json -29c5b769a55839f67050c47fd5cdf4a85124e8bb assets/byg/blockstates/potted_ebony_sapling.json -99d764124d9a7691c7356a55725a0289ed50dd11 assets/byg/blockstates/potted_embur_wart.json -063b11b9f95d673d95f028a2084a7123603e9458 assets/byg/blockstates/potted_ether_sapling.json -23fbbbce531aedf5e522dccec1f4728264ad62e5 assets/byg/blockstates/potted_fir_sapling.json -024d35275a5820185399851d4653414c6995081c assets/byg/blockstates/potted_green_enchanted_sapling.json -23a354082c811e55009ce5048816dbb0c5eee31c assets/byg/blockstates/potted_holly_sapling.json -e142bee1e6816991f4558010a0fccdf3559d4b34 assets/byg/blockstates/potted_imparius_mushroom.json -97c6af45474f9503287ef4813a538cac2cc91c4b assets/byg/blockstates/potted_jacaranda_sapling.json -79c243dfa7ea17953f804292905b9c17d95d3dc2 assets/byg/blockstates/potted_lament_sapling.json -4babfb75998f0891db03ae355c52ad54543cdb64 assets/byg/blockstates/potted_mahogany_sapling.json -178fc20190f1d18e808f983c72384c87f6a09275 assets/byg/blockstates/potted_mangrove_sapling.json -08fb36cacef7c295f11ccc06378bbedb0dcfb5c9 assets/byg/blockstates/potted_maple_sapling.json -2fbacfc6c6283a12959359aed883742ed52de14c assets/byg/blockstates/potted_nightshade_sapling.json -7b0d6acfe90488376b38ca79bf1bc812f36316da assets/byg/blockstates/potted_palm_sapling.json -ebe08b1ed3a3712b7564b40d5b62213a05691c31 assets/byg/blockstates/potted_pine_sapling.json -c568537b2f6cd4b868dfc8386a77ca4d95dd2340 assets/byg/blockstates/potted_rainbow_eucalyptus_sapling.json -c9b0ab69b12bd90d984e5688e2d677bdbf2571d6 assets/byg/blockstates/potted_redwood_sapling.json -d66ffe92bb7f24afeab7b74229059ec8cb5e7bea assets/byg/blockstates/potted_skyris_sapling.json -7e278fc482e1a11e1ef41563b8459c8ce7de324e assets/byg/blockstates/potted_sythian_fungus.json -ff9d3784136d0050b9e9b694444ea14d6984bb54 assets/byg/blockstates/potted_willow_sapling.json -bb5b76d1bc73cccb791145f47ccbb90096602a31 assets/byg/blockstates/potted_witch_hazel_sapling.json -3481db922ad4ea1efa53172189522a4d5142a4e5 assets/byg/blockstates/potted_zelkova_sapling.json -03c251ad1ceb61010086c8f3b1fcd412c30237f8 assets/byg/blockstates/rainbow_eucalyptus_bookshelf.json -1ea6045c6c6262c54679b884e2225f66162e0a34 assets/byg/blockstates/rainbow_eucalyptus_button.json -8163991471aa2021036c26ecf77872d84d745c9c assets/byg/blockstates/rainbow_eucalyptus_crafting_table.json -ae1c8951cd32c14207545989ea732b349502c5d7 assets/byg/blockstates/rainbow_eucalyptus_door.json -f7cada891a9aab1fc774925dfcdb74d1d579f508 assets/byg/blockstates/rainbow_eucalyptus_fence.json -185a0e3ba3b25a723a1f801caf390f0151ac1b4a assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json -f111f72f65a41f1219579ccb1dcea215699d58c3 assets/byg/blockstates/rainbow_eucalyptus_leaves.json -62b6d58e63f11a7e2c5890caab10dcccf4453f10 assets/byg/blockstates/rainbow_eucalyptus_log.json -e9688fc58b13569be30059f78d95e589b9151816 assets/byg/blockstates/rainbow_eucalyptus_planks.json -ac5373ec55bd933e36e266efbb58e02ed3583b67 assets/byg/blockstates/rainbow_eucalyptus_pressure_plate.json -9c697302648e720e473bc3b1b766552e311dfda8 assets/byg/blockstates/rainbow_eucalyptus_sapling.json -daa4d39fa206f5ec3b21ae53357ad966b52796bd assets/byg/blockstates/rainbow_eucalyptus_sign.json -bf9934aef9c14b76e2f73375c9735e0011a7013c assets/byg/blockstates/rainbow_eucalyptus_slab.json -c98058ed16baf212aeb74011e71b3cef0eaeeee9 assets/byg/blockstates/rainbow_eucalyptus_stairs.json -647930adaef9dbf7ef55d592cc201a282788c3f4 assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json -daa4d39fa206f5ec3b21ae53357ad966b52796bd assets/byg/blockstates/rainbow_eucalyptus_wall_sign.json -899c56bb15a21a98c1aa2ae7abcc97c0caa1bcff assets/byg/blockstates/rainbow_eucalyptus_wood.json -aba79cac4c0de1e15ae9e6bbbbf9fd0cdd240e5d assets/byg/blockstates/redwood_bookshelf.json -4d4d22dc817363aad9a26dff8e6a2c02ef18fe0d assets/byg/blockstates/redwood_button.json -ae4b7c410795711d53c22e42853646c09c9ae84a assets/byg/blockstates/redwood_crafting_table.json -ebfec6deb713ba9fc507c4951191e3c999a3554c assets/byg/blockstates/redwood_door.json -200c1fc9a78ef1848b22ee371bd0ad75cd3c9d67 assets/byg/blockstates/redwood_fence.json -2c2a0273636cf0ff62ef21cd68a80b76b9154a5f assets/byg/blockstates/redwood_fence_gate.json -242ba34e6be3ce78e54982256206823c94f5b131 assets/byg/blockstates/redwood_leaves.json -d6e5a8a76f5276b9441e00abb8abff6e46d1801e assets/byg/blockstates/redwood_log.json -2c6bd5b2389f7251549833beca587abc49b48806 assets/byg/blockstates/redwood_planks.json -1397d911f77fbcde93d184699828162ab5944e06 assets/byg/blockstates/redwood_pressure_plate.json -a99e0b739010290bb7c3d10e39ae0a0768a8b357 assets/byg/blockstates/redwood_sapling.json -6f9b80767adcb82c055d7503b156617a5b21ac79 assets/byg/blockstates/redwood_sign.json -5b3c32baab17ce65c6788c558176ee12f5e0c6a3 assets/byg/blockstates/redwood_slab.json -aa37e62134eeb2ec5ddd1e6d1d11a7d45c9f2ebe assets/byg/blockstates/redwood_stairs.json -4a93cd3f90e44278c2e51d38cc981b76c33e6fa8 assets/byg/blockstates/redwood_trapdoor.json -6f9b80767adcb82c055d7503b156617a5b21ac79 assets/byg/blockstates/redwood_wall_sign.json -08db9f7765cc53b997727d649f366dc944063c7f assets/byg/blockstates/redwood_wood.json -30713b51911af7f67076436fdd6eaa8bbece276d assets/byg/blockstates/skyris_bookshelf.json -41aa2aafd48099b387e57c16c883d62c1f2daf00 assets/byg/blockstates/skyris_button.json -257a15c6346f90be3602c06ba471dc630e0a8ed2 assets/byg/blockstates/skyris_crafting_table.json -bcbd17c4de0ba05848a8b15dad77d4236067207b assets/byg/blockstates/skyris_door.json -a99f37d2ee9136936565ee09d24b220e490766b8 assets/byg/blockstates/skyris_fence.json -e3e43bd5ff11a0b34b4886dbebc5e9ab7068598b assets/byg/blockstates/skyris_fence_gate.json -f050210d50e92bc9811effa4462ddbd172c25271 assets/byg/blockstates/skyris_leaves.json -1c4970a234370e4078be9d97128a688fb57ab3d4 assets/byg/blockstates/skyris_log.json -5eb0fe99714ea86fa7978eaeddb7e114c882e3a5 assets/byg/blockstates/skyris_planks.json -ecd63b24ebd68cb6863a041706cf7a4bad2aa05a assets/byg/blockstates/skyris_pressure_plate.json -2d1ef6f38249d92c85b8fa742278d8ea10fe7745 assets/byg/blockstates/skyris_sapling.json -167996801f5018cfb14e6e81f058d6d95b7c0388 assets/byg/blockstates/skyris_sign.json -d411e2607812059c5eb953d63350964b2d801ee9 assets/byg/blockstates/skyris_slab.json -cda48ff780127d33e6f01361dfeaca39f9327c1c assets/byg/blockstates/skyris_stairs.json -8338eb33a93eb376972c6ac3f2724c31557f9642 assets/byg/blockstates/skyris_trapdoor.json -167996801f5018cfb14e6e81f058d6d95b7c0388 assets/byg/blockstates/skyris_wall_sign.json -8d06785c16fdd81cc415980ca7310391c0d50ac3 assets/byg/blockstates/skyris_wood.json -6566cf7f92aadb61d379dbcaef0473851bf3909e assets/byg/blockstates/stripped_aspen_log.json -b7cef1857889d35956251b732f6dc286b30b7259 assets/byg/blockstates/stripped_aspen_wood.json -18e5da620766a46763e48460bf581be6047b4345 assets/byg/blockstates/stripped_baobab_log.json -562a2469a3a1fbbce26d54bde8afa8e7689b273a assets/byg/blockstates/stripped_baobab_wood.json -c33d4f69ee174ed9ee37dfb8a3aa62fd79cc5a11 assets/byg/blockstates/stripped_blue_enchanted_log.json -e102ca5500277ec3994264f2e0eaeac8074796ef assets/byg/blockstates/stripped_blue_enchanted_wood.json -84f8b063757d80c1324035677bebd22c573b7458 assets/byg/blockstates/stripped_bulbis_stem.json -ef01e82bf5872790295e1beb5c8e6552e3fd9584 assets/byg/blockstates/stripped_bulbis_wood.json -2a309605387f2df90b168e303a9d55dbebb782d8 assets/byg/blockstates/stripped_cherry_log.json -8334bae2083dc84d06a4fb05774056b45abfe6a6 assets/byg/blockstates/stripped_cherry_wood.json -1b88816e58d4019cd5b7276fc6cb6c1070f45b52 assets/byg/blockstates/stripped_cika_log.json -5c9cfd865bbe81e36c6be44f9c0db717bc8c6d97 assets/byg/blockstates/stripped_cika_wood.json -22ff78f6fe934d2eeef4e6c801fb1b4042814054 assets/byg/blockstates/stripped_cypress_log.json -615e6f98b311813ba850e39a306f5de9145ca1be assets/byg/blockstates/stripped_cypress_wood.json -f4e0b9beacb2909fc37fca89d9210a6f322ab2c0 assets/byg/blockstates/stripped_ebony_log.json -4cfd875f5f962a7de3c2ef003d8a887230dec377 assets/byg/blockstates/stripped_ebony_wood.json -edf913aff7aeb91fddd90e245648d7b20a214eb3 assets/byg/blockstates/stripped_embur_hyphae.json -8d0dc4f228890a6c3af57b031836029a7cfb287d assets/byg/blockstates/stripped_embur_pedu.json -84804e789d5378f959a5e14e33a577e55c72e7d5 assets/byg/blockstates/stripped_ether_log.json -3f7eb7b740c1f98a4a660ffb7ef4ffa8451032b5 assets/byg/blockstates/stripped_ether_wood.json -8e23a9ae234ab2d29b2cef26aa908d71a8a1a156 assets/byg/blockstates/stripped_fir_log.json -4607dba89ba1843a9d92805624ae69938580bc0a assets/byg/blockstates/stripped_fir_wood.json -12ed60cb1c6e0bec2509549afbc831c28fdc13a9 assets/byg/blockstates/stripped_green_enchanted_log.json -f4fd3372726d6c8c5188d4fffb70556b95c59dae assets/byg/blockstates/stripped_green_enchanted_wood.json -883ccd05f2b67a6aeee0e6ee57b7a30585538d7b assets/byg/blockstates/stripped_holly_log.json -6239db53e36bf37f2a8d22d02ea135f6594538b0 assets/byg/blockstates/stripped_holly_wood.json -fa08dba9b4ba2fcdc08e5aed52586732594986f6 assets/byg/blockstates/stripped_jacaranda_log.json -0a87dd9aa49418c936bb461ebe6812f235725510 assets/byg/blockstates/stripped_jacaranda_wood.json -c0a66a6955d48480b6fbffd8e19dfc2f273c9305 assets/byg/blockstates/stripped_lament_log.json -9303ee51cf8c4a2bfc0f4f01e5d22b2cf37c0529 assets/byg/blockstates/stripped_lament_wood.json -28d46328ec91e7650f48375c069a7bc8e814bf53 assets/byg/blockstates/stripped_mahogany_log.json -479abf5122246126d85fbe8affd3afaad3f7c531 assets/byg/blockstates/stripped_mahogany_wood.json -60daa9513ff96eac9272602d4e2afe9635718495 assets/byg/blockstates/stripped_mangrove_log.json -3ad3465364f28027741f566d36acea26900b5956 assets/byg/blockstates/stripped_mangrove_wood.json -06ed62280d35bff6ed18770e016144e0c71c71f9 assets/byg/blockstates/stripped_maple_log.json -53199081dad61fc2dc0c4c6a9281d3a7ebf500e8 assets/byg/blockstates/stripped_maple_wood.json -7304e8a4ad84325ef2ba3e23c432fec3f9647c23 assets/byg/blockstates/stripped_nightshade_log.json -5bc5331bfc5b7baf83ac9cceee5c8c9fd3d957b5 assets/byg/blockstates/stripped_nightshade_wood.json -5d63ae2eafc9d9a3ded5950201a561ab51ea7402 assets/byg/blockstates/stripped_palm_log.json -3e380a2c54db98407de1c8a852bb8bba7ed32f64 assets/byg/blockstates/stripped_palm_wood.json -dad6bf5a8b26e56dfe19cb61a65e56913d8e60ee assets/byg/blockstates/stripped_pine_log.json -0086696b42d7662139a276fc95a6280ed62b7e8a assets/byg/blockstates/stripped_pine_wood.json -507f729ba8e8cea738284534dc8b31c8fb769e68 assets/byg/blockstates/stripped_rainbow_eucalyptus_log.json -ba8af5af681e7a4c1fd9fa346be84fca1d132a53 assets/byg/blockstates/stripped_rainbow_eucalyptus_wood.json -67e9d9e8018903bb568c09d12767a0338c1bce68 assets/byg/blockstates/stripped_redwood_log.json -625fa0a3b477df439a0acf1655277bd844068167 assets/byg/blockstates/stripped_redwood_wood.json -73280ab092ef21a2ccc364aec42bb89d0b040c86 assets/byg/blockstates/stripped_skyris_log.json -32abb82467f2ddf621fa2a4ec79245aab2405155 assets/byg/blockstates/stripped_skyris_wood.json -80f81ef6eadf7614e1b101bd2d420b2a67b82180 assets/byg/blockstates/stripped_sythian_hyphae.json -4fd8e8dc0c0d9ea8178f1a7b563e1f6bfd074a7b assets/byg/blockstates/stripped_sythian_stem.json -f6b1aaf5a69ad8142f6e0834c64a73d0c4e74ae4 assets/byg/blockstates/stripped_willow_log.json -4e222bb9e50ce841de407afed467b9592f06053b assets/byg/blockstates/stripped_willow_wood.json -d32dc40358cf3a6f064ff9cbf0394e30f724aef3 assets/byg/blockstates/stripped_witch_hazel_log.json -7583d67b5af5c8dd63df91afb381d422c7bdbfee assets/byg/blockstates/stripped_witch_hazel_wood.json -211ce630315180eff72fe37b3edc00cde4325481 assets/byg/blockstates/stripped_zelkova_log.json -f9ff642efd907765efd82e5b17a8ebde73474ebd assets/byg/blockstates/stripped_zelkova_wood.json -9f72739a086d1ed9c26e74ec1bb8acb743b29511 assets/byg/blockstates/sythian_bookshelf.json -d9daecb4ca9fdf4e92ac04888ca65c470d442c41 assets/byg/blockstates/sythian_button.json -6ccab11d1b2631ca93a562ebaa9f2e58aeff7b6f assets/byg/blockstates/sythian_crafting_table.json -b4364d5ed940dc2ccc356e1753798e6542571df2 assets/byg/blockstates/sythian_door.json -722b3a9d27dd5d94f740f8b7109b19be88b5b652 assets/byg/blockstates/sythian_fence.json -90903c520f3b42ed1d2043cbd365c3bc281c5c4f assets/byg/blockstates/sythian_fence_gate.json -4a0715a61a12e7e63b7e165c7aa0ee4947adc47d assets/byg/blockstates/sythian_fungus.json -de4dd8b35a7d719f20a31186435ceca02e3dd985 assets/byg/blockstates/sythian_hyphae.json -b6de4593dc9024b5729953b6f36e409b173e7160 assets/byg/blockstates/sythian_planks.json -bddf7dc4d22f2f0b62a92f4c63615968304235fa assets/byg/blockstates/sythian_pressure_plate.json -539feaf1f39f058dbb0c3e364aca3a47651e7b77 assets/byg/blockstates/sythian_sign.json -4f74b31c3cdc195042788613e580a99c6b17c8f6 assets/byg/blockstates/sythian_slab.json -00e5d541748d124159bba40363aa2ffe5a28c69b assets/byg/blockstates/sythian_stairs.json -890058f1798aff0661b951fdc29caba6ab6ce770 assets/byg/blockstates/sythian_stem.json -2ecd05f365d0eb361931753cc3ab3e563fef9029 assets/byg/blockstates/sythian_trapdoor.json -539feaf1f39f058dbb0c3e364aca3a47651e7b77 assets/byg/blockstates/sythian_wall_sign.json -9459f29313e8a25885dd915b223e14356b4fa1c2 assets/byg/blockstates/sythian_wart_block.json -cfabafc13af51dd19cbb65e84db364d9f4784baa assets/byg/blockstates/willow_bookshelf.json -5c55fa6f5f1a648ceed10158984177b3cbfa5c58 assets/byg/blockstates/willow_button.json -0ff45eb69b7ff16882c602f499f0e0186fe58036 assets/byg/blockstates/willow_crafting_table.json -44d5de32e53eade160a4557e74e70e49e14a4109 assets/byg/blockstates/willow_door.json -6a86aeb6cc31aa1d9f0d20cf12b557c1122c62d9 assets/byg/blockstates/willow_fence.json -a70fee5b5ae5e30e90ce21a9b4598d2b9b16fb8f assets/byg/blockstates/willow_fence_gate.json -90633186aaec4825f29775ca9c8f5da8cb4854a1 assets/byg/blockstates/willow_leaves.json -f4db1abd6f31aef65b621d8353ed382bb0cc240c assets/byg/blockstates/willow_log.json -83b169d650b6222eb942543fe1140e309a6a08c2 assets/byg/blockstates/willow_planks.json -f10243db6a3ed19ef8791f010ad836735c28daac assets/byg/blockstates/willow_pressure_plate.json -2e58bfb5cca5b81c82875592e3778fc715b25546 assets/byg/blockstates/willow_sapling.json -c89812d4f86cabae7509a383161a6126c36dd6dc assets/byg/blockstates/willow_sign.json -979ec1504964051252f99e14fcab62c19bcd3db0 assets/byg/blockstates/willow_slab.json -dfe04810897e0afdb5c84f07c5dbad37fbec7141 assets/byg/blockstates/willow_stairs.json -378999d9ab09119c17126bf03907cbc361c87fc8 assets/byg/blockstates/willow_trapdoor.json -c89812d4f86cabae7509a383161a6126c36dd6dc assets/byg/blockstates/willow_wall_sign.json -13fc391fbc63c88a79d83d37b06348c8fcec9e69 assets/byg/blockstates/willow_wood.json -d219633b047d88b81c11fd0bf76ca92aa89a9936 assets/byg/blockstates/witch_hazel_bookshelf.json -54ea91ad393144ad0f4a79fb39de301d2462ac90 assets/byg/blockstates/witch_hazel_button.json -82514e3ad622f3cb9c7f3bb05eff534a0c86a1ec assets/byg/blockstates/witch_hazel_crafting_table.json -5abbc5c86c12fd5a55f5c618a8e8474a1b446317 assets/byg/blockstates/witch_hazel_door.json -096b518ba68ff93d9f0e83953f156633a652795c assets/byg/blockstates/witch_hazel_fence.json -aed2ce6d2c25fda5c82aadb93b9574053eb874fc assets/byg/blockstates/witch_hazel_fence_gate.json -9623a1e01a18cdfe70d13c830ce786e5deecfd4c assets/byg/blockstates/witch_hazel_leaves.json -7b888cbda62be1ec69c07c5a1de3ba4edc1b8d01 assets/byg/blockstates/witch_hazel_log.json -c7d6b38c5e613ec2936a6ccd51f1f81d6693ad69 assets/byg/blockstates/witch_hazel_planks.json -37205d5de01417cbbeceb6e3364ee14d143267df assets/byg/blockstates/witch_hazel_pressure_plate.json -651f517493b10ec2e796303f99abb2ecdef9c4d0 assets/byg/blockstates/witch_hazel_sapling.json -9258db47ea549f48335c74b505f97d6c1b5f1417 assets/byg/blockstates/witch_hazel_sign.json -265e86b316bfea772301ea174c7e3cd253674bd3 assets/byg/blockstates/witch_hazel_slab.json -949b1d15d430b84552aae30bc6ec1ae800220eb0 assets/byg/blockstates/witch_hazel_stairs.json -70cb0a4b54d7fe54052466a0fea2cf50f9016888 assets/byg/blockstates/witch_hazel_trapdoor.json -9258db47ea549f48335c74b505f97d6c1b5f1417 assets/byg/blockstates/witch_hazel_wall_sign.json -815d1018df138deb48666990fef1f246f1dfd982 assets/byg/blockstates/witch_hazel_wood.json -1ba4b9692641d0f04cfe61192c49a03bc9163007 assets/byg/blockstates/zelkova_bookshelf.json -c91e56660a8d88a0eb5047e7eb7ac7d0a04bf8ec assets/byg/blockstates/zelkova_button.json -400bd875276ad87ef8d80260130e60a711019323 assets/byg/blockstates/zelkova_crafting_table.json -eca4f9fb81c2c99e66c84aeb231c80dc7f8a9b62 assets/byg/blockstates/zelkova_door.json -4beb0ddebac10fff254f987ce63ab42f3f1375d6 assets/byg/blockstates/zelkova_fence.json -c647568c770c350b9b87be7aece3cdd2117c2bb8 assets/byg/blockstates/zelkova_fence_gate.json -182f557f77eaa5f9b92b56788c633ce01698f24b assets/byg/blockstates/zelkova_leaves.json -4929b02119edf9fb5f49be310a98425a9d232554 assets/byg/blockstates/zelkova_log.json -289b98bffc2185a5e2928394722ba95c9c3e4bb1 assets/byg/blockstates/zelkova_planks.json -85b2f81280239d4da5798b0449ea92512b4ae72e assets/byg/blockstates/zelkova_pressure_plate.json -5666a379ce4aaff7b94b148430676c3ae6833bac assets/byg/blockstates/zelkova_sapling.json -45164705009ca89bf035db9b095fe29dd81baaa4 assets/byg/blockstates/zelkova_sign.json -4e31b34369aec5063a3feb692205a40df794d494 assets/byg/blockstates/zelkova_slab.json -16b0cf6c437d96d9f67f8b52bfd18bb3052b8774 assets/byg/blockstates/zelkova_stairs.json -b8531f52886d3c3d253a11ec632b055756bcdbed assets/byg/blockstates/zelkova_trapdoor.json -45164705009ca89bf035db9b095fe29dd81baaa4 assets/byg/blockstates/zelkova_wall_sign.json -e6d361ed053df5b3512c7c74713f504e4a7143d6 assets/byg/blockstates/zelkova_wood.json -dd11b7a4c7529c04b4f35d8c4701c236fb3dbbdd assets/byg/lang/en_us.json -cfc581add9b9441fa4dfe88c75ab6c71d6b2c32f assets/byg/models/block/aspen/bookshelf.json -473c7ef684a1f6d251edc457ed3ace1e356ec148 assets/byg/models/block/aspen/button.json -ca1585bfb097f305bf6b6a3883962f52c3e108fa assets/byg/models/block/aspen/button_inventory.json -2bf3e6875f2c2751989618864aab8594dca74324 assets/byg/models/block/aspen/button_pressed.json -2a4946082bf8a99219734a5a1b0037719801ec10 assets/byg/models/block/aspen/crafting_table.json -b400d8113db2ef9fe9b7c918b964da9607fbffd5 assets/byg/models/block/aspen/door_bottom.json -0c3b6bb17c05ebb10ed2efc27598ee0c9f008d84 assets/byg/models/block/aspen/door_bottom_hinge.json -21335a02142a92dcc64ce7015f15f255cb2fe4b3 assets/byg/models/block/aspen/door_top.json -145d21652351e1c9de9d92c5118e76d97aad6f28 assets/byg/models/block/aspen/door_top_hinge.json -7d38e52981d404291a62a89148371edb08c4521b assets/byg/models/block/aspen/fence.json -180b19690fbadacdfa8ed5291f8011900e36263f assets/byg/models/block/aspen/fence_gate.json -3894c7ee2aaf9fe44ece506c223269c1a1e49ef5 assets/byg/models/block/aspen/fence_gate_open.json -0290d9f0631c5c089d0f53ae9c3af53f69dd34ee assets/byg/models/block/aspen/fence_gate_wall.json -836a5eff00071c22e737f2e2aaf189d93aacd32b assets/byg/models/block/aspen/fence_gate_wall_open.json -daf50a260453b66485cc77994c2bb6812d7e1e0f assets/byg/models/block/aspen/fence_inv.json -69dc1fbecb1981deb8e3780ddf4f7f802176340d assets/byg/models/block/aspen/fence_post.json -6bcb97531d915bed45b5232f401ef2d106b05c57 assets/byg/models/block/aspen/grower_item.json -58ff0d74f86f7a9ec892702d7d90844f65bb9914 assets/byg/models/block/aspen/leaves.json -a03e1534699be7c02170c877de2607b80efa0d22 assets/byg/models/block/aspen/leaves_snowy.json -7c119c0883f21413b7b484838e454f9bedc87a84 assets/byg/models/block/aspen/log.json -09ea269aaebadde43819dc02fed9c3c1116a16db assets/byg/models/block/aspen/planks.json -dadfe8c4f130588035bf982d0529b720a3666785 assets/byg/models/block/aspen/potted_grower_item.json -5cf51ea6353ffc1ebc45b14583a19fdda7f3be4c assets/byg/models/block/aspen/pressure_plate.json -1b6964de3755448eff338800d6176d211b87b4c1 assets/byg/models/block/aspen/pressure_plate_down.json -ab495d559843fb488806c6ab21a958a8b0e0eaeb assets/byg/models/block/aspen/sign.json -c7a4278abf00eaccfc4a1f979b8eca9704cfd805 assets/byg/models/block/aspen/slab.json -8b9b48288da793a220e7cf839a7e0af136c92b16 assets/byg/models/block/aspen/slab_top.json -ed11132c143966c8003df6ec3236da79bbfd2d0c assets/byg/models/block/aspen/stairs.json -be271c843bce2d4f4606a9f5c4a53379506d1c48 assets/byg/models/block/aspen/stairs_inner.json -4f0ffff35c596458ac84b3db3b302c60056bd535 assets/byg/models/block/aspen/stairs_outer.json -450a7e1ee4b8b2e5601f39234714683380eea7e6 assets/byg/models/block/aspen/stripped_log.json -03252d342afe557738c4ffd4a8731fafd91243a6 assets/byg/models/block/aspen/stripped_wood.json -76e7f9aa349991a4a71654d262e6e394a2caea0d assets/byg/models/block/aspen/trapdoor_bottom.json -d482f21c1b70db6d4b456191291d14c0d54b2f51 assets/byg/models/block/aspen/trapdoor_open.json -f0307f9818774087d2220c7bf39678414ee734ef assets/byg/models/block/aspen/trapdoor_top.json -95a22561722879a34775e020a8505278b435c747 assets/byg/models/block/aspen/wood.json -24f0c0973b6317415088e96958133b02b8c8701e assets/byg/models/block/baobab/bookshelf.json -07843ab609e2ed5d8c2bec533b20151e574ac689 assets/byg/models/block/baobab/button.json -73668cdfb040d89a3d9e02f465b7972f5ad5ec44 assets/byg/models/block/baobab/button_inventory.json -b6b4024eb2fa6d04d310d59afec6be0cb3669215 assets/byg/models/block/baobab/button_pressed.json -9dda473d195d670fdc118783ed914ee2eb9f9cae assets/byg/models/block/baobab/crafting_table.json -929262f73d154eea8176b5751cd39eb4db85e46f assets/byg/models/block/baobab/door_bottom.json -548fb33d0edaed51f9ec57b2bb8af8a84dfca3aa assets/byg/models/block/baobab/door_bottom_hinge.json -016c61a08b4c977dfca8c0b66f43dca2848cdcc6 assets/byg/models/block/baobab/door_top.json -9bdd88660bda76acef39ee3fb40b89da903969f2 assets/byg/models/block/baobab/door_top_hinge.json -cd99ed36ea1a0465079ed695201636aa827428e3 assets/byg/models/block/baobab/fence.json -7f9a54e0f109af35ef589d840771b29b2fb03c4c assets/byg/models/block/baobab/fence_gate.json -db06b19f47aa1a3d943a69404d325d720bcc50bf assets/byg/models/block/baobab/fence_gate_open.json -83eb28eb0430ecfb7e99d4306635d3c962fce1c2 assets/byg/models/block/baobab/fence_gate_wall.json -f29f2504f0dd6d6cdcf0c4a660ea2943cba748b3 assets/byg/models/block/baobab/fence_gate_wall_open.json -34529c51b201e26a237210ee7dfe86902b7c3b60 assets/byg/models/block/baobab/fence_inv.json -df9a2558ef341e75847f648921f2147ec3c54096 assets/byg/models/block/baobab/fence_post.json -09c4fb1513ee3f51064da761c3706a1bc7f54c65 assets/byg/models/block/baobab/grower_item.json -6baf7b52a3a7edea00f4a9a5c029774395ad3e5d assets/byg/models/block/baobab/leaves.json -224bd7bf22ad74ec9462488f9e61ad472da4a891 assets/byg/models/block/baobab/leaves_snowy.json -3926bf42e7f2d8922c2a829b0594ea61906ee586 assets/byg/models/block/baobab/log.json -1f59e2b2f77f0323bded94f390eed0c8fc409d1e assets/byg/models/block/baobab/planks.json -25c7e85de91eedf28df42c98b94058db872fe431 assets/byg/models/block/baobab/potted_grower_item.json -548b9b0f31c9954ee130f8b4bd53085e27bc7110 assets/byg/models/block/baobab/pressure_plate.json -f98d36d9a134c54aac309ef805d88e349ad76ba0 assets/byg/models/block/baobab/pressure_plate_down.json -e11147a329200d4fdbc7991a421e5470658f9082 assets/byg/models/block/baobab/sign.json -84dd2dd2689feffb1b9e662bb827325e40fee749 assets/byg/models/block/baobab/slab.json -095d0b898c8418b3fd79da96cd9a60aef7b72234 assets/byg/models/block/baobab/slab_top.json -17b5d109b776253a68c790982c53169b71b15140 assets/byg/models/block/baobab/stairs.json -76cd7c13e8a472c170bee401f53816a7146883d3 assets/byg/models/block/baobab/stairs_inner.json -36936e8548ac0a7e6880f63906f7f4af23baee17 assets/byg/models/block/baobab/stairs_outer.json -9bfb0a9533f3ee1d4759837d1d40ad4e36799c0c assets/byg/models/block/baobab/stripped_log.json -99a2ed6e9b60894553a2a8a3044d9e2290fb8708 assets/byg/models/block/baobab/stripped_wood.json -71a651bf94ee307fa588abc865736bd78291fdfe assets/byg/models/block/baobab/trapdoor_bottom.json -67e0aeea49afc3a1af02d05cb99769ea0b03d2f3 assets/byg/models/block/baobab/trapdoor_open.json -6d9421e7af02d85635301868cf30b019383f40d4 assets/byg/models/block/baobab/trapdoor_top.json -2a1b0e89f7858eae90274e135d83506016780a95 assets/byg/models/block/baobab/wood.json -342ea09ac25e8ff00beb042c6f15c5f87a3fff9b assets/byg/models/block/blue_enchanted/bookshelf.json -903b94423177dc6cbca0365f40b125357c38939e assets/byg/models/block/blue_enchanted/button.json -84acdb5c60d5523d8495329660cb63f2ee6b28c2 assets/byg/models/block/blue_enchanted/button_inventory.json -3d1b62263487869a2ba6b589357bc8e9aea5422b assets/byg/models/block/blue_enchanted/button_pressed.json -b5ccb0c95ea37c1f21ec6ecd56f42af33c6d5a84 assets/byg/models/block/blue_enchanted/crafting_table.json -d425e1b470fa2311bf39ca9023a20593929c761d assets/byg/models/block/blue_enchanted/door_bottom.json -b587f8eb21d159390db55ab8e3901090c0d73eee assets/byg/models/block/blue_enchanted/door_bottom_hinge.json -be454095ca2d89d5760f75b886635bc50e4fae41 assets/byg/models/block/blue_enchanted/door_top.json -748faf2eb6c9dc10dc3bdda258aeb50c79fa3d45 assets/byg/models/block/blue_enchanted/door_top_hinge.json -93f9e0b6d0f86a45603e1946f33657a73072a2e4 assets/byg/models/block/blue_enchanted/fence.json -258440a4812ac1074a0b55fcca031d1c741376e8 assets/byg/models/block/blue_enchanted/fence_gate.json -ac35dd46cb7bfcbfb120542d1999ce5db459249a assets/byg/models/block/blue_enchanted/fence_gate_open.json -737a7fad5fc148a658a9f70faaebcc00988d8488 assets/byg/models/block/blue_enchanted/fence_gate_wall.json -add286acac4cd6e672144ca2bc0053b65226e980 assets/byg/models/block/blue_enchanted/fence_gate_wall_open.json -de8db8b3bd27e3e475a373759f9f021e2a33884a assets/byg/models/block/blue_enchanted/fence_inv.json -77b409997fe27d49c4942575e6a751dd1b15c17f assets/byg/models/block/blue_enchanted/fence_post.json -6690be3be333d7427f15a4124d2a9020118ab5d7 assets/byg/models/block/blue_enchanted/grower_item.json -d3e6b9fc58a7562b8862fd464ef8bc30b2eb5c9d assets/byg/models/block/blue_enchanted/leaves.json -30d05482af9af5b8833f628f5ecc0d57c87279c6 assets/byg/models/block/blue_enchanted/leaves_snowy.json -fada881975e045cd4467b3dcdefee7323f12b222 assets/byg/models/block/blue_enchanted/log.json -39bc57ba19dd532abe0120d034cada631a59fd16 assets/byg/models/block/blue_enchanted/planks.json -73ff477c320ba07ae01907fc1e8996b8b9837fd0 assets/byg/models/block/blue_enchanted/potted_grower_item.json -f07d08e066d6b28e96f2e9280c4baca8817047bf assets/byg/models/block/blue_enchanted/pressure_plate.json -ec99031fa1bf540aeb451a0a9cba405cf897002b assets/byg/models/block/blue_enchanted/pressure_plate_down.json -4ad560b13aa5fa011328fde8fbaee57d6366c2cd assets/byg/models/block/blue_enchanted/sign.json -35e14c8e67a4d0722c5fec599160118c768fd6a0 assets/byg/models/block/blue_enchanted/slab.json -bb861cc6424f39c44f08c291dce0119836f8a514 assets/byg/models/block/blue_enchanted/slab_top.json -eb7652548528e0a91a725217cb5d8e3da5ac1f47 assets/byg/models/block/blue_enchanted/stairs.json -5562ad9708c583c826f91942161744cdc9ee3951 assets/byg/models/block/blue_enchanted/stairs_inner.json -615f70eb78454a89ae43e19ab1ffb9f8bbd139e4 assets/byg/models/block/blue_enchanted/stairs_outer.json -e059c170a4e1a8f1fb0da351888382f545f8109f assets/byg/models/block/blue_enchanted/stripped_log.json -78ba01d70cafa16511a8db427223b30841fe1acf assets/byg/models/block/blue_enchanted/stripped_wood.json -dc2cfe77459933fb8b93949d3d69dfaf249a4ec1 assets/byg/models/block/blue_enchanted/trapdoor_bottom.json -470bed12ad4a4a3affdf92cea353048fff2fc280 assets/byg/models/block/blue_enchanted/trapdoor_open.json -fd2b82aae72fea322eb7cdc2e60f4ad1d064e9f1 assets/byg/models/block/blue_enchanted/trapdoor_top.json -a63365bae6d564b24bdb318370143249497bbdad assets/byg/models/block/blue_enchanted/wood.json -9f3ef59e8c04f55c28783a40933f433b7b1387ff assets/byg/models/block/bulbis/bookshelf.json -3b2faa52752790a21cf55466d1b33ccfec4e0085 assets/byg/models/block/bulbis/button.json -7177ac629742d77d2bd4b21443e06ba86afd7fa3 assets/byg/models/block/bulbis/button_inventory.json -c4c6062f9fb44f2016e7a314af6df8eec67e9279 assets/byg/models/block/bulbis/button_pressed.json -fcd7c1a6d62498cc2d16eba55ae1ccb14dba5e7c assets/byg/models/block/bulbis/crafting_table.json -a642b309fe508adcbf2a2b49470e7b1854dba57b assets/byg/models/block/bulbis/door_bottom.json -96b605f552035bb647603df97556bf2be301878b assets/byg/models/block/bulbis/door_bottom_hinge.json -fdf7fa5f81165b8c00825d07385ee17675cb1b95 assets/byg/models/block/bulbis/door_top.json -dc36d5affb1a63ab9bf1257f0fa91ff6d4d5d92a assets/byg/models/block/bulbis/door_top_hinge.json -302e666e93c7c4c2c87c95a7aea50ddc27c60208 assets/byg/models/block/bulbis/fence.json -5e7637d0afb0425001fa45251d09f1ffbf6020d7 assets/byg/models/block/bulbis/fence_gate.json -7d27266056ef31574bfc19f5fd1b33638dbe66ad assets/byg/models/block/bulbis/fence_gate_open.json -fc210cd930ed68bdec95a982b1366f4a02ec4860 assets/byg/models/block/bulbis/fence_gate_wall.json -97fe5fe95b7751bc98cdf7d427ff852f084039c4 assets/byg/models/block/bulbis/fence_gate_wall_open.json -8cbcfd0f20c708f6620a70b3e5f1c76a04771606 assets/byg/models/block/bulbis/fence_inv.json -4dacfe5197a8d22fe04c6260d47378a44efdf429 assets/byg/models/block/bulbis/fence_post.json -c611670729691d4e63ba20dc76dd4831e76dae28 assets/byg/models/block/bulbis/grower_item.json -f90604e34c8c1f8391c8adfecbeb873b667d08f8 assets/byg/models/block/bulbis/log.json -d49ccb5fe7000d41ab055a514978566397c15b3b assets/byg/models/block/bulbis/planks.json -095b3bbaa99b23f250277bc8163deaf08e986073 assets/byg/models/block/bulbis/potted_grower_item.json -25702b9b0338c032d18239b8fb6718d7f89ad94b assets/byg/models/block/bulbis/pressure_plate.json -eec30ca1032b0e711d0788121590ecbde1f4af6a assets/byg/models/block/bulbis/pressure_plate_down.json -f93e6bb75898c5ed8d05e2b663226dafc839ba28 assets/byg/models/block/bulbis/sign.json -6d2cf43809a27dc076169c8a142cc8c2ff806558 assets/byg/models/block/bulbis/slab.json -3c49ab33b91ebcfaa455a5e479c1e79c3cdea16e assets/byg/models/block/bulbis/slab_top.json -fb5caf9f30f388bad125572d7093033efceaf406 assets/byg/models/block/bulbis/stairs.json -35c77b8c5bef56b75ec9bd9f77bda8c07eb3e038 assets/byg/models/block/bulbis/stairs_inner.json -f7bc2892cf07eea8cf1782c32ff768acc6002483 assets/byg/models/block/bulbis/stairs_outer.json -04be7aa8be8ecd79357c9a9e8101ff9cda92bb57 assets/byg/models/block/bulbis/stripped_log.json -fa273edd6102c871b49afbbcfe9999a1e2d930d2 assets/byg/models/block/bulbis/stripped_wood.json -56aa5302607f65ebd7e78196df17b90173b2c3c4 assets/byg/models/block/bulbis/trapdoor_bottom.json -c27b18fedb50ea01d430129ec9e229d1949d436d assets/byg/models/block/bulbis/trapdoor_open.json -00e5df9209acfce5ae98613398d022e942a26895 assets/byg/models/block/bulbis/trapdoor_top.json -a5f7f77a368e842399c01fedf858b142186091bf assets/byg/models/block/bulbis/wood.json -55419b8445de262fc9c14a2d1afc29ee3cc2d6d9 assets/byg/models/block/cherry/bookshelf.json -b61b724bd5d1b23f60a694ade93df7f9c0c5439d assets/byg/models/block/cherry/button.json -1b676842159db22e820b6b2e2b972691c2a66636 assets/byg/models/block/cherry/button_inventory.json -106c0ae5bd00115b3e73999bd274abd4eff83533 assets/byg/models/block/cherry/button_pressed.json -ef09392bff11a9cb0d8cf7b69d01964dd95a1e18 assets/byg/models/block/cherry/crafting_table.json -42cf930389a7420578a4294e014b47ca56e1237b assets/byg/models/block/cherry/door_bottom.json -c83212fc7c9175c1e8c820e96501dfbdb873a84e assets/byg/models/block/cherry/door_bottom_hinge.json -a677d914969547e2293587e2489b02fa89dfa1b9 assets/byg/models/block/cherry/door_top.json -33ab247625af5e119c513be35d596af9bb71681f assets/byg/models/block/cherry/door_top_hinge.json -7ef922a47c2d8ae80b808efa7a9a2cdb188aee97 assets/byg/models/block/cherry/fence.json -7a8e50369a71e11f2864b0bb75dba0461031efe3 assets/byg/models/block/cherry/fence_gate.json -5b49884019ee143a8e963e97abca5f8c5e43a1c4 assets/byg/models/block/cherry/fence_gate_open.json -949313b622a8222938acb430f6a89611845549cb assets/byg/models/block/cherry/fence_gate_wall.json -29078a270340acc30c6d60750051ed70597de05e assets/byg/models/block/cherry/fence_gate_wall_open.json -ea0814753d2b3957c50080ff987d3a9fe66e4a99 assets/byg/models/block/cherry/fence_inv.json -d6b7fbdeeab292de432ab893a2edaa2a72b25ec4 assets/byg/models/block/cherry/fence_post.json -093a5c160efd0a51689cf9de00d2bba9ce977ea6 assets/byg/models/block/cherry/log.json -bc862d2f159afcc5d9e95af32cce793714225d30 assets/byg/models/block/cherry/planks.json -c17608feb9e81e47233264cace783378563f3af5 assets/byg/models/block/cherry/pressure_plate.json -f8705b0a248ada71cdae14bcf19a308a7f4eb78a assets/byg/models/block/cherry/pressure_plate_down.json -3b1cc1a88ebcf3671485ca04a7708df0fed714a0 assets/byg/models/block/cherry/sign.json -e83c95d640fdc7c129799ebe6c500b18cbc80891 assets/byg/models/block/cherry/slab.json -1279c5142bdd412453c830ee17e2b4629d943de2 assets/byg/models/block/cherry/slab_top.json -fdb9246d01afa0cf05b3d6ae414b4c24a0a068b5 assets/byg/models/block/cherry/stairs.json -26b9d1ca396822f5f1a09b1ce06b38653fa4ef83 assets/byg/models/block/cherry/stairs_inner.json -1c07dacc18c532dc6426a76e5e17270841faea77 assets/byg/models/block/cherry/stairs_outer.json -0c7aaf316e7db749f0fc5d59e41912bf93c47424 assets/byg/models/block/cherry/stripped_log.json -9702ca63e2dc8959b8f7cbe37ea36c7bf373298f assets/byg/models/block/cherry/stripped_wood.json -91add80b05298d37b94a097f878462c19884c524 assets/byg/models/block/cherry/trapdoor_bottom.json -36b081ef0c8e487a8efde38d0496f2ccf73d4abe assets/byg/models/block/cherry/trapdoor_open.json -fb80e8dd89c2212bc3f597edaf0dee479c54b85c assets/byg/models/block/cherry/trapdoor_top.json -bbd3d4453849adc0f9c3e7e28e70a8451ec4a782 assets/byg/models/block/cherry/wood.json -8e70925b7477898d4bd0df33ff28ee7249d375d3 assets/byg/models/block/cika/bookshelf.json -cc495384bec10638db5ddb6cc9faf711ff1c5232 assets/byg/models/block/cika/button.json -ca5f79439846633630eea472e5cad307e30bd453 assets/byg/models/block/cika/button_inventory.json -8fe475630a162cff09e718dea1a53e745d48bd4d assets/byg/models/block/cika/button_pressed.json -ec7f5ef0c1ce4a2adf6ebd242c95d8411412cb3e assets/byg/models/block/cika/crafting_table.json -9fad1795f6acf907f7755f58d27bc722c5488118 assets/byg/models/block/cika/door_bottom.json -1fd5bb03ddff045d543bbda9e8762ef3fbef74a6 assets/byg/models/block/cika/door_bottom_hinge.json -eb16090931562f07122cddd222e4e9418b9746fa assets/byg/models/block/cika/door_top.json -2a7f1ea09bdf76c91add47cdf5c3c6fc3b4be54c assets/byg/models/block/cika/door_top_hinge.json -595542833ae7a0607cad0d33a76d06e09db6c949 assets/byg/models/block/cika/fence.json -8feb73315cf47b0f75413c5599823c71bdf0d2f5 assets/byg/models/block/cika/fence_gate.json -b6db2e0e1e73401133becbab9a099746eb06a770 assets/byg/models/block/cika/fence_gate_open.json -42d2165b07de96fa37fa1778e4935d6ab5272b73 assets/byg/models/block/cika/fence_gate_wall.json -4fecb9752f8cb6be9892ed65611d5fdf1f09dc6c assets/byg/models/block/cika/fence_gate_wall_open.json -86560ee5e158e108cd114e82aa3073740cf248e0 assets/byg/models/block/cika/fence_inv.json -5c50c602c71dd100a41b371b4a0190e3ad6bed88 assets/byg/models/block/cika/fence_post.json -d3e9b8f84a33a0adc256693dc8ea45f84315e0bc assets/byg/models/block/cika/grower_item.json -2a5ef0bdbea43de8c39fda420472c3b2bb441acd assets/byg/models/block/cika/leaves.json -7cee25084ae3cd16b2aecb8d6193050ecf33a09c assets/byg/models/block/cika/leaves_snowy.json -96f0efb07f2f760027f026751ab3df20f3a227b8 assets/byg/models/block/cika/log.json -c75a3536271817b33bff8a6cdcb39774c1a19b9e assets/byg/models/block/cika/planks.json -f9969b50b902b83f217c26cc6d598a9be6fa3f1e assets/byg/models/block/cika/potted_grower_item.json -f53e2bea9b50d39ee0057db926449e8bee9691ff assets/byg/models/block/cika/pressure_plate.json -2486da17469375c71b48b827933211cef6b4a8e6 assets/byg/models/block/cika/pressure_plate_down.json -70843d0315b04bc53509cf1542ade6a75f243bdd assets/byg/models/block/cika/sign.json -ffcdb03f8139357a42ce0afe31bef306451fe19a assets/byg/models/block/cika/slab.json -667387df6f1056509f112ba271b9d014d10c29b4 assets/byg/models/block/cika/slab_top.json -869a059b7f55590140a02459a9a96060787b87a7 assets/byg/models/block/cika/stairs.json -37d8526d628e939746fa4329b3237ca573f22907 assets/byg/models/block/cika/stairs_inner.json -d01e820802a729336e22835f1e891724e58094a6 assets/byg/models/block/cika/stairs_outer.json -533f31255a60f15e5cd413d60db612da11862055 assets/byg/models/block/cika/stripped_log.json -641c9d05ec91a0aa7610b7f8cc2d03dbed031c7d assets/byg/models/block/cika/stripped_wood.json -c4b8542d5bd6b34b50ae427ff43964674c3bde07 assets/byg/models/block/cika/trapdoor_bottom.json -c058842839c9184b51a3dcb5f7a571b52eabff18 assets/byg/models/block/cika/trapdoor_open.json -0f30e72e84531b3d6d613373ab71dd3a879cebaf assets/byg/models/block/cika/trapdoor_top.json -ea609e86e0e63aed18f9e92b034fc11af52ef2f9 assets/byg/models/block/cika/wood.json -bdf49e36532585b5b5b2db8ed61b17d5a1c2e3e9 assets/byg/models/block/cypress/bookshelf.json -3d65c0eb8f729fc119a1f3e4b01db0fc8503b358 assets/byg/models/block/cypress/button.json -daaa1ff636b6076a787e07439b1c460766dc20d1 assets/byg/models/block/cypress/button_inventory.json -3fcd6ca99f4aa6157ed76c842796c312c540fca7 assets/byg/models/block/cypress/button_pressed.json -48735a4456a1503e6945285e207490674162fdca assets/byg/models/block/cypress/crafting_table.json -3cc3da8203d317e0ce58e8c5eb2721b45ae390f1 assets/byg/models/block/cypress/door_bottom.json -5a8c42fa4bf3318f04da0925edfe1f09a6011951 assets/byg/models/block/cypress/door_bottom_hinge.json -065f336487f18e17361888ddaaa9bcdb4b1648c3 assets/byg/models/block/cypress/door_top.json -aacc54da619b8fd02a9abbf6b2dd471e5f231e13 assets/byg/models/block/cypress/door_top_hinge.json -298524c19f94a429ebddda33eb6f15114631873c assets/byg/models/block/cypress/fence.json -0de581245240221df11568d426898e83ef74b3e6 assets/byg/models/block/cypress/fence_gate.json -e6d14fb5066fed64c9541963dd7b70f66d784a59 assets/byg/models/block/cypress/fence_gate_open.json -15cb8b853d109f7922c6c557f8aed40a930dca13 assets/byg/models/block/cypress/fence_gate_wall.json -2a819545d5416489110f2c5dd8c4904a652fea95 assets/byg/models/block/cypress/fence_gate_wall_open.json -8faa1548a6315cf7c78f80e4e741dfa12c3969fd assets/byg/models/block/cypress/fence_inv.json -75e33321d34e2e787c45200c9bd38feaefe66618 assets/byg/models/block/cypress/fence_post.json -a26358949efe5d5d3938a9751314917d14c5eb43 assets/byg/models/block/cypress/grower_item.json -2098b8c2c22c987ff3c412ff686ade37794f58c4 assets/byg/models/block/cypress/leaves.json -8f058303773f99817fd1410b00f16469459a8c82 assets/byg/models/block/cypress/leaves_snowy.json -dccf3fd9614fde1d96fc6adf6d3d9944069e08b1 assets/byg/models/block/cypress/log.json -c32ad0c516c977543bba03e0ca6050f76531cb75 assets/byg/models/block/cypress/planks.json -6e3933af5cf41f1f4a952255223870166955611d assets/byg/models/block/cypress/potted_grower_item.json -c2073c790cedbc81f2bd540c266474acda00bd37 assets/byg/models/block/cypress/pressure_plate.json -9174e4208d16f65a7ccd741adbc1c8fd6a68df82 assets/byg/models/block/cypress/pressure_plate_down.json -74eb38e0002c14a550aa5598f136a498540aa38b assets/byg/models/block/cypress/sign.json -0d34c007c5f2a9fef520ed839d17277c5ef1a72d assets/byg/models/block/cypress/slab.json -55a7d16cc6ce2440632aba1f5c6d49c35e9a4da5 assets/byg/models/block/cypress/slab_top.json -b51269aeb3b974f8577466cc27d19a508680326c assets/byg/models/block/cypress/stairs.json -c83bbeb4d69e397620c49e7fb3e0c0b2a823d99b assets/byg/models/block/cypress/stairs_inner.json -c77f373231f4f5fbcb62c8732fde16d5e2f271bf assets/byg/models/block/cypress/stairs_outer.json -79627de757d17143122fc07cbf1f73261a7aa882 assets/byg/models/block/cypress/stripped_log.json -c6fa7cc125bc14d128fcb2583d44d1faa2e6cd4a assets/byg/models/block/cypress/stripped_wood.json -e2d7d59fd3bd4d7972ada45989bd9fdf08a01105 assets/byg/models/block/cypress/trapdoor_bottom.json -bb5fbc5fad8b1b15e54fe4a65b2608e85253caef assets/byg/models/block/cypress/trapdoor_open.json -4be848d813d65b3d7c66300f924dba25f677dba6 assets/byg/models/block/cypress/trapdoor_top.json -8e10baca50495ea8c4f12fa54722e824ae262b38 assets/byg/models/block/cypress/wood.json -b93df8197bda1b32ddf52e34fd1ad6c27b771615 assets/byg/models/block/ebony/bookshelf.json -76cd46330236e92926b217c076af66da805c23f0 assets/byg/models/block/ebony/button.json -c830cefb803bdbb8b0e876b9e90f3bde62a082e6 assets/byg/models/block/ebony/button_inventory.json -e3462900ba6d457c2aa2c96d24a2155c05592314 assets/byg/models/block/ebony/button_pressed.json -d3b2e6ae17c21ffaf3bead7a79cb3f03724ad529 assets/byg/models/block/ebony/crafting_table.json -cacae4a007bd19eed1ec4a3611cc143028ad14ad assets/byg/models/block/ebony/door_bottom.json -7ad4ae8c86b7683682a3c32888e9af799b467236 assets/byg/models/block/ebony/door_bottom_hinge.json -ebb92b99029121c1a7b6228088d7aec2c0e9ab5b assets/byg/models/block/ebony/door_top.json -27f89fa53bb5e1978532bedf299c3eeacbf513fb assets/byg/models/block/ebony/door_top_hinge.json -5d25e4ba013a002a63afdc0653321094ac7b1e09 assets/byg/models/block/ebony/fence.json -7853de16757a84e50014845c56485675285ccc4a assets/byg/models/block/ebony/fence_gate.json -623aabce821beab1ddc3384c64ccb0af843af02f assets/byg/models/block/ebony/fence_gate_open.json -75ed72e58a4714deef390e7a7c0b68d9c46bc1cc assets/byg/models/block/ebony/fence_gate_wall.json -98555849999e40d33542de797cf1b39f1d8f8e21 assets/byg/models/block/ebony/fence_gate_wall_open.json -2aa0fd88c46608d1892fd02d8cc2a15eafb0a54c assets/byg/models/block/ebony/fence_inv.json -b0bcc6885755a6b3eba201675c64262b0c4e91a2 assets/byg/models/block/ebony/fence_post.json -60ec91c07896435780b7cd33fd6da69670198f8d assets/byg/models/block/ebony/grower_item.json -40f74d77bce5d7a83bb9e2dc3c410c2e0df425fc assets/byg/models/block/ebony/leaves.json -5bf4badfbfa6481f1161449d88bad47dfced5fac assets/byg/models/block/ebony/leaves_snowy.json -9d6a9e2dc690ec9e2be47472450879214a9a5cdc assets/byg/models/block/ebony/log.json -2936bde1574892f420de362d99e604ed91f2220c assets/byg/models/block/ebony/planks.json -771c45b117070ef0ad06fe85cc1d7fff42dafd0d assets/byg/models/block/ebony/potted_grower_item.json -0254253134b651dcad94cb6b30d907ad93031de4 assets/byg/models/block/ebony/pressure_plate.json -a3393f56b5b8c5ffca21c97e6fe51ec4471759f8 assets/byg/models/block/ebony/pressure_plate_down.json -c66713495ba79ba44365f4f325c7dc16c8fc8bf7 assets/byg/models/block/ebony/sign.json -607e6d62b81cf6ad92da6b26f67517d2281fbe91 assets/byg/models/block/ebony/slab.json -871149a9d367aa279b5bc4f44fe9dccb20d51c06 assets/byg/models/block/ebony/slab_top.json -9786f4114f2976d92e6d9250f277f5a2c6f82bf8 assets/byg/models/block/ebony/stairs.json -41d73969017926ed2daee4ff4034e6d5622e9da4 assets/byg/models/block/ebony/stairs_inner.json -913328e8bb6e022391717fc7ed8cb3dec19867b1 assets/byg/models/block/ebony/stairs_outer.json -d113d4858c242fd47e9ccf3a1597d757abb55241 assets/byg/models/block/ebony/stripped_log.json -401b8101c268f44203f96477c3c853b0ab0cc506 assets/byg/models/block/ebony/stripped_wood.json -f33d3e10adc4b6030fc9ef8a7e9639ea0091643a assets/byg/models/block/ebony/trapdoor_bottom.json -631570666dd77724edf26bc7734581b5b8aa7d07 assets/byg/models/block/ebony/trapdoor_open.json -5e691ad4ea2566e63e99b6c06caf2ab819d5e88a assets/byg/models/block/ebony/trapdoor_top.json -d18f7ed470d3de14c0da35792affb611f8133903 assets/byg/models/block/ebony/wood.json -91d303d1f62f05a447ca1dc83a8ac7b402150a96 assets/byg/models/block/embur/bookshelf.json -34b8140f662b8618151a0aff332be6604e6b113f assets/byg/models/block/embur/button.json -22d327d12983ef38c8edd76d284985a70ab5c336 assets/byg/models/block/embur/button_inventory.json -52c272edf2e9b3942170fd20ca35c6178ecfa6f9 assets/byg/models/block/embur/button_pressed.json -ed697a5208d80cbe68845180bb51e1e84fff8ce3 assets/byg/models/block/embur/crafting_table.json -55848fe86c6d02588f4fc106da9df0d2e61e8200 assets/byg/models/block/embur/door_bottom.json -692564f31cf01771196a4eebf65e7b4b31408705 assets/byg/models/block/embur/door_bottom_hinge.json -8d81a6c44055aeccd91819495fc7486e34a198f5 assets/byg/models/block/embur/door_top.json -d8f63e8f15f52d81e27d7b49bfc7503d78e35f15 assets/byg/models/block/embur/door_top_hinge.json -7901bf71acac4bd302f199953d2b5e907306c665 assets/byg/models/block/embur/fence.json -650aa09a1eaca8cd1a49f77243b065d9b6cfde56 assets/byg/models/block/embur/fence_gate.json -0ab21432675dd4a4df4f38c6aaef5c73c5afa711 assets/byg/models/block/embur/fence_gate_open.json -cb9f854236862b2408afb4b2580433324051d637 assets/byg/models/block/embur/fence_gate_wall.json -bbf1baca8a5f781d6a92472b724903062ba492eb assets/byg/models/block/embur/fence_gate_wall_open.json -e7640f1f638b63f534bcadb1b2ee21350fb9255f assets/byg/models/block/embur/fence_inv.json -718f61914ed2d2776671f9016da0380d5d7938c1 assets/byg/models/block/embur/fence_post.json -5eb77faf112951059af41767d2ab6abda5c034ed assets/byg/models/block/embur/grower_item.json -59c73d96ba72b1c77a7b129eeb5fe805655d45bb assets/byg/models/block/embur/log.json -a321195a5cab309c682469d5345cda230e1e52dc assets/byg/models/block/embur/planks.json -027caaea2c48b4f92d84a9bf64e0a61aa24ddde3 assets/byg/models/block/embur/potted_grower_item.json -0ecfebb6a60ddec2417b671dcec162b7f57b2b07 assets/byg/models/block/embur/pressure_plate.json -e0c9a248f41c021407657c2be36ff0179e4b4b9a assets/byg/models/block/embur/pressure_plate_down.json -181e010a9d6b013f18dea2a4131b77bf2afd9492 assets/byg/models/block/embur/sign.json -4dd00cdbfe34d61a74070a1f488f6db897e77c2b assets/byg/models/block/embur/slab.json -84b5d1beee1d2e9bcc4f55ade9bb061297b1994a assets/byg/models/block/embur/slab_top.json -9c2c2b2d0e43407e9d0d87a1a6ec74ca2a6b60bb assets/byg/models/block/embur/stairs.json -b195fbc8d6ddec2d778d619a0ba3e1e958cd54cf assets/byg/models/block/embur/stairs_inner.json -7523a6754e538b0b33e465e4f6e97d88bdc57257 assets/byg/models/block/embur/stairs_outer.json -a4dd05982a73e8b686d2a9b241f4781d72d87a37 assets/byg/models/block/embur/stripped_log.json -ddb00c9808cd83d55a16fc39599c1fd6df5f6f5c assets/byg/models/block/embur/stripped_wood.json -392a9aaa805522c07b7f8654ed39920ae8782c7e assets/byg/models/block/embur/trapdoor_bottom.json -02d1895e71d5b4fb9866bee6b953fc811f60fad0 assets/byg/models/block/embur/trapdoor_open.json -eff5a660c4e9edab9d29d31e12952c721dedd756 assets/byg/models/block/embur/trapdoor_top.json -60e5bc353ed2c25862cdfe37f9d517d4ef1472ac assets/byg/models/block/embur/wood.json -9e0c6e392eb1d912d5ff72e203776609ce96c14e assets/byg/models/block/ether/bookshelf.json -951090d2076a3735ef3f278fbc48ff9b049249fb assets/byg/models/block/ether/button.json -866076592f9138f00523b84d5e13a799b4e6efa2 assets/byg/models/block/ether/button_inventory.json -104f0f5187e02447867b327e229926be3a162555 assets/byg/models/block/ether/button_pressed.json -c41e6a776201a7f910757a87011166e8987936b6 assets/byg/models/block/ether/crafting_table.json -ba6029644811e3da9f38a30a833f83879f5c8863 assets/byg/models/block/ether/door_bottom.json -fca2c74157761affd2625c3d01bdfc59d400b22a assets/byg/models/block/ether/door_bottom_hinge.json -67c0a055b1185cd3f743c451a09266d6c8f968ba assets/byg/models/block/ether/door_top.json -c264a88f331c237cdcb39e8f44538045c78ee432 assets/byg/models/block/ether/door_top_hinge.json -15376d763b19e4a4c955a41c4ceb0aa4f94119e8 assets/byg/models/block/ether/fence.json -8a4d20d3d06337018be098aa298b3ad979615e17 assets/byg/models/block/ether/fence_gate.json -728a836dc186fbdc8eec7d740b732405e834e6f4 assets/byg/models/block/ether/fence_gate_open.json -f6e5682ced57a7349ee04ad508e9f366eab2f925 assets/byg/models/block/ether/fence_gate_wall.json -d7c54d30e4e5f228fda2ddeaa1838168efdc62af assets/byg/models/block/ether/fence_gate_wall_open.json -62123d87b9413e6d74a6ee0f21c23d17e9ae8d3a assets/byg/models/block/ether/fence_inv.json -5236d278388cdfba1dbd51103d1f55b06237ff45 assets/byg/models/block/ether/fence_post.json -d43d280f877072e7d0de89b4323db0f02f9d8de6 assets/byg/models/block/ether/grower_item.json -391b9427289c98a335721472192b0b0b69891589 assets/byg/models/block/ether/leaves.json -3def3de859e8d73aeb8e38cf17614f1d9b9ed8c8 assets/byg/models/block/ether/leaves_snowy.json -333f0cac0b8fd9f6e1f2157bad1ad1188bb27906 assets/byg/models/block/ether/log.json -236e28fced889460da9920b94396337ee98a61e2 assets/byg/models/block/ether/planks.json -bd3fc47a8311ed0fe1f7ac373f87065a7cb85eda assets/byg/models/block/ether/potted_grower_item.json -ebc12a0a9686c90e3739bd23d96c05fe4a906eae assets/byg/models/block/ether/pressure_plate.json -b96313b6e5276e95c3c1ee2523cfa460e2496381 assets/byg/models/block/ether/pressure_plate_down.json -66958ef20c8b76748e5b39a014cd682091505999 assets/byg/models/block/ether/sign.json -4dea4efd0c474f8d542ff0e97d7e74455e9ed0fe assets/byg/models/block/ether/slab.json -4bcb19b6c5b3b28f3ae1cf2ef4727c5d76b904f6 assets/byg/models/block/ether/slab_top.json -3b042a717fb7d7d77fcf6aaef5995f32eff724e1 assets/byg/models/block/ether/stairs.json -054c6e18bf7f9fb503bc85349ef8ecfdfe7623a5 assets/byg/models/block/ether/stairs_inner.json -c07c6397816d8afa502c4a04dca385d1b4baf6d9 assets/byg/models/block/ether/stairs_outer.json -e42e71dea28942a62c221712fadd20206cd2acb9 assets/byg/models/block/ether/stripped_log.json -a48f8043336366ab70cdeb9c175a3cea079f2527 assets/byg/models/block/ether/stripped_wood.json -c4a2b8bfb456f821304933ac4e019e889fa0f28d assets/byg/models/block/ether/trapdoor_bottom.json -b9d4409a33e153601f0d7d07239ab95fbbeef32a assets/byg/models/block/ether/trapdoor_open.json -6742fee7cc5a67fe8944089e6afe561c27e7e3bc assets/byg/models/block/ether/trapdoor_top.json -b655ed9379b701c7e61e3395a2ffefedf40f7414 assets/byg/models/block/ether/wood.json -a7e92e3c0fb139149d866674a84eb57cb2f5cb11 assets/byg/models/block/fir/bookshelf.json -9b22c969a48258018e47de62cba0d45a5e5fbec8 assets/byg/models/block/fir/button.json -bcba00ff1b39dbfeaab6189bbb97feb0f9bef0eb assets/byg/models/block/fir/button_inventory.json -8ed14cb40a48a44365ba06a25ba58f98db0fccfd assets/byg/models/block/fir/button_pressed.json -0e2a2c71659882db111a65fa35f4b985f0d6c5de assets/byg/models/block/fir/crafting_table.json -2523cc0d8c2ba87e617c614768738039d63a3e6f assets/byg/models/block/fir/door_bottom.json -44881fd2ce4d728d84dc0585a45f0873db30c775 assets/byg/models/block/fir/door_bottom_hinge.json -6a71589344f83ceb986fafc27cccf04c274ce1a4 assets/byg/models/block/fir/door_top.json -244da6703d55e372f6be0347d49acacfe3965cf4 assets/byg/models/block/fir/door_top_hinge.json -2058ab0ef8a3b5ca3ff23d9e086f6de2df71e992 assets/byg/models/block/fir/fence.json -60267b055dc9ae420430c6719e244fcdc9681d35 assets/byg/models/block/fir/fence_gate.json -5b3248dfcfd36b46cd0b98a48b1ebb7e6e2fb383 assets/byg/models/block/fir/fence_gate_open.json -43c17a1a89967a3fc741394ad77e0c1dcff5f805 assets/byg/models/block/fir/fence_gate_wall.json -b9170c724f5f0572b4e33bbe0fc9feea87dd3ec6 assets/byg/models/block/fir/fence_gate_wall_open.json -13fdf8f8762038e8ee7e55e80a9c2dd5c1154e31 assets/byg/models/block/fir/fence_inv.json -3ca339e31fcc65647a22848e138086c4b3b2b1d0 assets/byg/models/block/fir/fence_post.json -b2a3d94c89f75f7424bd07e98d268239d03341c8 assets/byg/models/block/fir/grower_item.json -dde3c6590778f6320a16229fae9181d2fdb84132 assets/byg/models/block/fir/leaves.json -9288d58312649629be6a87adf22d9774d5460cef assets/byg/models/block/fir/leaves_snowy.json -033464821424a67f8ee0621159616df389d343be assets/byg/models/block/fir/log.json -43840c4c9e7dd4430d9a7af358826b7fd01d1748 assets/byg/models/block/fir/planks.json -672b3fbbfd03d4e7005af4658fc10c89037b8979 assets/byg/models/block/fir/potted_grower_item.json -3d19719c8bf30a354941f8913542ea943bb712a3 assets/byg/models/block/fir/pressure_plate.json -047484e298e9f14ba276fae5dbe602d0333c29df assets/byg/models/block/fir/pressure_plate_down.json -14b8b6c85774cb61e96c738f6fe61179a29f14c4 assets/byg/models/block/fir/sign.json -abed894765b64afc6e9139c64a4f9c938350e8a1 assets/byg/models/block/fir/slab.json -934ae08917776b8c02af61846307a6ea5cb5b34e assets/byg/models/block/fir/slab_top.json -69d1df741a76c57d97eff7c77d333bcbf4a872ad assets/byg/models/block/fir/stairs.json -d289d31b8f91829b11464e6807b6e0765b77d28e assets/byg/models/block/fir/stairs_inner.json -d278d64e67bdc2dd38541b9bf5bf24336f2994a9 assets/byg/models/block/fir/stairs_outer.json -a21e03ed8eb17a7fda491459702eb65bc38bdfe6 assets/byg/models/block/fir/stripped_log.json -9b6ef761ecfe28eb821ef4a36f6be483c984226d assets/byg/models/block/fir/stripped_wood.json -9cd3d0bcaf638bf1f8501d7dfe0cb677e7f2a259 assets/byg/models/block/fir/trapdoor_bottom.json -1e2e5714b08875fb2ee503a97b36ef1a402fcc48 assets/byg/models/block/fir/trapdoor_open.json -45a90c6129284331a4805899ff38c8797c97d1db assets/byg/models/block/fir/trapdoor_top.json -837b5fca69deb6f4b49ce4575731576b683bb3e3 assets/byg/models/block/fir/wood.json -2a0946cbdbbafb3a3e4e2b096f762dc70372b73e assets/byg/models/block/green_enchanted/bookshelf.json -22b1a113d9f9eca21b60785a7c880cd3ffa892eb assets/byg/models/block/green_enchanted/button.json -fdfc492699a7beb1cbf5b866708d85d387563161 assets/byg/models/block/green_enchanted/button_inventory.json -a78f517dc6dae6d2471f913277be7b56328957dc assets/byg/models/block/green_enchanted/button_pressed.json -02dade169fde794a2e4c862f05b3b3e68474e47c assets/byg/models/block/green_enchanted/crafting_table.json -e17ce505515042e106d33be8aa67c00233fac404 assets/byg/models/block/green_enchanted/door_bottom.json -db4a62fbd1c101a4598f0d1ee081c34d840c55a3 assets/byg/models/block/green_enchanted/door_bottom_hinge.json -f264cf1ac8e16e7236635e88048b392eb459130c assets/byg/models/block/green_enchanted/door_top.json -40dd2bb34a5b7d2bf5785a442ebe33419221e184 assets/byg/models/block/green_enchanted/door_top_hinge.json -dd7e8b14a8dce40381305730bd2ad57adbdb1a84 assets/byg/models/block/green_enchanted/fence.json -8597ddca7000ee48d31bcfe325c9a417c7ffeb3f assets/byg/models/block/green_enchanted/fence_gate.json -722926cd99fae9f7316df500133a6e8194889dac assets/byg/models/block/green_enchanted/fence_gate_open.json -7f791a58ab5526c6b7c010b9cc7265020a276510 assets/byg/models/block/green_enchanted/fence_gate_wall.json -81e1720e9066eb43024bfcb398fd4f605447a9a8 assets/byg/models/block/green_enchanted/fence_gate_wall_open.json -0db91ff3da46fc1c44f1ca0541fb77cd30c52f8e assets/byg/models/block/green_enchanted/fence_inv.json -c83a741fa92ce99e49e11568f3d4b687f01d48d2 assets/byg/models/block/green_enchanted/fence_post.json -25d66c39f80e8b9aa30c632e14907bb4ca859bac assets/byg/models/block/green_enchanted/grower_item.json -146ee796dfa5c7c0e514fbad16e46fa23dcaa1b8 assets/byg/models/block/green_enchanted/leaves.json -eeb54b895bd56056a8560a853c7fd2b8ddedfa97 assets/byg/models/block/green_enchanted/leaves_snowy.json -eea2c5a58d034a68c04ab97323f15265dd1a26a0 assets/byg/models/block/green_enchanted/log.json -a08a63cf2eb65db51a67bcb4697845789876d9be assets/byg/models/block/green_enchanted/planks.json -10ec4f71065a0497784e7b68a6c280574a4b4334 assets/byg/models/block/green_enchanted/potted_grower_item.json -19e1280be2ea5be08fd4e2eaa1edb094428d0e5b assets/byg/models/block/green_enchanted/pressure_plate.json -1acc016884ce274e82fa55ef2a4ba713648c51f0 assets/byg/models/block/green_enchanted/pressure_plate_down.json -d8103f421b60c9cf489183590e17ffe56f5d93f0 assets/byg/models/block/green_enchanted/sign.json -88134b54294516c1f9d108d22da8d63e9776304b assets/byg/models/block/green_enchanted/slab.json -f2343edc3dc92d2d0101eb709c877e190128588e assets/byg/models/block/green_enchanted/slab_top.json -09003ed5b44621cb46ceede1b10cdcd74e037391 assets/byg/models/block/green_enchanted/stairs.json -6e0a6811eb26b37eb338671b77647797a89cabb1 assets/byg/models/block/green_enchanted/stairs_inner.json -5349f05565f57fff8f1d7537c4a87a24898e0b09 assets/byg/models/block/green_enchanted/stairs_outer.json -4fb234851b72d80630b4a7413fc14725121f9baa assets/byg/models/block/green_enchanted/stripped_log.json -c1c740572675bd3c558fdd45e1a5c863ce321824 assets/byg/models/block/green_enchanted/stripped_wood.json -f437f0d36f5821c5b6af79240c6c77a624cbd5c9 assets/byg/models/block/green_enchanted/trapdoor_bottom.json -75c08b16536de2ea25702aa4a3cdfbc20b194300 assets/byg/models/block/green_enchanted/trapdoor_open.json -1fdc5c64c607718910dab2aed97189c7cc3f2baf assets/byg/models/block/green_enchanted/trapdoor_top.json -7a35344ba6e729fd7fcf76d901320363e79c6111 assets/byg/models/block/green_enchanted/wood.json -5408e4793dcc59ccaee3d389f85a3a529e2a007a assets/byg/models/block/holly/bookshelf.json -200caf896bee3db6e964cdcc2964f87ac73e1635 assets/byg/models/block/holly/button.json -30fbc45579b46d414f9876d4b53d50b375b0b387 assets/byg/models/block/holly/button_inventory.json -4a2d1e4aa5cdb234bd29f0753490e304ad9bc866 assets/byg/models/block/holly/button_pressed.json -39d69921ae099784241f0371d02656eb6702375d assets/byg/models/block/holly/crafting_table.json -1e2129a0fee626ea0a2c7dbff6e8fd5e50fdcbb8 assets/byg/models/block/holly/door_bottom.json -74d7f63613bc9e6184bfba5cb8ad8d33f7f3df7a assets/byg/models/block/holly/door_bottom_hinge.json -e29c7069f15ed21939bf336cedddfbef13868fcc assets/byg/models/block/holly/door_top.json -cd807b37b5fd14a91f79c4365ee6e3229007ad40 assets/byg/models/block/holly/door_top_hinge.json -3201c07f78afa2845513b3b2349593e90bc15156 assets/byg/models/block/holly/fence.json -06860cd5944ca70ed39364bdce629a28de5d65c5 assets/byg/models/block/holly/fence_gate.json -a93322724929cf38480d7365dcea56a9be3c6fb2 assets/byg/models/block/holly/fence_gate_open.json -07263a22ab6d8213f178768d49b2bcbb1fc76537 assets/byg/models/block/holly/fence_gate_wall.json -b8eb8293ff29d6064bbc9c9a9e523bfd80b91eed assets/byg/models/block/holly/fence_gate_wall_open.json -96d2e210c6216c92ac87b256bad74d459961da29 assets/byg/models/block/holly/fence_inv.json -d8ade96134e0921470b4618d76fea2173d31298e assets/byg/models/block/holly/fence_post.json -99894c65f6fd2fc263ac67690a9c9f84b53435ed assets/byg/models/block/holly/grower_item.json -e51a12821cfd585ad2e6fe537e10c84c26433b68 assets/byg/models/block/holly/leaves.json -04c1b89a1a709a4dce455f5a0048a6b6e3cc7473 assets/byg/models/block/holly/leaves_snowy.json -563ef1dc3e7db69a8b854d0dcafe8c5b34518433 assets/byg/models/block/holly/log.json -6d5b9268a25046565765e78d1d9f322954a2b30f assets/byg/models/block/holly/planks.json -106a3a9c35fe2ffe06e2b92238102e3e80f50eba assets/byg/models/block/holly/potted_grower_item.json -e4e9bbe8510df900e30cab661e45450ee5ce387a assets/byg/models/block/holly/pressure_plate.json -628a888a542382f0145454de9575b9395ad7b366 assets/byg/models/block/holly/pressure_plate_down.json -31aacaabf2ad81a1e8f2ba1834ebcbc785cec55a assets/byg/models/block/holly/sign.json -4980db3734e72d9ece421d5e4d4ce7941a1b9d3f assets/byg/models/block/holly/slab.json -6851b00bf067998abfcc173790774c7704fbd34d assets/byg/models/block/holly/slab_top.json -28dbba88f7fb307616f27bb4565e0f6c24702b2f assets/byg/models/block/holly/stairs.json -97a02e92c7565f38c20ce3a912b84aee5049ba94 assets/byg/models/block/holly/stairs_inner.json -9e8e60ee1f78dd15b676d9167c31cc68af4e91f5 assets/byg/models/block/holly/stairs_outer.json -58a36b650d70b32493438b00520e8dee31c57ad8 assets/byg/models/block/holly/stripped_log.json -bdf84447c044624065e69bac05e703181123c5e2 assets/byg/models/block/holly/stripped_wood.json -bd80774ceff6624eb26328d1f05d96de380c3f80 assets/byg/models/block/holly/trapdoor_bottom.json -ce4c9cd9d585aaf14cde2255d2671494020a4f1b assets/byg/models/block/holly/trapdoor_open.json -b035788f20b4673957ae7eae1c48599633bd1e86 assets/byg/models/block/holly/trapdoor_top.json -a71ed16290f8fc469f4615ef5d20ec55f914f03e assets/byg/models/block/holly/wood.json -4184d112f3088d08d62ba2585f9dfca3e3675642 assets/byg/models/block/imparius/bookshelf.json -ce2a5f559c484abfa91013401ab59cb034dba233 assets/byg/models/block/imparius/button.json -c6e10204f9c536876aef7350f1d562f19cf58503 assets/byg/models/block/imparius/button_inventory.json -c0ba7861b5e3b573140dc04b9c54607b863536e9 assets/byg/models/block/imparius/button_pressed.json -93be8dc0b0eb174dc56127913757b83cf1fbac85 assets/byg/models/block/imparius/crafting_table.json -d16705aad15aa8157a3c21df1031e37ab4368894 assets/byg/models/block/imparius/door_bottom.json -3b73e7a3bb93de93ef62bb1a97b69f44e7249b81 assets/byg/models/block/imparius/door_bottom_hinge.json -903f9ec305d4914ed78f5bcf1f3009aa3288d0bc assets/byg/models/block/imparius/door_top.json -d24f9f986d561f4cb96dd5ee8fb29f6d3f1c41b3 assets/byg/models/block/imparius/door_top_hinge.json -ec661c277602f19f505a90172a30b1daba553248 assets/byg/models/block/imparius/fence.json -8ae8d6e0e0954175f6cb901222944c9691dfd698 assets/byg/models/block/imparius/fence_gate.json -7afcdf2ea87edde29b73d6baf4cf0a972537171a assets/byg/models/block/imparius/fence_gate_open.json -9026c971359f7f11a9c9958edf642219ac268c06 assets/byg/models/block/imparius/fence_gate_wall.json -a695ee39ab9820e6ff3503fac4b51d120b067503 assets/byg/models/block/imparius/fence_gate_wall_open.json -7f6e9232a729461216af664339818cf1a24461c9 assets/byg/models/block/imparius/fence_inv.json -1a114f7df6c8aec9107555c1b422bf76960a71b0 assets/byg/models/block/imparius/fence_post.json -595a79813160520b9488884d4afc0017abde97af assets/byg/models/block/imparius/grower_item.json -0619139c301ffbdb198989106a9dc6ee627bfc14 assets/byg/models/block/imparius/log.json -40be562f3946b8c589fe888dc49130695bb7df08 assets/byg/models/block/imparius/planks.json -89bb2a44d08c971b1e394909fd6863e63404c4e0 assets/byg/models/block/imparius/potted_grower_item.json -dd857606a752b8aa6e41c50db7d4fb586c68df10 assets/byg/models/block/imparius/pressure_plate.json -1d20c1378d4491976471b0461a9decdaca735247 assets/byg/models/block/imparius/pressure_plate_down.json -1fe2e98943275613e99226018225c2cb50d0b91f assets/byg/models/block/imparius/sign.json -76f46acdb37fb5adb52b17346fa6924218347f7b assets/byg/models/block/imparius/slab.json -ff9d3bbe597ebc750b74eb91d259907e02fd6bfc assets/byg/models/block/imparius/slab_top.json -4973077d48e40ccf9bd945c9aa9177d11081ea03 assets/byg/models/block/imparius/stairs.json -ad08407b606c575350be942a8eb273537ea35a20 assets/byg/models/block/imparius/stairs_inner.json -d0512c9584c5b72e733e96d0cb041c4be4f2b126 assets/byg/models/block/imparius/stairs_outer.json -33da6501d63e81c2d203619cbc6051c34eb66374 assets/byg/models/block/imparius/trapdoor_bottom.json -ae9665920fb1045eea8742cea53119ebe7227e37 assets/byg/models/block/imparius/trapdoor_open.json -ae5737017dbc1d6053fa5937685581b639271805 assets/byg/models/block/imparius/trapdoor_top.json -1f9b271e1f7e94aa33a491ae563799bd9c16b7b2 assets/byg/models/block/imparius/wood.json -39de53a63c7e47dd437aa8adb44649c602f9027c assets/byg/models/block/jacaranda/bookshelf.json -15c34fa4e4a50c222252a1fe0da4e361340523c2 assets/byg/models/block/jacaranda/button.json -0a9a7c458981673182327622531c0c174ff9aaf6 assets/byg/models/block/jacaranda/button_inventory.json -ad154a05f2c8cdbfde56276fa10a9d1455e43f4f assets/byg/models/block/jacaranda/button_pressed.json -92fa025dd3975e61aa2c3c4f22aab0da3a8f5602 assets/byg/models/block/jacaranda/crafting_table.json -4afd38cb356c802a552e1dbefed5f5895ed2d9c8 assets/byg/models/block/jacaranda/door_bottom.json -45c1b737291ad459faf005713fe9e1f953165b5f assets/byg/models/block/jacaranda/door_bottom_hinge.json -155674ecb0201713abf39952729cc2b258dd7a43 assets/byg/models/block/jacaranda/door_top.json -299990a4a9758272d5774c061a20c745b0ea5cb7 assets/byg/models/block/jacaranda/door_top_hinge.json -cae628d166d0ae527ad1d238059b739841a11f9b assets/byg/models/block/jacaranda/fence.json -24149020f47c8bc56cd782337d0dc957ff928ca8 assets/byg/models/block/jacaranda/fence_gate.json -b09b4433c386be6888dc028dbc622d7222019edb assets/byg/models/block/jacaranda/fence_gate_open.json -67b6ea7d8fb1b31d86b4c5b68344c59084a2dfc6 assets/byg/models/block/jacaranda/fence_gate_wall.json -4587d5e1eb096bd157946d72c9c0830b61efebfb assets/byg/models/block/jacaranda/fence_gate_wall_open.json -807c238767de44c0ac9978697d4b5c0255eddbca assets/byg/models/block/jacaranda/fence_inv.json -bee2e372b696a70e270aadfe484a9e343126dc99 assets/byg/models/block/jacaranda/fence_post.json -a7a9c594b02e93e335b4758f9bf001b704af548e assets/byg/models/block/jacaranda/grower_item.json -983166aeaf8ef8d01a802f1db7307fc754aed8d8 assets/byg/models/block/jacaranda/leaves.json -604953298d30b8d1218a1497d2e5d4c7eb58be2c assets/byg/models/block/jacaranda/leaves_snowy.json -efbc1ec07bc7c38156d309dbf1f167c50aa7ceec assets/byg/models/block/jacaranda/log.json -74de0b19925ced521cd4ee6af965c88010e7ec49 assets/byg/models/block/jacaranda/planks.json -76f90f0e23d14f02c0d23819235c0838779777b0 assets/byg/models/block/jacaranda/potted_grower_item.json -818e8d63dad1cb46429bedf227d7ce87ebb3a1d2 assets/byg/models/block/jacaranda/pressure_plate.json -70c8c7438d5b90c1b75553b014b9c7d1469b2993 assets/byg/models/block/jacaranda/pressure_plate_down.json -210ff02c7b82cc40d98d85427ff767c7c2a27e8c assets/byg/models/block/jacaranda/sign.json -2553584974f85b7fe90eb32cfcc5986ebc34f137 assets/byg/models/block/jacaranda/slab.json -6349d34c42e722baf46c21be798035b9e0a27e9d assets/byg/models/block/jacaranda/slab_top.json -4b7cb7567d5ee25e4652825658e80bd5a1a4ef97 assets/byg/models/block/jacaranda/stairs.json -b201729669f46e7adbc5f279650e3f917cb15bc5 assets/byg/models/block/jacaranda/stairs_inner.json -37a0ba63d922a81f1fdc4e1b76b525f4d1fbee79 assets/byg/models/block/jacaranda/stairs_outer.json -b4457b102fba5d8e04a3c8ad00f1c929cd678256 assets/byg/models/block/jacaranda/stripped_log.json -261fcaa47c42f7c3686e206a5406a86cefdebc83 assets/byg/models/block/jacaranda/stripped_wood.json -afcacad0ef8b2f22a55d9422b6184940175e42ef assets/byg/models/block/jacaranda/trapdoor_bottom.json -ee6101896a17762f954960bb0e7f29de8e5bc57b assets/byg/models/block/jacaranda/trapdoor_open.json -f3a97f7037bd98c8543a606b67659188712e0fc9 assets/byg/models/block/jacaranda/trapdoor_top.json -cee2b01ed5050648f812cb4cb66cb723c0613522 assets/byg/models/block/jacaranda/wood.json -e1d0ed2c387934e8da4fcd5ebede2019df0f25cc assets/byg/models/block/lament/bookshelf.json -c422e3639a840bf08a658265c014a6b3d08328ef assets/byg/models/block/lament/button.json -8788b3c84920581717b1aae9807ba0f19237ad66 assets/byg/models/block/lament/button_inventory.json -e75d1ef70b06e8d06d56e36237ddffdf832aba02 assets/byg/models/block/lament/button_pressed.json -ce0c6d676335eebb61dd0a08c2724d02c9868f5f assets/byg/models/block/lament/crafting_table.json -1fd8053c1d4396d11bcce8a958904d9a4853f701 assets/byg/models/block/lament/door_bottom.json -31f817bf83f15c6c861b6caf383927602633568e assets/byg/models/block/lament/door_bottom_hinge.json -9c434fabe3e14d94df53da12247fd39b991e3a0e assets/byg/models/block/lament/door_top.json -5abcfd499112cf93532843be90c2926acdebd503 assets/byg/models/block/lament/door_top_hinge.json -6df3ce5ff4abae4c2cc13b8fa7b6947928a12bad assets/byg/models/block/lament/fence.json -e218c0e82bcb87dd21a6a408a87d4615f9879185 assets/byg/models/block/lament/fence_gate.json -f2661b99b8317238983fd14818ba5ddf791d77c0 assets/byg/models/block/lament/fence_gate_open.json -86c512171b88ac12d44cffc73d43e488f24853a3 assets/byg/models/block/lament/fence_gate_wall.json -097faa13ca06bfeb82fe6fa8c59e5c7bb98c8e59 assets/byg/models/block/lament/fence_gate_wall_open.json -1366825497cd91fc82e38064796903c0fc4fe23f assets/byg/models/block/lament/fence_inv.json -472fa12b1b33cf0eff893564e86be63683cb4fea assets/byg/models/block/lament/fence_post.json -7c1eee34a9d91fa0f0712f17d3fd5993c166414c assets/byg/models/block/lament/grower_item.json -73d77771675050ca15bec084ed0035f93c769568 assets/byg/models/block/lament/leaves.json -605bdb42850b35d94640e7690bc1f0ac859af9e7 assets/byg/models/block/lament/leaves_snowy.json -e7c9f32b6952228883bad79854258bce7ac028eb assets/byg/models/block/lament/log.json -f4ef8ef7e4e18418fb5161bb4cea15dfb6b8e7fb assets/byg/models/block/lament/planks.json -659391a4fe0672feb4c74e2057f77132414905c5 assets/byg/models/block/lament/potted_grower_item.json -d5d657dcf6a34415789c39abeae5bc86d41e4fa4 assets/byg/models/block/lament/pressure_plate.json -9dbd6360730f004afe0501b1652d30ea34c45141 assets/byg/models/block/lament/pressure_plate_down.json -859f61b1c3ec362623b21d6bed6429ce96522463 assets/byg/models/block/lament/sign.json -e7a985f1eda2672e0d8d0d0fc21f0fd5a3885ac4 assets/byg/models/block/lament/slab.json -cbcb22662b7384c1e8ac94c5a7517831c521161b assets/byg/models/block/lament/slab_top.json -29d9da05e103136f79c2821bf96f74117cdc118a assets/byg/models/block/lament/stairs.json -52868f5ce2a239bbb0b3c7c9fb69a683f7a66da6 assets/byg/models/block/lament/stairs_inner.json -e599832493e0fa92073c77c60095bf671efb3003 assets/byg/models/block/lament/stairs_outer.json -f07f52e18ae8acbdfde030508d3c6f14e345ad4b assets/byg/models/block/lament/stripped_log.json -5351b28088857f3b231cb0e37a4c245318cdf10b assets/byg/models/block/lament/stripped_wood.json -504c5769f7b98e7b82a2647944f083b67f3adb65 assets/byg/models/block/lament/trapdoor_bottom.json -a492b8d5d7607e0eba22c0730d2c49593386a157 assets/byg/models/block/lament/trapdoor_open.json -902980b8e720802106c04e0e9a3ddd95b43fd4c0 assets/byg/models/block/lament/trapdoor_top.json -70cd750a64ad62c91c88739b765e445a61d91f72 assets/byg/models/block/lament/wood.json -46ddc052ddf8365713e7613550e33d541877bc1c assets/byg/models/block/mahogany/bookshelf.json -1eb51f409ab27de20eb274edf2a0d22761e1e2a1 assets/byg/models/block/mahogany/button.json -fc7da464a0ff5aa5b61230223b3e29e0796938ac assets/byg/models/block/mahogany/button_inventory.json -e3f606173eec52990593569cc40c20612a19e2ee assets/byg/models/block/mahogany/button_pressed.json -7e60ef6f493979ecd552b08afc1c17eb31cfb53b assets/byg/models/block/mahogany/crafting_table.json -302cd8f026d7b3d83f4f0419a79506e9247ba91c assets/byg/models/block/mahogany/door_bottom.json -d6a4b08692c4ba99a41a4c3c627b7bd02733cb21 assets/byg/models/block/mahogany/door_bottom_hinge.json -113463a74e0859ea151a353e30002f2e8ee892c6 assets/byg/models/block/mahogany/door_top.json -dd91e333e75a9740eb52bf2a17bddb6d210c8224 assets/byg/models/block/mahogany/door_top_hinge.json -a4cdd60ccaac5a7145d14a1e931e662bf42289d0 assets/byg/models/block/mahogany/fence.json -a263d21e06176b571603582a047263986a9cbc05 assets/byg/models/block/mahogany/fence_gate.json -6d7ec8f1bd9cacf73f96f645a0c3577d5968dca7 assets/byg/models/block/mahogany/fence_gate_open.json -0639dc9aa547c04971535a1a013a752901966e5a assets/byg/models/block/mahogany/fence_gate_wall.json -d3e7af8e886b2bbeddba4341cb599090889c901d assets/byg/models/block/mahogany/fence_gate_wall_open.json -4b738d591c85fc237166262b07a8a0b07250da1f assets/byg/models/block/mahogany/fence_inv.json -6e79c75c084cd44d3b633d21b98900bd4640c184 assets/byg/models/block/mahogany/fence_post.json -2a734dbc733ebd65667011c9b3f6acbf1b1289c2 assets/byg/models/block/mahogany/grower_item.json -52cf187dd6f45454b2fe18eff7191a3bb6820508 assets/byg/models/block/mahogany/leaves.json -a3481313f634ce373eddbe96090cc1ffff96ae37 assets/byg/models/block/mahogany/leaves_snowy.json -edfd496ebaa9c5f80edcbc104b1ea54c84cbd411 assets/byg/models/block/mahogany/log.json -47789678c316d2b0d5654ad13f4dfb0be1c1918a assets/byg/models/block/mahogany/planks.json -d37a9edbeeb2ef5cb1c75d395a775e0e26c06370 assets/byg/models/block/mahogany/potted_grower_item.json -13c35c96abdc967ccf24364dc7f89dd13098cf85 assets/byg/models/block/mahogany/pressure_plate.json -b5123dd3ab45b2012724f8f126ad6369cc35c7a7 assets/byg/models/block/mahogany/pressure_plate_down.json -27d2d318fe84fdc380bbb019712a9097f3378bc8 assets/byg/models/block/mahogany/sign.json -c31abb434e8e3a56083dbbd5e208c45dba147edc assets/byg/models/block/mahogany/slab.json -f2fd0bdf26816fcd083222230742f05e92d97bed assets/byg/models/block/mahogany/slab_top.json -219d190d69f4355abf53567687cf967bd849fde8 assets/byg/models/block/mahogany/stairs.json -09bf6710ec3eead86c99262adb6fe280378de6ea assets/byg/models/block/mahogany/stairs_inner.json -89cf846e0a814064fcd02d57648ff8a583ac135a assets/byg/models/block/mahogany/stairs_outer.json -d511db509813684205cfc172e8edbeaa748ad364 assets/byg/models/block/mahogany/stripped_log.json -bc6f2d0f3901be3e67c986d9cfb46637db1c40ae assets/byg/models/block/mahogany/stripped_wood.json -d10f0a6bcae1b16d29c5f292453d92084befbe49 assets/byg/models/block/mahogany/trapdoor_bottom.json -06b76eb6b276363c35a03e7d5d37bba35aa3b154 assets/byg/models/block/mahogany/trapdoor_open.json -e7074ff7eb49bd39ef6fea403cb0de1812eb0c2c assets/byg/models/block/mahogany/trapdoor_top.json -7dee15f914317ba1566c249bf458c66f307a1bf0 assets/byg/models/block/mahogany/wood.json -06fb0aa2983608d3423dc38554f1eff8e1df21b3 assets/byg/models/block/mangrove/bookshelf.json -2a45424cf40551af0906f357328adf217282171e assets/byg/models/block/mangrove/button.json -d77ac2b5226c4331aa14aec35f070eac39136618 assets/byg/models/block/mangrove/button_inventory.json -3f72691009422c36f36539a26193862cfea1d7fc assets/byg/models/block/mangrove/button_pressed.json -a809461e52ffa5c09de0a834d6ec852eca97459b assets/byg/models/block/mangrove/crafting_table.json -e86405476914aaedd3fc49214e91eb9aee51c13b assets/byg/models/block/mangrove/door_bottom.json -90e0902796a8f6efa2649d614d8fc9bbacf7e65b assets/byg/models/block/mangrove/door_bottom_hinge.json -75b5959f4bf78837cfc76ce0c52580dca2685532 assets/byg/models/block/mangrove/door_top.json -7fc0656943e99a9333db5f4d2ab81d8920f3f292 assets/byg/models/block/mangrove/door_top_hinge.json -f52fd364b9161919bfb7ca6ec0bf0348f36bc819 assets/byg/models/block/mangrove/fence.json -043cd8c90f467fdf78055dd88e34fd3737f77aa9 assets/byg/models/block/mangrove/fence_gate.json -237e59f6764a80b5fd15c4137b3b058cd713efcd assets/byg/models/block/mangrove/fence_gate_open.json -b5670973fb23c48b078e8f8435936c006e279549 assets/byg/models/block/mangrove/fence_gate_wall.json -29e651571294d8f47eb2f7f61e45a13aa4b003d1 assets/byg/models/block/mangrove/fence_gate_wall_open.json -e042b1b6d266a6545b6c6e3366f8bbfe4fe8cc6b assets/byg/models/block/mangrove/fence_inv.json -3f077aba9686176cacd47868034e6802fb8ac593 assets/byg/models/block/mangrove/fence_post.json -2c6fc03bb3465f6f26e6fc6e538957f712f51742 assets/byg/models/block/mangrove/grower_item.json -9b9a987c7d1e0032da6911bd647af4014b81d804 assets/byg/models/block/mangrove/leaves.json -dd02ad772d32144d4c8f8008ffc2e894b76ccbed assets/byg/models/block/mangrove/leaves_snowy.json -1c8d145ddeff92246ae37f399fc4ba216e4bf494 assets/byg/models/block/mangrove/log.json -e2a68cef72a8896d8ba3c921f96342a1f49deb54 assets/byg/models/block/mangrove/planks.json -f2356d78e186347fc47366857c8b9d8781ab059c assets/byg/models/block/mangrove/potted_grower_item.json -a12a60a9c24dfb85d193955490282a569491683e assets/byg/models/block/mangrove/pressure_plate.json -ac7a2ed0c4b930a5d4a71a5f233730652c619705 assets/byg/models/block/mangrove/pressure_plate_down.json -f9f9163d5d0db6281eba780f2d7cd30a7b6727cd assets/byg/models/block/mangrove/sign.json -156a4fff72f2395df0d3223292374300d1a8074c assets/byg/models/block/mangrove/slab.json -9bc455c6e527549209b5b9aac6a53637a240f825 assets/byg/models/block/mangrove/slab_top.json -0380d94b824120f82f1850fe5cf50e8603ae53d1 assets/byg/models/block/mangrove/stairs.json -81f32a3bddda583a73a5fdf4fddbac23bd92b0a1 assets/byg/models/block/mangrove/stairs_inner.json -ccaaaf1759a8d518c4fd9a1895c9192bfc081c76 assets/byg/models/block/mangrove/stairs_outer.json -c213f8be3662160dcb2020ec1bac32b6833332aa assets/byg/models/block/mangrove/stripped_log.json -b53c1dbed17db433ca0335e71dd4a1cc38c463ad assets/byg/models/block/mangrove/stripped_wood.json -18602dff240e103ebf20972a974ef14eeb6bf0d2 assets/byg/models/block/mangrove/trapdoor_bottom.json -c7d722dd68d50442fa0362463a704a1400aa2267 assets/byg/models/block/mangrove/trapdoor_open.json -36becdeb37ab87ccc51c427f265fb62290eba13f assets/byg/models/block/mangrove/trapdoor_top.json -db85b26584a130734c0c18b1b8e10e3bf071a97f assets/byg/models/block/mangrove/wood.json -ef022fe652504aaa2e0839628225669dcbcf635d assets/byg/models/block/maple/bookshelf.json -c78a8dee25c7ff91c10e3d27d90f9a37e2b1ecc4 assets/byg/models/block/maple/button.json -f5d6391b8d6d0c790b553dfa1c8674d841ef7d7d assets/byg/models/block/maple/button_inventory.json -184ac7de917226f2d569f29483fd895f9990dcef assets/byg/models/block/maple/button_pressed.json -22db487ba17fbebe0d64dbc1531e75afbe238d2e assets/byg/models/block/maple/crafting_table.json -9cbc0618150ff6966489938bcfbec5612c42fb66 assets/byg/models/block/maple/door_bottom.json -e86fc1e596f6c4b7e26718548db60d9cc6b0a6c7 assets/byg/models/block/maple/door_bottom_hinge.json -f7375012dc49bc5e7a7edeaa6b3ceb9633c9e048 assets/byg/models/block/maple/door_top.json -b0582fb8db413fc60740d7cdd3b0eea20ae7341c assets/byg/models/block/maple/door_top_hinge.json -453954e228ea3d7836e189f339b6804453f57d1d assets/byg/models/block/maple/fence.json -96dea851ce1428ff914b8a36e9f92054905dc191 assets/byg/models/block/maple/fence_gate.json -d0b8a4c3fed61d221e7974f6512182f34164be0f assets/byg/models/block/maple/fence_gate_open.json -e120a9497db1bc17c0a3fbbaedbc18c12e59b024 assets/byg/models/block/maple/fence_gate_wall.json -558c7cb83af0a59af4dc6d051f79adbce5f848ce assets/byg/models/block/maple/fence_gate_wall_open.json -7bb3b1ae140922e8938b3ec2b0fca39e45cebb11 assets/byg/models/block/maple/fence_inv.json -99982a9b085ec25ad54a5f8dc985f03bbe69acec assets/byg/models/block/maple/fence_post.json -0461bd09eef6935e23481bd039159d1d3923d942 assets/byg/models/block/maple/grower_item.json -7ab162259aa5599ea01f747210abc294b237ade8 assets/byg/models/block/maple/leaves.json -c4c4e223da10d217662ff594b0fca9baf2a26551 assets/byg/models/block/maple/leaves_snowy.json -8b45273f8b3eea9b38ff07632556508721c462ab assets/byg/models/block/maple/log.json -215961082a4a9a9eca7befadf291bd7d7bb22725 assets/byg/models/block/maple/planks.json -4197bcf5d44803d069212a99a9dd4928ee2e39f1 assets/byg/models/block/maple/potted_grower_item.json -7633afb7645857638cd8ccc415d72a9622ddb92e assets/byg/models/block/maple/pressure_plate.json -e73bff44b2bce2792f4a22e8291c38affe8ed6be assets/byg/models/block/maple/pressure_plate_down.json -2a9f8f71aee0e801b53c351a89a112632535c1e1 assets/byg/models/block/maple/sign.json -fea84a75b119074ee24be1c11df466025d57f4d8 assets/byg/models/block/maple/slab.json -d5ae5a72a2e48f6885aa98ae05e3ec72f0a712a6 assets/byg/models/block/maple/slab_top.json -e5c23cc125b3cb34edec71b8a10daccb824ab38d assets/byg/models/block/maple/stairs.json -92f2cf19bb4bc2608d48ff52d0024838b2a3902a assets/byg/models/block/maple/stairs_inner.json -64c4ea88de55c325dffd6ccfefea302c225aca0a assets/byg/models/block/maple/stairs_outer.json -d964d143ca583b62746f8706aa107f5f7c1f7c07 assets/byg/models/block/maple/stripped_log.json -2ea83e7dfe1345335f5c84b033ea1c46935db2f4 assets/byg/models/block/maple/stripped_wood.json -759611efe388005ee1627668aa1681330090d15e assets/byg/models/block/maple/trapdoor_bottom.json -7931e24d6dee7d30d7cf349f05159e5a94713e0b assets/byg/models/block/maple/trapdoor_open.json -66044be06bc11ce721f98dff8364f738b1ed03c9 assets/byg/models/block/maple/trapdoor_top.json -16aaeaf268f24a4f86bcc3e75c14adc22cb33c6c assets/byg/models/block/maple/wood.json -af5e5b064247ae2c2fc4e5f57b9b7296288c6778 assets/byg/models/block/nightshade/bookshelf.json -1612a94a1356b4969df48b8ffb67289bf1a28a92 assets/byg/models/block/nightshade/button.json -f95eeef7fcc213d491aab6dabf75d0f660613672 assets/byg/models/block/nightshade/button_inventory.json -bbe33c4f5c089c6885aa7e0d5b53b3bcd24af146 assets/byg/models/block/nightshade/button_pressed.json -a78a865fb87ae658e29580faaef23576433cfc57 assets/byg/models/block/nightshade/crafting_table.json -fda94238ed935aa2ba21739c5e7b91c085598d79 assets/byg/models/block/nightshade/door_bottom.json -333216611eb81a0636c2878cc82a125e8979a044 assets/byg/models/block/nightshade/door_bottom_hinge.json -a242130b23eff1110b6e8018f289190f255649bc assets/byg/models/block/nightshade/door_top.json -65fb30e43f0d85068f1fdece61419c39501837b9 assets/byg/models/block/nightshade/door_top_hinge.json -e1a710a3a74f28eb08c92d047b03d648cb571ee5 assets/byg/models/block/nightshade/fence.json -25e99e8841c9077d186a337ee0648006a30a4fd1 assets/byg/models/block/nightshade/fence_gate.json -ed4e30c4f123aad24b4d065892f8b90440954912 assets/byg/models/block/nightshade/fence_gate_open.json -2573cd9a3685a4c20ae69f42f669da14d632b3af assets/byg/models/block/nightshade/fence_gate_wall.json -fb7263551534e16de22ab10e421af22be40c6d45 assets/byg/models/block/nightshade/fence_gate_wall_open.json -fe62516b76e37cded49a19d8e3ccbea4cd8003ff assets/byg/models/block/nightshade/fence_inv.json -25a4d8a82e4ed8268f3fa4135b268c69e15a05af assets/byg/models/block/nightshade/fence_post.json -76626693f23941197f534bcc96ca048273e108d3 assets/byg/models/block/nightshade/grower_item.json -e6cffadf9d315e517481259c55fd236efbcd245e assets/byg/models/block/nightshade/leaves.json -b537b432708e27fc0f1a28c17a050207971c03aa assets/byg/models/block/nightshade/leaves_snowy.json -dde8da2ffda06c74eb3ce764144336dc2b67045a assets/byg/models/block/nightshade/log.json -3af527e52937709d66b4eca1ed13879308328ad3 assets/byg/models/block/nightshade/planks.json -f3ab39eab019351994bcc3eaed1e4fd1b0dde4d9 assets/byg/models/block/nightshade/potted_grower_item.json -7e370681f447552103db002a8a3680e98137b92a assets/byg/models/block/nightshade/pressure_plate.json -a973b21f7c01d20f27567d54e1c58eaecff8047c assets/byg/models/block/nightshade/pressure_plate_down.json -ddbc522089f9153fb6f51fae7aa59fb735c4fc06 assets/byg/models/block/nightshade/sign.json -9837c243eeb7a2fe43d9df255d1c14a4ca533701 assets/byg/models/block/nightshade/slab.json -9b236e32f9d4d25c502ad393648fbd3f5322b91e assets/byg/models/block/nightshade/slab_top.json -565efe1282cb2fb6afd384d3426605d516b3496d assets/byg/models/block/nightshade/stairs.json -425155648cad7267f6cf15c92197a88dc43e0016 assets/byg/models/block/nightshade/stairs_inner.json -e463114ea5489452953354d869e4b127dfc1cfce assets/byg/models/block/nightshade/stairs_outer.json -d4a671cd66c0b1d0fb00744a3db52b818b607f41 assets/byg/models/block/nightshade/stripped_log.json -8944e386230c5a2501887f0e4df8fb0971fc3be3 assets/byg/models/block/nightshade/stripped_wood.json -228018989a6c500e524081fbc7938eb36bcaa636 assets/byg/models/block/nightshade/trapdoor_bottom.json -b794c5c74c1e2ef51ddbcbbfb4f2bd0ef0be529a assets/byg/models/block/nightshade/trapdoor_open.json -861d9433ae9a39491794cc35b10a31f50e57da76 assets/byg/models/block/nightshade/trapdoor_top.json -ebe95545fbc92bb6d0cd8e4a60a77ca8100a91ab assets/byg/models/block/nightshade/wood.json -73775020269c46d7eed295cd6898a9c700aea43e assets/byg/models/block/palm/bookshelf.json -8335e3f7ec34c1899bc24bda1d2c9f8a1e8be121 assets/byg/models/block/palm/button.json -46315a53d6effb3be613f52987aa17c55d4a092b assets/byg/models/block/palm/button_inventory.json -ed58fe15ff1d283e1d52d1d9e8cd7690bd8f49aa assets/byg/models/block/palm/button_pressed.json -5cf611605dab06abba92679d61ece89391aa36ca assets/byg/models/block/palm/crafting_table.json -4b6fad4024bb79b7c5b1812c62693439ad2fb1ed assets/byg/models/block/palm/door_bottom.json -757688bf70cd9d6e09fe8207c280f1464bbd43ea assets/byg/models/block/palm/door_bottom_hinge.json -dd01e3f77dd538ebffb433401e2abb4749bdc061 assets/byg/models/block/palm/door_top.json -9fec5541017a313b1ba9270977afe0ba1b731254 assets/byg/models/block/palm/door_top_hinge.json -fee846a169981ca459779623143dc02e6d86bdd3 assets/byg/models/block/palm/fence.json -27165ea31d155455c3c8fed9d97b539bbdb7bde5 assets/byg/models/block/palm/fence_gate.json -1e56b93de8e6a1049244435d645ac5b06d264b75 assets/byg/models/block/palm/fence_gate_open.json -f5c31c13dc733a6161974fcc8ef10c52e83ec858 assets/byg/models/block/palm/fence_gate_wall.json -9c263ccbf426b396fb73f5da316aaf9af3fab324 assets/byg/models/block/palm/fence_gate_wall_open.json -7076e4c05d75be039980ce353080b2e3aca6c6b4 assets/byg/models/block/palm/fence_inv.json -a4c294d282211afdd4c2f736adfb26be1452b6bb assets/byg/models/block/palm/fence_post.json -0e5e6e614254e995dbaad57a84644bdc919eb581 assets/byg/models/block/palm/grower_item.json -a0270c6545d8ee19b66cd917f59e1ac41cb2258a assets/byg/models/block/palm/leaves.json -4f4933f9a710e6df9b6b92f3fc6d7de0e27fd6b5 assets/byg/models/block/palm/leaves_snowy.json -1a042fa111eede6c830941db7040a8f0793d0cc5 assets/byg/models/block/palm/log.json -87d02a07f728a1557a8c0bdc92e4cf4078ca653c assets/byg/models/block/palm/planks.json -b9f580b3bbc757a5723c7e686769f21016f0a0bb assets/byg/models/block/palm/potted_grower_item.json -5c0275305fb2d94f5b203d646ff655cdb574da88 assets/byg/models/block/palm/pressure_plate.json -15e19f59603d7611419e5bf01ee7dc08bef58519 assets/byg/models/block/palm/pressure_plate_down.json -5b740e5f44ecc94c35a249752476459c38457b72 assets/byg/models/block/palm/sign.json -0705637c3f7703f7fcc3e25846da8c4a8e76877e assets/byg/models/block/palm/slab.json -a450c220fb7e0a98871a0bfe4291792123cdb027 assets/byg/models/block/palm/slab_top.json -b7b8e43c14a1b02612d0a08653aa2dd092031fd6 assets/byg/models/block/palm/stairs.json -d83d60d140d029181ce03d57993a7eb176862497 assets/byg/models/block/palm/stairs_inner.json -67bd4f349f4b6bf162f11bc05fa6e8b8245c56a4 assets/byg/models/block/palm/stairs_outer.json -2dab43e6932f6c5aecc149335760b49950fc4b86 assets/byg/models/block/palm/stripped_log.json -00838868eb00e6e93a725d22892525006c34146f assets/byg/models/block/palm/stripped_wood.json -c96021f0305bcae8f8d5b28e3580b898f9b885fe assets/byg/models/block/palm/trapdoor_bottom.json -6779b160647712fb544f5d3279f5ba0a81bbce26 assets/byg/models/block/palm/trapdoor_open.json -85806014cd8d8bc66feabfbfad47ca246e70463d assets/byg/models/block/palm/trapdoor_top.json -a0ff5273aa52b8d89e0645aba68d5f917a515f6b assets/byg/models/block/palm/wood.json -d99e634fbf06b52578f95fed65a8c70de8e20bd1 assets/byg/models/block/pine/bookshelf.json -4af8ae6f61ab700449c4efa91ea586a58cb6e165 assets/byg/models/block/pine/button.json -7f6d647c94ef21dbec7f7a4c356ea3889de172f8 assets/byg/models/block/pine/button_inventory.json -60d2a278cd42d4ebeffb6a2118de023c18579405 assets/byg/models/block/pine/button_pressed.json -d94c23ee22b8b160aaab471268e75e9f15eb3fcc assets/byg/models/block/pine/crafting_table.json -651b4505c693a42484fba712bcbaa7fd8092f753 assets/byg/models/block/pine/door_bottom.json -33b83ba09a2f36f9d125ec684ef41045bb147287 assets/byg/models/block/pine/door_bottom_hinge.json -51cf1df1357a6f0c9655aa0c2512cbded87cde0a assets/byg/models/block/pine/door_top.json -1ab90554955030e16a8ba90983bc0b8391f73a8b assets/byg/models/block/pine/door_top_hinge.json -33ed99a4941f4356aebb0d80e5e9b8e4f87cbb42 assets/byg/models/block/pine/fence.json -7e729228c564f70827c9f81b8c432b994d787ea9 assets/byg/models/block/pine/fence_gate.json -07f5880a1b28c9f19aa64d91539003d542679124 assets/byg/models/block/pine/fence_gate_open.json -c7a129d7c3b086cf7559474d101d1e99c6160ea8 assets/byg/models/block/pine/fence_gate_wall.json -e39c5acf3419fbb329afae4559fa581769bc3dd6 assets/byg/models/block/pine/fence_gate_wall_open.json -80a9ca9407adf3ca7aac87ebee512d494bbee27d assets/byg/models/block/pine/fence_inv.json -69ca360a8316da955ae88211a472393c96f86a98 assets/byg/models/block/pine/fence_post.json -ec602439e995c63d80924644c23aa19fc81c8158 assets/byg/models/block/pine/grower_item.json -bd34b6f3022776ef3d75472516b9f0835c3b5603 assets/byg/models/block/pine/leaves.json -a2cc2b1edc2c73dbb187da6cd99837fd395b3b2e assets/byg/models/block/pine/leaves_snowy.json -1056173174feb8e341342e7b784bde308469160c assets/byg/models/block/pine/log.json -c99cab0d28edb569e7fcfbb9b56cf7a4ab51064b assets/byg/models/block/pine/planks.json -cc0cdb399f2c802974c48778050a82885f8ca1f5 assets/byg/models/block/pine/potted_grower_item.json -f9a1b1e75e4b5df2eb03d5398628a56ba87a4d9d assets/byg/models/block/pine/pressure_plate.json -c5639b72db2422b06d8915dfd3b855a304a514e7 assets/byg/models/block/pine/pressure_plate_down.json -791429c2d0f85c0694bbbaa3658a786481cd54b9 assets/byg/models/block/pine/sign.json -85c94add76039124b8d533d863ff79031f2ea525 assets/byg/models/block/pine/slab.json -4441b7ca282312f4f1a5f0e2591c9503f70d3386 assets/byg/models/block/pine/slab_top.json -6bcb7022cf360abd33f662d10374f81ee0ead557 assets/byg/models/block/pine/stairs.json -48cb58088cc67a85019bf10aa6519bb4a580a061 assets/byg/models/block/pine/stairs_inner.json -d9150073be35eb509213cf92e71e88edb268252b assets/byg/models/block/pine/stairs_outer.json -247315f1bb16240dad01a8fd55da1ef6151b9823 assets/byg/models/block/pine/stripped_log.json -9ca78752ac2794846b6877b2bd1175c5f2abbce7 assets/byg/models/block/pine/stripped_wood.json -26612a52df17b7a3b0faa99f7f0b5617838d4c4d assets/byg/models/block/pine/trapdoor_bottom.json -6b20555505980dcbfd39584ef029883c26be7d17 assets/byg/models/block/pine/trapdoor_open.json -bf660b7bbf0f0590d50da4fe652b3781b102068d assets/byg/models/block/pine/trapdoor_top.json -83538082034a242e4ce03c5acafca4bb0b3eb085 assets/byg/models/block/pine/wood.json -fc6b85bea6163bce40ec11b113f2809f53e03890 assets/byg/models/block/rainbow_eucalyptus/bookshelf.json -6b68e76b2c0b735cc7279ea51dbf6c89ca957d05 assets/byg/models/block/rainbow_eucalyptus/button.json -921c3eded354e901eb874b87e06f6cf391675be5 assets/byg/models/block/rainbow_eucalyptus/button_inventory.json -476c1ae6f1343b418bdd37ce2579a3d85a137bd5 assets/byg/models/block/rainbow_eucalyptus/button_pressed.json -41fb848723f32a32b8358f087b4106135a69346e assets/byg/models/block/rainbow_eucalyptus/crafting_table.json -55a28e75ef5802541959269ad014ef63c8b6aeb4 assets/byg/models/block/rainbow_eucalyptus/door_bottom.json -1e9060114cd8a83ac61dea10f650cb5f423d4b4c assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json -6289605a604c6c01596e1fa18e3ccc54d852bd9e assets/byg/models/block/rainbow_eucalyptus/door_top.json -60a12db60b18342b68778dadca1df7ac8a25ba84 assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json -43d99dcc5ea8a5057295a5db949068e3db195e9d assets/byg/models/block/rainbow_eucalyptus/fence.json -9288df40c561670d4b2759dd7d8bcc3fead8cca5 assets/byg/models/block/rainbow_eucalyptus/fence_gate.json -d4ce9dc4f614b515b82a14abd94cad7d450f241b assets/byg/models/block/rainbow_eucalyptus/fence_gate_open.json -6c4c071fca6879f7d9bec24dc9963eccdebe614d assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall.json -935c6228a9c3e7754852486dcbdafcc663e2cb78 assets/byg/models/block/rainbow_eucalyptus/fence_gate_wall_open.json -015cb261df5eb515c8b38dab404aed1d5d2810bf assets/byg/models/block/rainbow_eucalyptus/fence_inv.json -942bb6841d7eda5e4d9b9de7473c06fc39848d1d assets/byg/models/block/rainbow_eucalyptus/fence_post.json -fdcad5fbaf61b6afb60d96aa24163af95f196a6c assets/byg/models/block/rainbow_eucalyptus/grower_item.json -e7c08f3941e74a9e16a3a069732b9c92f13da6ea assets/byg/models/block/rainbow_eucalyptus/leaves.json -6e44d3e23b6fe711c82aaefd8101397305e0d032 assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json -625555feb0a745ac4037afc66929885988008296 assets/byg/models/block/rainbow_eucalyptus/log.json -d13948e62ac414d46208e114c84a3b223ddc1048 assets/byg/models/block/rainbow_eucalyptus/planks.json -fae1765c740be6f7d833a0b8d5ba0c7a48d51f8e assets/byg/models/block/rainbow_eucalyptus/potted_grower_item.json -790b4249c297b7d8d893ba076f550b6364aaeadd assets/byg/models/block/rainbow_eucalyptus/pressure_plate.json -3eba8300da3b54415678dc051ef495c1057f59e9 assets/byg/models/block/rainbow_eucalyptus/pressure_plate_down.json -17e9a839eb43f6dd3bc8b11060114e9aaaf52b65 assets/byg/models/block/rainbow_eucalyptus/sign.json -92df78f84617c95fd91993f0689351dea799284c assets/byg/models/block/rainbow_eucalyptus/slab.json -dc2d6a466adb3322f3a8e5569eb37a46841413e9 assets/byg/models/block/rainbow_eucalyptus/slab_top.json -770f556efe82f8aece831f7fea6941c217f78b25 assets/byg/models/block/rainbow_eucalyptus/stairs.json -28c9c8c34a27779e44b6af6315da4a1ba98e03e4 assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json -b57828f7441725fd3138a192d46e429e90f0d9b2 assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json -7b70e44b06d85c7e328ac7f9ed65a8f1766a993f assets/byg/models/block/rainbow_eucalyptus/stripped_log.json -76a8e3a0242e2d5f010db04ab88d12cafb2e3e56 assets/byg/models/block/rainbow_eucalyptus/stripped_wood.json -d957291f73a03ab141686ec524c9075affc0e159 assets/byg/models/block/rainbow_eucalyptus/trapdoor_bottom.json -0e339b867aa9d1346515dd4563e5f6571fee0289 assets/byg/models/block/rainbow_eucalyptus/trapdoor_open.json -9e5bbaf520d42d9ebc00d51ca9857d5f357ff751 assets/byg/models/block/rainbow_eucalyptus/trapdoor_top.json -4d1db3cbc836b0682fefe852506eb3a71d656935 assets/byg/models/block/rainbow_eucalyptus/wood.json -0e5dc61a6bee3d6446e9c5501932b49a4b9a3bed assets/byg/models/block/redwood/bookshelf.json -62597a4689ed82c8a93e186eb107e46e19051840 assets/byg/models/block/redwood/button.json -4a5ab3e7e74a2d88ae6676063882a95e2a45b000 assets/byg/models/block/redwood/button_inventory.json -fc7994c04aa8427a9652953c032b64bc12e82f76 assets/byg/models/block/redwood/button_pressed.json -7da2f476a6c7898698ebcb03b3847691e173cba7 assets/byg/models/block/redwood/crafting_table.json -669aca11efff0e53c3bc87524fdae718a71fe912 assets/byg/models/block/redwood/door_bottom.json -2c769b92b827f3965708f24fa7100fa8288ae1e1 assets/byg/models/block/redwood/door_bottom_hinge.json -0bdef1d9d524efae43cb96b9cb7170b605d596d2 assets/byg/models/block/redwood/door_top.json -1dae3cdc089866fb878ddad8319dd7558f370e4b assets/byg/models/block/redwood/door_top_hinge.json -d0d3c2d38448d3a14e7dc276eb93573ec586fb23 assets/byg/models/block/redwood/fence.json -8b540d87647683815dafd3853059428c67290e3f assets/byg/models/block/redwood/fence_gate.json -44d9222a5894c9f412dc53223bd730bfdec10b52 assets/byg/models/block/redwood/fence_gate_open.json -48c9f09b557644b9a477eeb81a046a5a294ee3d2 assets/byg/models/block/redwood/fence_gate_wall.json -b9445a01055c5ef5758f6fd64463c5ac3a74c751 assets/byg/models/block/redwood/fence_gate_wall_open.json -e795542472cf9752cf492bc3706572fd203356c0 assets/byg/models/block/redwood/fence_inv.json -7558b37a188383d3534b88483d565795d635038f assets/byg/models/block/redwood/fence_post.json -9c9cceb3724a609ea3b4fc4b5074ac1465a49fb9 assets/byg/models/block/redwood/grower_item.json -d88fbfc57bef37e1e7d9bde795d732f9149daed2 assets/byg/models/block/redwood/leaves.json -7e0a42bfeaaa27446d5a985dfbb224293ded0a10 assets/byg/models/block/redwood/leaves_snowy.json -48a3e474de1fcefb0a1a77234a95f64a502d3c0e assets/byg/models/block/redwood/log.json -bb3ebb55ed613c372c05c64cdec881ad0cb74b3d assets/byg/models/block/redwood/planks.json -7adb01da371ce28348d8a49c5f4935a3cae77481 assets/byg/models/block/redwood/potted_grower_item.json -861d9dc4071f590543890ffc44588eb09106b36a assets/byg/models/block/redwood/pressure_plate.json -77da2cac360d8c6175c37a6b785493305f15c793 assets/byg/models/block/redwood/pressure_plate_down.json -254f3e95c7866c71ae44c0b62e1d4b50cdae1609 assets/byg/models/block/redwood/sign.json -15e4ffcc05ad3522c2486b1be63cf328bd3bafb5 assets/byg/models/block/redwood/slab.json -e2ac3f180cac701f5754a63cd140b73a5fe152a7 assets/byg/models/block/redwood/slab_top.json -3e20d8d44b26a20ae4bf256ceb0e28b5930bbbd3 assets/byg/models/block/redwood/stairs.json -20d8e4c21c80aa24cc61f27bfa1444e90d054417 assets/byg/models/block/redwood/stairs_inner.json -1c8659d7db7b60c6e01a66ae5e84bbea17b3ca97 assets/byg/models/block/redwood/stairs_outer.json -d24b712b8eb17c4834d12ee9cf1516823151cf51 assets/byg/models/block/redwood/stripped_log.json -a1b1d64d36cf817b36611e323b42d2750b053bba assets/byg/models/block/redwood/stripped_wood.json -9a9cde020b938a575dddb0fc4473fdcb1ad0eb2b assets/byg/models/block/redwood/trapdoor_bottom.json -c5fc0a24261e0b5c4a8bf1c603136656d830a7c4 assets/byg/models/block/redwood/trapdoor_open.json -304d366d10f68c3e64c2e3a0be1c03d734a9e278 assets/byg/models/block/redwood/trapdoor_top.json -b92686745b20a33080cb669a5d23b8e8e0b4915c assets/byg/models/block/redwood/wood.json -9ea6888335568e65263832db5e81b8ca10fbcfa1 assets/byg/models/block/skyris/bookshelf.json -f5f56106de555ffebf7448b2d5743e29df77d930 assets/byg/models/block/skyris/button.json -5bd0ea67342c68603f2e41f1e104fd4c3c4902fc assets/byg/models/block/skyris/button_inventory.json -2717bb30ab8de6264c7c62cb6e2e917ca30a350b assets/byg/models/block/skyris/button_pressed.json -2a4fd33a62663eff2182c96f01a1baed930739d1 assets/byg/models/block/skyris/crafting_table.json -fc56ef7dd0db6406a1e1ff5d10763f1e856c630b assets/byg/models/block/skyris/door_bottom.json -63005fddb8d650fd9472d38991ac6f8b08f719ec assets/byg/models/block/skyris/door_bottom_hinge.json -5ad0e1a8e212dbb33d8fb2e0bcddbd029779b6aa assets/byg/models/block/skyris/door_top.json -e2cb06bb38b4b27271a2b78e2e61e0152cea16cc assets/byg/models/block/skyris/door_top_hinge.json -edf211fff12478c2100ec3b98a9d8f5485951ebf assets/byg/models/block/skyris/fence.json -3992f292eb209cc9425a69e3efb4ed0629544af4 assets/byg/models/block/skyris/fence_gate.json -8dc8f4bb379bdc160b74eb61fb5b6f32a923854b assets/byg/models/block/skyris/fence_gate_open.json -7cddc031f8b955e92f7b2b62cd133e156c3068dc assets/byg/models/block/skyris/fence_gate_wall.json -cebd3cdb7a737aa64ebcffae46be68b539b350e0 assets/byg/models/block/skyris/fence_gate_wall_open.json -7a74fc6f4a2b5d8959c49db3857e0c574cf2457e assets/byg/models/block/skyris/fence_inv.json -d0bf673675e384988067fb2ca054b18c1bd5b13c assets/byg/models/block/skyris/fence_post.json -a4ac8a8eaa8928abab08bf6f6a437cfc0d67e01d assets/byg/models/block/skyris/grower_item.json -965b2a5455b43f79be311942528a37899c172291 assets/byg/models/block/skyris/leaves.json -192bb0f3e8b490e4ecd5b5f754fb005e04b0bc2f assets/byg/models/block/skyris/leaves_snowy.json -bcd28d83aa6744ef566a364bb36f7bfa7376faa9 assets/byg/models/block/skyris/log.json -e9ad55913d8b69f5ac6c9d5b22e8585b0b61eaa5 assets/byg/models/block/skyris/planks.json -b6fed392982074dc8d55c240beb7c719c8cace75 assets/byg/models/block/skyris/potted_grower_item.json -5aa4c75ece49a325df983f690d3bb57960fdc9a2 assets/byg/models/block/skyris/pressure_plate.json -914a496841df359078acf40d0b3458393979a46d assets/byg/models/block/skyris/pressure_plate_down.json -3edef3a22b5feb4d998a0f41be6e610b3d151123 assets/byg/models/block/skyris/sign.json -16431bd21ba37faceba9182b072ba513570499d5 assets/byg/models/block/skyris/slab.json -706d04c4738ee1a466a12832ea71edf93f33c651 assets/byg/models/block/skyris/slab_top.json -d3ed80f613890d5830584cc9057252980c544bee assets/byg/models/block/skyris/stairs.json -3da2b9d02e8bf5fd5cd61e9eac37eed3c44431c5 assets/byg/models/block/skyris/stairs_inner.json -67e6822dd2cd9ff3eeb64ddc2eab8b2e23446ec8 assets/byg/models/block/skyris/stairs_outer.json -af9040693f0f02e9dfa536bf37a8ddc473f2a09b assets/byg/models/block/skyris/stripped_log.json -6e6b4bf6195a05979601aaffe41330c7a4abe8a8 assets/byg/models/block/skyris/stripped_wood.json -a2cfcf7bb008ba34fcd24aa3f6d2bb60439675fc assets/byg/models/block/skyris/trapdoor_bottom.json -f8c761485fe1ddd4db3b99c4f7cf183b2ff1cd1a assets/byg/models/block/skyris/trapdoor_open.json -718bfcda46c14e1067099c273005579c4a6d3f93 assets/byg/models/block/skyris/trapdoor_top.json -bd7e271b11667ca274c3dcae59cdd28830dc722d assets/byg/models/block/skyris/wood.json -f609435c668bc7df2b4629289101e1c3f38641e0 assets/byg/models/block/sythian/bookshelf.json -35767dee2ac8093d6860bfb48a4c665b9adfbd26 assets/byg/models/block/sythian/button.json -d053689fb4513489f8f1ebcb7f0c24d13001530c assets/byg/models/block/sythian/button_inventory.json -6af9a2372487e6689cd96525ec76b5d42e40b961 assets/byg/models/block/sythian/button_pressed.json -4b6afe0de91bbe56b8844d8bae7d7eaa4f924e69 assets/byg/models/block/sythian/crafting_table.json -4b8ee4e134914edc1fa2bba8286287228a1467e8 assets/byg/models/block/sythian/door_bottom.json -52fe8d461b9cc9c26fe35222ba5feac9b122f0c9 assets/byg/models/block/sythian/door_bottom_hinge.json -8b280bdaab142ef23553dfb2cd0f7de155ed42f3 assets/byg/models/block/sythian/door_top.json -e0aae6d183e126c13e240ab9beccba93894ee3c6 assets/byg/models/block/sythian/door_top_hinge.json -6ebd4789bed71d54a8585152887d5c37dc61194e assets/byg/models/block/sythian/fence.json -eb16ce7bf5d643faad41e10426a8aad9c6890964 assets/byg/models/block/sythian/fence_gate.json -6592c226abb3df359ce235656daf152d6304bd7a assets/byg/models/block/sythian/fence_gate_open.json -713d4d6b47fb4347a987498825441f546c21b60f assets/byg/models/block/sythian/fence_gate_wall.json -d851529253a077698465aea91d4c5c0f543f9a6e assets/byg/models/block/sythian/fence_gate_wall_open.json -5f018cd797232f7108eaa89edaf52d87ee62d661 assets/byg/models/block/sythian/fence_inv.json -c52bc83170ce1da40740286d513fde0c86f39654 assets/byg/models/block/sythian/fence_post.json -474b96982097f737c00ae889033e4acf46e35c8d assets/byg/models/block/sythian/grower_item.json -e9c5d8407b2e5c7a473bbb1a916bd35cd3c43407 assets/byg/models/block/sythian/leaves.json -d7487e5fb582e7d48328d29ab7977219147c4857 assets/byg/models/block/sythian/leaves_snowy.json -ff337b115b474c3a8c8b4d6dc2aa8f3568e71d2e assets/byg/models/block/sythian/log.json -560cb6f859f056369ba030379dc5e887c910f832 assets/byg/models/block/sythian/planks.json -0cc3cbc787d1e3f291e648a82f6e4cd33cb8dcea assets/byg/models/block/sythian/potted_grower_item.json -a2ca9f484ae49db9f5aef858a248e00adcb9fdc2 assets/byg/models/block/sythian/pressure_plate.json -efcb96e91be1632af3f7d673c23ad6bb88fb8764 assets/byg/models/block/sythian/pressure_plate_down.json -c6def3e88527c9c427fbec5c5c716e82627830ba assets/byg/models/block/sythian/sign.json -b32f3bb03f67f61c9b4b90e62ad6d91c7bedb139 assets/byg/models/block/sythian/slab.json -1f8825b8ed8f6534c2e6b2f2dec5570e0919acb2 assets/byg/models/block/sythian/slab_top.json -d5321722d9a7b0a48a83eedbb6e47040862cb889 assets/byg/models/block/sythian/stairs.json -fae89cf926080190113b2b388ec15d9f6cbd210b assets/byg/models/block/sythian/stairs_inner.json -6361ceda50b4328315d992e248368cc65da42cae assets/byg/models/block/sythian/stairs_outer.json -379c6cfb5a35f0d79acc384f95b129be8e392c4d assets/byg/models/block/sythian/stripped_log.json -6487e298a7254dad1b8fcdbe91f941844819731e assets/byg/models/block/sythian/stripped_wood.json -43e7b7b4d79fb9634d34473711092bfdeb1f916c assets/byg/models/block/sythian/trapdoor_bottom.json -bdf701686c9f92e84f27c756a65efff5d0144d8f assets/byg/models/block/sythian/trapdoor_open.json -3f31fb04e431956d3f6c05358a262621a2a301e9 assets/byg/models/block/sythian/trapdoor_top.json -64e57c8c9552cd26c7311c41db04f51d9394b759 assets/byg/models/block/sythian/wood.json -ce80e9118013200e66d532e869d8bd249cb1b8ec assets/byg/models/block/willow/bookshelf.json -26bd534315d6f49619fd4388fd0d72a81678c85c assets/byg/models/block/willow/button.json -2febb5a4bc0e0bdc4cf65b5cea798a66e2c689cd assets/byg/models/block/willow/button_inventory.json -3808bdaa9e533368754057c0a57f9326648470ae assets/byg/models/block/willow/button_pressed.json -df258b499d6d218de285d77bfea54b6fdd0f3232 assets/byg/models/block/willow/crafting_table.json -29f69671719975515e1bfb601d114b8eb441f398 assets/byg/models/block/willow/door_bottom.json -284b695e83aacb6e14aa738ed8b1f1b8572047cb assets/byg/models/block/willow/door_bottom_hinge.json -02c84d5f5c0c25ed13d4a0d5b5592b7c882dd16d assets/byg/models/block/willow/door_top.json -54cba9a43f22a6bd842f17baa76cc518dadd04cd assets/byg/models/block/willow/door_top_hinge.json -ab254ed8b8ee500ea9a643152e9437864274dc08 assets/byg/models/block/willow/fence.json -982436fb978a70f47e2e74d40f1747a598030846 assets/byg/models/block/willow/fence_gate.json -9bf199fc5b5c09bc6dcd07c55daeab84ccc99d50 assets/byg/models/block/willow/fence_gate_open.json -38426261cbef23ffc84241073daa615f14cf5958 assets/byg/models/block/willow/fence_gate_wall.json -21aed1e945f984af538f8070948e21a7b07cb662 assets/byg/models/block/willow/fence_gate_wall_open.json -10bf9b4a419147e792d4156dcd285111e8935048 assets/byg/models/block/willow/fence_inv.json -8799c88ebdb1f508f86f62b77a244e01e87a6b46 assets/byg/models/block/willow/fence_post.json -5e5afb7a3890d8f48d5e23a2c87b1188619506c8 assets/byg/models/block/willow/grower_item.json -c5fb5e63e5e076a5b7a5b8f9ea524b604815a78f assets/byg/models/block/willow/leaves.json -1301c5e2999f537a044d5111e5e8a7cd7722173b assets/byg/models/block/willow/leaves_snowy.json -feac0b2ff67fbfc5a7e6db13829acf57fec39f5a assets/byg/models/block/willow/log.json -9ec37312d1e64d6921417500edc74171330e4253 assets/byg/models/block/willow/planks.json -683734056c24860ada4f2e9a1a29d31772e42a3e assets/byg/models/block/willow/potted_grower_item.json -a792ac13a4ff8673d6da1efbaef9502337887236 assets/byg/models/block/willow/pressure_plate.json -f86b9b5f611d5a5833ab40d32752f704e75e8c61 assets/byg/models/block/willow/pressure_plate_down.json -d1ce2de46f5340589926696a51435cbc9609c3a0 assets/byg/models/block/willow/sign.json -c451ec6b5682d7f358994d02b496fb2457a09207 assets/byg/models/block/willow/slab.json -a8cd96ef4db07698687493aa5a643b2be51b1ced assets/byg/models/block/willow/slab_top.json -5c58b009e7b933a978784bf64e309c37020c52b2 assets/byg/models/block/willow/stairs.json -36c8ed21c916724d472c27c8bcba3fc04f1ab613 assets/byg/models/block/willow/stairs_inner.json -87b1013ab54b467e3de04f961bf90edec6a88042 assets/byg/models/block/willow/stairs_outer.json -ab687571198ebfe95437d9a7ca9bfa92bb52fbe8 assets/byg/models/block/willow/stripped_log.json -ecccd0297dae87e55fb0581341059f43e22b59e9 assets/byg/models/block/willow/stripped_wood.json -a9d4c98f65f333f4b644724ef23aee3d39cee3dd assets/byg/models/block/willow/trapdoor_bottom.json -bafd010c91e98b5d4abb2bf5e5ad58dddec6da54 assets/byg/models/block/willow/trapdoor_open.json -eea8e81a8e46a407ab529f289e23f35f518d6cb1 assets/byg/models/block/willow/trapdoor_top.json -48594802914937e97f96bd10e136561e89b4767e assets/byg/models/block/willow/wood.json -bc45417c620440c2f7254065312783e86728f486 assets/byg/models/block/witch_hazel/bookshelf.json -f6c16fa1fb634538da55ac73a6b2c2aee73d8fbb assets/byg/models/block/witch_hazel/button.json -1c23dc9498629d724641837effb1011080f56167 assets/byg/models/block/witch_hazel/button_inventory.json -a03373fc37a3c06ad52f489015de96c5ff04db4c assets/byg/models/block/witch_hazel/button_pressed.json -adaad4fd3577891198b3b0e5d921a728ca77dc0c assets/byg/models/block/witch_hazel/crafting_table.json -324d430498c855ccff09fda9a1f29779f9374543 assets/byg/models/block/witch_hazel/door_bottom.json -7bd71f5d7645af883ab9cdc24d3609c7a6590b02 assets/byg/models/block/witch_hazel/door_bottom_hinge.json -62ad094d8953e251431cd031527155afb2f5bb3d assets/byg/models/block/witch_hazel/door_top.json -37ed8b791711cb32d71cee976e7d7d0cc37d07e4 assets/byg/models/block/witch_hazel/door_top_hinge.json -4730178a0c9e8b639f5d5c529480c8a133ef0a2c assets/byg/models/block/witch_hazel/fence.json -4a2ed118ac0d20b440b41ac6d4e115061ec26bb1 assets/byg/models/block/witch_hazel/fence_gate.json -f1451d64a7092c39582be1f9067ac2ec31a2746f assets/byg/models/block/witch_hazel/fence_gate_open.json -15bf64b70e942f07636701e027037755038b1cf8 assets/byg/models/block/witch_hazel/fence_gate_wall.json -c0e1f1335039334bf52f0e97f23e4ac133d5b74e assets/byg/models/block/witch_hazel/fence_gate_wall_open.json -2bc9cf3284f9c3881ebc5dd7352e2020ff12cf00 assets/byg/models/block/witch_hazel/fence_inv.json -6065975d5c2136efc85bec1ccb75651e55a9cbb8 assets/byg/models/block/witch_hazel/fence_post.json -90c0b9e7082cc7e8f34f66035f76ad78d38db60b assets/byg/models/block/witch_hazel/grower_item.json -bee9431e8675056a8eb16e64e61f0134e5c18af0 assets/byg/models/block/witch_hazel/leaves.json -63e8e8531d90ab450275f3170dfa414353a42bf4 assets/byg/models/block/witch_hazel/leaves_snowy.json -2d4d8b8a6a14cc280d4e3fe57a43657d3a52cd96 assets/byg/models/block/witch_hazel/log.json -02de0b41a02a93dafa542e2fa4764f2c66b5f8f1 assets/byg/models/block/witch_hazel/planks.json -782fc93a0a7973cf7be650f47e1d779693fb8b62 assets/byg/models/block/witch_hazel/potted_grower_item.json -c313a30572d7f13e67b72e54a6ddab2c99c6acbb assets/byg/models/block/witch_hazel/pressure_plate.json -6fe041a932e5200da73db3bcbed5dff8d9ad7c6c assets/byg/models/block/witch_hazel/pressure_plate_down.json -8582afbd0845c3318b5f4c18049cc9f6863f5b21 assets/byg/models/block/witch_hazel/sign.json -0674f0ad27ac6b8a8a52909fc9bfeff01933c79c assets/byg/models/block/witch_hazel/slab.json -22d6e82975e62c5b4459ccf2d3d24e459d7a1fa3 assets/byg/models/block/witch_hazel/slab_top.json -334718206820ba5730ad12f9676df1b1eb072cfd assets/byg/models/block/witch_hazel/stairs.json -48fae63331777725f1bb94b478f2f351cd97f9ca assets/byg/models/block/witch_hazel/stairs_inner.json -249fdd1e2148ee5330b0a950b0e4972b82b47853 assets/byg/models/block/witch_hazel/stairs_outer.json -e33216927e9498cad7077b8addf05a62e00370fd assets/byg/models/block/witch_hazel/stripped_log.json -de970385fdad67acf439f77049948149e164bc4b assets/byg/models/block/witch_hazel/stripped_wood.json -2c4c660fa225986d8826f7e282eff588d4b1101c assets/byg/models/block/witch_hazel/trapdoor_bottom.json -8d2e5c3f8d523a99dc0a514124d5c57e952a2c16 assets/byg/models/block/witch_hazel/trapdoor_open.json -f655421c46282f56f4391129b6a092796c60ef8b assets/byg/models/block/witch_hazel/trapdoor_top.json -abbecc266513275fe07c9da9414768ec7317c0d2 assets/byg/models/block/witch_hazel/wood.json -061fce9a782781f733567363590edc04cf164d46 assets/byg/models/block/zelkova/bookshelf.json -08cef593cf20d9202a630e08f9d4fffe649dbf34 assets/byg/models/block/zelkova/button.json -0bd0b1dcfef2d9be2ab7ac69cf72865118447ffe assets/byg/models/block/zelkova/button_inventory.json -07dbb98ea1e165dc1bd0b9e658d135f957f6a644 assets/byg/models/block/zelkova/button_pressed.json -e94f133773a11276377d6f54a7345d97e9b6f757 assets/byg/models/block/zelkova/crafting_table.json -18a63dccf6ddc0d031f922d2a2bca5f0c95680fe assets/byg/models/block/zelkova/door_bottom.json -8a2d99d8313ae02af77cd38d2c775b38e6c167fe assets/byg/models/block/zelkova/door_bottom_hinge.json -df084f24d6003ab9a77f3cacd8367d41495ca082 assets/byg/models/block/zelkova/door_top.json -fb37012a3c6ad454ecc5cd530ab838c840c1d58f assets/byg/models/block/zelkova/door_top_hinge.json -6d5aa8f76cfd3a4900bda86f7437e7469b48220f assets/byg/models/block/zelkova/fence.json -996e3dfe4c2b56b84b046bd79fd65e4b2b302c01 assets/byg/models/block/zelkova/fence_gate.json -ad1adc3e30e9b0ff25b5fe9a89b15e0f2be2f6db assets/byg/models/block/zelkova/fence_gate_open.json -6c5dde7889eec48d2ee39f8206b53a675c268b38 assets/byg/models/block/zelkova/fence_gate_wall.json -7f18a04c6385aa5d1240da7055902c405db011d1 assets/byg/models/block/zelkova/fence_gate_wall_open.json -18c9ea64f78c53360d0a35b2e7275380c4a3ddef assets/byg/models/block/zelkova/fence_inv.json -27d92c9201e4b17e28d5cfff614059862227d776 assets/byg/models/block/zelkova/fence_post.json -2f9a2ee25192c73a00f4dce1af55688765b00e04 assets/byg/models/block/zelkova/grower_item.json -619385594f122104d1821b0088316a371e705a9f assets/byg/models/block/zelkova/leaves.json -ef5f55349ca4c1196d94c67884f0035085323a90 assets/byg/models/block/zelkova/leaves_snowy.json -63de24837aa2f58fbd5de80ee4a4e584bdfeabb5 assets/byg/models/block/zelkova/log.json -aeeb64d84bd50fb58c48e64c0b921a7e83d16363 assets/byg/models/block/zelkova/planks.json -28dba0d15b0aa5547ebd0ff4563c61126767a53c assets/byg/models/block/zelkova/potted_grower_item.json -a4c7aa319e522820d079bcbaf0faaea764a7f2ec assets/byg/models/block/zelkova/pressure_plate.json -db7bee9ad1470f8004d6312b37558e63e1806e98 assets/byg/models/block/zelkova/pressure_plate_down.json -b7dfabb50911cfca112511020e923ee92a86615b assets/byg/models/block/zelkova/sign.json -87bc547fc289441746b4a7e4424caee026f6b5d6 assets/byg/models/block/zelkova/slab.json -b4fd33232e23ed2bfaed1ebee0b8cc38dd504ad2 assets/byg/models/block/zelkova/slab_top.json -1b25f295105359b99d88f260504b9f6124e27d20 assets/byg/models/block/zelkova/stairs.json -695136a22be4dbb26f7b78c97c1351e1e32254ac assets/byg/models/block/zelkova/stairs_inner.json -013a773f702d7cdba882d237c4f36cb32657ef28 assets/byg/models/block/zelkova/stairs_outer.json -ff054988ef39777460903aea64b1c3b18a18032f assets/byg/models/block/zelkova/stripped_log.json -c3c4a88adef021e550fb5fc37a89a6e5640fe492 assets/byg/models/block/zelkova/stripped_wood.json -ab1675e50a3e6091219fbe83b79a9e7c5c5f6b1f assets/byg/models/block/zelkova/trapdoor_bottom.json -8f9be3415ad1ddd69d7960b635e06ffaed679d9a assets/byg/models/block/zelkova/trapdoor_open.json -918fff9aa98157ae0666e10d17dc3d22844fe4f2 assets/byg/models/block/zelkova/trapdoor_top.json -8b83de88f16c43627c40020e3984f1e71dca53c1 assets/byg/models/block/zelkova/wood.json -331c6b31986bc80b9a702624d5a58822df914b6f assets/byg/models/item/aspen_boat.json -78f52e95f0fc465129838d53048ca2e39866b9e5 assets/byg/models/item/aspen_bookshelf.json -65fc3d87911c393c9b1b830e2f865bc2b0c70f6f assets/byg/models/item/aspen_button.json -a2848cd275262a16626a23992a1a526914d5c364 assets/byg/models/item/aspen_crafting_table.json -6058b86174918e7a984dce6bae27c57f67849c56 assets/byg/models/item/aspen_door.json -091b7e45d024db5983a83420ff31c340cc5ca3bd assets/byg/models/item/aspen_fence.json -2f14a53284b4dc5f45b3f39f983a8ce521278395 assets/byg/models/item/aspen_fence_gate.json -3ce228e1a16f8cc4b786be2e91f3b1f76d84dc3a assets/byg/models/item/aspen_leaves.json -7a39c1080f30287cf92be5da8bd8fa33081aaa70 assets/byg/models/item/aspen_log.json -8ccbe3930f4887d6a6f89135d2ea345fefd94ac8 assets/byg/models/item/aspen_planks.json -a9afd845f4e771fb6809dc439def5ee35663016e assets/byg/models/item/aspen_pressure_plate.json -0b5ed255f00030cb3ff1df30d8c51d7b6ea9afb6 assets/byg/models/item/aspen_sapling.json -1218b125c3ec876c8d2986607718263a79a6c7b6 assets/byg/models/item/aspen_sign.json -9ce82435d1aa01ba081186b5f538a4872174885a assets/byg/models/item/aspen_slab.json -95e8459211f1b407f8d766e50791cdb84d2d3263 assets/byg/models/item/aspen_stairs.json -0fd309f03497db973cf3e755228da798fa4d2aba assets/byg/models/item/aspen_trapdoor.json -dda37f5ea836cf6231cf342862e02d4c4a8d8e8c assets/byg/models/item/aspen_wood.json -faa6be8a2020e22b2de29ec835066d1acb0b57b8 assets/byg/models/item/baobab_boat.json -bb4f3db5a9e8a066e7aa1a568491a3cfb28c2fd3 assets/byg/models/item/baobab_bookshelf.json -1cd0819f3663876c3742743756bb6647d1ca0b5d assets/byg/models/item/baobab_button.json -e07883a7884f530c5951b56b5799b34e4372e6fb assets/byg/models/item/baobab_crafting_table.json -77e287a34be20212e1e8aa1c68551a0435abac2f assets/byg/models/item/baobab_door.json -21ebb14caa2092f03dc7cb774c91cb925187fb9d assets/byg/models/item/baobab_fence.json -597fa9d8ef960b994f8a7301f46cd5aa8963c6ab assets/byg/models/item/baobab_fence_gate.json -ca67915d4fd002dc7f62d0f988d8d40e77b579fc assets/byg/models/item/baobab_leaves.json -144b98c07b2e021a36fe7d25d686306373fa4722 assets/byg/models/item/baobab_log.json -8e820316436b1e08bf280070058a83f0c9935542 assets/byg/models/item/baobab_planks.json -b4d3db7e509a15c89df124667a7d6c3e5188bdf6 assets/byg/models/item/baobab_pressure_plate.json -50ba87085b69541ad42bb85171ae33cce565c83c assets/byg/models/item/baobab_sapling.json -8345df193b6280a399fa5040f64d64804102421f assets/byg/models/item/baobab_sign.json -4e836fbab8a65cf4d797008c44509f3a19d11c05 assets/byg/models/item/baobab_slab.json -86a5a2e864b31515ecca3a0ae6cc91cf21654fca assets/byg/models/item/baobab_stairs.json -1ef3a60e80a128c9bb42dcc726ab1f17b77c684d assets/byg/models/item/baobab_trapdoor.json -fa0f9ab545363bf6c66eb3431ca6672d4730271a assets/byg/models/item/baobab_wood.json -364ec05acaa6d67f772f0dd7c7d3c6c43981148f assets/byg/models/item/blue_enchanted_boat.json -abc61690d812e1274877796418d2a2de0b596a49 assets/byg/models/item/blue_enchanted_bookshelf.json -9cdf652172d4e90aa597d893adbde9f787a79a98 assets/byg/models/item/blue_enchanted_button.json -587c2b678d69480cbb4f8858d635dcb7db49d2ba assets/byg/models/item/blue_enchanted_crafting_table.json -429b921a774a05b4ef0334e7869b685f468ef6e4 assets/byg/models/item/blue_enchanted_door.json -97d22c372065556efcae9f7f52e1a519375684e3 assets/byg/models/item/blue_enchanted_fence.json -2c769b4c33caf2b05b6e487b47ff5234725aa244 assets/byg/models/item/blue_enchanted_fence_gate.json -1da7b06ab294aed045338db636164d57c6536a74 assets/byg/models/item/blue_enchanted_leaves.json -faa99f2398307b4a01735cd99d327748658a41a4 assets/byg/models/item/blue_enchanted_log.json -43a9b7d1d66e10bec791a24437adb0ac3d5af35a assets/byg/models/item/blue_enchanted_planks.json -f61a7bf218e65808e180608e03e5d58a2dd97954 assets/byg/models/item/blue_enchanted_pressure_plate.json -df6e5276a0b04b4146d38546530cba58bce7fa75 assets/byg/models/item/blue_enchanted_sapling.json -0c45875eba27b5f8ee0fc42d1ff46dabc9198d30 assets/byg/models/item/blue_enchanted_sign.json -994145c6950682114ec3ef589b7be385b4be8869 assets/byg/models/item/blue_enchanted_slab.json -2feab092f5685c98b591642a82c08b0337b9138a assets/byg/models/item/blue_enchanted_stairs.json -39b800e8b7822c45b7e6b58de35baa20fa9c2af6 assets/byg/models/item/blue_enchanted_trapdoor.json -a4cb1f144302e32010a17f914cb275eb062ef5bb assets/byg/models/item/blue_enchanted_wood.json -a7b559f9a1a637fbd7503d1e72c8142951fb8156 assets/byg/models/item/bulbis_bookshelf.json -6426315883ed77300cec1569a91ed6306d3905e9 assets/byg/models/item/bulbis_button.json -490c0fcfd64530bdd65f2a85319c5c6d756e5f6d assets/byg/models/item/bulbis_crafting_table.json -1f076b5c13d20abd1ab142ac7a57dab99a266e56 assets/byg/models/item/bulbis_door.json -0926b8774de634e4672e3302fd2100993e785740 assets/byg/models/item/bulbis_fence.json -8e296f3e0760fb418ac31b1438827e74c1132431 assets/byg/models/item/bulbis_fence_gate.json -661801e3a4ca9353697810a3aa4a81d7b07e00e7 assets/byg/models/item/bulbis_oddity.json -e3c2386fc2317ddcd2c0562c34467002ead1effe assets/byg/models/item/bulbis_planks.json -4a5cf63bfe1d373d6874bb3f95ab015b944680ab assets/byg/models/item/bulbis_pressure_plate.json -3500de8878e264d57b6c802b3284cf1e3443f8ac assets/byg/models/item/bulbis_sign.json -9b0971f59cac0d7eee33f6fe78b69521d8f36158 assets/byg/models/item/bulbis_slab.json -55615375d6153b1f7c7fdb777df2603515ddf6d3 assets/byg/models/item/bulbis_stairs.json -52e3e2ba6a89a7323453178ed0d6be2bc028d05f assets/byg/models/item/bulbis_stem.json -38bee46bfbb50d6a6a7d336c53ae2e4a6f5f6621 assets/byg/models/item/bulbis_trapdoor.json -1a242864eaf20cbf5e2aab37843a9701cdc1032f assets/byg/models/item/bulbis_wood.json -d4502e108d0629141cc53335771ceceffae3d552 assets/byg/models/item/cherry_boat.json -aa216009bf5130342dc1c1043b4c6305d8993657 assets/byg/models/item/cherry_bookshelf.json -d0362947b575dda7555aea3a937ebd68db2b6a6c assets/byg/models/item/cherry_button.json -24d37586ac1ef398b0ab6687512ea2c74e9c177a assets/byg/models/item/cherry_crafting_table.json -6701e69fee961fa3cafe3637ab9252d1d691c5fb assets/byg/models/item/cherry_door.json -41f96c0a00f9751b8858b1417c37ec85a0a35814 assets/byg/models/item/cherry_fence.json -2ca0508ae3f011ab0875c258d9dd0a004b64cd8b assets/byg/models/item/cherry_fence_gate.json -5ca5c2026070205afd31d849c4882b94bb44d141 assets/byg/models/item/cherry_log.json -ed80d846b315f4eb21aa2a4fc3a5b584ffa4107d assets/byg/models/item/cherry_planks.json -2cae4e8da59f8d5cb192c6c772200b5b61b946ec assets/byg/models/item/cherry_pressure_plate.json -f0c423dbf72eec80a5d1dd73a07af608e49a8281 assets/byg/models/item/cherry_sign.json -767d86f6a59dd9fc0c6af5a89bda1c752343858b assets/byg/models/item/cherry_slab.json -5c51b95d93aae080bb940eb3ae98743bc259bf75 assets/byg/models/item/cherry_stairs.json -c73e19e98c8f9b1c36b7ed2ecf8bb148098e2863 assets/byg/models/item/cherry_trapdoor.json -c8811da3eda623268e3729042d2ef660fca8118d assets/byg/models/item/cherry_wood.json -50009b1b8338fa245894386cd307a1483260902c assets/byg/models/item/cika_boat.json -2f7c754b022ebf678f21c93d676476a75e27c7dc assets/byg/models/item/cika_bookshelf.json -99756216992f19a473bbb8cb29a5a91f63b075b1 assets/byg/models/item/cika_button.json -660fb89002d646500260d1200f121988d4b3d4f8 assets/byg/models/item/cika_crafting_table.json -5ab0f9e30bea28148174a3bbb3c193711dfd1fa9 assets/byg/models/item/cika_door.json -765eff152076daddcac2db0bdae864dd18755121 assets/byg/models/item/cika_fence.json -562ce18f1061a4c17db837b81425a2eec253c2c7 assets/byg/models/item/cika_fence_gate.json -b9f6e475b63f3a86395d511576c0c8262c41fe10 assets/byg/models/item/cika_leaves.json -491c04a3ab103dadfe75225b655cbd36d7940dfa assets/byg/models/item/cika_log.json -f4a01a1c2d74b1d2780e80597f51b506693a7632 assets/byg/models/item/cika_planks.json -af6cb0377220ef4d0b316926cd49c90cdf14b4fe assets/byg/models/item/cika_pressure_plate.json -b1fbf364db542513285aa4a7cd55c1f4eafd96d1 assets/byg/models/item/cika_sapling.json -7c3b6dcfb2676daf2a1d9ebb61d4ef32576988dc assets/byg/models/item/cika_sign.json -a6b01df5440d0b9cf7eca070fc1cb1ba1ed2883c assets/byg/models/item/cika_slab.json -f2c767f3f01c2fb97a87f737df7a766d41bf3706 assets/byg/models/item/cika_stairs.json -93d532bd0a51aa175f3894777dc35f4bd7335445 assets/byg/models/item/cika_trapdoor.json -0495a6e67a0fc165da574f5535a437fc456ebbbe assets/byg/models/item/cika_wood.json -1115843477e3e39471f26b22717d36f32817cbf4 assets/byg/models/item/cypress_boat.json -c64d221e2469fcc040ca492b5b9e6a37395900a5 assets/byg/models/item/cypress_bookshelf.json -3f78ccf79293769312aac83ae3f2fcb3f6afe976 assets/byg/models/item/cypress_button.json -1a31486948002ca09e6b0ed5b92118e7a109206d assets/byg/models/item/cypress_crafting_table.json -47de2d9214f236ac039c4a62783da8493fb36bb3 assets/byg/models/item/cypress_door.json -800f8f1464f1a3ca07080c6c0c80c7c1155b8dbb assets/byg/models/item/cypress_fence.json -973cdb059784a2eb34f77dea001b9d2b7f8e7ea9 assets/byg/models/item/cypress_fence_gate.json -9cbe70113de8200f2deebbfc5d458be818a4410e assets/byg/models/item/cypress_leaves.json -7a569355989601998d8ad85c4784bfb2d2d71fa3 assets/byg/models/item/cypress_log.json -38acbdb182d2cac8f5a799ea9e1709814b0ffaab assets/byg/models/item/cypress_planks.json -461c62bae2a20c4617eb6c5a8ba4dc6d9f0f98ec assets/byg/models/item/cypress_pressure_plate.json -5b9cec5debe640c2da5fd07465f5b4744a7a0695 assets/byg/models/item/cypress_sapling.json -606801dbe2978e25308ad884f683acf32be18bb1 assets/byg/models/item/cypress_sign.json -fd97e91d95ffde72791e2854c2ed8d57fc1a2a05 assets/byg/models/item/cypress_slab.json -29a69284ab32d4f7358302067d7767c4599ed305 assets/byg/models/item/cypress_stairs.json -beb15f9b3ed6c5309b36bec542ab3b52b21c3e5a assets/byg/models/item/cypress_trapdoor.json -d66247dd97fcae964984c2ab71708db563f3b4f4 assets/byg/models/item/cypress_wood.json -45839da35dac45b1fa019ca536de6cbd2afbce8c assets/byg/models/item/ebony_boat.json -295ee2f6286c2368e71d6690681a82d420559d18 assets/byg/models/item/ebony_bookshelf.json -1e6f24bbdf74b5172d3d25d5f1400ef32a579ea4 assets/byg/models/item/ebony_button.json -3dcf588a9659c90e0839461538c7d5342e28821f assets/byg/models/item/ebony_crafting_table.json -c3fdda9816205904c9e67c08632bbf936878d5cf assets/byg/models/item/ebony_door.json -77659901cc8ab587d051ba8eed0431ee4c9c495a assets/byg/models/item/ebony_fence.json -704318f13d3a73e326587bbf8956e9abc23fe87e assets/byg/models/item/ebony_fence_gate.json -a7552666a20326e57e7e0913ae6dd6659f88a77a assets/byg/models/item/ebony_leaves.json -bede82f15ab2d814bfca0c4062a7eb69790d993d assets/byg/models/item/ebony_log.json -e5a090778ce48ca20d253d99c82a935cbd8cb667 assets/byg/models/item/ebony_planks.json -3d72c90b1547a7dad403430ad53efb00d855174e assets/byg/models/item/ebony_pressure_plate.json -077f9c32aabcf49216b03cb5ea184b0535b856f4 assets/byg/models/item/ebony_sapling.json -46c4074d3e03091b9c13107d08d8d1d91f166d4f assets/byg/models/item/ebony_sign.json -a17baeb374c95959d20c38a1cf14029f189ef6bf assets/byg/models/item/ebony_slab.json -98ed71cba9a3eb5dfbc28430e9e4adba6f120596 assets/byg/models/item/ebony_stairs.json -fe1404a150e445eb5220692cc0ad7898f6f178ee assets/byg/models/item/ebony_trapdoor.json -ee030f03a491ef8d7d845da92ffd106d935d4b6c assets/byg/models/item/ebony_wood.json -2841ca8e8bbc38b5058d0c832c7a23a35d3b7839 assets/byg/models/item/embur_bookshelf.json -d6450f4fd0ce2fe7a31b659129b929b28ff6ff4b assets/byg/models/item/embur_button.json -d191034e27b30671a3e935e988d55d1ec3759da7 assets/byg/models/item/embur_crafting_table.json -b31773b495b434b1390c212dc64cfb9bd465c28d assets/byg/models/item/embur_door.json -a0789a181dc99f7c1c69b1d5df59bb8d71b631c2 assets/byg/models/item/embur_fence.json -35315685e38fd251a84f6786845821bcbeb985c3 assets/byg/models/item/embur_fence_gate.json -6bc1ae48d3839516cc2f66f61c97d6f9d6a0b194 assets/byg/models/item/embur_hyphae.json -1ea72d91c1202c6105450188d3ae00fb5e7d11bd assets/byg/models/item/embur_pedu.json -017edeb29f425654dce2a9d685154cbb78a39c6d assets/byg/models/item/embur_planks.json -99354ff5e260dd8416cc5cb6c1c4abde2bfe1b79 assets/byg/models/item/embur_pressure_plate.json -06e1b341961539a7af7cc6d40d9a3e15c3ae572e assets/byg/models/item/embur_sign.json -28a053a792a97989455294e072af93c91dd01799 assets/byg/models/item/embur_slab.json -de0fe12925ca27d70084852ac3c6ccb4c7d4ed2e assets/byg/models/item/embur_stairs.json -5f1772effcfeb533a5f44759d0bf90a26d8430bb assets/byg/models/item/embur_trapdoor.json -362ff4592e0b862d7b382f567ac0de57b71cfb85 assets/byg/models/item/embur_wart.json -a738b98393a906c3370fc2264d085148d74382a9 assets/byg/models/item/ether_bookshelf.json -0d764181101f212f7cb89c9d1982e08cea89e65a assets/byg/models/item/ether_button.json -bf33776a7202fc417bc0cc4a73f9c2529fc83295 assets/byg/models/item/ether_crafting_table.json -1b5fe275fd8f068048a998cf8e59bb8febdc7b72 assets/byg/models/item/ether_door.json -6c96991ded8536261c1b590f77843da3c2c1ffcc assets/byg/models/item/ether_fence.json -d3b25f93ce5afebe19090c439b042f68a903d1f0 assets/byg/models/item/ether_fence_gate.json -817160672eae7be5b3981c8ce7a783a46c841530 assets/byg/models/item/ether_leaves.json -13b70520358170e237438ae742a0d88f4af77db8 assets/byg/models/item/ether_log.json -f2694503a9059e64da730806ba63d1fa4f4cfbe1 assets/byg/models/item/ether_planks.json -cc9ba8a7a057f3edb876b15530f6b5698a94d628 assets/byg/models/item/ether_pressure_plate.json -d565b9cd6d02a2f5d0ada6f498cb3a2ecad8f2d6 assets/byg/models/item/ether_sapling.json -dc5732d78bb813e2fae84e54e4ce2f568249f57c assets/byg/models/item/ether_sign.json -dc795894c62ad433cebfcbf9591d9c9545a9925a assets/byg/models/item/ether_slab.json -f7a7ea114db3b06c36b122e4c860ac10804945ff assets/byg/models/item/ether_stairs.json -989d66ec3cc5e46576926aad4ada02aab0334ab7 assets/byg/models/item/ether_trapdoor.json -b408c6a95c7acfcc6d351d965d76d4a7c0f7d007 assets/byg/models/item/ether_wood.json -ca2cd2bf18242ac31c980bec455d9b6fb12e8523 assets/byg/models/item/fir_boat.json -aab8154b012e7bb92e26bf940672be14149d9eb6 assets/byg/models/item/fir_bookshelf.json -d8ede5ddc5573fe10b33697e89e7eba8243ebd09 assets/byg/models/item/fir_button.json -fc2bd0fdc8b661517bb6046ba6c6c510414fd518 assets/byg/models/item/fir_crafting_table.json -17cb6978461f5e0b18f37a3ba37394a717c816b7 assets/byg/models/item/fir_door.json -e37f579e49f656009ed5d873e03ab0a313d17873 assets/byg/models/item/fir_fence.json -dd2dea23d868cf956090513edfaa8c00353a0550 assets/byg/models/item/fir_fence_gate.json -2346803c9b4067515f18ca71965000c4c8a2ad0b assets/byg/models/item/fir_leaves.json -5eb6e30de7798c0ef4c4592b762fa6ac62cdee4f assets/byg/models/item/fir_log.json -062a663882fb45967220ab155328abd01f953c01 assets/byg/models/item/fir_planks.json -8639f85022556f339405fb3f0ac66a994d2b40a9 assets/byg/models/item/fir_pressure_plate.json -b3ca097c89198092e4d6933879cec153a980f707 assets/byg/models/item/fir_sapling.json -48d7108c8e8f3f6d17934f10927cd99ff11822aa assets/byg/models/item/fir_sign.json -378ff5a2eb5451b027f4e9b8adfa281edf88d045 assets/byg/models/item/fir_slab.json -4fcf3d712a70e48ec98bdcf5fea15d56644fa306 assets/byg/models/item/fir_stairs.json -74f5b50a204d1ecc2504d8034df10aba2ab22364 assets/byg/models/item/fir_trapdoor.json -ced3e6c7f5220906d5d11da641f1194642b0dba5 assets/byg/models/item/fir_wood.json -c698fcdde72e29eacae6d36b08793e00f7c6ea35 assets/byg/models/item/green_enchanted_boat.json -2c1af4590b2f20540c2cd8f7a4eb564da05138ba assets/byg/models/item/green_enchanted_bookshelf.json -792e5bf60f873773e6da3a8907231c096b4c70f6 assets/byg/models/item/green_enchanted_button.json -9cc14826a44a094931e93a9d0ec49fee8f34d0f8 assets/byg/models/item/green_enchanted_crafting_table.json -ea9952290b491b30fbe263683dcb82e8504256cd assets/byg/models/item/green_enchanted_door.json -792f29a8e76beea62607d469e36c5552c169acc5 assets/byg/models/item/green_enchanted_fence.json -cf9a214f8f431447f301d6a3da4ea1c8ded3014a assets/byg/models/item/green_enchanted_fence_gate.json -4fc0e145707e20f1fd52bc2661e245486cc7a794 assets/byg/models/item/green_enchanted_leaves.json -d82a38272fd002efdc918a1830f365748cd49888 assets/byg/models/item/green_enchanted_log.json -2d3ab24ccb420052a423e89ea780b97468bb7938 assets/byg/models/item/green_enchanted_planks.json -3441740912cb1911af5b77d446703342febfc115 assets/byg/models/item/green_enchanted_pressure_plate.json -ce18a380e57d37ead5cbee1628e5d255313963f5 assets/byg/models/item/green_enchanted_sapling.json -879ae80dfc4c919c8341b300e738db7069f44994 assets/byg/models/item/green_enchanted_sign.json -e4ba9b69838b94276fb3fcb07c14c685bb374827 assets/byg/models/item/green_enchanted_slab.json -ada026c9ece852649aacca39d70428180619426c assets/byg/models/item/green_enchanted_stairs.json -cdb03909df81dff7567395fb921008f79234b647 assets/byg/models/item/green_enchanted_trapdoor.json -35b75f67fed51a6987f7da81d571eeae34f6dda5 assets/byg/models/item/green_enchanted_wood.json -6f09e4719d8ca0c0112d05560df19ff4d10f7011 assets/byg/models/item/holly_boat.json -df5a129c735e07c4e878d452392d8e3872c2a33d assets/byg/models/item/holly_bookshelf.json -a017d4f7f115c6d10b01ee723250ec2ec0532235 assets/byg/models/item/holly_button.json -8ce0421196b97286ba44c49a54fbb7f2bdf09c6e assets/byg/models/item/holly_crafting_table.json -be84506996a338d85a16c7f0e2011a30a9d6b5d3 assets/byg/models/item/holly_door.json -59d208f6124ca14801e20b6d3d58c5e92932de75 assets/byg/models/item/holly_fence.json -38aad837131642a5537e5811902f0bd8811d4bd1 assets/byg/models/item/holly_fence_gate.json -612ca7ce9ac3e0eed46dfc90f4c33f552a751098 assets/byg/models/item/holly_leaves.json -7f6011fcd44e106a8cb7bc380e2054befe56f354 assets/byg/models/item/holly_log.json -e0e40484b94aeac64ace16eacb4529b51c8758c5 assets/byg/models/item/holly_planks.json -49410ad86799caa3a32d98e271b1684e1a124122 assets/byg/models/item/holly_pressure_plate.json -5be333046661c77987e36265af74c7c54bbcf0e2 assets/byg/models/item/holly_sapling.json -5553e46e15812ddabc6c94abd3d96df4c1b53a9a assets/byg/models/item/holly_sign.json -f26a75321b0865a70718812f9896b96aac1b5a3a assets/byg/models/item/holly_slab.json -c59089c2f12b84d35e1bb31670eab2b343402bc3 assets/byg/models/item/holly_stairs.json -e526dc46016919146c7ad66eb02ec9a7cd557206 assets/byg/models/item/holly_trapdoor.json -aece276ad34ec46ae26292fc9c22ca8f790a9d7b assets/byg/models/item/holly_wood.json -1412cd17546a3734a7502ec2751f09e0552f96d9 assets/byg/models/item/imparius_bookshelf.json -cc3e7859a6d025d865a4a5ed2ebcbbb4bc2a9032 assets/byg/models/item/imparius_button.json -a57f0f8de631a3fd2d4a4ed84f06c062a8145571 assets/byg/models/item/imparius_crafting_table.json -183528a8e2e3311099df714a1526622849650ae3 assets/byg/models/item/imparius_door.json -114a60c595d6d5722703872c177b0c9c536bc18b assets/byg/models/item/imparius_fence.json -df3a47f283aa11f3cbb524c2d0efb7464bf66845 assets/byg/models/item/imparius_fence_gate.json -1f65d8c6ad200e87a90f9c4242ea9590e4f35a16 assets/byg/models/item/imparius_hyphae.json -3c2d52bf279e7bb74f599c9bf79f76500368ef5a assets/byg/models/item/imparius_mushroom.json -b154607a7ed1eeac57e787005663d288f4a13d9d assets/byg/models/item/imparius_planks.json -d32408d48a2452905867aab2fdde028e6e0745a8 assets/byg/models/item/imparius_pressure_plate.json -b2a82f9d890a3502b6966c3a9025ed89f10c5094 assets/byg/models/item/imparius_sign.json -510283f55fbde7b474a834f9c15980d776122460 assets/byg/models/item/imparius_slab.json -7c2e6ed840e047cc1c970bd8e1779ccaf985f995 assets/byg/models/item/imparius_stairs.json -151fd55d01e61adac78e427dfdf878cdac332d3f assets/byg/models/item/imparius_stem.json -81e3d3490bab0e3312289497457f116a70a6df38 assets/byg/models/item/imparius_trapdoor.json -a7cedcec33fab5c1f7530e8da7b7921b3de02815 assets/byg/models/item/jacaranda_boat.json -d6cbf44f7b44d96986f2cecc3bf7a9222d51d6a9 assets/byg/models/item/jacaranda_bookshelf.json -8f4537e91025f33fa560c91a09f57a79c0f31ce8 assets/byg/models/item/jacaranda_button.json -20fdaf2f06252da62e1ca3af14c8ef5846b3c2b2 assets/byg/models/item/jacaranda_crafting_table.json -82b1bce72528f527e2a4cd7f48c01505757d4b3d assets/byg/models/item/jacaranda_door.json -2b0f96c4331d67309b26899450eb55c04ae0bef3 assets/byg/models/item/jacaranda_fence.json -d27aff17a3e2ce53827f5a62d78cdf2819debcbc assets/byg/models/item/jacaranda_fence_gate.json -7e55025e16aad27d38b049091dd08e0b3272a422 assets/byg/models/item/jacaranda_leaves.json -0af159134c351cd0d03887dedd1ee39498f3b011 assets/byg/models/item/jacaranda_log.json -98793ff287bcfa5b1eea58ba52e6eb2cf89ab42b assets/byg/models/item/jacaranda_planks.json -a4b891eeec337ebbcd0e3cc4e7d6bf1e6a5a0132 assets/byg/models/item/jacaranda_pressure_plate.json -dcdcc07c8cbca3c5ad973cec28db6e9e7555016e assets/byg/models/item/jacaranda_sapling.json -31b887c724796bd3cec0c3f8b722c5a3bc59a934 assets/byg/models/item/jacaranda_sign.json -5cc496b7d3ea76fc11fc59b8d877c097ee4882b5 assets/byg/models/item/jacaranda_slab.json -91ae49704d5ad331330689daf0fe162f51c16a36 assets/byg/models/item/jacaranda_stairs.json -28da4bad8d1e77950a9ec786e087baf9b640a13b assets/byg/models/item/jacaranda_trapdoor.json -de48c9f0d085b2f0b6aee5dc9e0d1ac26561aa98 assets/byg/models/item/jacaranda_wood.json -43108e292ab8d2c28ba23da265ac49bf56729fed assets/byg/models/item/lament_bookshelf.json -598ed4a3fe2c7505497c0e5b2428b312e6732b2c assets/byg/models/item/lament_button.json -88f5f79cb6cf050ecd80977cbbf3cf076ea1c82d assets/byg/models/item/lament_crafting_table.json -2f7b42edc2b22c1262864242b38fb57c76ffa281 assets/byg/models/item/lament_door.json -ac3287839bbdeeb51a9173a4074cf543fdf23efb assets/byg/models/item/lament_fence.json -6e285f6b28abd308771b2759e28e81602b525495 assets/byg/models/item/lament_fence_gate.json -4355ace4dfc8ea66df194773011cf5a579a019aa assets/byg/models/item/lament_leaves.json -949347e264c857529147333367e7cda58946c520 assets/byg/models/item/lament_log.json -b77f8ae1ffe30e5455f6a87868cc7acc9728f70f assets/byg/models/item/lament_planks.json -6da1a2a9534d5b8b8c351e30e5d7ee7433e6a133 assets/byg/models/item/lament_pressure_plate.json -3e85dec796bfb48231ce63c17f149c30bfefbfa2 assets/byg/models/item/lament_sapling.json -c7f580d861bbf92c9f49b72bc8b8274a1b1ed64b assets/byg/models/item/lament_sign.json -2ecebcec270243c5cdb19de5b197b6ce082a5cfa assets/byg/models/item/lament_slab.json -74bb345d7e6ae8fffec74adebb3a4e050be6c7da assets/byg/models/item/lament_stairs.json -3cae05d0760d2dccd3f05f9fc93d51e2264fb18c assets/byg/models/item/lament_trapdoor.json -dffe613c195c22f6e17c256b68156c0a74658dea assets/byg/models/item/lament_wood.json -308fdc52954271202cfea5bc7f66e6beb13dd522 assets/byg/models/item/mahogany_boat.json -4492809fcab159e80ab32cdf5ff1b3908836bcb6 assets/byg/models/item/mahogany_bookshelf.json -3675d5f1aae8ed09bb152beab640fcb5d3a82f38 assets/byg/models/item/mahogany_button.json -df0559cf08d0846d1b12afac67fbfbfd5fca75df assets/byg/models/item/mahogany_crafting_table.json -21ccb7bee6299a30f579e3c0c6fafca1114af0e1 assets/byg/models/item/mahogany_door.json -6ef5d3639b6c655adbd810bddee9e9ae5275cd6d assets/byg/models/item/mahogany_fence.json -5f51431cc433d64c0b4d0b206cb129163edcfcb8 assets/byg/models/item/mahogany_fence_gate.json -00e4852d45d15459268105e1fedb6e830d407350 assets/byg/models/item/mahogany_leaves.json -6a1f064204a70d8c7e17ba359e95ce8a29d52efa assets/byg/models/item/mahogany_log.json -1517b68ab0172d3e39d1a86464016fdb611d0850 assets/byg/models/item/mahogany_planks.json -af307f8aa6295fb81982c254ce4d15503f579b95 assets/byg/models/item/mahogany_pressure_plate.json -d274bb65e5894078164344c25fc85f2a7ea994a4 assets/byg/models/item/mahogany_sapling.json -f8491f398c9f64b52c17c7eda0753897a446eda5 assets/byg/models/item/mahogany_sign.json -2d1f4f1ff605d580bf5b664db434cb382ff0b848 assets/byg/models/item/mahogany_slab.json -5ef059d8995b99cdd60adb5ea46c12e3d9400baa assets/byg/models/item/mahogany_stairs.json -1972c83ee127dd76ed1ab1b632f202606ff9a7fd assets/byg/models/item/mahogany_trapdoor.json -9fe4f0b1c862e4b2120dbbf598d09b6297b1d2e3 assets/byg/models/item/mahogany_wood.json -1faa3c095998b9767b4e1b71ff586d0c566ad90a assets/byg/models/item/mangrove_boat.json -68ca3bb25c7feac21fda46a46b67e83dab6a3a9b assets/byg/models/item/mangrove_bookshelf.json -37f3c3a9e828cb1bec645a0efe95227adcc92595 assets/byg/models/item/mangrove_button.json -724a0cd863cf79d75bb26d05838c3e473a1afd05 assets/byg/models/item/mangrove_crafting_table.json -b3e66440598f233fb8c5b856393037fb063de2f4 assets/byg/models/item/mangrove_door.json -c6c818437a6986b9187668d07b3cf02a6364ee69 assets/byg/models/item/mangrove_fence.json -c205646f54043aa1f88c8495efba13103984ee0d assets/byg/models/item/mangrove_fence_gate.json -b0d420934636f338c85dbf73267029b9420c2e8b assets/byg/models/item/mangrove_leaves.json -0cdff58e05cd081158e7d0dbbc0f2d0dd5bbb7b4 assets/byg/models/item/mangrove_log.json -663b1fe6614360a2133136635de85e505363572b assets/byg/models/item/mangrove_planks.json -202d70f947d5f1361bf270a4c7653e17b48be2df assets/byg/models/item/mangrove_pressure_plate.json -2b93482c1bc6c4f91a71e7b7853b2dcd50170cc3 assets/byg/models/item/mangrove_sapling.json -8cbb365b2382be0b9bb441bf5bc18da01b8f2e57 assets/byg/models/item/mangrove_sign.json -6ae725945788d34d3471f064cf00ffe7b457fb3c assets/byg/models/item/mangrove_slab.json -9a0a23bedcba4b9c03c4e4eaea18f35838fde21e assets/byg/models/item/mangrove_stairs.json -cc3e31e2be98bea46da444ad0922ccdc5136dedb assets/byg/models/item/mangrove_trapdoor.json -b34430391585af64bbdc3d2bcf5f69587d7036cc assets/byg/models/item/mangrove_wood.json -b3360b2c749a47e15403b2849bbd2e76f6bdc62e assets/byg/models/item/maple_boat.json -96cd960b276ac6cce3405ad3bce7f8f72ca64cb5 assets/byg/models/item/maple_bookshelf.json -387a115e9d0dc90376f24bfbb2e3fefe1d4dbb5d assets/byg/models/item/maple_button.json -c173f6996501a5e3d0c47c853274347a737190d1 assets/byg/models/item/maple_crafting_table.json -4c3cd122e6f83a16e44dd8fa51c191d59d400f0b assets/byg/models/item/maple_door.json -de1fb00c2ef5c82a95587827b77f484bb35fcb16 assets/byg/models/item/maple_fence.json -7a5242ab08431a6d00c8f04dc744768cbf086fe5 assets/byg/models/item/maple_fence_gate.json -2580b3db140bed74c28ffa213176e485fdb3ea5f assets/byg/models/item/maple_leaves.json -45213c10d8cf696376ebf82abcc63ad943f20985 assets/byg/models/item/maple_log.json -730755678662904e796b4d44afacb09a842c4ee0 assets/byg/models/item/maple_planks.json -02133c31cf8512d4ccd15d1277f2bf45754484d6 assets/byg/models/item/maple_pressure_plate.json -e7486c85fd736d98c7f06c5a487dab8e2c942a83 assets/byg/models/item/maple_sapling.json -d084530f24d50d2cfdeea5745cfc34c462891797 assets/byg/models/item/maple_sign.json -5d86a101ab8baebcb9a683f6d71ef95b3a075fc4 assets/byg/models/item/maple_slab.json -4dc6e718612425205a9afefdf089d4440612a6cc assets/byg/models/item/maple_stairs.json -32d8ea1a4b9a5b95e36d4152e9a221bfd2d29c92 assets/byg/models/item/maple_trapdoor.json -968f1aa353ba79de353264ed58545f2fb2066848 assets/byg/models/item/maple_wood.json -d9852a7fff6598719476cf3d0ab8ca823c4d057f assets/byg/models/item/nightshade_bookshelf.json -b1fb5becac68091065fd9495073dbedba6a48109 assets/byg/models/item/nightshade_button.json -94aa426bb94a09dcdb4c19ccd90c68420e1400b6 assets/byg/models/item/nightshade_crafting_table.json -b63bb59776900e38343e9b03de4853962883412c assets/byg/models/item/nightshade_door.json -9ff73309cd9d5461e1429e8d0c2aa8cdf6c09b16 assets/byg/models/item/nightshade_fence.json -e6f470eb6fabf0f116b6f26243fd281c1bd0c8af assets/byg/models/item/nightshade_fence_gate.json -a637397faf67cda4f303e9d8086d57b15c27468d assets/byg/models/item/nightshade_leaves.json -774fc1f73470ae4689c5994fd6d4626b4f7af0cf assets/byg/models/item/nightshade_log.json -74c9df807cade4612961b11a1da4151972f639fd assets/byg/models/item/nightshade_planks.json -3df61b09678ab516436a0b50a8e31c408e31589c assets/byg/models/item/nightshade_pressure_plate.json -f0bbb5065915d842bfe2bd87462c277218c5bc95 assets/byg/models/item/nightshade_sapling.json -be03d71c92421b83beb9a83e7a458693bf7b25a1 assets/byg/models/item/nightshade_sign.json -5b5d2e2b41c69472fb8022fa333659ad2bf28a64 assets/byg/models/item/nightshade_slab.json -1c97bc6e1ca4177ffc2efb1a505cb7db8645d30b assets/byg/models/item/nightshade_stairs.json -8794a3b3dfc7dedd2a8a3ecc39359c14023857ee assets/byg/models/item/nightshade_trapdoor.json -a6a93a6825ebf3d50635a93e96f0ab15e4a328f2 assets/byg/models/item/nightshade_wood.json -18000c946ed522199aa1da394e8a7d0b5ccf8853 assets/byg/models/item/palm_boat.json -a4ed7d5608be7b13280da58fb439fcc3326621c4 assets/byg/models/item/palm_bookshelf.json -0a1741fe2250f9d95c6d2429b41418f153311a9d assets/byg/models/item/palm_button.json -767d3574ba62ced07e4293c68d00fb825469637f assets/byg/models/item/palm_crafting_table.json -d0073c6fbb4fed6c68ac36135053578c32cd193b assets/byg/models/item/palm_door.json -f53b8bf63e188cbe734554d3a8ac88d73f91df2b assets/byg/models/item/palm_fence.json -dd1a1264aa8bf8d4aa600aa3beb9eaaa3ae3dcce assets/byg/models/item/palm_fence_gate.json -6674afdb2ea44229f5ba7c0cc432ab03ebe8a0b8 assets/byg/models/item/palm_leaves.json -36747572f9161d3e79f34c02d26d0dc0289b5aa1 assets/byg/models/item/palm_log.json -02b33321f618cec53691f04382a3f84de5538ab5 assets/byg/models/item/palm_planks.json -b6065827d85ab66ea718a96bc05607c12259220f assets/byg/models/item/palm_pressure_plate.json -828ed945909c554046fa0e466626f633a9075dc1 assets/byg/models/item/palm_sapling.json -8f2fcef971226350b49b99f5726c9cde7008cafe assets/byg/models/item/palm_sign.json -3aaf72cd555b77bd85fdab7e3dd3fc36f3c217ef assets/byg/models/item/palm_slab.json -ce2e8f4430316198f9b6ad05ee65f1b8ddc135b3 assets/byg/models/item/palm_stairs.json -2d2ae64b49dd4d6836a7c550e388a5b23f89631d assets/byg/models/item/palm_trapdoor.json -641ded0df8c74eff47030fbf79f9bc373d58fb9a assets/byg/models/item/palm_wood.json -1f65f41935457796948289ca9e84d97322821c02 assets/byg/models/item/pine_boat.json -71158e2ccf57dfc90fccc4b3c3218c74cd2ebb71 assets/byg/models/item/pine_bookshelf.json -2fcf1ffa10662a12b5adf2bcd154a8bf4025fa38 assets/byg/models/item/pine_button.json -d541974e54d7b6bda195849d4db35549081a041a assets/byg/models/item/pine_crafting_table.json -b687c999f9786e4ae51b8e99f79625f607930ccd assets/byg/models/item/pine_door.json -69dccd44f4c0d2932a6ce2d04f35c20c94623ba0 assets/byg/models/item/pine_fence.json -9985e192c1021b4c7f406c1000e7649490ac4fc2 assets/byg/models/item/pine_fence_gate.json -1137af14ade751523450facaa608c9a92134ab6d assets/byg/models/item/pine_leaves.json -7d98dd94a72dd9d51d027fb33a698c5893aa84cc assets/byg/models/item/pine_log.json -fba9a9fd473aa9eb770970dda91e63855a5b1ccf assets/byg/models/item/pine_planks.json -ead4c243f01620607f91b993be085bcebb214cf2 assets/byg/models/item/pine_pressure_plate.json -9826776657d6273054a685e72caf5bbf30725957 assets/byg/models/item/pine_sapling.json -5b2548a89184cbdce3496d2b8444a6cc61fbf36a assets/byg/models/item/pine_sign.json -94d803b73017692991f46ea0371dc099a2362580 assets/byg/models/item/pine_slab.json -db6fe228afbac567186d648a6aec8262d1ee6a14 assets/byg/models/item/pine_stairs.json -fe36b59918baf0e0fd54834ff95ab1babbaf9cbd assets/byg/models/item/pine_trapdoor.json -c6353e6e98765496bc28411805a2040ed5b1c4c0 assets/byg/models/item/pine_wood.json -f3829eb3a12c1513c6e8f74f09c224988790086d assets/byg/models/item/rainbow_eucalyptus_boat.json -355ac7f53a857d8564a1ec89b66797216dab29d2 assets/byg/models/item/rainbow_eucalyptus_bookshelf.json -18a404c4088832ccb6d1bd55d0fd37f239b7d484 assets/byg/models/item/rainbow_eucalyptus_button.json -d10c2a42336f2b423cd096001238e55a7ff02095 assets/byg/models/item/rainbow_eucalyptus_crafting_table.json -39e3cd49c8c8d8c56e9db764703220908a171f54 assets/byg/models/item/rainbow_eucalyptus_door.json -2e09951b70a1aaf269a62a289c319a1efcf9bcb2 assets/byg/models/item/rainbow_eucalyptus_fence.json -e56ec0e81887b3784d1bed19ab6cba99947f2a58 assets/byg/models/item/rainbow_eucalyptus_fence_gate.json -f226d4c0634aa06076e51c4dc5844d9d39f9b1d7 assets/byg/models/item/rainbow_eucalyptus_leaves.json -40a9046036b077d96734acc31634b14f16c50b7d assets/byg/models/item/rainbow_eucalyptus_log.json -9149e920185851a997066860ffa95c6ccf0fab4b assets/byg/models/item/rainbow_eucalyptus_planks.json -e845c8591c0f3300544797e09c45a5e787ded391 assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json -c1320dd256a425c6bf3df619c023f419b450eaeb assets/byg/models/item/rainbow_eucalyptus_sapling.json -338b7915c9c90498156a1605d61d889609886869 assets/byg/models/item/rainbow_eucalyptus_sign.json -caaf1f7aa3a6e42e3ac2c392e0d8256cccddc45c assets/byg/models/item/rainbow_eucalyptus_slab.json -dfd60e8e00afd42f7d88a1571ca5cfce155f80da assets/byg/models/item/rainbow_eucalyptus_stairs.json -bd453cf6d9a973cc05eca497d1e2b9873507ab0f assets/byg/models/item/rainbow_eucalyptus_trapdoor.json -6a38eafae03cae9d2c59409679a29deac2e79430 assets/byg/models/item/rainbow_eucalyptus_wood.json -7172ad671c1a08c35e27bcee2cef8fcc742ed278 assets/byg/models/item/redwood_boat.json -10a826907d0d0fb0595ddf2ad9c7568df2c59f79 assets/byg/models/item/redwood_bookshelf.json -b542b7ea6e8cad348d274157fea0ba80bc97bcac assets/byg/models/item/redwood_button.json -652550c75aef18aaa6b285afd2216e4af43cdca6 assets/byg/models/item/redwood_crafting_table.json -d4a311d8c584e1584b298dbfe331158624fa3a90 assets/byg/models/item/redwood_door.json -171a7b13f633fcd3d8eaf8d8e27282857c4e7c04 assets/byg/models/item/redwood_fence.json -cca49455c6d9341aa6ff3d426b604b901992f028 assets/byg/models/item/redwood_fence_gate.json -ebf4e0f3e7b9a74dd65fe879b3c073be4275f65a assets/byg/models/item/redwood_leaves.json -99778c2901f546c05ef6f5f5fce7d2f4819e1000 assets/byg/models/item/redwood_log.json -bb531a8fd05926296fdebe4d3bc925abd5a72465 assets/byg/models/item/redwood_planks.json -2ccad4ae6350593f534f95af9360bc1e1c8f0de2 assets/byg/models/item/redwood_pressure_plate.json -4b4f90dfc96b44c0fa7551ffe2319002212f47b7 assets/byg/models/item/redwood_sapling.json -105461a4d5decad7f1c44099d99791ad06654a43 assets/byg/models/item/redwood_sign.json -6bc04400c70e382e07b2b11fb981cf03727b9fa7 assets/byg/models/item/redwood_slab.json -68d710d727c23617894f7e70dfa8f788966e0911 assets/byg/models/item/redwood_stairs.json -bea3cf137114ffb2071b31a67b821b4df4b85e34 assets/byg/models/item/redwood_trapdoor.json -30853e542fa6fd325fb9b54db516b5cf6c9ff71a assets/byg/models/item/redwood_wood.json -90f1531fc9dde5637ac51549c9d3244b83f4f8f5 assets/byg/models/item/skyris_boat.json -8b0d64177140102116464ed3374320b6f4dd3f19 assets/byg/models/item/skyris_bookshelf.json -709f7c852829ef541cb4c59c57d530a724172790 assets/byg/models/item/skyris_button.json -e018d92f41b547bc7d7883b0bf55b7f6a70c5729 assets/byg/models/item/skyris_crafting_table.json -304cea558254a55fec3839c5558438530ffb2343 assets/byg/models/item/skyris_door.json -d78d6ca789933a9f6331b91e4da754964d9ed621 assets/byg/models/item/skyris_fence.json -8ba7551c4449281b3b6529ba12d2dac3a3520a52 assets/byg/models/item/skyris_fence_gate.json -b0f7f8504f9fafdc0a2ae4ab6cf48c5ae667156e assets/byg/models/item/skyris_leaves.json -37f871a0f5de332301942c96948dc83d5c844746 assets/byg/models/item/skyris_log.json -e7843e5b430e1861210b4ff66faaa7bc86fb5685 assets/byg/models/item/skyris_planks.json -bc63e25d4a09e9dacefdb219a1ab1514d8000d24 assets/byg/models/item/skyris_pressure_plate.json -5101fc54f3156790bf7717b118a4c53d38889e73 assets/byg/models/item/skyris_sapling.json -f8ef93da89e7d48253afeb3de15e12e24ca724f3 assets/byg/models/item/skyris_sign.json -b83babc96b05faae942a83eef6038ebba01c121a assets/byg/models/item/skyris_slab.json -f399f2ce0b940d0e451cb2062c9cc1211f21c038 assets/byg/models/item/skyris_stairs.json -ed4b6adbe2630c9f163c3788471e0f570be1c668 assets/byg/models/item/skyris_trapdoor.json -32556c83388b115cf9bb5e78a377556b88c65e7c assets/byg/models/item/skyris_wood.json -5eb73c5eff81302b6160bf99e9a395f4a881710a assets/byg/models/item/stripped_aspen_log.json -d562898c1fd9a5390654b3360b230abe9f2fa357 assets/byg/models/item/stripped_aspen_wood.json -8f311f72bc1785f527a93215c655ee1b7997f4cf assets/byg/models/item/stripped_baobab_log.json -a626dae24f4dd86f6787e23f8d56dfe903f46121 assets/byg/models/item/stripped_baobab_wood.json -7f6ed8e052889bcbefc1beb60915aa8c71211946 assets/byg/models/item/stripped_blue_enchanted_log.json -6a92504572a3332db8868d01ab21a4a70ea3543a assets/byg/models/item/stripped_blue_enchanted_wood.json -e1fdda2bf6df61f3a433c9c783c2010af5852a2f assets/byg/models/item/stripped_bulbis_stem.json -7d09224eab4290421d478e10ed790dcc7b7cb23e assets/byg/models/item/stripped_bulbis_wood.json -5d7063b73fd2ff127cfa3d2b90731a152fdffb46 assets/byg/models/item/stripped_cherry_log.json -0afb17de1f2638703fc9d84dddd7f81dd82bd66a assets/byg/models/item/stripped_cherry_wood.json -2c5edb90d9d8954cc1118543e4856bc061363e90 assets/byg/models/item/stripped_cika_log.json -3dbba3311c4e9c22741d785d0f516560b150f795 assets/byg/models/item/stripped_cika_wood.json -feab6881106cade562fa3b02d82d12e98ee9230b assets/byg/models/item/stripped_cypress_log.json -0692e7e67a4ef4b23e2ff7bf429cf3f742f414fd assets/byg/models/item/stripped_cypress_wood.json -98e91b262a9375d48c381898272f1e01ab00e45a assets/byg/models/item/stripped_ebony_log.json -e4ed1b4f8e97ded9b95e6a4bb8333e62ae08b188 assets/byg/models/item/stripped_ebony_wood.json -e0c73411518c49829bf7ccaeb17d7508cc81be46 assets/byg/models/item/stripped_embur_hyphae.json -a9e46b97e764b54f226eb975fc3a12911b63919e assets/byg/models/item/stripped_embur_pedu.json -d8cf3c34099fa0bd7fd8dbf51a5075b9df29217c assets/byg/models/item/stripped_ether_log.json -2f3615abe3246b8c691c5925ca76a9108763829e assets/byg/models/item/stripped_ether_wood.json -b0d668ef92fa26d739f0fb38fdd5fce090ce6b49 assets/byg/models/item/stripped_fir_log.json -62b05299b4e6f97cdb4661da45ca6f4938ed74b4 assets/byg/models/item/stripped_fir_wood.json -4d76fe19f799a7c3024c04408b33aeabe2c64554 assets/byg/models/item/stripped_green_enchanted_log.json -be77374f6f08032f6f25978bb596568e9928f19a assets/byg/models/item/stripped_green_enchanted_wood.json -700f07776e23d57776aeb0635dcc3b73d16f09db assets/byg/models/item/stripped_holly_log.json -8527fb1522dc86c8fee094163603e6cb39c685a0 assets/byg/models/item/stripped_holly_wood.json -fdfdec32df82ed46563a693429dada4bc7e5ef0a assets/byg/models/item/stripped_jacaranda_log.json -c1797a3d58aad68904c12e8885d4642a7f329d52 assets/byg/models/item/stripped_jacaranda_wood.json -578584d2b4fb3da894b78a8c0c00447fc11b6412 assets/byg/models/item/stripped_lament_log.json -6640a4be3b53ba3a87cd1e41ab25775dd56382aa assets/byg/models/item/stripped_lament_wood.json -8d712c44b14eee5ab993f13a6d92cc925b483716 assets/byg/models/item/stripped_mahogany_log.json -3cb6f573ba8293f70be4617d65d0238ec7b57324 assets/byg/models/item/stripped_mahogany_wood.json -15b7617de1da389e5b34feb74834b5558c69631b assets/byg/models/item/stripped_mangrove_log.json -9db799e21b94bb971d782aa6642ba2f2a5d19d7f assets/byg/models/item/stripped_mangrove_wood.json -31e7479a15aaba2248fa0c037569a8a5edd29715 assets/byg/models/item/stripped_maple_log.json -feef3a493d873d12296f022e763ae2d9f3b05cb0 assets/byg/models/item/stripped_maple_wood.json -ecb14641a281653709e15369a027afb36b73bc28 assets/byg/models/item/stripped_nightshade_log.json -89ecc0a3969ef6928bc7f9bcb48c6c86e3a33904 assets/byg/models/item/stripped_nightshade_wood.json -68eb2889df27becb11fe966b959e12d309f72e62 assets/byg/models/item/stripped_palm_log.json -e83010cbd7141bd301946fb9db35a71ce0e68753 assets/byg/models/item/stripped_palm_wood.json -4c39f243be0cd275197a200ed0ace2061d6b413c assets/byg/models/item/stripped_pine_log.json -22eed6f1c69f582927c07a9550251f5fa488e682 assets/byg/models/item/stripped_pine_wood.json -7cec0f98353fad65f9f5552bdb93fab566867635 assets/byg/models/item/stripped_rainbow_eucalyptus_log.json -03df4f31d47d36fd31fdc70002686f80dc3cb46f assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json -a86cac25410f11ccd308ab3cbf1217e18eb73895 assets/byg/models/item/stripped_redwood_log.json -db8a7ece8ae147b5b60a97bdaaa461d45185bb09 assets/byg/models/item/stripped_redwood_wood.json -ab724ff0d459c79f56e4da47b80ac5bf8e65be68 assets/byg/models/item/stripped_skyris_log.json -f51e6982334b412786b7c85e1a7b316ac8ff10cd assets/byg/models/item/stripped_skyris_wood.json -db07f156bfbdffbeea263bd9d6d42ed1183b37c7 assets/byg/models/item/stripped_sythian_hyphae.json -5f18b3cba93df79fb8333a6dfe6b62a5fa65ebe9 assets/byg/models/item/stripped_sythian_stem.json -fb93ad2185e85033120d127bd82f62c6a31f7e4c assets/byg/models/item/stripped_willow_log.json -adeebea04044107c674e2d9f0507120d622647b5 assets/byg/models/item/stripped_willow_wood.json -e6950d73dc47a1084f96c6718bcd1a9c8f99f54e assets/byg/models/item/stripped_witch_hazel_log.json -b5ace128271a547e9aec54d9654f961e1eedb37b assets/byg/models/item/stripped_witch_hazel_wood.json -8b1eac54f1510cc94903fff54021c459a615665d assets/byg/models/item/stripped_zelkova_log.json -24e453300046cb72733d5332321d36aea2e077fb assets/byg/models/item/stripped_zelkova_wood.json -56c2ae6989c34d18bf77e79aa43e17bcdb6ed6aa assets/byg/models/item/sythian_bookshelf.json -65081a6849dda77648fa6ffb72fbcfacd0d61293 assets/byg/models/item/sythian_button.json -4a419e0817c9b2d888c1957c3e5b76f18976fda3 assets/byg/models/item/sythian_crafting_table.json -4717b6a27bc6e6366ea444541ac7514266df7f41 assets/byg/models/item/sythian_door.json -81408174910d629cdbf4b8e6426dbeac0b63d6de assets/byg/models/item/sythian_fence.json -8d100561293c599f2655ea992850b676d74ea26a assets/byg/models/item/sythian_fence_gate.json -7c839ca5ebb6803862952edf853e9361a4d41c8e assets/byg/models/item/sythian_fungus.json -f624822fa4960cab4ca1aeefaab1b0778b78a149 assets/byg/models/item/sythian_hyphae.json -3785ffb871d4033aa77d7b1ba2beb8d0c022afa5 assets/byg/models/item/sythian_planks.json -f59df2cf798a5b7d6d2040046a40cc781e4a41ba assets/byg/models/item/sythian_pressure_plate.json -089596b1b68b4da17298ad3de436f77af815d41b assets/byg/models/item/sythian_sign.json -cc130597a10b0e61ed51c8fb16f9c797605d60ed assets/byg/models/item/sythian_slab.json -3e45f23c56a1e0b3fdb339c8626375bce2d3e931 assets/byg/models/item/sythian_stairs.json -66e8914249bfb56050995582985166330e9ff9de assets/byg/models/item/sythian_stem.json -6f14d5a024475a25ac31e60609eee006d61de568 assets/byg/models/item/sythian_trapdoor.json -0bb134aa65e3884ba001c390d578cf155722df3b assets/byg/models/item/sythian_wart_block.json -a52bc875d6707a1b1d65472af872f38341d74862 assets/byg/models/item/willow_boat.json -8d8cfcfd12b3742a693df688c8db073d3bfdbaf0 assets/byg/models/item/willow_bookshelf.json -866026b225ba45574007e994aecb293b5dad7d6d assets/byg/models/item/willow_button.json -7246dbe95b4571df2432246d54cdbe4a24105936 assets/byg/models/item/willow_crafting_table.json -5b445b7a9b68810e95dc20e56ac12ef45ae331cf assets/byg/models/item/willow_door.json -99f474696fbd4fc29ddef29ac607a724a84938aa assets/byg/models/item/willow_fence.json -302cfa6da893bc2017fc76deae0cff01467e8076 assets/byg/models/item/willow_fence_gate.json -b02d9b57bb6db0d6763d8cb1305c747462324142 assets/byg/models/item/willow_leaves.json -8112375ad6a7805e63fe3ce73e0ef74837d15936 assets/byg/models/item/willow_log.json -0ae4dba613603a07fd48c79830781f02a6026a7c assets/byg/models/item/willow_planks.json -29c830fcf5349965bbd73bd87caf004cb2d5b8c4 assets/byg/models/item/willow_pressure_plate.json -d34a3f4732fd8f597e8359c2a8db3f6fce144919 assets/byg/models/item/willow_sapling.json -522e2cced3f7e1797194035fb34a7383e7e36f4d assets/byg/models/item/willow_sign.json -27d9f5b070024aaf18da4fc85617bdcc355c465a assets/byg/models/item/willow_slab.json -77d5d392878fe1a28710e6ee6823bfcd3215c8e2 assets/byg/models/item/willow_stairs.json -bce10e0702e13c2c6d95cf6a1bfec374da67b3de assets/byg/models/item/willow_trapdoor.json -7f9b973b3da73098a0e08bd9503e68e62826f421 assets/byg/models/item/willow_wood.json -af8dfa8b8ebfa5767941d15d53e89e12cbdb2afc assets/byg/models/item/witch_hazel_boat.json -4f4fa7f12faa772ee1e689d02ed121cbe128236a assets/byg/models/item/witch_hazel_bookshelf.json -e3663b382d3fb093f89d56b82299b20997dc8cb4 assets/byg/models/item/witch_hazel_button.json -9827a52d0694bb47dcac5b8c4634dc78b524f3d9 assets/byg/models/item/witch_hazel_crafting_table.json -b4f5e02b694a88d383c667d6a701f0aaaac82c98 assets/byg/models/item/witch_hazel_door.json -939cb92da2d31ff754662bd70a6bff486e5f9d5f assets/byg/models/item/witch_hazel_fence.json -d048c4cb7ac33c0bb3e65eec56eeb68514646a46 assets/byg/models/item/witch_hazel_fence_gate.json -2fc78d259246515fa7db39b816a74afa69ebc7c0 assets/byg/models/item/witch_hazel_leaves.json -9270f668d4fb0cc7afddc07a9d7d29259df8047a assets/byg/models/item/witch_hazel_log.json -1ac92832148124b4b1277d8994bedf57782e19a5 assets/byg/models/item/witch_hazel_planks.json -3abb227e0d75fd6f8bdeab5a4e25dfe86a397c8b assets/byg/models/item/witch_hazel_pressure_plate.json -c0d2d67481fe5702a0256109243698d3a117818e assets/byg/models/item/witch_hazel_sapling.json -52c306ddee27acbe9fb0aaa69aed6b7fbc50e9a2 assets/byg/models/item/witch_hazel_sign.json -efb86376aef5cfb09e69e9fe444ac115d4db0eb2 assets/byg/models/item/witch_hazel_slab.json -a75f89ed619c4602a1a89f52515757744d0bd530 assets/byg/models/item/witch_hazel_stairs.json -24f0246e7234ac365aa0593fb4fec098acca5f4b assets/byg/models/item/witch_hazel_trapdoor.json -8b2170e50f1b5b782b82c649aea4194a4985ff5d assets/byg/models/item/witch_hazel_wood.json -c859ebb6fc1693e4e35b6df16641ffc54c91861c assets/byg/models/item/zelkova_boat.json -7f7c5801191562e8d9d8abff53e2b81ee174be5c assets/byg/models/item/zelkova_bookshelf.json -9a0711bbc8efa06dccac1b75b20268ddc27ac679 assets/byg/models/item/zelkova_button.json -61c10955c42198ca23e6796410dfdd34ff338978 assets/byg/models/item/zelkova_crafting_table.json -5364a3067040014f67fd87da38f5398393cbfc7b assets/byg/models/item/zelkova_door.json -0fc1b6f4fe7e32c7b5be783e445674ed636afbc8 assets/byg/models/item/zelkova_fence.json -4a2c09b90687604332a4c863e3c785dbe5fb3bc6 assets/byg/models/item/zelkova_fence_gate.json -83ef1f99f43336cbb03bae053eaa204b7248a531 assets/byg/models/item/zelkova_leaves.json -a6396600e00f4b4d0b53fd1fd7c2938b57f22f93 assets/byg/models/item/zelkova_log.json -bc785e1c1efec9f89265a5cb5474b3f88eac5064 assets/byg/models/item/zelkova_planks.json -613fa17c691ac2b320f967ebf3a14ec09127ae60 assets/byg/models/item/zelkova_pressure_plate.json -41d236f7a48a2d7493af11495db0579977ab11ff assets/byg/models/item/zelkova_sapling.json -75b2e091f6ce4965ca046143cb548ffbc449e5bd assets/byg/models/item/zelkova_sign.json -d4f287df28be70f53a4a7c6473355d760e64078f assets/byg/models/item/zelkova_slab.json -7efd2d48e7253cf1dedb7e910216b18d518cd35d assets/byg/models/item/zelkova_stairs.json -c558d204496231acfc2f07b1763894108894a676 assets/byg/models/item/zelkova_trapdoor.json -5a969090404d7acf76034084b7ff60640528ae20 assets/byg/models/item/zelkova_wood.json -d38ed1ea9db48a72020b2d9c62a9b7f78abc00f0 data/byg/advancements/adventure/oh_the_biomes_youll_go.json -088f462dc7e989078f364f070553c33b5475ca5c data/byg/advancements/biomepedia_gift.json -b4d83bce4f82add22412cca9049ee245aeeb2f18 data/byg/advancements/husbandry/berrily_alive.json -ca36240397ba18ddf2a2a64aa0ff986f54ac6a9b data/byg/advancements/husbandry/forager.json -bd8b08acafe6385adb99ad9c22c3e3682691b8b3 data/byg/advancements/husbandry/granny_smith.json -0df73ca37bdbbbd96cab4ab8cc78a117ce585291 data/byg/advancements/husbandry/hot_diggity_not_dog.json -6b9be9a81ec520c16aa698e3121b61dd99a57373 data/byg/advancements/husbandry/just_like_grandmas.json -45a8e36e3b6e14910467378be403e52411436ae8 data/byg/advancements/husbandry/root.json -7c1935b2c1f61656798b4c0117d6a8f2827cd29a data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json -0974b3e8eb876517cc7025ee268dbef1be2c0dd7 data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json -d8a50f7933fab8fa5f1a9cbe8bfbf86f8e2c1866 data/byg/advancements/recipes/byg.byg/wood/aspen/button.json -1839dad0677af5c73450e0161ca3191bd546b488 data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json -db985793fdd315c02ba0d3be4cb1764ac320e387 data/byg/advancements/recipes/byg.byg/wood/aspen/door.json -140ccce47b045be05a55dbeda4e526fc1d40bdab data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json -3dfc28bfe74af2d2aa2f87f61e088ea4543c8cca data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json -db84ae5b52bba81b3e43f27613343f80abdfbd19 data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json -0b8a550c52cb3c9e1aa883e77aa32b10f3f07770 data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json -cb211482cc1335e19a05a5e76f4a95dcbb8068e4 data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json -5f42b62b9a96d8eb55d3bf645bafae9de79f6b13 data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json -fa6e7b7f077e8e0a3ffb64c8bb443132b0914c15 data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json -70fe220fa3368bd5be4b984c385e086531920331 data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json -4578f17118ea7f1321b347be2962ad9485e923fb data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json -5ad16716e1d1ef1a264f92a4520d0d4054a6eeff data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json -24fba2b2cbc207d1d51e10d59d7c23f12ad39e76 data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json -e7dae4923c93313f898cf8769280740d3d73bb1c data/byg/advancements/recipes/byg.byg/wood/baobab/button.json -753f5b4d4e0fc6318a30581f6c6bf440dd109342 data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json -75f2d1cacb11e14a46fc3d5a84bce3240c72374b data/byg/advancements/recipes/byg.byg/wood/baobab/door.json -604447503f3bcddb34d7bc75f728b36adeff3d34 data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json -f65bf801cc20711aae25ae606741fc1bf04fb445 data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json -96b241c110d1505c97c6ef75487aed6c81fbf2b5 data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json -8684aace48a2f8c53dbecac0c70f37d66465e5f6 data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json -ae26bf7a014ee3df2b787f1f28107fe26188927e data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json -833619c47c131b4c72c1b6a56796c451f9c2bff0 data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json -19f58aad206582307b90f8db9784d80d40460e8d data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json -f536f670da5cf0770e33bff32dc1f9f9f705ba88 data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json -411e9c381fb8e2579819235c97e1fd3a1c5db11c data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json -167a2d9e7d9e7d03bbaf134d2232041fff87c5c1 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json -4cba0fd6e01f2950893d295aac62b622be78db50 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json -326b441cb19dae1bc6eb232360a665a527cec5e1 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json -0f43b9d796576822349412901689d96377d59bce data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json -6b51d098d8c6dab3f716dd8528e672f5f3a5c705 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json -733a5386f7b07d7834fb3d790fddf2f3758ca9ba data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json -23fe49cffbed25aa69be0ff760d983f067af2b65 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json -f41f2d2d3c0af5821bc96e82b7a0429b02e379a8 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json -6864e4a80e3e28f2edc0ed5e6f133110d4364113 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json -d42276e89ada47b1843a34a0339821e888e7799d data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json -513a7028ba639f101216ceac8786ea58647b0ab5 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json -71ae592506dbd4598b54f717a182268035d3c0b2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json -59dd8ff337e24b31e917ab5405e8692c452b47b4 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json -227b8abe2f2bb7f03de82bdab4f84272a39f2fd2 data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json -6b82d269ef533babeb129ead109ac430f9bac423 data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json -59388d27e5237edba7ff239e0b3fb94d96ff9c42 data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json -400aa527a416e95c00d0f267720b2c55a8a656c1 data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json -e750119b99fb80d6a938f4753bc7490aee61300d data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json -6ff0c5bf4b3d452a38688a7db7b50e6d828ddec9 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json -c50eea308107c7fbb7c5254415df875448eff056 data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json -8342d661d5bb9157c11a082342ae5d4764706786 data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json -995bf4d4574badf99459ebc78dcb2707774190b3 data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json -532cd6db1c55f54cd3c585d7525a724d78a1ea03 data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json -ef0119d4da07d55c8a35779d0a1231acd24ad6fe data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json -14dcfdd0b3b214ce0b94bec84a8e834695bd93ee data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json -999a1a1a0be1d07927214494be8dc56ba59a5d6f data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json -e3d666835415e1a77b40e193ebbd1c6f61deaa60 data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json -3c6a275c40d897a11193e76d014c15b3c24aa4b8 data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json -52f7e26086dd14af9180b69034abe66c355aef0b data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json -2534dfbe152c4c359fa8d9192401d616ccb70631 data/byg/advancements/recipes/byg.byg/wood/cherry/button.json -e1588dd3dc5c8002944d146df52e6271500963ab data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json -26febe445f845f73cef06afeb9bddf1c5038d1c9 data/byg/advancements/recipes/byg.byg/wood/cherry/door.json -69fcbbc9d24d42c1ee5affe4737369af97f483d8 data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json -097af9339c3f2d7bc75ed63c67242dbfbdb60308 data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json -c3daf89e6c51f92a94448687e88128853602ab94 data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json -efe4a39583a805af78c82bfe7f224e36844abe3f data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json -b4f3260cfa20e997423b8c39eb5f400928ac109b data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json -fb0c8077d9009f4878830513a4cf2a03d4aa6b18 data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json -131415f581121f364e982090cd76e69de0d5c07c data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json -7c19345d226ea6e1a1adab274168dfe289200373 data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json -4277c921c71f28463f09b2ca099f99bef21ada03 data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json -880e327783f05849d5b9f76db856276129229b05 data/byg/advancements/recipes/byg.byg/wood/cika/boat.json -6db36c0851ed3dba1011af2efd7bb34675f88620 data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json -06c046e7482dbeb32b720c27210fb8078d217626 data/byg/advancements/recipes/byg.byg/wood/cika/button.json -496353afae5dd68db59bd0e4ae42924cdaa82cf0 data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json -ddbd1ecd8afe20b7be22ddb9105886a3bbb52375 data/byg/advancements/recipes/byg.byg/wood/cika/door.json -1863f6ddef21684706dbeee59720bbf07b735b08 data/byg/advancements/recipes/byg.byg/wood/cika/fence.json -6551ec208aba255c717faad92d7646ff435e2dca data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json -7669036e415ce7f705c7103a4f9a47655f2b33b8 data/byg/advancements/recipes/byg.byg/wood/cika/planks.json -d9615b7a10088c08da377d5037e9264235f0eced data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json -d9fc5ac5ea1c0c84c9f2a88d18a9cfb077d49221 data/byg/advancements/recipes/byg.byg/wood/cika/sign.json -761cabe05bc9c0ea350782e2acbccabcec112bf7 data/byg/advancements/recipes/byg.byg/wood/cika/slab.json -280574a7a2a3df2ab428677d10f15cefe9af326e data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json -dcaafbd26e9fc567180c8dc46b465b515473a713 data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json -b8f23159b7ff36e757d4782411514205527913ba data/byg/advancements/recipes/byg.byg/wood/cika/wood.json -bd475e53816f3adddde30dc00d917c7d23d0aee1 data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json -9303794cf89b78c7ee2a0a35e873df86102b0fa8 data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json -69d875c7e780112827a3ef4cecd2fed41dbb8db1 data/byg/advancements/recipes/byg.byg/wood/cypress/button.json -4a3b8d1dc283ead2610a2bb03383468d81720808 data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json -07033ec8a66fd2280963d2b23937f366bd6e53d7 data/byg/advancements/recipes/byg.byg/wood/cypress/door.json -8ec5cb0ee54caa360644208f1c48afacd3b22bf7 data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json -6ade55f8bfb3a222785938193bc19e98bbd647a1 data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json -88fad555f9efec69903219ab247e55b7db136f30 data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json -04b81587e55ceaf3998232cf34b1805ad93fbadd data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json -a27cd42686e9419ec7f7e83569b93320c5eda893 data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json -0095d0adaaa11d85552ab54d5195b1aa557572b9 data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json -40e7f6394d71ccbd802b40b1fb9a81556d92e79a data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json -fcfe35857371e012b64fc77fea5524b63abe2be2 data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json -c7af942f104a1a9e2b3b533d49a4b0e75dacfca7 data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json -22bd4b976c9e0436cdf68280bc0193444479448c data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json -406638d185de81cfcd999c647aae649044a1bb51 data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json -0f18b748ea306f4ee39524fcf3a2b514222a9960 data/byg/advancements/recipes/byg.byg/wood/ebony/button.json -fa594aa7463ad026fb2fa455b4f9a7d47b5a2dce data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json -3e08116e2b9b55e617df914678bbc2a313813234 data/byg/advancements/recipes/byg.byg/wood/ebony/door.json -ec1ebec1e8fd863cb4adefc098ae89e70ca04c22 data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json -f1a0277ee9f6b8bda41805b9e07fe1b8277eae82 data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json -114915093f7c91ddf77e806f0714a293c3d58ff3 data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json -0c17e3d382a5afcb9be55ea38be12caac60a6e4e data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json -1e97f568589d2c19d95317a720aba3ef454a8f21 data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json -c11c95a814d930a9a9128fdbcc8138c651a1a0db data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json -c146cebcc5cda2004d61257e4c2deb4ff421e9de data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json -9dd64acb1012c36dbcf979f00f680b3f716465b4 data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json -bc237fdfe5a01a5caf21ae87675b4fe144caa9d6 data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json -cbcd24147b96d8fd638fdd20408334d90e7c5872 data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json -7c572067ed8844b4e2642d14df2baada8483930e data/byg/advancements/recipes/byg.byg/wood/embur/button.json -838fa47a687aae593073a41ce1172e922524a064 data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json -94d9bb0db7da38e62133f48762ab72450b44ec2b data/byg/advancements/recipes/byg.byg/wood/embur/door.json -4aeb2936898e9d9437ffdfa3d45513307605a596 data/byg/advancements/recipes/byg.byg/wood/embur/fence.json -b5ef8379f588abfdd1371574f7ccbffa33b390f8 data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json -7d3dfe79e35bf36008c981751cea61947d7a5f29 data/byg/advancements/recipes/byg.byg/wood/embur/planks.json -f9d2ff3b2735a14c7a67c360ec9ad3d37757e4ab data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json -ecd2242dc9b6a660f8e6c7166e10233c23b16ff4 data/byg/advancements/recipes/byg.byg/wood/embur/sign.json -2ab26df6c178f0e2b2ec97a223cfbec14025b82a data/byg/advancements/recipes/byg.byg/wood/embur/slab.json -59a7be5ea54968e4ba14615daca8072d133a059c data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json -bfa220a3176ed010f6cb184120033569e5d744f0 data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json -df93bb888ddb2b7c355042d18dd4bb529395654d data/byg/advancements/recipes/byg.byg/wood/embur/wood.json -b6d69417231d8bb1214b34f21c92748c6ff9f367 data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json -b767921c7c0f4fc620be688ea605184ce99f2c43 data/byg/advancements/recipes/byg.byg/wood/ether/button.json -83ead00ef090545b87617c944c6eeeb7c6268e27 data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json -468a3778aed31d1b3b1a1663184fa864386fcf7c data/byg/advancements/recipes/byg.byg/wood/ether/door.json -d6aaa33a010ad1cbea45f91268d42c8c76ac1c92 data/byg/advancements/recipes/byg.byg/wood/ether/fence.json -e4a8688990d64c704fe7aa5428f30426c7d7d3a2 data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json -d68f20e0ec94d8d8eecf15a1ef6063036875367b data/byg/advancements/recipes/byg.byg/wood/ether/planks.json -d98639a6ccf4e011f162f02574cee6555ca1e8de data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json -0fdfbc021c7ce21753fb743b4c242e4e90c0ce2a data/byg/advancements/recipes/byg.byg/wood/ether/sign.json -715a1fe551746f7a1b389ad3a7b1666d18c82b73 data/byg/advancements/recipes/byg.byg/wood/ether/slab.json -775f6170cff6aef3714388add618c14e020ef8b6 data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json -f9116fff9b742d987945bc396246b41b5a3bf12c data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json -ee31a189af0cdb306aa33ac45ae388cd8cb31421 data/byg/advancements/recipes/byg.byg/wood/ether/wood.json -887a184d8e6a28fb4eebc40c6ce7bded4ee010b7 data/byg/advancements/recipes/byg.byg/wood/fir/boat.json -e90b7de79cbe42f3b0c4c4a0b4785e80a9ee5ad9 data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json -1a29e8d41bfce15aeb107e1b6735966b6c7c0f85 data/byg/advancements/recipes/byg.byg/wood/fir/button.json -fbc8554852c60e1773694ae1eb3a7650fdc4c0c2 data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json -24976181393c7bdab8dcb152b5735bd835662a44 data/byg/advancements/recipes/byg.byg/wood/fir/door.json -d7a335cf63c00f03382f7f789152eabb3ac239ee data/byg/advancements/recipes/byg.byg/wood/fir/fence.json -95737ca56cacec4ad5ed80b082b00368c4f1cf5d data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json -e298d7496d24bb85a66eaea0e2046dafb45648e4 data/byg/advancements/recipes/byg.byg/wood/fir/planks.json -8e456a2336d2dc21b4dcba3065046232f94fb5d7 data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json -64258155cd95c243326cb094b907349dab3b73a8 data/byg/advancements/recipes/byg.byg/wood/fir/sign.json -c6401f67edcd9707b45b10b2c9560e304cf3be7a data/byg/advancements/recipes/byg.byg/wood/fir/slab.json -c400e09dcf59ab7f73b0ac154397a9cad91ec87a data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json -3c1c1585f83dfc80c4186cd8c770798e4a490c77 data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json -7f3747e660c9287e6e7bc6ae223a4cd87cce5d65 data/byg/advancements/recipes/byg.byg/wood/fir/wood.json -4aa153eb5f694060e46d37ef226aa34b7ba6cf09 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json -3b7cc54950d05734d6e287bfebca15995c41a4b7 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json -59ad623f9a29c639eb4d38fb2b85c4613690a090 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json -d9fb0402b196fba9bcc0864c13c0540620fff4fb data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json -48a321256166b1b84a3a57be4f444b3f440bdca8 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json -bebbb2fbcc6a1225668a050d6a0b222bb5a79491 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json -68dcda315f00202e49dbcb472fcf1b661ed24bd8 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json -218356c5e4f374c61bf58b550b705a2fabd07890 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json -d43f52cc90905d4898f973a27d338a63a8fd3db6 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json -53960d9f69587b124373a14bad63cce14ee8e7ef data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json -0cacea4b7f3fd744f07bcfde562a016ac1508f0f data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json -10dcdf764a5544180480a21b04592e313d0553ba data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json -06c3958dc0ec2b7f80fa4050851e39cecfd41580 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json -c01c05346a96fa455e198821d964fbd956446251 data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json -61ac31a79039ca512d310874adc7d78e0c24212f data/byg/advancements/recipes/byg.byg/wood/holly/boat.json -49a7f92c4ea36d8da1f497fbd9ea183774741c5c data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json -1c4821639533d50462b277304aa75d34043eafba data/byg/advancements/recipes/byg.byg/wood/holly/button.json -9f708ea38d8a0f9d9f693624122c7f9fa7401ff3 data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json -7973e5c80a2e21093c7af0a05e8c157191216005 data/byg/advancements/recipes/byg.byg/wood/holly/door.json -f1a32e7e0c01275e64bc728f792b179f485f4dd5 data/byg/advancements/recipes/byg.byg/wood/holly/fence.json -63797ab6e35fbeeba288b9567f335701ad16cae7 data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json -98e27ec36fc04cc29d6efb765dccba93d84f652a data/byg/advancements/recipes/byg.byg/wood/holly/planks.json -1cbf4262c545c09d1765a3f0824b678f382ab058 data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json -86520336890984f0c1208a3c3e577df6edec51f3 data/byg/advancements/recipes/byg.byg/wood/holly/sign.json -936142a10cdea1fe8c61b747f2180e16cca306a6 data/byg/advancements/recipes/byg.byg/wood/holly/slab.json -6f33d35a03824ffe3bda33c1e7b72e124d8fd2aa data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json -78e889d6619efb1d8e8d1be701e640b2968dee46 data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json -df0d7e8f0280269736ac22d62e84b3db7c2e6c39 data/byg/advancements/recipes/byg.byg/wood/holly/wood.json -3ee748d33b86f251c946e125886e4985d61381da data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json -7e48664cdf66d6b1f2c049c350ac29dd7b96ad0e data/byg/advancements/recipes/byg.byg/wood/imparius/button.json -46b67d09a692882cca7e64333ccde583746c8801 data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json -1fa53d9e2e95603aa18c19d521a3a5ac173e9eba data/byg/advancements/recipes/byg.byg/wood/imparius/door.json -8eee91d9377836e4aac7a52368757a1341fc4879 data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json -a36d45d9a4f718aba0a4dd6588d995d0995c24f8 data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json -1d66707ae8a8628874adaedeaefb28d40ceebc9a data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json -39f4a722c4ca867bd464893909002c4be38d8927 data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json -2c2fee5bac940847710738ecb1a5136e5c9086c0 data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json -e76f548ce8d8677a28c38c699afe79cd217ae0af data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json -21d37593813bc04e0261f2f9ab92b28dd4fbea39 data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json -f47132903b9e7eb0565b6fcbb46a36c77e0c6acc data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json -ae49ef7c283fbe64a3b191ec6edf9b54a573b336 data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json -9b63fdd65f906dcf1cae46f2d8f58f1ee66ebd81 data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json -7639605898e82c0eb121f6615d86b11a25852070 data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json -6e3c4be62665086fb2f4de795c904775e044e022 data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json -d6db26dc1358ebc8d2b800946cd02a63b269813a data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json -4ff71f71a754f33a1e3072255b6ad8a5efd61b28 data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json -74129cb918b70b9c02b66b5572715220984bd3c7 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json -49a7a3016d146de8c893756a8601ab48d61f9e33 data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json -e7086261f7b57af35c174f6338a464c047ee7bb6 data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json -336fc3792690640efe58fa048f1fdeb328773669 data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json -92fbba80c2ec334d001619f69df1c74c878e6c9b data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json -890e6fbbebe86e8c4949fcc5f20e7c15672223ad data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json -5a0f6fffd88be08b587aa7f5bf4e83de18bbdf4e data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json -9d4a8d79a288204acc3b39d70e8d071484c09446 data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json -af340260b341d180e134ba9b75c4af054b9b24bb data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json -4df2f89704dc8609e4f7756cadcaf3d95a8dc794 data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json -fc5cdeb834d0985ad3bab1b2f59db019fd042b4b data/byg/advancements/recipes/byg.byg/wood/lament/button.json -44a3bb049b373b6a3d4bfdf9070fc43d8d0c2ce2 data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json -4844572bf9699f433b8a28a8d9195c8f8aace1d4 data/byg/advancements/recipes/byg.byg/wood/lament/door.json -2105f6f01a35ae4acb40ae497d7e7044244f64ed data/byg/advancements/recipes/byg.byg/wood/lament/fence.json -d0bca869b44928eb27282f5a4b4afe9a254b74b3 data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json -b61ba3e679c804622eeb07bfd53d694099e83c1c data/byg/advancements/recipes/byg.byg/wood/lament/planks.json -974735c810011ed37ecf7993137390066049c5ed data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json -8f05423a309e3f568041a14561ed99f85742ef4c data/byg/advancements/recipes/byg.byg/wood/lament/sign.json -0f35cac5b1c9806eb1dd8723c92bb5273feb2988 data/byg/advancements/recipes/byg.byg/wood/lament/slab.json -b9c56f373d702e86e512a481a78d2ecbf0100898 data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json -62ecbf2fdc225488e8b44bbb3c54f000055d43bd data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json -b5233e20730415dc4e495a7e5b85b2d92e4ea3d4 data/byg/advancements/recipes/byg.byg/wood/lament/wood.json -95786d1aed14c5652fc8682bb9d7fcf359bf734b data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json -0d446dad280dcbe8707ad2c7a5932caf788acc52 data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json -149437419bb7ad500a7c8b60c54da40d0977d6bd data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json -d6b591dee348b32c4942eb45549d8c9cff8ddf02 data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json -49f9d0388d94e30c0ec622d688333004d8bfe8a5 data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json -06b8056113292184693a08a6de3769cfa4de2b4f data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json -3bf65b830f1fb1ff60cad8aa91294e3ec6afab1b data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json -a9e0f8677d35a3447eb658bce8619837156150f8 data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json -44d191e7415b89f3f75961b0e4f9fa028f776843 data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json -63dbce130802d0c093ea2acdb559653d4f11e7d7 data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json -dbb51975c5190152740d709a03e264737fe1c2ce data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json -b7f8754d44b9a3833d7ac10d62a9f00ae77af26e data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json -21d421d0b92bd3bb4edfbc901976bc76bbbdfa00 data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json -5e0143c37c59bfd4776c17cbf2a7a06d0646cf63 data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json -01a06e3197352e503c4821be159b3dc7146ea44e data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json -5de3e60bf81882ed9c5ee442408d18de5800fe52 data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json -03c87839e956c174a3ec9cb721900ab050fed5ce data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json -cf195f6e4375fd5f2dfb28c7ae633a3a26df40a1 data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json -96d4661b543c9858c768cb02f7095a857ce7ab13 data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json -8f82b68ccefd0ff5b8368070a29517d266960784 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json -8dc550f42ca8270dc3c6d98eaa270e346eeeef20 data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json -1ebc0797ea321249ac527b39e383af6e8c81a76e data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json -941a750649fc69ff8dc9629056552085ff0a4f1a data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json -77db39daa5ea2e697e7266c28e2596a55c5baac4 data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json -90d4390fe6f7c5bb8246f959a4b34251a8ce9dee data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json -c6a7e1aaa5a221169c9c6f2853e070245613a039 data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json -80a87b25d06038ae0a0b867f617ce79bdb7e8bcc data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json -8e68638672aded0392ab42d4d99747032a597867 data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json -43faec67909f1522a7285229365a9a74cb0ad37a data/byg/advancements/recipes/byg.byg/wood/maple/boat.json -b467c6707348baef2f15cef04c23ff4a24576de1 data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json -b2883df48e5663f2fb64d4192ff2bcdcad0e81e0 data/byg/advancements/recipes/byg.byg/wood/maple/button.json -edfad60db534edb1922271caf4e9d167898b4d6a data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json -d9a9cda1cda4ccd5094e5bdd47a99729b4f3f6de data/byg/advancements/recipes/byg.byg/wood/maple/door.json -d5afcf929b117947a249d990c7a38c1329602d83 data/byg/advancements/recipes/byg.byg/wood/maple/fence.json -403c513bdfe578de2ea2726773f16770ed3d9f90 data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json -b2b8f0a248822d59d7decf84408e84f067bc4250 data/byg/advancements/recipes/byg.byg/wood/maple/planks.json -02563db07b402d445c35fd495bd615c66aa46517 data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json -3a3b6f8ac79b351af8b5e105f05badc0325b807a data/byg/advancements/recipes/byg.byg/wood/maple/sign.json -b723b3e3ecf3d647499b4afea51157d5be61b830 data/byg/advancements/recipes/byg.byg/wood/maple/slab.json -8f3ed300254a103a0bf9b49eb0a6bc4527f3e2a0 data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json -2462c5675fe9ea34bc455e158b73d28f2b995210 data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json -dbd728616dad0e093ced3413b877a61ac4553ba2 data/byg/advancements/recipes/byg.byg/wood/maple/wood.json -ca3828e70ccfd562118f860470807c205294bd08 data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json -b0cc3d01f15d0ed8ecbc72784297f5eeee23f2c4 data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json -d7cd6788013f6af1288e4ffea4778200b7661e83 data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json -55bdd94155956e116a9cf2b48cac5db8b767f3ce data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json -c560c853dcebf5028fb974bf928cd08a97effca6 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json -7424866d4cfbc7f66606837bd73fd4c358109cd7 data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json -95c181f92a7d0bede76c0927ab1ff9aaeee9edaa data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json -6f77c8749d512ac370c4e3eeda4c2620f8ced14a data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json -486c3cb51603387efbaf01f94c56323fc71bb474 data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json -6237257ab8d96d71f1482649060d9b48dc04a039 data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json -a7581263bd5c31bd45d691415a2ad25c7117cb64 data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json -3a8450da76c3d276e069cbd7dddb6b7461f98ad0 data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json -7c99e79382b086d57bb1b498a474a602afefdc8c data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json -91ec4bd9aa552d0c8185558e473bd37dea9ed4ba data/byg/advancements/recipes/byg.byg/wood/palm/boat.json -ea278f1d625776b8651b4126ca2cbbff65364aaa data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json -742cf53a038d7572b6c0d2c290349c2768e24198 data/byg/advancements/recipes/byg.byg/wood/palm/button.json -8c5f37d7161c4811644c469de9db10b010351dea data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json -7269122ac7f4e3ca77a66fb6ac21b7ca910350dd data/byg/advancements/recipes/byg.byg/wood/palm/door.json -4e24e5388c8c084afdb20663d2dd4e4c5df2a731 data/byg/advancements/recipes/byg.byg/wood/palm/fence.json -44a7dc86b3fe68ce619d6a2b13485fb9b6dd8f92 data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json -45701258292dcade3701dfa6e86536873b530ed2 data/byg/advancements/recipes/byg.byg/wood/palm/planks.json -507824f93c6a3e112a25ef20217669dafaa235d4 data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json -49bc8952e16edeed3512d180b653927982a6db48 data/byg/advancements/recipes/byg.byg/wood/palm/sign.json -ded595aca78b27ff23c66f8d0584185e2764ffbc data/byg/advancements/recipes/byg.byg/wood/palm/slab.json -40c85e634608fe669547035181bb8c43be47449f data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json -a7caf367c6e2d197bc9d109a3fbc6e1e08bf26c5 data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json -835a274afc35e3c414eedfea46ff3490dd18a98f data/byg/advancements/recipes/byg.byg/wood/palm/wood.json -2601f00ad181a8241c41b4532a3b392ba5edb88b data/byg/advancements/recipes/byg.byg/wood/pine/boat.json -57646d0e8e563af6a06a6594f5d56c04166324c9 data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json -4329d9bfde52e9a0f1a200b4774f292502bb1677 data/byg/advancements/recipes/byg.byg/wood/pine/button.json -2e42c00057017485865d9d7de15270bb0488ef4b data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json -81e54278d436a6d512fd4398bf831eeab382bf62 data/byg/advancements/recipes/byg.byg/wood/pine/door.json -9c33fcee7a64cf151b8d382271a798bddcd94b1f data/byg/advancements/recipes/byg.byg/wood/pine/fence.json -b780788a4c989154d95b64d41aeb9c9cfc039e7f data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json -f35deddb85ba57119510eb56ebffd267c2ebd557 data/byg/advancements/recipes/byg.byg/wood/pine/planks.json -6cc95e191de6ba78c7555673c2c388d367223b30 data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json -6c5cc5c0284c3e6daa84a1e758f9daebdd14485e data/byg/advancements/recipes/byg.byg/wood/pine/sign.json -afbaf9dab1f1c68e97f3ca96cd99dc5b7ba04467 data/byg/advancements/recipes/byg.byg/wood/pine/slab.json -daa17726d156767ba4cbd318e8100b4ddc859561 data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json -7b1a7bb2a7e121fa7ae90e6060047368f7b9fe00 data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json -661b37dee58147b43c2380768c7e0ebd885237c3 data/byg/advancements/recipes/byg.byg/wood/pine/wood.json -11a02212eb35328204dbe54673bc85fa73e49023 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json -a8e6b01c7ad678cec2989535165cdfbffee15890 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json -bc9cac67350bfa0000edc13ff435dafe5cb33ae0 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json -13278094485b41341a5e7adb2ea05608146a92f3 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json -c43e07541d41471e3f6392e31f2d9fe7f0a33811 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json -eadce2b6426ac50951f1aa732979c4019cff07f5 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json -7d8ce6ad138fddf06b324945be9a96ff4b9c3528 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json -e8b1b41d81dac589ecf150cf0e82d57faa4a107a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json -6227f328f4b447d2f36e97c8d72e5ccb76a66424 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json -a3b9e342ef1d909d20192a3929d942ca5978e968 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json -7c133afaff2bb99301724866abb2596fa4da4cc4 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json -1fc9cd0e17b8ac252188befd4b65402ffbc3907d data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json -028ad9ae534f745665b580f11ea2d474eb2ff19a data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json -68b1c6e22a781e22a90ecf025f18ecafdfc56b01 data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json -5303b5bcda5e21c4d95e7b22859c6d61d90cb8d2 data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json -be69c1d9eb87be384841071b2f14ac154472f0f7 data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json -8cbf0f0522b814da6c47df545012edbbfa648b1b data/byg/advancements/recipes/byg.byg/wood/redwood/button.json -979c74fca934a4030705cce98237737564fb62e7 data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json -090a9d6d26f4b203b7c50aa3b2c3625120569d49 data/byg/advancements/recipes/byg.byg/wood/redwood/door.json -005d5d1488814462294bb7faced90409513eaed3 data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json -fbebcc53fe2b597c287a30264edda80ced5d92dd data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json -b7bcbecfef8c29248d0ca0f0c1d87a8b424e8fb9 data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json -f879c677c3fe2235f11dae49184d943c4d87481c data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json -23e151a5194c12babc7e90a132c92c5161b1a340 data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json -4246aff3798c80f6f7548f1b83f1b5bc9a749525 data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json -48f1097cdaca7296fdf09488fddf9297fd8811c9 data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json -f0f933eebd5cb12c59475982d53408f620c71ce3 data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json -ce977027d630e1d18301bbff458916b11621daa9 data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json -19d45ab8f2448d81ff581a7b3ae57740e956cf3a data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json -692c9b250fd64e1577a32ed705210ebef1844960 data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json -fe93f9d42ac9af2974e435cf70a6dd0adfb66de6 data/byg/advancements/recipes/byg.byg/wood/skyris/button.json -097b193a87e5439dff7dca87f83ca5cb81c0318a data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json -33abd0a4909407052fec6cc204ba87ce82d6eb51 data/byg/advancements/recipes/byg.byg/wood/skyris/door.json -aab1b61b74b8e343ac121d35dfbf87b607311534 data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json -91e61481d1b7640aea47e3bf37c39fc14bb450d8 data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json -ab1a468b669904bb3b22409f06ce5345300b54db data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json -b630b384d3f541bec7bd863d16aca2f2b8a7edad data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json -bab88f8d8dab7ab858cc8a6eac45901f3843f4a4 data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json -a83d445b4c5452b3e0f13e3ecf19b4ec7adae235 data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json -6732c2a40272a07e9477266dad98b084b3f0ccdc data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json -1005e61c2f79e7a742e473ac164b11deac03fe5c data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json -3ae4185f349cbc9d0bca245ecb212eaa978d6eff data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json -57ee2ed86380b7aa0205fea50d7418d03aaa71b6 data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json -93a68ce74502ff43c1dcaac2c0a3bc1b69af1b5f data/byg/advancements/recipes/byg.byg/wood/sythian/button.json -bed0fe7f9f783c594170979ab9af60abe160f5c7 data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json -3d16bd72a5351057df108a5d8ff1dae34e481a82 data/byg/advancements/recipes/byg.byg/wood/sythian/door.json -9b28b5d51bb6bcb049ec344a25a015f0d4c0054a data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json -4fddc714997fcbe7e2c371553ea37de3772c8739 data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json -07dcd4470b107c239d1a00488eec0772816b45ed data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json -1eb44357bceb6eebb4cf88464d9e2dfd1d3eff52 data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json -2a331da6611dbb222b93ebb7828016727d204b5d data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json -1eb658f6cd7e634bace3ed76afc5f7733e3a358f data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json -6ae698e128fcf2fd1020eabaff033be7788dfcf6 data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json -b8d75b0c9d037bf5d186265c3a2b8f92f8f6a5e9 data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json -b32eee896d4570b91f505cf05117e2e76d3f68a3 data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json -48dbd2f4c71c5116e529c19ef8033dee0b232fda data/byg/advancements/recipes/byg.byg/wood/willow/boat.json -13bfcd87821c7ea0d55a275910defa7dbc7a1a00 data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json -34f9f4691439d3288e486685671b53c5f2e30ba1 data/byg/advancements/recipes/byg.byg/wood/willow/button.json -249a772fdd1e4196d027deca01982a5b38830ab9 data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json -6691deb6b35bde56911fb640a71c5ea4fddbe8b9 data/byg/advancements/recipes/byg.byg/wood/willow/door.json -e29da2c4e8fd38b40d92e8b6e320afb8d1bb56db data/byg/advancements/recipes/byg.byg/wood/willow/fence.json -5f7c4ceae94bc2ff3aa19ce230ef6d66cc0c18ed data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json -8f1a00431112150c0c0044fea6ad876d8c9495e5 data/byg/advancements/recipes/byg.byg/wood/willow/planks.json -d04480bf1d069032f9466601054d79b6e8b40296 data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json -7133a479391f550218a8ac40afa5a6a5614f1cd4 data/byg/advancements/recipes/byg.byg/wood/willow/sign.json -dd4b6fd9c90c3ce98f842957d2aee4f2fb1dcd39 data/byg/advancements/recipes/byg.byg/wood/willow/slab.json -812032f12d83f5125bfc7113c6592491ec8911f6 data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json -44da6f86672f69a1e64351f411b9ae7a3e445518 data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json -940bf82aab8c2b9588754696772c658a2aa920a9 data/byg/advancements/recipes/byg.byg/wood/willow/wood.json -9f805ae39e7c572808e8c976de35ca965ae2cf2d data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json -ec86022bc854cf72b10c54b04f05b7b757af4fbd data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json -897cdf37e19452bc0907e3691dba6beffa093bf7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json -cf525bbbb4bb959682827f7c862ee986115d639c data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json -a186210030093ba5c30b6820e7bb2325b8cd9a6c data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json -04ba72598f109172c525f8fb471bfc29d46cf57e data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json -6c7c8dcbf4a3f58ed04126f191c5b75fbeb0ee40 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json -cef8647c4e6d4fd7167fe917133ece74cfc11a61 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json -816ef82b64f6e7859c006d51164e180c560d77e4 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json -c5091c1ddc4657ea6a4d7ebb80162b090b876e97 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json -6e1be4972fd1e7b9d8ec96f0f933b2c666c26fae data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json -bb44865b80806f1bc536521caecfbd752f4d12c7 data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json -5384dd297cf8df2c86d6ccad6832bf54fd640fbe data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json -75e7d4fdf4c5ff2864b418c43dd8eaf1c14bfacb data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json -736dd39bb9d8dae6da8d3ac2d43332a4fc2d26cb data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json -efab17ac82f54c8f3a9ba30d45db96b398457518 data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json -91bbbf24b0ec85585a30322410cadc45e5a135b6 data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json -0b5b85ec3cb786c0b55c51fc4ef6e0e2004c1cf0 data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json -57696b92a14bbd456d045df4e5251674710445ea data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json -c59b21fdafb3dc04832f154d75c9baed1033b052 data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json -747a3bb3e57b40c834af5aba294ee78364fddb0e data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json -ba9f51cd727d9e0365d68153fc5d2a25e9c4035b data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json -d7c781e47dc8891cbb9a0c2660c64dca75fcf983 data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json -44cd52f9905f74870358719860e566501154d1ab data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json -3bf8c396e8086903d0eb0c71dcde3f2e305423a7 data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json -b0cbd5fdb61a5c8ccf6a5a58a4bfad85b3acde92 data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json -83eb246f22ed55bd11083437fbf8df5221ef5089 data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json -2e794f722e70ffdda0a17dbf28c0f8716abdf426 data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json -cb3a3db82ae7cf7e9ccd64506839fb01b1c9ff88 data/byg/advancements/root.json -0b07e0f24ecb7068098deca783fe2b64e3585ea9 data/byg/loot_tables/blocks/aspen_bookshelf.json -b95983751ee141014ab4d5da3b7820081af854ec data/byg/loot_tables/blocks/aspen_button.json -662e15ceb338efbaf51aa9d94400503f24cb00be data/byg/loot_tables/blocks/aspen_crafting_table.json -af5f616aa7f9ea8573b9639071b50d0305e4635e data/byg/loot_tables/blocks/aspen_door.json -30a946aa6c8dd39d8dd2d677638dedd8d1f2fa12 data/byg/loot_tables/blocks/aspen_fence.json -21ee1898479133b3688b6e1b5d6b16afab20fdc9 data/byg/loot_tables/blocks/aspen_fence_gate.json -338cd97383cb526387ab2c048cbbda3a515c8e04 data/byg/loot_tables/blocks/aspen_leaves.json -19d887c454d95c68ed77fc444f695c831709b188 data/byg/loot_tables/blocks/aspen_log.json -72a4f570456e6ea341d4837f966b43a1c7f59988 data/byg/loot_tables/blocks/aspen_planks.json -bc3c651912acbb22ea8543e73010d90c410acea5 data/byg/loot_tables/blocks/aspen_pressure_plate.json -cb535913fb27b9190af7a197a5e345f95c083b24 data/byg/loot_tables/blocks/aspen_sapling.json -55c9c8b37698b43ea1e00bef2e8c4cbf38134838 data/byg/loot_tables/blocks/aspen_sign.json -36661d9bb16a6562aabebdd8940edb4bebc373f0 data/byg/loot_tables/blocks/aspen_slab.json -7d5c98ad0c2c8cfa705fedbcb19a0011a2378222 data/byg/loot_tables/blocks/aspen_stairs.json -14d5ebca01f19097950358c70a62850fdabad3dc data/byg/loot_tables/blocks/aspen_trapdoor.json -33d3b7c1f28c9eeef9fe1975fa994a483a2037cd data/byg/loot_tables/blocks/aspen_wood.json -4206b41d4b82beaf6eee7fa99d23fea74a70536f data/byg/loot_tables/blocks/baobab_bookshelf.json -eca2357a8d6ece9830f0514688e15b66b726043a data/byg/loot_tables/blocks/baobab_button.json -d7027b6283850cfb3d1b0702dafb3a4c9219a825 data/byg/loot_tables/blocks/baobab_crafting_table.json -227c32803507dc07637b36bc8d5781c6dbde293d data/byg/loot_tables/blocks/baobab_door.json -6ae8dd6731cb4ecc83daf58a85622264eee5cd80 data/byg/loot_tables/blocks/baobab_fence.json -652d8af51a71e270a09c81e60616897cc1c70aeb data/byg/loot_tables/blocks/baobab_fence_gate.json -7139f955046b4e9a108de43ccf9f47c30bd4be11 data/byg/loot_tables/blocks/baobab_leaves.json -08dc448e135f6b6e0027a81a9f2593c4cff33da5 data/byg/loot_tables/blocks/baobab_log.json -982d0fd10518afaabaa0bdde22d45da5ed5fe67c data/byg/loot_tables/blocks/baobab_planks.json -5c9de6c0fa0c689c06d9412660c9dbde44d7d2e7 data/byg/loot_tables/blocks/baobab_pressure_plate.json -392c1803655bfa041bdd488fefad7f7dc925262e data/byg/loot_tables/blocks/baobab_sapling.json -4037435c6c1c096f7cae08b5016fed4dcba57b0a data/byg/loot_tables/blocks/baobab_sign.json -b7cf8dc8435b21b62e40a89c8ee95df10e3bc45f data/byg/loot_tables/blocks/baobab_slab.json -f301cf55de793df46dc3825ec481de7fbb85c190 data/byg/loot_tables/blocks/baobab_stairs.json -1c091e05557eb61d63a0056f3a4ce526ae650e9b data/byg/loot_tables/blocks/baobab_trapdoor.json -fe6db0c642a7597326d61d09a4a9020094ed5d1f data/byg/loot_tables/blocks/baobab_wood.json -a5f1874cc92c98366cbd1097a715cd7ea75cc74f data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json -4d0e5d661f4a39a78b604a91c821fa114b13557f data/byg/loot_tables/blocks/blue_enchanted_button.json -65485e0e55fdb1d6c1443a01ef1bbf4c726526dd data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json -c6da00ffc357a998b19006e678f0425a667b01cf data/byg/loot_tables/blocks/blue_enchanted_door.json -e21bc026e43d1646d3eb86e17717e583c40f6bc3 data/byg/loot_tables/blocks/blue_enchanted_fence.json -59354e27a4750867fda03dd9feaebc822fb236ee data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json -a79a06bfee5670dc52d09f97978a2f56f2183b77 data/byg/loot_tables/blocks/blue_enchanted_leaves.json -752b7605b02933faf0fc9098134c468082bb4a39 data/byg/loot_tables/blocks/blue_enchanted_log.json -a640b504a8890f3fd94e9322119918aebc8ac1de data/byg/loot_tables/blocks/blue_enchanted_planks.json -fae23599b47dc89793294be20b55c37fd15650b7 data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json -06442c880a0b922e24291c50238e20081777d6db data/byg/loot_tables/blocks/blue_enchanted_sapling.json -c02a870dd91dc7acca26256529916c05a90ca752 data/byg/loot_tables/blocks/blue_enchanted_sign.json -b1b9466559f2be5df34098b73ce509d482053367 data/byg/loot_tables/blocks/blue_enchanted_slab.json -79451c11891e56c348e1274be7b91040b27fcaa7 data/byg/loot_tables/blocks/blue_enchanted_stairs.json -8dc1ed2cac3ed834df9ca9c5321c94cd2308ee0e data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json -6de2d11e5858e6f3a0c8bba9954fe56fa279ad05 data/byg/loot_tables/blocks/blue_enchanted_wood.json -3f6cf056307c66a280b1aff970db53f2ae1224ff data/byg/loot_tables/blocks/bulbis_bookshelf.json -b1af433ab8cc9ce7326c33467b0ad8c67710dc26 data/byg/loot_tables/blocks/bulbis_button.json -703e1bde2d184279daed49bd8f9db32ff7a040e1 data/byg/loot_tables/blocks/bulbis_crafting_table.json -65bed264f2f82a664524234750c7018e7aad9d4a data/byg/loot_tables/blocks/bulbis_door.json -64b926492434675de16b8cec2c466bcb07fea5d5 data/byg/loot_tables/blocks/bulbis_fence.json -0fac0c532ae951e142f77d6c90e160a20bfcc454 data/byg/loot_tables/blocks/bulbis_fence_gate.json -4c0eb782a74bcb2a98ce447a26d1edc80879655e data/byg/loot_tables/blocks/bulbis_oddity.json -5d9aaa8aa2b977180288229a3e0ce8a825d3b0cc data/byg/loot_tables/blocks/bulbis_planks.json -60c9a35a289f69ded442f44a39470bc8f8a6434f data/byg/loot_tables/blocks/bulbis_pressure_plate.json -4a1203d54f801729b8ce5bc4dfe2c921dc9b8cb0 data/byg/loot_tables/blocks/bulbis_sign.json -03490d0f7d61049458affa07a2201c3581d1f382 data/byg/loot_tables/blocks/bulbis_slab.json -71645d8e9808ae02c137ef808c06c1966ba01c5d data/byg/loot_tables/blocks/bulbis_stairs.json -b44c2fba3b513ac7e603dd32016a6f3034e29bbf data/byg/loot_tables/blocks/bulbis_stem.json -fded613a2178b64350464203c2518bbd11607278 data/byg/loot_tables/blocks/bulbis_trapdoor.json -ea8377aa3bf6024ac93ba553f1e02c4fb52d4f88 data/byg/loot_tables/blocks/bulbis_wood.json -2b8804a5b5b657d35355d531169e05c424751a07 data/byg/loot_tables/blocks/cherry_bookshelf.json -e2878b43b2e19bdd871be95a845ded82906c1ece data/byg/loot_tables/blocks/cherry_button.json -c49587169299d75ad0100091e452dadf474a88a4 data/byg/loot_tables/blocks/cherry_crafting_table.json -6ec4768046dd343159034fdd1576041ac2abd85c data/byg/loot_tables/blocks/cherry_door.json -8701b082baaea79e81d7ea9132ae59d981953de9 data/byg/loot_tables/blocks/cherry_fence.json -c326165e4c573ce89cdd28377dd5b74d4f7d52bf data/byg/loot_tables/blocks/cherry_fence_gate.json -5d0b722797fa28822bc9f5ffb7c26b834f15ca1d data/byg/loot_tables/blocks/cherry_log.json -28301e9d562bbe8d909c45cfff5f5d13d9341b88 data/byg/loot_tables/blocks/cherry_planks.json -ca80674bc1eb79c1aa7aea0d93f8485f9d2f5927 data/byg/loot_tables/blocks/cherry_pressure_plate.json -7ac809b8875c8419e3283f8803368f8cfe24f873 data/byg/loot_tables/blocks/cherry_sign.json -f8ff03d7566e10dcacbc83d28a5bfbe5d84ca546 data/byg/loot_tables/blocks/cherry_slab.json -c1c9d9ddf407512eb0ba487e9dc69d720e9e6833 data/byg/loot_tables/blocks/cherry_stairs.json -cacda2362ff78a98a84e6b13a07314702f8d74b2 data/byg/loot_tables/blocks/cherry_trapdoor.json -5327af26d404e8e5c660474d07c677180614b55b data/byg/loot_tables/blocks/cherry_wood.json -3b57e5bd631bdfe6423074c30b564ff5e30d4944 data/byg/loot_tables/blocks/cika_bookshelf.json -bc5be024ad487e73247855c71c22dbca9cb56ac7 data/byg/loot_tables/blocks/cika_button.json -314d0b660831571f776fa2a778fba2a69bd35fdc data/byg/loot_tables/blocks/cika_crafting_table.json -9946fb00be45aabe159ca347a18abf2bd7e7bd6c data/byg/loot_tables/blocks/cika_door.json -11671280f281de854b04f624db9a74cf1099d14c data/byg/loot_tables/blocks/cika_fence.json -32008353f7ed7cfeff005b32970f77b69f91ea33 data/byg/loot_tables/blocks/cika_fence_gate.json -3357c7cf462c60807b9897c650e058a22df1a844 data/byg/loot_tables/blocks/cika_leaves.json -c38905528f4e8f4ed69e4c9e7264dedd1f0209b2 data/byg/loot_tables/blocks/cika_log.json -4734f29e2d9ebd4f8c4622769d239729cc78e912 data/byg/loot_tables/blocks/cika_planks.json -8953a3fd62c3c3255de7d96f95a972b146cad8e2 data/byg/loot_tables/blocks/cika_pressure_plate.json -a735c30655c5dc36796e43ce854009662e7addb0 data/byg/loot_tables/blocks/cika_sapling.json -2677544542f52a8b331c01b503c635558c12f788 data/byg/loot_tables/blocks/cika_sign.json -34101344ea1dc71e88ec28f43d84356f755f7999 data/byg/loot_tables/blocks/cika_slab.json -1a8c607cbceef4bddc7adcb5f03ba77730b7841c data/byg/loot_tables/blocks/cika_stairs.json -20e02bbe50b60d345bf800bb0975f5f84b479386 data/byg/loot_tables/blocks/cika_trapdoor.json -77ce5e84a6faee2eef4380525a74d1d65556f60d data/byg/loot_tables/blocks/cika_wood.json -27f58d530b420003d34a72c7cacd9de64263add3 data/byg/loot_tables/blocks/cypress_bookshelf.json -af22c3f2cfba04cb6b9cdfa3821241e476b74210 data/byg/loot_tables/blocks/cypress_button.json -81515f4f11fd368f5a7604b2a1cd6ab0e1dbde68 data/byg/loot_tables/blocks/cypress_crafting_table.json -84cd53fe0bdecdfe3475147f7982082d3f390492 data/byg/loot_tables/blocks/cypress_door.json -b5b7b8207a3d17bea6c8707247b082d6a00e5f9c data/byg/loot_tables/blocks/cypress_fence.json -bb34c2617f63b091aba14e9195475a80eec662ca data/byg/loot_tables/blocks/cypress_fence_gate.json -d03c3e10d2e573d1dd930a52fbc899c1f94e48b1 data/byg/loot_tables/blocks/cypress_leaves.json -369a36ea1de7d9b9f357a49544bd7e370550e961 data/byg/loot_tables/blocks/cypress_log.json -e1a5d5a54d4b14ee9982c6425a06b5efa1649d65 data/byg/loot_tables/blocks/cypress_planks.json -3fdc753ebb1c84c21f2ab9f77e87293c2a0ee5a8 data/byg/loot_tables/blocks/cypress_pressure_plate.json -e26bb6c61c1d9f981c95c5836766fbc2a7abc7f9 data/byg/loot_tables/blocks/cypress_sapling.json -370ca78afa49724bb9dfc537995ab5007f20a522 data/byg/loot_tables/blocks/cypress_sign.json -9b8d675c8db24946f09cfa31a35983ca4029240a data/byg/loot_tables/blocks/cypress_slab.json -c3e11ce37f30094bce856f06809293a985ed1fca data/byg/loot_tables/blocks/cypress_stairs.json -15135f4d2e7c93418010f97e7d29990ac1202dc7 data/byg/loot_tables/blocks/cypress_trapdoor.json -31eab5bae670a11780104cb75b2f7ce1577a3eec data/byg/loot_tables/blocks/cypress_wood.json -86a97f6c979905406977b7cd5c5839ddf3bcae91 data/byg/loot_tables/blocks/ebony_bookshelf.json -ac092a19856b84a17f47109ab9d530629adc3b31 data/byg/loot_tables/blocks/ebony_button.json -64568a12d9216d9eabbeb8a52df00fe993c72366 data/byg/loot_tables/blocks/ebony_crafting_table.json -2934da86e844aae53806fbf1216d0db9ec065a36 data/byg/loot_tables/blocks/ebony_door.json -75315c927b6a29da4935700a83bd29c3cc3ceaee data/byg/loot_tables/blocks/ebony_fence.json -c8114d5a8d721b438a2c67f120526ecf9ae5e5a2 data/byg/loot_tables/blocks/ebony_fence_gate.json -16d2cd09299de5112805816f994f8d2586782cb4 data/byg/loot_tables/blocks/ebony_leaves.json -f028142aec62da97824b7268ba60cffc797daeec data/byg/loot_tables/blocks/ebony_log.json -7916dd819b3daeb5f66dfa191d8bc92c19488092 data/byg/loot_tables/blocks/ebony_planks.json -666c8b5d0345249311620c4239419eee84358c97 data/byg/loot_tables/blocks/ebony_pressure_plate.json -75baaf6d65cdf78c0661fb3169740e0b970cfb65 data/byg/loot_tables/blocks/ebony_sapling.json -2ed50e5aecbb6f6c37ae5aed0178bb5aac72187a data/byg/loot_tables/blocks/ebony_sign.json -121b3bdb6d3fb501abefc428286c589bb73683f4 data/byg/loot_tables/blocks/ebony_slab.json -67e33650222524c6f81b67da6d0ab7c6f643222b data/byg/loot_tables/blocks/ebony_stairs.json -51fd339251c32e2d0eb0f8c97cd64051984ccbab data/byg/loot_tables/blocks/ebony_trapdoor.json -da6dc9ef66a7ba179c8e2862783913344887530c data/byg/loot_tables/blocks/ebony_wood.json -c58d44f6601404fd83926f6416f7fa14ea69b472 data/byg/loot_tables/blocks/embur_bookshelf.json -1fced081bc8673a2763b8cd2ba13fb5439c05e36 data/byg/loot_tables/blocks/embur_button.json -1f345c505e0b9dd243ef89ff2ba6bac53c3da9c8 data/byg/loot_tables/blocks/embur_crafting_table.json -e8085a5d474fa62b0ff685e669ae6f3040edc3f3 data/byg/loot_tables/blocks/embur_door.json -1db55d0bc304f48fa689fc21c239d1de69bd57cf data/byg/loot_tables/blocks/embur_fence.json -41d68376e6e947867621fb5619a9f419c892b48a data/byg/loot_tables/blocks/embur_fence_gate.json -8907786637746a8cc10eb14eefae43e91b772c08 data/byg/loot_tables/blocks/embur_hyphae.json -2b5fe9da810badb614d8b0dc59e9fb5d3a4d37be data/byg/loot_tables/blocks/embur_pedu.json -ff41398d1e169f0b9fa5f978b15659a302d75bda data/byg/loot_tables/blocks/embur_planks.json -47f0468fe2b90fab3e6dd7d642d82ee43499f444 data/byg/loot_tables/blocks/embur_pressure_plate.json -62cadaa1cbb9fc9f6229b366dbece3fea3f97b9b data/byg/loot_tables/blocks/embur_sign.json -fbd42fdc4106ecfcc9b72e9488a155fe00d3e397 data/byg/loot_tables/blocks/embur_slab.json -16d99e9aff0cdadd33e81881af97dba1f93d1e6a data/byg/loot_tables/blocks/embur_stairs.json -aae59db4b06a2eb6c8cb9c97f3dd71d83f78b3eb data/byg/loot_tables/blocks/embur_trapdoor.json -05cc992603c03a862cc8bac30ab3f477d8edcc24 data/byg/loot_tables/blocks/embur_wart.json -a7b9e7d984f17a67f8c81cd3982af2e89eb0191a data/byg/loot_tables/blocks/ether_bookshelf.json -c96944e8b0e59dd2c6bcc3ed6d65d44190b8b57a data/byg/loot_tables/blocks/ether_button.json -bcc9c6ebfa396f82c8cb2a0e13c0c190ca8716de data/byg/loot_tables/blocks/ether_crafting_table.json -1e306af8ab8a5b38c10539deed00468f7e0152af data/byg/loot_tables/blocks/ether_door.json -9e284c3bf55a1a10b7580ff320255f6ae7d75cf5 data/byg/loot_tables/blocks/ether_fence.json -9bc6daad4cc923978110adbbad7036e1f2815b8f data/byg/loot_tables/blocks/ether_fence_gate.json -ad6a63db380b49cc5badedfd4cb06244004ec6a0 data/byg/loot_tables/blocks/ether_leaves.json -0115e84d961a5feeebed2a8bbfa03b68ab203492 data/byg/loot_tables/blocks/ether_log.json -3de26ec684d8f939600c4c1c3a11a669b1eba73a data/byg/loot_tables/blocks/ether_planks.json -8c8f883f9b45307ec49b02302878a5d420311a06 data/byg/loot_tables/blocks/ether_pressure_plate.json -e161bb580cd8ef6eb2908e07accd0ac52b1e7fda data/byg/loot_tables/blocks/ether_sapling.json -45044463f8b045fb1425aec899317c452b969a3d data/byg/loot_tables/blocks/ether_sign.json -fbd6f5bd03a2a635d1420c62f9a391964cbe5bfb data/byg/loot_tables/blocks/ether_slab.json -0695606ed0b53636f0f14f13f61c2c3af1c20ec1 data/byg/loot_tables/blocks/ether_stairs.json -118323ce7bf34cf1186c3822ab007965eb3003a8 data/byg/loot_tables/blocks/ether_trapdoor.json -b33c35edd119f169518a9058c41fbec5605b1e58 data/byg/loot_tables/blocks/ether_wood.json -0daff7051014f873d38df9086ccf93fb703b716d data/byg/loot_tables/blocks/fir_bookshelf.json -7a5d5265f2cdb9dbac91afc71804148496fa7461 data/byg/loot_tables/blocks/fir_button.json -8e7bcc75bb0bd10fe9309efa9278d02e02cc91bf data/byg/loot_tables/blocks/fir_crafting_table.json -d7337044143e7f6195e6e47d845b3963acc7ecc8 data/byg/loot_tables/blocks/fir_door.json -8e139527dd25c93a4cbdcec7d05875c15ce7bcd6 data/byg/loot_tables/blocks/fir_fence.json -83770eaa84df8f34f4a59159a81b29765999cbba data/byg/loot_tables/blocks/fir_fence_gate.json -ffb0a30e5fa09b7352b937438762bc75b5bc31e9 data/byg/loot_tables/blocks/fir_leaves.json -b5efec5ac3a7d060de56206154777b991e0575bd data/byg/loot_tables/blocks/fir_log.json -d13ec6203800992a6fd515d62d672b632157cd29 data/byg/loot_tables/blocks/fir_planks.json -a338779558a66fe18918fb95eb7e14693cb53591 data/byg/loot_tables/blocks/fir_pressure_plate.json -f95ff7bec8df583ed0e3549aa19629709cfc1670 data/byg/loot_tables/blocks/fir_sapling.json -cf1245faa8f10ec2c0149fbb0b3960964b05e124 data/byg/loot_tables/blocks/fir_sign.json -1ca421fedcaa795f4069108e2676e6ff0b83d576 data/byg/loot_tables/blocks/fir_slab.json -23aa64d28acc7ee6b388c7b1dcda4bf8116271dc data/byg/loot_tables/blocks/fir_stairs.json -d358f89ab615ded7e4951788315b78f2e0527e58 data/byg/loot_tables/blocks/fir_trapdoor.json -a0335a6e6e3af10f36e34b492ec814bb82eb4020 data/byg/loot_tables/blocks/fir_wood.json -b85a39b8448fd6f1776263a0b829f498d16d445e data/byg/loot_tables/blocks/green_enchanted_bookshelf.json -3ed3a7d4d278bfba4b205f8f68e2455cd3be85fa data/byg/loot_tables/blocks/green_enchanted_button.json -276154e78973b604e97ec4f95e3c9df4b48b0f92 data/byg/loot_tables/blocks/green_enchanted_crafting_table.json -3382d03c3358196fc1d5d1d843c58c0ae2f6b8ba data/byg/loot_tables/blocks/green_enchanted_door.json -e8ecd7b363abd3e21c30a8a9ba7b8c00db3163b0 data/byg/loot_tables/blocks/green_enchanted_fence.json -eb5ca6d6605b68dd14397ced1f9a52743b83af64 data/byg/loot_tables/blocks/green_enchanted_fence_gate.json -342065120f5cb2cf1a39f450eace7affcee41386 data/byg/loot_tables/blocks/green_enchanted_leaves.json -a3ee2f2889c5a1c21f100a8bb95a8565f3527d5a data/byg/loot_tables/blocks/green_enchanted_log.json -7ebcfb1eff1630db1b22fd063044d0227f362da9 data/byg/loot_tables/blocks/green_enchanted_planks.json -c0b8c919fb298929b7750fc85d79049dda97eeb8 data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json -a94f96a5a606d0d16c0de9804f33fb6e7dfef249 data/byg/loot_tables/blocks/green_enchanted_sapling.json -636eeb180b2131c700732f902568cad4e36ca57c data/byg/loot_tables/blocks/green_enchanted_sign.json -428c3f3d1949976d76381ea8effc71aa644aa9e2 data/byg/loot_tables/blocks/green_enchanted_slab.json -682af6470c2c7f943c5d1bc0dfd76d7c7bcd08e4 data/byg/loot_tables/blocks/green_enchanted_stairs.json -d2565d8758262679b33115d0f15b531e9ca3f589 data/byg/loot_tables/blocks/green_enchanted_trapdoor.json -06819a59828310a03616213d86ef43b49505f7bf data/byg/loot_tables/blocks/green_enchanted_wood.json -f17aa36ff3887324d909cebd4137d1607728b67d data/byg/loot_tables/blocks/holly_bookshelf.json -ef6a60f38ed07626b80a06f94e3eb022c7426df3 data/byg/loot_tables/blocks/holly_button.json -d20b04b9f7fb9c387b6439a6a863c46fadf7fffe data/byg/loot_tables/blocks/holly_crafting_table.json -866bef04ee6549732da86c4e76107937c6895afa data/byg/loot_tables/blocks/holly_door.json -5b657f84fbd921f423b723d08e57ab572f3fa15a data/byg/loot_tables/blocks/holly_fence.json -ea949079f62370ccb76c7edde0353453f459bf43 data/byg/loot_tables/blocks/holly_fence_gate.json -8f17bd3900d5ff469263a9e758bc963bf147fb9b data/byg/loot_tables/blocks/holly_leaves.json -9f39abeb58f96207d9da919c1a50b214c07648b7 data/byg/loot_tables/blocks/holly_log.json -4b54a247279c00691501eb65ebffc752777f4d2d data/byg/loot_tables/blocks/holly_planks.json -b4def8b29dccd71683084287c244da9f839a6ea3 data/byg/loot_tables/blocks/holly_pressure_plate.json -269bff7d19dc9a2cabc96079686f8304d14f797f data/byg/loot_tables/blocks/holly_sapling.json -d8b7111d5901acc22e8bc2e165e0f17ebddc186a data/byg/loot_tables/blocks/holly_sign.json -75e7b6e8b039bb1438063b0dc6fd8bce9f300b0e data/byg/loot_tables/blocks/holly_slab.json -849571d9a9f29d2e3a2c048469f7056e7c89bdb7 data/byg/loot_tables/blocks/holly_stairs.json -edee1c31489bf36cea8f929d4878493d3e8589bb data/byg/loot_tables/blocks/holly_trapdoor.json -79d8d2cab48084c0d17b49a2259897c1a98b3604 data/byg/loot_tables/blocks/holly_wood.json -ebf8f815a6f6b2f249d221bc2400af59e768f3aa data/byg/loot_tables/blocks/imparius_bookshelf.json -7950949e701661559e30b5030f593229b51ea37b data/byg/loot_tables/blocks/imparius_button.json -77f4507928937af499ff1ea766ec19b660f3fed2 data/byg/loot_tables/blocks/imparius_crafting_table.json -e9cc50a2d0ad301c961458b2ef7055f2d55d5976 data/byg/loot_tables/blocks/imparius_door.json -fc2a7d626071145a42a0386656ff6d584e862f9c data/byg/loot_tables/blocks/imparius_fence.json -1da8952cf9c247439db3e333a0fe81c140b2165e data/byg/loot_tables/blocks/imparius_fence_gate.json -5bf5aecb0c17f77f43db8d23641d346d5b77306b data/byg/loot_tables/blocks/imparius_hyphae.json -241b5c3b79acc99ef8861e9a9faf9283cdfc6dec data/byg/loot_tables/blocks/imparius_mushroom.json -136c1bbc57999a3d02296dd2407b55ff020b638f data/byg/loot_tables/blocks/imparius_planks.json -532082c639e9e66e8b2475c0a1ed0ae867a3b99a data/byg/loot_tables/blocks/imparius_pressure_plate.json -211616ef7f2bfb375aabfa2851d35c8865a6a179 data/byg/loot_tables/blocks/imparius_sign.json -70c90dac660fe61ee556750284b2dabe9e666371 data/byg/loot_tables/blocks/imparius_slab.json -36c9c862e04b27ef62f4ae3a53bd94eae96fc2f3 data/byg/loot_tables/blocks/imparius_stairs.json -3d36172be374f58f30fe3a00cc5a730935d85c54 data/byg/loot_tables/blocks/imparius_stem.json -9c0568917407b5286ef4a7f8da3423d89563b975 data/byg/loot_tables/blocks/imparius_trapdoor.json -0ceec5e3cc6eda6a767d58b57ee8174718a490e1 data/byg/loot_tables/blocks/jacaranda_bookshelf.json -0ca80df93af8ac7f4eaf1f8fa1b277aae0b773ef data/byg/loot_tables/blocks/jacaranda_button.json -1a28ed35384438b27b83a3952380bb87b490501f data/byg/loot_tables/blocks/jacaranda_crafting_table.json -6848c67497f792555a10da3f3853d350ceaef312 data/byg/loot_tables/blocks/jacaranda_door.json -b6661279d199d94e281ee3977bdc8664b5805aac data/byg/loot_tables/blocks/jacaranda_fence.json -ad53834ab8e2526cde5101930e463ddae1e1e9f6 data/byg/loot_tables/blocks/jacaranda_fence_gate.json -143d6d5bcec985db959e6d32fc1d3b866e115283 data/byg/loot_tables/blocks/jacaranda_leaves.json -05e2faff93825d25b97497cbb219b7ca19fc5d1c data/byg/loot_tables/blocks/jacaranda_log.json -5f6f4355961c76f5c989e9d88e92049f4ae2cba2 data/byg/loot_tables/blocks/jacaranda_planks.json -8e4b71f27e99356ce93717c87674467c8db7358d data/byg/loot_tables/blocks/jacaranda_pressure_plate.json -1139c74e917034b1281960e0ca28ac1d88e57096 data/byg/loot_tables/blocks/jacaranda_sapling.json -c7769235b1848f195c0f218f0b088649027f9556 data/byg/loot_tables/blocks/jacaranda_sign.json -6911bfe176770c4a0dfcf854f8c2864ef578f0bf data/byg/loot_tables/blocks/jacaranda_slab.json -0bd018ef3c769002b130d6b24f28a24f4ec7b37e data/byg/loot_tables/blocks/jacaranda_stairs.json -ab27f287e25d20b0a4611ff392ce22380a4223f5 data/byg/loot_tables/blocks/jacaranda_trapdoor.json -af14e7d2e14b57eb8ced83d1cc15fef550626032 data/byg/loot_tables/blocks/jacaranda_wood.json -f43805d8428f560b9d6769fe8225fb01faf75661 data/byg/loot_tables/blocks/lament_bookshelf.json -4d57a3d0e7d70a71187990656acd9b0be6a3abe1 data/byg/loot_tables/blocks/lament_button.json -d348ba543d6054932946e1fddf8b7ad06b137e32 data/byg/loot_tables/blocks/lament_crafting_table.json -ccc6c55e944eb7b992cf6e6f743a1f0121a26f90 data/byg/loot_tables/blocks/lament_door.json -b4dac1d2e406a42dddb4cd40296990094f8f4a3f data/byg/loot_tables/blocks/lament_fence.json -9232f874078b1a0411014d26559e70bf1cc21bec data/byg/loot_tables/blocks/lament_fence_gate.json -0bc626ae4086d4b92888d06d1394a6711320e517 data/byg/loot_tables/blocks/lament_leaves.json -3883b1767e021272c6fe7fe669124d5e0f6eb79f data/byg/loot_tables/blocks/lament_log.json -e126dad5e35224de08a7b558c7503f381da2b32a data/byg/loot_tables/blocks/lament_planks.json -14b9073a5dbe7705c932adc6594dcbe935edaea6 data/byg/loot_tables/blocks/lament_pressure_plate.json -abf4374f97c63c84c1ddca0bcb57d6208404a382 data/byg/loot_tables/blocks/lament_sapling.json -48e398efc5465f13730d32ce93c7454d2228ce62 data/byg/loot_tables/blocks/lament_sign.json -e535eec166ba82498cfeb98e0596db8b84a3c635 data/byg/loot_tables/blocks/lament_slab.json -ac67d8a344ed7abc98c55fcc299421aed5fcfe41 data/byg/loot_tables/blocks/lament_stairs.json -0c5cc01363ec61b45e9b00ab84c66bc392df48a1 data/byg/loot_tables/blocks/lament_trapdoor.json -c8a741720ca64ad7a1fcf9f9fd2e7dc1b327680f data/byg/loot_tables/blocks/lament_wood.json -93a87fe184c6c4247aa870092af80766c3e5da75 data/byg/loot_tables/blocks/mahogany_bookshelf.json -13ca364d14e638b723303c3e1730a0feac95f3e7 data/byg/loot_tables/blocks/mahogany_button.json -d25c27914da93622cddcaf0af79ea4e1267f3b3b data/byg/loot_tables/blocks/mahogany_crafting_table.json -6ed99a58b0dc5c9dbe186913297707bc14d2605a data/byg/loot_tables/blocks/mahogany_door.json -79e1a12370543521827617bd1f39b77243f95082 data/byg/loot_tables/blocks/mahogany_fence.json -9298cbe91ce8d512a72b1e94d958901bf53a4d69 data/byg/loot_tables/blocks/mahogany_fence_gate.json -1b4d022486a9b98c5bfcdeae1de9e16dddbce833 data/byg/loot_tables/blocks/mahogany_leaves.json -da526b5cc199d5d9de35cd3c7608fba35ee98918 data/byg/loot_tables/blocks/mahogany_log.json -b075b0714593d53f9dfab80a85453b70b676021d data/byg/loot_tables/blocks/mahogany_planks.json -bede3adce3a1d3cd47d92d5e0b5e7cd0c8e7135f data/byg/loot_tables/blocks/mahogany_pressure_plate.json -729663427e10d094a9ecc8b6af2d6f1bc0c73a4e data/byg/loot_tables/blocks/mahogany_sapling.json -22cc061aa32d44c245444b3081edd4910daf18fc data/byg/loot_tables/blocks/mahogany_sign.json -9f2552de57b885c8aaeae30b5b3265664d349aa6 data/byg/loot_tables/blocks/mahogany_slab.json -6a986caf4fa73189647e6a0d825cc7b28399c816 data/byg/loot_tables/blocks/mahogany_stairs.json -1b3fa755c297261101dde8f9f0b52635dd439b25 data/byg/loot_tables/blocks/mahogany_trapdoor.json -96080e9f1cee2f83c01aab28c5c1ecb48e0c2f5d data/byg/loot_tables/blocks/mahogany_wood.json -d730b4638d73fbf7385469320f48f63bfd9d6341 data/byg/loot_tables/blocks/mangrove_bookshelf.json -2c3b8be32153750bc34305195293176812878316 data/byg/loot_tables/blocks/mangrove_button.json -c0bb774e93fcdd5f97c7e2a52caa9f596e9bdbda data/byg/loot_tables/blocks/mangrove_crafting_table.json -26f591ab971134e9ea2e79b8ab6f0e52cb7513f1 data/byg/loot_tables/blocks/mangrove_door.json -b224d315a16d924f852f942a576f2ca803c556f3 data/byg/loot_tables/blocks/mangrove_fence.json -c6acf18645559df21af8f86f533dc55a11e355ec data/byg/loot_tables/blocks/mangrove_fence_gate.json -d6f9867d25584168ca53ce4932463b02ed02d481 data/byg/loot_tables/blocks/mangrove_leaves.json -106d6611f64658a7bcc35dfceeb419913e46cf97 data/byg/loot_tables/blocks/mangrove_log.json -ab9640aebd5b7051becb8330b3b3ca4a2c8e69e3 data/byg/loot_tables/blocks/mangrove_planks.json -cf7afd2bda0e77f0908580420b207df3364133ea data/byg/loot_tables/blocks/mangrove_pressure_plate.json -e0ca13cf682dc596004b95d01579177251a9d020 data/byg/loot_tables/blocks/mangrove_sapling.json -a3874b45f0a6e0ff99d21474cc9ff2ccbbe1232e data/byg/loot_tables/blocks/mangrove_sign.json -613e5728b8a65d7523176969313e2e9abe1e464e data/byg/loot_tables/blocks/mangrove_slab.json -8240221971f809efad5b37bf10bed010f22ed82a data/byg/loot_tables/blocks/mangrove_stairs.json -18845dd277a8a2df7c4eb27ce4ffb36e8a83b4d6 data/byg/loot_tables/blocks/mangrove_trapdoor.json -3a01f5c689caa9c5aac60c7c1e00ac6b99b73e1a data/byg/loot_tables/blocks/mangrove_wood.json -71f45b3e43e7b4267b5f58c4b4f07546dabc7503 data/byg/loot_tables/blocks/maple_bookshelf.json -deabed93799a3d04b60fd7c1b4f3d896aa44c0a7 data/byg/loot_tables/blocks/maple_button.json -d7a6ea9e02ab40c6a5393a17107824914bd10d93 data/byg/loot_tables/blocks/maple_crafting_table.json -f6f0a77d04e0e79362240eab358c992583e4bffc data/byg/loot_tables/blocks/maple_door.json -fa7a980bde5e91cf5a187f89c7a662f95adfa902 data/byg/loot_tables/blocks/maple_fence.json -7703da7a6672c4fe5b0d9a7c2f657d89c790681f data/byg/loot_tables/blocks/maple_fence_gate.json -ea09e4fd26fc6921d4aebbf18eedd9a62e1f5420 data/byg/loot_tables/blocks/maple_leaves.json -dcf4c978d3ef9af781d23b39ed1cf71fcf3f3ec6 data/byg/loot_tables/blocks/maple_log.json -5769a0932e5d7d8b3cfe69408bc1e3b78c2f2600 data/byg/loot_tables/blocks/maple_planks.json -26aacfbccdfe3f216e266da48fdd79a6cb70445e data/byg/loot_tables/blocks/maple_pressure_plate.json -98252b21bcff2f5164076c8b784b875c37623e05 data/byg/loot_tables/blocks/maple_sapling.json -804634e13f32af42a33fafaab08293eaa41a8e6a data/byg/loot_tables/blocks/maple_sign.json -6a2a86d26780cd384a47bf71c0800417019f4ab3 data/byg/loot_tables/blocks/maple_slab.json -00cbb21eb48df7c6c44068d3be42468825647aec data/byg/loot_tables/blocks/maple_stairs.json -d658f0a526928e209575b3a492c0b6aef5b786bc data/byg/loot_tables/blocks/maple_trapdoor.json -331c51c5d073d6af3b86cd4aa279a693f84bc166 data/byg/loot_tables/blocks/maple_wood.json -87e220679c53be065780357b7d77529bf06567d9 data/byg/loot_tables/blocks/nightshade_bookshelf.json -f229ae5f063941b76f20cf4409d1ad11c132e5fc data/byg/loot_tables/blocks/nightshade_button.json -743ba512d026791637bb531865d660996616892d data/byg/loot_tables/blocks/nightshade_crafting_table.json -e42f6cf52971638bd23b62647d15490b5ad6a942 data/byg/loot_tables/blocks/nightshade_door.json -67942b1c959805fb4e7ee1d94701193829a114b0 data/byg/loot_tables/blocks/nightshade_fence.json -aba8cacfdafb05d9e35f803c2b3a382dcb2c5ecd data/byg/loot_tables/blocks/nightshade_fence_gate.json -979b06d46c41b9249b6267c45f460ef8c4b0ef0e data/byg/loot_tables/blocks/nightshade_leaves.json -fe72d175883a5aa16a31af42087a8aa8b2a1a454 data/byg/loot_tables/blocks/nightshade_log.json -e30aca37414a4d43586ea65ddca320c88cc18ac2 data/byg/loot_tables/blocks/nightshade_planks.json -364607ffd1f2d819cfe96703e68e801792a518a3 data/byg/loot_tables/blocks/nightshade_pressure_plate.json -67c0c5601d82968b54791c8aadfa153b92031ea0 data/byg/loot_tables/blocks/nightshade_sapling.json -b625973e08e3a3da4450d21449b083eeed6fa56a data/byg/loot_tables/blocks/nightshade_sign.json -785e38bb4f0e1d858102052d2dc56b1d5b82e423 data/byg/loot_tables/blocks/nightshade_slab.json -fbbcb5affc50dc9abd82d7304180ac9f09df487b data/byg/loot_tables/blocks/nightshade_stairs.json -0aaabc0b78d63d2b7c99c91c0919130498f74aa2 data/byg/loot_tables/blocks/nightshade_trapdoor.json -067c3d4db68e91cde9cd56f7cc4fc49d11799c59 data/byg/loot_tables/blocks/nightshade_wood.json -80f616568386bed8d37dd3f53acad4883cb11dfe data/byg/loot_tables/blocks/palm_bookshelf.json -71cafb051c4aa9ead37442e7cd6809a0e395c7ec data/byg/loot_tables/blocks/palm_button.json -06f76e8bbd1e9ba952dde47461e2a76dec2c3f06 data/byg/loot_tables/blocks/palm_crafting_table.json -7d5b39538bc9d2291e8d3dcadbf5b320e993b642 data/byg/loot_tables/blocks/palm_door.json -2fb710286cff2bcb2d40cfaa6a5c9da49a0a1edf data/byg/loot_tables/blocks/palm_fence.json -6ff7e8aaf052ee23b2bc1570b7975729895f1206 data/byg/loot_tables/blocks/palm_fence_gate.json -b8358b9c867da230bf0483d551e52366618cded4 data/byg/loot_tables/blocks/palm_leaves.json -05016a6f4a8635eb026246c210de06a5b57f60c0 data/byg/loot_tables/blocks/palm_log.json -58384d14852400bb7791acebc5bf0d5fa6cf6422 data/byg/loot_tables/blocks/palm_planks.json -5a4badfc830f778596a964ff88b9775fb4799d85 data/byg/loot_tables/blocks/palm_pressure_plate.json -b27aea3350f52e86cdbf0994efd204257ca276e9 data/byg/loot_tables/blocks/palm_sapling.json -d0f4ae3d41a9d248ef0a01d0a4cf54bffe7458ad data/byg/loot_tables/blocks/palm_sign.json -8cf3450048c9c5f2372ea23a9b28c618874fd5d1 data/byg/loot_tables/blocks/palm_slab.json -648dfa24f653a034faa1691f17cb22a33c409036 data/byg/loot_tables/blocks/palm_stairs.json -81eaa1c8f3bb399f64bea1260e80e81871c001dc data/byg/loot_tables/blocks/palm_trapdoor.json -67b3f790fc11c6e4b03731265bb8c3a16a4b2e5b data/byg/loot_tables/blocks/palm_wood.json -bd37436617828b78c49c5d24065aaac8a932319d data/byg/loot_tables/blocks/pine_bookshelf.json -899ebf1140e7c1fe768fe74b204cee165b5ea175 data/byg/loot_tables/blocks/pine_button.json -2a2227520448b248069b7307139cb66b9dc1a506 data/byg/loot_tables/blocks/pine_crafting_table.json -2757a1e9a4609acae4c976cf3d44760b956b4650 data/byg/loot_tables/blocks/pine_door.json -f5eadb34ba92cfeee05663cd069d1eacaedd4a37 data/byg/loot_tables/blocks/pine_fence.json -1e0f61178071365f2a45186ceed71978d6eb06fe data/byg/loot_tables/blocks/pine_fence_gate.json -b5a1ceb6e374630b9880870c142fe9328ebe1adc data/byg/loot_tables/blocks/pine_leaves.json -1208fb898484a7a8f64bfd137e33c4c09c1f2d00 data/byg/loot_tables/blocks/pine_log.json -02077776920a661414aa886422346aefbe407c3c data/byg/loot_tables/blocks/pine_planks.json -183362b783e3eec4eb2b37f365ec621daac17856 data/byg/loot_tables/blocks/pine_pressure_plate.json -be5d48c28f718b36cd920af075223b3157489a8a data/byg/loot_tables/blocks/pine_sapling.json -671fefd52ffc07978507a400d84a1f384ed711be data/byg/loot_tables/blocks/pine_sign.json -60e6ded8e5bdc569d641a8ef03f6b77e9d50af96 data/byg/loot_tables/blocks/pine_slab.json -860beef877197883976c86ec033f813b36e0034d data/byg/loot_tables/blocks/pine_stairs.json -e57c157b678cbcc65bccfeaff51cf9a9a245bb49 data/byg/loot_tables/blocks/pine_trapdoor.json -02043c8d0cef3c0a6a6bdb8c04aa8a83a6660e84 data/byg/loot_tables/blocks/pine_wood.json -f7e86302fd3899228a4a4b91c466796df2152f7b data/byg/loot_tables/blocks/potted_aspen_sapling.json -6636d73c8fbf1de3a8f40116a908cc9b3065444b data/byg/loot_tables/blocks/potted_baobab_sapling.json -e2225831a46fe898d023257a5381d76384cb317a data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json -a73c099c69c1029c0a8463653cac049054b468d3 data/byg/loot_tables/blocks/potted_bulbis_oddity.json -2647a90a645aa14ecab5fc3b29e8dfaaacd6822c data/byg/loot_tables/blocks/potted_cika_sapling.json -30f9d36ce02753fe46a0f8cbf6853d3b30b8ee7f data/byg/loot_tables/blocks/potted_cypress_sapling.json -a847937232f84de33af109a4b1482a74d7f4d4e1 data/byg/loot_tables/blocks/potted_ebony_sapling.json -8cd7e5d30cf09050399bff4b8c609860c15e2c8f data/byg/loot_tables/blocks/potted_embur_wart.json -062c66924711bae4ce843457192e3f40c55409bf data/byg/loot_tables/blocks/potted_ether_sapling.json -b76854eeb5580ca1296b78af5dd50d6950d3a7fa data/byg/loot_tables/blocks/potted_fir_sapling.json -39201eca9dacc2765ce07cdd286bbfa19949c9ae data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json -5027042948ffb61a95a28b6fc9eb59dd7e6b77c9 data/byg/loot_tables/blocks/potted_holly_sapling.json -79f16533eb667b70fb13b42ad66a91cf38280d68 data/byg/loot_tables/blocks/potted_imparius_mushroom.json -aa82ebcb822d1dd6697f224e3ec7fde057afbf62 data/byg/loot_tables/blocks/potted_jacaranda_sapling.json -1d1c49cb919ce9a4fb1a478420704faada30b53c data/byg/loot_tables/blocks/potted_lament_sapling.json -2f0e74f824914a5366ebb3801db2fbb82f76aa94 data/byg/loot_tables/blocks/potted_mahogany_sapling.json -7b0410d3d354acf2108c5cf4337a1c262d7ccb5e data/byg/loot_tables/blocks/potted_mangrove_sapling.json -9322bfcc503b90681c0d3b34194b84dcfb78fcf3 data/byg/loot_tables/blocks/potted_maple_sapling.json -707742f870bf832a343bbabe6d74b132956e26a0 data/byg/loot_tables/blocks/potted_nightshade_sapling.json -08bdc8cb2e9605b61734b651a9a767698eafd086 data/byg/loot_tables/blocks/potted_palm_sapling.json -08c9cf13e67375a41fc57718f4d1930176728e47 data/byg/loot_tables/blocks/potted_pine_sapling.json -a2dd310aef7fbc14867b94c052d1bbbef364f6e0 data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json -df108eb8bfa788939cc3fa2510f4ae53dbe0687a data/byg/loot_tables/blocks/potted_redwood_sapling.json -a7581e96538751d3e0a547246e4d15b42cdc5ba3 data/byg/loot_tables/blocks/potted_skyris_sapling.json -bcb72503fa97b727d5efb8c164705a164f20938e data/byg/loot_tables/blocks/potted_sythian_fungus.json -8551fa39ca5e7e19db6187d33e94475421f0eaca data/byg/loot_tables/blocks/potted_willow_sapling.json -d40c87d768ddc9ac0c91899d03bb56765831f865 data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json -464e1bd0c8d1a1ec0d051d4f77219b6d75efc05c data/byg/loot_tables/blocks/potted_zelkova_sapling.json -5119f2f7f79bc753e66beb6a82d09e19fee77889 data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json -bde0a0722e9fee015e715db6e58211ebaa994405 data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json -98e88c37a09dbdb096155609c252931d24fdccdb data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json -c90013aecad10e82a01ae301970a2ddd300f6863 data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json -656ecc05a02c85936dca036de616130a60f3326c data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json -99f56cc9aedacb95b6ec909d804f8c6b1e684c58 data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json -dbee9dac52d9c0c996c93eb1a37a2de1e74d0f2a data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json -99412f8013fd4fba54a7f2e674c5f313b01bccc8 data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json -c11fefe42ac9d194ee58d385951989c118a3f8d9 data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json -20b751754bb9703f1715d9e36625efcdba20502c data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json -4277deb0748dead9ffa5db13043047b101e7bf15 data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json -618b9d68a97eb44ea8c4df1cf0cb55d66aec0897 data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json -42bd507cd8067a41b65bb7a8027219b7207907ce data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json -fb4671036519c5b43d27e15696802263a5bc6f1f data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json -cbe1f86effc6c5f4fe1e84d8bfbc76bcce98e020 data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json -580cfbf732c5649886e0e74dfab7aec696d2f190 data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json -7d79e5553725cb5711761e0be3b63cbe3d53794d data/byg/loot_tables/blocks/redwood_bookshelf.json -31451519b905fc6c111266f0ed6d9ee3673f4bb0 data/byg/loot_tables/blocks/redwood_button.json -91c73bfec94d59fb93418faaddaf0a0e194f2f89 data/byg/loot_tables/blocks/redwood_crafting_table.json -46ef8a70566018e8ef8e08649063315f8dabd027 data/byg/loot_tables/blocks/redwood_door.json -41a1a11eabddfefbfddd8d78d27cb6094ba703db data/byg/loot_tables/blocks/redwood_fence.json -93f7cec420a227819a12fc32e002790ae19f169d data/byg/loot_tables/blocks/redwood_fence_gate.json -54b5a209379daa5547a9a2429213254c7ff94a2f data/byg/loot_tables/blocks/redwood_leaves.json -b3067290862e9112f91f28ceb7429174b2d184e4 data/byg/loot_tables/blocks/redwood_log.json -97adbff5f7a483946f3d62c562ed7becdea2e0a2 data/byg/loot_tables/blocks/redwood_planks.json -ac75f7713715f4e601870f42c65c4ef08bf5d8ad data/byg/loot_tables/blocks/redwood_pressure_plate.json -d0d173ed0bad14836e55ea13af684503e5d9eafa data/byg/loot_tables/blocks/redwood_sapling.json -770fcadc384de0835d545ff5bdd50cd77f36a402 data/byg/loot_tables/blocks/redwood_sign.json -5550654e653ac56bb36183d66dc858a6c868bdf6 data/byg/loot_tables/blocks/redwood_slab.json -93f2892f1a504592b71721654241b3e9db230061 data/byg/loot_tables/blocks/redwood_stairs.json -19eb6314f23e1c4edfd12f46a8444e3b087b3516 data/byg/loot_tables/blocks/redwood_trapdoor.json -2f915291c83aea0f3de332e7d181261eea586207 data/byg/loot_tables/blocks/redwood_wood.json -74fc9c2586cd683e745a3ea8c4c1a63e68e32cd9 data/byg/loot_tables/blocks/skyris_bookshelf.json -fa33e9f7fcadb90d21cf4cbf6086e350c6c21d1b data/byg/loot_tables/blocks/skyris_button.json -70e96fec13b44fdc9868fe808c992fefcb1d645f data/byg/loot_tables/blocks/skyris_crafting_table.json -32457caf9cf9af966b4dbd4ee5ebe45fb3ec7952 data/byg/loot_tables/blocks/skyris_door.json -6b4d599ff802c427d3f8e24d66a9096aa2ff91e3 data/byg/loot_tables/blocks/skyris_fence.json -c4fa7d63702f0d56f18503580ce997fbbf4e5719 data/byg/loot_tables/blocks/skyris_fence_gate.json -c0c43509d7dbc48662c3b3a5532a8d080200cc7f data/byg/loot_tables/blocks/skyris_leaves.json -bf9e1251a504a965a7f128d66448e724fa0fed08 data/byg/loot_tables/blocks/skyris_log.json -a4e7fe64e838a52cc9572d412760c0dd065e5a64 data/byg/loot_tables/blocks/skyris_planks.json -7fdcdcafd57309a610d2a97134ba70067d8ad285 data/byg/loot_tables/blocks/skyris_pressure_plate.json -36ff436ff3fc00540de1a467d561633c09c469dd data/byg/loot_tables/blocks/skyris_sapling.json -f3f09f800d9d0803be043830cf99088876c7f4fd data/byg/loot_tables/blocks/skyris_sign.json -ffea3eb1e308904cf7bbd0eebd3c6563755466ff data/byg/loot_tables/blocks/skyris_slab.json -8a98f8316e0adb8059e45a3b6a10ade3a62a16a0 data/byg/loot_tables/blocks/skyris_stairs.json -378c3104e8b2c03cd58b749f589f6b6bf42b366b data/byg/loot_tables/blocks/skyris_trapdoor.json -ac68190a1d7ca795972361bb6c4f10ccd82b71b0 data/byg/loot_tables/blocks/skyris_wood.json -50bb062ab000ccc9f5b9519b0e4299f80be5bc79 data/byg/loot_tables/blocks/stripped_aspen_log.json -251ed82b833721fbba301f71bacd681785e63ad2 data/byg/loot_tables/blocks/stripped_aspen_wood.json -68d559511398a89630963f9cff3a555702f0e106 data/byg/loot_tables/blocks/stripped_baobab_log.json -bd4e0910575a27de5b8d04a3a7c6e69dcba23fa5 data/byg/loot_tables/blocks/stripped_baobab_wood.json -2511dfdb6d68da7ec452b8ddab7856f12eb8d5d8 data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json -c062d461e29ea67d6b636b97e2cc6f8959721bc6 data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json -7f2f0b5b041f6ea94d8c1387b7f30fb36616b1c2 data/byg/loot_tables/blocks/stripped_bulbis_stem.json -0276f2f9b984c8d614badee24e169ebbd40e6b99 data/byg/loot_tables/blocks/stripped_bulbis_wood.json -2102897bec75a67bbf1038111a6c950921f0be37 data/byg/loot_tables/blocks/stripped_cherry_log.json -2bf4abe31416d9499ed8e25956f8049b4318158d data/byg/loot_tables/blocks/stripped_cherry_wood.json -dce9a7bc67442afe6f28120cc3acd541cefb9d7a data/byg/loot_tables/blocks/stripped_cika_log.json -776659ab112cbcb7f533f647e24d5dfd43894fe6 data/byg/loot_tables/blocks/stripped_cika_wood.json -11c8ac878636c904c5d2f1ab1814e115512eed13 data/byg/loot_tables/blocks/stripped_cypress_log.json -4118c3c81805cb96585212a5be183e34816626e0 data/byg/loot_tables/blocks/stripped_cypress_wood.json -5147dd970e050768e5aaf07e2c1f0444da6643c7 data/byg/loot_tables/blocks/stripped_ebony_log.json -6f5bfb35c35d05dbed1841f44c0ad117410a7944 data/byg/loot_tables/blocks/stripped_ebony_wood.json -377ad766d79414eb49dfec453d56e88fb5fd8111 data/byg/loot_tables/blocks/stripped_embur_hyphae.json -ed08ff2ef355f291ca82652c5a213377f7cb4ffe data/byg/loot_tables/blocks/stripped_embur_pedu.json -61aedff13721411bec487e3ca373790d37472a32 data/byg/loot_tables/blocks/stripped_ether_log.json -1fb440eccfa83ae9148b9b892a7c8e2e9f58b562 data/byg/loot_tables/blocks/stripped_ether_wood.json -714455a288c4ec9b09e314eb6f5f4d0f47e9994e data/byg/loot_tables/blocks/stripped_fir_log.json -3ad3504d88b7d398f1fc993e4db86663af317101 data/byg/loot_tables/blocks/stripped_fir_wood.json -189a43d41111d19e212b00100e84a4c7c35038a0 data/byg/loot_tables/blocks/stripped_green_enchanted_log.json -35df2273d2359309c33dbdc9574044493892c34a data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json -7794b993569d8eaabef2fc7dc8c1757b6b0bdbcb data/byg/loot_tables/blocks/stripped_holly_log.json -b96fa879b4c28bf34ae3344cc0da19465a4e322e data/byg/loot_tables/blocks/stripped_holly_wood.json -7b66fea60e5dc31d4fcb2e6b67298d3e1fcf26bc data/byg/loot_tables/blocks/stripped_jacaranda_log.json -989cf88c69c107faddefcbdc4960c04399dd1c6f data/byg/loot_tables/blocks/stripped_jacaranda_wood.json -7760ea74ab21ccab09d9f418e63d9268ff19f36f data/byg/loot_tables/blocks/stripped_lament_log.json -fcc1ea94ecf8a4ef8eee4a70ed57bba57e5b7968 data/byg/loot_tables/blocks/stripped_lament_wood.json -cc976777af32fbdc114170dc34330cf960db0af8 data/byg/loot_tables/blocks/stripped_mahogany_log.json -092e52bc8c5921b4ac918cafe989c5b2fcff3ab6 data/byg/loot_tables/blocks/stripped_mahogany_wood.json -5d2afbbcb16b871d2f5c16cc051e7e35caa932bd data/byg/loot_tables/blocks/stripped_mangrove_log.json -c99fa734b8cbc7e1c1ff59b60f46dc014e8ff474 data/byg/loot_tables/blocks/stripped_mangrove_wood.json -96a0acea6361090da9f255aaced345936d9b60eb data/byg/loot_tables/blocks/stripped_maple_log.json -92c3f6cca515bec10304ecf54b1d11d77674b7b5 data/byg/loot_tables/blocks/stripped_maple_wood.json -d3819bc66b519381c98fef6e1ab1d613a141e75e data/byg/loot_tables/blocks/stripped_nightshade_log.json -dda4ac5eee6c6573d8fab3a8def214c9dc4dda28 data/byg/loot_tables/blocks/stripped_nightshade_wood.json -a412aa220506c9e2f200cbe5825e17fcd97bdc88 data/byg/loot_tables/blocks/stripped_palm_log.json -3f3f7a5faaf83a4635ea94bd2167596d3f9fe6ba data/byg/loot_tables/blocks/stripped_palm_wood.json -64f77953c7cd8317c42761d2cf96cb058fe207cd data/byg/loot_tables/blocks/stripped_pine_log.json -5e8a7d936527bf5bcf6a34ac115591c7ba598950 data/byg/loot_tables/blocks/stripped_pine_wood.json -2fcb4b0f19b7efb84e605a6954f4fb813bc44b33 data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json -6c3aa44918312b6991045f7bf1956883df424d97 data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json -66be6fa5facb9b7e9f988979aed4a8244bf09918 data/byg/loot_tables/blocks/stripped_redwood_log.json -1a68ef530830481c221e71e5dc64ac296332c161 data/byg/loot_tables/blocks/stripped_redwood_wood.json -649968ac991ad2bcfe079b0ae020e3ad10112d6d data/byg/loot_tables/blocks/stripped_skyris_log.json -c1f486ac3e06c0359275c50900b9257bc29a5965 data/byg/loot_tables/blocks/stripped_skyris_wood.json -99819558464daaf4ad9f28e98aa9abd5064df038 data/byg/loot_tables/blocks/stripped_sythian_hyphae.json -6353d19c4a9b07e31775fb0af3e3438829f5d88a data/byg/loot_tables/blocks/stripped_sythian_stem.json -73fdb3dabb050e5512c40fceab03478ca7fa76b1 data/byg/loot_tables/blocks/stripped_willow_log.json -3f478e168254ebef744fd0bd9736de6df57ca460 data/byg/loot_tables/blocks/stripped_willow_wood.json -56c807a3607dbb2cdee1c10bd85a1637de6c6c87 data/byg/loot_tables/blocks/stripped_witch_hazel_log.json -f33b70b38fa3c70f997292d154182827174db146 data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json -e0afbb906e7cac0cf96707c5a1424150c07181f0 data/byg/loot_tables/blocks/stripped_zelkova_log.json -66cddb22b97449bbdc5266c6f150fe15c699eb55 data/byg/loot_tables/blocks/stripped_zelkova_wood.json -871283ac3300a469b6ad2f3a013dc88bc6fb3941 data/byg/loot_tables/blocks/sythian_bookshelf.json -d3503287ffb3d65d6a30d44b547c32abc046eeb0 data/byg/loot_tables/blocks/sythian_button.json -7cac1cc3a347b0f79d6295e668b83c5a74159843 data/byg/loot_tables/blocks/sythian_crafting_table.json -3477eee7d82bc1f36957ec4a224a26e753839b74 data/byg/loot_tables/blocks/sythian_door.json -2d206672da4371fcf2202ca6eb589971df073a40 data/byg/loot_tables/blocks/sythian_fence.json -5b66670a74e3fb50629ed16d7a8e0ffef45aeddd data/byg/loot_tables/blocks/sythian_fence_gate.json -78ec7dda56281a026011ac5457d3fe6cbd3f2980 data/byg/loot_tables/blocks/sythian_fungus.json -28be92a0ef940ced2c4561d1924aa4dc89a8ff0b data/byg/loot_tables/blocks/sythian_hyphae.json -8e6f41a44442da7c6767a0bb5d51905d7dcfa662 data/byg/loot_tables/blocks/sythian_planks.json -924a02a61f12020ad3954755a6f02c5a49ddbadf data/byg/loot_tables/blocks/sythian_pressure_plate.json -9b80e5956479fa3abccee4bee47458c0341b3dc9 data/byg/loot_tables/blocks/sythian_sign.json -6ed0afc80d0b609ee7b7d5ef653fb8627fa4a4ae data/byg/loot_tables/blocks/sythian_slab.json -b7bdd6076a894bdf8700de7a75081ac707598d6a data/byg/loot_tables/blocks/sythian_stairs.json -bad0da7de372efddb7c82859e4f7c158c82487a0 data/byg/loot_tables/blocks/sythian_stem.json -d1b64f7bbea4eb042cab71a5334ec7049db7bf0b data/byg/loot_tables/blocks/sythian_trapdoor.json -60e6a26686f583d03eaea0eaee702652d24e4719 data/byg/loot_tables/blocks/sythian_wart_block.json -d2ac2565bc7687e98e4f3ce1cbc8d29ad829247e data/byg/loot_tables/blocks/willow_bookshelf.json -69de4fbb323c49eb27d1e4c00802702c00012fa9 data/byg/loot_tables/blocks/willow_button.json -2611bb1794cdf753d935629b033dd8fd54b4bdcd data/byg/loot_tables/blocks/willow_crafting_table.json -b889851a2853d156d1a74d36929afaa38865ce62 data/byg/loot_tables/blocks/willow_door.json -8cdf184825f577c657237b37b7315ccb47e98b82 data/byg/loot_tables/blocks/willow_fence.json -0649cb7cb89df6d767d1a67dcdf86f2b71a4d282 data/byg/loot_tables/blocks/willow_fence_gate.json -f98fd3d9fd1693de652d96f568eb82a1e3bbe182 data/byg/loot_tables/blocks/willow_leaves.json -2419212330208d07a4e8083944bc4c6359980d77 data/byg/loot_tables/blocks/willow_log.json -88d9922070b764920b2017ca34a4e1c3b89bfc17 data/byg/loot_tables/blocks/willow_planks.json -d16feca097f761a74490d5a5ce8096b220215c25 data/byg/loot_tables/blocks/willow_pressure_plate.json -d1f77c5d4586e93e383c4368a9a9e71c1e33744e data/byg/loot_tables/blocks/willow_sapling.json -1883b6edbfbbcb616388490f1c1d602013ed20d6 data/byg/loot_tables/blocks/willow_sign.json -99bbb214e2a52b0f9c83d0c1ff8fa82001834eb2 data/byg/loot_tables/blocks/willow_slab.json -e62edf561486a0e9559217a4e3a20d320abeb6e3 data/byg/loot_tables/blocks/willow_stairs.json -c9a3210632d12d1a4e64c40c65928295f1f37a41 data/byg/loot_tables/blocks/willow_trapdoor.json -c47b7c919fd17367e7572028aeb559f8de376567 data/byg/loot_tables/blocks/willow_wood.json -1b3ca8930d80d351669ca9c26eaf86621b69abd4 data/byg/loot_tables/blocks/witch_hazel_bookshelf.json -b07998686b02752346733bba051c7af1ed0b68ab data/byg/loot_tables/blocks/witch_hazel_button.json -15b3640c73e65bf7b65cca4c0c45f2f359e98a10 data/byg/loot_tables/blocks/witch_hazel_crafting_table.json -ae1a6b8b3c922a505645e6b06e827f8c9b51aae0 data/byg/loot_tables/blocks/witch_hazel_door.json -0e6076d76ba688dfe954d4262e931139abead6db data/byg/loot_tables/blocks/witch_hazel_fence.json -11c2f6ba78e1b4aa6b363a1b530ba558cd737cd9 data/byg/loot_tables/blocks/witch_hazel_fence_gate.json -fe760ae22644ff1ef18e525a83d2106dd0f87274 data/byg/loot_tables/blocks/witch_hazel_leaves.json -837bedf6428df9579cddbc335a9c8e2a01b59a50 data/byg/loot_tables/blocks/witch_hazel_log.json -c94799611bfd5ba96b1c3130d60069ee0dbe9f08 data/byg/loot_tables/blocks/witch_hazel_planks.json -a4232c2a72f0006fcce7cb341871536499238904 data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json -6598eadb6c1f8c9e77a717af9ae9add6e99db838 data/byg/loot_tables/blocks/witch_hazel_sapling.json -1f154b7272c21345522cb1b8de90a5fcfac651d6 data/byg/loot_tables/blocks/witch_hazel_sign.json -31413b8b215f4f6283ac95796abc27064530b77e data/byg/loot_tables/blocks/witch_hazel_slab.json -a9131abc8187e62ca476e3fb1e04f8b5982f85f1 data/byg/loot_tables/blocks/witch_hazel_stairs.json -fc322b84ce46a8b8fd1237a7ed49d571682c28ca data/byg/loot_tables/blocks/witch_hazel_trapdoor.json -5b813eee43120ab99b94a3189b85ef2a96bc566d data/byg/loot_tables/blocks/witch_hazel_wood.json -4971435da8bfd3e97008de63447a430a1bcf62cb data/byg/loot_tables/blocks/zelkova_bookshelf.json -7ddb7491227d8e2a73447507d58876af86809daa data/byg/loot_tables/blocks/zelkova_button.json -ad0ff2ed32e278a184747a181ecc282ed89c4cfc data/byg/loot_tables/blocks/zelkova_crafting_table.json -8fa91216147c96c1d8cd43674da34a577e25f082 data/byg/loot_tables/blocks/zelkova_door.json -f2b110cfeebd29bd0af39ff53df40e076b0fc470 data/byg/loot_tables/blocks/zelkova_fence.json -2524d16feb3ce6523e76e065495078fd6e1a5ebf data/byg/loot_tables/blocks/zelkova_fence_gate.json -3d8d6e7a35f16f13ef5a74505f595a5d4a1c2c70 data/byg/loot_tables/blocks/zelkova_leaves.json -d600547a5788f7083e0549f1ecf6f15525c82ce5 data/byg/loot_tables/blocks/zelkova_log.json -c074de11fe36eecba5c79e04419f117f5b48fd5a data/byg/loot_tables/blocks/zelkova_planks.json -5d1bace0bf6297f57d55ddf1fdf47d6896cc1ae3 data/byg/loot_tables/blocks/zelkova_pressure_plate.json -5bf789893e95ce60b66b8b48cc6fcf5ced5bef0a data/byg/loot_tables/blocks/zelkova_sapling.json -41447f6150e3c66c899fed36bc9a2e237c53fce6 data/byg/loot_tables/blocks/zelkova_sign.json -6d30fc27d8fa94dbfc0c51033207d36b01a390c7 data/byg/loot_tables/blocks/zelkova_slab.json -42f9e0310af3102984e3765efafbfc69753d865a data/byg/loot_tables/blocks/zelkova_stairs.json -744d023c8c56788532ee8fe06225e7ba6314faac data/byg/loot_tables/blocks/zelkova_trapdoor.json -d446b9231022f457d5191efba7722210419376db data/byg/loot_tables/blocks/zelkova_wood.json -7795f7198f4f974ffd7b3c7ba6d28246312c3237 data/byg/loot_tables/boats/aspen.json -1dea9498fe72a5719d91ddfe2ba0362bb6b687fb data/byg/loot_tables/boats/aspen_fall.json -0ad52e583462ca1e6a7bb29902bdbd97f2f3670d data/byg/loot_tables/boats/baobab.json -6cb5af47ce6bb4a0fa5c9a03243efc7b3abe9094 data/byg/loot_tables/boats/baobab_fall.json -90d279dc12d2ce7ee2129a2e5131c506f8a1fda2 data/byg/loot_tables/boats/blue_enchanted.json -917b89b03281005ce32635fa82e6a80900cc0054 data/byg/loot_tables/boats/blue_enchanted_fall.json -eb3e14915058dd57b40e3aa818b5696e2fc9f309 data/byg/loot_tables/boats/cherry.json -9eb0e2c03a97e42846050deb93151d24380dc809 data/byg/loot_tables/boats/cherry_fall.json -789a66ccfe2d2c06373573aabc0578a48ed92323 data/byg/loot_tables/boats/cika.json -5a1fbfa64947370c4aaa5d7fbb40d2cc187e5c48 data/byg/loot_tables/boats/cika_fall.json -8179d939014ca5c3d9ea5f5bac9efa3d14067e22 data/byg/loot_tables/boats/cypress.json -2a18fe46aff825cb0e45361687b6b7d50151783e data/byg/loot_tables/boats/cypress_fall.json -dba4f9ce69144f23dcd517fb7f4a39d9ada795ad data/byg/loot_tables/boats/ebony.json -8f7db3a9c330de726cdd4887f3a32e7ecf04ebe1 data/byg/loot_tables/boats/ebony_fall.json -564433034869072144ece0805ac00b61c82148a0 data/byg/loot_tables/boats/fir.json -acc904fddb88f497523a5c48aee5b225fb9e1d32 data/byg/loot_tables/boats/fir_fall.json -d943e0a94a6cffb570f1678f3049239d0878f9a5 data/byg/loot_tables/boats/green_enchanted.json -08fc132596921b3ccdbf104fd290665eb8ecf588 data/byg/loot_tables/boats/green_enchanted_fall.json -bb9aa72f7bd8112b6c554c9b0cd45b9803c3ba97 data/byg/loot_tables/boats/holly.json -3ec3c7f651ca25f79e15d00ecd96541a7e261a03 data/byg/loot_tables/boats/holly_fall.json -a28b90ff41ab5761076d1ff04d90f4ba0888d76f data/byg/loot_tables/boats/jacaranda.json -6f83fe1293ee4d708fd02dd122e15fcb2f5765d0 data/byg/loot_tables/boats/jacaranda_fall.json -2631023aa07b4b400cc3c88ec4b5877eda83ec06 data/byg/loot_tables/boats/mahogony.json -762f2b941bca08d2cf2935ab5ebe8e947ee66312 data/byg/loot_tables/boats/mahogony_fall.json -3fb704a6972f2290ab99b1c58930f04a93602778 data/byg/loot_tables/boats/mangrove.json -96398e69b9d697ef13f334b2759dbd6a9feb44ba data/byg/loot_tables/boats/mangrove_fall.json -42168783cf94b5a3c9a5ad941e74c6e22f5427c5 data/byg/loot_tables/boats/maple.json -df307e2a0f38b35615394a6156bcba07ad00464a data/byg/loot_tables/boats/maple_fall.json -1e9bee9f65df503f3e02bf82ee399594d7efed64 data/byg/loot_tables/boats/palm.json -78258f61d554f9fd5ce9323fb8a9f7aa91286e8e data/byg/loot_tables/boats/palm_fall.json -68dd36df6033005fdb4e5b552bd8b90db01ad37d data/byg/loot_tables/boats/pine.json -7b47e02811f5257a9207c3c24ee2c4742df4b423 data/byg/loot_tables/boats/pine_fall.json -163e4d5fe6fd4fd83488fc01c4043e6947b8d957 data/byg/loot_tables/boats/rainbow_eucalyptus.json -98de8a29aa5fdc4d716e3ea336b1bc27b80f5fa4 data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json -0e9a7864e80276e862b0c741203e9314bcd263a5 data/byg/loot_tables/boats/redwood.json -55cf5b60bf53bfca96198a17ef9d5355594b2f82 data/byg/loot_tables/boats/redwood_fall.json -6fc4608ec80d6f08c4e84d958d0161b456f73677 data/byg/loot_tables/boats/skyris.json -a48cf0c8caa95dbb302fb015bfdf05e9f1ebb708 data/byg/loot_tables/boats/skyris_fall.json -f3253f1e14798d091c0b300aa63bbb98d423ba09 data/byg/loot_tables/boats/willow.json -a0198827a9c0c7785b5b106778f779c7dbfd2322 data/byg/loot_tables/boats/willow_fall.json -caf921528f3b92b7d77ddac5072f2ad52c96f0d4 data/byg/loot_tables/boats/witch_hazel.json -5aad88a32a241a0a5918563608d1f1ce7dfe77d0 data/byg/loot_tables/boats/witch_hazel_fall.json -2e6ed906f34f3455ad8f41531ba67895c42b9cc1 data/byg/loot_tables/boats/zelkova.json -3f8e4e1adb2215043d07e8b292592329394eafed data/byg/loot_tables/boats/zelkova_fall.json -a89864ead1d2c45c856924cee720f9acf66614e8 data/byg/recipes/wood/aspen/boat.json -e11ee0b24522ebdaa0000224c1ef34757428e589 data/byg/recipes/wood/aspen/bookshelf.json -a9e2de8c17b4f6b9f80856249a703229c032d397 data/byg/recipes/wood/aspen/button.json -b1ea352ac9d826d92c548d06df8cc71883325219 data/byg/recipes/wood/aspen/crafting_table.json -2e074f27da76623d60b4818fc91da6d6a25631f7 data/byg/recipes/wood/aspen/door.json -3eee811b3c5590c755adace143e2f47692dc16f7 data/byg/recipes/wood/aspen/fence.json -4494153276bc6b54995d1fda56b7ca7554eb46d6 data/byg/recipes/wood/aspen/fence_gate.json -783c791292b8003c229ede378f587fd6c415cfe5 data/byg/recipes/wood/aspen/planks.json -27ba6f01a336d971e5ec751bb64a2f635a434be5 data/byg/recipes/wood/aspen/pressure_plate.json -6e2204e7adbfa389d63b71c773e643d3bb2f5014 data/byg/recipes/wood/aspen/sign.json -d7a1d70300005e933b50adb1acbec3a589a06297 data/byg/recipes/wood/aspen/slab.json -56f6741a5d527c2e790acfc0e0d2efa4420f9e3a data/byg/recipes/wood/aspen/stairs.json -015b0b00f19a550e60dadb8f9cda438a1ffaa221 data/byg/recipes/wood/aspen/trapdoor.json -d28c218f0f9f6c078619e2c26fe3e1835d980a9f data/byg/recipes/wood/aspen/wood.json -066abc9fd5ad44d4c5ec7d5fcb03f45953721e68 data/byg/recipes/wood/baobab/boat.json -3fe41d699430df2902edda4ce47e03d335be5524 data/byg/recipes/wood/baobab/bookshelf.json -7ad9aad06477fbad1d33dd07449f84cde3ef823d data/byg/recipes/wood/baobab/button.json -5dfab2c004a0a1797e83719081cd2b2c5580297a data/byg/recipes/wood/baobab/crafting_table.json -cc8efc86e9d25b5eb2c56073eca38423f7065d93 data/byg/recipes/wood/baobab/door.json -449a07dd2a4cff484a706a318054a09004481d16 data/byg/recipes/wood/baobab/fence.json -da0bf30721c59c9b4127a1dac601f0dd8bc75a27 data/byg/recipes/wood/baobab/fence_gate.json -073f67bd061280348c117639af247a85acac4e18 data/byg/recipes/wood/baobab/planks.json -e9ea4c56af7c08592ab33701533d2fbb2f07e472 data/byg/recipes/wood/baobab/pressure_plate.json -30ad230ce3245d66d4836793832e8ee339d7971e data/byg/recipes/wood/baobab/sign.json -0ca12512f00f62c144a4a1ea75110f1fa3a11ceb data/byg/recipes/wood/baobab/slab.json -634e1ee6eaaf1cd7a38f716e566ab3c763971f79 data/byg/recipes/wood/baobab/stairs.json -718313d55269a53b0a11200c07dcb028999d9731 data/byg/recipes/wood/baobab/trapdoor.json -ca005e9857765dac441a953c7d283888c48f342c data/byg/recipes/wood/baobab/wood.json -cdcea7dcf02fcac9f38cdebf4fbe3e1373674e0a data/byg/recipes/wood/blue_enchanted/boat.json -17affff67278f8b968f65cfc7e46d4fd870746a7 data/byg/recipes/wood/blue_enchanted/bookshelf.json -052228530563a6e5e40e4ca9c599e3c5b6b2e7f1 data/byg/recipes/wood/blue_enchanted/button.json -2dd0aff848fe2e5065fe8a8ef589269afb318064 data/byg/recipes/wood/blue_enchanted/crafting_table.json -3a591e628e2cc31995ec4fdb9fdb5088c1fc7e9b data/byg/recipes/wood/blue_enchanted/door.json -39938b0a98d1378f84c5a6c8360bca36e3b13e6c data/byg/recipes/wood/blue_enchanted/fence.json -643a7bcb21e4e9a3d2c580c3f7a74e8b9aa37ceb data/byg/recipes/wood/blue_enchanted/fence_gate.json -14cee8bfff1a506fd525aedc3c5244b7bf5a999d data/byg/recipes/wood/blue_enchanted/planks.json -787b857d14904563c701ac265b71f171f410845f data/byg/recipes/wood/blue_enchanted/pressure_plate.json -40c25e8ee524e545f90defd1faae3d5475e9dc9d data/byg/recipes/wood/blue_enchanted/sign.json -a31ee3423b1b94f5f0f725bbaa1bd475af2529a6 data/byg/recipes/wood/blue_enchanted/slab.json -642a4cdb86732d1bd0df8e77fbc158ea0b747a4c data/byg/recipes/wood/blue_enchanted/stairs.json -6288b691a45bfb216bb823d8e2f4ce9b71a01775 data/byg/recipes/wood/blue_enchanted/trapdoor.json -d936c12c34602c7d2a6305d50f8ff2dddb402a4d data/byg/recipes/wood/blue_enchanted/wood.json -f376a529b65cb0bfd3e1138f087935cfe197c8c8 data/byg/recipes/wood/bulbis/bookshelf.json -3b63cc1e4ac322cf4c21ec0815e0e5adb1632938 data/byg/recipes/wood/bulbis/button.json -24b50ed86668b9c10dffe4ff3c3ff3628319990e data/byg/recipes/wood/bulbis/crafting_table.json -67800a40053b00689a31dfd0efcda4fc1d08f066 data/byg/recipes/wood/bulbis/door.json -1f8af944397c019aadee26cde978cd31e5e7b8fa data/byg/recipes/wood/bulbis/fence.json -860f879b59ba30da1a223a6d2b970bc441d053a3 data/byg/recipes/wood/bulbis/fence_gate.json -338e3d049ad40ffedad289df4168a312c10f2b94 data/byg/recipes/wood/bulbis/planks.json -f759ec6decdecf11942a9631efb9501d64c8b179 data/byg/recipes/wood/bulbis/pressure_plate.json -c671d31e0fb3326d94d4d69f7074cca552114242 data/byg/recipes/wood/bulbis/sign.json -f990490be9ee8802570ff167ef2339d689967f82 data/byg/recipes/wood/bulbis/slab.json -2e40cf96e3d0bc9446669bec2fa9f98a68a10c48 data/byg/recipes/wood/bulbis/stairs.json -e233da95e2cde16f4cada84a04db6f65340e7b14 data/byg/recipes/wood/bulbis/trapdoor.json -5caa3354b5580a44c9394df5f775439b2e186b14 data/byg/recipes/wood/bulbis/wood.json -fcc3ecbb4c7fd0ca85a097eb05af19fb9470f82b data/byg/recipes/wood/cherry/boat.json -f6ebac66eb0b9b389c5aa8399e7f635f83fd6f37 data/byg/recipes/wood/cherry/bookshelf.json -69a6c51e9be471a4fdf07a0d253b4b3f76026818 data/byg/recipes/wood/cherry/button.json -032216390b5e594204b830a8338af8a4db15039f data/byg/recipes/wood/cherry/crafting_table.json -b4cd0c2f83180f071060cbb47c2bc18b485cd329 data/byg/recipes/wood/cherry/door.json -493e440aa9bccf432249792f9be04a3ec6a79661 data/byg/recipes/wood/cherry/fence.json -4b54f86555c187bf6121fafe0c5dd4d8a42fbdf3 data/byg/recipes/wood/cherry/fence_gate.json -28edc8349437a264eeb4ebddfc214deec3d1fb88 data/byg/recipes/wood/cherry/planks.json -7a9a8fd4e78eb7200da14f359424fa885400425e data/byg/recipes/wood/cherry/pressure_plate.json -62631fe4fb0ad86fed2199af679befe27175869b data/byg/recipes/wood/cherry/sign.json -34165d5515938d8f03bc640c5c4d6095310ff503 data/byg/recipes/wood/cherry/slab.json -e29ef5e0d13da4ec0263d43dd31fa8692b68a041 data/byg/recipes/wood/cherry/stairs.json -f2e078bc274292f6555d1e28d485f9b7b6641de2 data/byg/recipes/wood/cherry/trapdoor.json -68789845ea93600e6fe7cb420a98157a5488ed65 data/byg/recipes/wood/cherry/wood.json -581f671e542900899612da305c2e47bab58ff1d3 data/byg/recipes/wood/cika/boat.json -c3931becfcf4f37f896ec97b536aad2a006a26aa data/byg/recipes/wood/cika/bookshelf.json -1225b84e5ab6917972f15229e2733c17c9265aba data/byg/recipes/wood/cika/button.json -ee25638100ad8238083995c754da3aecc36a46e6 data/byg/recipes/wood/cika/crafting_table.json -10202553084d0d7950261e8d350bb8d706adf428 data/byg/recipes/wood/cika/door.json -907f223e5bbd6fba1931576f7dd1852bdd9ae890 data/byg/recipes/wood/cika/fence.json -fa3e96f26d9fe2500664940a395558b49234034b data/byg/recipes/wood/cika/fence_gate.json -4144f24a51f076711b652d8dc263d847f4e0f9f1 data/byg/recipes/wood/cika/planks.json -94f6ec4de852211c4b2108527f215c7f9a31d39a data/byg/recipes/wood/cika/pressure_plate.json -0bc8405d54d4b4e616c60cd608da7fd416007fce data/byg/recipes/wood/cika/sign.json -da0c6a3d35ec44c43f0dd23a8f67c672476379bc data/byg/recipes/wood/cika/slab.json -deca528a6fd5b0a2445ee388685a857ba2ad3463 data/byg/recipes/wood/cika/stairs.json -3f0f2756422aa6c65d4c248ce38464df692a749a data/byg/recipes/wood/cika/trapdoor.json -8e45c9d7b92db703152be1c93bed84ec0cb786f1 data/byg/recipes/wood/cika/wood.json -2ab25d932ec5bec50e458e1d74ab7cddd9089bd9 data/byg/recipes/wood/cypress/boat.json -bb34adc112d88028f6e18a12e11eaa0d47bd290e data/byg/recipes/wood/cypress/bookshelf.json -77c6b91acb8813e49be3238993c50e4aa2f03194 data/byg/recipes/wood/cypress/button.json -f49127239fb1ab9d6802b9e1fe66e1c572ec2118 data/byg/recipes/wood/cypress/crafting_table.json -5a7c0c05282005ed0d691a7bbb0f5ac0f957477e data/byg/recipes/wood/cypress/door.json -b8e9b1110f0ed239709845e50297579524f68e5c data/byg/recipes/wood/cypress/fence.json -487991f00a986d342de6725c04b7afdd92536e57 data/byg/recipes/wood/cypress/fence_gate.json -1d7448e510d921e8f79e54d5f219c9ac2b7fede1 data/byg/recipes/wood/cypress/planks.json -210e0438be44d8e2cbc208ac03fdca0bee1cd476 data/byg/recipes/wood/cypress/pressure_plate.json -dd003e75e84f447e2b9fa6daac80c68534e9d5fd data/byg/recipes/wood/cypress/sign.json -4858f390405103a5725338a816ac6d0d4d4bd732 data/byg/recipes/wood/cypress/slab.json -2bd5355bf93b6081d2fb6ed0905b317889bc8196 data/byg/recipes/wood/cypress/stairs.json -fc7e5419f84acc14b0aa73b4dc8d58d2f480a74b data/byg/recipes/wood/cypress/trapdoor.json -71959d4e94637409778e5b0aabe06e05b560cfb8 data/byg/recipes/wood/cypress/wood.json -9d0151950c4527d7aee79319c3dd5197402fc0df data/byg/recipes/wood/ebony/boat.json -dcceaf00fa6006d3a5b1338df05350b1b7463ae6 data/byg/recipes/wood/ebony/bookshelf.json -632826dba9bce03f3ed485ed57dc46afebd8a538 data/byg/recipes/wood/ebony/button.json -1ecbc6da6ff49798e35a10b15887fbce992b9372 data/byg/recipes/wood/ebony/crafting_table.json -76a1adacb68adf209a91a7693b9d6df433111402 data/byg/recipes/wood/ebony/door.json -4050bf7a7bb6dd2b33cf9e3f22c4c190535bd91a data/byg/recipes/wood/ebony/fence.json -48ca144bc06eff7d58ab76015e0825e21b93215b data/byg/recipes/wood/ebony/fence_gate.json -aca20354a788e1d97963eec8c4fed0a825d75df2 data/byg/recipes/wood/ebony/planks.json -083a97f1cc0659a9b168c24d28190daa7482be9c data/byg/recipes/wood/ebony/pressure_plate.json -9bea96fd2e5c4ea9dcf64c063af16d0756afc3b2 data/byg/recipes/wood/ebony/sign.json -ecd292502b1ba405da5b7cd6dc907e6741a7ab34 data/byg/recipes/wood/ebony/slab.json -b03173249150fb57da7ea0b5fc3272530c0333e1 data/byg/recipes/wood/ebony/stairs.json -cfc202a88a767f32c6fb0addea1ee03b3789f6f9 data/byg/recipes/wood/ebony/trapdoor.json -7ef6d2286f911144c5a1fd7bfb95974631517438 data/byg/recipes/wood/ebony/wood.json -770adbbd61f7a0b7c4c95b0305959835264282c0 data/byg/recipes/wood/embur/bookshelf.json -7a5e21e999d6bc461b8934c2a073f3d8da4a3f6d data/byg/recipes/wood/embur/button.json -c0248cde772f05bb5267e8eea2edff9918c04129 data/byg/recipes/wood/embur/crafting_table.json -0a8bf0fdedbbde1757e57746687eb7e9be2657dd data/byg/recipes/wood/embur/door.json -8474fdbdc4be6989ac158273a084db7a3949f8d6 data/byg/recipes/wood/embur/fence.json -3e03758f168e7ee5589dfc1325c2eb354983f292 data/byg/recipes/wood/embur/fence_gate.json -c8eb7b747c73416ee2825910308480af5dde6d70 data/byg/recipes/wood/embur/planks.json -a8b7439e42a12200de7d26d484cfa55e6dc887e0 data/byg/recipes/wood/embur/pressure_plate.json -a59cb66804182cc1d8ff937285ea4ed78ffdfdbb data/byg/recipes/wood/embur/sign.json -eed8be018b86684fc516f039fb94e3a45306e02c data/byg/recipes/wood/embur/slab.json -917ef07f88a9f0dc7c9e0aeed83e9bc664704387 data/byg/recipes/wood/embur/stairs.json -30d2582c69bde3513ec61e48a523f39844193cb5 data/byg/recipes/wood/embur/trapdoor.json -ea032914737512f8483a9325d5e96d760cb190ad data/byg/recipes/wood/embur/wood.json -86d3edbb975fd920b866562841a1a4368c5f5551 data/byg/recipes/wood/ether/bookshelf.json -74876a43f8e763fe5bd418f95b65b02fff554be6 data/byg/recipes/wood/ether/button.json -a434b4d028fd5b097f88886c6fce58641204bed5 data/byg/recipes/wood/ether/crafting_table.json -52faa07cde0a3d4c4bc49393244b8e990b3751ee data/byg/recipes/wood/ether/door.json -e934ac326eb7aa5a7d78d0723e7433e679b1b295 data/byg/recipes/wood/ether/fence.json -18896a7ff4d512f756063e67d919cdfed07de580 data/byg/recipes/wood/ether/fence_gate.json -9507b8fd3f1eae3c4acf6e10f74c9a6084cf89f7 data/byg/recipes/wood/ether/planks.json -b48bac9b7aaa14fd286e4e71149fc78dd381ea5c data/byg/recipes/wood/ether/pressure_plate.json -7a0788225ca02fcb5d9e9bd7a06176ceaf2ea0de data/byg/recipes/wood/ether/sign.json -eda83001030b0dfac6c3ccd92c9c7f452eee6f7b data/byg/recipes/wood/ether/slab.json -7764e07cb9aa3053869082917560c5985b9b1bb6 data/byg/recipes/wood/ether/stairs.json -e308f8d569ee3f59be3884908821c4d5c66a58b7 data/byg/recipes/wood/ether/trapdoor.json -2a9be6b7846ea71700d30cb99ffb31ec9faeb8a7 data/byg/recipes/wood/ether/wood.json -b533ac19abbd2dbd6270ebf3b0ba54e2c133fa9e data/byg/recipes/wood/fir/boat.json -04e0159f15aed0f0ba47c04e4bed8481c2d4ebe9 data/byg/recipes/wood/fir/bookshelf.json -e6a9f18b10d3b48f7fd2fe855e6039080eb517c2 data/byg/recipes/wood/fir/button.json -a627b1aa2a568bf4ee9310b52517667a6cb922ee data/byg/recipes/wood/fir/crafting_table.json -19a468ff39297c013f5b0875e0c5d519eacd7b20 data/byg/recipes/wood/fir/door.json -077d0fc0f1abceb31a1870ca58cbc3558c70270b data/byg/recipes/wood/fir/fence.json -1bf3efc97e3c7b4e81237da624a147398b0953af data/byg/recipes/wood/fir/fence_gate.json -37bc3c333eac8a46c60c454532e936d3653684d7 data/byg/recipes/wood/fir/planks.json -b245db81b6ec383a91df91673ae90fc3dad0f850 data/byg/recipes/wood/fir/pressure_plate.json -bd86ebe2a27734587a9e78fb6f21a377280756cd data/byg/recipes/wood/fir/sign.json -65b20003f1b266d431be4bfcbc51d2dbd7b64b66 data/byg/recipes/wood/fir/slab.json -4493f95748ed40595d49ac0e87a5363381d1fc96 data/byg/recipes/wood/fir/stairs.json -e9a451281d8d3cb683acec506e9b8e78608cce43 data/byg/recipes/wood/fir/trapdoor.json -dbadfa96e072ebce74b5b5e591a2819fd2ff273a data/byg/recipes/wood/fir/wood.json -00849130adccd6cd99c8844e83b94f0e1c2ef3a5 data/byg/recipes/wood/green_enchanted/boat.json -42ef2ff3f21222aeef9afabf463a406f4fe09fef data/byg/recipes/wood/green_enchanted/bookshelf.json -dcaabfe86ea6ec5dc7dcd37a9ac9dd58ab30d67f data/byg/recipes/wood/green_enchanted/button.json -d0380a692f02a3d60ad98bfb692c201430da8c05 data/byg/recipes/wood/green_enchanted/crafting_table.json -2589e2b9e995fbe3c8140a7b62fb0d79a5610ac9 data/byg/recipes/wood/green_enchanted/door.json -74c92c418d8f70bb00d614eb750c466c0b5640e7 data/byg/recipes/wood/green_enchanted/fence.json -1ce52ae0fb0c36ee423b912450c8fe4ccb3eeb2a data/byg/recipes/wood/green_enchanted/fence_gate.json -c7d0e4ee4be1a208fdf212b86fdf0a2db4c18be0 data/byg/recipes/wood/green_enchanted/planks.json -f553c9c526821bc0db3aff458c4aeeef2d915ad6 data/byg/recipes/wood/green_enchanted/pressure_plate.json -eb255275b17d2f57d22b6d4e06c661f233ec75ff data/byg/recipes/wood/green_enchanted/sign.json -6208b13057c1da578a2ac8aba7af65d4ecdcf2aa data/byg/recipes/wood/green_enchanted/slab.json -b519845d4d931b9e50a74d1be071b0301e1638cc data/byg/recipes/wood/green_enchanted/stairs.json -9e87eebd551c977e3ef7ba14c442bfa7a51e3b52 data/byg/recipes/wood/green_enchanted/trapdoor.json -c0400126b1da6b09625d144d5b7a3e45290295a0 data/byg/recipes/wood/green_enchanted/wood.json -9aaac9a584af1f0fc5fa09282a7642af1dafe9e8 data/byg/recipes/wood/holly/boat.json -6728383d21cef715f2519e7c9f1f6ebf4a13554c data/byg/recipes/wood/holly/bookshelf.json -7ed678397ba3356fef446b9e9208c177d8e17ad6 data/byg/recipes/wood/holly/button.json -94cb01fe12e818480c5a7cb29758b8f9011d00dc data/byg/recipes/wood/holly/crafting_table.json -ab5fe57e1951ed5875bd86823d50b95a88b1bde7 data/byg/recipes/wood/holly/door.json -8ef62e1057d9cddd14b332994c871006dde6d394 data/byg/recipes/wood/holly/fence.json -7ac4b5efdbb5d6d23c2e6dfc979c705e58c92967 data/byg/recipes/wood/holly/fence_gate.json -38e375959973d1b42f2efa4b2536938c4908e764 data/byg/recipes/wood/holly/planks.json -9fa3efad105acdd7b7f9c7e4fcf2196fc3bf1a55 data/byg/recipes/wood/holly/pressure_plate.json -00b4aed892be6b79f06eb4d83d086bb2a3f546b9 data/byg/recipes/wood/holly/sign.json -52ed1932b6579679c372be18c832d7727ae26625 data/byg/recipes/wood/holly/slab.json -0621b9364a6d328033e2053fc429244482dfa00f data/byg/recipes/wood/holly/stairs.json -86046c7ccfd2aa099c32b40ed0180fcbe5112b74 data/byg/recipes/wood/holly/trapdoor.json -f26dab6058245ffa50a299bef00e25fa2644866f data/byg/recipes/wood/holly/wood.json -a9c1d8af053d39f6eaf0bad7900520cbf829e71e data/byg/recipes/wood/imparius/bookshelf.json -f14e001c77f79df5fc2ba69a2237211512e1a418 data/byg/recipes/wood/imparius/button.json -c193ac4b435da0f1dd58c510e0d89d8a07484e78 data/byg/recipes/wood/imparius/crafting_table.json -590de7ea72c32aaf0054aa4f0d55f924bbebfa44 data/byg/recipes/wood/imparius/door.json -c7209745c248d8a557cfef522d1e3528288abbfe data/byg/recipes/wood/imparius/fence.json -e0d714b999e5726cb81e8a3c2edab0a0370b21ee data/byg/recipes/wood/imparius/fence_gate.json -4e701bf430384fed46f4180d0f4074e5ec4a7265 data/byg/recipes/wood/imparius/planks.json -12e1f28f258a1082813f9dca884af096a9244593 data/byg/recipes/wood/imparius/pressure_plate.json -319f2c33e35fac0637267fcc1978b8b19b0688e2 data/byg/recipes/wood/imparius/sign.json -10860028f3d9b845bb05d85b6d8d7c6e9f3c6419 data/byg/recipes/wood/imparius/slab.json -7e820fde1205837049d3978f124a2cad5ba7ca36 data/byg/recipes/wood/imparius/stairs.json -67f2b1ee6fb0cfa8b34647e2ce8ef90d9b4d1e57 data/byg/recipes/wood/imparius/trapdoor.json -7868a447edb00b506360fadccf7494ef456a775e data/byg/recipes/wood/imparius/wood.json -6b7e114aef8883cb5fe6d06c97430f2bdf57dbc6 data/byg/recipes/wood/jacaranda/boat.json -f767b1117c2dbd3c215b4d57fe9248255b964e88 data/byg/recipes/wood/jacaranda/bookshelf.json -808323bac21913eaa2fb4ae6f54a91d8ace3fb26 data/byg/recipes/wood/jacaranda/button.json -f8b8eb8a0061854626ffc42feddc02ee1ede5738 data/byg/recipes/wood/jacaranda/crafting_table.json -9920e72996e8e36c711d27b67bc743155460656a data/byg/recipes/wood/jacaranda/door.json -01ad53eb7c72ea7fdc98c308b9d0b956c5c9ad43 data/byg/recipes/wood/jacaranda/fence.json -13e9194d0abc955c0d74bf59fcd1c298af0283fb data/byg/recipes/wood/jacaranda/fence_gate.json -2016114072e5c68b6e242061fbba0d742234c9a3 data/byg/recipes/wood/jacaranda/planks.json -24c8ca28e1bd2621ebba7005614126bee27a3ed9 data/byg/recipes/wood/jacaranda/pressure_plate.json -e4a069b7dba9340e4b2c79e0631c4ef8a99b8396 data/byg/recipes/wood/jacaranda/sign.json -4f6e33e4604db3fda59343a7f5f529f7d640e4f5 data/byg/recipes/wood/jacaranda/slab.json -22f968a1384eff9b0e2dc6f2c2913f19946f0057 data/byg/recipes/wood/jacaranda/stairs.json -fa2f16445640fec9d6f2476fbf9d11636c5742fc data/byg/recipes/wood/jacaranda/trapdoor.json -64935c9ce800657c72f7b5e21f91b8d371137f81 data/byg/recipes/wood/jacaranda/wood.json -4054d9b7c8238fa3adf7e614844603aa119b7310 data/byg/recipes/wood/lament/bookshelf.json -450b8b29ef6d74ee50c8459e1a0baab86b25893b data/byg/recipes/wood/lament/button.json -804b7b6478646d9282f0af35fa3d2d679272b6f3 data/byg/recipes/wood/lament/crafting_table.json -b12fad2e730589d29459831f7b8628f7911b0c29 data/byg/recipes/wood/lament/door.json -0139d9270bf01a1a5443886c31dbcc0061f77c05 data/byg/recipes/wood/lament/fence.json -7e60fef2e3aa29945c9ac298b140a7596598bce5 data/byg/recipes/wood/lament/fence_gate.json -692a2814497aaedfea9746a7ae48eef7981b5c0a data/byg/recipes/wood/lament/planks.json -7f724e794ef82417b257e1c7e598b27f5ca65ede data/byg/recipes/wood/lament/pressure_plate.json -24db50a14232b7731c538ccb3fa3473c5bac5f00 data/byg/recipes/wood/lament/sign.json -71d034e12ad67752a6dcbe6d673afe255d2ed685 data/byg/recipes/wood/lament/slab.json -2a894b5f0b7a5c2db4cc0c14536b244c263aab85 data/byg/recipes/wood/lament/stairs.json -e6052e40cf349355523ed97c22b58d894b33dfac data/byg/recipes/wood/lament/trapdoor.json -96789af2a774b33fde222f103233578660b81dbc data/byg/recipes/wood/lament/wood.json -a0efd20b844663b3dfe5cd5b5861ae78f9b1dd0a data/byg/recipes/wood/mahogany/boat.json -bd227ea44f539c1b70089a8faeab074bf9fb0002 data/byg/recipes/wood/mahogany/bookshelf.json -2c4490731c6f1e34847594539b87684359d4d53b data/byg/recipes/wood/mahogany/button.json -f99aaf03fab34e61bd8f80401533330096c678d1 data/byg/recipes/wood/mahogany/crafting_table.json -9b72e81bca8c9eaa1c4de3da15e989dcac9f94a8 data/byg/recipes/wood/mahogany/door.json -0b2fd7d36a9292ba3354b25a18be8743a448c16d data/byg/recipes/wood/mahogany/fence.json -ae6fa3c01970b40f5a2909b2db21dc29069a3380 data/byg/recipes/wood/mahogany/fence_gate.json -4250e0784fca1d4c65e0f1b34b1142befdc5120e data/byg/recipes/wood/mahogany/planks.json -e363352d2c68a4b1555dc3a459f75095f6e5423e data/byg/recipes/wood/mahogany/pressure_plate.json -675f106268e0a754a2a763349ef0e8cde0f39322 data/byg/recipes/wood/mahogany/sign.json -a2b8e800096876b7a50eccdda34bc53fbb0c0677 data/byg/recipes/wood/mahogany/slab.json -ffebea536d574ddafc22ff1ac4a34332cb35f15e data/byg/recipes/wood/mahogany/stairs.json -bbf36d70b55c0251abc6a6adfaef04f0f42366d1 data/byg/recipes/wood/mahogany/trapdoor.json -421d9f59938dbe491d5d68ddef9aa7177906e693 data/byg/recipes/wood/mahogany/wood.json -c1db4438ac17f8f051ba33e0d0a17b4b3948b056 data/byg/recipes/wood/mangrove/boat.json -b4a1984792daf137b317ff719608e41812774263 data/byg/recipes/wood/mangrove/bookshelf.json -7f509ecbf155c4a6d403d6f1629217babec5aa2f data/byg/recipes/wood/mangrove/button.json -6552b958b35161883cee35b51679b8d082343261 data/byg/recipes/wood/mangrove/crafting_table.json -9b526909e767b9fe1d1b0f6b31556626fa6c4c81 data/byg/recipes/wood/mangrove/door.json -2e193e1994df461e89927202f4c9da12d9196add data/byg/recipes/wood/mangrove/fence.json -6d058a8ef785a44e63d0f52c6931804ea2665e10 data/byg/recipes/wood/mangrove/fence_gate.json -83e6bb28f9ae4c6eb46f68d5252a1e845d98dbe1 data/byg/recipes/wood/mangrove/planks.json -028d326cde235b07b5c8934cdfe9dbe63c9156fb data/byg/recipes/wood/mangrove/pressure_plate.json -1b894e5091a9a3e715dbb68aa4949a0486997440 data/byg/recipes/wood/mangrove/sign.json -5e501c611ce5205b97fb14abd195ae4a7cbf56b9 data/byg/recipes/wood/mangrove/slab.json -5ce5d4c94e47915282c6a3ad9c5ed597ac59f67f data/byg/recipes/wood/mangrove/stairs.json -9318eb844ba366324e2e94ba83c0698cbd9b21be data/byg/recipes/wood/mangrove/trapdoor.json -abd1d968c12a7255a1504388adb8d92700c82692 data/byg/recipes/wood/mangrove/wood.json -96f4d2778247741c4a7ffe60f32e75be1f31ba15 data/byg/recipes/wood/maple/boat.json -d796470649d727ee1e163eaa77375ad1b7193c86 data/byg/recipes/wood/maple/bookshelf.json -75f2707b23ede4528b8d4e76d7bdac4edf39231c data/byg/recipes/wood/maple/button.json -377b35f88e1a85b0c71f467c0100911d0d64c6ce data/byg/recipes/wood/maple/crafting_table.json -bf5cfa798ad7e708dd16afff436ad8bb0c45d40c data/byg/recipes/wood/maple/door.json -28029c2996f57185f7d23fb17c8bfbb4e035e32f data/byg/recipes/wood/maple/fence.json -b41602ea8d61156567e1be03f44add7a6e69f8f8 data/byg/recipes/wood/maple/fence_gate.json -7be46c11bac419d1eac8c00db392a8b3f71c3c88 data/byg/recipes/wood/maple/planks.json -b12a4b910686e06a3176bc93b7628ace019b25b6 data/byg/recipes/wood/maple/pressure_plate.json -6c1190db81ffdbe7de9ad884e2124c6a0cad3018 data/byg/recipes/wood/maple/sign.json -f063860c7a1f68d86917c62eb28233956bb9b508 data/byg/recipes/wood/maple/slab.json -b053481f3918d9dbe880b262aa27501676905bac data/byg/recipes/wood/maple/stairs.json -e71c7a2b907d8dc2bcd9d44c9a7f06b757d2d19f data/byg/recipes/wood/maple/trapdoor.json -5b97b63955213b1ab400e6e615898b0429946682 data/byg/recipes/wood/maple/wood.json -40bb384c86428a74cf2149b91ef2a14b02bfb092 data/byg/recipes/wood/nightshade/bookshelf.json -fb731632fc441eef65edd773e72759b185c6d866 data/byg/recipes/wood/nightshade/button.json -e941f260e96d1c82a0fc2cb9622edd227269733d data/byg/recipes/wood/nightshade/crafting_table.json -9828ab1f9bc4bb53b87c106e4c4bee9989df0764 data/byg/recipes/wood/nightshade/door.json -d21aca548c94397e49321bb9dd4d1a6570372d6a data/byg/recipes/wood/nightshade/fence.json -dfeac9482a6a9d973213b84aadb2f14787cd5f44 data/byg/recipes/wood/nightshade/fence_gate.json -28c71aa583c5cd150bd6962496ec781bac057017 data/byg/recipes/wood/nightshade/planks.json -064a8bbb780dad8b5cf1c4c66cd58e0d2da80eb8 data/byg/recipes/wood/nightshade/pressure_plate.json -268442fe2414863230e306be6c98fb0af8fdbd2a data/byg/recipes/wood/nightshade/sign.json -c5c6bb0ccbee4eb60bc9dd7cd8b411346a4b024f data/byg/recipes/wood/nightshade/slab.json -afe90f1802908dab650b36cc6d67bfbe15a7117b data/byg/recipes/wood/nightshade/stairs.json -e0614498736d2fb02b1b58793ca93c1abca85933 data/byg/recipes/wood/nightshade/trapdoor.json -a68c2d7e64e273c6ce0a5fce50f197c2946caae4 data/byg/recipes/wood/nightshade/wood.json -247270685d75f0d12b2aafa381070f6631892aca data/byg/recipes/wood/palm/boat.json -e01f1b1b87ff1f6511f7cc2d1f04f457b96bfb01 data/byg/recipes/wood/palm/bookshelf.json -64410fa72ab5ce643357c3ba80c2cbc2f2d52310 data/byg/recipes/wood/palm/button.json -4690828bbeff88ab7d98224b91caf4bbaed143af data/byg/recipes/wood/palm/crafting_table.json -821de9401aa3f912f0cb9232a3d466550c6afdbd data/byg/recipes/wood/palm/door.json -963e34105e7674a7faa997d3a2ebe931ed4dc176 data/byg/recipes/wood/palm/fence.json -0221b14cca55e62e4c61c75b69a1d1da6b1d410d data/byg/recipes/wood/palm/fence_gate.json -84c066105d39659d690885a593cc9698fa7fc0e2 data/byg/recipes/wood/palm/planks.json -1c06ed0ee707db44cb23332ee623a07efb2187a7 data/byg/recipes/wood/palm/pressure_plate.json -b549f1cd011a225c119992f1028026910c8b4e1f data/byg/recipes/wood/palm/sign.json -e8fd0779a8eb0c996d45f66461d0391fd77b9d13 data/byg/recipes/wood/palm/slab.json -69ac3c83af773a6a3c9edeaf738306320f72f81c data/byg/recipes/wood/palm/stairs.json -6c73f4e9cd248aa03cf2caad2bf3293356429246 data/byg/recipes/wood/palm/trapdoor.json -2290d2f878ab2585629fc476886d1ed1a0b8899c data/byg/recipes/wood/palm/wood.json -36ab816316e9b1e2c8ac41f80e2d48612302a5f5 data/byg/recipes/wood/pine/boat.json -b467b0cee4750a02504e2841f552bb70366c534b data/byg/recipes/wood/pine/bookshelf.json -d70141a9e3f6abc78ea5826d4e9079d05e80cbb3 data/byg/recipes/wood/pine/button.json -47d74161d4c0e71724130894f512264e75c0891a data/byg/recipes/wood/pine/crafting_table.json -7fb68840968c00f6bfcf0a86c727b06fa5b21d5e data/byg/recipes/wood/pine/door.json -f4225a3146891b5b4bea6554c0c0179b83177ba0 data/byg/recipes/wood/pine/fence.json -ab2103bf27b9778c7a9b710ddf33bb1ff3d83e05 data/byg/recipes/wood/pine/fence_gate.json -cb2f512e683654d888dba39147e7aaddde714747 data/byg/recipes/wood/pine/planks.json -aa599d4693145fbe6640eb641a8e6a146aa1979c data/byg/recipes/wood/pine/pressure_plate.json -fddaf7bf350298a7440e627174d9fe160fd0c423 data/byg/recipes/wood/pine/sign.json -52a3c129ef1b5eee710d0c93f1075a76dc3661bc data/byg/recipes/wood/pine/slab.json -f8c29c9be3523c673696e74de77789e8e963c913 data/byg/recipes/wood/pine/stairs.json -1633e25a0a403bb814a843fb69091912be0b79dc data/byg/recipes/wood/pine/trapdoor.json -c3384ce5f0653c602e061e84f02ffcc558f6d80d data/byg/recipes/wood/pine/wood.json -a2ac2986c80994b03e07782fe3aa14fce9fb52a3 data/byg/recipes/wood/rainbow_eucalyptus/boat.json -cc3bc70c4f94d4fe78810876d6aa3e53666daf6c data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json -d006ff219554dc0604eba87f187c6bcdd1175292 data/byg/recipes/wood/rainbow_eucalyptus/button.json -6a1569afe56172370459a5e4edc475ac384c6240 data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json -9c321fb29c2cd975b6be0f2ff8089c23fed4a5a3 data/byg/recipes/wood/rainbow_eucalyptus/door.json -21a1da70c755a603ae66e22faac545b80d2eb1fd data/byg/recipes/wood/rainbow_eucalyptus/fence.json -2f255f9dae36d7660073351144594a468a32fd1c data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json -15ed565185c7121779d81681d21786827f7da2a9 data/byg/recipes/wood/rainbow_eucalyptus/planks.json -b9fc1e92cc85df382bafe5ac98f4aec5be98bb78 data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json -8d8cd5fe36fc3b83130d3d476f86bd51bbdce88f data/byg/recipes/wood/rainbow_eucalyptus/sign.json -2fa6aa1168283859d5c8f6838d63b5fa4cd02637 data/byg/recipes/wood/rainbow_eucalyptus/slab.json -bd4f1e62614b1103516a6a14161ca565e6c9239a data/byg/recipes/wood/rainbow_eucalyptus/stairs.json -1d588f35d134aefdde6bd3218c669e2b4f89981d data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json -75d87d74b45ebf91db21b3899b76efee6ef07f37 data/byg/recipes/wood/rainbow_eucalyptus/wood.json -a27297d25d52fcafdaf6f312e16ac71e10fcb7f4 data/byg/recipes/wood/redwood/boat.json -f7a5ae59fa7ed24c1c058c763f1091ec2e4f7781 data/byg/recipes/wood/redwood/bookshelf.json -22dc47db0d6ff52a8d64533ba0357e0a17a16d97 data/byg/recipes/wood/redwood/button.json -d214073ed8a1c702de6a76839e0cf1dd99795f29 data/byg/recipes/wood/redwood/crafting_table.json -8672046a5beeb30c27e0713d4884711af402915d data/byg/recipes/wood/redwood/door.json -ba180c9d0b58f541c3e3f85ec7d48636d345f698 data/byg/recipes/wood/redwood/fence.json -d05398798e4eaf23b93cf77dc9061a090930c543 data/byg/recipes/wood/redwood/fence_gate.json -8b57e4a5d837d62b149b51643670eade7e7ef8cc data/byg/recipes/wood/redwood/planks.json -a264a4076ca765cfce6f1a4de2c78fb7808bb11e data/byg/recipes/wood/redwood/pressure_plate.json -aa18f3f95adff6cf6b3a45041ccd51ff30e10cdc data/byg/recipes/wood/redwood/sign.json -e3b88b0600ef01e3b462eb59ef5ea5f6b612c5c8 data/byg/recipes/wood/redwood/slab.json -5a7aa0612d567719efb5bd6dafcb367bab1b598b data/byg/recipes/wood/redwood/stairs.json -87db68650faddc45d75d68321875925363ee68eb data/byg/recipes/wood/redwood/trapdoor.json -77068fa435484d2dfd95ba3a45308c36d6593157 data/byg/recipes/wood/redwood/wood.json -2631ce235ff2f5221271d8c25bace19779243d8c data/byg/recipes/wood/skyris/boat.json -383b11a75a46101fbd060f8ad1232feb9d9e16c3 data/byg/recipes/wood/skyris/bookshelf.json -b2aa86756f081a02c6c78c00b0a42065a264adf3 data/byg/recipes/wood/skyris/button.json -8728371c728bd571cef555668f5a07675e8d1df4 data/byg/recipes/wood/skyris/crafting_table.json -9208b050275cc74fdfe91c6cb03150907f7d704d data/byg/recipes/wood/skyris/door.json -a4ec1dcf127df7172837ef1bee1c9bdb0ad7504b data/byg/recipes/wood/skyris/fence.json -371fe32cabe87d56d1444c496dc4ac7f1f8e8de1 data/byg/recipes/wood/skyris/fence_gate.json -4f299bdf264590c0546189f4acca5e4c0d898bea data/byg/recipes/wood/skyris/planks.json -102d1f688da4cdb83de4da0e11e8efcc85551d54 data/byg/recipes/wood/skyris/pressure_plate.json -ecb5702ac2f059cdb9fd87a3a362c8f64f97456b data/byg/recipes/wood/skyris/sign.json -c0fb8c5f94db8296362f5579e94236fb5ab9a118 data/byg/recipes/wood/skyris/slab.json -4ad1fd1d426c4e72e754936c08811fdb2cd4a96a data/byg/recipes/wood/skyris/stairs.json -d2cf8c3c8524cdb3ce6f363aafd50fd989008a03 data/byg/recipes/wood/skyris/trapdoor.json -b3572896d593001a84adf0dbb35959fb381aa5bd data/byg/recipes/wood/skyris/wood.json -39a5771eb4c4416d1f1c0e0301ba8fa706bc828e data/byg/recipes/wood/sythian/bookshelf.json -aacccae5dbf9ab6190d494d9321b7af851aef0fc data/byg/recipes/wood/sythian/button.json -7ac944da1dfe8ffcfa39b910be5b8c9a481bd47d data/byg/recipes/wood/sythian/crafting_table.json -7ae2280ffbdb41f6f3297e7caba1868b63a20dd0 data/byg/recipes/wood/sythian/door.json -bf531484d426261343046c7310828041a9078e9a data/byg/recipes/wood/sythian/fence.json -8b38bc84bbc33290c8172cf95dca816326645e44 data/byg/recipes/wood/sythian/fence_gate.json -fd1dcb3bc09c335e9581d95213d3af165744118f data/byg/recipes/wood/sythian/planks.json -51d9e735a6333c2a179a95a9f4563a4db6ffa1af data/byg/recipes/wood/sythian/pressure_plate.json -b18348e306adc9d8393e5bf4009bc6262a8cadca data/byg/recipes/wood/sythian/sign.json -61667e39c7df0009f3c8aa324fea644f4c64dfc9 data/byg/recipes/wood/sythian/slab.json -26cf9803288adde5e8f5a1466c980be751e92be8 data/byg/recipes/wood/sythian/stairs.json -505117e54a49ffef4fc44cc52b3f7a5d790acdcf data/byg/recipes/wood/sythian/trapdoor.json -2b04684a700790f200755a005338328e1490158d data/byg/recipes/wood/sythian/wood.json -837cb000ce0acb14670412f3dfb5e5fd666216fc data/byg/recipes/wood/willow/boat.json -06e9a5a74e213645a9b491c89f968100d8d37d96 data/byg/recipes/wood/willow/bookshelf.json -331708c6a157e1c2b5f43c57e7c65c0b80886e34 data/byg/recipes/wood/willow/button.json -a3c68bcafe458a0b2d459cbf8614f0f4d47a5401 data/byg/recipes/wood/willow/crafting_table.json -5e9c71117e0307036ead5af0e2d5729613fb7fc9 data/byg/recipes/wood/willow/door.json -f47a914611b7529c5377071f20939b2a65ea9c22 data/byg/recipes/wood/willow/fence.json -3cd4de1d963ec741bda482d4b5dcd44230cfa234 data/byg/recipes/wood/willow/fence_gate.json -0725f98b1ad68bf6d8564b1618c6c247b7e80ef8 data/byg/recipes/wood/willow/planks.json -14eeff76c2beb34eaf7d817ba4494c38c84e8bbc data/byg/recipes/wood/willow/pressure_plate.json -0d3e6fa6281ef7fb0adba4e690fefa3f44975ada data/byg/recipes/wood/willow/sign.json -cb9a56bb7cdcca02a6936cc3bf47dc65ded746f8 data/byg/recipes/wood/willow/slab.json -3a751748a2b9069d0a425f13056cd7c51e3f8721 data/byg/recipes/wood/willow/stairs.json -da344558dd48b0428d760f60d8d47ad0a1cf3d0f data/byg/recipes/wood/willow/trapdoor.json -51fa8f011040ffcd63eb1eb948bdb14e154498ab data/byg/recipes/wood/willow/wood.json -8be04d919c768ca504a362376a377abe5068491e data/byg/recipes/wood/witch_hazel/boat.json -4d89b78838e5a87d93d000e6b644b0c15fb5a134 data/byg/recipes/wood/witch_hazel/bookshelf.json -e1b3fe1dce1b76bc2f177e84e8ea7db1f2645015 data/byg/recipes/wood/witch_hazel/button.json -f3051a1922fe1afeda7d43b1335a90f63f5695d8 data/byg/recipes/wood/witch_hazel/crafting_table.json -a7b74ca3edfc8f597f716b644c559d760732e42a data/byg/recipes/wood/witch_hazel/door.json -c33282ee5ba481b99b31418313ef656f7c075b85 data/byg/recipes/wood/witch_hazel/fence.json -746fc180c1010ddfcba9f78bbd46d2b1893678a7 data/byg/recipes/wood/witch_hazel/fence_gate.json -d5f8f3331d7268d45e382b896c7664665a7d5dd9 data/byg/recipes/wood/witch_hazel/planks.json -a4b642fd4648e4691ab27e6dd2e45f6a9ea10308 data/byg/recipes/wood/witch_hazel/pressure_plate.json -99861c1a3c4887e28bca33bcfc67feaff61aeea4 data/byg/recipes/wood/witch_hazel/sign.json -cf423f46d8a554275b125d46fe11589c44b089d7 data/byg/recipes/wood/witch_hazel/slab.json -bcb31b82d756d66eaf2ba6ac42175f065f055a6c data/byg/recipes/wood/witch_hazel/stairs.json -3237525986cf267bcebfdec1d9679c7cae8de1f4 data/byg/recipes/wood/witch_hazel/trapdoor.json -4526c524259ce1746cf07bff23079a4f74c92731 data/byg/recipes/wood/witch_hazel/wood.json -e3a1b871d0ad4c86097b356c06d343b8d96129fd data/byg/recipes/wood/zelkova/boat.json -31c15fd989c1090a19f488a9f6c0a39b491037fa data/byg/recipes/wood/zelkova/bookshelf.json -34c2d86ebff26218427b83e7a09cf1b6907032d8 data/byg/recipes/wood/zelkova/button.json -83aed9be1c7d230ffa7fca714539021bc495e32a data/byg/recipes/wood/zelkova/crafting_table.json -55f02f16c273e1f3359af8520a422d922905cc11 data/byg/recipes/wood/zelkova/door.json -c59f39dbcbf9b3fa97bd56bb8add80ac57e84e12 data/byg/recipes/wood/zelkova/fence.json -984589f81fae2850c89ea079ca42a32e8d2e5626 data/byg/recipes/wood/zelkova/fence_gate.json -1fdf7c8c242c238c0025521a400d69eac31dd289 data/byg/recipes/wood/zelkova/planks.json -2ee988906823ce6d7ba83fd772b693dee61e4089 data/byg/recipes/wood/zelkova/pressure_plate.json -0617be7ca54ee255663658317c7112e65dee6078 data/byg/recipes/wood/zelkova/sign.json -65b4c7eba317fbcc85d56bccf004458b9aae1f6e data/byg/recipes/wood/zelkova/slab.json -5cc3d6c5d4ad75828481945934c82b9b4681d1f1 data/byg/recipes/wood/zelkova/stairs.json -7d1bd145500fbeffd22edc9d35239aa995d48815 data/byg/recipes/wood/zelkova/trapdoor.json -514cc64fb5a8f37d6e6520a28705223d917f7478 data/byg/recipes/wood/zelkova/wood.json -fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/blocks/bookshelves.json -d409d66cd99d6e86f9294c45c71b483debfbb112 data/byg/tags/blocks/end_stone.json -dec608514dfc42eac5f8c810578b2b05f2eb87ab data/byg/tags/blocks/lush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/allium_flower_bush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/alpine_bellflower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/amaranth.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/angelica.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/araucaria_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/aspen_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/baobab_sapling.json -df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/beach_grass.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/begonia.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/bistort.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/black_rose.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_sage.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_birch_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_oak_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json -ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/bulbis_oddity.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/california_poppy.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cika_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/clover_patch.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/crocus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cyan_amaranth.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/cypress_sapling.json -56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/death_cap.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/delphinium.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/ebony_sapling.json -56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/embur_wart.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/ether_sapling.json -c4fbfdfc41fc02b0de7ad2977ceb0b382569ea6e data/byg/tags/blocks/may_place_on/fairy_slipper.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/fir_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flower_patch.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/foxglove.json -ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/fungal_imparius.json -df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/golden_spined_cactus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json -830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/green_mushroom.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/green_tulip.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/guzmania.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/holly_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/horseweed.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/hydrangea_bush.json -ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/imparius_mushroom.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/incan_lily.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/iris.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/jacaranda_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/japanese_orchid.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/joshua_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/kovan_flower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lament_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lazarus_bellflower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/lollipop_flower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/magenta_amaranth.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/magenta_tulip.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/mahogany_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/mangrove_sapling.json -d6deac24c1e4346c0f356b2a1d458a72266b01f3 data/byg/tags/blocks/may_place_on/mangrove_tree.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/maple_sapling.json -df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/mini_cactus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/nightshade_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_amaranth.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_birch_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_daisy.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_oak_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/orchard_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/osiria_rose.json -f753439c558e9415a3d7196b46128d14cea5c9b1 data/byg/tags/blocks/may_place_on/palm_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/palo_verde_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/peach_leather_flower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pine_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_allium.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_allium_bush.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_anemone.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/pink_daffodil.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/prairie_grass.json -df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/protea_flower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_amaranth.json -ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_sage.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/purple_tulip.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_birch_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_maple_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_oak_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/red_spruce_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/redwood_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/richea.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/rose.json -ca09537e74072fea0431dbf635ca8e8355dff046 data/byg/tags/blocks/may_place_on/shulkren_fungus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/silver_maple_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/silver_vase_flower.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/skyris_sapling.json -56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/soul_shroom.json -56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/sythian_fungus.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_allium.json -df9ee6dda975d83a8e9b841997af32145752343a data/byg/tags/blocks/may_place_on/tall_beach_grass.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_pink_allium.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/tall_prairie_grass.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/torch_ginger.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/violet_leather_flower.json -830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/weeping_milk_cap.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_anemone.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_cherry_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/white_sage.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/willow_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/winter_succulent.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json -56196ce18ce9abf13cad6aa4ba17142a6cdbf360 data/byg/tags/blocks/may_place_on/withering_oak_sapling.json -830507d9d1d3a8ab33b41d3cdad6cabb7cc3e8b9 data/byg/tags/blocks/may_place_on/wood_blewit.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_daffodil.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/yellow_tulip.json -7fecd5818677dd12c77c521f4011e3116c50518b data/byg/tags/blocks/may_place_on/zelkova_sapling.json -ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/blocks/mushrooms.json -6e54f0683d236d69c5cce2c20bd86a6634245578 data/byg/tags/blocks/scaffolding.json -8609e06689af9adf9b9b148e93751d9035a3302e data/byg/tags/blocks/slabs.json -05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/blocks/wood/aspen_logs.json -fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/blocks/wood/baobab_logs.json -5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/blocks/wood/blue_enchanted_logs.json -6ba54ede001aeb5d407035a8d9ed38fd9c6b6b85 data/byg/tags/blocks/wood/bulbis_logs.json -92bb19e703dea870b6efd348f6216eb791b07f94 data/byg/tags/blocks/wood/cherry_logs.json -5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/blocks/wood/cika_logs.json -7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/blocks/wood/cypress_logs.json -9b0b2d4870545894723344872062d9317ab188bc data/byg/tags/blocks/wood/ebony_logs.json -088b5d14f042e63b6bcbff1f8487ba3a4f3b3182 data/byg/tags/blocks/wood/embur_logs.json -80e1953df48855e29d5b55070afdefe2697acade data/byg/tags/blocks/wood/ether_logs.json -b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/blocks/wood/fir_logs.json -c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/blocks/wood/green_enchanted_logs.json -47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/blocks/wood/holly_logs.json -60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/blocks/wood/imparius_logs.json -c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/blocks/wood/jacaranda_logs.json -9e22dce46462b6eeabc33cc58ddca514d843c59a data/byg/tags/blocks/wood/lament_logs.json -095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/blocks/wood/mahogany_logs.json -5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/blocks/wood/mangrove_logs.json -a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/blocks/wood/maple_logs.json -88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/blocks/wood/nightshade_logs.json -701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/blocks/wood/palm_logs.json -d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/blocks/wood/palo_verde_logs.json -be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/blocks/wood/pine_logs.json -a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json -9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/blocks/wood/redwood_logs.json -c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/blocks/wood/skyris_logs.json -629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/blocks/wood/sythian_logs.json -7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/blocks/wood/willow_logs.json -7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/blocks/wood/witch_hazel_logs.json -3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/blocks/wood/withering_oak_logs.json -a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/blocks/wood/zelkova_logs.json -b9ab1582ed849d23d78df79d78211ec07ba14d27 data/byg/tags/entity_types/boats.json -fe99dedb5956e38d78c4b25953f2f2f438851428 data/byg/tags/items/bookshelves.json -ec01dd781caabcbddbb6e4976f5dbc32ad69d527 data/byg/tags/items/mushrooms.json -6d49966ebc8bda4c28b7d3305ba9480a5d8ab251 data/byg/tags/items/sticks.json -05f049ce3b43d0d334eb6919e7757ff009e8f5a5 data/byg/tags/items/wood/aspen_logs.json -fef182ec0f322f5afeaceaaf40201a1f8a8e4490 data/byg/tags/items/wood/baobab_logs.json -5c86e0ca01ddd0f437716b2531dbdd6a4dc7f5ef data/byg/tags/items/wood/blue_enchanted_logs.json -6ba54ede001aeb5d407035a8d9ed38fd9c6b6b85 data/byg/tags/items/wood/bulbis_logs.json -92bb19e703dea870b6efd348f6216eb791b07f94 data/byg/tags/items/wood/cherry_logs.json -5e914064c19b559bbfe2c5854498c911fc652c1e data/byg/tags/items/wood/cika_logs.json -7783615e9e6ec1e4fa32f307ea427d887937ca54 data/byg/tags/items/wood/cypress_logs.json -9b0b2d4870545894723344872062d9317ab188bc data/byg/tags/items/wood/ebony_logs.json -088b5d14f042e63b6bcbff1f8487ba3a4f3b3182 data/byg/tags/items/wood/embur_logs.json -80e1953df48855e29d5b55070afdefe2697acade data/byg/tags/items/wood/ether_logs.json -b2472a6b1680ca054346688ab16e460eec43f4f5 data/byg/tags/items/wood/fir_logs.json -c15a0295fe2f490bff6f73cfda024db130adc30e data/byg/tags/items/wood/green_enchanted_logs.json -47bd2c93ddfd096e6be0bd2e3224a3e4f0877cae data/byg/tags/items/wood/holly_logs.json -60138502e4d7bcf36a2ea1cb5e0254a3d18bc982 data/byg/tags/items/wood/imparius_logs.json -c0e406923d32b8e6e73616101fdbff57b429bf94 data/byg/tags/items/wood/jacaranda_logs.json -9e22dce46462b6eeabc33cc58ddca514d843c59a data/byg/tags/items/wood/lament_logs.json -095adaff95b3695d579fb82697ed5b4a4c0c8b39 data/byg/tags/items/wood/mahogany_logs.json -5dddc09a90bd8ee5ae454cc83103b2e115516aa9 data/byg/tags/items/wood/mangrove_logs.json -a8de7ba71416ab47612c45b4abb93fbe36a6f2cc data/byg/tags/items/wood/maple_logs.json -88d14584daeb810cb1ecefbc59d3d91cdd8828b4 data/byg/tags/items/wood/nightshade_logs.json -701606f7f63938e45fa4cf6e04fdec09aad75926 data/byg/tags/items/wood/palm_logs.json -d7dac2f4c677c1b478b788d4548eca31982cc77a data/byg/tags/items/wood/palo_verde_logs.json -be2f93f0cbef45e13f337231b89b1c32062f2d35 data/byg/tags/items/wood/pine_logs.json -a2e6b1b8adc68e83a74a4c21cfbfa5f7d018538b data/byg/tags/items/wood/rainbow_eucalyptus_logs.json -9f7f6edc8c46df511ab2e3895dae9c2d9eef7f91 data/byg/tags/items/wood/redwood_logs.json -c1b152629b71f4990c376eb8188554e333bca423 data/byg/tags/items/wood/skyris_logs.json -629a20e6b2715a7a4d10a99c3120f1cf193bdae5 data/byg/tags/items/wood/sythian_logs.json -7138e47a0b55cf74b18a10aa063636ec8fc831c8 data/byg/tags/items/wood/willow_logs.json -7fb9f499649301d69d2ea9f85bef7921b6ad7e16 data/byg/tags/items/wood/witch_hazel_logs.json -3a4b442b0ddecea21abff5d0c7c008162044f778 data/byg/tags/items/wood/withering_oak_logs.json -a8ca5bf06557161de198d6e729db8c52c5cd97d1 data/byg/tags/items/wood/zelkova_logs.json -417da7430aeb414baa78ea7c68077f9e964396ef data/byg/tags/worldgen/biome/is_badlands.json -e267658c8d53318f1183c2fb3a860580be3498dd data/byg/tags/worldgen/biome/is_beach.json -7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_dead.json -a58f5d6e58216b07697b39682647820c0f23779c data/byg/tags/worldgen/biome/is_deep_ocean.json -8ff0c57a1c566702b71a741cc95bf8e79630285d data/byg/tags/worldgen/biome/is_icy.json -a58f5d6e58216b07697b39682647820c0f23779c data/byg/tags/worldgen/biome/is_ocean.json -6c5591da8888cfd1a3c6b7f2be4818277dd1154f data/byg/tags/worldgen/biome/is_sandy.json -ca812f2ce872a3cc2ae76961b501b55673f789b3 data/byg/tags/worldgen/biome/is_snowy.json -84f1bfefb5417f440b327fb2e7c2127deb8152da data/byg/tags/worldgen/biome/is_spooky.json -df49524b70b0f38239e968c7288de18975f2dc7f data/byg/tags/worldgen/biome/is_swamp.json -7bfa2259361126f285ee4e93daebe58603f8353c data/byg/tags/worldgen/biome/is_wasteland.json -686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/blocks/buttons.json -5f8107eb48f67becbda2b5f7f650f05af5ea63b7 data/minecraft/tags/blocks/campfires.json -3e73ebf1fc5ce9b4b85ffd829772c20e6c68dfc5 data/minecraft/tags/blocks/ice.json -7e79f85e43d30a3167c74f6e335268c63b71eab3 data/minecraft/tags/blocks/leaves.json -337c5359dbf08062360d240e40db3c0544084292 data/minecraft/tags/blocks/logs.json -cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/blocks/logs_that_burn.json -4778df338b1173432537b360008afe3f44963050 data/minecraft/tags/blocks/mineable/axe.json -cf6fba1ef612f3e7e93291777e20311ec1d82062 data/minecraft/tags/blocks/mineable/shovel.json -3a4b442b0ddecea21abff5d0c7c008162044f778 data/minecraft/tags/blocks/oak_logs.json -d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/blocks/planks.json -3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/blocks/sand.json -73720aba09d3697f9d1c29289a0ab94c080c0410 data/minecraft/tags/blocks/saplings.json -8f688520cda72285fe1d6880e6e35d3df0987b23 data/minecraft/tags/blocks/stairs.json -b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/trapdoors.json -80d29532a1785f4bc25da05a241660d6f1694447 data/minecraft/tags/blocks/wart_blocks.json -686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/blocks/wooden_buttons.json -de954410ba639f97f3359cbd60af139d96c9a23d data/minecraft/tags/blocks/wooden_doors.json -d9ab9d24f99f65562b07b0df2c4441667016f1d6 data/minecraft/tags/blocks/wooden_fences.json -ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/blocks/wooden_pressure_plates.json -325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/blocks/wooden_slabs.json -2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/blocks/wooden_stairs.json -b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/blocks/wooden_trapdoors.json -686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/buttons.json -1a425684393db180e3cde0048031ec3959749966 data/minecraft/tags/items/leaves.json -337c5359dbf08062360d240e40db3c0544084292 data/minecraft/tags/items/logs.json -cdd19380fc1a24c7d8cf510a5deaade4f8235458 data/minecraft/tags/items/logs_that_burn.json -d5a8c53b10113cbe8b1574864fd1ddf4722fa544 data/minecraft/tags/items/planks.json -3ef98eff34d161e2253559796ede6ea8824388ed data/minecraft/tags/items/sand.json -bdc2492c1f92de2a4539d7b99b887c6cc0a388e2 data/minecraft/tags/items/saplings.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/minecraft/tags/items/slabs.json -8f688520cda72285fe1d6880e6e35d3df0987b23 data/minecraft/tags/items/stairs.json -b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/trapdoors.json -686c39d8f6ec038f813099bc6ce0a5b8f1ee4739 data/minecraft/tags/items/wooden_buttons.json -de954410ba639f97f3359cbd60af139d96c9a23d data/minecraft/tags/items/wooden_doors.json -d9ab9d24f99f65562b07b0df2c4441667016f1d6 data/minecraft/tags/items/wooden_fences.json -ddd12d971436979db2961572c64ad54a42dd8ced data/minecraft/tags/items/wooden_pressure_plates.json -325d2ff26abd2f524c4c24afdb6e00ee9b1edd00 data/minecraft/tags/items/wooden_slabs.json -2b12276f3745f519c6dadd731673b8c555401515 data/minecraft/tags/items/wooden_stairs.json -b699d6ee081dd5163e6c67b27d36a35d115e0ade data/minecraft/tags/items/wooden_trapdoors.json diff --git a/Common/src/generated/resources/.cache/e96ec6bce616c89889fb1019febdaef36b955008 b/Common/src/generated/resources/.cache/e96ec6bce616c89889fb1019febdaef36b955008 new file mode 100644 index 0000000000..9e3d76513d --- /dev/null +++ b/Common/src/generated/resources/.cache/e96ec6bce616c89889fb1019febdaef36b955008 @@ -0,0 +1,181 @@ +// 1.19 2022-06-08T20:08:31.2974232 BYG Block Tags +9ad18a5f91a85156fdb4a0fe04bfced0a85190f6 data/byg/tags/blocks/bookshelves.json +fb625d0f7d1039b071247f74b3fe90ebaa9b2f55 data/byg/tags/blocks/end_stone.json +291cb53edd79525d3a0e1007725504fb91c0c6ce data/byg/tags/blocks/lush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/allium_flower_bush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/alpine_bellflower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/amaranth.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/angelica.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/araucaria_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/aspen_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/baobab_sapling.json +c1b2a217bb3fcb7e1d67f5bc45409796720bd171 data/byg/tags/blocks/may_place_on/beach_grass.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/begonia.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/bistort.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/black_rose.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/blue_sage.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/brown_birch_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/brown_oak_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json +830eb1ded3cfb6e1903bb2cfa49e32d4939555ca data/byg/tags/blocks/may_place_on/bulbis_oddity.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/california_poppy.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/cika_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/clover_patch.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/crocus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/cyan_amaranth.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/cypress_sapling.json +90bbe2b8b55383bb4d2d3d5fd4288ce2cb1759a2 data/byg/tags/blocks/may_place_on/death_cap.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/delphinium.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/ebony_sapling.json +90bbe2b8b55383bb4d2d3d5fd4288ce2cb1759a2 data/byg/tags/blocks/may_place_on/embur_wart.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/ether_sapling.json +44efe42214465777f9f3e90abdf701b7295e601c data/byg/tags/blocks/may_place_on/fairy_slipper.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/fir_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/flower_patch.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/foxglove.json +830eb1ded3cfb6e1903bb2cfa49e32d4939555ca data/byg/tags/blocks/may_place_on/fungal_imparius.json +c1b2a217bb3fcb7e1d67f5bc45409796720bd171 data/byg/tags/blocks/may_place_on/golden_spined_cactus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json +bd718172517e746752807374d5c0b16d23f3fbef data/byg/tags/blocks/may_place_on/green_mushroom.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/green_tulip.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/guzmania.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/holly_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/horseweed.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/hydrangea_bush.json +830eb1ded3cfb6e1903bb2cfa49e32d4939555ca data/byg/tags/blocks/may_place_on/imparius_mushroom.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/incan_lily.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/iris.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/jacaranda_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/japanese_orchid.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/joshua_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/kovan_flower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/lament_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/lazarus_bellflower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/lollipop_flower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/magenta_amaranth.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/magenta_tulip.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/mahogany_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/mangrove_sapling.json +09b1366d4fd12c3c9acf727240cb52f9fa4930ae data/byg/tags/blocks/may_place_on/mangrove_tree.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/maple_sapling.json +c1b2a217bb3fcb7e1d67f5bc45409796720bd171 data/byg/tags/blocks/may_place_on/mini_cactus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/nightshade_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orange_amaranth.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orange_birch_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orange_daisy.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orange_oak_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/orchard_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/osiria_rose.json +e4d28099b3557b120274c2ef7593e202019c4d65 data/byg/tags/blocks/may_place_on/palm_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/palo_verde_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/peach_leather_flower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pine_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pink_allium.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pink_allium_bush.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pink_anemone.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/pink_daffodil.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/prairie_grass.json +c1b2a217bb3fcb7e1d67f5bc45409796720bd171 data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/protea_flower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/purple_amaranth.json +830eb1ded3cfb6e1903bb2cfa49e32d4939555ca data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/purple_sage.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/purple_tulip.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/redwood_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/red_birch_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/red_maple_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/red_oak_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/red_spruce_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/richea.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/rose.json +830eb1ded3cfb6e1903bb2cfa49e32d4939555ca data/byg/tags/blocks/may_place_on/shulkren_fungus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/silver_maple_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/silver_vase_flower.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/skyris_sapling.json +90bbe2b8b55383bb4d2d3d5fd4288ce2cb1759a2 data/byg/tags/blocks/may_place_on/soul_shroom.json +90bbe2b8b55383bb4d2d3d5fd4288ce2cb1759a2 data/byg/tags/blocks/may_place_on/sythian_fungus.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/tall_allium.json +c1b2a217bb3fcb7e1d67f5bc45409796720bd171 data/byg/tags/blocks/may_place_on/tall_beach_grass.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/tall_pink_allium.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/tall_prairie_grass.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/torch_ginger.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/violet_leather_flower.json +bd718172517e746752807374d5c0b16d23f3fbef data/byg/tags/blocks/may_place_on/weeping_milk_cap.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/white_anemone.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/white_cherry_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/white_sage.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/willow_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/winter_succulent.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json +90bbe2b8b55383bb4d2d3d5fd4288ce2cb1759a2 data/byg/tags/blocks/may_place_on/withering_oak_sapling.json +bd718172517e746752807374d5c0b16d23f3fbef data/byg/tags/blocks/may_place_on/wood_blewit.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/yellow_daffodil.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/yellow_tulip.json +69c396cb051bbe9a130e6979b67065e5041b179d data/byg/tags/blocks/may_place_on/zelkova_sapling.json +ef89ece741f37ca4edef1a32af40e5bd5fef30ed data/byg/tags/blocks/mushrooms.json +76954474fd913b2db52c9c8a86f153f95cbd3e0b data/byg/tags/blocks/scaffolding.json +6323117165896801aed3be76c92f68d68f7c3364 data/byg/tags/blocks/slabs.json +7703e5d02c2746bdbbbc0ed84ca702ba0ffbf08f data/byg/tags/blocks/wood/aspen_logs.json +6e452e56808f54cc00f849724e4c707876b8dc62 data/byg/tags/blocks/wood/baobab_logs.json +2f4f003fcf3e0abe5f6910af3f84a2c23f861755 data/byg/tags/blocks/wood/blue_enchanted_logs.json +60471b0693276a23d3e570d946ae8b281a670967 data/byg/tags/blocks/wood/bulbis_logs.json +6025faea67820ec5603c746f11158ada99723aad data/byg/tags/blocks/wood/cherry_logs.json +0c2e6ad3ab992852d39b97b7e68c3b9f5163a200 data/byg/tags/blocks/wood/cika_logs.json +c4c46b42bcbfb2d5f9fdc30ca094140f3ca55669 data/byg/tags/blocks/wood/cypress_logs.json +40aded7130bc80f71359616f444235b1d84269b1 data/byg/tags/blocks/wood/ebony_logs.json +19bceb41a62f2024bdb7079aa69a2990b5afb49c data/byg/tags/blocks/wood/embur_logs.json +0a9d1609711a1eaf2c4896b3c2771b2048b3834b data/byg/tags/blocks/wood/ether_logs.json +def5f419deab903798347c2bbc6b67fc6050c0bb data/byg/tags/blocks/wood/fir_logs.json +15e6e7aed0a9615d4470f7d2499734f117846e67 data/byg/tags/blocks/wood/green_enchanted_logs.json +5675baabec6f48813b01ad90224966f04e63e1ff data/byg/tags/blocks/wood/holly_logs.json +477df1cf06cfe87245f7dfbee2703103540354c3 data/byg/tags/blocks/wood/imparius_logs.json +f25c6968ff68cb356a0223c0c7d87c6bd98fe365 data/byg/tags/blocks/wood/jacaranda_logs.json +dddfc92c770ad7f92a3bbdf9bcc91bce4261347e data/byg/tags/blocks/wood/lament_logs.json +bc209ef504cd8e1f9bb684ca72923ddbf4eddacc data/byg/tags/blocks/wood/mahogany_logs.json +43bac38b67128575b270ceaea927bf628d7f9859 data/byg/tags/blocks/wood/mangrove_logs.json +2c0ab0d6b8e69b49a963860699e7dd105c7de5e8 data/byg/tags/blocks/wood/maple_logs.json +778d3a63d8cce3649f87a7e084ea24229c85cfd1 data/byg/tags/blocks/wood/nightshade_logs.json +5d48ee13f5e465f19a7b3efa6691763b0f53592e data/byg/tags/blocks/wood/palm_logs.json +54cf56b00b4bb1a2a860f813021e229fc65fe3b6 data/byg/tags/blocks/wood/palo_verde_logs.json +94f72a755c3831ec716034a60afbd6e062135dea data/byg/tags/blocks/wood/pine_logs.json +5f624f68a4e536875061508b262c2d130e75ae4b data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json +1f83b1a5783ea13aec0600e7812d4f78d1953881 data/byg/tags/blocks/wood/redwood_logs.json +0c8ce69039282be5f6b814248b8397590423af8e data/byg/tags/blocks/wood/skyris_logs.json +2233f58716ca83938f2fd3b85cc1d5cba070d8e1 data/byg/tags/blocks/wood/sythian_logs.json +b5444de87b7a8a3d8cf1a1d93d8e0f785a2ebbd3 data/byg/tags/blocks/wood/willow_logs.json +d9bee530cb743b4401ddc0ae6e746db1446cb58c data/byg/tags/blocks/wood/witch_hazel_logs.json +905fafa6eeb610de1832dd4816b99b1f102dc7d4 data/byg/tags/blocks/wood/withering_oak_logs.json +c45f5216a4bfbe4957d094bbbe5e0c7200697677 data/byg/tags/blocks/wood/zelkova_logs.json +9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/blocks/buttons.json +62978bd2ab4e2dff704fe9d5dd21ce5134f21eb5 data/minecraft/tags/blocks/campfires.json +e3c17f50270f84c73d4addfdb43108029521063b data/minecraft/tags/blocks/ice.json +c1f4f765e628d81da849771c62775b9cf5e294eb data/minecraft/tags/blocks/leaves.json +33b235c8f4002c5dbd589c5fe366c207db40bf00 data/minecraft/tags/blocks/logs.json +2b8005337c8db298e3e8bea249c881029f2bbfef data/minecraft/tags/blocks/logs_that_burn.json +b7cd7cd2df595d7b37ea4469c4257266c511e54e data/minecraft/tags/blocks/mineable/axe.json +09da8b01567112b92ce083797241354a301138c6 data/minecraft/tags/blocks/mineable/shovel.json +905fafa6eeb610de1832dd4816b99b1f102dc7d4 data/minecraft/tags/blocks/oak_logs.json +783bd34843ae1ebe7eee31074eef9ceb8f2d9243 data/minecraft/tags/blocks/planks.json +694444607939e5deac55f0e05c9a2fcf754c7418 data/minecraft/tags/blocks/sand.json +36d602daace4eccd255edbf46dba8493caa5872f data/minecraft/tags/blocks/saplings.json +5963df094b99da0ee350cf32a6123322b62e6cac data/minecraft/tags/blocks/stairs.json +d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/blocks/trapdoors.json +09e208ea5f3042ba092d786bc68deb01f0e53fd1 data/minecraft/tags/blocks/wart_blocks.json +9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/blocks/wooden_buttons.json +8f7ff378ccfcaaebc4a0222ee7e11cecb44f7d9e data/minecraft/tags/blocks/wooden_doors.json +4d32f5855aeee653ff9b92b88865c88b08fa782f data/minecraft/tags/blocks/wooden_fences.json +e3b5e4bd8dc3d019e1ccda81d4d5cba553ebc2e8 data/minecraft/tags/blocks/wooden_pressure_plates.json +c9f4a4e34c5fabc6838bd4d6017c7f93aa5ca00c data/minecraft/tags/blocks/wooden_slabs.json +6c66002027cbd32fc13f9df0493a7783888303d5 data/minecraft/tags/blocks/wooden_stairs.json +d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/blocks/wooden_trapdoors.json diff --git a/Common/src/generated/resources/.cache/fb07fd0e5e59c798298e44c793e29943bd74dcd4 b/Common/src/generated/resources/.cache/fb07fd0e5e59c798298e44c793e29943bd74dcd4 new file mode 100644 index 0000000000..c2942ad9ee --- /dev/null +++ b/Common/src/generated/resources/.cache/fb07fd0e5e59c798298e44c793e29943bd74dcd4 @@ -0,0 +1,10 @@ +// 1.19 2022-06-08T20:08:31.2394261 BYG Advancements +153cb4332005b750c9f081eab0b2d7b0189582ff data/byg/advancements/adventure/oh_the_biomes_youll_go.json +a780babb10c3430b09f01d9a20e61d2a2029f505 data/byg/advancements/biomepedia_gift.json +945b25c9757911d34615d8b7deffdc4319ddeba1 data/byg/advancements/husbandry/berrily_alive.json +fa21cc9ef6edf1dc3ecd7084d0454517d4df4cc3 data/byg/advancements/husbandry/forager.json +c39e62a3a2763f4012082784f79b5410888c667c data/byg/advancements/husbandry/granny_smith.json +2d6dc7b07f69ccd48c318d316253edefd9bd6cef data/byg/advancements/husbandry/hot_diggity_not_dog.json +8c16e997ad0f27dcac373b5be71c45e6fb225eb5 data/byg/advancements/husbandry/just_like_grandmas.json +1406ced26b7c7484e9d7eb2f2821a5945ad56750 data/byg/advancements/husbandry/root.json +0ddafc1a08432ffe301390c8f55092699007b395 data/byg/advancements/root.json diff --git a/Common/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab b/Common/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab new file mode 100644 index 0000000000..242f0a670e --- /dev/null +++ b/Common/src/generated/resources/.cache/fcc0d197db45e404a8bc894ca09c0611e5a65cab @@ -0,0 +1,2 @@ +// 1.19 2022-06-08T20:08:31.2954332 Tags for minecraft:entity_type +5159600ada2c8a80e33182bcc091541870881060 data/byg/tags/entity_types/boats.json diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json index 5c912d3bae..258a72fcc8 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/aspen/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/aspen/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/aspen/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/aspen/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/aspen/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/aspen/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/aspen/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/aspen/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/aspen/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/aspen/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/aspen/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/aspen/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/aspen/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/aspen/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/aspen/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/aspen/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/aspen/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/aspen/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/aspen/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/aspen/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/aspen/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/aspen/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/aspen/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/aspen/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/aspen/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/aspen/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/aspen/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/aspen/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/aspen/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/aspen/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/aspen/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/aspen/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/aspen/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json index 406e0bcda9..990fd91dd3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/aspen/door_top" + "model": "byg:block/aspen/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen/door_bottom", + "model": "byg:block/aspen/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/aspen/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_top_hinge", + "model": "byg:block/aspen/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/aspen/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/aspen/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/aspen/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_top_hinge", + "model": "byg:block/aspen/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/aspen/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/aspen/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", + "model": "byg:block/aspen/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/aspen/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/aspen/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/aspen/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/aspen/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/aspen/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/aspen/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/aspen/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/aspen/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/aspen/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json index f3521dbbbe..1332557b1f 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/aspen/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/aspen/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/aspen/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/aspen/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json index e7d74e950c..664c0865ac 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/aspen/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/aspen/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/aspen/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/aspen/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/aspen/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/aspen/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/aspen/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/aspen/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/aspen/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/aspen/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/aspen/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/aspen/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/aspen/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/aspen/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/aspen/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/aspen/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/aspen/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/aspen/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/aspen/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/aspen/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json index a15044a8f9..0a738a7440 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/aspen/slab_top" - }, "type=bottom": { "model": "byg:block/aspen/slab" }, "type=double": { "model": "byg:block/aspen/planks" + }, + "type=top": { + "model": "byg:block/aspen/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json index ba8b608a67..3d34fb10c0 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/aspen/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/aspen/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/aspen/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/aspen/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/aspen/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/aspen/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/aspen/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/aspen/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/aspen/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/aspen/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/aspen/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/aspen/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/aspen/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/aspen/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/aspen/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/aspen/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/aspen/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/aspen/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/aspen/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/aspen/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/aspen/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/aspen/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/aspen/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/aspen/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/aspen/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/aspen/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/aspen/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/aspen/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/aspen/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/aspen/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/aspen/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/aspen/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/aspen/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/aspen/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/aspen/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/aspen/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/aspen/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/aspen/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json index 1c837dd18a..0257aa1a76 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/aspen_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/aspen/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/aspen/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/aspen/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/aspen/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/aspen/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/aspen/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/aspen/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/aspen/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/aspen/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/aspen/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/aspen/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/aspen/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/aspen/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/aspen/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/aspen/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/aspen/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/aspen/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/aspen/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/aspen/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/aspen/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json index bb3f6541f8..9dd9cb18a7 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/baobab/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/baobab/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/baobab/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/baobab/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/baobab/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/baobab/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/baobab/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/baobab/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/baobab/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/baobab/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/baobab/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/baobab/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/baobab/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/baobab/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/baobab/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/baobab/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/baobab/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/baobab/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/baobab/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/baobab/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/baobab/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/baobab/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/baobab/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/baobab/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/baobab/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/baobab/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/baobab/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/baobab/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/baobab/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/baobab/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/baobab/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/baobab/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/baobab/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json index 9556a40ec4..7334cc15bc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/baobab/door_top" + "model": "byg:block/baobab/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab/door_bottom", + "model": "byg:block/baobab/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/baobab/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_top_hinge", + "model": "byg:block/baobab/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/baobab/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/baobab/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/baobab/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_top_hinge", + "model": "byg:block/baobab/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/baobab/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/baobab/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", + "model": "byg:block/baobab/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/baobab/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/baobab/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/baobab/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/baobab/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/baobab/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/baobab/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/baobab/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/baobab/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/baobab/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json index e731a38a7b..e9115abfc4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/baobab/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/baobab/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/baobab/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/baobab/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json index e1ba415907..517f05af15 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/baobab/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/baobab/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/baobab/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/baobab/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/baobab/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/baobab/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/baobab/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/baobab/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/baobab/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/baobab/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/baobab/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/baobab/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/baobab/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/baobab/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/baobab/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/baobab/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/baobab/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/baobab/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/baobab/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/baobab/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json index ae2d4a9e6a..44139d7b03 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/baobab/slab_top" - }, "type=bottom": { "model": "byg:block/baobab/slab" }, "type=double": { "model": "byg:block/baobab/planks" + }, + "type=top": { + "model": "byg:block/baobab/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json index 3e599e99f5..745577284c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/baobab/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/baobab/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/baobab/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/baobab/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/baobab/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/baobab/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/baobab/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/baobab/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/baobab/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/baobab/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/baobab/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/baobab/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/baobab/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/baobab/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/baobab/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/baobab/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/baobab/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/baobab/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/baobab/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/baobab/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/baobab/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/baobab/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/baobab/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/baobab/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/baobab/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/baobab/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/baobab/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/baobab/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/baobab/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/baobab/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/baobab/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/baobab/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/baobab/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/baobab/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/baobab/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/baobab/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/baobab/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/baobab/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json index 35f6c567dc..48844b81c0 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/baobab_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/baobab/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/baobab/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/baobab/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/baobab/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/baobab/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/baobab/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/baobab/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/baobab/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/baobab/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/baobab/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/baobab/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/baobab/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/baobab/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/baobab/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/baobab/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/baobab/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/baobab/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/baobab/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/baobab/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/baobab/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json index 39f748e81d..fddcf25aa5 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/blue_enchanted/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/blue_enchanted/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/blue_enchanted/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/blue_enchanted/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/blue_enchanted/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/blue_enchanted/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/blue_enchanted/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/blue_enchanted/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/blue_enchanted/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/blue_enchanted/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/blue_enchanted/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/blue_enchanted/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/blue_enchanted/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/blue_enchanted/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/blue_enchanted/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json index 640451546d..2247349ba2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_top" + "model": "byg:block/blue_enchanted/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_bottom", + "model": "byg:block/blue_enchanted/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/blue_enchanted/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_top_hinge", + "model": "byg:block/blue_enchanted/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/blue_enchanted/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_top_hinge", + "model": "byg:block/blue_enchanted/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", + "model": "byg:block/blue_enchanted/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/blue_enchanted/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/blue_enchanted/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/blue_enchanted/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/blue_enchanted/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/blue_enchanted/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/blue_enchanted/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json index 19577b1aff..d51287e43b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/blue_enchanted/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/blue_enchanted/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/blue_enchanted/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/blue_enchanted/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json index 3d011a49bf..706b3af685 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/blue_enchanted/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/blue_enchanted/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/blue_enchanted/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/blue_enchanted/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/blue_enchanted/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/blue_enchanted/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/blue_enchanted/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/blue_enchanted/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/blue_enchanted/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/blue_enchanted/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/blue_enchanted/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/blue_enchanted/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/blue_enchanted/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json index 7fe159a6ca..bf4adb686d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/blue_enchanted/slab_top" - }, "type=bottom": { "model": "byg:block/blue_enchanted/slab" }, "type=double": { "model": "byg:block/blue_enchanted/planks" + }, + "type=top": { + "model": "byg:block/blue_enchanted/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json index b5da9773c7..7e85af7f05 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/blue_enchanted/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/blue_enchanted/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/blue_enchanted/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/blue_enchanted/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/blue_enchanted/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/blue_enchanted/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/blue_enchanted/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/blue_enchanted/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/blue_enchanted/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/blue_enchanted/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/blue_enchanted/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/blue_enchanted/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/blue_enchanted/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/blue_enchanted/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/blue_enchanted/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/blue_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/blue_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/blue_enchanted/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/blue_enchanted/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/blue_enchanted/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json index 20474850b4..cdcb114998 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/blue_enchanted_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/blue_enchanted/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/blue_enchanted/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/blue_enchanted/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/blue_enchanted/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/blue_enchanted/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/blue_enchanted/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/blue_enchanted/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/blue_enchanted/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/blue_enchanted/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/blue_enchanted/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/blue_enchanted/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/blue_enchanted/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/blue_enchanted/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json index b96ef63f47..2638647f5b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/bulbis/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/bulbis/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/bulbis/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/bulbis/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/bulbis/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/bulbis/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/bulbis/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/bulbis/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/bulbis/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/bulbis/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/bulbis/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/bulbis/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/bulbis/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/bulbis/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/bulbis/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/bulbis/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/bulbis/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/bulbis/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/bulbis/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/bulbis/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/bulbis/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/bulbis/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/bulbis/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/bulbis/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/bulbis/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/bulbis/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/bulbis/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/bulbis/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json index f7a3c44675..18341569dd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/bulbis/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/bulbis/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/bulbis/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/bulbis/door_top" + "model": "byg:block/bulbis/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/bulbis/door_bottom", + "model": "byg:block/bulbis/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/bulbis/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/bulbis/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/bulbis/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_top_hinge", + "model": "byg:block/bulbis/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/bulbis/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/bulbis/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/bulbis/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_top_hinge", + "model": "byg:block/bulbis/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/bulbis/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/bulbis/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", + "model": "byg:block/bulbis/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/bulbis/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/bulbis/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/bulbis/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/bulbis/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/bulbis/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/bulbis/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/bulbis/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/bulbis/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/bulbis/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/bulbis/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/bulbis/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/bulbis/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/bulbis/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/bulbis/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/bulbis/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json index 9cd972b333..7f19ec5773 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/bulbis/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/bulbis/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/bulbis/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/bulbis/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json index f7f5ac800f..9364498909 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/bulbis/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/bulbis/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/bulbis/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/bulbis/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/bulbis/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/bulbis/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/bulbis/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/bulbis/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/bulbis/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/bulbis/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/bulbis/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/bulbis/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/bulbis/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/bulbis/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/bulbis/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/bulbis/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/bulbis/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/bulbis/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/bulbis/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/bulbis/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json index b8219db3fa..cba7d58f66 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/bulbis/slab_top" - }, "type=bottom": { "model": "byg:block/bulbis/slab" }, "type=double": { "model": "byg:block/bulbis/planks" + }, + "type=top": { + "model": "byg:block/bulbis/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json index 884edb8ba8..d1f8364586 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/bulbis/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/bulbis/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/bulbis/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/bulbis/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/bulbis/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/bulbis/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/bulbis/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/bulbis/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/bulbis/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/bulbis/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/bulbis/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/bulbis/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/bulbis/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/bulbis/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/bulbis/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/bulbis/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/bulbis/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/bulbis/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/bulbis/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/bulbis/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/bulbis/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/bulbis/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/bulbis/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/bulbis/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/bulbis/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/bulbis/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/bulbis/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/bulbis/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/bulbis/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/bulbis/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/bulbis/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/bulbis/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json index a783d4e662..bfbfc830cc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/bulbis_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/bulbis/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/bulbis/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/bulbis/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/bulbis/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/bulbis/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/bulbis/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/bulbis/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/bulbis/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/bulbis/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/bulbis/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/bulbis/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/bulbis/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/bulbis/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/bulbis/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/bulbis/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/bulbis/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/bulbis/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/bulbis/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/bulbis/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/bulbis/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json index 1890720e0d..9b2afb7f7c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/cherry/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/cherry/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/cherry/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cherry/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cherry/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/cherry/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cherry/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cherry/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/cherry/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cherry/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/cherry/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cherry/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/cherry/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cherry/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/cherry/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/cherry/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cherry/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cherry/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cherry/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/cherry/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cherry/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cherry/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/cherry/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/cherry/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cherry/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/cherry/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/cherry/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/cherry/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/cherry/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/cherry/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/cherry/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/cherry/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/cherry/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json index 7e9f2b299c..28e50fb84a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cherry/door_top" + "model": "byg:block/cherry/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry/door_bottom", + "model": "byg:block/cherry/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cherry/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_top_hinge", + "model": "byg:block/cherry/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cherry/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cherry/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cherry/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_top_hinge", + "model": "byg:block/cherry/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cherry/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cherry/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", + "model": "byg:block/cherry/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cherry/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cherry/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cherry/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cherry/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cherry/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cherry/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cherry/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cherry/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cherry/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json index 8b4a233179..3208df73c9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/cherry/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/cherry/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/cherry/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/cherry/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json index 628410825a..ce70aa384a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cherry/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cherry/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cherry/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/cherry/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cherry/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/cherry/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cherry/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cherry/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/cherry/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cherry/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cherry/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cherry/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/cherry/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cherry/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/cherry/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cherry/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cherry/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cherry/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cherry/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/cherry/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json index b72e64202a..5c3e16fb70 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/cherry/slab_top" - }, "type=bottom": { "model": "byg:block/cherry/slab" }, "type=double": { "model": "byg:block/cherry/planks" + }, + "type=top": { + "model": "byg:block/cherry/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json index e2aa6c9c9d..58ef6497bd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/cherry/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cherry/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cherry/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cherry/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cherry/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cherry/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cherry/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/cherry/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/cherry/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/cherry/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cherry/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cherry/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/cherry/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cherry/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/cherry/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cherry/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cherry/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/cherry/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/cherry/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cherry/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cherry/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/cherry/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cherry/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cherry/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cherry/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/cherry/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/cherry/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/cherry/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cherry/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cherry/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cherry/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/cherry/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/cherry/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cherry/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/cherry/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/cherry/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cherry/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/cherry/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json index 02d53d3a27..850d4d7fb1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cherry_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/cherry/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cherry/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/cherry/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/cherry/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/cherry/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/cherry/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cherry/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cherry/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/cherry/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cherry/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/cherry/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/cherry/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cherry/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/cherry/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cherry/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/cherry/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cherry/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/cherry/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/cherry/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/cherry/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_button.json b/Common/src/generated/resources/assets/byg/blockstates/cika_button.json index 2b3a97b125..a1cfda5c1a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/cika/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/cika/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/cika/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cika/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cika/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/cika/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cika/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cika/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/cika/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cika/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/cika/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cika/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/cika/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cika/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/cika/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/cika/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cika/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cika/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cika/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/cika/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cika/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cika/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/cika/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/cika/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cika/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/cika/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/cika/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/cika/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/cika/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/cika/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/cika/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/cika/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/cika/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_door.json b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json index f940aa75f2..46a1166405 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cika/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cika/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cika/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cika/door_top" + "model": "byg:block/cika/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cika/door_bottom", + "model": "byg:block/cika/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cika/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cika/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cika/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_top_hinge", + "model": "byg:block/cika/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cika/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cika/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cika/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_top_hinge", + "model": "byg:block/cika/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cika/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cika/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", + "model": "byg:block/cika/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cika/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cika/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cika/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cika/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cika/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cika/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cika/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cika/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cika/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cika/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cika/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cika/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cika/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cika/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cika/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json index 936e6680d1..d9de27b8a1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/cika/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/cika/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/cika/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/cika/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json index b80595a2fa..80bab6351f 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cika/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cika/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cika/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/cika/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cika/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/cika/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cika/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cika/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/cika/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cika/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cika/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cika/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/cika/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cika/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/cika/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cika/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cika/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cika/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cika/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/cika/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json index c6577765d2..0e7b417306 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/cika/slab_top" - }, "type=bottom": { "model": "byg:block/cika/slab" }, "type=double": { "model": "byg:block/cika/planks" + }, + "type=top": { + "model": "byg:block/cika/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json index 51ae3136a4..0f072841dd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/cika/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cika/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cika/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cika/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cika/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cika/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cika/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/cika/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/cika/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/cika/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cika/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cika/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/cika/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cika/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/cika/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cika/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cika/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/cika/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/cika/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cika/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cika/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/cika/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cika/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cika/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cika/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/cika/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/cika/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/cika/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cika/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cika/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cika/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/cika/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/cika/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cika/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cika/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cika/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cika/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/cika/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cika/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cika/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/cika/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cika/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/cika/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json index 232e325954..53ae669d30 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cika_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/cika/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cika/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/cika/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/cika/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/cika/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/cika/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cika/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cika/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/cika/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cika/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/cika/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/cika/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cika/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/cika/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cika/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/cika/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cika/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/cika/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/cika/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/cika/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json index c20b3d37d4..cfc139040d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/cypress/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/cypress/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/cypress/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/cypress/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/cypress/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/cypress/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/cypress/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/cypress/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/cypress/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/cypress/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/cypress/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/cypress/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/cypress/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/cypress/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/cypress/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/cypress/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/cypress/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/cypress/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/cypress/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/cypress/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/cypress/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/cypress/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/cypress/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/cypress/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/cypress/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/cypress/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/cypress/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/cypress/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/cypress/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/cypress/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/cypress/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/cypress/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/cypress/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json index 5862ea420e..81abc714bd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/cypress/door_top" + "model": "byg:block/cypress/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress/door_bottom", + "model": "byg:block/cypress/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/cypress/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_top_hinge", + "model": "byg:block/cypress/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/cypress/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/cypress/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/cypress/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_top_hinge", + "model": "byg:block/cypress/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/cypress/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/cypress/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", + "model": "byg:block/cypress/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/cypress/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/cypress/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/cypress/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/cypress/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/cypress/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/cypress/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/cypress/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/cypress/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/cypress/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json index 651f0e5f6d..7f2647eac2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/cypress/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/cypress/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/cypress/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/cypress/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json index a56e9a1820..d3fb1c7d06 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/cypress/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/cypress/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/cypress/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/cypress/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/cypress/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/cypress/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/cypress/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/cypress/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/cypress/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/cypress/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/cypress/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/cypress/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/cypress/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/cypress/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/cypress/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/cypress/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/cypress/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/cypress/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/cypress/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/cypress/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json index ddc23990fd..f8704755a7 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/cypress/slab_top" - }, "type=bottom": { "model": "byg:block/cypress/slab" }, "type=double": { "model": "byg:block/cypress/planks" + }, + "type=top": { + "model": "byg:block/cypress/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json index b361ab6177..e107a435f3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/cypress/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/cypress/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/cypress/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/cypress/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/cypress/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/cypress/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/cypress/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/cypress/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/cypress/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/cypress/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/cypress/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/cypress/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/cypress/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/cypress/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/cypress/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/cypress/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/cypress/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/cypress/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/cypress/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/cypress/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/cypress/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/cypress/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/cypress/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/cypress/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/cypress/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/cypress/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/cypress/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/cypress/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/cypress/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/cypress/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/cypress/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/cypress/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/cypress/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/cypress/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/cypress/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/cypress/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/cypress/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/cypress/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json index 526c61d211..214911ef2f 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/cypress_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/cypress/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/cypress/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/cypress/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/cypress/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/cypress/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/cypress/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/cypress/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/cypress/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/cypress/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/cypress/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/cypress/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/cypress/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/cypress/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/cypress/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/cypress/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/cypress/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/cypress/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/cypress/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/cypress/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/cypress/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json index 9f2b7063b6..ecd5dbf05c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/ebony/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/ebony/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/ebony/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/ebony/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/ebony/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/ebony/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/ebony/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/ebony/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/ebony/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/ebony/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/ebony/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/ebony/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/ebony/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/ebony/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/ebony/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/ebony/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/ebony/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/ebony/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/ebony/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/ebony/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/ebony/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/ebony/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/ebony/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/ebony/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/ebony/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/ebony/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/ebony/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/ebony/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/ebony/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/ebony/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/ebony/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/ebony/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/ebony/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json index 5eb552fb0d..6b8411b340 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/ebony/door_top" + "model": "byg:block/ebony/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony/door_bottom", + "model": "byg:block/ebony/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/ebony/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_top_hinge", + "model": "byg:block/ebony/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/ebony/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/ebony/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/ebony/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_top_hinge", + "model": "byg:block/ebony/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/ebony/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/ebony/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", + "model": "byg:block/ebony/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/ebony/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/ebony/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/ebony/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/ebony/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/ebony/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/ebony/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/ebony/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/ebony/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/ebony/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json index 7cd07ed1fb..72a0a246d6 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/ebony/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/ebony/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/ebony/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/ebony/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json index a4e30bceaa..01f543f851 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/ebony/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/ebony/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/ebony/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/ebony/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/ebony/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/ebony/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/ebony/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/ebony/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/ebony/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/ebony/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/ebony/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/ebony/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/ebony/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/ebony/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/ebony/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/ebony/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/ebony/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/ebony/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/ebony/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/ebony/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json index 8ff11b333a..2349f4ff48 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/ebony/slab_top" - }, "type=bottom": { "model": "byg:block/ebony/slab" }, "type=double": { "model": "byg:block/ebony/planks" + }, + "type=top": { + "model": "byg:block/ebony/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json index 0c3e12e1b8..839229dc6b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/ebony/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/ebony/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/ebony/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/ebony/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/ebony/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/ebony/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/ebony/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/ebony/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/ebony/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/ebony/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/ebony/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/ebony/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/ebony/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/ebony/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/ebony/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/ebony/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/ebony/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/ebony/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/ebony/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/ebony/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/ebony/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/ebony/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/ebony/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/ebony/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/ebony/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/ebony/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/ebony/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/ebony/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/ebony/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/ebony/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/ebony/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/ebony/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/ebony/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/ebony/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/ebony/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/ebony/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/ebony/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/ebony/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json index 0738c0ae45..8331496387 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ebony_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/ebony/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/ebony/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/ebony/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/ebony/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/ebony/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/ebony/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/ebony/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/ebony/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/ebony/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/ebony/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/ebony/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/ebony/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/ebony/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/ebony/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/ebony/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/ebony/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/ebony/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/ebony/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/ebony/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/ebony/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_button.json b/Common/src/generated/resources/assets/byg/blockstates/embur_button.json index 32b23cf5a2..2339b2b05d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/embur/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/embur/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/embur/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/embur/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/embur/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/embur/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/embur/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/embur/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/embur/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/embur/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/embur/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/embur/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/embur/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/embur/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/embur/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/embur/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/embur/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/embur/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/embur/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/embur/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/embur/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/embur/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/embur/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/embur/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/embur/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/embur/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/embur/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/embur/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/embur/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/embur/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/embur/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/embur/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/embur/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_door.json b/Common/src/generated/resources/assets/byg/blockstates/embur_door.json index 6e63ce1eec..e9f466157a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/embur/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/embur/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/embur/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/embur/door_top" + "model": "byg:block/embur/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/embur/door_bottom", + "model": "byg:block/embur/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/embur/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/embur/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/embur/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/embur/door_top_hinge", + "model": "byg:block/embur/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/embur/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/embur/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/embur/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/embur/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/embur/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/embur/door_bottom_hinge", + "model": "byg:block/embur/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/embur/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/embur/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/embur/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/embur/door_top_hinge", + "model": "byg:block/embur/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/embur/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/embur/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/embur/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/embur/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/embur/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/embur/door_bottom_hinge", + "model": "byg:block/embur/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/embur/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/embur/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/embur/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/embur/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/embur/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/embur/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/embur/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/embur/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/embur/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/embur/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/embur/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/embur/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/embur/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/embur/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/embur/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json b/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json index 504ab501a6..3e7d77a429 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/embur/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/embur/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/embur/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/embur/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json index 8823cbb111..87009184b9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/embur/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/embur/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/embur/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/embur/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/embur/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/embur/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/embur/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/embur/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/embur/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/embur/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/embur/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/embur/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/embur/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/embur/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/embur/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/embur/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/embur/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/embur/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/embur/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/embur/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json b/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json index 38a4b8374c..0ffe01cae2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/embur/slab_top" - }, "type=bottom": { "model": "byg:block/embur/slab" }, "type=double": { "model": "byg:block/embur/planks" + }, + "type=top": { + "model": "byg:block/embur/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json index 678a53b0f5..0de7305d13 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/embur/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/embur/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/embur/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/embur/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/embur/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/embur/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/embur/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/embur/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/embur/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/embur/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/embur/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/embur/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/embur/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/embur/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/embur/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/embur/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/embur/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/embur/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/embur/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/embur/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/embur/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/embur/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/embur/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/embur/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/embur/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/embur/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/embur/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/embur/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/embur/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/embur/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/embur/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/embur/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/embur/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/embur/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/embur/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/embur/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/embur/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/embur/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/embur/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/embur/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/embur/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/embur/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/embur/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json index f96fa89188..eef772f7f7 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/embur_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/embur/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/embur/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/embur/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/embur/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/embur/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/embur/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/embur/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/embur/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/embur/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/embur/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/embur/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/embur/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/embur/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/embur/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/embur/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/embur/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/embur/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/embur/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/embur/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/embur/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_button.json b/Common/src/generated/resources/assets/byg/blockstates/ether_button.json index c3b4c81c0d..6050dc2f7c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/ether/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/ether/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/ether/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/ether/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/ether/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/ether/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/ether/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/ether/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/ether/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/ether/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/ether/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/ether/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/ether/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/ether/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/ether/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/ether/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/ether/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/ether/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/ether/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/ether/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/ether/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/ether/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/ether/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/ether/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/ether/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/ether/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/ether/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/ether/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/ether/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/ether/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/ether/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/ether/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/ether/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_door.json b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json index 5d101b58c4..463190a613 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/ether/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/ether/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/ether/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/ether/door_top" + "model": "byg:block/ether/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/ether/door_bottom", + "model": "byg:block/ether/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/ether/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/ether/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/ether/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_top_hinge", + "model": "byg:block/ether/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/ether/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/ether/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/ether/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_top_hinge", + "model": "byg:block/ether/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/ether/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/ether/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", + "model": "byg:block/ether/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/ether/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/ether/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/ether/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/ether/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/ether/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/ether/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/ether/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/ether/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/ether/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/ether/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/ether/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/ether/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/ether/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/ether/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/ether/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json b/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json index a41e8c58c8..e1793ab5d8 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/ether/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/ether/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/ether/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/ether/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json index eb4f897f07..c3955f3f75 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/ether/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/ether/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/ether/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/ether/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/ether/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/ether/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/ether/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/ether/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/ether/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/ether/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/ether/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/ether/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/ether/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/ether/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/ether/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/ether/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/ether/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/ether/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/ether/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/ether/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json b/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json index d1b0f57c6b..90dba7c326 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/ether/slab_top" - }, "type=bottom": { "model": "byg:block/ether/slab" }, "type=double": { "model": "byg:block/ether/planks" + }, + "type=top": { + "model": "byg:block/ether/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json index 5571f0b045..37fb7ec9bc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/ether/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/ether/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/ether/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/ether/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/ether/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/ether/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/ether/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/ether/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/ether/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/ether/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/ether/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/ether/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/ether/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/ether/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/ether/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/ether/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/ether/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/ether/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/ether/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/ether/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/ether/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/ether/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/ether/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/ether/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/ether/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/ether/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/ether/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/ether/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/ether/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/ether/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/ether/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/ether/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/ether/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/ether/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/ether/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/ether/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/ether/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/ether/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/ether/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/ether/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/ether/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/ether/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/ether/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json index 17933f93c4..b8340cdb89 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/ether_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/ether/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/ether/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/ether/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/ether/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/ether/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/ether/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/ether/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/ether/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/ether/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/ether/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/ether/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/ether/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/ether/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/ether/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/ether/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/ether/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/ether/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/ether/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/ether/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/ether/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_button.json b/Common/src/generated/resources/assets/byg/blockstates/fir_button.json index 3ef6785258..2307be1409 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/fir/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/fir/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/fir/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/fir/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/fir/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/fir/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/fir/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/fir/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/fir/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/fir/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/fir/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/fir/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/fir/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/fir/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/fir/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/fir/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/fir/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/fir/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/fir/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/fir/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/fir/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/fir/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/fir/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/fir/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/fir/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/fir/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/fir/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/fir/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/fir/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/fir/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/fir/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/fir/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/fir/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_door.json b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json index b00d75656d..873328c03a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/fir/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/fir/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/fir/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/fir/door_top" + "model": "byg:block/fir/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/fir/door_bottom", + "model": "byg:block/fir/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/fir/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/fir/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/fir/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_top_hinge", + "model": "byg:block/fir/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/fir/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/fir/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/fir/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_top_hinge", + "model": "byg:block/fir/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/fir/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/fir/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", + "model": "byg:block/fir/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/fir/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/fir/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/fir/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/fir/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/fir/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/fir/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/fir/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/fir/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/fir/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/fir/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/fir/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/fir/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/fir/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/fir/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/fir/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json b/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json index 314ebb34ce..93f5a076a4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/fir/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/fir/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/fir/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/fir/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json index 5be9ecad6d..6ee215465b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/fir/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/fir/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/fir/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/fir/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/fir/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/fir/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/fir/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/fir/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/fir/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/fir/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/fir/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/fir/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/fir/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/fir/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/fir/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/fir/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/fir/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/fir/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/fir/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/fir/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json b/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json index 3b430b6138..c2f0ffb824 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/fir/slab_top" - }, "type=bottom": { "model": "byg:block/fir/slab" }, "type=double": { "model": "byg:block/fir/planks" + }, + "type=top": { + "model": "byg:block/fir/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json index da8592388e..e158a180be 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/fir/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/fir/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/fir/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/fir/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/fir/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/fir/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/fir/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/fir/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/fir/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/fir/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/fir/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/fir/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/fir/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/fir/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/fir/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/fir/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/fir/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/fir/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/fir/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/fir/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/fir/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/fir/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/fir/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/fir/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/fir/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/fir/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/fir/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/fir/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/fir/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/fir/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/fir/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/fir/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/fir/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/fir/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/fir/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/fir/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/fir/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/fir/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/fir/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/fir/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/fir/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/fir/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/fir/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/fir/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json index a78a23178a..7151d3a893 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/fir_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/fir/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/fir/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/fir/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/fir/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/fir/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/fir/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/fir/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/fir/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/fir/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/fir/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/fir/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/fir/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/fir/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/fir/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/fir/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/fir/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/fir/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/fir/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/fir/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/fir/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/fir/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/fir/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json index 68426c52e3..04337517fc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/green_enchanted/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/green_enchanted/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/green_enchanted/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/green_enchanted/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/green_enchanted/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/green_enchanted/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/green_enchanted/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/green_enchanted/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/green_enchanted/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/green_enchanted/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/green_enchanted/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/green_enchanted/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/green_enchanted/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/green_enchanted/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/green_enchanted/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/green_enchanted/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/green_enchanted/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/green_enchanted/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/green_enchanted/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/green_enchanted/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/green_enchanted/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/green_enchanted/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json index 8d267a684d..36b0d7a00e 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_top" + "model": "byg:block/green_enchanted/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_bottom", + "model": "byg:block/green_enchanted/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/green_enchanted/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_top_hinge", + "model": "byg:block/green_enchanted/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/green_enchanted/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_top_hinge", + "model": "byg:block/green_enchanted/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", + "model": "byg:block/green_enchanted/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/green_enchanted/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/green_enchanted/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/green_enchanted/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/green_enchanted/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/green_enchanted/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/green_enchanted/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json index 71b7d4853e..537ceb6cc3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/green_enchanted/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/green_enchanted/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/green_enchanted/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/green_enchanted/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json index 3c03c88fc6..f9d1e8e4aa 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/green_enchanted/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/green_enchanted/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/green_enchanted/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/green_enchanted/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/green_enchanted/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/green_enchanted/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/green_enchanted/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/green_enchanted/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/green_enchanted/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/green_enchanted/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/green_enchanted/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/green_enchanted/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/green_enchanted/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/green_enchanted/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/green_enchanted/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/green_enchanted/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/green_enchanted/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/green_enchanted/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/green_enchanted/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/green_enchanted/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json index b6499d8113..2813e42215 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/green_enchanted/slab_top" - }, "type=bottom": { "model": "byg:block/green_enchanted/slab" }, "type=double": { "model": "byg:block/green_enchanted/planks" + }, + "type=top": { + "model": "byg:block/green_enchanted/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json index 5512a84957..23078cac14 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/green_enchanted/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/green_enchanted/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/green_enchanted/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/green_enchanted/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/green_enchanted/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/green_enchanted/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/green_enchanted/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/green_enchanted/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/green_enchanted/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/green_enchanted/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/green_enchanted/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/green_enchanted/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/green_enchanted/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/green_enchanted/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/green_enchanted/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/green_enchanted/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/green_enchanted/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/green_enchanted/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/green_enchanted/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/green_enchanted/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json index e51ba6dce4..5f96bc4ea3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/green_enchanted_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/green_enchanted/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/green_enchanted/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/green_enchanted/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/green_enchanted/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/green_enchanted/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/green_enchanted/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/green_enchanted/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/green_enchanted/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/green_enchanted/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/green_enchanted/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/green_enchanted/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/green_enchanted/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/green_enchanted/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/green_enchanted/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/green_enchanted/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/green_enchanted/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/green_enchanted/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/green_enchanted/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/green_enchanted/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_button.json b/Common/src/generated/resources/assets/byg/blockstates/holly_button.json index e3d1d42c39..a01f5d4318 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/holly/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/holly/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/holly/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/holly/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/holly/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/holly/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/holly/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/holly/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/holly/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/holly/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/holly/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/holly/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/holly/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/holly/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/holly/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/holly/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/holly/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/holly/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/holly/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/holly/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/holly/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/holly/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/holly/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/holly/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/holly/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/holly/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/holly/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/holly/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/holly/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/holly/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/holly/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/holly/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/holly/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_door.json b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json index 8063717b3e..32dfdb5173 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/holly/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/holly/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/holly/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/holly/door_top" + "model": "byg:block/holly/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/holly/door_bottom", + "model": "byg:block/holly/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/holly/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/holly/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/holly/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_top_hinge", + "model": "byg:block/holly/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/holly/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/holly/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/holly/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_top_hinge", + "model": "byg:block/holly/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/holly/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/holly/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", + "model": "byg:block/holly/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/holly/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/holly/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/holly/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/holly/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/holly/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/holly/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/holly/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/holly/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/holly/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/holly/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/holly/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/holly/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/holly/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/holly/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/holly/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json b/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json index 194d0a33b8..3bce04ad66 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/holly/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/holly/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/holly/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/holly/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json index b036e8152b..acb86b9ce2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/holly/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/holly/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/holly/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/holly/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/holly/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/holly/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/holly/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/holly/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/holly/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/holly/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/holly/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/holly/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/holly/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/holly/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/holly/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/holly/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/holly/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/holly/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/holly/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/holly/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json b/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json index 1ee941716c..986d6980af 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/holly/slab_top" - }, "type=bottom": { "model": "byg:block/holly/slab" }, "type=double": { "model": "byg:block/holly/planks" + }, + "type=top": { + "model": "byg:block/holly/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json index 52d715f9ec..4bacd45d1b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/holly/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/holly/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/holly/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/holly/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/holly/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/holly/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/holly/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/holly/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/holly/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/holly/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/holly/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/holly/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/holly/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/holly/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/holly/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/holly/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/holly/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/holly/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/holly/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/holly/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/holly/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/holly/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/holly/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/holly/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/holly/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/holly/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/holly/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/holly/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/holly/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/holly/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/holly/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/holly/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/holly/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/holly/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/holly/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/holly/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/holly/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/holly/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/holly/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/holly/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/holly/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/holly/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/holly/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json index 87f5b06c7b..d908531519 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/holly_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/holly/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/holly/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/holly/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/holly/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/holly/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/holly/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/holly/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/holly/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/holly/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/holly/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/holly/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/holly/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/holly/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/holly/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/holly/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/holly/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/holly/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/holly/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/holly/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/holly/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json index e31b26e1c7..e5dbef310a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/imparius/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/imparius/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/imparius/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/imparius/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/imparius/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/imparius/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/imparius/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/imparius/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/imparius/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/imparius/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/imparius/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/imparius/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/imparius/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/imparius/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/imparius/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/imparius/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/imparius/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/imparius/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/imparius/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/imparius/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/imparius/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/imparius/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/imparius/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/imparius/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/imparius/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/imparius/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/imparius/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/imparius/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/imparius/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/imparius/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/imparius/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/imparius/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/imparius/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json index 7b9bd4a0b9..77aff59b54 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/imparius/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/imparius/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/imparius/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/imparius/door_top" + "model": "byg:block/imparius/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/imparius/door_bottom", + "model": "byg:block/imparius/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/imparius/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/imparius/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/imparius/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_top_hinge", + "model": "byg:block/imparius/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/imparius/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/imparius/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/imparius/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_top_hinge", + "model": "byg:block/imparius/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/imparius/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/imparius/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", + "model": "byg:block/imparius/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/imparius/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/imparius/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/imparius/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/imparius/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/imparius/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/imparius/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/imparius/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/imparius/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/imparius/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/imparius/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/imparius/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/imparius/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/imparius/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/imparius/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/imparius/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json index 6e6e95eacc..833dec3e7a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/imparius/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/imparius/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/imparius/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/imparius/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json index cfef2c801b..c02cf731bc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/imparius/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/imparius/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/imparius/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/imparius/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/imparius/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/imparius/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/imparius/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/imparius/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/imparius/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/imparius/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/imparius/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/imparius/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/imparius/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/imparius/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/imparius/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/imparius/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/imparius/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/imparius/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/imparius/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/imparius/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json index 250a9ce37b..8efc000805 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/imparius/slab_top" - }, "type=bottom": { "model": "byg:block/imparius/slab" }, "type=double": { "model": "byg:block/imparius/planks" + }, + "type=top": { + "model": "byg:block/imparius/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json index 191b8b1a84..91d25fd093 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/imparius/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/imparius/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/imparius/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/imparius/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/imparius/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/imparius/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/imparius/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/imparius/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/imparius/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/imparius/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/imparius/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/imparius/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/imparius/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/imparius/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/imparius/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/imparius/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/imparius/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/imparius/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/imparius/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/imparius/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/imparius/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/imparius/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/imparius/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/imparius/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/imparius/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/imparius/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/imparius/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/imparius/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/imparius/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/imparius/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/imparius/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/imparius/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/imparius/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/imparius/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/imparius/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/imparius/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/imparius/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/imparius/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json index c4fe931ed7..3679aa7cdc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/imparius_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/imparius/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/imparius/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/imparius/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/imparius/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/imparius/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/imparius/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/imparius/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/imparius/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/imparius/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/imparius/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/imparius/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/imparius/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/imparius/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/imparius/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/imparius/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/imparius/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/imparius/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/imparius/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/imparius/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/imparius/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json index 418049942b..80005f3d57 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/jacaranda/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/jacaranda/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/jacaranda/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/jacaranda/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/jacaranda/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/jacaranda/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/jacaranda/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/jacaranda/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/jacaranda/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/jacaranda/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/jacaranda/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/jacaranda/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/jacaranda/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/jacaranda/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/jacaranda/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/jacaranda/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/jacaranda/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/jacaranda/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/jacaranda/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/jacaranda/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/jacaranda/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/jacaranda/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/jacaranda/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/jacaranda/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/jacaranda/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/jacaranda/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/jacaranda/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/jacaranda/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json index fd264ab775..86a97f4d71 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_top" + "model": "byg:block/jacaranda/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_bottom", + "model": "byg:block/jacaranda/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/jacaranda/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_top_hinge", + "model": "byg:block/jacaranda/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_bottom_hinge", + "model": "byg:block/jacaranda/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/jacaranda/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_top_hinge", + "model": "byg:block/jacaranda/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_bottom_hinge", + "model": "byg:block/jacaranda/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/jacaranda/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/jacaranda/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/jacaranda/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/jacaranda/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/jacaranda/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/jacaranda/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json index 772a6c0e4d..d547ee5aa4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/jacaranda/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/jacaranda/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/jacaranda/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/jacaranda/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json index eb4a7fe5cb..00b3b9e153 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/jacaranda/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/jacaranda/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/jacaranda/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/jacaranda/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/jacaranda/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/jacaranda/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/jacaranda/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/jacaranda/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/jacaranda/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/jacaranda/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/jacaranda/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/jacaranda/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/jacaranda/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/jacaranda/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/jacaranda/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/jacaranda/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/jacaranda/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/jacaranda/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/jacaranda/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/jacaranda/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json index e8847ea83b..66a43e10fa 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/jacaranda/slab_top" - }, "type=bottom": { "model": "byg:block/jacaranda/slab" }, "type=double": { "model": "byg:block/jacaranda/planks" + }, + "type=top": { + "model": "byg:block/jacaranda/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json index 77bc5986e6..c67cdd50ac 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/jacaranda/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/jacaranda/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/jacaranda/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/jacaranda/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/jacaranda/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/jacaranda/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/jacaranda/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/jacaranda/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/jacaranda/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/jacaranda/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/jacaranda/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/jacaranda/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/jacaranda/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/jacaranda/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/jacaranda/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/jacaranda/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/jacaranda/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/jacaranda/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/jacaranda/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/jacaranda/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/jacaranda/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/jacaranda/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json index a882dab888..699037ae75 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/jacaranda_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/jacaranda/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/jacaranda/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/jacaranda/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/jacaranda/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/jacaranda/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/jacaranda/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/jacaranda/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/jacaranda/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/jacaranda/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/jacaranda/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/jacaranda/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/jacaranda/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/jacaranda/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/jacaranda/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/jacaranda/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/jacaranda/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/jacaranda/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/jacaranda/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/jacaranda/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/jacaranda/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/jacaranda/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/jacaranda/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_button.json b/Common/src/generated/resources/assets/byg/blockstates/lament_button.json index f51fff0d0e..e8a82e5fb9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/lament/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/lament/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/lament/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/lament/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/lament/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/lament/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/lament/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/lament/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/lament/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/lament/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/lament/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/lament/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/lament/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/lament/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/lament/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/lament/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/lament/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/lament/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/lament/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/lament/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/lament/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/lament/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/lament/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/lament/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/lament/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/lament/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/lament/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/lament/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/lament/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/lament/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/lament/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/lament/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/lament/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_door.json b/Common/src/generated/resources/assets/byg/blockstates/lament_door.json index 74c214e577..033f8f5546 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/lament/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/lament/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/lament/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/lament/door_top" + "model": "byg:block/lament/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/lament/door_bottom", + "model": "byg:block/lament/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/lament/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/lament/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/lament/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/lament/door_top_hinge", + "model": "byg:block/lament/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/lament/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/lament/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/lament/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/lament/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/lament/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/lament/door_bottom_hinge", + "model": "byg:block/lament/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/lament/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/lament/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/lament/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/lament/door_top_hinge", + "model": "byg:block/lament/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/lament/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/lament/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/lament/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/lament/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/lament/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/lament/door_bottom_hinge", + "model": "byg:block/lament/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/lament/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/lament/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/lament/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/lament/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/lament/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/lament/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/lament/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/lament/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/lament/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/lament/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/lament/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/lament/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/lament/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/lament/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/lament/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json b/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json index 1aef989f2a..b152e8a471 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/lament/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/lament/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/lament/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/lament/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json index 5726d16587..5feef1c16b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/lament/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/lament/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/lament/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/lament/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/lament/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/lament/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/lament/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/lament/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/lament/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/lament/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/lament/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/lament/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/lament/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/lament/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/lament/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/lament/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/lament/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/lament/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/lament/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/lament/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json b/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json index 4d23de2701..84b4ff1e05 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/lament/slab_top" - }, "type=bottom": { "model": "byg:block/lament/slab" }, "type=double": { "model": "byg:block/lament/planks" + }, + "type=top": { + "model": "byg:block/lament/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json index 8cfff7effa..6469c3df52 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/lament/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/lament/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/lament/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/lament/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/lament/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/lament/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/lament/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/lament/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/lament/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/lament/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/lament/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/lament/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/lament/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/lament/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/lament/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/lament/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/lament/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/lament/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/lament/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/lament/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/lament/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/lament/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/lament/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/lament/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/lament/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/lament/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/lament/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/lament/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/lament/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/lament/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/lament/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/lament/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/lament/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/lament/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/lament/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/lament/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/lament/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/lament/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/lament/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/lament/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/lament/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/lament/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/lament/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json index 19ae885cb7..68a050a8f4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/lament_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/lament/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/lament/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/lament/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/lament/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/lament/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/lament/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/lament/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/lament/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/lament/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/lament/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/lament/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/lament/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/lament/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/lament/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/lament/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/lament/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/lament/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/lament/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/lament/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/lament/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json index 04852241bc..6163cb7941 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/mahogany/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/mahogany/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/mahogany/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/mahogany/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/mahogany/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/mahogany/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/mahogany/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/mahogany/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/mahogany/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/mahogany/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/mahogany/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/mahogany/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/mahogany/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/mahogany/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/mahogany/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/mahogany/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/mahogany/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/mahogany/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/mahogany/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/mahogany/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/mahogany/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/mahogany/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/mahogany/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/mahogany/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/mahogany/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/mahogany/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/mahogany/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/mahogany/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json index 57cf1a7b36..975080af36 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/mahogany/door_top" + "model": "byg:block/mahogany/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany/door_bottom", + "model": "byg:block/mahogany/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/mahogany/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_top_hinge", + "model": "byg:block/mahogany/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mahogany/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/mahogany/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/mahogany/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_top_hinge", + "model": "byg:block/mahogany/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mahogany/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/mahogany/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", + "model": "byg:block/mahogany/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/mahogany/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/mahogany/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/mahogany/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/mahogany/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/mahogany/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/mahogany/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/mahogany/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/mahogany/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/mahogany/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json index 7a8a77bf4d..c0e517bf18 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/mahogany/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/mahogany/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/mahogany/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/mahogany/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json index 2cdb1cd2de..6eb0bac74d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/mahogany/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/mahogany/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/mahogany/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/mahogany/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/mahogany/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/mahogany/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/mahogany/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/mahogany/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/mahogany/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/mahogany/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/mahogany/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/mahogany/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/mahogany/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/mahogany/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/mahogany/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/mahogany/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/mahogany/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/mahogany/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/mahogany/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/mahogany/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json index 4fcf5521e9..f0a5d6adc9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/mahogany/slab_top" - }, "type=bottom": { "model": "byg:block/mahogany/slab" }, "type=double": { "model": "byg:block/mahogany/planks" + }, + "type=top": { + "model": "byg:block/mahogany/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json index 00b3bd7ebe..2bb38a13bc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/mahogany/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/mahogany/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/mahogany/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/mahogany/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/mahogany/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/mahogany/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/mahogany/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/mahogany/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/mahogany/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/mahogany/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/mahogany/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/mahogany/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/mahogany/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/mahogany/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/mahogany/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/mahogany/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/mahogany/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/mahogany/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/mahogany/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/mahogany/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/mahogany/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/mahogany/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/mahogany/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/mahogany/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/mahogany/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/mahogany/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/mahogany/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/mahogany/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json index 82e56c1c75..c29320ef13 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mahogany_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/mahogany/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/mahogany/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/mahogany/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/mahogany/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/mahogany/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/mahogany/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/mahogany/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/mahogany/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/mahogany/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/mahogany/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/mahogany/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/mahogany/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/mahogany/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/mahogany/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/mahogany/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/mahogany/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/mahogany/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/mahogany/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/mahogany/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/mahogany/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json index 9cbb765394..69b55b9607 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/mangrove/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/mangrove/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/mangrove/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/mangrove/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/mangrove/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/mangrove/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/mangrove/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/mangrove/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/mangrove/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/mangrove/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/mangrove/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/mangrove/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/mangrove/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/mangrove/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/mangrove/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/mangrove/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/mangrove/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/mangrove/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/mangrove/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/mangrove/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/mangrove/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/mangrove/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/mangrove/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/mangrove/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/mangrove/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/mangrove/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/mangrove/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/mangrove/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json index b1e04f4356..cb7063348d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/mangrove/door_top" + "model": "byg:block/mangrove/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove/door_bottom", + "model": "byg:block/mangrove/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/mangrove/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_top_hinge", + "model": "byg:block/mangrove/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/mangrove/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/mangrove/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/mangrove/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_top_hinge", + "model": "byg:block/mangrove/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/mangrove/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/mangrove/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", + "model": "byg:block/mangrove/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/mangrove/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/mangrove/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/mangrove/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/mangrove/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/mangrove/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/mangrove/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/mangrove/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/mangrove/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/mangrove/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json index a62bb4bb9e..02a5c17755 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/mangrove/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/mangrove/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/mangrove/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/mangrove/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json index 52b1155a35..9560be2cf4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/mangrove/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/mangrove/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/mangrove/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/mangrove/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/mangrove/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/mangrove/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/mangrove/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/mangrove/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/mangrove/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/mangrove/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/mangrove/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/mangrove/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/mangrove/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/mangrove/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/mangrove/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/mangrove/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/mangrove/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/mangrove/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/mangrove/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/mangrove/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json index 9789b08225..d8233b7506 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/mangrove/slab_top" - }, "type=bottom": { "model": "byg:block/mangrove/slab" }, "type=double": { "model": "byg:block/mangrove/planks" + }, + "type=top": { + "model": "byg:block/mangrove/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json index c68660ef82..589304ab8a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/mangrove/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/mangrove/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/mangrove/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/mangrove/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/mangrove/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/mangrove/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/mangrove/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/mangrove/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/mangrove/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/mangrove/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/mangrove/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/mangrove/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/mangrove/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/mangrove/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/mangrove/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/mangrove/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/mangrove/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/mangrove/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/mangrove/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/mangrove/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/mangrove/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/mangrove/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/mangrove/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/mangrove/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/mangrove/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/mangrove/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/mangrove/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/mangrove/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json index 1946571b53..5ba358d10c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/mangrove_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/mangrove/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/mangrove/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/mangrove/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/mangrove/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/mangrove/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/mangrove/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/mangrove/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/mangrove/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/mangrove/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/mangrove/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/mangrove/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/mangrove/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/mangrove/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/mangrove/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/mangrove/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/mangrove/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/mangrove/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/mangrove/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/mangrove/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/mangrove/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_button.json b/Common/src/generated/resources/assets/byg/blockstates/maple_button.json index 58b0d12fb4..d924a86425 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/maple/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/maple/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/maple/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/maple/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/maple/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/maple/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/maple/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/maple/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/maple/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/maple/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/maple/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/maple/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/maple/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/maple/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/maple/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/maple/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/maple/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/maple/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/maple/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/maple/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/maple/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/maple/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/maple/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/maple/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/maple/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/maple/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/maple/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/maple/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/maple/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/maple/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/maple/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/maple/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/maple/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_door.json b/Common/src/generated/resources/assets/byg/blockstates/maple_door.json index 6a01fa25bd..8270c1027b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/maple/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/maple/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/maple/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/maple/door_top" + "model": "byg:block/maple/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/maple/door_bottom", + "model": "byg:block/maple/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/maple/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/maple/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/maple/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/maple/door_top_hinge", + "model": "byg:block/maple/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/maple/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/maple/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/maple/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/maple/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/maple/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/maple/door_bottom_hinge", + "model": "byg:block/maple/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/maple/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/maple/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/maple/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/maple/door_top_hinge", + "model": "byg:block/maple/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/maple/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/maple/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/maple/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/maple/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/maple/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/maple/door_bottom_hinge", + "model": "byg:block/maple/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/maple/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/maple/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/maple/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/maple/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/maple/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/maple/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/maple/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/maple/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/maple/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/maple/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/maple/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/maple/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/maple/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/maple/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/maple/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json b/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json index 34795f391d..912c8c89be 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/maple/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/maple/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/maple/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/maple/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json index 284adbf9e0..66288d4dad 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/maple/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/maple/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/maple/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/maple/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/maple/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/maple/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/maple/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/maple/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/maple/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/maple/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/maple/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/maple/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/maple/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/maple/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/maple/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/maple/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/maple/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/maple/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/maple/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/maple/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json b/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json index 890569c2e5..524c2e86cc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/maple/slab_top" - }, "type=bottom": { "model": "byg:block/maple/slab" }, "type=double": { "model": "byg:block/maple/planks" + }, + "type=top": { + "model": "byg:block/maple/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json index e417d555c2..9f33161070 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/maple/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/maple/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/maple/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/maple/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/maple/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/maple/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/maple/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/maple/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/maple/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/maple/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/maple/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/maple/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/maple/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/maple/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/maple/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/maple/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/maple/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/maple/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/maple/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/maple/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/maple/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/maple/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/maple/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/maple/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/maple/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/maple/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/maple/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/maple/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/maple/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/maple/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/maple/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/maple/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/maple/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/maple/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/maple/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/maple/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/maple/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/maple/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/maple/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/maple/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/maple/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/maple/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/maple/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/maple/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json index 2ab5b3c1be..92b27a4ad1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/maple_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/maple/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/maple/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/maple/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/maple/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/maple/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/maple/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/maple/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/maple/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/maple/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/maple/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/maple/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/maple/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/maple/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/maple/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/maple/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/maple/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/maple/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/maple/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/maple/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/maple/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/maple/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/maple/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json index 5c9562c0b4..c4b9f7553a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/nightshade/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/nightshade/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/nightshade/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/nightshade/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/nightshade/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/nightshade/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/nightshade/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/nightshade/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/nightshade/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/nightshade/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/nightshade/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/nightshade/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/nightshade/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/nightshade/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/nightshade/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/nightshade/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/nightshade/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/nightshade/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/nightshade/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/nightshade/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/nightshade/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/nightshade/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/nightshade/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/nightshade/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/nightshade/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/nightshade/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/nightshade/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/nightshade/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json index 573b25ec57..51edd046e1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/nightshade/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/nightshade/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/nightshade/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/nightshade/door_top" + "model": "byg:block/nightshade/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/nightshade/door_bottom", + "model": "byg:block/nightshade/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/nightshade/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/nightshade/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/nightshade/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/nightshade/door_top_hinge", + "model": "byg:block/nightshade/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/nightshade/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/nightshade/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/nightshade/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/nightshade/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/nightshade/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/nightshade/door_bottom_hinge", + "model": "byg:block/nightshade/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/nightshade/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/nightshade/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/nightshade/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/nightshade/door_top_hinge", + "model": "byg:block/nightshade/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/nightshade/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/nightshade/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/nightshade/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/nightshade/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/nightshade/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/nightshade/door_bottom_hinge", + "model": "byg:block/nightshade/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/nightshade/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/nightshade/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/nightshade/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/nightshade/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/nightshade/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/nightshade/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/nightshade/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/nightshade/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/nightshade/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/nightshade/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/nightshade/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/nightshade/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/nightshade/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/nightshade/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/nightshade/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json index 922faa8c61..42970091ee 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/nightshade/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/nightshade/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/nightshade/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/nightshade/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json index 26eacdeb98..a82531890c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/nightshade/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/nightshade/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/nightshade/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/nightshade/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/nightshade/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/nightshade/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/nightshade/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/nightshade/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/nightshade/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/nightshade/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/nightshade/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/nightshade/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/nightshade/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/nightshade/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/nightshade/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/nightshade/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/nightshade/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/nightshade/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/nightshade/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/nightshade/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json index 18270cbe0d..a8f75c8896 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/nightshade/slab_top" - }, "type=bottom": { "model": "byg:block/nightshade/slab" }, "type=double": { "model": "byg:block/nightshade/planks" + }, + "type=top": { + "model": "byg:block/nightshade/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json index 12f0363459..2947afd8f2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/nightshade/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/nightshade/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/nightshade/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/nightshade/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/nightshade/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/nightshade/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/nightshade/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/nightshade/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/nightshade/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/nightshade/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/nightshade/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/nightshade/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/nightshade/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/nightshade/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/nightshade/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/nightshade/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/nightshade/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/nightshade/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/nightshade/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/nightshade/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/nightshade/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/nightshade/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/nightshade/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/nightshade/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/nightshade/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/nightshade/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/nightshade/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/nightshade/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/nightshade/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/nightshade/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/nightshade/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/nightshade/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json index 488a049d4d..72437e7370 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/nightshade_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/nightshade/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/nightshade/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/nightshade/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/nightshade/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/nightshade/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/nightshade/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/nightshade/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/nightshade/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/nightshade/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/nightshade/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/nightshade/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/nightshade/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/nightshade/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/nightshade/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/nightshade/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/nightshade/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/nightshade/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/nightshade/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/nightshade/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/nightshade/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_button.json b/Common/src/generated/resources/assets/byg/blockstates/palm_button.json index 56b6efdaf9..260d0ef9dd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/palm/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/palm/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/palm/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/palm/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/palm/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/palm/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/palm/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/palm/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/palm/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/palm/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/palm/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/palm/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/palm/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/palm/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/palm/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/palm/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/palm/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/palm/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/palm/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/palm/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/palm/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/palm/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/palm/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/palm/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/palm/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/palm/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/palm/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/palm/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/palm/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/palm/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/palm/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/palm/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/palm/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_door.json b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json index db26e2743d..ff2cbd2675 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/palm/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/palm/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/palm/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/palm/door_top" + "model": "byg:block/palm/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/palm/door_bottom", + "model": "byg:block/palm/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/palm/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/palm/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/palm/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_top_hinge", + "model": "byg:block/palm/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/palm/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/palm/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/palm/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_top_hinge", + "model": "byg:block/palm/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/palm/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/palm/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", + "model": "byg:block/palm/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/palm/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/palm/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/palm/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/palm/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/palm/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/palm/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/palm/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/palm/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/palm/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/palm/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/palm/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/palm/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/palm/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/palm/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/palm/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json b/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json index 70acc0ea66..46c2b15989 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/palm/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/palm/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/palm/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/palm/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json index 1ec179d6a0..464b461882 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/palm/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/palm/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/palm/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/palm/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/palm/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/palm/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/palm/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/palm/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/palm/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/palm/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/palm/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/palm/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/palm/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/palm/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/palm/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/palm/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/palm/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/palm/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/palm/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/palm/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json b/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json index f7778bfd5b..0a249d43cf 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/palm/slab_top" - }, "type=bottom": { "model": "byg:block/palm/slab" }, "type=double": { "model": "byg:block/palm/planks" + }, + "type=top": { + "model": "byg:block/palm/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json index 08eab5ad4d..71ed39b673 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/palm/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/palm/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/palm/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/palm/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/palm/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/palm/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/palm/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/palm/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/palm/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/palm/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/palm/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/palm/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/palm/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/palm/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/palm/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/palm/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/palm/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/palm/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/palm/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/palm/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/palm/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/palm/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/palm/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/palm/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/palm/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/palm/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/palm/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/palm/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/palm/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/palm/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/palm/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/palm/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/palm/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/palm/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/palm/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/palm/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/palm/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/palm/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/palm/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/palm/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/palm/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/palm/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/palm/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json index 5910c8dd13..8cd17f322d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/palm_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/palm/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/palm/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/palm/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/palm/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/palm/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/palm/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/palm/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/palm/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/palm/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/palm/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/palm/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/palm/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/palm/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/palm/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/palm/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/palm/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/palm/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/palm/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/palm/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/palm/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_button.json b/Common/src/generated/resources/assets/byg/blockstates/pine_button.json index 9cd4762912..ee63ac37e0 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/pine/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/pine/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/pine/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/pine/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/pine/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/pine/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/pine/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/pine/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/pine/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/pine/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/pine/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/pine/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/pine/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/pine/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/pine/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/pine/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/pine/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/pine/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/pine/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/pine/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/pine/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/pine/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/pine/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/pine/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/pine/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/pine/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/pine/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/pine/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/pine/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/pine/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/pine/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/pine/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/pine/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_door.json b/Common/src/generated/resources/assets/byg/blockstates/pine_door.json index 2e632486e7..5a5d7b475f 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/pine/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/pine/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/pine/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/pine/door_top" + "model": "byg:block/pine/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/pine/door_bottom", + "model": "byg:block/pine/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/pine/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/pine/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/pine/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/pine/door_top_hinge", + "model": "byg:block/pine/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/pine/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/pine/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/pine/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/pine/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/pine/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/pine/door_bottom_hinge", + "model": "byg:block/pine/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/pine/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/pine/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/pine/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/pine/door_top_hinge", + "model": "byg:block/pine/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/pine/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/pine/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/pine/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/pine/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/pine/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/pine/door_bottom_hinge", + "model": "byg:block/pine/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/pine/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/pine/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/pine/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/pine/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/pine/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/pine/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/pine/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/pine/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/pine/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/pine/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/pine/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/pine/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/pine/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/pine/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/pine/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json b/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json index 166ad7b260..093c896b0d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/pine/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/pine/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/pine/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/pine/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json index d302d8c626..6230081b0b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/pine/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/pine/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/pine/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/pine/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/pine/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/pine/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/pine/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/pine/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/pine/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/pine/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/pine/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/pine/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/pine/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/pine/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/pine/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/pine/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/pine/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/pine/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/pine/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/pine/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json b/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json index 38f4ab8ecd..c31bfad96a 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/pine/slab_top" - }, "type=bottom": { "model": "byg:block/pine/slab" }, "type=double": { "model": "byg:block/pine/planks" + }, + "type=top": { + "model": "byg:block/pine/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json index 8adb849c0c..f79cb603f7 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/pine/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/pine/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/pine/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/pine/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/pine/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/pine/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/pine/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/pine/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/pine/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/pine/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/pine/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/pine/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/pine/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/pine/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/pine/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/pine/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/pine/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/pine/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/pine/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/pine/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/pine/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/pine/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/pine/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/pine/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/pine/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/pine/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/pine/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/pine/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/pine/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/pine/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/pine/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/pine/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/pine/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/pine/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/pine/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/pine/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/pine/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/pine/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/pine/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/pine/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/pine/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/pine/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/pine/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json index f4b95a551b..9021dfbe86 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/pine_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/pine/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/pine/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/pine/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/pine/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/pine/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/pine/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/pine/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/pine/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/pine/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/pine/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/pine/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/pine/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/pine/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/pine/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/pine/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/pine/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/pine/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/pine/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/pine/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/pine/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json index 5ed8ffd426..684828750f 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/rainbow_eucalyptus/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/rainbow_eucalyptus/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/rainbow_eucalyptus/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/rainbow_eucalyptus/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/rainbow_eucalyptus/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/rainbow_eucalyptus/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/rainbow_eucalyptus/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/rainbow_eucalyptus/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/rainbow_eucalyptus/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/rainbow_eucalyptus/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json index 8481275ea1..a2fa5a3298 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top" + "model": "byg:block/rainbow_eucalyptus/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", + "model": "byg:block/rainbow_eucalyptus/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "model": "byg:block/rainbow_eucalyptus/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "model": "byg:block/rainbow_eucalyptus/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "model": "byg:block/rainbow_eucalyptus/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", + "model": "byg:block/rainbow_eucalyptus/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/rainbow_eucalyptus/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/rainbow_eucalyptus/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/rainbow_eucalyptus/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json index 84d613518f..e98e903596 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/rainbow_eucalyptus/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/rainbow_eucalyptus/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/rainbow_eucalyptus/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/rainbow_eucalyptus/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json index 927252810d..731f1e43dd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/rainbow_eucalyptus/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/rainbow_eucalyptus/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/rainbow_eucalyptus/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/rainbow_eucalyptus/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/rainbow_eucalyptus/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json index 695e9e62d1..e039d3d99c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/rainbow_eucalyptus/slab_top" - }, "type=bottom": { "model": "byg:block/rainbow_eucalyptus/slab" }, "type=double": { "model": "byg:block/rainbow_eucalyptus/planks" + }, + "type=top": { + "model": "byg:block/rainbow_eucalyptus/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json index 28c69c77b1..036005d169 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/rainbow_eucalyptus/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/rainbow_eucalyptus/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/rainbow_eucalyptus/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/rainbow_eucalyptus/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/rainbow_eucalyptus/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/rainbow_eucalyptus/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json index 4009d6c630..2c73853cb3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/rainbow_eucalyptus_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/rainbow_eucalyptus/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/rainbow_eucalyptus/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/rainbow_eucalyptus/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/rainbow_eucalyptus/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/rainbow_eucalyptus/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/rainbow_eucalyptus/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/rainbow_eucalyptus/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/rainbow_eucalyptus/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json index f08e06cc03..e61c3d38bc 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/redwood/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/redwood/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/redwood/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/redwood/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/redwood/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/redwood/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/redwood/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/redwood/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/redwood/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/redwood/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/redwood/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/redwood/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/redwood/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/redwood/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/redwood/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/redwood/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/redwood/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/redwood/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/redwood/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/redwood/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/redwood/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/redwood/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/redwood/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/redwood/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/redwood/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/redwood/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/redwood/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/redwood/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/redwood/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/redwood/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/redwood/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/redwood/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/redwood/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json index 40b08cf6f5..88bdb9a9f1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/redwood/door_top" + "model": "byg:block/redwood/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood/door_bottom", + "model": "byg:block/redwood/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/redwood/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood/door_top_hinge", + "model": "byg:block/redwood/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/redwood/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/redwood/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood/door_bottom_hinge", + "model": "byg:block/redwood/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/redwood/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood/door_top_hinge", + "model": "byg:block/redwood/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/redwood/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/redwood/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood/door_bottom_hinge", + "model": "byg:block/redwood/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/redwood/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/redwood/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/redwood/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/redwood/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/redwood/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/redwood/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/redwood/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/redwood/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/redwood/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json index 954ef33dcc..bae3801cc1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/redwood/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/redwood/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/redwood/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/redwood/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json index 704abd82d9..0ffaf6fde2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/redwood/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/redwood/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/redwood/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/redwood/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/redwood/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/redwood/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/redwood/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/redwood/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/redwood/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/redwood/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/redwood/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/redwood/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/redwood/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/redwood/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/redwood/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/redwood/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/redwood/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/redwood/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/redwood/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/redwood/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json index 5026711e6b..29871093c3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/redwood/slab_top" - }, "type=bottom": { "model": "byg:block/redwood/slab" }, "type=double": { "model": "byg:block/redwood/planks" + }, + "type=top": { + "model": "byg:block/redwood/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json index 5b9140664f..ef5bdcbd06 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/redwood/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/redwood/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/redwood/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/redwood/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/redwood/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/redwood/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/redwood/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/redwood/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/redwood/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/redwood/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/redwood/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/redwood/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/redwood/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/redwood/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/redwood/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/redwood/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/redwood/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/redwood/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/redwood/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/redwood/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/redwood/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/redwood/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/redwood/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/redwood/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/redwood/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/redwood/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/redwood/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/redwood/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/redwood/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/redwood/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/redwood/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/redwood/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/redwood/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/redwood/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/redwood/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/redwood/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/redwood/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/redwood/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json index 20152d7a57..f222cbfed2 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/redwood_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/redwood/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/redwood/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/redwood/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/redwood/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/redwood/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/redwood/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/redwood/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/redwood/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/redwood/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/redwood/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/redwood/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/redwood/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/redwood/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/redwood/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/redwood/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/redwood/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/redwood/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/redwood/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/redwood/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/redwood/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json index 8f655e677a..473f158014 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/skyris/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/skyris/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/skyris/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/skyris/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/skyris/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/skyris/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/skyris/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/skyris/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/skyris/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/skyris/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/skyris/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/skyris/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/skyris/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/skyris/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/skyris/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/skyris/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/skyris/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/skyris/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/skyris/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/skyris/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/skyris/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/skyris/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/skyris/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/skyris/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/skyris/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/skyris/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/skyris/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/skyris/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/skyris/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/skyris/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/skyris/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/skyris/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/skyris/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json index a0cfc20713..deff8bfbc5 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/skyris/door_top" + "model": "byg:block/skyris/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris/door_bottom", + "model": "byg:block/skyris/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/skyris/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris/door_top_hinge", + "model": "byg:block/skyris/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/skyris/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/skyris/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris/door_bottom_hinge", + "model": "byg:block/skyris/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/skyris/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris/door_top_hinge", + "model": "byg:block/skyris/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/skyris/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/skyris/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris/door_bottom_hinge", + "model": "byg:block/skyris/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/skyris/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/skyris/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/skyris/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/skyris/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/skyris/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/skyris/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/skyris/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/skyris/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/skyris/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json index f00a980a51..e4019853e4 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/skyris/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/skyris/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/skyris/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/skyris/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json index e86d6e02f7..95389f0cae 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/skyris/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/skyris/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/skyris/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/skyris/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/skyris/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/skyris/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/skyris/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/skyris/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/skyris/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/skyris/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/skyris/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/skyris/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/skyris/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/skyris/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/skyris/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/skyris/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/skyris/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/skyris/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/skyris/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/skyris/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json index 71a53383dc..27d465b3f7 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/skyris/slab_top" - }, "type=bottom": { "model": "byg:block/skyris/slab" }, "type=double": { "model": "byg:block/skyris/planks" + }, + "type=top": { + "model": "byg:block/skyris/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json index 52f290456a..64d31756b9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/skyris/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/skyris/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/skyris/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/skyris/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/skyris/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/skyris/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/skyris/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/skyris/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/skyris/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/skyris/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/skyris/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/skyris/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/skyris/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/skyris/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/skyris/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/skyris/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/skyris/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/skyris/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/skyris/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/skyris/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/skyris/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/skyris/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/skyris/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/skyris/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/skyris/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/skyris/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/skyris/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/skyris/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/skyris/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/skyris/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/skyris/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/skyris/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/skyris/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/skyris/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/skyris/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/skyris/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/skyris/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/skyris/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json index b40f19761d..e8248375ef 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/skyris_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/skyris/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/skyris/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/skyris/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/skyris/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/skyris/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/skyris/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/skyris/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/skyris/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/skyris/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/skyris/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/skyris/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/skyris/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/skyris/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/skyris/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/skyris/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/skyris/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/skyris/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/skyris/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/skyris/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/skyris/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/skyris/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/skyris/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json index 9b391d0144..75ada5e046 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/sythian/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/sythian/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/sythian/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/sythian/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/sythian/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/sythian/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/sythian/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/sythian/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/sythian/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/sythian/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/sythian/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/sythian/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/sythian/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/sythian/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/sythian/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/sythian/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/sythian/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/sythian/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/sythian/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/sythian/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/sythian/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/sythian/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/sythian/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/sythian/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/sythian/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/sythian/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/sythian/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/sythian/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/sythian/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/sythian/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/sythian/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/sythian/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/sythian/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json index 5e90d4b76c..74729a1f47 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/sythian/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/sythian/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/sythian/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/sythian/door_top" + "model": "byg:block/sythian/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/sythian/door_bottom", + "model": "byg:block/sythian/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/sythian/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/sythian/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/sythian/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/sythian/door_top_hinge", + "model": "byg:block/sythian/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/sythian/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/sythian/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/sythian/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/sythian/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/sythian/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/sythian/door_bottom_hinge", + "model": "byg:block/sythian/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/sythian/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/sythian/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/sythian/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/sythian/door_top_hinge", + "model": "byg:block/sythian/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/sythian/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/sythian/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/sythian/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/sythian/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/sythian/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/sythian/door_bottom_hinge", + "model": "byg:block/sythian/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/sythian/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/sythian/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/sythian/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/sythian/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/sythian/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/sythian/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/sythian/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/sythian/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/sythian/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/sythian/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/sythian/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/sythian/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/sythian/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/sythian/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/sythian/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json index 06e5433b49..be231d9b4c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/sythian/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/sythian/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/sythian/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/sythian/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json index 4a3211fa20..6378ca8fe9 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/sythian/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/sythian/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/sythian/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/sythian/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/sythian/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/sythian/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/sythian/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/sythian/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/sythian/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/sythian/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/sythian/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/sythian/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/sythian/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/sythian/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/sythian/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/sythian/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/sythian/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/sythian/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/sythian/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/sythian/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json index a9306e4504..e69583bd2b 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/sythian/slab_top" - }, "type=bottom": { "model": "byg:block/sythian/slab" }, "type=double": { "model": "byg:block/sythian/planks" + }, + "type=top": { + "model": "byg:block/sythian/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json index bed4072344..f0f1e984cd 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/sythian/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/sythian/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/sythian/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/sythian/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/sythian/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/sythian/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/sythian/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/sythian/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/sythian/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/sythian/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/sythian/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/sythian/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/sythian/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/sythian/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/sythian/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/sythian/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/sythian/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/sythian/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/sythian/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/sythian/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/sythian/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/sythian/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/sythian/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/sythian/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/sythian/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/sythian/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/sythian/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/sythian/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/sythian/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/sythian/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/sythian/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/sythian/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/sythian/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/sythian/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/sythian/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/sythian/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/sythian/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/sythian/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json index 76b69d3bc2..a79bfc8961 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/sythian_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/sythian/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/sythian/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/sythian/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/sythian/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/sythian/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/sythian/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/sythian/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/sythian/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/sythian/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/sythian/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/sythian/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/sythian/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/sythian/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/sythian/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/sythian/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/sythian/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/sythian/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/sythian/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/sythian/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/sythian/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_button.json b/Common/src/generated/resources/assets/byg/blockstates/willow_button.json index 1042622bc9..53f834cc27 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/willow/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/willow/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/willow/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/willow/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/willow/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/willow/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/willow/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/willow/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/willow/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/willow/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/willow/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/willow/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/willow/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/willow/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/willow/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/willow/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/willow/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/willow/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/willow/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/willow/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/willow/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/willow/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/willow/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/willow/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/willow/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/willow/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/willow/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/willow/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/willow/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/willow/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/willow/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/willow/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/willow/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_door.json b/Common/src/generated/resources/assets/byg/blockstates/willow_door.json index 78fcebed8f..29d86a6329 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/willow/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/willow/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/willow/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/willow/door_top" + "model": "byg:block/willow/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/willow/door_bottom", + "model": "byg:block/willow/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/willow/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/willow/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/willow/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/willow/door_top_hinge", + "model": "byg:block/willow/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/willow/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/willow/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/willow/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/willow/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/willow/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/willow/door_bottom_hinge", + "model": "byg:block/willow/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/willow/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/willow/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/willow/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/willow/door_top_hinge", + "model": "byg:block/willow/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/willow/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/willow/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/willow/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/willow/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/willow/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/willow/door_bottom_hinge", + "model": "byg:block/willow/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/willow/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/willow/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/willow/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/willow/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/willow/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/willow/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/willow/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/willow/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/willow/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/willow/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/willow/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/willow/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/willow/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/willow/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/willow/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json b/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json index a170969ab6..d770ac4e4c 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/willow/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/willow/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/willow/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/willow/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json index bbc6c795ab..65457b3bc1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/willow/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/willow/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/willow/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/willow/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/willow/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/willow/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/willow/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/willow/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/willow/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/willow/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/willow/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/willow/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/willow/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/willow/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/willow/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/willow/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/willow/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/willow/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/willow/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/willow/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json b/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json index d527adb581..45d3d90f19 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/willow/slab_top" - }, "type=bottom": { "model": "byg:block/willow/slab" }, "type=double": { "model": "byg:block/willow/planks" + }, + "type=top": { + "model": "byg:block/willow/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json index 496a9c0dcd..f0561cfa60 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/willow/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/willow/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/willow/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/willow/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/willow/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/willow/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/willow/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/willow/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/willow/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/willow/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/willow/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/willow/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/willow/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/willow/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/willow/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/willow/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/willow/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/willow/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/willow/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/willow/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/willow/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/willow/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/willow/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/willow/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/willow/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/willow/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/willow/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/willow/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/willow/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/willow/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/willow/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/willow/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/willow/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/willow/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/willow/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/willow/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/willow/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/willow/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/willow/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/willow/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/willow/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/willow/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/willow/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json index 887f37f6cb..5c862f6c18 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/willow_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/willow/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/willow/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/willow/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/willow/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/willow/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/willow/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/willow/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/willow/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/willow/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/willow/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/willow/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/willow/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/willow/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/willow/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/willow/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/willow/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/willow/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/willow/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/willow/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/willow/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json index 5fdb847869..288153d399 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/witch_hazel/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/witch_hazel/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/witch_hazel/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/witch_hazel/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/witch_hazel/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/witch_hazel/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/witch_hazel/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/witch_hazel/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/witch_hazel/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/witch_hazel/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/witch_hazel/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/witch_hazel/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/witch_hazel/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/witch_hazel/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/witch_hazel/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/witch_hazel/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/witch_hazel/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/witch_hazel/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/witch_hazel/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/witch_hazel/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/witch_hazel/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/witch_hazel/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json index e722504d1b..88253bc427 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_top" + "model": "byg:block/witch_hazel/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_bottom", + "model": "byg:block/witch_hazel/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/witch_hazel/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_top_hinge", + "model": "byg:block/witch_hazel/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_bottom_hinge", + "model": "byg:block/witch_hazel/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/witch_hazel/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_top_hinge", + "model": "byg:block/witch_hazel/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_bottom_hinge", + "model": "byg:block/witch_hazel/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/witch_hazel/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/witch_hazel/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/witch_hazel/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/witch_hazel/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/witch_hazel/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/witch_hazel/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json index bf614e8965..bb39a474f6 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/witch_hazel/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/witch_hazel/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/witch_hazel/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/witch_hazel/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json index a6d3cf39da..46feee7f90 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/witch_hazel/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/witch_hazel/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/witch_hazel/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/witch_hazel/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/witch_hazel/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/witch_hazel/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/witch_hazel/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/witch_hazel/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/witch_hazel/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/witch_hazel/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/witch_hazel/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/witch_hazel/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/witch_hazel/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/witch_hazel/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/witch_hazel/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/witch_hazel/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/witch_hazel/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/witch_hazel/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/witch_hazel/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/witch_hazel/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json index f4bd8d17ff..5ce43fbcf1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/witch_hazel/slab_top" - }, "type=bottom": { "model": "byg:block/witch_hazel/slab" }, "type=double": { "model": "byg:block/witch_hazel/planks" + }, + "type=top": { + "model": "byg:block/witch_hazel/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json index ad928a06f2..75862feb7e 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/witch_hazel/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/witch_hazel/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/witch_hazel/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/witch_hazel/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/witch_hazel/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/witch_hazel/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/witch_hazel/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/witch_hazel/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/witch_hazel/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/witch_hazel/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/witch_hazel/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/witch_hazel/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/witch_hazel/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/witch_hazel/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/witch_hazel/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/witch_hazel/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/witch_hazel/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/witch_hazel/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/witch_hazel/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/witch_hazel/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json index 751c721b51..331827edc6 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/witch_hazel_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/witch_hazel/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/witch_hazel/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/witch_hazel/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/witch_hazel/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/witch_hazel/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/witch_hazel/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/witch_hazel/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/witch_hazel/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/witch_hazel/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/witch_hazel/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/witch_hazel/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/witch_hazel/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/witch_hazel/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/witch_hazel/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/witch_hazel/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/witch_hazel/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/witch_hazel/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/witch_hazel/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/witch_hazel/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json index ce0a5d903a..f802eb423e 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_button.json @@ -1,117 +1,117 @@ { "variants": { - "face=floor,facing=north,powered=false": { - "model": "byg:block/zelkova/button_inventory" - }, - "face=wall,facing=north,powered=false": { + "face=ceiling,facing=east,powered=false": { "model": "byg:block/zelkova/button_inventory", - "x": 90, - "uvlock": true + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, + "y": 270 }, "face=ceiling,facing=north,powered=false": { "model": "byg:block/zelkova/button_inventory", "x": 180, "y": 180 }, - "face=floor,facing=south,powered=false": { - "model": "byg:block/zelkova/button_inventory", + "face=ceiling,facing=north,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, "y": 180 }, - "face=wall,facing=south,powered=false": { - "model": "byg:block/zelkova/button_inventory", - "x": 90, - "y": 180, - "uvlock": true - }, "face=ceiling,facing=south,powered=false": { "model": "byg:block/zelkova/button_inventory", "x": 180 }, - "face=floor,facing=west,powered=false": { - "model": "byg:block/zelkova/button_inventory", - "y": 270 - }, - "face=wall,facing=west,powered=false": { - "model": "byg:block/zelkova/button_inventory", - "x": 90, - "y": 270, - "uvlock": true + "face=ceiling,facing=south,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180 }, "face=ceiling,facing=west,powered=false": { "model": "byg:block/zelkova/button_inventory", "x": 180, "y": 90 }, + "face=ceiling,facing=west,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "x": 180, + "y": 90 + }, "face=floor,facing=east,powered=false": { "model": "byg:block/zelkova/button_inventory", "y": 90 }, - "face=wall,facing=east,powered=false": { - "model": "byg:block/zelkova/button_inventory", - "x": 90, - "y": 90, - "uvlock": true + "face=floor,facing=east,powered=true": { + "model": "byg:block/zelkova/button_pressed", + "y": 90 }, - "face=ceiling,facing=east,powered=false": { - "model": "byg:block/zelkova/button_inventory", - "x": 180, - "y": 270 + "face=floor,facing=north,powered=false": { + "model": "byg:block/zelkova/button_inventory" }, "face=floor,facing=north,powered=true": { "model": "byg:block/zelkova/button_pressed" }, - "face=wall,facing=north,powered=true": { - "model": "byg:block/zelkova/button_pressed", - "x": 90, - "uvlock": true - }, - "face=ceiling,facing=north,powered=true": { - "model": "byg:block/zelkova/button_pressed", - "x": 180, + "face=floor,facing=south,powered=false": { + "model": "byg:block/zelkova/button_inventory", "y": 180 }, "face=floor,facing=south,powered=true": { "model": "byg:block/zelkova/button_pressed", "y": 180 }, - "face=wall,facing=south,powered=true": { - "model": "byg:block/zelkova/button_pressed", - "x": 90, - "y": 180, - "uvlock": true - }, - "face=ceiling,facing=south,powered=true": { - "model": "byg:block/zelkova/button_pressed", - "x": 180 + "face=floor,facing=west,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "y": 270 }, "face=floor,facing=west,powered=true": { "model": "byg:block/zelkova/button_pressed", "y": 270 }, - "face=wall,facing=west,powered=true": { - "model": "byg:block/zelkova/button_pressed", + "face=wall,facing=east,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "uvlock": true, "x": 90, - "y": 270, - "uvlock": true + "y": 90 }, - "face=ceiling,facing=west,powered=true": { + "face=wall,facing=east,powered=true": { "model": "byg:block/zelkova/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 90 }, - "face=floor,facing=east,powered=true": { + "face=wall,facing=north,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { "model": "byg:block/zelkova/button_pressed", - "y": 90 + "uvlock": true, + "x": 90 }, - "face=wall,facing=east,powered=true": { + "face=wall,facing=south,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { "model": "byg:block/zelkova/button_pressed", + "uvlock": true, "x": 90, - "y": 90, - "uvlock": true + "y": 180 }, - "face=ceiling,facing=east,powered=true": { + "face=wall,facing=west,powered=false": { + "model": "byg:block/zelkova/button_inventory", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { "model": "byg:block/zelkova/button_pressed", - "x": 180, + "uvlock": true, + "x": 90, "y": 270 } } diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json index 16693092a0..7a9dad883d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_door.json @@ -1,124 +1,124 @@ { "variants": { - "facing=north,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova/door_top", - "y": 270 + "facing=east,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door/bottom_left" }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova/door_top", + "facing=east,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door/bottom_right_open", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova/door_top", - "y": 180 + "facing=east,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door/bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door/bottom_left_open", + "y": 270 }, "facing=east,half=upper,hinge=left,open=false": { - "model": "byg:block/zelkova/door_top" + "model": "byg:block/zelkova/door/top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door/top_right_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door/top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door/top_left_open", + "y": 270 }, "facing=north,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova/door_bottom", + "model": "byg:block/zelkova/door/bottom_left", "y": 270 }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova/door_bottom", - "y": 90 + "facing=north,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door/bottom_right_open" }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova/door_bottom", + "facing=north,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door/bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door/bottom_left_open", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false": { - "model": "byg:block/zelkova/door_bottom" + "facing=north,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door/top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door/top_right_open" }, "facing=north,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova/door_top_hinge", + "model": "byg:block/zelkova/door/top_right", "y": 270 }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova/door_top_hinge", - "y": 90 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova/door_top_hinge", + "facing=north,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door/top_left_open", "y": 180 }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "byg:block/zelkova/door_top_hinge" + "facing=south,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door/bottom_left", + "y": 90 }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova/door_bottom_hinge", - "y": 270 + "facing=south,half=lower,hinge=left,open=true": { + "model": "byg:block/zelkova/door/bottom_right_open", + "y": 180 }, "facing=south,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova/door_bottom_hinge", + "model": "byg:block/zelkova/door/bottom_right", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova/door_bottom_hinge", - "y": 180 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "byg:block/zelkova/door_bottom_hinge" + "facing=south,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door/bottom_left_open" }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova/door_top_hinge" + "facing=south,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door/top_left", + "y": 90 }, "facing=south,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova/door_top_hinge", + "model": "byg:block/zelkova/door/top_right_open", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova/door_top_hinge", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "byg:block/zelkova/door_top_hinge", + "facing=south,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door/top_right", "y": 90 }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova/door_bottom_hinge" + "facing=south,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door/top_left_open" }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova/door_bottom_hinge", + "facing=west,half=lower,hinge=left,open=false": { + "model": "byg:block/zelkova/door/bottom_left", "y": 180 }, "facing=west,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova/door_bottom_hinge", + "model": "byg:block/zelkova/door/bottom_right_open", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "byg:block/zelkova/door_bottom_hinge", - "y": 90 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova/door_top", + "facing=west,half=lower,hinge=right,open=false": { + "model": "byg:block/zelkova/door/bottom_right", "y": 180 }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova/door_top" - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova/door_top", + "facing=west,half=lower,hinge=right,open=true": { + "model": "byg:block/zelkova/door/bottom_left_open", "y": 90 }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "byg:block/zelkova/door_top", + "facing=west,half=upper,hinge=left,open=false": { + "model": "byg:block/zelkova/door/top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "byg:block/zelkova/door/top_right_open", "y": 270 }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova/door_bottom", + "facing=west,half=upper,hinge=right,open=false": { + "model": "byg:block/zelkova/door/top_right", "y": 180 }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova/door_bottom" - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova/door_bottom", + "facing=west,half=upper,hinge=right,open=true": { + "model": "byg:block/zelkova/door/top_left_open", "y": 90 - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "byg:block/zelkova/door_bottom", - "y": 270 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json index 07f43b9fc5..4620a29440 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence.json @@ -6,42 +6,42 @@ } }, { - "when": { - "north": "true" - }, "apply": { "model": "byg:block/zelkova/fence", "uvlock": true + }, + "when": { + "north": "true" } }, { - "when": { - "south": "true" - }, "apply": { "model": "byg:block/zelkova/fence", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" } }, { - "when": { - "west": "true" - }, "apply": { "model": "byg:block/zelkova/fence", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" } }, { - "when": { - "east": "true" - }, "apply": { "model": "byg:block/zelkova/fence", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" } } ] diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json index a923822d76..bb0c1ce07d 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_fence_gate.json @@ -1,80 +1,80 @@ { "variants": { - "facing=north,in_wall=false,open=false": { - "model": "byg:block/zelkova/fence_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "byg:block/zelkova/fence_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "byg:block/zelkova/fence_gate", - "y": 90, - "uvlock": true - }, "facing=east,in_wall=false,open=false": { "model": "byg:block/zelkova/fence_gate", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=north,in_wall=true,open=false": { - "model": "byg:block/zelkova/fence_gate_wall", - "y": 180, - "uvlock": true + "facing=east,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "uvlock": true, + "y": 270 }, - "facing=south,in_wall=true,open=false": { + "facing=east,in_wall=true,open=false": { "model": "byg:block/zelkova/fence_gate_wall", - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=west,in_wall=true,open=false": { - "model": "byg:block/zelkova/fence_gate_wall", - "y": 90, - "uvlock": true + "facing=east,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "uvlock": true, + "y": 270 }, - "facing=east,in_wall=true,open=false": { - "model": "byg:block/zelkova/fence_gate_wall", - "y": 270, - "uvlock": true + "facing=north,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "uvlock": true, + "y": 180 }, "facing=north,in_wall=false,open=true": { "model": "byg:block/zelkova/fence_gate_open", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,in_wall=false,open=true": { - "model": "byg:block/zelkova/fence_gate_open", - "uvlock": true + "facing=north,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "uvlock": true, + "y": 180 }, - "facing=west,in_wall=false,open=true": { - "model": "byg:block/zelkova/fence_gate_open", - "y": 90, + "facing=north,in_wall=true,open=true": { + "model": "byg:block/zelkova/fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", "uvlock": true }, - "facing=east,in_wall=false,open=true": { + "facing=south,in_wall=false,open=true": { "model": "byg:block/zelkova/fence_gate_open", - "y": 270, "uvlock": true }, - "facing=north,in_wall=true,open=true": { - "model": "byg:block/zelkova/fence_gate_wall_open", - "y": 180, + "facing=south,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", "uvlock": true }, "facing=south,in_wall=true,open=true": { "model": "byg:block/zelkova/fence_gate_wall_open", "uvlock": true }, - "facing=west,in_wall=true,open=true": { - "model": "byg:block/zelkova/fence_gate_wall_open", - "y": 90, - "uvlock": true + "facing=west,in_wall=false,open=false": { + "model": "byg:block/zelkova/fence_gate", + "uvlock": true, + "y": 90 }, - "facing=east,in_wall=true,open=true": { + "facing=west,in_wall=false,open=true": { + "model": "byg:block/zelkova/fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "byg:block/zelkova/fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { "model": "byg:block/zelkova/fence_gate_wall_open", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 90 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json index 5f0b775de9..a2fe111cb3 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_slab.json @@ -1,13 +1,13 @@ { "variants": { - "type=top": { - "model": "byg:block/zelkova/slab_top" - }, "type=bottom": { "model": "byg:block/zelkova/slab" }, "type=double": { "model": "byg:block/zelkova/planks" + }, + "type=top": { + "model": "byg:block/zelkova/slab_top" } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json index 8be2eec455..6dd67aca61 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_stairs.json @@ -1,209 +1,209 @@ { "variants": { - "facing=north,half=top,shape=straight": { - "model": "byg:block/zelkova/stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "byg:block/zelkova/stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "byg:block/zelkova/stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "byg:block/zelkova/stairs", - "x": 180, - "uvlock": true + "facing=east,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, + "y": 270 }, - "facing=north,half=bottom,shape=straight": { - "model": "byg:block/zelkova/stairs", - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner" }, - "facing=south,half=bottom,shape=straight": { - "model": "byg:block/zelkova/stairs", - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=west,half=bottom,shape=straight": { - "model": "byg:block/zelkova/stairs", - "y": 180, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer" }, "facing=east,half=bottom,shape=straight": { "model": "byg:block/zelkova/stairs" }, - "facing=north,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_left": { "model": "byg:block/zelkova/stairs_inner", - "x": 180, - "y": 270, - "uvlock": true + "uvlock": true, + "x": 180 }, - "facing=south,half=top,shape=inner_left": { + "facing=east,half=top,shape=inner_right": { "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=inner_left": { - "model": "byg:block/zelkova/stairs_inner", - "x": 180, - "y": 180, - "uvlock": true + "facing=east,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "x": 180 }, - "facing=east,half=top,shape=inner_left": { - "model": "byg:block/zelkova/stairs_inner", + "facing=east,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, + "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "byg:block/zelkova/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=south,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova/stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { + "facing=north,half=bottom,shape=inner_right": { "model": "byg:block/zelkova/stairs_inner", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 270 }, - "facing=east,half=bottom,shape=inner_left": { - "model": "byg:block/zelkova/stairs_inner", - "y": 270, - "uvlock": true + "facing=north,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=inner_right": { - "model": "byg:block/zelkova/stairs_inner", - "x": 180, - "uvlock": true + "facing=north,half=bottom,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "y": 270 }, - "facing=south,half=top,shape=inner_right": { + "facing=north,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 270 }, - "facing=west,half=top,shape=inner_right": { + "facing=north,half=top,shape=inner_right": { "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=inner_right": { - "model": "byg:block/zelkova/stairs_inner", + "facing=north,half=top,shape=outer_right": { + "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 270 }, - "facing=north,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova/stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { "model": "byg:block/zelkova/stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova/stairs_inner", - "y": 180, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=inner_right": { - "model": "byg:block/zelkova/stairs_inner" + "facing=south,half=bottom,shape=outer_left": { + "model": "byg:block/zelkova/stairs_outer" }, - "facing=north,half=top,shape=outer_left": { + "facing=south,half=bottom,shape=outer_right": { "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true + "y": 90 }, - "facing=west,half=top,shape=outer_left": { + "facing=south,half=top,shape=outer_right": { "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=east,half=top,shape=outer_left": { - "model": "byg:block/zelkova/stairs_outer", + "facing=south,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, "x": 180, - "uvlock": true + "y": 90 }, - "facing=north,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova/stairs_outer", - "y": 180, - "uvlock": true + "facing=west,half=bottom,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, + "y": 90 }, - "facing=south,half=bottom,shape=outer_left": { - "model": "byg:block/zelkova/stairs_outer" + "facing=west,half=bottom,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, + "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "byg:block/zelkova/stairs_outer", - "y": 90, - "uvlock": true + "uvlock": true, + "y": 90 }, - "facing=east,half=bottom,shape=outer_left": { + "facing=west,half=bottom,shape=outer_right": { "model": "byg:block/zelkova/stairs_outer", - "y": 270, - "uvlock": true + "uvlock": true, + "y": 180 }, - "facing=north,half=top,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer", - "x": 180, - "uvlock": true + "facing=west,half=bottom,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, + "y": 180 }, - "facing=south,half=top,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer", + "facing=west,half=top,shape=inner_left": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, "x": 180, - "y": 180, - "uvlock": true + "y": 180 }, - "facing=west,half=top,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer", + "facing=west,half=top,shape=inner_right": { + "model": "byg:block/zelkova/stairs_inner", + "uvlock": true, "x": 180, - "y": 270, - "uvlock": true + "y": 270 }, - "facing=east,half=top,shape=outer_right": { + "facing=west,half=top,shape=outer_left": { "model": "byg:block/zelkova/stairs_outer", + "uvlock": true, "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer", - "y": 90, - "uvlock": true + "y": 180 }, - "facing=west,half=bottom,shape=outer_right": { + "facing=west,half=top,shape=outer_right": { "model": "byg:block/zelkova/stairs_outer", - "y": 180, - "uvlock": true + "uvlock": true, + "x": 180, + "y": 270 }, - "facing=east,half=bottom,shape=outer_right": { - "model": "byg:block/zelkova/stairs_outer" + "facing=west,half=top,shape=straight": { + "model": "byg:block/zelkova/stairs", + "uvlock": true, + "x": 180, + "y": 180 } } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json b/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json index 1b206bbce8..77affbe0c1 100644 --- a/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/blockstates/zelkova_trapdoor.json @@ -1,67 +1,67 @@ { "variants": { - "facing=north,half=top,open=false": { - "model": "byg:block/zelkova/trapdoor_top" - }, - "facing=south,half=top,open=false": { - "model": "byg:block/zelkova/trapdoor_top", - "y": 180 + "facing=east,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 90 }, - "facing=west,half=top,open=false": { - "model": "byg:block/zelkova/trapdoor_top", - "y": 270 + "facing=east,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "y": 90 }, "facing=east,half=top,open=false": { "model": "byg:block/zelkova/trapdoor_top", "y": 90 }, + "facing=east,half=top,open=true": { + "model": "byg:block/zelkova/trapdoor_open", + "x": 180, + "y": 270 + }, "facing=north,half=bottom,open=false": { "model": "byg:block/zelkova/trapdoor_bottom" }, - "facing=south,half=bottom,open=false": { - "model": "byg:block/zelkova/trapdoor_bottom", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "byg:block/zelkova/trapdoor_bottom", - "y": 270 + "facing=north,half=bottom,open=true": { + "model": "byg:block/zelkova/trapdoor_open" }, - "facing=east,half=bottom,open=false": { - "model": "byg:block/zelkova/trapdoor_bottom", - "y": 90 + "facing=north,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top" }, "facing=north,half=top,open=true": { "model": "byg:block/zelkova/trapdoor_open", "x": 180, "y": 180 }, - "facing=south,half=top,open=true": { - "model": "byg:block/zelkova/trapdoor_open", - "x": 180 - }, - "facing=west,half=top,open=true": { - "model": "byg:block/zelkova/trapdoor_open", - "x": 180, - "y": 90 + "facing=south,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 180 }, - "facing=east,half=top,open=true": { + "facing=south,half=bottom,open=true": { "model": "byg:block/zelkova/trapdoor_open", - "x": 180, - "y": 270 + "y": 180 }, - "facing=north,half=bottom,open=true": { - "model": "byg:block/zelkova/trapdoor_open" + "facing=south,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top", + "y": 180 }, - "facing=south,half=bottom,open=true": { + "facing=south,half=top,open=true": { "model": "byg:block/zelkova/trapdoor_open", - "y": 180 + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "byg:block/zelkova/trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "byg:block/zelkova/trapdoor_open", "y": 270 }, - "facing=east,half=bottom,open=true": { + "facing=west,half=top,open=false": { + "model": "byg:block/zelkova/trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { "model": "byg:block/zelkova/trapdoor_open", + "x": 180, "y": 90 } } diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json index 55184f1e54..a9803b180d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/aspen/planks", - "up": "byg:block/aspen/planks", + "east": "byg:block/aspen/bookshelf", "north": "byg:block/aspen/bookshelf", + "particle": "byg:block/aspen/planks", "south": "byg:block/aspen/bookshelf", - "east": "byg:block/aspen/bookshelf", - "west": "byg:block/aspen/bookshelf", - "particle": "byg:block/aspen/planks" + "up": "byg:block/aspen/planks", + "west": "byg:block/aspen/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json index 391021fe02..b0c9619cf1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/aspen/planks", - "up": "byg:block/aspen/crafting_table_top", + "east": "byg:block/aspen/crafting_table_side", "north": "byg:block/aspen/crafting_table_front", + "particle": "byg:block/aspen/crafting_table_front", "south": "byg:block/aspen/crafting_table_side", - "east": "byg:block/aspen/crafting_table_side", - "west": "byg:block/aspen/crafting_table_front", - "particle": "byg:block/aspen/crafting_table_front" + "up": "byg:block/aspen/crafting_table_top", + "west": "byg:block/aspen/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left.json index 4f9b847150..699a640312 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/aspen/door_bottom", "top": "byg:block/aspen/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left_open.json new file mode 100644 index 0000000000..003143cecb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/aspen/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right.json index 792ff365c2..63c4cafd28 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/aspen/door_bottom", "top": "byg:block/aspen/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right_open.json new file mode 100644 index 0000000000..c43bef74af --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/aspen/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left.json index 25ff281723..08d2d61dd0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/aspen/door_bottom", "top": "byg:block/aspen/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left_open.json new file mode 100644 index 0000000000..e7a1ac64fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right.json index 88d63b2d22..f87c7f05b7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/aspen/door_bottom", "top": "byg:block/aspen/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right_open.json new file mode 100644 index 0000000000..a8dbd11783 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/aspen/door_bottom", + "top": "byg:block/aspen/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json index f982b9100e..8e38576ca6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/aspen/planks", - "particle": "byg:block/aspen/planks" + "particle": "byg:block/aspen/planks", + "texture": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json index 8660cfacce..e10b5edf43 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/aspen/planks", - "particle": "byg:block/aspen/planks" + "particle": "byg:block/aspen/planks", + "texture": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json index bd513b53fd..46683637d8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/aspen/planks", - "particle": "byg:block/aspen/planks" + "particle": "byg:block/aspen/planks", + "texture": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json index 966497991f..5d3d5b70ea 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/aspen/leaves_snowy", - "up": "byg:block/aspen/leaves_snowy", + "east": "byg:block/aspen/leaves_snowy_side", "north": "byg:block/aspen/leaves_snowy_side", + "particle": "byg:block/aspen/leaves_snowy_side", "south": "byg:block/aspen/leaves_snowy_side", - "east": "byg:block/aspen/leaves_snowy_side", - "west": "byg:block/aspen/leaves_snowy_side", - "particle": "byg:block/aspen/leaves_snowy_side" + "up": "byg:block/aspen/leaves_snowy", + "west": "byg:block/aspen/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/log.json b/Common/src/generated/resources/assets/byg/models/block/aspen/log.json index 06e8a45e49..6a42ba9e01 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/aspen/log", - "end": "byg:block/aspen/log_top" + "end": "byg:block/aspen/log_top", + "side": "byg:block/aspen/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/planks.json b/Common/src/generated/resources/assets/byg/models/block/aspen/planks.json index 9adc7f228c..0bb9555623 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/aspen/planks", - "up": "byg:block/aspen/planks", + "east": "byg:block/aspen/planks", "north": "byg:block/aspen/planks", + "particle": "byg:block/aspen/planks", "south": "byg:block/aspen/planks", - "east": "byg:block/aspen/planks", - "west": "byg:block/aspen/planks", - "particle": "byg:block/aspen/planks" + "up": "byg:block/aspen/planks", + "west": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/slab.json b/Common/src/generated/resources/assets/byg/models/block/aspen/slab.json index 9c9519e145..43a474aed0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/aspen/planks", "bottom": "byg:block/aspen/planks", + "side": "byg:block/aspen/planks", "top": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json index 17d80994e5..3797c5bc54 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/aspen/planks", "bottom": "byg:block/aspen/planks", + "side": "byg:block/aspen/planks", "top": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json index aff2e0987f..0f64b7d5e3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/aspen/planks", "bottom": "byg:block/aspen/planks", + "side": "byg:block/aspen/planks", "top": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json index 5ff07c1549..8d9b4a9b62 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/aspen/planks", "bottom": "byg:block/aspen/planks", + "side": "byg:block/aspen/planks", "top": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json index a89afd5515..48e83f1806 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/aspen/planks", "bottom": "byg:block/aspen/planks", + "side": "byg:block/aspen/planks", "top": "byg:block/aspen/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json index 7009a6f827..54efdeac15 100644 --- a/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/aspen/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/aspen/stripped_log", - "end": "byg:block/aspen/stripped_log_top" + "end": "byg:block/aspen/stripped_log_top", + "side": "byg:block/aspen/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json index 64e6ccc7b4..a5655502bc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/baobab/planks", - "up": "byg:block/baobab/planks", + "east": "byg:block/baobab/bookshelf", "north": "byg:block/baobab/bookshelf", + "particle": "byg:block/baobab/planks", "south": "byg:block/baobab/bookshelf", - "east": "byg:block/baobab/bookshelf", - "west": "byg:block/baobab/bookshelf", - "particle": "byg:block/baobab/planks" + "up": "byg:block/baobab/planks", + "west": "byg:block/baobab/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json index 599b9ae710..ea55e41ca5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/baobab/planks", - "up": "byg:block/baobab/crafting_table_top", + "east": "byg:block/baobab/crafting_table_side", "north": "byg:block/baobab/crafting_table_front", + "particle": "byg:block/baobab/crafting_table_front", "south": "byg:block/baobab/crafting_table_side", - "east": "byg:block/baobab/crafting_table_side", - "west": "byg:block/baobab/crafting_table_front", - "particle": "byg:block/baobab/crafting_table_front" + "up": "byg:block/baobab/crafting_table_top", + "west": "byg:block/baobab/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/baobab/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left.json index d0db8aa023..a9467fb4e0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/baobab/door_bottom", "top": "byg:block/baobab/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left_open.json new file mode 100644 index 0000000000..71faf0508c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/baobab/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right.json index 793c1e0573..977e312ea2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/baobab/door_bottom", "top": "byg:block/baobab/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right_open.json new file mode 100644 index 0000000000..b2e349f47c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left.json index 4bd1c45a98..15f0d44b2d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/baobab/door_bottom", "top": "byg:block/baobab/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left_open.json new file mode 100644 index 0000000000..9eb3f6e858 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right.json index 0593a7bfb4..b7c8edf6c2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/baobab/door_bottom", "top": "byg:block/baobab/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right_open.json new file mode 100644 index 0000000000..f3418d9762 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/baobab/door_bottom", + "top": "byg:block/baobab/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json index abe7d50db9..9b4430d3ba 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/baobab/planks", - "particle": "byg:block/baobab/planks" + "particle": "byg:block/baobab/planks", + "texture": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json index 5f86bc04ce..b13c242a56 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/baobab/planks", - "particle": "byg:block/baobab/planks" + "particle": "byg:block/baobab/planks", + "texture": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json index 884c79351f..284f84e704 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/baobab/planks", - "particle": "byg:block/baobab/planks" + "particle": "byg:block/baobab/planks", + "texture": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json index 65fb38df23..7019cacebd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/baobab/leaves_snowy", - "up": "byg:block/baobab/leaves_snowy", + "east": "byg:block/baobab/leaves_snowy_side", "north": "byg:block/baobab/leaves_snowy_side", + "particle": "byg:block/baobab/leaves_snowy_side", "south": "byg:block/baobab/leaves_snowy_side", - "east": "byg:block/baobab/leaves_snowy_side", - "west": "byg:block/baobab/leaves_snowy_side", - "particle": "byg:block/baobab/leaves_snowy_side" + "up": "byg:block/baobab/leaves_snowy", + "west": "byg:block/baobab/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/log.json b/Common/src/generated/resources/assets/byg/models/block/baobab/log.json index 4825408dce..547395e6c2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/baobab/log", - "end": "byg:block/baobab/log_top" + "end": "byg:block/baobab/log_top", + "side": "byg:block/baobab/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/planks.json b/Common/src/generated/resources/assets/byg/models/block/baobab/planks.json index d95a5ecdd2..26eb9ad083 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/baobab/planks", - "up": "byg:block/baobab/planks", + "east": "byg:block/baobab/planks", "north": "byg:block/baobab/planks", + "particle": "byg:block/baobab/planks", "south": "byg:block/baobab/planks", - "east": "byg:block/baobab/planks", - "west": "byg:block/baobab/planks", - "particle": "byg:block/baobab/planks" + "up": "byg:block/baobab/planks", + "west": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/slab.json b/Common/src/generated/resources/assets/byg/models/block/baobab/slab.json index e27ad85619..105a201d22 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/baobab/planks", "bottom": "byg:block/baobab/planks", + "side": "byg:block/baobab/planks", "top": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json index 01aa894a19..a703425415 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/baobab/planks", "bottom": "byg:block/baobab/planks", + "side": "byg:block/baobab/planks", "top": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json index 5bac8422f4..89cf37735a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/baobab/planks", "bottom": "byg:block/baobab/planks", + "side": "byg:block/baobab/planks", "top": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json index 0b2da064e1..c714bfb65b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/baobab/planks", "bottom": "byg:block/baobab/planks", + "side": "byg:block/baobab/planks", "top": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json index a69a49ec02..0d1b6bffa9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/baobab/planks", "bottom": "byg:block/baobab/planks", + "side": "byg:block/baobab/planks", "top": "byg:block/baobab/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json index 2c52044c36..71c2c9aa85 100644 --- a/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/baobab/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/baobab/stripped_log", - "end": "byg:block/baobab/stripped_log_top" + "end": "byg:block/baobab/stripped_log_top", + "side": "byg:block/baobab/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json index ec690fa161..38e1acf64f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/blue_enchanted/planks", - "up": "byg:block/blue_enchanted/planks", + "east": "byg:block/blue_enchanted/bookshelf", "north": "byg:block/blue_enchanted/bookshelf", + "particle": "byg:block/blue_enchanted/planks", "south": "byg:block/blue_enchanted/bookshelf", - "east": "byg:block/blue_enchanted/bookshelf", - "west": "byg:block/blue_enchanted/bookshelf", - "particle": "byg:block/blue_enchanted/planks" + "up": "byg:block/blue_enchanted/planks", + "west": "byg:block/blue_enchanted/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json index d9e8e88910..39c6ca67ad 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/blue_enchanted/planks", - "up": "byg:block/blue_enchanted/crafting_table_top", + "east": "byg:block/blue_enchanted/crafting_table_side", "north": "byg:block/blue_enchanted/crafting_table_front", + "particle": "byg:block/blue_enchanted/crafting_table_front", "south": "byg:block/blue_enchanted/crafting_table_side", - "east": "byg:block/blue_enchanted/crafting_table_side", - "west": "byg:block/blue_enchanted/crafting_table_front", - "particle": "byg:block/blue_enchanted/crafting_table_front" + "up": "byg:block/blue_enchanted/crafting_table_top", + "west": "byg:block/blue_enchanted/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left.json index f45d54f684..28dd6606db 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/blue_enchanted/door_bottom", "top": "byg:block/blue_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left_open.json new file mode 100644 index 0000000000..d0fbce37d5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right.json index 10adb9fa1a..82195874ee 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/blue_enchanted/door_bottom", "top": "byg:block/blue_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right_open.json new file mode 100644 index 0000000000..8095e56a97 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left.json similarity index 73% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left.json index ecb938dc83..85d926c400 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/blue_enchanted/door_bottom", "top": "byg:block/blue_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left_open.json new file mode 100644 index 0000000000..1f89a5f4fc --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right.json index dd1ec89ff6..c7fc226354 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/blue_enchanted/door_bottom", "top": "byg:block/blue_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right_open.json new file mode 100644 index 0000000000..07f7d040a9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/blue_enchanted/door_bottom", + "top": "byg:block/blue_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json index 13abdae318..6b9ea0e2fc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/blue_enchanted/planks", - "particle": "byg:block/blue_enchanted/planks" + "particle": "byg:block/blue_enchanted/planks", + "texture": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json index d16e734a77..3f6b4203a2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/blue_enchanted/planks", - "particle": "byg:block/blue_enchanted/planks" + "particle": "byg:block/blue_enchanted/planks", + "texture": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json index 7751f09cdc..b50da94237 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/blue_enchanted/planks", - "particle": "byg:block/blue_enchanted/planks" + "particle": "byg:block/blue_enchanted/planks", + "texture": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json index 14b314102c..316beab6f8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/blue_enchanted/leaves_snowy", - "up": "byg:block/blue_enchanted/leaves_snowy", + "east": "byg:block/blue_enchanted/leaves_snowy_side", "north": "byg:block/blue_enchanted/leaves_snowy_side", + "particle": "byg:block/blue_enchanted/leaves_snowy_side", "south": "byg:block/blue_enchanted/leaves_snowy_side", - "east": "byg:block/blue_enchanted/leaves_snowy_side", - "west": "byg:block/blue_enchanted/leaves_snowy_side", - "particle": "byg:block/blue_enchanted/leaves_snowy_side" + "up": "byg:block/blue_enchanted/leaves_snowy", + "west": "byg:block/blue_enchanted/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json index 4b36ebd4b6..a6b453fab0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/blue_enchanted/log", - "end": "byg:block/blue_enchanted/log_top" + "end": "byg:block/blue_enchanted/log_top", + "side": "byg:block/blue_enchanted/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json index fd69ee25ad..b463369573 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/blue_enchanted/planks_top", - "up": "byg:block/blue_enchanted/planks_top", + "east": "byg:block/blue_enchanted/planks", "north": "byg:block/blue_enchanted/planks", + "particle": "byg:block/blue_enchanted/planks_top", "south": "byg:block/blue_enchanted/planks", - "east": "byg:block/blue_enchanted/planks", - "west": "byg:block/blue_enchanted/planks", - "particle": "byg:block/blue_enchanted/planks_top" + "up": "byg:block/blue_enchanted/planks_top", + "west": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json index caf7d1ab26..a293df74bf 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/blue_enchanted/planks", "bottom": "byg:block/blue_enchanted/planks_top", + "side": "byg:block/blue_enchanted/planks", "top": "byg:block/blue_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json index 91fc5bf50f..f6be002643 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/blue_enchanted/planks", "bottom": "byg:block/blue_enchanted/planks_top", + "side": "byg:block/blue_enchanted/planks", "top": "byg:block/blue_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json index 3af9113453..d7f27b4771 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/blue_enchanted/planks", "bottom": "byg:block/blue_enchanted/planks", + "side": "byg:block/blue_enchanted/planks", "top": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json index 0fb03ae64a..61c918457f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/blue_enchanted/planks", "bottom": "byg:block/blue_enchanted/planks", + "side": "byg:block/blue_enchanted/planks", "top": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json index 5a410b8c2c..b7688b9986 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/blue_enchanted/planks", "bottom": "byg:block/blue_enchanted/planks", + "side": "byg:block/blue_enchanted/planks", "top": "byg:block/blue_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json index c6a0039687..5b6d832541 100644 --- a/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/blue_enchanted/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/blue_enchanted/stripped_log", - "end": "byg:block/blue_enchanted/stripped_log_top" + "end": "byg:block/blue_enchanted/stripped_log_top", + "side": "byg:block/blue_enchanted/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json index 2ec9420e41..289e64541f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/bulbis/planks", - "up": "byg:block/bulbis/planks", + "east": "byg:block/bulbis/bookshelf", "north": "byg:block/bulbis/bookshelf", + "particle": "byg:block/bulbis/planks", "south": "byg:block/bulbis/bookshelf", - "east": "byg:block/bulbis/bookshelf", - "west": "byg:block/bulbis/bookshelf", - "particle": "byg:block/bulbis/planks" + "up": "byg:block/bulbis/planks", + "west": "byg:block/bulbis/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json index 4ecb980620..45aae5a8dc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/bulbis/planks", - "up": "byg:block/bulbis/crafting_table_top", + "east": "byg:block/bulbis/crafting_table_side", "north": "byg:block/bulbis/crafting_table_front", + "particle": "byg:block/bulbis/crafting_table_front", "south": "byg:block/bulbis/crafting_table_side", - "east": "byg:block/bulbis/crafting_table_side", - "west": "byg:block/bulbis/crafting_table_front", - "particle": "byg:block/bulbis/crafting_table_front" + "up": "byg:block/bulbis/crafting_table_top", + "west": "byg:block/bulbis/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/bulbis/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left.json index 14c5c1da47..f262beea1a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/bulbis/door_bottom", "top": "byg:block/bulbis/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left_open.json new file mode 100644 index 0000000000..7e08f7af03 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/bulbis/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right.json index e11e905d01..1a7e85db87 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/bulbis/door_bottom", "top": "byg:block/bulbis/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right_open.json new file mode 100644 index 0000000000..61d0207d2d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left.json index cbfd4f388b..1d0fc735be 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/bulbis/door_bottom", "top": "byg:block/bulbis/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left_open.json new file mode 100644 index 0000000000..754fd081f7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right.json index 84b96018a4..bf8fa6cea8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/bulbis/door_bottom", "top": "byg:block/bulbis/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right_open.json new file mode 100644 index 0000000000..0f9906c10c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/bulbis/door_bottom", + "top": "byg:block/bulbis/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json index 1899ed5423..344a71eb40 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/bulbis/planks", - "particle": "byg:block/bulbis/planks" + "particle": "byg:block/bulbis/planks", + "texture": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json index ec6b830c0b..015b0e5a3c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/bulbis/planks", - "particle": "byg:block/bulbis/planks" + "particle": "byg:block/bulbis/planks", + "texture": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json index 15ea730057..6b5ed64ca6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/bulbis/planks", - "particle": "byg:block/bulbis/planks" + "particle": "byg:block/bulbis/planks", + "texture": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/log.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/log.json index 8085d5b223..79a6354f8f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/bulbis/log", - "end": "byg:block/bulbis/log_top" + "end": "byg:block/bulbis/log_top", + "side": "byg:block/bulbis/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json index 9a588815b8..8538c362b8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/bulbis/planks", - "up": "byg:block/bulbis/planks", + "east": "byg:block/bulbis/planks", "north": "byg:block/bulbis/planks", + "particle": "byg:block/bulbis/planks", "south": "byg:block/bulbis/planks", - "east": "byg:block/bulbis/planks", - "west": "byg:block/bulbis/planks", - "particle": "byg:block/bulbis/planks" + "up": "byg:block/bulbis/planks", + "west": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json index 5e2e6f78fd..0a1093e6ca 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/bulbis/planks", "bottom": "byg:block/bulbis/planks", + "side": "byg:block/bulbis/planks", "top": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json index 8947c4b6dd..579bcda1ee 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/bulbis/planks", "bottom": "byg:block/bulbis/planks", + "side": "byg:block/bulbis/planks", "top": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json index f79febfdfb..8c2f7c0a2b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/bulbis/planks", "bottom": "byg:block/bulbis/planks", + "side": "byg:block/bulbis/planks", "top": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json index 3ee36d1109..b0b28a60d4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/bulbis/planks", "bottom": "byg:block/bulbis/planks", + "side": "byg:block/bulbis/planks", "top": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json index f001963e62..d3dba092f3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/bulbis/planks", "bottom": "byg:block/bulbis/planks", + "side": "byg:block/bulbis/planks", "top": "byg:block/bulbis/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json index ef891444b4..acb5dc6627 100644 --- a/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/bulbis/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/bulbis/stripped_log", - "end": "byg:block/bulbis/stripped_log_top" + "end": "byg:block/bulbis/stripped_log_top", + "side": "byg:block/bulbis/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json index 7bcf3eac95..10d85a3631 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cherry/planks", - "up": "byg:block/cherry/planks", + "east": "byg:block/cherry/bookshelf", "north": "byg:block/cherry/bookshelf", + "particle": "byg:block/cherry/planks", "south": "byg:block/cherry/bookshelf", - "east": "byg:block/cherry/bookshelf", - "west": "byg:block/cherry/bookshelf", - "particle": "byg:block/cherry/planks" + "up": "byg:block/cherry/planks", + "west": "byg:block/cherry/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json index 60d9304857..7e076b7fbd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cherry/planks", - "up": "byg:block/cherry/crafting_table_top", + "east": "byg:block/cherry/crafting_table_side", "north": "byg:block/cherry/crafting_table_front", + "particle": "byg:block/cherry/crafting_table_front", "south": "byg:block/cherry/crafting_table_side", - "east": "byg:block/cherry/crafting_table_side", - "west": "byg:block/cherry/crafting_table_front", - "particle": "byg:block/cherry/crafting_table_front" + "up": "byg:block/cherry/crafting_table_top", + "west": "byg:block/cherry/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/cherry/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left.json index cb0be9ef28..1d7612d5eb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/cherry/door_bottom", "top": "byg:block/cherry/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left_open.json new file mode 100644 index 0000000000..c296a2813e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/cherry/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right.json index e7b9fb6af2..dc6c7a9009 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/cherry/door_bottom", "top": "byg:block/cherry/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right_open.json new file mode 100644 index 0000000000..fc2b26900a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left.json index 8539fa9c44..67d3f8bb91 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/cherry/door_bottom", "top": "byg:block/cherry/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left_open.json new file mode 100644 index 0000000000..8033df7026 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right.json index cb177a4848..be2f5c61c4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/cherry/door_bottom", "top": "byg:block/cherry/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right_open.json new file mode 100644 index 0000000000..79004ce160 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/cherry/door_bottom", + "top": "byg:block/cherry/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json index 5049d595e0..97a6db50f5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/cherry/planks", - "particle": "byg:block/cherry/planks" + "particle": "byg:block/cherry/planks", + "texture": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json index 4d1b744c13..4efc0aa9f7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/cherry/planks", - "particle": "byg:block/cherry/planks" + "particle": "byg:block/cherry/planks", + "texture": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json index 07cf83ae29..a90e230732 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/cherry/planks", - "particle": "byg:block/cherry/planks" + "particle": "byg:block/cherry/planks", + "texture": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/log.json b/Common/src/generated/resources/assets/byg/models/block/cherry/log.json index c0935d77f4..163ceaf486 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cherry/log", - "end": "byg:block/cherry/log_top" + "end": "byg:block/cherry/log_top", + "side": "byg:block/cherry/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/planks.json b/Common/src/generated/resources/assets/byg/models/block/cherry/planks.json index 8db5d3b7c8..ad5f483b83 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cherry/planks", - "up": "byg:block/cherry/planks", + "east": "byg:block/cherry/planks", "north": "byg:block/cherry/planks", + "particle": "byg:block/cherry/planks", "south": "byg:block/cherry/planks", - "east": "byg:block/cherry/planks", - "west": "byg:block/cherry/planks", - "particle": "byg:block/cherry/planks" + "up": "byg:block/cherry/planks", + "west": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/slab.json b/Common/src/generated/resources/assets/byg/models/block/cherry/slab.json index 5c11f82751..a5c59ff262 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/cherry/planks", "bottom": "byg:block/cherry/planks", + "side": "byg:block/cherry/planks", "top": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json index 4ecd1c826a..102f2eb95d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/cherry/planks", "bottom": "byg:block/cherry/planks", + "side": "byg:block/cherry/planks", "top": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json index 42950e7803..489c090797 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/cherry/planks", "bottom": "byg:block/cherry/planks", + "side": "byg:block/cherry/planks", "top": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json index 4e45b39693..fa062c6e07 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/cherry/planks", "bottom": "byg:block/cherry/planks", + "side": "byg:block/cherry/planks", "top": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json index b3ab4a9594..63d07ad48f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/cherry/planks", "bottom": "byg:block/cherry/planks", + "side": "byg:block/cherry/planks", "top": "byg:block/cherry/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json index 52cdc19547..b3dcf3fa52 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cherry/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cherry/stripped_log", - "end": "byg:block/cherry/stripped_log_top" + "end": "byg:block/cherry/stripped_log_top", + "side": "byg:block/cherry/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json index 772480d3c1..60cffba51d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cika/planks", - "up": "byg:block/cika/planks", + "east": "byg:block/cika/bookshelf", "north": "byg:block/cika/bookshelf", + "particle": "byg:block/cika/planks", "south": "byg:block/cika/bookshelf", - "east": "byg:block/cika/bookshelf", - "west": "byg:block/cika/bookshelf", - "particle": "byg:block/cika/planks" + "up": "byg:block/cika/planks", + "west": "byg:block/cika/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json index 36892ccc54..a26796916a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cika/planks", - "up": "byg:block/cika/crafting_table_top", + "east": "byg:block/cika/crafting_table_side", "north": "byg:block/cika/crafting_table_front", + "particle": "byg:block/cika/crafting_table_front", "south": "byg:block/cika/crafting_table_side", - "east": "byg:block/cika/crafting_table_side", - "west": "byg:block/cika/crafting_table_front", - "particle": "byg:block/cika/crafting_table_front" + "up": "byg:block/cika/crafting_table_top", + "west": "byg:block/cika/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door_top.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/cika/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left.json index d6d57766f0..37237a8bd1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/cika/door_bottom", "top": "byg:block/cika/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left_open.json new file mode 100644 index 0000000000..1377287176 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right.json similarity index 67% rename from Common/src/generated/resources/assets/byg/models/block/cika/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right.json index c248ed0ba2..8f69174eb7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/cika/door_bottom", "top": "byg:block/cika/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right_open.json new file mode 100644 index 0000000000..f9564dbd70 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/cika/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door/top_left.json index 06c8c33e36..73ed321d79 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/cika/door_bottom", "top": "byg:block/cika/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_left_open.json new file mode 100644 index 0000000000..0fa41c5fbd --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/cika/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cika/door/top_right.json index e09d476fb8..416c28ccd5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/cika/door_bottom", "top": "byg:block/cika/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_right_open.json new file mode 100644 index 0000000000..ad875ae2fe --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cika/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/cika/door_bottom", + "top": "byg:block/cika/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/fence.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence.json index 6e5013dffe..f80c863631 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/cika/planks", - "particle": "byg:block/cika/planks" + "particle": "byg:block/cika/planks", + "texture": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json index 8c33fb6414..543314a02a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/cika/planks", - "particle": "byg:block/cika/planks" + "particle": "byg:block/cika/planks", + "texture": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json index e6d723fc7c..96e3f8ffa3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/cika/planks", - "particle": "byg:block/cika/planks" + "particle": "byg:block/cika/planks", + "texture": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json index 624e2acccc..89deddcae7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cika/leaves_snowy", - "up": "byg:block/cika/leaves_snowy", + "east": "byg:block/cika/leaves_snowy_side", "north": "byg:block/cika/leaves_snowy_side", + "particle": "byg:block/cika/leaves_snowy_side", "south": "byg:block/cika/leaves_snowy_side", - "east": "byg:block/cika/leaves_snowy_side", - "west": "byg:block/cika/leaves_snowy_side", - "particle": "byg:block/cika/leaves_snowy_side" + "up": "byg:block/cika/leaves_snowy", + "west": "byg:block/cika/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/log.json b/Common/src/generated/resources/assets/byg/models/block/cika/log.json index 8e1572cf1b..0d31c67f0d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cika/log", - "end": "byg:block/cika/log_top" + "end": "byg:block/cika/log_top", + "side": "byg:block/cika/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/planks.json b/Common/src/generated/resources/assets/byg/models/block/cika/planks.json index 406711316e..b7e458cdf7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cika/planks", - "up": "byg:block/cika/planks", + "east": "byg:block/cika/planks", "north": "byg:block/cika/planks", + "particle": "byg:block/cika/planks", "south": "byg:block/cika/planks", - "east": "byg:block/cika/planks", - "west": "byg:block/cika/planks", - "particle": "byg:block/cika/planks" + "up": "byg:block/cika/planks", + "west": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/slab.json b/Common/src/generated/resources/assets/byg/models/block/cika/slab.json index 12a6746e30..def962553b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/cika/planks", "bottom": "byg:block/cika/planks", + "side": "byg:block/cika/planks", "top": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json index e3e73a280b..5beb879a44 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/cika/planks", "bottom": "byg:block/cika/planks", + "side": "byg:block/cika/planks", "top": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stairs.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs.json index a0d6abae24..b1d3f527b4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/cika/planks", "bottom": "byg:block/cika/planks", + "side": "byg:block/cika/planks", "top": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json index a7518eeb93..7f078da08d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/cika/planks", "bottom": "byg:block/cika/planks", + "side": "byg:block/cika/planks", "top": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json index d6204195a0..2b45d88c71 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/cika/planks", "bottom": "byg:block/cika/planks", + "side": "byg:block/cika/planks", "top": "byg:block/cika/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json index 14cd87b06a..7dfc930e95 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cika/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cika/stripped_log", - "end": "byg:block/cika/stripped_log_top" + "end": "byg:block/cika/stripped_log_top", + "side": "byg:block/cika/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json index b54df58f41..b94dca3ad8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cypress/planks", - "up": "byg:block/cypress/planks", + "east": "byg:block/cypress/bookshelf", "north": "byg:block/cypress/bookshelf", + "particle": "byg:block/cypress/planks", "south": "byg:block/cypress/bookshelf", - "east": "byg:block/cypress/bookshelf", - "west": "byg:block/cypress/bookshelf", - "particle": "byg:block/cypress/planks" + "up": "byg:block/cypress/planks", + "west": "byg:block/cypress/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json index d503c6afa9..5abc0188c2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cypress/planks", - "up": "byg:block/cypress/crafting_table_top", + "east": "byg:block/cypress/crafting_table_side", "north": "byg:block/cypress/crafting_table_front", + "particle": "byg:block/cypress/crafting_table_front", "south": "byg:block/cypress/crafting_table_side", - "east": "byg:block/cypress/crafting_table_side", - "west": "byg:block/cypress/crafting_table_front", - "particle": "byg:block/cypress/crafting_table_front" + "up": "byg:block/cypress/crafting_table_top", + "west": "byg:block/cypress/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/cypress/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left.json index 69eee36e68..44d319855d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/cypress/door_bottom", "top": "byg:block/cypress/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left_open.json new file mode 100644 index 0000000000..051555643b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/cypress/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right.json index d2b3040599..05fe3c12c2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/cypress/door_bottom", "top": "byg:block/cypress/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right_open.json new file mode 100644 index 0000000000..e52212d78e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left.json index bc49aacbe9..f806b69838 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/cypress/door_bottom", "top": "byg:block/cypress/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left_open.json new file mode 100644 index 0000000000..664581e15c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right.json index 79408955e7..4e08354efb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/cypress/door_bottom", "top": "byg:block/cypress/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right_open.json new file mode 100644 index 0000000000..0665be1d01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/cypress/door_bottom", + "top": "byg:block/cypress/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json index 192e6205aa..fe32fd1f7a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/cypress/planks", - "particle": "byg:block/cypress/planks" + "particle": "byg:block/cypress/planks", + "texture": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json index 1be16b0811..778ac48957 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/cypress/planks", - "particle": "byg:block/cypress/planks" + "particle": "byg:block/cypress/planks", + "texture": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json index 3001b43cea..adfe8033f2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/cypress/planks", - "particle": "byg:block/cypress/planks" + "particle": "byg:block/cypress/planks", + "texture": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json index 790fe62427..fbe8f3b336 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cypress/leaves_snowy", - "up": "byg:block/cypress/leaves_snowy", + "east": "byg:block/cypress/leaves_snowy_side", "north": "byg:block/cypress/leaves_snowy_side", + "particle": "byg:block/cypress/leaves_snowy_side", "south": "byg:block/cypress/leaves_snowy_side", - "east": "byg:block/cypress/leaves_snowy_side", - "west": "byg:block/cypress/leaves_snowy_side", - "particle": "byg:block/cypress/leaves_snowy_side" + "up": "byg:block/cypress/leaves_snowy", + "west": "byg:block/cypress/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/log.json b/Common/src/generated/resources/assets/byg/models/block/cypress/log.json index c9e8e32c57..075c5cc06b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cypress/log", - "end": "byg:block/cypress/log_top" + "end": "byg:block/cypress/log_top", + "side": "byg:block/cypress/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/planks.json b/Common/src/generated/resources/assets/byg/models/block/cypress/planks.json index d7b365e7b6..d560d6b17b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/cypress/planks", - "up": "byg:block/cypress/planks", + "east": "byg:block/cypress/planks", "north": "byg:block/cypress/planks", + "particle": "byg:block/cypress/planks", "south": "byg:block/cypress/planks", - "east": "byg:block/cypress/planks", - "west": "byg:block/cypress/planks", - "particle": "byg:block/cypress/planks" + "up": "byg:block/cypress/planks", + "west": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/slab.json b/Common/src/generated/resources/assets/byg/models/block/cypress/slab.json index e53421d247..d66d17582e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/cypress/planks", "bottom": "byg:block/cypress/planks", + "side": "byg:block/cypress/planks", "top": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json index ccfb1bca70..c263d18dd2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/cypress/planks", "bottom": "byg:block/cypress/planks", + "side": "byg:block/cypress/planks", "top": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json index 5b3d4ad8a6..91ac47d00d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/cypress/planks", "bottom": "byg:block/cypress/planks", + "side": "byg:block/cypress/planks", "top": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json index 5a18e7716b..151adf0fb8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/cypress/planks", "bottom": "byg:block/cypress/planks", + "side": "byg:block/cypress/planks", "top": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json index efbb9eef66..504941461d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/cypress/planks", "bottom": "byg:block/cypress/planks", + "side": "byg:block/cypress/planks", "top": "byg:block/cypress/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json index bff80ca6e2..5f0fb80df7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/cypress/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/cypress/stripped_log", - "end": "byg:block/cypress/stripped_log_top" + "end": "byg:block/cypress/stripped_log_top", + "side": "byg:block/cypress/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json index d10b207eaa..d017131afc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ebony/planks", - "up": "byg:block/ebony/planks", + "east": "byg:block/ebony/bookshelf", "north": "byg:block/ebony/bookshelf", + "particle": "byg:block/ebony/planks", "south": "byg:block/ebony/bookshelf", - "east": "byg:block/ebony/bookshelf", - "west": "byg:block/ebony/bookshelf", - "particle": "byg:block/ebony/planks" + "up": "byg:block/ebony/planks", + "west": "byg:block/ebony/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json index 88f174d423..96d288d728 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ebony/planks", - "up": "byg:block/ebony/crafting_table_top", + "east": "byg:block/ebony/crafting_table_side", "north": "byg:block/ebony/crafting_table_front", + "particle": "byg:block/ebony/crafting_table_front", "south": "byg:block/ebony/crafting_table_side", - "east": "byg:block/ebony/crafting_table_side", - "west": "byg:block/ebony/crafting_table_front", - "particle": "byg:block/ebony/crafting_table_front" + "up": "byg:block/ebony/crafting_table_top", + "west": "byg:block/ebony/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/ebony/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left.json index e1601f0a20..5ba3f87b6a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/ebony/door_bottom", "top": "byg:block/ebony/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left_open.json new file mode 100644 index 0000000000..809797c4a8 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/ebony/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right.json index d27e1063c3..f0a6ced8f7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/ebony/door_bottom", "top": "byg:block/ebony/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right_open.json new file mode 100644 index 0000000000..26f254990b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left.json index a7e3cd6e1f..6836e3708e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/ebony/door_bottom", "top": "byg:block/ebony/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left_open.json new file mode 100644 index 0000000000..4c7cb5724a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right.json index 8ff6c136ab..39858f14b8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/ebony/door_bottom", "top": "byg:block/ebony/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right_open.json new file mode 100644 index 0000000000..62af41ba2f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/ebony/door_bottom", + "top": "byg:block/ebony/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json index cb4b390a4f..ecd0ef8cf1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/ebony/planks", - "particle": "byg:block/ebony/planks" + "particle": "byg:block/ebony/planks", + "texture": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json index 0824af0a5d..8a69f5abe3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/ebony/planks", - "particle": "byg:block/ebony/planks" + "particle": "byg:block/ebony/planks", + "texture": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json index e2a3c694b7..dfb2fb2973 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/ebony/planks", - "particle": "byg:block/ebony/planks" + "particle": "byg:block/ebony/planks", + "texture": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json index 49d9603b86..4a6b8d7c58 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ebony/leaves_snowy", - "up": "byg:block/ebony/leaves_snowy", + "east": "byg:block/ebony/leaves_snowy_side", "north": "byg:block/ebony/leaves_snowy_side", + "particle": "byg:block/ebony/leaves_snowy_side", "south": "byg:block/ebony/leaves_snowy_side", - "east": "byg:block/ebony/leaves_snowy_side", - "west": "byg:block/ebony/leaves_snowy_side", - "particle": "byg:block/ebony/leaves_snowy_side" + "up": "byg:block/ebony/leaves_snowy", + "west": "byg:block/ebony/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/log.json b/Common/src/generated/resources/assets/byg/models/block/ebony/log.json index b5b6042b18..259825d214 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/ebony/log", - "end": "byg:block/ebony/log_top" + "end": "byg:block/ebony/log_top", + "side": "byg:block/ebony/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/planks.json b/Common/src/generated/resources/assets/byg/models/block/ebony/planks.json index 6d5fd1bc6e..98fdce4224 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ebony/planks", - "up": "byg:block/ebony/planks", + "east": "byg:block/ebony/planks", "north": "byg:block/ebony/planks", + "particle": "byg:block/ebony/planks", "south": "byg:block/ebony/planks", - "east": "byg:block/ebony/planks", - "west": "byg:block/ebony/planks", - "particle": "byg:block/ebony/planks" + "up": "byg:block/ebony/planks", + "west": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/slab.json b/Common/src/generated/resources/assets/byg/models/block/ebony/slab.json index 4bb75aa974..e1e7be9c85 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/ebony/planks", "bottom": "byg:block/ebony/planks", + "side": "byg:block/ebony/planks", "top": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json index b222515c56..955b9f78ce 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/ebony/planks", "bottom": "byg:block/ebony/planks", + "side": "byg:block/ebony/planks", "top": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json index ecd78f6421..e7df274eb7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/ebony/planks", "bottom": "byg:block/ebony/planks", + "side": "byg:block/ebony/planks", "top": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json index 27c771fd7c..b928783819 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/ebony/planks", "bottom": "byg:block/ebony/planks", + "side": "byg:block/ebony/planks", "top": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json index 0c91049299..50a5c089d5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/ebony/planks", "bottom": "byg:block/ebony/planks", + "side": "byg:block/ebony/planks", "top": "byg:block/ebony/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json index a88977bd73..2e782b5dd2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/ebony/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/ebony/stripped_log", - "end": "byg:block/ebony/stripped_log_top" + "end": "byg:block/ebony/stripped_log_top", + "side": "byg:block/ebony/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json index 8918507928..efdf0ea360 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/embur/planks", - "up": "byg:block/embur/planks", + "east": "byg:block/embur/bookshelf", "north": "byg:block/embur/bookshelf", + "particle": "byg:block/embur/planks", "south": "byg:block/embur/bookshelf", - "east": "byg:block/embur/bookshelf", - "west": "byg:block/embur/bookshelf", - "particle": "byg:block/embur/planks" + "up": "byg:block/embur/planks", + "west": "byg:block/embur/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json index d8ea99b5a7..ba4f489503 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/embur/planks", - "up": "byg:block/embur/crafting_table_top", + "east": "byg:block/embur/crafting_table_side", "north": "byg:block/embur/crafting_table_front", + "particle": "byg:block/embur/crafting_table_front", "south": "byg:block/embur/crafting_table_side", - "east": "byg:block/embur/crafting_table_side", - "west": "byg:block/embur/crafting_table_front", - "particle": "byg:block/embur/crafting_table_front" + "up": "byg:block/embur/crafting_table_top", + "west": "byg:block/embur/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_top.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/embur/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left.json index e88a8206ab..97079d7910 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/embur/door_bottom", "top": "byg:block/embur/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left_open.json new file mode 100644 index 0000000000..7cbc49cf72 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right.json index f23181d368..9b4054878e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/embur/door_bottom", "top": "byg:block/embur/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right_open.json new file mode 100644 index 0000000000..e35783809e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/embur/door/top_left.json index 1723e728d7..e455bd7d32 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/embur/door_bottom", "top": "byg:block/embur/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_left_open.json new file mode 100644 index 0000000000..f1b86b4e9b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/embur/door/top_right.json index 6cb92eed0e..c702c974a5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/embur/door_bottom", "top": "byg:block/embur/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_right_open.json new file mode 100644 index 0000000000..599bdc9381 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/embur/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/embur/door_bottom", + "top": "byg:block/embur/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence.json index 73b0f7a998..508d2c369f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/embur/planks", - "particle": "byg:block/embur/planks" + "particle": "byg:block/embur/planks", + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json index 0bf1bbcd21..34c5f1db00 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/embur/planks", - "particle": "byg:block/embur/planks" + "particle": "byg:block/embur/planks", + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json index cba64136aa..a322530596 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/embur/planks", - "particle": "byg:block/embur/planks" + "particle": "byg:block/embur/planks", + "texture": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/log.json b/Common/src/generated/resources/assets/byg/models/block/embur/log.json index 15eb1f1392..544f7a753f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/embur/log", - "end": "byg:block/embur/log_top" + "end": "byg:block/embur/log_top", + "side": "byg:block/embur/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/planks.json b/Common/src/generated/resources/assets/byg/models/block/embur/planks.json index c733364b59..0502d59fb6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/embur/planks", - "up": "byg:block/embur/planks", + "east": "byg:block/embur/planks", "north": "byg:block/embur/planks", + "particle": "byg:block/embur/planks", "south": "byg:block/embur/planks", - "east": "byg:block/embur/planks", - "west": "byg:block/embur/planks", - "particle": "byg:block/embur/planks" + "up": "byg:block/embur/planks", + "west": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/slab.json b/Common/src/generated/resources/assets/byg/models/block/embur/slab.json index 721c57274c..36ae2618a4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/embur/planks", "bottom": "byg:block/embur/planks", + "side": "byg:block/embur/planks", "top": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json index bdc8e2c2c3..49026eac31 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/embur/planks", "bottom": "byg:block/embur/planks", + "side": "byg:block/embur/planks", "top": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json index 1fb8d92a45..36dfb14894 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/embur/planks", "bottom": "byg:block/embur/planks", + "side": "byg:block/embur/planks", "top": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json index 9c3d14d00b..26df3ac65e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/embur/planks", "bottom": "byg:block/embur/planks", + "side": "byg:block/embur/planks", "top": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json index 2fe174a33c..f4dc6d99b9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/embur/planks", "bottom": "byg:block/embur/planks", + "side": "byg:block/embur/planks", "top": "byg:block/embur/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json index af17571a02..5349d5962d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/embur/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/embur/stripped_log", - "end": "byg:block/embur/stripped_log_top" + "end": "byg:block/embur/stripped_log_top", + "side": "byg:block/embur/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json index 2e783c607e..eec1e007c4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ether/planks", - "up": "byg:block/ether/planks", + "east": "byg:block/ether/bookshelf", "north": "byg:block/ether/bookshelf", + "particle": "byg:block/ether/planks", "south": "byg:block/ether/bookshelf", - "east": "byg:block/ether/bookshelf", - "west": "byg:block/ether/bookshelf", - "particle": "byg:block/ether/planks" + "up": "byg:block/ether/planks", + "west": "byg:block/ether/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json index 1e5ddc0cf1..d529e29aa5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ether/planks", - "up": "byg:block/ether/crafting_table_top", + "east": "byg:block/ether/crafting_table_side", "north": "byg:block/ether/crafting_table_front", + "particle": "byg:block/ether/crafting_table_front", "south": "byg:block/ether/crafting_table_side", - "east": "byg:block/ether/crafting_table_side", - "west": "byg:block/ether/crafting_table_front", - "particle": "byg:block/ether/crafting_table_front" + "up": "byg:block/ether/crafting_table_top", + "west": "byg:block/ether/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_top.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/ether/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left.json index 76baa88ac4..64f83755db 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/ether/door_bottom", "top": "byg:block/ether/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left_open.json new file mode 100644 index 0000000000..000e5e8110 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right.json index 863289b4e1..6dde953045 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/ether/door_bottom", "top": "byg:block/ether/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right_open.json new file mode 100644 index 0000000000..5417efc9ab --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/ether/door/top_left.json index efedd160f8..5bcb4664c0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/ether/door_bottom", "top": "byg:block/ether/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_left_open.json new file mode 100644 index 0000000000..161f9d3230 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/ether/door/top_right.json index ccd61707fb..c0b06ab8e8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/ether/door_bottom", "top": "byg:block/ether/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_right_open.json new file mode 100644 index 0000000000..54154ae0ca --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/ether/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/ether/door_bottom", + "top": "byg:block/ether/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence.json index e4f7813cc0..7d50a48c88 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/ether/planks", - "particle": "byg:block/ether/planks" + "particle": "byg:block/ether/planks", + "texture": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json index 96f76face5..e8bf248ab8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/ether/planks", - "particle": "byg:block/ether/planks" + "particle": "byg:block/ether/planks", + "texture": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json index 87a03df114..68d5486190 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/ether/planks", - "particle": "byg:block/ether/planks" + "particle": "byg:block/ether/planks", + "texture": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json index 5f4fc96885..d0ac69e8e9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ether/leaves_snowy", - "up": "byg:block/ether/leaves_snowy", + "east": "byg:block/ether/leaves_snowy_side", "north": "byg:block/ether/leaves_snowy_side", + "particle": "byg:block/ether/leaves_snowy_side", "south": "byg:block/ether/leaves_snowy_side", - "east": "byg:block/ether/leaves_snowy_side", - "west": "byg:block/ether/leaves_snowy_side", - "particle": "byg:block/ether/leaves_snowy_side" + "up": "byg:block/ether/leaves_snowy", + "west": "byg:block/ether/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/log.json b/Common/src/generated/resources/assets/byg/models/block/ether/log.json index a6d31613e3..8e796e151c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/ether/log", - "end": "byg:block/ether/log_top" + "end": "byg:block/ether/log_top", + "side": "byg:block/ether/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/planks.json b/Common/src/generated/resources/assets/byg/models/block/ether/planks.json index 9e7ee31d80..5c2d67a319 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/ether/planks", - "up": "byg:block/ether/planks", + "east": "byg:block/ether/planks", "north": "byg:block/ether/planks", + "particle": "byg:block/ether/planks", "south": "byg:block/ether/planks", - "east": "byg:block/ether/planks", - "west": "byg:block/ether/planks", - "particle": "byg:block/ether/planks" + "up": "byg:block/ether/planks", + "west": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/slab.json b/Common/src/generated/resources/assets/byg/models/block/ether/slab.json index deed540702..ca24aeca81 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/ether/planks", "bottom": "byg:block/ether/planks", + "side": "byg:block/ether/planks", "top": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json index 55d94e19f2..9b6309246a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/ether/planks", "bottom": "byg:block/ether/planks", + "side": "byg:block/ether/planks", "top": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json index 4d6d964069..138d9ea52c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/ether/planks", "bottom": "byg:block/ether/planks", + "side": "byg:block/ether/planks", "top": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json index e7d64178a5..b5ef4bc484 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/ether/planks", "bottom": "byg:block/ether/planks", + "side": "byg:block/ether/planks", "top": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json index ac764f67c4..f7b70d1152 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/ether/planks", "bottom": "byg:block/ether/planks", + "side": "byg:block/ether/planks", "top": "byg:block/ether/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json index eb7b2f4adf..49fceb31f8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/ether/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/ether/stripped_log", - "end": "byg:block/ether/stripped_log_top" + "end": "byg:block/ether/stripped_log_top", + "side": "byg:block/ether/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json index d612690fc5..7f5770b5b4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/fir/planks", - "up": "byg:block/fir/planks", + "east": "byg:block/fir/bookshelf", "north": "byg:block/fir/bookshelf", + "particle": "byg:block/fir/planks", "south": "byg:block/fir/bookshelf", - "east": "byg:block/fir/bookshelf", - "west": "byg:block/fir/bookshelf", - "particle": "byg:block/fir/planks" + "up": "byg:block/fir/planks", + "west": "byg:block/fir/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json index 1112da0ddf..463626b3a1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/fir/planks", - "up": "byg:block/fir/crafting_table_top", + "east": "byg:block/fir/crafting_table_side", "north": "byg:block/fir/crafting_table_front", + "particle": "byg:block/fir/crafting_table_front", "south": "byg:block/fir/crafting_table_side", - "east": "byg:block/fir/crafting_table_side", - "west": "byg:block/fir/crafting_table_front", - "particle": "byg:block/fir/crafting_table_front" + "up": "byg:block/fir/crafting_table_top", + "west": "byg:block/fir/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_top.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/fir/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left.json index ce320059d5..0b43f81b89 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/fir/door_bottom", "top": "byg:block/fir/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left_open.json new file mode 100644 index 0000000000..84a05240cb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right.json similarity index 67% rename from Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right.json index d37f58274a..9b6f1469cb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/fir/door_bottom", "top": "byg:block/fir/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right_open.json new file mode 100644 index 0000000000..cf75b1db4a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/fir/door/top_left.json index 4fb6254bc8..eb82a941c8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/fir/door_bottom", "top": "byg:block/fir/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_left_open.json new file mode 100644 index 0000000000..b76f840bf3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/fir/door/top_right.json index 4cf2afc77d..7451f2f745 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/fir/door_bottom", "top": "byg:block/fir/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_right_open.json new file mode 100644 index 0000000000..d6388acb8a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/fir/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/fir/door_bottom", + "top": "byg:block/fir/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence.json index e1c937a93d..db30d54070 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/fir/planks", - "particle": "byg:block/fir/planks" + "particle": "byg:block/fir/planks", + "texture": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json index 94b982e2ab..547d3fa1d1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/fir/planks", - "particle": "byg:block/fir/planks" + "particle": "byg:block/fir/planks", + "texture": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json index 4f6eb3e866..8ea0e112ed 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/fir/planks", - "particle": "byg:block/fir/planks" + "particle": "byg:block/fir/planks", + "texture": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json index f39b16a28d..1178cb1b4e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/fir/leaves_snowy", - "up": "byg:block/fir/leaves_snowy", + "east": "byg:block/fir/leaves_snowy_side", "north": "byg:block/fir/leaves_snowy_side", + "particle": "byg:block/fir/leaves_snowy_side", "south": "byg:block/fir/leaves_snowy_side", - "east": "byg:block/fir/leaves_snowy_side", - "west": "byg:block/fir/leaves_snowy_side", - "particle": "byg:block/fir/leaves_snowy_side" + "up": "byg:block/fir/leaves_snowy", + "west": "byg:block/fir/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/log.json b/Common/src/generated/resources/assets/byg/models/block/fir/log.json index afe907ab67..cf46b1738c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/fir/log", - "end": "byg:block/fir/log_top" + "end": "byg:block/fir/log_top", + "side": "byg:block/fir/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/planks.json b/Common/src/generated/resources/assets/byg/models/block/fir/planks.json index 6d7c558f08..c7cc17cfe0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/fir/planks", - "up": "byg:block/fir/planks", + "east": "byg:block/fir/planks", "north": "byg:block/fir/planks", + "particle": "byg:block/fir/planks", "south": "byg:block/fir/planks", - "east": "byg:block/fir/planks", - "west": "byg:block/fir/planks", - "particle": "byg:block/fir/planks" + "up": "byg:block/fir/planks", + "west": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/slab.json b/Common/src/generated/resources/assets/byg/models/block/fir/slab.json index db3066aa0a..bdd8b58646 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/fir/planks", "bottom": "byg:block/fir/planks", + "side": "byg:block/fir/planks", "top": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json index dd9e319733..ef1291f9df 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/fir/planks", "bottom": "byg:block/fir/planks", + "side": "byg:block/fir/planks", "top": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json index ff2d795dff..a9022abc5b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/fir/planks", "bottom": "byg:block/fir/planks", + "side": "byg:block/fir/planks", "top": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json index f8c1e4c9b1..799bc265a4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/fir/planks", "bottom": "byg:block/fir/planks", + "side": "byg:block/fir/planks", "top": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json index 035a567e64..c2e5e915ba 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/fir/planks", "bottom": "byg:block/fir/planks", + "side": "byg:block/fir/planks", "top": "byg:block/fir/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json index e5c4c57306..7f37f32896 100644 --- a/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/fir/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/fir/stripped_log", - "end": "byg:block/fir/stripped_log_top" + "end": "byg:block/fir/stripped_log_top", + "side": "byg:block/fir/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json index 9f9b306897..c711ddbd67 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/green_enchanted/planks", - "up": "byg:block/green_enchanted/planks", + "east": "byg:block/green_enchanted/bookshelf", "north": "byg:block/green_enchanted/bookshelf", + "particle": "byg:block/green_enchanted/planks", "south": "byg:block/green_enchanted/bookshelf", - "east": "byg:block/green_enchanted/bookshelf", - "west": "byg:block/green_enchanted/bookshelf", - "particle": "byg:block/green_enchanted/planks" + "up": "byg:block/green_enchanted/planks", + "west": "byg:block/green_enchanted/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json index 23552b91ac..847b351ecd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/green_enchanted/planks", - "up": "byg:block/green_enchanted/crafting_table_top", + "east": "byg:block/green_enchanted/crafting_table_side", "north": "byg:block/green_enchanted/crafting_table_front", + "particle": "byg:block/green_enchanted/crafting_table_front", "south": "byg:block/green_enchanted/crafting_table_side", - "east": "byg:block/green_enchanted/crafting_table_side", - "west": "byg:block/green_enchanted/crafting_table_front", - "particle": "byg:block/green_enchanted/crafting_table_front" + "up": "byg:block/green_enchanted/crafting_table_top", + "west": "byg:block/green_enchanted/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left.json index 4e8b96031b..bcc5e78686 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/green_enchanted/door_bottom", "top": "byg:block/green_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left_open.json new file mode 100644 index 0000000000..0cace1d9fb --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right.json index 99a4fc49ed..48d9ff3794 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/green_enchanted/door_bottom", "top": "byg:block/green_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right_open.json new file mode 100644 index 0000000000..874b39a761 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left.json similarity index 73% rename from Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left.json index 97b2deb2f6..972305fcb2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/green_enchanted/door_bottom", "top": "byg:block/green_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left_open.json new file mode 100644 index 0000000000..9c8153e89e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right.json similarity index 73% rename from Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right.json index 71a109e617..3614900ab0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/green_enchanted/door_bottom", "top": "byg:block/green_enchanted/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right_open.json new file mode 100644 index 0000000000..8f72c71f7b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/green_enchanted/door_bottom", + "top": "byg:block/green_enchanted/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json index 2074bd0448..754f1ef93f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/green_enchanted/planks", - "particle": "byg:block/green_enchanted/planks" + "particle": "byg:block/green_enchanted/planks", + "texture": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json index bc3c645052..eb188ba5bc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/green_enchanted/planks", - "particle": "byg:block/green_enchanted/planks" + "particle": "byg:block/green_enchanted/planks", + "texture": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json index 341e146a65..6deb6e76a5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/green_enchanted/planks", - "particle": "byg:block/green_enchanted/planks" + "particle": "byg:block/green_enchanted/planks", + "texture": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json index fd0185dd3c..56de1965e9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/green_enchanted/leaves_snowy", - "up": "byg:block/green_enchanted/leaves_snowy", + "east": "byg:block/green_enchanted/leaves_snowy_side", "north": "byg:block/green_enchanted/leaves_snowy_side", + "particle": "byg:block/green_enchanted/leaves_snowy_side", "south": "byg:block/green_enchanted/leaves_snowy_side", - "east": "byg:block/green_enchanted/leaves_snowy_side", - "west": "byg:block/green_enchanted/leaves_snowy_side", - "particle": "byg:block/green_enchanted/leaves_snowy_side" + "up": "byg:block/green_enchanted/leaves_snowy", + "west": "byg:block/green_enchanted/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json index 172e4d34a0..38a7371eaa 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/green_enchanted/log", - "end": "byg:block/green_enchanted/log_top" + "end": "byg:block/green_enchanted/log_top", + "side": "byg:block/green_enchanted/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json index 22ad18bbe8..2308101735 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/green_enchanted/planks_top", - "up": "byg:block/green_enchanted/planks_top", + "east": "byg:block/green_enchanted/planks", "north": "byg:block/green_enchanted/planks", + "particle": "byg:block/green_enchanted/planks_top", "south": "byg:block/green_enchanted/planks", - "east": "byg:block/green_enchanted/planks", - "west": "byg:block/green_enchanted/planks", - "particle": "byg:block/green_enchanted/planks_top" + "up": "byg:block/green_enchanted/planks_top", + "west": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json index 3733b7bb38..0cc1eb1822 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/green_enchanted/planks", "bottom": "byg:block/green_enchanted/planks_top", + "side": "byg:block/green_enchanted/planks", "top": "byg:block/green_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json index 926cc07c66..d1bdf8c66e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/green_enchanted/planks", "bottom": "byg:block/green_enchanted/planks_top", + "side": "byg:block/green_enchanted/planks", "top": "byg:block/green_enchanted/planks_top" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json index 2df42ecfa8..36d0a9552f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/green_enchanted/planks", "bottom": "byg:block/green_enchanted/planks", + "side": "byg:block/green_enchanted/planks", "top": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json index 6e0846b4cb..fa7abc7d83 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/green_enchanted/planks", "bottom": "byg:block/green_enchanted/planks", + "side": "byg:block/green_enchanted/planks", "top": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json index 2ed296c447..de5eb1bee1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/green_enchanted/planks", "bottom": "byg:block/green_enchanted/planks", + "side": "byg:block/green_enchanted/planks", "top": "byg:block/green_enchanted/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json index c6fd444974..2f290479d7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/green_enchanted/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/green_enchanted/stripped_log", - "end": "byg:block/green_enchanted/stripped_log_top" + "end": "byg:block/green_enchanted/stripped_log_top", + "side": "byg:block/green_enchanted/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json index 27c0c946c5..18c95542f0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/holly/planks", - "up": "byg:block/holly/planks", + "east": "byg:block/holly/bookshelf", "north": "byg:block/holly/bookshelf", + "particle": "byg:block/holly/planks", "south": "byg:block/holly/bookshelf", - "east": "byg:block/holly/bookshelf", - "west": "byg:block/holly/bookshelf", - "particle": "byg:block/holly/planks" + "up": "byg:block/holly/planks", + "west": "byg:block/holly/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json index 09702317d1..2233412dea 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/holly/planks", - "up": "byg:block/holly/crafting_table_top", + "east": "byg:block/holly/crafting_table_side", "north": "byg:block/holly/crafting_table_front", + "particle": "byg:block/holly/crafting_table_front", "south": "byg:block/holly/crafting_table_side", - "east": "byg:block/holly/crafting_table_side", - "west": "byg:block/holly/crafting_table_front", - "particle": "byg:block/holly/crafting_table_front" + "up": "byg:block/holly/crafting_table_top", + "west": "byg:block/holly/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_top.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/holly/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left.json index b3a32ab6c7..6fe03c871e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/holly/door_bottom", "top": "byg:block/holly/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left_open.json new file mode 100644 index 0000000000..d412641ea5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right.json index 362655b8b6..b145f4b9b8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/holly/door_bottom", "top": "byg:block/holly/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right_open.json new file mode 100644 index 0000000000..3fe1a8c2a1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/holly/door/top_left.json index a13c7a20cd..8870407c64 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/holly/door_bottom", "top": "byg:block/holly/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_left_open.json new file mode 100644 index 0000000000..4fbe412053 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/holly/door/top_right.json index a86b8b83a4..af83630b44 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/holly/door_bottom", "top": "byg:block/holly/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_right_open.json new file mode 100644 index 0000000000..c6914cdf27 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/holly/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/holly/door_bottom", + "top": "byg:block/holly/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence.json index 119bc68677..a0c3fe8c46 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/holly/planks", - "particle": "byg:block/holly/planks" + "particle": "byg:block/holly/planks", + "texture": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json index c60a4c03c6..7e07f98281 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/holly/planks", - "particle": "byg:block/holly/planks" + "particle": "byg:block/holly/planks", + "texture": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json index 2fc5441e3e..b85db6d39a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/holly/planks", - "particle": "byg:block/holly/planks" + "particle": "byg:block/holly/planks", + "texture": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json index f24d44b5aa..25d652a59a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/holly/leaves_snowy", - "up": "byg:block/holly/leaves_snowy", + "east": "byg:block/holly/leaves_snowy_side", "north": "byg:block/holly/leaves_snowy_side", + "particle": "byg:block/holly/leaves_snowy_side", "south": "byg:block/holly/leaves_snowy_side", - "east": "byg:block/holly/leaves_snowy_side", - "west": "byg:block/holly/leaves_snowy_side", - "particle": "byg:block/holly/leaves_snowy_side" + "up": "byg:block/holly/leaves_snowy", + "west": "byg:block/holly/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/log.json b/Common/src/generated/resources/assets/byg/models/block/holly/log.json index ca68985a55..5e545fe846 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/holly/log", - "end": "byg:block/holly/log_top" + "end": "byg:block/holly/log_top", + "side": "byg:block/holly/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/planks.json b/Common/src/generated/resources/assets/byg/models/block/holly/planks.json index eee1fc4158..0a3e98927e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/holly/planks", - "up": "byg:block/holly/planks", + "east": "byg:block/holly/planks", "north": "byg:block/holly/planks", + "particle": "byg:block/holly/planks", "south": "byg:block/holly/planks", - "east": "byg:block/holly/planks", - "west": "byg:block/holly/planks", - "particle": "byg:block/holly/planks" + "up": "byg:block/holly/planks", + "west": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/slab.json b/Common/src/generated/resources/assets/byg/models/block/holly/slab.json index 1bf1927380..24749b617e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/holly/planks", "bottom": "byg:block/holly/planks", + "side": "byg:block/holly/planks", "top": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json index 433b5f249e..7e25e0bef5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/holly/planks", "bottom": "byg:block/holly/planks", + "side": "byg:block/holly/planks", "top": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json index 1cef2d992b..948b786030 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/holly/planks", "bottom": "byg:block/holly/planks", + "side": "byg:block/holly/planks", "top": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json index ad3f2518bf..8cb4954dc4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/holly/planks", "bottom": "byg:block/holly/planks", + "side": "byg:block/holly/planks", "top": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json index 2a85cf0fd8..e6fcdaa6dd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/holly/planks", "bottom": "byg:block/holly/planks", + "side": "byg:block/holly/planks", "top": "byg:block/holly/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json index 01831abf9c..a563639bee 100644 --- a/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/holly/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/holly/stripped_log", - "end": "byg:block/holly/stripped_log_top" + "end": "byg:block/holly/stripped_log_top", + "side": "byg:block/holly/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json index 55b41751a7..a4505e5b08 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/imparius/planks", - "up": "byg:block/imparius/planks", + "east": "byg:block/imparius/bookshelf", "north": "byg:block/imparius/bookshelf", + "particle": "byg:block/imparius/planks", "south": "byg:block/imparius/bookshelf", - "east": "byg:block/imparius/bookshelf", - "west": "byg:block/imparius/bookshelf", - "particle": "byg:block/imparius/planks" + "up": "byg:block/imparius/planks", + "west": "byg:block/imparius/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json index 7a0c95aa2c..dd80d17e5a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/imparius/planks", - "up": "byg:block/imparius/crafting_table_top", + "east": "byg:block/imparius/crafting_table_side", "north": "byg:block/imparius/crafting_table_front", + "particle": "byg:block/imparius/crafting_table_front", "south": "byg:block/imparius/crafting_table_side", - "east": "byg:block/imparius/crafting_table_side", - "west": "byg:block/imparius/crafting_table_front", - "particle": "byg:block/imparius/crafting_table_front" + "up": "byg:block/imparius/crafting_table_top", + "west": "byg:block/imparius/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left.json index 138a53b439..51ac51aacf 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/imparius/door_bottom", "top": "byg:block/imparius/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left_open.json new file mode 100644 index 0000000000..37ec695b01 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right.json index 25f5aebea4..bdbeb930b2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/imparius/door_bottom", "top": "byg:block/imparius/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right_open.json new file mode 100644 index 0000000000..bc14a7cba7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left.json index 0bbdce3320..00cade75ad 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/imparius/door_bottom", "top": "byg:block/imparius/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left_open.json new file mode 100644 index 0000000000..efc9184438 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right.json index 7feec8d61a..686d00e35b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/imparius/door_bottom", "top": "byg:block/imparius/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right_open.json new file mode 100644 index 0000000000..c35d0b937d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/imparius/door_bottom", + "top": "byg:block/imparius/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json index 48011976c6..44daf7ca1a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/imparius/planks", - "particle": "byg:block/imparius/planks" + "particle": "byg:block/imparius/planks", + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json index 3c7544e5a5..01a81d688b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/imparius/planks", - "particle": "byg:block/imparius/planks" + "particle": "byg:block/imparius/planks", + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json index be6dde5679..868266b3f7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/imparius/planks", - "particle": "byg:block/imparius/planks" + "particle": "byg:block/imparius/planks", + "texture": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/log.json b/Common/src/generated/resources/assets/byg/models/block/imparius/log.json index 5b89fabf9a..b7a6d7069f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/imparius/log", - "end": "byg:block/imparius/log_top" + "end": "byg:block/imparius/log_top", + "side": "byg:block/imparius/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json b/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json index c9d5eaa257..567caf3e59 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/imparius/planks", - "up": "byg:block/imparius/planks", + "east": "byg:block/imparius/planks", "north": "byg:block/imparius/planks", + "particle": "byg:block/imparius/planks", "south": "byg:block/imparius/planks", - "east": "byg:block/imparius/planks", - "west": "byg:block/imparius/planks", - "particle": "byg:block/imparius/planks" + "up": "byg:block/imparius/planks", + "west": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json b/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json index 680190c919..1b1eb70e22 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/imparius/planks", "bottom": "byg:block/imparius/planks", + "side": "byg:block/imparius/planks", "top": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json index d5019223b9..d60dc369e0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/imparius/planks", "bottom": "byg:block/imparius/planks", + "side": "byg:block/imparius/planks", "top": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json index 4abef9b91b..07a7f17085 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/imparius/planks", "bottom": "byg:block/imparius/planks", + "side": "byg:block/imparius/planks", "top": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json index 22aeaa1eb9..67652ddf2e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/imparius/planks", "bottom": "byg:block/imparius/planks", + "side": "byg:block/imparius/planks", "top": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json index 6675988ffa..a1e6bc985c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/imparius/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/imparius/planks", "bottom": "byg:block/imparius/planks", + "side": "byg:block/imparius/planks", "top": "byg:block/imparius/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json index 162ec9493f..73553dcd7b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/jacaranda/planks", - "up": "byg:block/jacaranda/planks", + "east": "byg:block/jacaranda/bookshelf", "north": "byg:block/jacaranda/bookshelf", + "particle": "byg:block/jacaranda/planks", "south": "byg:block/jacaranda/bookshelf", - "east": "byg:block/jacaranda/bookshelf", - "west": "byg:block/jacaranda/bookshelf", - "particle": "byg:block/jacaranda/planks" + "up": "byg:block/jacaranda/planks", + "west": "byg:block/jacaranda/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json index ce10e3ddfc..abcf7d73d8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/jacaranda/planks", - "up": "byg:block/jacaranda/crafting_table_top", + "east": "byg:block/jacaranda/crafting_table_side", "north": "byg:block/jacaranda/crafting_table_front", + "particle": "byg:block/jacaranda/crafting_table_front", "south": "byg:block/jacaranda/crafting_table_side", - "east": "byg:block/jacaranda/crafting_table_side", - "west": "byg:block/jacaranda/crafting_table_front", - "particle": "byg:block/jacaranda/crafting_table_front" + "up": "byg:block/jacaranda/crafting_table_top", + "west": "byg:block/jacaranda/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left.json index 9cdba364c0..0de4cfff4f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/jacaranda/door_bottom", "top": "byg:block/jacaranda/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left_open.json new file mode 100644 index 0000000000..5330a1131c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right.json index 667b602e6e..523226bc4d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/jacaranda/door_bottom", "top": "byg:block/jacaranda/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right_open.json new file mode 100644 index 0000000000..fb3633f340 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left.json index 1c5dba3a85..b370bc7503 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/jacaranda/door_bottom", "top": "byg:block/jacaranda/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left_open.json new file mode 100644 index 0000000000..27ea40d57c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right.json index da617f618b..4e19830b2b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/jacaranda/door_bottom", "top": "byg:block/jacaranda/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right_open.json new file mode 100644 index 0000000000..2f246fcfb7 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/jacaranda/door_bottom", + "top": "byg:block/jacaranda/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json index 2bc88a11fa..0941fbe254 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/jacaranda/planks", - "particle": "byg:block/jacaranda/planks" + "particle": "byg:block/jacaranda/planks", + "texture": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json index 93272bebfd..1034a13e9d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/jacaranda/planks", - "particle": "byg:block/jacaranda/planks" + "particle": "byg:block/jacaranda/planks", + "texture": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json index 6bf679023d..66a4c32ed6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/jacaranda/planks", - "particle": "byg:block/jacaranda/planks" + "particle": "byg:block/jacaranda/planks", + "texture": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json index 9bcc364af0..79cf565c71 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/jacaranda/leaves_snowy", - "up": "byg:block/jacaranda/leaves_snowy", + "east": "byg:block/jacaranda/leaves_snowy_side", "north": "byg:block/jacaranda/leaves_snowy_side", + "particle": "byg:block/jacaranda/leaves_snowy_side", "south": "byg:block/jacaranda/leaves_snowy_side", - "east": "byg:block/jacaranda/leaves_snowy_side", - "west": "byg:block/jacaranda/leaves_snowy_side", - "particle": "byg:block/jacaranda/leaves_snowy_side" + "up": "byg:block/jacaranda/leaves_snowy", + "west": "byg:block/jacaranda/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json index a1d521b20b..a4ab803b08 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/jacaranda/log", - "end": "byg:block/jacaranda/log_top" + "end": "byg:block/jacaranda/log_top", + "side": "byg:block/jacaranda/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json index 5f6621ebab..ac43a5c3d5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/jacaranda/planks", - "up": "byg:block/jacaranda/planks", + "east": "byg:block/jacaranda/planks", "north": "byg:block/jacaranda/planks", + "particle": "byg:block/jacaranda/planks", "south": "byg:block/jacaranda/planks", - "east": "byg:block/jacaranda/planks", - "west": "byg:block/jacaranda/planks", - "particle": "byg:block/jacaranda/planks" + "up": "byg:block/jacaranda/planks", + "west": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json index 75168ac13d..de790e0b16 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/jacaranda/planks", "bottom": "byg:block/jacaranda/planks", + "side": "byg:block/jacaranda/planks", "top": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json index a57a2c2bf0..630ef42a4e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/jacaranda/planks", "bottom": "byg:block/jacaranda/planks", + "side": "byg:block/jacaranda/planks", "top": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json index f0b2b52233..9e4519b81d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/jacaranda/planks", "bottom": "byg:block/jacaranda/planks", + "side": "byg:block/jacaranda/planks", "top": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json index 4b2107e4a0..2b000dd1c3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/jacaranda/planks", "bottom": "byg:block/jacaranda/planks", + "side": "byg:block/jacaranda/planks", "top": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json index a6714a0f58..a80fbd8d43 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/jacaranda/planks", "bottom": "byg:block/jacaranda/planks", + "side": "byg:block/jacaranda/planks", "top": "byg:block/jacaranda/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json index b7954460fe..78215d69b3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/jacaranda/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/jacaranda/stripped_log", - "end": "byg:block/jacaranda/stripped_log_top" + "end": "byg:block/jacaranda/stripped_log_top", + "side": "byg:block/jacaranda/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json index 0cd3513ba4..db4ba3109d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/lament/planks", - "up": "byg:block/lament/planks", + "east": "byg:block/lament/bookshelf", "north": "byg:block/lament/bookshelf", + "particle": "byg:block/lament/planks", "south": "byg:block/lament/bookshelf", - "east": "byg:block/lament/bookshelf", - "west": "byg:block/lament/bookshelf", - "particle": "byg:block/lament/planks" + "up": "byg:block/lament/planks", + "west": "byg:block/lament/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json index 5a54298589..c6ea83a538 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/lament/planks", - "up": "byg:block/lament/crafting_table_top", + "east": "byg:block/lament/crafting_table_side", "north": "byg:block/lament/crafting_table_front", + "particle": "byg:block/lament/crafting_table_front", "south": "byg:block/lament/crafting_table_side", - "east": "byg:block/lament/crafting_table_side", - "west": "byg:block/lament/crafting_table_front", - "particle": "byg:block/lament/crafting_table_front" + "up": "byg:block/lament/crafting_table_top", + "west": "byg:block/lament/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_top.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/lament/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left.json index 31de5e991f..0b09ede44b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/lament/door_bottom", "top": "byg:block/lament/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left_open.json new file mode 100644 index 0000000000..71b48dceff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right.json index ee1880caed..8608b85c1b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/lament/door_bottom", "top": "byg:block/lament/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right_open.json new file mode 100644 index 0000000000..b1b535aa81 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/lament/door/top_left.json index e2125198e5..e9a1a0d2f4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/lament/door_bottom", "top": "byg:block/lament/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_left_open.json new file mode 100644 index 0000000000..71eb0187bf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/lament/door/top_right.json index e29d6cdbbc..9155a72686 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/lament/door_bottom", "top": "byg:block/lament/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_right_open.json new file mode 100644 index 0000000000..14afa89bd1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/lament/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/lament/door_bottom", + "top": "byg:block/lament/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence.json index e1746e7d7e..4c6eecd9eb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/lament/planks", - "particle": "byg:block/lament/planks" + "particle": "byg:block/lament/planks", + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json index 0b1d9aff0a..30a7ebb55b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/lament/planks", - "particle": "byg:block/lament/planks" + "particle": "byg:block/lament/planks", + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json index 05eb86d819..a51e446b9d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/lament/planks", - "particle": "byg:block/lament/planks" + "particle": "byg:block/lament/planks", + "texture": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json index 98c31b958e..a6d5486097 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/lament/leaves_snowy", - "up": "byg:block/lament/leaves_snowy", + "east": "byg:block/lament/leaves_snowy_side", "north": "byg:block/lament/leaves_snowy_side", + "particle": "byg:block/lament/leaves_snowy_side", "south": "byg:block/lament/leaves_snowy_side", - "east": "byg:block/lament/leaves_snowy_side", - "west": "byg:block/lament/leaves_snowy_side", - "particle": "byg:block/lament/leaves_snowy_side" + "up": "byg:block/lament/leaves_snowy", + "west": "byg:block/lament/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/log.json b/Common/src/generated/resources/assets/byg/models/block/lament/log.json index 75427f58c6..3c25fb8128 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/lament/log", - "end": "byg:block/lament/log_top" + "end": "byg:block/lament/log_top", + "side": "byg:block/lament/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/planks.json b/Common/src/generated/resources/assets/byg/models/block/lament/planks.json index 1a8b3824bb..47531d9e5a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/lament/planks", - "up": "byg:block/lament/planks", + "east": "byg:block/lament/planks", "north": "byg:block/lament/planks", + "particle": "byg:block/lament/planks", "south": "byg:block/lament/planks", - "east": "byg:block/lament/planks", - "west": "byg:block/lament/planks", - "particle": "byg:block/lament/planks" + "up": "byg:block/lament/planks", + "west": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/slab.json b/Common/src/generated/resources/assets/byg/models/block/lament/slab.json index 2e748bf484..52e3a77641 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/lament/planks", "bottom": "byg:block/lament/planks", + "side": "byg:block/lament/planks", "top": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json index a691718664..e26a6b8bd1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/lament/planks", "bottom": "byg:block/lament/planks", + "side": "byg:block/lament/planks", "top": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json index 3b9ed81935..bdd4988975 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/lament/planks", "bottom": "byg:block/lament/planks", + "side": "byg:block/lament/planks", "top": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json index 0757397a2b..5eedcce773 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/lament/planks", "bottom": "byg:block/lament/planks", + "side": "byg:block/lament/planks", "top": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json index 141ca45fe0..9de98903a1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/lament/planks", "bottom": "byg:block/lament/planks", + "side": "byg:block/lament/planks", "top": "byg:block/lament/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json index de79f41bfe..20c0d2d933 100644 --- a/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/lament/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/lament/stripped_log", - "end": "byg:block/lament/stripped_log_top" + "end": "byg:block/lament/stripped_log_top", + "side": "byg:block/lament/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json index fa13f0a2e7..659c2681c5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mahogany/planks", - "up": "byg:block/mahogany/planks", + "east": "byg:block/mahogany/bookshelf", "north": "byg:block/mahogany/bookshelf", + "particle": "byg:block/mahogany/planks", "south": "byg:block/mahogany/bookshelf", - "east": "byg:block/mahogany/bookshelf", - "west": "byg:block/mahogany/bookshelf", - "particle": "byg:block/mahogany/planks" + "up": "byg:block/mahogany/planks", + "west": "byg:block/mahogany/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json index cfda4ad684..4064286273 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mahogany/planks", - "up": "byg:block/mahogany/crafting_table_top", + "east": "byg:block/mahogany/crafting_table_side", "north": "byg:block/mahogany/crafting_table_front", + "particle": "byg:block/mahogany/crafting_table_front", "south": "byg:block/mahogany/crafting_table_side", - "east": "byg:block/mahogany/crafting_table_side", - "west": "byg:block/mahogany/crafting_table_front", - "particle": "byg:block/mahogany/crafting_table_front" + "up": "byg:block/mahogany/crafting_table_top", + "west": "byg:block/mahogany/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left.json index 87454d3bb0..394438b315 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/mahogany/door_bottom", "top": "byg:block/mahogany/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left_open.json new file mode 100644 index 0000000000..a47f5dbbcf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right.json index 2bc680596d..8dbb4ca434 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/mahogany/door_bottom", "top": "byg:block/mahogany/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right_open.json new file mode 100644 index 0000000000..ce1ef6cdf6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left.json index 4524cc38ea..00e980b49f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/mahogany/door_bottom", "top": "byg:block/mahogany/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left_open.json new file mode 100644 index 0000000000..e4d28d3984 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right.json index 2753a8b685..1cc287af0e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/mahogany/door_bottom", "top": "byg:block/mahogany/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right_open.json new file mode 100644 index 0000000000..05fde86f05 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/mahogany/door_bottom", + "top": "byg:block/mahogany/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json index 85e1b7ec60..2405a0b31c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/mahogany/planks", - "particle": "byg:block/mahogany/planks" + "particle": "byg:block/mahogany/planks", + "texture": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json index 7b83a47ed8..67c394a85c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/mahogany/planks", - "particle": "byg:block/mahogany/planks" + "particle": "byg:block/mahogany/planks", + "texture": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json index f6ef911bf7..7d249ab511 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/mahogany/planks", - "particle": "byg:block/mahogany/planks" + "particle": "byg:block/mahogany/planks", + "texture": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json index cb1a1202be..96aab92d1c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves.json @@ -1,55 +1,33 @@ { "parent": "minecraft:block/cube", - "textures": { - "down": "byg:block/mahogany/leaves", - "up": "byg:block/mahogany/leaves", - "north": "byg:block/mahogany/leaves", - "south": "byg:block/mahogany/leaves", - "east": "byg:block/mahogany/leaves", - "west": "byg:block/mahogany/leaves", - "particle": "byg:block/mahogany/leaves", - "overlay": "byg:block/mahogany/leaves_overlay" - }, "elements": [ { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], "faces": { "down": { - "texture": "#down", - "cullface": "down" + "cullface": "down", + "texture": "#down" }, - "up": { - "texture": "#up", - "cullface": "up" + "east": { + "cullface": "east", + "texture": "#east" }, "north": { - "texture": "#north", - "cullface": "north" + "cullface": "north", + "texture": "#north" }, "south": { - "texture": "#south", - "cullface": "south" + "cullface": "south", + "texture": "#south" }, - "west": { - "texture": "#west", - "cullface": "west" + "up": { + "cullface": "up", + "texture": "#up" }, - "east": { - "texture": "#east", - "cullface": "east" + "west": { + "cullface": "west", + "texture": "#west" } - } - }, - { + }, "from": [ 0, 0, @@ -59,39 +37,61 @@ 16, 16, 16 - ], + ] + }, + { "faces": { "down": { - "texture": "#down", "cullface": "down", + "texture": "#down", "tintindex": 1 }, - "up": { - "texture": "#up", - "cullface": "up", + "east": { + "cullface": "east", + "texture": "#east", "tintindex": 1 }, "north": { - "texture": "#north", "cullface": "north", + "texture": "#north", "tintindex": 1 }, "south": { - "texture": "#south", "cullface": "south", + "texture": "#south", "tintindex": 1 }, - "west": { - "texture": "#west", - "cullface": "west", + "up": { + "cullface": "up", + "texture": "#up", "tintindex": 1 }, - "east": { - "texture": "#east", - "cullface": "east", + "west": { + "cullface": "west", + "texture": "#west", "tintindex": 1 } - } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] } - ] + ], + "textures": { + "down": "byg:block/mahogany/leaves", + "east": "byg:block/mahogany/leaves", + "north": "byg:block/mahogany/leaves", + "overlay": "byg:block/mahogany/leaves_overlay", + "particle": "byg:block/mahogany/leaves", + "south": "byg:block/mahogany/leaves", + "up": "byg:block/mahogany/leaves", + "west": "byg:block/mahogany/leaves" + } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json index 39d1f755f8..9c3cb6c02b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mahogany/leaves_snowy", - "up": "byg:block/mahogany/leaves_snowy", + "east": "byg:block/mahogany/leaves_snowy_side", "north": "byg:block/mahogany/leaves_snowy_side", + "particle": "byg:block/mahogany/leaves_snowy_side", "south": "byg:block/mahogany/leaves_snowy_side", - "east": "byg:block/mahogany/leaves_snowy_side", - "west": "byg:block/mahogany/leaves_snowy_side", - "particle": "byg:block/mahogany/leaves_snowy_side" + "up": "byg:block/mahogany/leaves_snowy", + "west": "byg:block/mahogany/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json index 0e5216bd64..0a11485eb6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/mahogany/log", - "end": "byg:block/mahogany/log_top" + "end": "byg:block/mahogany/log_top", + "side": "byg:block/mahogany/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json index d368241359..14b655b81d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mahogany/planks", - "up": "byg:block/mahogany/planks", + "east": "byg:block/mahogany/planks", "north": "byg:block/mahogany/planks", + "particle": "byg:block/mahogany/planks", "south": "byg:block/mahogany/planks", - "east": "byg:block/mahogany/planks", - "west": "byg:block/mahogany/planks", - "particle": "byg:block/mahogany/planks" + "up": "byg:block/mahogany/planks", + "west": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json index e3d094463d..a0d2f206f0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/mahogany/planks", "bottom": "byg:block/mahogany/planks", + "side": "byg:block/mahogany/planks", "top": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json index 1e98424c9c..f5b8641474 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/mahogany/planks", "bottom": "byg:block/mahogany/planks", + "side": "byg:block/mahogany/planks", "top": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json index 3337b36f19..da7f77cad2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/mahogany/planks", "bottom": "byg:block/mahogany/planks", + "side": "byg:block/mahogany/planks", "top": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json index bb311edd08..36aa750200 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/mahogany/planks", "bottom": "byg:block/mahogany/planks", + "side": "byg:block/mahogany/planks", "top": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json index 1bcd174845..56c03ec85e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/mahogany/planks", "bottom": "byg:block/mahogany/planks", + "side": "byg:block/mahogany/planks", "top": "byg:block/mahogany/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json index 28098b5c5e..56c9db8472 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/mahogany/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/mahogany/stripped_log", - "end": "byg:block/mahogany/stripped_log_top" + "end": "byg:block/mahogany/stripped_log_top", + "side": "byg:block/mahogany/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json index 929248c1f6..846f211d1f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mangrove/planks", - "up": "byg:block/mangrove/planks", + "east": "byg:block/mangrove/bookshelf", "north": "byg:block/mangrove/bookshelf", + "particle": "byg:block/mangrove/planks", "south": "byg:block/mangrove/bookshelf", - "east": "byg:block/mangrove/bookshelf", - "west": "byg:block/mangrove/bookshelf", - "particle": "byg:block/mangrove/planks" + "up": "byg:block/mangrove/planks", + "west": "byg:block/mangrove/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json index f8df7a06eb..fcffad4fa1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mangrove/planks", - "up": "byg:block/mangrove/crafting_table_top", + "east": "byg:block/mangrove/crafting_table_side", "north": "byg:block/mangrove/crafting_table_front", + "particle": "byg:block/mangrove/crafting_table_front", "south": "byg:block/mangrove/crafting_table_side", - "east": "byg:block/mangrove/crafting_table_side", - "west": "byg:block/mangrove/crafting_table_front", - "particle": "byg:block/mangrove/crafting_table_front" + "up": "byg:block/mangrove/crafting_table_top", + "west": "byg:block/mangrove/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left.json index 2d672ce9a0..dda47fd478 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/mangrove/door_bottom", "top": "byg:block/mangrove/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left_open.json new file mode 100644 index 0000000000..92bd2ea460 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right.json index d5076c43ab..6e4e88edd7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/mangrove/door_bottom", "top": "byg:block/mangrove/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right_open.json new file mode 100644 index 0000000000..8b83d7e164 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left.json index fe99f3046d..b4efc300c4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/mangrove/door_bottom", "top": "byg:block/mangrove/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left_open.json new file mode 100644 index 0000000000..9b05b8f5d2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right.json index 7bc39ffc5b..3690f932f5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/mangrove/door_bottom", "top": "byg:block/mangrove/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right_open.json new file mode 100644 index 0000000000..0f3b327952 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/mangrove/door_bottom", + "top": "byg:block/mangrove/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json index 6a256b0ba6..cfea641dc1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/mangrove/planks", - "particle": "byg:block/mangrove/planks" + "particle": "byg:block/mangrove/planks", + "texture": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json index 4576a3c7e1..8a2d709811 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/mangrove/planks", - "particle": "byg:block/mangrove/planks" + "particle": "byg:block/mangrove/planks", + "texture": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json index 6a0a3e8ca4..706181aaff 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/mangrove/planks", - "particle": "byg:block/mangrove/planks" + "particle": "byg:block/mangrove/planks", + "texture": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json index ea87e33818..83f2272343 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mangrove/leaves_snowy", - "up": "byg:block/mangrove/leaves_snowy", + "east": "byg:block/mangrove/leaves_snowy_side", "north": "byg:block/mangrove/leaves_snowy_side", + "particle": "byg:block/mangrove/leaves_snowy_side", "south": "byg:block/mangrove/leaves_snowy_side", - "east": "byg:block/mangrove/leaves_snowy_side", - "west": "byg:block/mangrove/leaves_snowy_side", - "particle": "byg:block/mangrove/leaves_snowy_side" + "up": "byg:block/mangrove/leaves_snowy", + "west": "byg:block/mangrove/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json index cc991490fe..11cf64c5ca 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/mangrove/log", - "end": "byg:block/mangrove/log_top" + "end": "byg:block/mangrove/log_top", + "side": "byg:block/mangrove/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json index 3ba8ba39c6..10d119035d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/mangrove/planks", - "up": "byg:block/mangrove/planks", + "east": "byg:block/mangrove/planks", "north": "byg:block/mangrove/planks", + "particle": "byg:block/mangrove/planks", "south": "byg:block/mangrove/planks", - "east": "byg:block/mangrove/planks", - "west": "byg:block/mangrove/planks", - "particle": "byg:block/mangrove/planks" + "up": "byg:block/mangrove/planks", + "west": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json index 57c16c0697..d4be5b17b4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/mangrove/planks", "bottom": "byg:block/mangrove/planks", + "side": "byg:block/mangrove/planks", "top": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json index 6122160580..45a6c5e7e6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/mangrove/planks", "bottom": "byg:block/mangrove/planks", + "side": "byg:block/mangrove/planks", "top": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json index 38d63c2544..4ecdb7753e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/mangrove/planks", "bottom": "byg:block/mangrove/planks", + "side": "byg:block/mangrove/planks", "top": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json index 4f1462bc9d..9e25e94de7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/mangrove/planks", "bottom": "byg:block/mangrove/planks", + "side": "byg:block/mangrove/planks", "top": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json index 531520ce07..177d47aee7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/mangrove/planks", "bottom": "byg:block/mangrove/planks", + "side": "byg:block/mangrove/planks", "top": "byg:block/mangrove/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json index ca8363eaad..7cf6ea0e7f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/mangrove/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/mangrove/stripped_log", - "end": "byg:block/mangrove/stripped_log_top" + "end": "byg:block/mangrove/stripped_log_top", + "side": "byg:block/mangrove/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json index 072a8cc7d8..d8f210f6aa 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/maple/planks", - "up": "byg:block/maple/planks", + "east": "byg:block/maple/bookshelf", "north": "byg:block/maple/bookshelf", + "particle": "byg:block/maple/planks", "south": "byg:block/maple/bookshelf", - "east": "byg:block/maple/bookshelf", - "west": "byg:block/maple/bookshelf", - "particle": "byg:block/maple/planks" + "up": "byg:block/maple/planks", + "west": "byg:block/maple/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json index 1346a0fd91..a981e8d3a0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/maple/planks", - "up": "byg:block/maple/crafting_table_top", + "east": "byg:block/maple/crafting_table_side", "north": "byg:block/maple/crafting_table_front", + "particle": "byg:block/maple/crafting_table_front", "south": "byg:block/maple/crafting_table_side", - "east": "byg:block/maple/crafting_table_side", - "west": "byg:block/maple/crafting_table_front", - "particle": "byg:block/maple/crafting_table_front" + "up": "byg:block/maple/crafting_table_top", + "west": "byg:block/maple/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_top.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/maple/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left.json index 687681ecc4..ced59c03a6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/maple/door_bottom", "top": "byg:block/maple/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left_open.json new file mode 100644 index 0000000000..c3f8cfc4c2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right.json index 957911fac2..da16190b9a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/maple/door_bottom", "top": "byg:block/maple/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right_open.json new file mode 100644 index 0000000000..7f3605e2c6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/maple/door/top_left.json index eaf67843f7..dc4e720546 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/maple/door_bottom", "top": "byg:block/maple/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_left_open.json new file mode 100644 index 0000000000..8c13c087f9 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/maple/door/top_right.json index 98b4733e55..5e4952e348 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/maple/door_bottom", "top": "byg:block/maple/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_right_open.json new file mode 100644 index 0000000000..0514c6736f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/maple/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/maple/door_bottom", + "top": "byg:block/maple/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence.json index edf60144ef..e6392370b3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/maple/planks", - "particle": "byg:block/maple/planks" + "particle": "byg:block/maple/planks", + "texture": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json index e4b4c25e31..d14500a1be 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/maple/planks", - "particle": "byg:block/maple/planks" + "particle": "byg:block/maple/planks", + "texture": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json index 81827a89c6..44b8a5bc20 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/maple/planks", - "particle": "byg:block/maple/planks" + "particle": "byg:block/maple/planks", + "texture": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json index e6162d1fc8..4cbde34fa1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/maple/leaves_snowy", - "up": "byg:block/maple/leaves_snowy", + "east": "byg:block/maple/leaves_snowy_side", "north": "byg:block/maple/leaves_snowy_side", + "particle": "byg:block/maple/leaves_snowy_side", "south": "byg:block/maple/leaves_snowy_side", - "east": "byg:block/maple/leaves_snowy_side", - "west": "byg:block/maple/leaves_snowy_side", - "particle": "byg:block/maple/leaves_snowy_side" + "up": "byg:block/maple/leaves_snowy", + "west": "byg:block/maple/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/log.json b/Common/src/generated/resources/assets/byg/models/block/maple/log.json index 5c66eb17e0..554719d7df 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/maple/log", - "end": "byg:block/maple/log_top" + "end": "byg:block/maple/log_top", + "side": "byg:block/maple/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/planks.json b/Common/src/generated/resources/assets/byg/models/block/maple/planks.json index b02c91b093..9801d9a505 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/maple/planks", - "up": "byg:block/maple/planks", + "east": "byg:block/maple/planks", "north": "byg:block/maple/planks", + "particle": "byg:block/maple/planks", "south": "byg:block/maple/planks", - "east": "byg:block/maple/planks", - "west": "byg:block/maple/planks", - "particle": "byg:block/maple/planks" + "up": "byg:block/maple/planks", + "west": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/slab.json b/Common/src/generated/resources/assets/byg/models/block/maple/slab.json index 5de7a467a5..c82461d10d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/maple/planks", "bottom": "byg:block/maple/planks", + "side": "byg:block/maple/planks", "top": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json index 39f8534ed5..acabd2ec8e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/maple/planks", "bottom": "byg:block/maple/planks", + "side": "byg:block/maple/planks", "top": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json index 6e20289757..19f14ddea1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/maple/planks", "bottom": "byg:block/maple/planks", + "side": "byg:block/maple/planks", "top": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json index 0a4a44f868..42c1c3f975 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/maple/planks", "bottom": "byg:block/maple/planks", + "side": "byg:block/maple/planks", "top": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json index 7076e0a615..97febca5f2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/maple/planks", "bottom": "byg:block/maple/planks", + "side": "byg:block/maple/planks", "top": "byg:block/maple/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json index 2af82cc76a..15e8e910e5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/maple/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/maple/stripped_log", - "end": "byg:block/maple/stripped_log_top" + "end": "byg:block/maple/stripped_log_top", + "side": "byg:block/maple/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json index 3df18caf41..253cd86b2a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/nightshade/planks", - "up": "byg:block/nightshade/planks", + "east": "byg:block/nightshade/bookshelf", "north": "byg:block/nightshade/bookshelf", + "particle": "byg:block/nightshade/planks", "south": "byg:block/nightshade/bookshelf", - "east": "byg:block/nightshade/bookshelf", - "west": "byg:block/nightshade/bookshelf", - "particle": "byg:block/nightshade/planks" + "up": "byg:block/nightshade/planks", + "west": "byg:block/nightshade/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json index 791af924df..308c06a5b6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/nightshade/planks", - "up": "byg:block/nightshade/crafting_table_top", + "east": "byg:block/nightshade/crafting_table_side", "north": "byg:block/nightshade/crafting_table_front", + "particle": "byg:block/nightshade/crafting_table_front", "south": "byg:block/nightshade/crafting_table_side", - "east": "byg:block/nightshade/crafting_table_side", - "west": "byg:block/nightshade/crafting_table_front", - "particle": "byg:block/nightshade/crafting_table_front" + "up": "byg:block/nightshade/crafting_table_top", + "west": "byg:block/nightshade/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left.json index 9c1eeec89c..2aaaaf668e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/nightshade/door_bottom", "top": "byg:block/nightshade/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left_open.json new file mode 100644 index 0000000000..02170d1d89 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right.json index 473ced87ee..b7e627f99a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/nightshade/door_bottom", "top": "byg:block/nightshade/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right_open.json new file mode 100644 index 0000000000..59023dd616 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left.json index 45ac8cf917..455734a6f2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/nightshade/door_bottom", "top": "byg:block/nightshade/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left_open.json new file mode 100644 index 0000000000..0832843a82 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right.json index 1ff784af5b..f0d68a4d51 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/nightshade/door_bottom", "top": "byg:block/nightshade/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right_open.json new file mode 100644 index 0000000000..03f670b607 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/nightshade/door_bottom", + "top": "byg:block/nightshade/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json index 52401b3dbf..ac7fc9fa81 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/nightshade/planks", - "particle": "byg:block/nightshade/planks" + "particle": "byg:block/nightshade/planks", + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json index d74642e27d..9e3362dd1d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/nightshade/planks", - "particle": "byg:block/nightshade/planks" + "particle": "byg:block/nightshade/planks", + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json index 2fd47d89ae..146b9ee2a2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/nightshade/planks", - "particle": "byg:block/nightshade/planks" + "particle": "byg:block/nightshade/planks", + "texture": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json index cbdf485452..584f29640e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/nightshade/leaves_snowy", - "up": "byg:block/nightshade/leaves_snowy", + "east": "byg:block/nightshade/leaves_snowy_side", "north": "byg:block/nightshade/leaves_snowy_side", + "particle": "byg:block/nightshade/leaves_snowy_side", "south": "byg:block/nightshade/leaves_snowy_side", - "east": "byg:block/nightshade/leaves_snowy_side", - "west": "byg:block/nightshade/leaves_snowy_side", - "particle": "byg:block/nightshade/leaves_snowy_side" + "up": "byg:block/nightshade/leaves_snowy", + "west": "byg:block/nightshade/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json index 8971dbe372..a3e940ee45 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/nightshade/log", - "end": "byg:block/nightshade/log_top" + "end": "byg:block/nightshade/log_top", + "side": "byg:block/nightshade/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json index 89dbf24402..fc682028cd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/nightshade/planks", - "up": "byg:block/nightshade/planks", + "east": "byg:block/nightshade/planks", "north": "byg:block/nightshade/planks", + "particle": "byg:block/nightshade/planks", "south": "byg:block/nightshade/planks", - "east": "byg:block/nightshade/planks", - "west": "byg:block/nightshade/planks", - "particle": "byg:block/nightshade/planks" + "up": "byg:block/nightshade/planks", + "west": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json index fa977928f1..2fb96196f1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/nightshade/planks", "bottom": "byg:block/nightshade/planks", + "side": "byg:block/nightshade/planks", "top": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json index 58630afc0a..afb3a5f6f7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/nightshade/planks", "bottom": "byg:block/nightshade/planks", + "side": "byg:block/nightshade/planks", "top": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json index d2b2792761..971669ff40 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/nightshade/planks", "bottom": "byg:block/nightshade/planks", + "side": "byg:block/nightshade/planks", "top": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json index 33dae9e25c..0d7ab2b15d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/nightshade/planks", "bottom": "byg:block/nightshade/planks", + "side": "byg:block/nightshade/planks", "top": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json index 18e0585f96..34ba326dfe 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/nightshade/planks", "bottom": "byg:block/nightshade/planks", + "side": "byg:block/nightshade/planks", "top": "byg:block/nightshade/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json index 22e27dba8f..5168828ec2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/nightshade/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/nightshade/stripped_log", - "end": "byg:block/nightshade/stripped_log_top" + "end": "byg:block/nightshade/stripped_log_top", + "side": "byg:block/nightshade/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json index 3c31b96165..ec77246343 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/palm/planks", - "up": "byg:block/palm/planks", + "east": "byg:block/palm/bookshelf", "north": "byg:block/palm/bookshelf", + "particle": "byg:block/palm/planks", "south": "byg:block/palm/bookshelf", - "east": "byg:block/palm/bookshelf", - "west": "byg:block/palm/bookshelf", - "particle": "byg:block/palm/planks" + "up": "byg:block/palm/planks", + "west": "byg:block/palm/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json index 341002606a..3ffc15b96f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/palm/planks", - "up": "byg:block/palm/crafting_table_top", + "east": "byg:block/palm/crafting_table_side", "north": "byg:block/palm/crafting_table_front", + "particle": "byg:block/palm/crafting_table_front", "south": "byg:block/palm/crafting_table_side", - "east": "byg:block/palm/crafting_table_side", - "west": "byg:block/palm/crafting_table_front", - "particle": "byg:block/palm/crafting_table_front" + "up": "byg:block/palm/crafting_table_top", + "west": "byg:block/palm/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_top.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/palm/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left.json index 9be0b8e20e..e1addcd113 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/palm/door_bottom", "top": "byg:block/palm/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left_open.json new file mode 100644 index 0000000000..3d970e28fa --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right.json similarity index 67% rename from Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right.json index 06c175c804..91bdd5acff 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/palm/door_bottom", "top": "byg:block/palm/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right_open.json new file mode 100644 index 0000000000..221e8c3c67 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/palm/door/top_left.json index ae815c0d45..242e270be6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/palm/door_bottom", "top": "byg:block/palm/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_left_open.json new file mode 100644 index 0000000000..469c5e239f --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/palm/door/top_right.json index 493ae97cc4..317f29cc31 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/palm/door_bottom", "top": "byg:block/palm/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_right_open.json new file mode 100644 index 0000000000..54e75741b5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/palm/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/palm/door_bottom", + "top": "byg:block/palm/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence.json index 0d24bb6e0d..87f0b9c8c1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/palm/planks", - "particle": "byg:block/palm/planks" + "particle": "byg:block/palm/planks", + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json index efe13a4256..88e53d01ac 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/palm/planks", - "particle": "byg:block/palm/planks" + "particle": "byg:block/palm/planks", + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json index 1d4e107af4..974a99408b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/palm/planks", - "particle": "byg:block/palm/planks" + "particle": "byg:block/palm/planks", + "texture": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json index 35550b64ea..1f84d74cf2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/palm/leaves_snowy", - "up": "byg:block/palm/leaves_snowy", + "east": "byg:block/palm/leaves_snowy_side", "north": "byg:block/palm/leaves_snowy_side", + "particle": "byg:block/palm/leaves_snowy_side", "south": "byg:block/palm/leaves_snowy_side", - "east": "byg:block/palm/leaves_snowy_side", - "west": "byg:block/palm/leaves_snowy_side", - "particle": "byg:block/palm/leaves_snowy_side" + "up": "byg:block/palm/leaves_snowy", + "west": "byg:block/palm/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/log.json b/Common/src/generated/resources/assets/byg/models/block/palm/log.json index 088ae709f9..cd0a7aba25 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/palm/log", - "end": "byg:block/palm/log_top" + "end": "byg:block/palm/log_top", + "side": "byg:block/palm/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/planks.json b/Common/src/generated/resources/assets/byg/models/block/palm/planks.json index 0725e9297b..de3fffe3ff 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/palm/planks", - "up": "byg:block/palm/planks", + "east": "byg:block/palm/planks", "north": "byg:block/palm/planks", + "particle": "byg:block/palm/planks", "south": "byg:block/palm/planks", - "east": "byg:block/palm/planks", - "west": "byg:block/palm/planks", - "particle": "byg:block/palm/planks" + "up": "byg:block/palm/planks", + "west": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/slab.json b/Common/src/generated/resources/assets/byg/models/block/palm/slab.json index 1b354e0fd7..be8915d67d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/palm/planks", "bottom": "byg:block/palm/planks", + "side": "byg:block/palm/planks", "top": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json index 9ee96e5e19..c58fd8d0ce 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/palm/planks", "bottom": "byg:block/palm/planks", + "side": "byg:block/palm/planks", "top": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json index cc61cd3359..4ff038e59f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/palm/planks", "bottom": "byg:block/palm/planks", + "side": "byg:block/palm/planks", "top": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json index 573c5f681e..f9821ec325 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/palm/planks", "bottom": "byg:block/palm/planks", + "side": "byg:block/palm/planks", "top": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json index c863332415..9013b1a9c9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/palm/planks", "bottom": "byg:block/palm/planks", + "side": "byg:block/palm/planks", "top": "byg:block/palm/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json index 845afc1b32..e8ddec77f0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/palm/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/palm/stripped_log", - "end": "byg:block/palm/stripped_log_top" + "end": "byg:block/palm/stripped_log_top", + "side": "byg:block/palm/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json index 93e8a7c48e..835fa0c6d4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/pine/planks", - "up": "byg:block/pine/planks", + "east": "byg:block/pine/bookshelf", "north": "byg:block/pine/bookshelf", + "particle": "byg:block/pine/planks", "south": "byg:block/pine/bookshelf", - "east": "byg:block/pine/bookshelf", - "west": "byg:block/pine/bookshelf", - "particle": "byg:block/pine/planks" + "up": "byg:block/pine/planks", + "west": "byg:block/pine/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json index a11b3f13ca..329f091a91 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/pine/planks", - "up": "byg:block/pine/crafting_table_top", + "east": "byg:block/pine/crafting_table_side", "north": "byg:block/pine/crafting_table_front", + "particle": "byg:block/pine/crafting_table_front", "south": "byg:block/pine/crafting_table_side", - "east": "byg:block/pine/crafting_table_side", - "west": "byg:block/pine/crafting_table_front", - "particle": "byg:block/pine/crafting_table_front" + "up": "byg:block/pine/crafting_table_top", + "west": "byg:block/pine/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_top.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/pine/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left.json index 12f9af552a..cec5c0ce97 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/pine/door_bottom", "top": "byg:block/pine/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left_open.json new file mode 100644 index 0000000000..f2afe6f51d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right.json similarity index 67% rename from Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right.json index 65d5d35cda..38466909cc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/pine/door_bottom", "top": "byg:block/pine/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right_open.json new file mode 100644 index 0000000000..2173ad614d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/pine/door/top_left.json index d78fd13811..0348a473ba 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/pine/door_bottom", "top": "byg:block/pine/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_left_open.json new file mode 100644 index 0000000000..ddf69c4e5c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/pine/door/top_right.json index a3e8daa0e8..9632d85299 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/pine/door_bottom", "top": "byg:block/pine/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_right_open.json new file mode 100644 index 0000000000..8dfa3a7c76 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/pine/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/pine/door_bottom", + "top": "byg:block/pine/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence.json index 42cdbb87e2..70cf0d4823 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/pine/planks", - "particle": "byg:block/pine/planks" + "particle": "byg:block/pine/planks", + "texture": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json index 2e21aeb901..6b804d962c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/pine/planks", - "particle": "byg:block/pine/planks" + "particle": "byg:block/pine/planks", + "texture": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json index c5e23d2562..b4fd1deeeb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/pine/planks", - "particle": "byg:block/pine/planks" + "particle": "byg:block/pine/planks", + "texture": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json index 4b45a43508..81bd9c1381 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/pine/leaves_snowy", - "up": "byg:block/pine/leaves_snowy", + "east": "byg:block/pine/leaves_snowy_side", "north": "byg:block/pine/leaves_snowy_side", + "particle": "byg:block/pine/leaves_snowy_side", "south": "byg:block/pine/leaves_snowy_side", - "east": "byg:block/pine/leaves_snowy_side", - "west": "byg:block/pine/leaves_snowy_side", - "particle": "byg:block/pine/leaves_snowy_side" + "up": "byg:block/pine/leaves_snowy", + "west": "byg:block/pine/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/log.json b/Common/src/generated/resources/assets/byg/models/block/pine/log.json index 5d0b3d7034..4c90197ff4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/pine/log", - "end": "byg:block/pine/log_top" + "end": "byg:block/pine/log_top", + "side": "byg:block/pine/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/planks.json b/Common/src/generated/resources/assets/byg/models/block/pine/planks.json index 68b3815bfd..62f7c6e771 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/pine/planks", - "up": "byg:block/pine/planks", + "east": "byg:block/pine/planks", "north": "byg:block/pine/planks", + "particle": "byg:block/pine/planks", "south": "byg:block/pine/planks", - "east": "byg:block/pine/planks", - "west": "byg:block/pine/planks", - "particle": "byg:block/pine/planks" + "up": "byg:block/pine/planks", + "west": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/slab.json b/Common/src/generated/resources/assets/byg/models/block/pine/slab.json index dcab917ee5..bc5311482e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/pine/planks", "bottom": "byg:block/pine/planks", + "side": "byg:block/pine/planks", "top": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json index 927ec51989..ff34dc770d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/pine/planks", "bottom": "byg:block/pine/planks", + "side": "byg:block/pine/planks", "top": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json index 799716f1f2..648e3b1d3d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/pine/planks", "bottom": "byg:block/pine/planks", + "side": "byg:block/pine/planks", "top": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json index acfb0e2af7..d26ea93386 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/pine/planks", "bottom": "byg:block/pine/planks", + "side": "byg:block/pine/planks", "top": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json index df54aa6a97..780105ed19 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/pine/planks", "bottom": "byg:block/pine/planks", + "side": "byg:block/pine/planks", "top": "byg:block/pine/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json index 64399d4546..8766285a14 100644 --- a/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/pine/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/pine/stripped_log", - "end": "byg:block/pine/stripped_log_top" + "end": "byg:block/pine/stripped_log_top", + "side": "byg:block/pine/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json index 24469add33..674eb79283 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/rainbow_eucalyptus/planks", - "up": "byg:block/rainbow_eucalyptus/planks", + "east": "byg:block/rainbow_eucalyptus/bookshelf", "north": "byg:block/rainbow_eucalyptus/bookshelf", + "particle": "byg:block/rainbow_eucalyptus/planks", "south": "byg:block/rainbow_eucalyptus/bookshelf", - "east": "byg:block/rainbow_eucalyptus/bookshelf", - "west": "byg:block/rainbow_eucalyptus/bookshelf", - "particle": "byg:block/rainbow_eucalyptus/planks" + "up": "byg:block/rainbow_eucalyptus/planks", + "west": "byg:block/rainbow_eucalyptus/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json index 08b8385b80..03ce4827e6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/rainbow_eucalyptus/planks", - "up": "byg:block/rainbow_eucalyptus/crafting_table_top", + "east": "byg:block/rainbow_eucalyptus/crafting_table_side", "north": "byg:block/rainbow_eucalyptus/crafting_table_front", + "particle": "byg:block/rainbow_eucalyptus/crafting_table_front", "south": "byg:block/rainbow_eucalyptus/crafting_table_side", - "east": "byg:block/rainbow_eucalyptus/crafting_table_side", - "west": "byg:block/rainbow_eucalyptus/crafting_table_front", - "particle": "byg:block/rainbow_eucalyptus/crafting_table_front" + "up": "byg:block/rainbow_eucalyptus/crafting_table_top", + "west": "byg:block/rainbow_eucalyptus/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left.json similarity index 73% rename from Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left.json index 7e5bfd9616..c7e299b3ee 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/rainbow_eucalyptus/door_bottom", "top": "byg:block/rainbow_eucalyptus/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left_open.json new file mode 100644 index 0000000000..5ade43adaf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right.json index 8afed4ece7..b4a9c675ff 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/rainbow_eucalyptus/door_bottom", "top": "byg:block/rainbow_eucalyptus/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right_open.json new file mode 100644 index 0000000000..bdeeb792f3 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left.json similarity index 74% rename from Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left.json index 3f939d2a5b..9971e2de27 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/rainbow_eucalyptus/door_bottom", "top": "byg:block/rainbow_eucalyptus/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left_open.json new file mode 100644 index 0000000000..42121342c5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right.json similarity index 74% rename from Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right.json index 2644c598c9..c3f7d650e2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/rainbow_eucalyptus/door_bottom", "top": "byg:block/rainbow_eucalyptus/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right_open.json new file mode 100644 index 0000000000..4e49e953e1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/rainbow_eucalyptus/door_bottom", + "top": "byg:block/rainbow_eucalyptus/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json index 542fb94960..80df6eacc6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/rainbow_eucalyptus/planks", - "particle": "byg:block/rainbow_eucalyptus/planks" + "particle": "byg:block/rainbow_eucalyptus/planks", + "texture": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json index 9eedd7693d..9bdbd2e275 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/rainbow_eucalyptus/planks", - "particle": "byg:block/rainbow_eucalyptus/planks" + "particle": "byg:block/rainbow_eucalyptus/planks", + "texture": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json index 4f2e38b7a2..25826ed7ab 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/rainbow_eucalyptus/planks", - "particle": "byg:block/rainbow_eucalyptus/planks" + "particle": "byg:block/rainbow_eucalyptus/planks", + "texture": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json index d617fb3fa9..eb7cec97f5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/rainbow_eucalyptus/leaves_snowy", - "up": "byg:block/rainbow_eucalyptus/leaves_snowy", + "east": "byg:block/rainbow_eucalyptus/leaves_snowy_side", "north": "byg:block/rainbow_eucalyptus/leaves_snowy_side", + "particle": "byg:block/rainbow_eucalyptus/leaves_snowy_side", "south": "byg:block/rainbow_eucalyptus/leaves_snowy_side", - "east": "byg:block/rainbow_eucalyptus/leaves_snowy_side", - "west": "byg:block/rainbow_eucalyptus/leaves_snowy_side", - "particle": "byg:block/rainbow_eucalyptus/leaves_snowy_side" + "up": "byg:block/rainbow_eucalyptus/leaves_snowy", + "west": "byg:block/rainbow_eucalyptus/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json index 94e0faedb8..d77fb4dbf2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/rainbow_eucalyptus/log", - "end": "byg:block/rainbow_eucalyptus/log_top" + "end": "byg:block/rainbow_eucalyptus/log_top", + "side": "byg:block/rainbow_eucalyptus/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json index 051d77fa00..106794761e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/rainbow_eucalyptus/planks", - "up": "byg:block/rainbow_eucalyptus/planks", + "east": "byg:block/rainbow_eucalyptus/planks", "north": "byg:block/rainbow_eucalyptus/planks", + "particle": "byg:block/rainbow_eucalyptus/planks", "south": "byg:block/rainbow_eucalyptus/planks", - "east": "byg:block/rainbow_eucalyptus/planks", - "west": "byg:block/rainbow_eucalyptus/planks", - "particle": "byg:block/rainbow_eucalyptus/planks" + "up": "byg:block/rainbow_eucalyptus/planks", + "west": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json index ef97e4fe38..bb9bb57e4e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/rainbow_eucalyptus/planks", "bottom": "byg:block/rainbow_eucalyptus/planks", + "side": "byg:block/rainbow_eucalyptus/planks", "top": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json index 78da0975c5..077f143fb6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/rainbow_eucalyptus/planks", "bottom": "byg:block/rainbow_eucalyptus/planks", + "side": "byg:block/rainbow_eucalyptus/planks", "top": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json index 6ee764e13c..92d388a29b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/rainbow_eucalyptus/planks", "bottom": "byg:block/rainbow_eucalyptus/planks", + "side": "byg:block/rainbow_eucalyptus/planks", "top": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json index 8b43f5d39c..e90bc0893e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/rainbow_eucalyptus/planks", "bottom": "byg:block/rainbow_eucalyptus/planks", + "side": "byg:block/rainbow_eucalyptus/planks", "top": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json index bb898e96b6..2ff5e8719e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/rainbow_eucalyptus/planks", "bottom": "byg:block/rainbow_eucalyptus/planks", + "side": "byg:block/rainbow_eucalyptus/planks", "top": "byg:block/rainbow_eucalyptus/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json index e0cd626a38..13878713c8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/rainbow_eucalyptus/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/rainbow_eucalyptus/stripped_log", - "end": "byg:block/rainbow_eucalyptus/stripped_log_top" + "end": "byg:block/rainbow_eucalyptus/stripped_log_top", + "side": "byg:block/rainbow_eucalyptus/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json index c7a758ccbc..9cbbe6acb8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/redwood/planks", - "up": "byg:block/redwood/planks", + "east": "byg:block/redwood/bookshelf", "north": "byg:block/redwood/bookshelf", + "particle": "byg:block/redwood/planks", "south": "byg:block/redwood/bookshelf", - "east": "byg:block/redwood/bookshelf", - "west": "byg:block/redwood/bookshelf", - "particle": "byg:block/redwood/planks" + "up": "byg:block/redwood/planks", + "west": "byg:block/redwood/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json index 308edebc54..46f4f6aff4 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/redwood/planks", - "up": "byg:block/redwood/crafting_table_top", + "east": "byg:block/redwood/crafting_table_side", "north": "byg:block/redwood/crafting_table_front", + "particle": "byg:block/redwood/crafting_table_front", "south": "byg:block/redwood/crafting_table_side", - "east": "byg:block/redwood/crafting_table_side", - "west": "byg:block/redwood/crafting_table_front", - "particle": "byg:block/redwood/crafting_table_front" + "up": "byg:block/redwood/crafting_table_top", + "west": "byg:block/redwood/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left.json index 205d9f7176..da4625b20b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/redwood/door_bottom", "top": "byg:block/redwood/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left_open.json new file mode 100644 index 0000000000..36b2cbdb5e --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right.json index 49ddd28714..9731c44796 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/redwood/door_bottom", "top": "byg:block/redwood/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right_open.json new file mode 100644 index 0000000000..040969b945 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left.json index 8924859e74..c66853af9b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/redwood/door_bottom", "top": "byg:block/redwood/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left_open.json new file mode 100644 index 0000000000..cae7700db0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right.json index 0c8e6c8922..970d6b513e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/redwood/door_bottom", "top": "byg:block/redwood/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right_open.json new file mode 100644 index 0000000000..773eda1f17 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/redwood/door_bottom", + "top": "byg:block/redwood/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json index 598b95de8b..9344c03718 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/redwood/planks", - "particle": "byg:block/redwood/planks" + "particle": "byg:block/redwood/planks", + "texture": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json index 2c2e27c2d5..2b81654f5f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/redwood/planks", - "particle": "byg:block/redwood/planks" + "particle": "byg:block/redwood/planks", + "texture": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json index 2bfe6a384e..9827c31743 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/redwood/planks", - "particle": "byg:block/redwood/planks" + "particle": "byg:block/redwood/planks", + "texture": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json index 46247343bb..cafa1f70d9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/redwood/leaves_snowy", - "up": "byg:block/redwood/leaves_snowy", + "east": "byg:block/redwood/leaves_snowy_side", "north": "byg:block/redwood/leaves_snowy_side", + "particle": "byg:block/redwood/leaves_snowy_side", "south": "byg:block/redwood/leaves_snowy_side", - "east": "byg:block/redwood/leaves_snowy_side", - "west": "byg:block/redwood/leaves_snowy_side", - "particle": "byg:block/redwood/leaves_snowy_side" + "up": "byg:block/redwood/leaves_snowy", + "west": "byg:block/redwood/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/log.json b/Common/src/generated/resources/assets/byg/models/block/redwood/log.json index 200c91342f..dd143f06fb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/redwood/log", - "end": "byg:block/redwood/log_top" + "end": "byg:block/redwood/log_top", + "side": "byg:block/redwood/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json b/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json index 99142bf1dd..ae8703d1d7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/redwood/planks", - "up": "byg:block/redwood/planks", + "east": "byg:block/redwood/planks", "north": "byg:block/redwood/planks", + "particle": "byg:block/redwood/planks", "south": "byg:block/redwood/planks", - "east": "byg:block/redwood/planks", - "west": "byg:block/redwood/planks", - "particle": "byg:block/redwood/planks" + "up": "byg:block/redwood/planks", + "west": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json b/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json index 058b159e8b..e10878ab52 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/redwood/planks", "bottom": "byg:block/redwood/planks", + "side": "byg:block/redwood/planks", "top": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json index 3be9a015db..821b44a7dc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/redwood/planks", "bottom": "byg:block/redwood/planks", + "side": "byg:block/redwood/planks", "top": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json index 8a3d3171de..15c588a4ea 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/redwood/planks", "bottom": "byg:block/redwood/planks", + "side": "byg:block/redwood/planks", "top": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json index cea5a3cf0c..fc6e440e5a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/redwood/planks", "bottom": "byg:block/redwood/planks", + "side": "byg:block/redwood/planks", "top": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json index 7065520061..8c14b1eb2f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/redwood/planks", "bottom": "byg:block/redwood/planks", + "side": "byg:block/redwood/planks", "top": "byg:block/redwood/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json index 272fd7ed3d..a529ee9ee9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/redwood/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/redwood/stripped_log", - "end": "byg:block/redwood/stripped_log_top" + "end": "byg:block/redwood/stripped_log_top", + "side": "byg:block/redwood/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json index c2090dcc59..6d8a2e8cf0 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/skyris/planks", - "up": "byg:block/skyris/planks", + "east": "byg:block/skyris/bookshelf", "north": "byg:block/skyris/bookshelf", + "particle": "byg:block/skyris/planks", "south": "byg:block/skyris/bookshelf", - "east": "byg:block/skyris/bookshelf", - "west": "byg:block/skyris/bookshelf", - "particle": "byg:block/skyris/planks" + "up": "byg:block/skyris/planks", + "west": "byg:block/skyris/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json index 2b303bebdc..838cdaf9f5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/skyris/planks", - "up": "byg:block/skyris/crafting_table_top", + "east": "byg:block/skyris/crafting_table_side", "north": "byg:block/skyris/crafting_table_front", + "particle": "byg:block/skyris/crafting_table_front", "south": "byg:block/skyris/crafting_table_side", - "east": "byg:block/skyris/crafting_table_side", - "west": "byg:block/skyris/crafting_table_front", - "particle": "byg:block/skyris/crafting_table_front" + "up": "byg:block/skyris/crafting_table_top", + "west": "byg:block/skyris/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left.json index ba90161c16..86771e799b 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/skyris/door_bottom", "top": "byg:block/skyris/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left_open.json new file mode 100644 index 0000000000..d139781db6 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right.json index e6cdd0017d..d4f09ee18c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/skyris/door_bottom", "top": "byg:block/skyris/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right_open.json new file mode 100644 index 0000000000..47d4f3fec5 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left.json index db00107811..b281eceb66 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/skyris/door_bottom", "top": "byg:block/skyris/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left_open.json new file mode 100644 index 0000000000..9bc44d8404 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right.json index bca6f16da3..3bbc506f34 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/skyris/door_bottom", "top": "byg:block/skyris/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right_open.json new file mode 100644 index 0000000000..98f4bcf17a --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/skyris/door_bottom", + "top": "byg:block/skyris/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json index c9f1dba861..34c2248221 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/skyris/planks", - "particle": "byg:block/skyris/planks" + "particle": "byg:block/skyris/planks", + "texture": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json index af73b203bc..1a2474aafa 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/skyris/planks", - "particle": "byg:block/skyris/planks" + "particle": "byg:block/skyris/planks", + "texture": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json index 861c478d3a..0f81ec91d2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/skyris/planks", - "particle": "byg:block/skyris/planks" + "particle": "byg:block/skyris/planks", + "texture": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json index 8ea7521946..12940738a7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/skyris/leaves_snowy", - "up": "byg:block/skyris/leaves_snowy", + "east": "byg:block/skyris/leaves_snowy_side", "north": "byg:block/skyris/leaves_snowy_side", + "particle": "byg:block/skyris/leaves_snowy_side", "south": "byg:block/skyris/leaves_snowy_side", - "east": "byg:block/skyris/leaves_snowy_side", - "west": "byg:block/skyris/leaves_snowy_side", - "particle": "byg:block/skyris/leaves_snowy_side" + "up": "byg:block/skyris/leaves_snowy", + "west": "byg:block/skyris/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/log.json b/Common/src/generated/resources/assets/byg/models/block/skyris/log.json index c544f711ac..6f4ce3255f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/skyris/log", - "end": "byg:block/skyris/log_top" + "end": "byg:block/skyris/log_top", + "side": "byg:block/skyris/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json b/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json index 6c748841ac..a5de325205 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/skyris/planks", - "up": "byg:block/skyris/planks", + "east": "byg:block/skyris/planks", "north": "byg:block/skyris/planks", + "particle": "byg:block/skyris/planks", "south": "byg:block/skyris/planks", - "east": "byg:block/skyris/planks", - "west": "byg:block/skyris/planks", - "particle": "byg:block/skyris/planks" + "up": "byg:block/skyris/planks", + "west": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json b/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json index c5753bed4f..d060190d8c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/skyris/planks", "bottom": "byg:block/skyris/planks", + "side": "byg:block/skyris/planks", "top": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json index 915aa4f17d..05b4aeb046 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/skyris/planks", "bottom": "byg:block/skyris/planks", + "side": "byg:block/skyris/planks", "top": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json index 824150b6ff..ef4ec7bd30 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/skyris/planks", "bottom": "byg:block/skyris/planks", + "side": "byg:block/skyris/planks", "top": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json index efe6964eae..55b9af7652 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/skyris/planks", "bottom": "byg:block/skyris/planks", + "side": "byg:block/skyris/planks", "top": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json index 9405fd47b1..39f3ecad6c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/skyris/planks", "bottom": "byg:block/skyris/planks", + "side": "byg:block/skyris/planks", "top": "byg:block/skyris/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json index 218bfe6512..478a09e916 100644 --- a/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/skyris/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/skyris/stripped_log", - "end": "byg:block/skyris/stripped_log_top" + "end": "byg:block/skyris/stripped_log_top", + "side": "byg:block/skyris/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json index 873eb67eea..ae6765f704 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/sythian/planks", - "up": "byg:block/sythian/planks", + "east": "byg:block/sythian/bookshelf", "north": "byg:block/sythian/bookshelf", + "particle": "byg:block/sythian/planks", "south": "byg:block/sythian/bookshelf", - "east": "byg:block/sythian/bookshelf", - "west": "byg:block/sythian/bookshelf", - "particle": "byg:block/sythian/planks" + "up": "byg:block/sythian/planks", + "west": "byg:block/sythian/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json index f3d20e2fe1..e74131fec6 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/sythian/planks", - "up": "byg:block/sythian/crafting_table_top", + "east": "byg:block/sythian/crafting_table_side", "north": "byg:block/sythian/crafting_table_front", + "particle": "byg:block/sythian/crafting_table_front", "south": "byg:block/sythian/crafting_table_side", - "east": "byg:block/sythian/crafting_table_side", - "west": "byg:block/sythian/crafting_table_front", - "particle": "byg:block/sythian/crafting_table_front" + "up": "byg:block/sythian/crafting_table_top", + "west": "byg:block/sythian/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left.json index 822f4a0ef2..6193c68778 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/sythian/door_bottom", "top": "byg:block/sythian/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left_open.json new file mode 100644 index 0000000000..c1f29930ff --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right.json index 1989b45039..b49502ce80 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/sythian/door_bottom", "top": "byg:block/sythian/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right_open.json new file mode 100644 index 0000000000..48f7392c0d --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left.json index ae74f92ea0..88d2db2b04 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/sythian/door_bottom", "top": "byg:block/sythian/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left_open.json new file mode 100644 index 0000000000..2d5b080daf --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right.json index 99758f4026..cb678c6c64 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/sythian/door_bottom", "top": "byg:block/sythian/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right_open.json new file mode 100644 index 0000000000..ef6b3e9792 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/sythian/door_bottom", + "top": "byg:block/sythian/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json index 33e9b4c425..c8447086a1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/sythian/planks", - "particle": "byg:block/sythian/planks" + "particle": "byg:block/sythian/planks", + "texture": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json index 8145883256..09b99420cc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/sythian/planks", - "particle": "byg:block/sythian/planks" + "particle": "byg:block/sythian/planks", + "texture": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json index cbeccf36cc..9cc6c306bf 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/sythian/planks", - "particle": "byg:block/sythian/planks" + "particle": "byg:block/sythian/planks", + "texture": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json index 925ac5f2d8..473476cdba 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/sythian/leaves_snowy", - "up": "byg:block/sythian/leaves_snowy", + "east": "byg:block/sythian/leaves_snowy_side", "north": "byg:block/sythian/leaves_snowy_side", + "particle": "byg:block/sythian/leaves_snowy_side", "south": "byg:block/sythian/leaves_snowy_side", - "east": "byg:block/sythian/leaves_snowy_side", - "west": "byg:block/sythian/leaves_snowy_side", - "particle": "byg:block/sythian/leaves_snowy_side" + "up": "byg:block/sythian/leaves_snowy", + "west": "byg:block/sythian/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/log.json b/Common/src/generated/resources/assets/byg/models/block/sythian/log.json index 4936558bb9..bb193036d7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/sythian/log", - "end": "byg:block/sythian/log_top" + "end": "byg:block/sythian/log_top", + "side": "byg:block/sythian/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json b/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json index 158a37510f..16f5ebeab9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/sythian/planks", - "up": "byg:block/sythian/planks", + "east": "byg:block/sythian/planks", "north": "byg:block/sythian/planks", + "particle": "byg:block/sythian/planks", "south": "byg:block/sythian/planks", - "east": "byg:block/sythian/planks", - "west": "byg:block/sythian/planks", - "particle": "byg:block/sythian/planks" + "up": "byg:block/sythian/planks", + "west": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json b/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json index 249aada4e1..8f8728b6fd 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/sythian/planks", "bottom": "byg:block/sythian/planks", + "side": "byg:block/sythian/planks", "top": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json index 29399c1788..92584bac49 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/sythian/planks", "bottom": "byg:block/sythian/planks", + "side": "byg:block/sythian/planks", "top": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json index fa4819a073..139f5abd4a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/sythian/planks", "bottom": "byg:block/sythian/planks", + "side": "byg:block/sythian/planks", "top": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json index 7ddf7af873..54f1bd2ba2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/sythian/planks", "bottom": "byg:block/sythian/planks", + "side": "byg:block/sythian/planks", "top": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json index 4654c09375..f6ffed66e9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/sythian/planks", "bottom": "byg:block/sythian/planks", + "side": "byg:block/sythian/planks", "top": "byg:block/sythian/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json index 959c604bf4..9f5021b795 100644 --- a/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/sythian/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/sythian/stripped_log", - "end": "byg:block/sythian/stripped_log_top" + "end": "byg:block/sythian/stripped_log_top", + "side": "byg:block/sythian/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json index 8fd6acafab..899daa7669 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/willow/planks", - "up": "byg:block/willow/planks", + "east": "byg:block/willow/bookshelf", "north": "byg:block/willow/bookshelf", + "particle": "byg:block/willow/planks", "south": "byg:block/willow/bookshelf", - "east": "byg:block/willow/bookshelf", - "west": "byg:block/willow/bookshelf", - "particle": "byg:block/willow/planks" + "up": "byg:block/willow/planks", + "west": "byg:block/willow/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json index 78edca2df8..539a66096a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/willow/planks", - "up": "byg:block/willow/crafting_table_top", + "east": "byg:block/willow/crafting_table_side", "north": "byg:block/willow/crafting_table_front", + "particle": "byg:block/willow/crafting_table_front", "south": "byg:block/willow/crafting_table_side", - "east": "byg:block/willow/crafting_table_side", - "west": "byg:block/willow/crafting_table_front", - "particle": "byg:block/willow/crafting_table_front" + "up": "byg:block/willow/crafting_table_top", + "west": "byg:block/willow/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_top.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/willow/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left.json index f728ff8b81..18a4cefbbc 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/willow/door_bottom", "top": "byg:block/willow/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left_open.json new file mode 100644 index 0000000000..543336f5ef --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right.json similarity index 68% rename from Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right.json index 8cef307892..c3899e7264 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/willow/door_bottom", "top": "byg:block/willow/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right_open.json new file mode 100644 index 0000000000..56eca086f1 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/willow/door/top_left.json index 18eaba88b5..db1d48e206 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/willow/door_bottom", "top": "byg:block/willow/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_left_open.json new file mode 100644 index 0000000000..4a66adb4a0 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/willow/door/top_right.json index c3e23e77da..ccf4477cf1 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/willow/door_bottom", "top": "byg:block/willow/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_right_open.json new file mode 100644 index 0000000000..5c8ab02d4c --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/willow/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/willow/door_bottom", + "top": "byg:block/willow/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence.json index 9f7bd05e1c..96a33ecf05 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/willow/planks", - "particle": "byg:block/willow/planks" + "particle": "byg:block/willow/planks", + "texture": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json index 4faa0149c2..3d1a1eccab 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/willow/planks", - "particle": "byg:block/willow/planks" + "particle": "byg:block/willow/planks", + "texture": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json index e18ca3927d..730c5d0845 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/willow/planks", - "particle": "byg:block/willow/planks" + "particle": "byg:block/willow/planks", + "texture": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json index f49cee674e..a4378ffde3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves.json @@ -1,55 +1,33 @@ { "parent": "minecraft:block/cube", - "textures": { - "down": "byg:block/willow/leaves", - "up": "byg:block/willow/leaves", - "north": "byg:block/willow/leaves", - "south": "byg:block/willow/leaves", - "east": "byg:block/willow/leaves", - "west": "byg:block/willow/leaves", - "particle": "byg:block/willow/leaves", - "overlay": "byg:block/willow/leaves" - }, "elements": [ { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], "faces": { "down": { - "texture": "#down", - "cullface": "down" + "cullface": "down", + "texture": "#down" }, - "up": { - "texture": "#up", - "cullface": "up" + "east": { + "cullface": "east", + "texture": "#east" }, "north": { - "texture": "#north", - "cullface": "north" + "cullface": "north", + "texture": "#north" }, "south": { - "texture": "#south", - "cullface": "south" + "cullface": "south", + "texture": "#south" }, - "west": { - "texture": "#west", - "cullface": "west" + "up": { + "cullface": "up", + "texture": "#up" }, - "east": { - "texture": "#east", - "cullface": "east" + "west": { + "cullface": "west", + "texture": "#west" } - } - }, - { + }, "from": [ 0, 0, @@ -59,39 +37,61 @@ 16, 16, 16 - ], + ] + }, + { "faces": { "down": { - "texture": "#down", "cullface": "down", + "texture": "#down", "tintindex": 1 }, - "up": { - "texture": "#up", - "cullface": "up", + "east": { + "cullface": "east", + "texture": "#east", "tintindex": 1 }, "north": { - "texture": "#north", "cullface": "north", + "texture": "#north", "tintindex": 1 }, "south": { - "texture": "#south", "cullface": "south", + "texture": "#south", "tintindex": 1 }, - "west": { - "texture": "#west", - "cullface": "west", + "up": { + "cullface": "up", + "texture": "#up", "tintindex": 1 }, - "east": { - "texture": "#east", - "cullface": "east", + "west": { + "cullface": "west", + "texture": "#west", "tintindex": 1 } - } + }, + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ] } - ] + ], + "textures": { + "down": "byg:block/willow/leaves", + "east": "byg:block/willow/leaves", + "north": "byg:block/willow/leaves", + "overlay": "byg:block/willow/leaves", + "particle": "byg:block/willow/leaves", + "south": "byg:block/willow/leaves", + "up": "byg:block/willow/leaves", + "west": "byg:block/willow/leaves" + } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json index 90e1ca20cd..323f17b9b9 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/willow/leaves_snowy", - "up": "byg:block/willow/leaves_snowy", + "east": "byg:block/willow/leaves_snowy_side", "north": "byg:block/willow/leaves_snowy_side", + "particle": "byg:block/willow/leaves_snowy_side", "south": "byg:block/willow/leaves_snowy_side", - "east": "byg:block/willow/leaves_snowy_side", - "west": "byg:block/willow/leaves_snowy_side", - "particle": "byg:block/willow/leaves_snowy_side" + "up": "byg:block/willow/leaves_snowy", + "west": "byg:block/willow/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/log.json b/Common/src/generated/resources/assets/byg/models/block/willow/log.json index 16663213b5..ca906dec0c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/willow/log", - "end": "byg:block/willow/log_top" + "end": "byg:block/willow/log_top", + "side": "byg:block/willow/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/planks.json b/Common/src/generated/resources/assets/byg/models/block/willow/planks.json index 0fd02bc430..7e6febd10c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/willow/planks", - "up": "byg:block/willow/planks", + "east": "byg:block/willow/planks", "north": "byg:block/willow/planks", + "particle": "byg:block/willow/planks", "south": "byg:block/willow/planks", - "east": "byg:block/willow/planks", - "west": "byg:block/willow/planks", - "particle": "byg:block/willow/planks" + "up": "byg:block/willow/planks", + "west": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/slab.json b/Common/src/generated/resources/assets/byg/models/block/willow/slab.json index dfe2825f8a..a79d477988 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/willow/planks", "bottom": "byg:block/willow/planks", + "side": "byg:block/willow/planks", "top": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json index e2c85b3357..555ec4f1be 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/willow/planks", "bottom": "byg:block/willow/planks", + "side": "byg:block/willow/planks", "top": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json index 1e398a28e0..449aeded68 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/willow/planks", "bottom": "byg:block/willow/planks", + "side": "byg:block/willow/planks", "top": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json index 6722d14a26..3f8048e941 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/willow/planks", "bottom": "byg:block/willow/planks", + "side": "byg:block/willow/planks", "top": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json index 646905884a..1c9b73e22f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/willow/planks", "bottom": "byg:block/willow/planks", + "side": "byg:block/willow/planks", "top": "byg:block/willow/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json index 3c5b5028ec..39194954fa 100644 --- a/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/willow/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/willow/stripped_log", - "end": "byg:block/willow/stripped_log_top" + "end": "byg:block/willow/stripped_log_top", + "side": "byg:block/willow/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json index ff78397eab..5abd220220 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/witch_hazel/planks", - "up": "byg:block/witch_hazel/planks", + "east": "byg:block/witch_hazel/bookshelf", "north": "byg:block/witch_hazel/bookshelf", + "particle": "byg:block/witch_hazel/planks", "south": "byg:block/witch_hazel/bookshelf", - "east": "byg:block/witch_hazel/bookshelf", - "west": "byg:block/witch_hazel/bookshelf", - "particle": "byg:block/witch_hazel/planks" + "up": "byg:block/witch_hazel/planks", + "west": "byg:block/witch_hazel/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json index 200354e350..bbe373a543 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/witch_hazel/planks", - "up": "byg:block/witch_hazel/crafting_table_top", + "east": "byg:block/witch_hazel/crafting_table_side", "north": "byg:block/witch_hazel/crafting_table_front", + "particle": "byg:block/witch_hazel/crafting_table_front", "south": "byg:block/witch_hazel/crafting_table_side", - "east": "byg:block/witch_hazel/crafting_table_side", - "west": "byg:block/witch_hazel/crafting_table_front", - "particle": "byg:block/witch_hazel/crafting_table_front" + "up": "byg:block/witch_hazel/crafting_table_top", + "west": "byg:block/witch_hazel/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left.json index 7f683b511f..2eecb336cb 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/witch_hazel/door_bottom", "top": "byg:block/witch_hazel/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left_open.json new file mode 100644 index 0000000000..6b548dfc30 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right.json index 2ac692ff01..4a27a27480 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/witch_hazel/door_bottom", "top": "byg:block/witch_hazel/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right_open.json new file mode 100644 index 0000000000..7e86960751 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left.json similarity index 72% rename from Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left.json index 70bd162243..5f7406bb53 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/witch_hazel/door_bottom", "top": "byg:block/witch_hazel/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left_open.json new file mode 100644 index 0000000000..2672f92414 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right.json similarity index 71% rename from Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right.json index e78f9974e4..e61050355e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/witch_hazel/door_bottom", "top": "byg:block/witch_hazel/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right_open.json new file mode 100644 index 0000000000..8dfae5da52 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/witch_hazel/door_bottom", + "top": "byg:block/witch_hazel/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json index a6c4edfffa..a173af8ee7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/witch_hazel/planks", - "particle": "byg:block/witch_hazel/planks" + "particle": "byg:block/witch_hazel/planks", + "texture": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json index 776bb0207c..f149349755 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/witch_hazel/planks", - "particle": "byg:block/witch_hazel/planks" + "particle": "byg:block/witch_hazel/planks", + "texture": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json index 48ceadc0d8..ce711ec798 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/witch_hazel/planks", - "particle": "byg:block/witch_hazel/planks" + "particle": "byg:block/witch_hazel/planks", + "texture": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json index b5d8dd0884..247ef5d474 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/witch_hazel/leaves_snowy", - "up": "byg:block/witch_hazel/leaves_snowy", + "east": "byg:block/witch_hazel/leaves_snowy_side", "north": "byg:block/witch_hazel/leaves_snowy_side", + "particle": "byg:block/witch_hazel/leaves_snowy_side", "south": "byg:block/witch_hazel/leaves_snowy_side", - "east": "byg:block/witch_hazel/leaves_snowy_side", - "west": "byg:block/witch_hazel/leaves_snowy_side", - "particle": "byg:block/witch_hazel/leaves_snowy_side" + "up": "byg:block/witch_hazel/leaves_snowy", + "west": "byg:block/witch_hazel/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json index e4a9326182..be153a0477 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/witch_hazel/log", - "end": "byg:block/witch_hazel/log_top" + "end": "byg:block/witch_hazel/log_top", + "side": "byg:block/witch_hazel/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json index 9096b30f78..0ca211a9b8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/witch_hazel/planks", - "up": "byg:block/witch_hazel/planks", + "east": "byg:block/witch_hazel/planks", "north": "byg:block/witch_hazel/planks", + "particle": "byg:block/witch_hazel/planks", "south": "byg:block/witch_hazel/planks", - "east": "byg:block/witch_hazel/planks", - "west": "byg:block/witch_hazel/planks", - "particle": "byg:block/witch_hazel/planks" + "up": "byg:block/witch_hazel/planks", + "west": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json index bdc5dacfc4..35b7cc63f3 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/witch_hazel/planks", "bottom": "byg:block/witch_hazel/planks", + "side": "byg:block/witch_hazel/planks", "top": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json index 534c581650..030a0cb3b7 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/witch_hazel/planks", "bottom": "byg:block/witch_hazel/planks", + "side": "byg:block/witch_hazel/planks", "top": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json index 05e923955d..bfbcfb32be 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/witch_hazel/planks", "bottom": "byg:block/witch_hazel/planks", + "side": "byg:block/witch_hazel/planks", "top": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json index b12f7ea303..0ece46dda5 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/witch_hazel/planks", "bottom": "byg:block/witch_hazel/planks", + "side": "byg:block/witch_hazel/planks", "top": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json index 42e0427975..232c424030 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/witch_hazel/planks", "bottom": "byg:block/witch_hazel/planks", + "side": "byg:block/witch_hazel/planks", "top": "byg:block/witch_hazel/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json index 8adbf9987d..eca3fd423f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/witch_hazel/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/witch_hazel/stripped_log", - "end": "byg:block/witch_hazel/stripped_log_top" + "end": "byg:block/witch_hazel/stripped_log_top", + "side": "byg:block/witch_hazel/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json index 8a167cd115..1664e11648 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/bookshelf.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/zelkova/planks", - "up": "byg:block/zelkova/planks", + "east": "byg:block/zelkova/bookshelf", "north": "byg:block/zelkova/bookshelf", + "particle": "byg:block/zelkova/planks", "south": "byg:block/zelkova/bookshelf", - "east": "byg:block/zelkova/bookshelf", - "west": "byg:block/zelkova/bookshelf", - "particle": "byg:block/zelkova/planks" + "up": "byg:block/zelkova/planks", + "west": "byg:block/zelkova/bookshelf" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json index c7ce314b91..2cbf35f479 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/crafting_table.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/zelkova/planks", - "up": "byg:block/zelkova/crafting_table_top", + "east": "byg:block/zelkova/crafting_table_side", "north": "byg:block/zelkova/crafting_table_front", + "particle": "byg:block/zelkova/crafting_table_front", "south": "byg:block/zelkova/crafting_table_side", - "east": "byg:block/zelkova/crafting_table_side", - "west": "byg:block/zelkova/crafting_table_front", - "particle": "byg:block/zelkova/crafting_table_front" + "up": "byg:block/zelkova/crafting_table_top", + "west": "byg:block/zelkova/crafting_table_front" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json rename to Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left.json index 2f179d86a3..579f5feb81 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/door_bottom_left", "textures": { "bottom": "byg:block/zelkova/door_bottom", "top": "byg:block/zelkova/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left_open.json new file mode 100644 index 0000000000..544d5066b2 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right.json similarity index 69% rename from Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right.json index 4acf1db9ce..102ea3db7e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_top_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/door_bottom_right", "textures": { "bottom": "byg:block/zelkova/door_bottom", "top": "byg:block/zelkova/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right_open.json new file mode 100644 index 0000000000..f9e1453a67 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json rename to Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left.json index 1fe9eeeeb4..422accf79c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/door_top_left", "textures": { "bottom": "byg:block/zelkova/door_bottom", "top": "byg:block/zelkova/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left_open.json new file mode 100644 index 0000000000..d58fb38206 --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right.json similarity index 70% rename from Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json rename to Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right.json index 2f83cb41cf..152283bac8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/door_bottom_hinge.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/door_top_right", "textures": { "bottom": "byg:block/zelkova/door_bottom", "top": "byg:block/zelkova/door_top" diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right_open.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right_open.json new file mode 100644 index 0000000000..0cb817ef8b --- /dev/null +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/door/top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "byg:block/zelkova/door_bottom", + "top": "byg:block/zelkova/door_top" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json index 92bedf42b1..e1b0e3603c 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "byg:block/zelkova/planks", - "particle": "byg:block/zelkova/planks" + "particle": "byg:block/zelkova/planks", + "texture": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json index 16104652eb..b9fd227d7e 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_inv.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "byg:block/zelkova/planks", - "particle": "byg:block/zelkova/planks" + "particle": "byg:block/zelkova/planks", + "texture": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json index e953fd47ca..9ce6faee7a 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/fence_post.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "byg:block/zelkova/planks", - "particle": "byg:block/zelkova/planks" + "particle": "byg:block/zelkova/planks", + "texture": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json index ffbda64b32..b9cc1a6857 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/leaves_snowy.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/zelkova/leaves_snowy", - "up": "byg:block/zelkova/leaves_snowy", + "east": "byg:block/zelkova/leaves_snowy_side", "north": "byg:block/zelkova/leaves_snowy_side", + "particle": "byg:block/zelkova/leaves_snowy_side", "south": "byg:block/zelkova/leaves_snowy_side", - "east": "byg:block/zelkova/leaves_snowy_side", - "west": "byg:block/zelkova/leaves_snowy_side", - "particle": "byg:block/zelkova/leaves_snowy_side" + "up": "byg:block/zelkova/leaves_snowy", + "west": "byg:block/zelkova/leaves_snowy_side" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json index 0f02da4b16..0d2e99ddc2 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/zelkova/log", - "end": "byg:block/zelkova/log_top" + "end": "byg:block/zelkova/log_top", + "side": "byg:block/zelkova/log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json index 01da49cbc5..69a74d8842 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/planks.json @@ -2,11 +2,11 @@ "parent": "minecraft:block/cube", "textures": { "down": "byg:block/zelkova/planks", - "up": "byg:block/zelkova/planks", + "east": "byg:block/zelkova/planks", "north": "byg:block/zelkova/planks", + "particle": "byg:block/zelkova/planks", "south": "byg:block/zelkova/planks", - "east": "byg:block/zelkova/planks", - "west": "byg:block/zelkova/planks", - "particle": "byg:block/zelkova/planks" + "up": "byg:block/zelkova/planks", + "west": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json index cf211201a8..f8e0099a63 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "side": "byg:block/zelkova/planks", "bottom": "byg:block/zelkova/planks", + "side": "byg:block/zelkova/planks", "top": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json index 689ac4f333..0f0c114d79 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/slab_top.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab_top", "textures": { - "side": "byg:block/zelkova/planks", "bottom": "byg:block/zelkova/planks", + "side": "byg:block/zelkova/planks", "top": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json index f4527d4b64..936e9bcaa8 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/stairs", "textures": { - "side": "byg:block/zelkova/planks", "bottom": "byg:block/zelkova/planks", + "side": "byg:block/zelkova/planks", "top": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json index 05a90b5ffb..960647816d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/inner_stairs", "textures": { - "side": "byg:block/zelkova/planks", "bottom": "byg:block/zelkova/planks", + "side": "byg:block/zelkova/planks", "top": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json index 66cbaaabfd..6d0af2395f 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/outer_stairs", "textures": { - "side": "byg:block/zelkova/planks", "bottom": "byg:block/zelkova/planks", + "side": "byg:block/zelkova/planks", "top": "byg:block/zelkova/planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json index 0c1964025c..22efd7800d 100644 --- a/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json +++ b/Common/src/generated/resources/assets/byg/models/block/zelkova/stripped_log.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "byg:block/zelkova/stripped_log", - "end": "byg:block/zelkova/stripped_log_top" + "end": "byg:block/zelkova/stripped_log_top", + "side": "byg:block/zelkova/stripped_log" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json index f77288c4f7..75835792a3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_button.json b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json index 40a12adbe4..e3da8e6670 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json index cccbf87fb1..332b90ca41 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json index 7a6af279a7..acbbd50ca4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json index 6278f0810e..b4f1ccc30b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json index 1ad0000bcd..20edb7d292 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_log.json b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json index 03ad517786..688264c703 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json index 6f777ec49f..666fe7cf38 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json index f862a93efb..b8f4478bd9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json index 664597a4a2..8571426302 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json index cd9a808481..8acbd2149d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json index 0599364beb..76f9cb1fc9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json index cb2fa3a269..7904585a8d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/aspen_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json index a33bea422a..c96b514029 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_button.json b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json index 51aafe18f0..3e8b0d0a74 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json index 2acc7acad3..5dcb247d72 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json index 43528b53cf..0c9c271a27 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json index 6877a23b6a..60d2a4aa50 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json index 09a7a1b9ed..5ac5545077 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_log.json b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json index 7082c4a8ec..e883e051e2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json index 9c2aab304f..9ccac2e8a3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json index 1185dd6b8c..cfe86339ed 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json index 3f1966c6ac..30b4a0ca94 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json index 9c74fcb74d..7aa7bffecb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json index 71b3bdc8d0..e58fa65790 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json index 2c7c379f94..481f1deb86 100644 --- a/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/baobab_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json index 3e8869c9d3..5e23abdaae 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json index f29951e9ef..f031b8a46c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json index af2bdfa13e..a4e5d7ae5b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json index 7a973e71d1..ada7981ff2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json index 2e6060bb8c..bda057b905 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json index dc31265e60..e8d27ef47b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json index 012f89edc4..7fa7b3307f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json index fda674d8b7..21076f55ac 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json index 3d3cf79784..0b0566b6a5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json index 72e4212339..bc22f67e6d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json index 2ef79b8da4..23980af134 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json index 8c9774be15..addf82fef9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json index 530dbfe527..a3f916c442 100644 --- a/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/blue_enchanted_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json index d412ffbc33..0f8cbda0ed 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json index 6e79945947..8160cf96f3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json index 3042c119b1..edb5540905 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json index 3eeae02945..6346df3963 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json index a8da00cc0d..cb3e213487 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json index d4ae1e44aa..a94bb514b2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json index 30aa0bffd8..87df068854 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json index e7faffb488..bfbb5ef8f5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json index 41244b078a..b8be5ec27e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json index 9331c166a5..c23a972688 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_stem.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json index 7e6dfdcfc3..acdcbcbffb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json index be5e6d57bb..e545f42993 100644 --- a/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/bulbis_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json index dc2b414e60..afa5116fb1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_button.json b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json index e4d565e663..d25fa669e8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json index 671a9a477b..53f17c9180 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json index d186ea9f0f..a8ae2d8c89 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json index 3701a2cd9b..4c7c16a5b8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_log.json b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json index dc403972aa..ed597047d4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json index 4e008178ed..17be0f7300 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json index 3f07527352..8acd33175d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json index b4ad840f3f..b7f9120d68 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json index ebfd7168a2..cff2a9bd78 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json index 1626303edb..775be68d08 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json index 0664fc3912..a45cf04058 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cherry_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json index dab69ea050..9dac13d3ab 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_button.json b/Common/src/generated/resources/assets/byg/models/item/cika_button.json index 0888fed5d6..f85b624c0d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json index f0de9eeb03..5eef146f2b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json index 1fcdae9869..a299c6b80f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json index f71dcb81ab..c8d7bc89b2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json index 09eebf3b78..01b8fed0c3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_log.json b/Common/src/generated/resources/assets/byg/models/item/cika_log.json index 0a68df2ea1..c32acf1ac3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_planks.json b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json index c444b27318..59cb218e6b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json index 9b6908433c..04b3667fec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_slab.json b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json index f2d27b929e..f2b0ed8c17 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json index 24b60dce9d..575bd6b7bf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json index e74ce48185..316692157c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cika_wood.json b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json index 1d0c9346c5..a660962e73 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cika_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cika_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json index 14bb16319d..0f976b25a5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_button.json b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json index 38cdd81a4d..157799d3f8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json index 15f6825a79..6af26d03ba 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json index c385826391..52f508c5a1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json index 065043ed5f..85ac5e65c0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json index 653eee5dd3..cb547ea0e4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_log.json b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json index 14bcfe0e20..19f9eb4234 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json index bd9d6c288d..6c68d7841e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json index 1b1e02d483..45fb189c96 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json index 7087e21d5f..76c870877b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json index fb826a89cf..0bf5c9498e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json index 5e7cdcfeab..3fde733c3d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json index 721460df40..98bc7118a6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/cypress_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json index eba82f91df..57b2d43849 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_button.json b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json index bb48fa6744..fe629ef54d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json index aa6679ec06..0779a07b67 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json index 538c658dc6..27dbd8f5a3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json index 16978f5baa..0505aa18f5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json index 355dc31eaa..47c66d0e05 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_log.json b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json index baf9a230a4..f924a0aac1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json index f4b08d29fe..009d82d2e6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json index eb5dd202e6..9c42ee09b2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json index 20fc1e36af..e0f38c7acc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json index 0993c21a4e..9a0946ddd1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json index 6917712738..7e97a129ed 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json index 0baefc56ea..d1615984eb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/ebony_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json index a54ca8a48b..5a5c651dfc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_button.json b/Common/src/generated/resources/assets/byg/models/item/embur_button.json index 465065c89a..cc8c1ebc99 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json index 9dd62b0487..4fb16edf54 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fence.json b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json index b654b7759e..c4d7ca87f2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json index acf3a38d69..d4b37a85e9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json index 69c7389da6..648ab1e606 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_hyphae.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json b/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json index dd9e5d79f1..f105b1c3bb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_pedu.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_planks.json b/Common/src/generated/resources/assets/byg/models/item/embur_planks.json index 1000802d14..736700f409 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json index 3de996a694..b77e6af838 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_slab.json b/Common/src/generated/resources/assets/byg/models/item/embur_slab.json index c4cf159915..1b14277b6e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json b/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json index 35746e5f55..04b934887d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json index 88c0f240fe..205437eb9e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/embur_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json index d91ea4eed7..825d72128a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_button.json b/Common/src/generated/resources/assets/byg/models/item/ether_button.json index 4cbaf3137b..386b04f75e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json index 4f6b4a8023..4b4fcafebf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_fence.json b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json index e66f04cb6c..66373dd277 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json index c443e2cdc5..2dc43dba75 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json b/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json index dc6b41faff..3c1c168bce 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_log.json b/Common/src/generated/resources/assets/byg/models/item/ether_log.json index 2cf17c2ec8..938b753bec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_planks.json b/Common/src/generated/resources/assets/byg/models/item/ether_planks.json index e0ab81d41d..64abd4034b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json index a0a8d08a19..f43746f3e3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_slab.json b/Common/src/generated/resources/assets/byg/models/item/ether_slab.json index ab93ee81fb..cef3afdd5a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json b/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json index 8542c99166..092b74937a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json index 610a01ba88..beaf5bc0b5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/ether_wood.json b/Common/src/generated/resources/assets/byg/models/item/ether_wood.json index 05db965c08..4eeabeb7c4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/ether_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/ether_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json index e9e074ac7c..992573022e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_button.json b/Common/src/generated/resources/assets/byg/models/item/fir_button.json index a03d21ffbe..51fa936ff5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json index ad2d4b4421..86bbaded1b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_fence.json b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json index 08a2863dcb..da6f8c9bcc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json index e05201a2f1..aeb9cf0686 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json b/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json index d63c2ac389..73312a0ae0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_log.json b/Common/src/generated/resources/assets/byg/models/item/fir_log.json index 643eec79c2..69215eaabb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_planks.json b/Common/src/generated/resources/assets/byg/models/item/fir_planks.json index b78618eabe..6c4301ffd0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json index 43872420d3..c0eae68596 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_slab.json b/Common/src/generated/resources/assets/byg/models/item/fir_slab.json index 2f06cd77f0..00bd87c611 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json b/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json index 06b1815ac6..d8ecd149f1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json index a789cb00fd..d450c02517 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/fir_wood.json b/Common/src/generated/resources/assets/byg/models/item/fir_wood.json index ed27dd6c85..0bc51c785b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/fir_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/fir_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json index 24456588f4..63a3136ed6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json index 3572995d07..22090e259d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json index 7a278bc3b7..9c8478d7a1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json index 115998f6f7..74a9cb0624 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json index 78d2c162bc..8fe564a2bc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json index 940634709e..77148864b0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json index dd61b0bee3..7bb2bec114 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json index 7a3b6390b9..15277af797 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json index 9715ee55c8..f9e6e6d55f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json index d08f7b99d6..ccc0045fc7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json index f4c1c06a3a..88ba807d52 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json index 5c2622f953..c1b3a8cfae 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json index 60b2c2b18d..6d9664ee50 100644 --- a/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/green_enchanted_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json index f6d4123de3..273d9c8131 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_button.json b/Common/src/generated/resources/assets/byg/models/item/holly_button.json index 370cdf135c..bdba290a95 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json index 73c80c513e..c95b353f66 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_fence.json b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json index 33aadd69e9..53ecd9c3ee 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json index 8955f9f3ac..470b2163bd 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json b/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json index 8c0838733d..cf2cd8d8e0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_log.json b/Common/src/generated/resources/assets/byg/models/item/holly_log.json index b9c0c7f4d7..765e14e5df 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_planks.json b/Common/src/generated/resources/assets/byg/models/item/holly_planks.json index 97619b94af..3c6d5998c1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json index cc24db77e9..35e187e6a2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_slab.json b/Common/src/generated/resources/assets/byg/models/item/holly_slab.json index 6a39ef1705..69b32eb161 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json b/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json index 54f184ff04..6c3d1ffc11 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json index ffdc2d4dca..e7ed919cd6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/holly_wood.json b/Common/src/generated/resources/assets/byg/models/item/holly_wood.json index 27ca3c0988..f38c2be857 100644 --- a/Common/src/generated/resources/assets/byg/models/item/holly_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/holly_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json index a9ca00a6bd..42fd5e7025 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_button.json b/Common/src/generated/resources/assets/byg/models/item/imparius_button.json index 69988fbbc7..b23433789a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json index f703a11eb2..c4863c7567 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json index 204bc76849..ad1576dc14 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json index e2ccdc724b..0e08d2e9e1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json index 9cfea45809..30766a5cb6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_hyphae.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json b/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json index a5611a23c2..5ad5e573fa 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json index 16fb9a56a9..15d01ac86e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json b/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json index dc07575211..6662b09672 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json b/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json index 8dcf0d3d09..55e4e94ec7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json b/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json index cffe8d5add..5584eabf99 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_stem.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json index f59baa2077..0df6173a11 100644 --- a/Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/imparius_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json index ced652fdaf..6c23b6c8d7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json index cdc9f0c9c1..cafdcff830 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json index 437246c3e8..30804969ae 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json index 38f5c66800..28f70139d7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json index 216e23f6dc..9facad7ca7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json index a3d7ccd86c..3a570bac7a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json index a2d6c0616a..05ced77539 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json index 5b280e1360..9bb242f41e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json index 42a07ee85c..5669d40eb0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json index 4a9d963966..28a1d0bb05 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json index 595bb7eff8..7c745122bc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json index cfade325c8..85553f74c9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json b/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json index 816ec126fd..8e21e70e43 100644 --- a/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/jacaranda_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json index a499163a6b..5f5481c7cb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_button.json b/Common/src/generated/resources/assets/byg/models/item/lament_button.json index f64deb8e46..190d4b4e9b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json index fc0aba5b69..f8f42669cf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_fence.json b/Common/src/generated/resources/assets/byg/models/item/lament_fence.json index b57b001eeb..70a0cce1fb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json index 0cef1c8a60..3685e0ca68 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json b/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json index 35a2eac836..fa66afeecb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_log.json b/Common/src/generated/resources/assets/byg/models/item/lament_log.json index ffcb2e4325..2b028bbb7d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_planks.json b/Common/src/generated/resources/assets/byg/models/item/lament_planks.json index 84c8a95758..66b7f0e8c5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json index 91263407c1..2ac7d6ea48 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_slab.json b/Common/src/generated/resources/assets/byg/models/item/lament_slab.json index 8db8c789ed..1040af9d74 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json b/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json index 1b6282d08a..7056de863c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json index 8162089467..3dfc2e3d12 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/lament_wood.json b/Common/src/generated/resources/assets/byg/models/item/lament_wood.json index 04caf44ebb..aa22d1a304 100644 --- a/Common/src/generated/resources/assets/byg/models/item/lament_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/lament_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json index 7b3db2ccae..0d027a9ba0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json index 97d8ce8ca9..123d058542 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json index 57d787bd73..a7641efa4b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json index 6dd77f3a22..69997575ac 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json index eea1255704..bb2aa48b92 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json index 9b0ffe46bc..9b18805a11 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json index fcdcdf806c..b6259490c9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json index 7b2a6dfbd6..c8ffe73738 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json index 9969e2cd4a..cfb50b2688 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json index 40d6b9baf1..e85f20fdd1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json index 869b841b85..8cb5da6d02 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json index e0a463c8c1..7003753a2c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json b/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json index fc3cd9fe65..6bd97f37f1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/mahogany_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json index 7368499583..a82f8a74d8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json index 185e348c52..fc66e60aa6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json index b60b31285b..5246723a8c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json index 161322c4d3..e9917ec679 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json index 307f09b06d..b44e057a24 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json index 88dc475842..84dcf42ee9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json index 977dd87219..e1eb47ffe3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json index d90d8317eb..0149604aee 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json index efcd0e9f7d..bbf76decd1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json index d56178fed9..7586e88384 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json index c37faaa949..4fbd645c54 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json index 209b4c4197..64331a63df 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json b/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json index 2fc1a1c610..8251bb9697 100644 --- a/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/mangrove_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json index 22c837d4a8..44c2da7def 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_button.json b/Common/src/generated/resources/assets/byg/models/item/maple_button.json index f5d4e17c7d..3dfd93af6c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json index e5da8c779b..06356b9a22 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_fence.json b/Common/src/generated/resources/assets/byg/models/item/maple_fence.json index b36e065318..a5446f6fde 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json index b2e9fabf2a..08ca633445 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json b/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json index d42d9f005c..e74fe9c10e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_log.json b/Common/src/generated/resources/assets/byg/models/item/maple_log.json index 363834eeb8..623e8b22cb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_planks.json b/Common/src/generated/resources/assets/byg/models/item/maple_planks.json index 31522b3ded..d3ce017238 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json index 810fe996e8..9290ae4196 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_slab.json b/Common/src/generated/resources/assets/byg/models/item/maple_slab.json index 854317de18..a31715cb99 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json b/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json index 28132525d7..e784f99c71 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json index a6782bc69f..46d80eebd6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/maple_wood.json b/Common/src/generated/resources/assets/byg/models/item/maple_wood.json index f3aeb67fc4..8a462940a8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/maple_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/maple_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json index f6a5c76058..988b4edb73 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json index 4f9be5ea03..dc1d5144b4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json index d045b98fa1..81c1949c39 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json index c473683ad9..9913ddfbc1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json index a2939ebcd3..fe8fdbe861 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json index 55a4f979ab..81277becb2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json index 61400ed16e..75c327d5a3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json index d581d09f4b..6c2b76e926 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json index f95c4bb690..edca4eb344 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json index 2b97cfdc49..4e99cb5368 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json index be2ee68b81..d9f6a1e87e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json index f36ebc5cc6..29df3b593a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json b/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json index 46c407b9ce..11fde72b68 100644 --- a/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/nightshade_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json index c94f2b3301..1a05ecb7bc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_button.json b/Common/src/generated/resources/assets/byg/models/item/palm_button.json index be456d3c7f..e347d666c8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json index 0fe83f5d2f..ecef89d7cf 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_fence.json b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json index 4b2bb055bb..ab4ffaaedb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json index 79af9c2dca..24c3ec8e9b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json b/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json index 105dcdf255..92f82dd473 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_log.json b/Common/src/generated/resources/assets/byg/models/item/palm_log.json index 3ac454ff69..94d2c0d92e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_planks.json b/Common/src/generated/resources/assets/byg/models/item/palm_planks.json index f277157b44..9c68dfef09 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json index 640a383693..b28faa85ca 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_slab.json b/Common/src/generated/resources/assets/byg/models/item/palm_slab.json index 24844dbada..4a846772a1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json b/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json index 2bc43a9d68..a7c9848878 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json index a33cec5271..1f1c61f575 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/palm_wood.json b/Common/src/generated/resources/assets/byg/models/item/palm_wood.json index 4376face0e..b815e7b835 100644 --- a/Common/src/generated/resources/assets/byg/models/item/palm_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/palm_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json index 5effb2f6be..8553f52f0f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_button.json b/Common/src/generated/resources/assets/byg/models/item/pine_button.json index 4aa1435b3e..f7d2554e9d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json index cdc87b4b9d..d79408ad59 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_fence.json b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json index 4a064d92ea..0205c7805d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json index c626704972..52050f2d5a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json b/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json index 0c5e42d8f2..08790a0db7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_log.json b/Common/src/generated/resources/assets/byg/models/item/pine_log.json index 31f577418e..b3834b9913 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_planks.json b/Common/src/generated/resources/assets/byg/models/item/pine_planks.json index 6b49f59260..43d69cae85 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json index 590e2947bc..54209ef521 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_slab.json b/Common/src/generated/resources/assets/byg/models/item/pine_slab.json index b8663860f2..a41f6bc8b6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json b/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json index ef282a6957..644a12068f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json index 7e91f1fa18..968879b179 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/pine_wood.json b/Common/src/generated/resources/assets/byg/models/item/pine_wood.json index 264dcb2669..fb029377f7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/pine_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/pine_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json index 77a983da53..5237031073 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json index 34d7eec59b..597382f022 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json index 48554a5cbb..c1bc5f7d41 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json index a375e27dd6..a8e38d7b21 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json index a871d2fe39..36cd0439d9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json index 9d68f8f141..e44633be43 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json index 15c4465fa0..9ec6b51656 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json index c0cfd7cde0..c3820d6a0f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json index 4974cac46c..63585644a7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json index c9c44a0913..369184f058 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json index ef5c6c8c38..33c85038bb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json index 3f541f0a4a..d9f5a89ef1 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json index ffd2baaec8..5f832c8a6f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/rainbow_eucalyptus_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json index 5f8a3c2410..5a42346088 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_button.json b/Common/src/generated/resources/assets/byg/models/item/redwood_button.json index ceae0042b5..3e444addc9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json index 1d77cb2d03..0d25e1d261 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json index 8d99ae5623..39f84f8548 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json index d0eebf4c81..a871142a84 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json b/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json index edb18769c6..680e8e2665 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_log.json b/Common/src/generated/resources/assets/byg/models/item/redwood_log.json index ea149118e4..0fbc836f94 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json b/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json index b5a4b0469f..9f6281c0e6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json index 9ccd3cfb93..cf63de2d23 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json b/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json index 6aa423ba2b..75405f90ee 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json b/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json index 7a98754d54..4cd08645bc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json index fdda7e8b9b..ea8f4ca81a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json b/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json index 5abc2b4b84..569443f864 100644 --- a/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/redwood_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json index 2f0d487b64..2a290b5bf0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_button.json b/Common/src/generated/resources/assets/byg/models/item/skyris_button.json index 8d1802b883..0fb9abbaf2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json index b7168ca0ce..68e6cea4ca 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json b/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json index 50d8d1f396..fc3bbe4b01 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json index 5e5104bae7..39ffd1216c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json b/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json index 12005777e6..aefee2a179 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_log.json b/Common/src/generated/resources/assets/byg/models/item/skyris_log.json index 31d1239ff9..ac7b747bb5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json b/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json index 23e5e8168a..a66ab958f0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json index 7d9ce4d210..ab9c14d108 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json b/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json index d804856962..c5eec59b20 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json b/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json index 92f562d855..f6f4a2eeec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json index 8266909237..89895dcc12 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json b/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json index b49d9df8e3..8b64b829b0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/skyris_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json index 0417414b75..c6e819bb4d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json index c8e66c6c4a..c90e3e6e49 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_aspen_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json index 705c12695b..48fbda1b58 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json index d508cda023..0f2a4a5411 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_baobab_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json index d870481eea..df304cad08 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json index 4b9f93fe42..2060ef541f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_blue_enchanted_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json index 826211b610..e24477b67a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_stem.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json index ee5932aea4..00ed327b18 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_bulbis_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json index 01d4fdbbc0..d0b6096836 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json index 18b1a24481..a695b41757 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cherry_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json index da5e5be297..b5db1ec7b4 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json index 47cf97e808..6b341341ac 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cika_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json index d472bf66b7..108f64cd8e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json index b4f699f58e..70cd806448 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_cypress_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json index 2b11166316..0f9eae0f89 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json index 3455b6a854..2c0c965511 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ebony_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json index 080c3176dd..1b5bb5922d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_hyphae.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json index fef57e4d2b..37f933dba8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_embur_pedu.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json index 709d7411f7..157e9d657e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json index a5bbccb089..4bbdc3791d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_ether_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json index b5243793b3..bec99ccec0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json index 204d16ac82..656728cc53 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_fir_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json index 7dfa1f0fec..0d1975254d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json index 15eec313c2..5caa55d082 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_green_enchanted_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json index 953501299b..e14149314c 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json index acda624e84..cecf92b3ab 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_holly_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json index 6e4a814388..b2cde51059 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json index 07987c1bc1..0888c8d40e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_jacaranda_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json index ff7188eab5..7d1caec185 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json index ef631077ff..749afd6889 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_lament_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json index cd0001916b..fa598bd92a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json index 2ac7e1ce3d..e4b518159b 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mahogany_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json index 9eef9caf77..3ea40897ac 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json index 23a0687efe..98bbada5cb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_mangrove_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json index b440216898..30d6697dd3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json index caf3357b97..62b21d570a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_maple_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json index d78a85d0ec..cbfd1a46cd 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json index 347bfecba4..4ec16c46da 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_nightshade_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json index a15f460520..2fc3fa3c93 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json index bf0cad9d27..0a2ac7186d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_palm_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json index 896d9d1ac3..b07097a06e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json index d6dacfed88..8e01c15140 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_pine_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json index ea7554a96c..be7ae6c3c2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json index 1098402c0f..7ac78f9cbb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_rainbow_eucalyptus_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json index 2cef11fe22..4b2db8001a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json index db3f09e224..4f6237639e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_redwood_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json index 9efdb9f34f..a244560998 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json index 52ed670c3b..26265c0f74 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_skyris_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json index 10308970ff..10dfce7043 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_hyphae.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json index d4246b6a83..4d5bdd7cf8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_sythian_stem.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json index 88523cc265..b123708aa3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json index 509377122d..95ee7d39cc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_willow_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json index 1c7b751f53..4024a62149 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json index 58acbe2a99..d6fe92f963 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_witch_hazel_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json index b759756e3f..ed0e22218d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json index d3e1aed247..b3dfa9f635 100644 --- a/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/stripped_zelkova_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json index 03281e846a..52ecd5cf95 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_button.json b/Common/src/generated/resources/assets/byg/models/item/sythian_button.json index d71728176b..5216867385 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json index 4f571a9696..283f9cdfa2 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json index f7d79648c4..21272091ff 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json index 91c6c85f64..f1b24300ba 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json b/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json index 2067d49dc8..f6ec960944 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_hyphae.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json b/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json index 02261b7a60..60ca742633 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json index 5c892ee155..a22a5b60eb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json b/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json index b62a0efdf7..7adbc8c72e 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json b/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json index 52f191196a..df84cbceb5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json b/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json index 7f0ac72f28..dc07f6301d 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_stem.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json index 77637bc791..445d346045 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json b/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json index 59fcfb23c8..c4b7e38c92 100644 --- a/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json +++ b/Common/src/generated/resources/assets/byg/models/item/sythian_wart_block.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json index f6794713da..ba5978e002 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_button.json b/Common/src/generated/resources/assets/byg/models/item/willow_button.json index 64c7cebf97..3c6c51900f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json index fe564b8888..806cc322a7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_fence.json b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json index 86761239a3..83a44aedbd 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json index 6a82965db6..df26ecf295 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json b/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json index 4ede1fc275..2a50373fa9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_log.json b/Common/src/generated/resources/assets/byg/models/item/willow_log.json index 78c6d57f8e..d05a49f61a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_planks.json b/Common/src/generated/resources/assets/byg/models/item/willow_planks.json index e51d460239..52ca7c2b71 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json index b378980a87..6500d838d3 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_slab.json b/Common/src/generated/resources/assets/byg/models/item/willow_slab.json index 8d8270cec7..d7d05fd644 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json b/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json index 1699295467..f377cc9633 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json index f99225355c..a3c22cff9f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/willow_wood.json b/Common/src/generated/resources/assets/byg/models/item/willow_wood.json index f7dcf6bd24..d75a1f7a93 100644 --- a/Common/src/generated/resources/assets/byg/models/item/willow_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/willow_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json index 0922228d64..3e8c8b8dbc 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json index 6fa84b8b00..33bd2d8e78 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json index 30fa9cd329..313351b762 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json index ad63f6a019..610fcec1c8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json index 20a8b47df4..2f71147f59 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json index 85c3a5fc55..4f2aa73be6 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json index 4a4bef629c..75c76817ec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json index 5d74db9688..e808518980 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json index e0a00602d3..140dc49c76 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json index b0b86dd705..ca38174472 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json index 4fcb5939d6..db8f0f8912 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json index 87f44a2432..465f9e56bb 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json index 2c865b896b..d5753d4432 100644 --- a/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/witch_hazel_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json index b4c9423551..a27f5580f7 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_bookshelf.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json index 5cbbb7167f..6a8d029c0f 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_button.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json index 3c4f2b20cd..9439cd23d9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_crafting_table.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json index 3411bb571b..a3f1537d2a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json index 4b45755c3f..6feb59e6a9 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_fence_gate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json index 256537239a..1f73cf3f51 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_leaves.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json index 13854b78b9..e929223502 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_log.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json index 16c35a3427..a1e1d76e6a 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_planks.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json index 6e6980232e..0800e77d99 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_pressure_plate.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json index 3c01e1853c..9507fe5eec 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_slab.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json index 28c669eaf4..45967c89b0 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_stairs.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json index 0e29b0a9de..def7ae09b5 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_trapdoor.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json b/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json index 1812008b4f..843cf8f6e8 100644 --- a/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json +++ b/Common/src/generated/resources/assets/byg/models/item/zelkova_wood.json @@ -7,15 +7,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] }, "thirdperson_righthand": { @@ -24,15 +24,15 @@ -45, 170 ], - "translation": [ - 0, - 1.5, - -2.75 - ], "scale": [ 0.375, 0.375, 0.375 + ], + "translation": [ + 0, + 1.5, + -2.75 ] } } diff --git a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json index 6d81380b1c..91f696de78 100644 --- a/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json +++ b/Common/src/generated/resources/data/byg/advancements/adventure/oh_the_biomes_youll_go.json @@ -1,850 +1,1450 @@ { "parent": "byg:root", - "display": { - "icon": { - "item": "byg:byg_logo" - }, - "title": { - "translate": "byg.advancements.adventure.explore_biomes.title" - }, - "description": { - "translate": "byg.advancements.adventure.explore_biomes.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, - "rewards": { - "experience": 1000 - }, "criteria": { - "byg:borealis_grove": { - "trigger": "minecraft:location", + "byg:allium_fields": { "conditions": { - "location": { - "biome": "byg:borealis_grove" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:allium_fields" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:prairie": { - "trigger": "minecraft:location", + "byg:amaranth_fields": { "conditions": { - "location": { - "biome": "byg:prairie" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:amaranth_fields" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:baobab_savanna": { - "trigger": "minecraft:location", + "byg:araucaria_savanna": { "conditions": { - "location": { - "biome": "byg:baobab_savanna" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:araucaria_savanna" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:lush_stacks": { - "trigger": "minecraft:location", + "byg:arisian_undergrowth": { "conditions": { - "location": { - "biome": "byg:lush_stacks" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:arisian_undergrowth" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:shattered_glacier": { - "trigger": "minecraft:location", + "byg:aspen_forest": { "conditions": { - "location": { - "biome": "byg:shattered_glacier" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:aspen_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:red_oak_forest": { - "trigger": "minecraft:location", + "byg:atacama_desert": { "conditions": { - "location": { - "biome": "byg:red_oak_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:atacama_desert" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:jacaranda_forest": { - "trigger": "minecraft:location", + "byg:autumnal_forest": { "conditions": { - "location": { - "biome": "byg:jacaranda_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:autumnal_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:red_rock_valley": { - "trigger": "minecraft:location", + "byg:autumnal_taiga": { "conditions": { - "location": { - "biome": "byg:red_rock_valley" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:autumnal_taiga" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:skyris_vale": { - "trigger": "minecraft:location", + "byg:autumnal_valley": { "conditions": { - "location": { - "biome": "byg:skyris_vale" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:autumnal_valley" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:rainbow_beach": { - "trigger": "minecraft:location", + "byg:baobab_savanna": { "conditions": { - "location": { - "biome": "byg:rainbow_beach" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:baobab_savanna" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:amaranth_fields": { - "trigger": "minecraft:location", + "byg:basalt_barrera": { "conditions": { - "location": { - "biome": "byg:amaranth_fields" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:basalt_barrera" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:dacite_ridges": { - "trigger": "minecraft:location", + "byg:bayou": { "conditions": { - "location": { - "biome": "byg:dacite_ridges" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:bayou" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:redwood_thicket": { - "trigger": "minecraft:location", + "byg:black_forest": { "conditions": { - "location": { - "biome": "byg:redwood_thicket" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:black_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:weeping_witch_forest": { - "trigger": "minecraft:location", + "byg:borealis_grove": { "conditions": { - "location": { - "biome": "byg:weeping_witch_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:borealis_grove" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:dead_sea": { - "trigger": "minecraft:location", + "byg:brimstone_caverns": { "conditions": { - "location": { - "biome": "byg:dead_sea" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:brimstone_caverns" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:autumnal_taiga": { - "trigger": "minecraft:location", + "byg:bulbis_gardens": { "conditions": { - "location": { - "biome": "byg:autumnal_taiga" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:bulbis_gardens" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:ivis_fields": { - "trigger": "minecraft:location", + "byg:canadian_shield": { "conditions": { - "location": { - "biome": "byg:ivis_fields" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:canadian_shield" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:autumnal_forest": { - "trigger": "minecraft:location", + "byg:cardinal_tundra": { "conditions": { - "location": { - "biome": "byg:autumnal_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:cardinal_tundra" + } + } + } + ] + }, + "trigger": "minecraft:location" }, "byg:cherry_blossom_forest": { - "trigger": "minecraft:location", "conditions": { - "location": { - "biome": "byg:cherry_blossom_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:cherry_blossom_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:windswept_beach": { - "trigger": "minecraft:location", + "byg:cika_woods": { "conditions": { - "location": { - "biome": "byg:windswept_beach" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:cika_woods" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:cypress_swamplands": { - "trigger": "minecraft:location", + "byg:coconino_meadow": { "conditions": { - "location": { - "biome": "byg:cypress_swamplands" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:coconino_meadow" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:atacama_desert": { - "trigger": "minecraft:location", + "byg:coniferous_forest": { "conditions": { - "location": { - "biome": "byg:atacama_desert" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:coniferous_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:howling_peaks": { - "trigger": "minecraft:location", + "byg:crag_gardens": { "conditions": { - "location": { - "biome": "byg:howling_peaks" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:crag_gardens" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:dacite_shore": { - "trigger": "minecraft:location", + "byg:crimson_gardens": { "conditions": { - "location": { - "biome": "byg:dacite_shore" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:crimson_gardens" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:cika_woods": { - "trigger": "minecraft:location", + "byg:cryptic_wastes": { "conditions": { - "location": { - "biome": "byg:cika_woods" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:cryptic_wastes" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:wailing_garth": { - "trigger": "minecraft:location", + "byg:cypress_swamplands": { "conditions": { - "location": { - "biome": "byg:wailing_garth" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:cypress_swamplands" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:arisian_undergrowth": { - "trigger": "minecraft:location", + "byg:dacite_ridges": { "conditions": { - "location": { - "biome": "byg:arisian_undergrowth" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:dacite_ridges" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:aspen_forest": { - "trigger": "minecraft:location", + "byg:dacite_shore": { "conditions": { - "location": { - "biome": "byg:aspen_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:dacite_shore" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:canadian_shield": { - "trigger": "minecraft:location", + "byg:dead_sea": { "conditions": { - "location": { - "biome": "byg:canadian_shield" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:dead_sea" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:crag_gardens": { - "trigger": "minecraft:location", + "byg:ebony_woods": { "conditions": { - "location": { - "biome": "byg:crag_gardens" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:ebony_woods" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:brimstone_caverns": { - "trigger": "minecraft:location", + "byg:embur_bog": { "conditions": { - "location": { - "biome": "byg:brimstone_caverns" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:embur_bog" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:cardinal_tundra": { - "trigger": "minecraft:location", + "byg:ethereal_islands": { "conditions": { - "location": { - "biome": "byg:cardinal_tundra" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:ethereal_islands" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:windswept_desert": { - "trigger": "minecraft:location", + "byg:firecracker_shrubland": { "conditions": { - "location": { - "biome": "byg:windswept_desert" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:firecracker_shrubland" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:frosted_taiga": { - "trigger": "minecraft:location", + "byg:forgotten_forest": { "conditions": { - "location": { - "biome": "byg:frosted_taiga" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:forgotten_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:magma_wastes": { - "trigger": "minecraft:location", + "byg:fragment_forest": { "conditions": { - "location": { - "biome": "byg:magma_wastes" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:fragment_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:white_mangrove_marshes": { - "trigger": "minecraft:location", + "byg:frosted_coniferous_forest": { "conditions": { - "location": { - "biome": "byg:white_mangrove_marshes" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:frosted_coniferous_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:viscal_isles": { - "trigger": "minecraft:location", + "byg:frosted_taiga": { "conditions": { - "location": { - "biome": "byg:viscal_isles" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:frosted_taiga" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:araucaria_savanna": { - "trigger": "minecraft:location", + "byg:glowstone_gardens": { "conditions": { - "location": { - "biome": "byg:araucaria_savanna" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:glowstone_gardens" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:warped_desert": { - "trigger": "minecraft:location", + "byg:guiana_shield": { "conditions": { - "location": { - "biome": "byg:warped_desert" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:guiana_shield" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:autumnal_valley": { - "trigger": "minecraft:location", + "byg:howling_peaks": { "conditions": { - "location": { - "biome": "byg:autumnal_valley" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:howling_peaks" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:sythian_torrids": { - "trigger": "minecraft:location", + "byg:imparius_grove": { "conditions": { - "location": { - "biome": "byg:sythian_torrids" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:imparius_grove" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:black_forest": { - "trigger": "minecraft:location", + "byg:ivis_fields": { "conditions": { - "location": { - "biome": "byg:black_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:ivis_fields" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:imparius_grove": { - "trigger": "minecraft:location", + "byg:jacaranda_forest": { "conditions": { - "location": { - "biome": "byg:imparius_grove" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:jacaranda_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:nightshade_forest": { - "trigger": "minecraft:location", + "byg:lush_stacks": { "conditions": { - "location": { - "biome": "byg:nightshade_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:lush_stacks" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:bayou": { - "trigger": "minecraft:location", + "byg:magma_wastes": { "conditions": { - "location": { - "biome": "byg:bayou" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:magma_wastes" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:subzero_hypogeal": { - "trigger": "minecraft:location", + "byg:maple_taiga": { "conditions": { - "location": { - "biome": "byg:subzero_hypogeal" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:maple_taiga" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:zelkova_forest": { - "trigger": "minecraft:location", + "byg:mojave_desert": { "conditions": { - "location": { - "biome": "byg:zelkova_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:mojave_desert" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:shulkren_forest": { - "trigger": "minecraft:location", + "byg:nightshade_forest": { "conditions": { - "location": { - "biome": "byg:shulkren_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:nightshade_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:basalt_barrera": { - "trigger": "minecraft:location", + "byg:orchard": { "conditions": { - "location": { - "biome": "byg:basalt_barrera" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:orchard" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:tropical_rainforest": { - "trigger": "minecraft:location", + "byg:prairie": { "conditions": { - "location": { - "biome": "byg:tropical_rainforest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:prairie" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:ethereal_islands": { - "trigger": "minecraft:location", + "byg:quartz_desert": { "conditions": { - "location": { - "biome": "byg:ethereal_islands" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:quartz_desert" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:coconino_meadow": { - "trigger": "minecraft:location", + "byg:rainbow_beach": { "conditions": { - "location": { - "biome": "byg:coconino_meadow" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:rainbow_beach" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:firecracker_shrubland": { - "trigger": "minecraft:location", + "byg:red_oak_forest": { "conditions": { - "location": { - "biome": "byg:firecracker_shrubland" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:red_oak_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:guiana_shield": { - "trigger": "minecraft:location", + "byg:red_rock_valley": { "conditions": { - "location": { - "biome": "byg:guiana_shield" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:red_rock_valley" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:orchard": { - "trigger": "minecraft:location", + "byg:redwood_thicket": { "conditions": { - "location": { - "biome": "byg:orchard" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:redwood_thicket" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:glowstone_gardens": { - "trigger": "minecraft:location", + "byg:rose_fields": { "conditions": { - "location": { - "biome": "byg:glowstone_gardens" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:rose_fields" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:bulbis_gardens": { - "trigger": "minecraft:location", + "byg:shattered_glacier": { "conditions": { - "location": { - "biome": "byg:bulbis_gardens" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:shattered_glacier" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:mojave_desert": { - "trigger": "minecraft:location", + "byg:shulkren_forest": { "conditions": { - "location": { - "biome": "byg:mojave_desert" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:shulkren_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:frosted_coniferous_forest": { - "trigger": "minecraft:location", + "byg:sierra_badlands": { "conditions": { - "location": { - "biome": "byg:frosted_coniferous_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:sierra_badlands" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:weeping_mire": { - "trigger": "minecraft:location", + "byg:skyris_vale": { "conditions": { - "location": { - "biome": "byg:weeping_mire" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:skyris_vale" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:sierra_badlands": { - "trigger": "minecraft:location", + "byg:subzero_hypogeal": { "conditions": { - "location": { - "biome": "byg:sierra_badlands" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:subzero_hypogeal" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:crimson_gardens": { - "trigger": "minecraft:location", + "byg:sythian_torrids": { "conditions": { - "location": { - "biome": "byg:crimson_gardens" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:sythian_torrids" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:rose_fields": { - "trigger": "minecraft:location", + "byg:temperate_grove": { "conditions": { - "location": { - "biome": "byg:rose_fields" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:temperate_grove" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:ebony_woods": { - "trigger": "minecraft:location", + "byg:temperate_rainforest": { "conditions": { - "location": { - "biome": "byg:ebony_woods" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:temperate_rainforest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:temperate_grove": { - "trigger": "minecraft:location", + "byg:tropical_rainforest": { "conditions": { - "location": { - "biome": "byg:temperate_grove" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:tropical_rainforest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, "byg:twilight_meadow": { - "trigger": "minecraft:location", "conditions": { - "location": { - "biome": "byg:twilight_meadow" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:twilight_meadow" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:quartz_desert": { - "trigger": "minecraft:location", + "byg:viscal_isles": { "conditions": { - "location": { - "biome": "byg:quartz_desert" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:viscal_isles" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:embur_bog": { - "trigger": "minecraft:location", + "byg:wailing_garth": { "conditions": { - "location": { - "biome": "byg:embur_bog" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:wailing_garth" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:forgotten_forest": { - "trigger": "minecraft:location", + "byg:warped_desert": { "conditions": { - "location": { - "biome": "byg:forgotten_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:warped_desert" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:coniferous_forest": { - "trigger": "minecraft:location", + "byg:weeping_mire": { "conditions": { - "location": { - "biome": "byg:coniferous_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:weeping_mire" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:temperate_rainforest": { - "trigger": "minecraft:location", + "byg:weeping_witch_forest": { "conditions": { - "location": { - "biome": "byg:temperate_rainforest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:weeping_witch_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:fragment_forest": { - "trigger": "minecraft:location", + "byg:white_mangrove_marshes": { "conditions": { - "location": { - "biome": "byg:fragment_forest" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:white_mangrove_marshes" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:cryptic_wastes": { - "trigger": "minecraft:location", + "byg:windswept_beach": { "conditions": { - "location": { - "biome": "byg:cryptic_wastes" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:windswept_beach" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:maple_taiga": { - "trigger": "minecraft:location", + "byg:windswept_desert": { "conditions": { - "location": { - "biome": "byg:maple_taiga" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:windswept_desert" + } + } + } + ] + }, + "trigger": "minecraft:location" }, - "byg:allium_fields": { - "trigger": "minecraft:location", + "byg:zelkova_forest": { "conditions": { - "location": { - "biome": "byg:allium_fields" - } - } + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "biome": "byg:zelkova_forest" + } + } + } + ] + }, + "trigger": "minecraft:location" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.adventure.explore_biomes.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:byg_logo" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.adventure.explore_biomes.title" } }, "requirements": [ - [ - "byg:borealis_grove" - ], [ "byg:prairie" ], [ - "byg:baobab_savanna" + "byg:crag_gardens" ], [ - "byg:lush_stacks" + "byg:wailing_garth" ], [ - "byg:shattered_glacier" + "byg:aspen_forest" ], [ - "byg:red_oak_forest" + "byg:coniferous_forest" ], [ - "byg:jacaranda_forest" + "byg:dacite_ridges" ], [ - "byg:red_rock_valley" + "byg:arisian_undergrowth" ], [ - "byg:skyris_vale" + "byg:jacaranda_forest" ], [ - "byg:rainbow_beach" + "byg:cardinal_tundra" ], [ - "byg:amaranth_fields" + "byg:white_mangrove_marshes" ], [ - "byg:dacite_ridges" + "byg:guiana_shield" ], [ "byg:redwood_thicket" ], [ - "byg:weeping_witch_forest" + "byg:forgotten_forest" ], [ - "byg:dead_sea" + "byg:windswept_beach" ], [ - "byg:autumnal_taiga" + "byg:weeping_mire" ], [ - "byg:ivis_fields" + "byg:sythian_torrids" ], [ - "byg:autumnal_forest" + "byg:atacama_desert" ], [ - "byg:cherry_blossom_forest" + "byg:borealis_grove" ], [ - "byg:windswept_beach" + "byg:bulbis_gardens" ], [ - "byg:cypress_swamplands" + "byg:lush_stacks" ], [ - "byg:atacama_desert" + "byg:amaranth_fields" ], [ - "byg:howling_peaks" + "byg:crimson_gardens" ], [ - "byg:dacite_shore" + "byg:twilight_meadow" ], [ - "byg:cika_woods" + "byg:ebony_woods" ], [ - "byg:wailing_garth" + "byg:cryptic_wastes" ], [ - "byg:arisian_undergrowth" + "byg:mojave_desert" ], [ - "byg:aspen_forest" + "byg:fragment_forest" ], [ - "byg:canadian_shield" + "byg:skyris_vale" ], [ - "byg:crag_gardens" + "byg:maple_taiga" ], [ - "byg:brimstone_caverns" + "byg:imparius_grove" ], [ - "byg:cardinal_tundra" + "byg:basalt_barrera" ], [ - "byg:windswept_desert" + "byg:magma_wastes" ], [ - "byg:frosted_taiga" + "byg:araucaria_savanna" ], [ - "byg:magma_wastes" + "byg:autumnal_forest" ], [ - "byg:white_mangrove_marshes" + "byg:firecracker_shrubland" ], [ - "byg:viscal_isles" + "byg:warped_desert" ], [ - "byg:araucaria_savanna" + "byg:frosted_taiga" ], [ - "byg:warped_desert" + "byg:tropical_rainforest" ], [ "byg:autumnal_valley" ], [ - "byg:sythian_torrids" + "byg:cypress_swamplands" ], [ - "byg:black_forest" + "byg:quartz_desert" ], [ - "byg:imparius_grove" + "byg:dacite_shore" ], [ - "byg:nightshade_forest" + "byg:ethereal_islands" ], [ - "byg:bayou" + "byg:rainbow_beach" ], [ - "byg:subzero_hypogeal" + "byg:cika_woods" ], [ - "byg:zelkova_forest" + "byg:viscal_isles" ], [ - "byg:shulkren_forest" + "byg:dead_sea" ], [ - "byg:basalt_barrera" + "byg:shulkren_forest" ], [ - "byg:tropical_rainforest" + "byg:howling_peaks" ], [ - "byg:ethereal_islands" + "byg:brimstone_caverns" ], [ - "byg:coconino_meadow" + "byg:cherry_blossom_forest" ], [ - "byg:firecracker_shrubland" + "byg:sierra_badlands" ], [ - "byg:guiana_shield" + "byg:black_forest" ], [ "byg:orchard" ], [ - "byg:glowstone_gardens" + "byg:rose_fields" ], [ - "byg:bulbis_gardens" + "byg:embur_bog" ], [ - "byg:mojave_desert" + "byg:temperate_rainforest" ], [ - "byg:frosted_coniferous_forest" + "byg:subzero_hypogeal" ], [ - "byg:weeping_mire" + "byg:coconino_meadow" ], [ - "byg:sierra_badlands" + "byg:glowstone_gardens" ], [ - "byg:crimson_gardens" + "byg:autumnal_taiga" ], [ - "byg:rose_fields" + "byg:ivis_fields" ], [ - "byg:ebony_woods" + "byg:nightshade_forest" ], [ - "byg:temperate_grove" + "byg:windswept_desert" ], [ - "byg:twilight_meadow" + "byg:red_oak_forest" ], [ - "byg:quartz_desert" + "byg:red_rock_valley" ], [ - "byg:embur_bog" + "byg:shattered_glacier" ], [ - "byg:forgotten_forest" + "byg:frosted_coniferous_forest" ], [ - "byg:coniferous_forest" + "byg:baobab_savanna" ], [ - "byg:temperate_rainforest" + "byg:weeping_witch_forest" ], [ - "byg:fragment_forest" + "byg:allium_fields" ], [ - "byg:cryptic_wastes" + "byg:temperate_grove" ], [ - "byg:maple_taiga" + "byg:zelkova_forest" ], [ - "byg:allium_fields" + "byg:bayou" + ], + [ + "byg:canadian_shield" ] - ] + ], + "rewards": { + "experience": 1000 + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json b/Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json index 4c79434277..845c273f05 100644 --- a/Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json +++ b/Common/src/generated/resources/data/byg/advancements/biomepedia_gift.json @@ -1,34 +1,34 @@ { "parent": "byg:root", + "criteria": { + "tick": { + "conditions": {}, + "trigger": "minecraft:tick" + } + }, "display": { - "icon": { - "item": "byg:biomepedia" - }, - "title": { - "translate": "byg.advancements.biomepediagift.title" - }, + "announce_to_chat": false, "description": { "translate": "byg.advancements.biomepediagift.description" }, "frame": "task", + "hidden": true, + "icon": { + "item": "byg:biomepedia" + }, "show_toast": false, - "announce_to_chat": false, - "hidden": true - }, - "rewards": { - "loot": [ - "byg:advancement/biomepedia_gift" - ] - }, - "criteria": { - "tick": { - "trigger": "minecraft:tick", - "conditions": {} + "title": { + "translate": "byg.advancements.biomepediagift.title" } }, "requirements": [ [ "tick" ] - ] + ], + "rewards": { + "loot": [ + "byg:advancement/biomepedia_gift" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json b/Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json index 470b8a3f60..e09b26c0c5 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/berrily_alive.json @@ -1,23 +1,7 @@ { "parent": "byg:husbandry/root", - "display": { - "icon": { - "item": "byg:blueberries" - }, - "title": { - "translate": "byg.advancements.husbandry.berrily_alive.title" - }, - "description": { - "translate": "byg.advancements.husbandry.berrily_alive.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, "criteria": { "blue_berry": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -26,7 +10,23 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.husbandry.berrily_alive.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:blueberries" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.husbandry.berrily_alive.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/forager.json b/Common/src/generated/resources/data/byg/advancements/husbandry/forager.json index d6d70eca9e..f4d1a7e7fb 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/forager.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/forager.json @@ -1,23 +1,7 @@ { "parent": "byg:husbandry/root", - "display": { - "icon": { - "item": "byg:white_puffball_cap" - }, - "title": { - "translate": "byg.advancements.husbandry.forager.title" - }, - "description": { - "translate": "byg.advancements.husbandry.forager.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, "criteria": { "white_puffball_cap": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -26,7 +10,23 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.husbandry.forager.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:white_puffball_cap" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.husbandry.forager.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json b/Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json index 450f76afa2..a532a04ba3 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/granny_smith.json @@ -1,23 +1,7 @@ { "parent": "byg:husbandry/root", - "display": { - "icon": { - "item": "byg:green_apple" - }, - "title": { - "translate": "byg.advancements.husbandry.granny_smith.title" - }, - "description": { - "translate": "byg.advancements.husbandry.granny_smith.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, "criteria": { "green_apple": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -26,7 +10,23 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.husbandry.granny_smith.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:green_apple" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.husbandry.granny_smith.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json b/Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json index 1b5908007d..0c39d34a97 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/hot_diggity_not_dog.json @@ -1,35 +1,35 @@ { "parent": "byg:husbandry/root", - "display": { - "icon": { - "item": "byg:cattail_sprout" - }, - "title": { - "translate": "byg.advancements.husbandry.hot_diggity_not_dog.title" - }, - "description": { - "translate": "byg.advancements.husbandry.hot_diggity_not_dog.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, "criteria": { "cattail_sprout": { - "trigger": "minecraft:item_used_on_block", "conditions": { - "location": { - "block": { - "tag": "minecraft:campfires" - } - }, "item": { "items": [ "byg:cattail_sprout" ] + }, + "location": { + "block": { + "tag": "minecraft:campfires" + } } - } + }, + "trigger": "minecraft:item_used_on_block" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.husbandry.hot_diggity_not_dog.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:cattail_sprout" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.husbandry.hot_diggity_not_dog.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json b/Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json index 1367085d81..8aa2e505ed 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/just_like_grandmas.json @@ -1,23 +1,7 @@ { "parent": "byg:husbandry/root", - "display": { - "icon": { - "item": "byg:green_apple_pie" - }, - "title": { - "translate": "byg.advancements.husbandry.just_like_grandmas.title" - }, - "description": { - "translate": "byg.advancements.husbandry.just_like_grandmas.description" - }, - "frame": "challenge", - "show_toast": true, - "announce_to_chat": true, - "hidden": false - }, "criteria": { "blueberry_pie": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -26,34 +10,34 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, - "green_apple_pie": { - "trigger": "minecraft:inventory_changed", + "crimson_berry_pie": { "conditions": { "items": [ { "items": [ - "byg:green_apple_pie" + "byg:crimson_berry_pie" ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, - "crimson_berry_pie": { - "trigger": "minecraft:inventory_changed", + "green_apple_pie": { "conditions": { "items": [ { "items": [ - "byg:crimson_berry_pie" + "byg:green_apple_pie" ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "nightshade_berry_pie": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -62,7 +46,23 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "byg.advancements.husbandry.just_like_grandmas.description" + }, + "frame": "challenge", + "hidden": false, + "icon": { + "item": "byg:green_apple_pie" + }, + "show_toast": true, + "title": { + "translate": "byg.advancements.husbandry.just_like_grandmas.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/husbandry/root.json b/Common/src/generated/resources/data/byg/advancements/husbandry/root.json index 231cdf207c..827839a385 100644 --- a/Common/src/generated/resources/data/byg/advancements/husbandry/root.json +++ b/Common/src/generated/resources/data/byg/advancements/husbandry/root.json @@ -1,24 +1,24 @@ { "parent": "byg:root", + "criteria": { + "consumed_item": { + "conditions": {}, + "trigger": "minecraft:consume_item" + } + }, "display": { - "icon": { - "item": "byg:green_apple" - }, - "title": { - "translate": "byg.advancements.husbandry.root.title" - }, + "announce_to_chat": false, "description": { "translate": "byg.advancements.husbandry.root.description" }, "frame": "task", + "hidden": false, + "icon": { + "item": "byg:green_apple" + }, "show_toast": false, - "announce_to_chat": false, - "hidden": false - }, - "criteria": { - "consumed_item": { - "trigger": "minecraft:consume_item", - "conditions": {} + "title": { + "translate": "byg.advancements.husbandry.root.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json index 04243303f6..42c1dc7d07 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json index 398ca0c4fa..44cfd69413 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json index 79df111673..1705c33222 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json index a6f88cc0a4..c023e29af0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json index 0c32624071..d3c5d1682a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json index 8b0897dbc8..cb93b3a8c9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json index 1f652c10ec..285e8efe36 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json index b94977cbe6..b48c25d910 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/aspen_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json index bf4ca11ccf..f3fc906aa7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json index 98fbccedc5..2bb46cffea 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json index cfad18d6ce..54c1561b52 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json index 8d695ccbb2..05e0abe137 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json index 22f0a7a7b1..0392675125 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json index 7cb7ea5bc1..76f7e336b4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/aspen/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/aspen/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/aspen/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/aspen/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json index 54588d743a..a095724e64 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json index d3958e7bef..f13d0a5983 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json index a17b9d3029..c3fa5af4e7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json index 2e0a2436b1..67bff43d97 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json index 99ff283ca9..8a56483041 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json index 84f3ddd3a2..8f3513cb40 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json index adb364fefa..248edd10d7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json index eb4756314a..946e03b7a3 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/baobab_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json index ddda347171..d539c0b1db 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json index 5998782530..59ce92e2cf 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json index 168f0a3671..8bebf9dced 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json index bf06695012..906457a089 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json index d35cb9092b..3f9010c769 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json index 707b4fa7b6..cdfe39b7b0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/baobab/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/baobab/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/baobab/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/baobab/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json index d620cff016..6f9b4299f4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json index 8f385f0b5f..218a541946 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json index 3608f1bd26..63b200b650 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json index 9a4198feae..00921d0645 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json index 4e8ad9195b..c84716666b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json index 12d803f8a5..d679344028 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json index 2846fdeb25..adb50f5eac 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json index 659021cb0c..fdba7ba54e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/blue_enchanted_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json index 957c08eabb..1dd1cc4ed6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json index 02ba0348ec..8531b2924f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json index 8717d319ab..b4c2ff72d7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json index e6549a1233..0a785f9a89 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json index 84d20bc753..f62a35e6d2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json index c892500c65..2dbe032b2d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/blue_enchanted/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/blue_enchanted/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/blue_enchanted/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/blue_enchanted/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json index 5471664eb3..7aab3188c5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json index c8e47320a4..6fdd586c96 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json index 72ea2baacd..adbfb02933 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json index 82d335ad59..c2e846e6be 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json index 077b451964..df381d721c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json index fafd63908d..068fba8e58 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json index 1b289efbd2..f9357c8a5c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/bulbis_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json index 661523c912..38b841cbba 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json index 98e0c8eb25..48eceadfda 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json index ee10fc6477..85a66eeb3f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json index 4e00a6513f..aa84dbd9ab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json index 6741159af6..0e2ad24c96 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json index 259757152d..3fd69ad665 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/bulbis/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/bulbis/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/bulbis/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/bulbis/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json index c2a8a84296..77023a5c2e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json index 1556004df0..4972dbd4d6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json index 6844dd980c..15508a7cbb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json index 2d5c672f38..24a28f92bf 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json index bb41b38fd8..938ed27127 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json index a94bff2507..f6ab97fe7a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json index 8355292a3f..3f399dfcde 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json index df7d25d957..a4a7b1ba2f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/cherry_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json index 8debc46a91..e2c07f8bc8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json index c0406d587b..4eecf38fb9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json index 41d355e48c..9aab125ade 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json index ecdf230a15..fe338e1f9f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json index 2a8471978e..500f587b09 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json index cb3acf85ac..a046e11623 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cherry/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cherry/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cherry/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cherry/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json index c782defc02..06267b85f6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json index 8d6ed76cd2..e4db2361ab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json index 2ccc6faca0..d49c392e6d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json index 4d89c927fb..daab7a857f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json index 87eab0642f..a3c25bec46 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json index edd42628db..01309ad913 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json index 911dc9c5b5..04f324dfdc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json index ccd3a40c01..9d8a2318d6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/cika_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json index f4fa085aeb..472e3eaf87 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json index 29e92f4025..d6b38b33c0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json index 47c24f5aad..ed65870036 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json index 8aed4e2c4e..28dbe5421c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json index 253fcbdb78..7da83d5c9b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json index 4ffe3ec7cc..93ffdb60e8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cika/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cika/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cika/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cika/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json index 79acf15709..0b2cb9bca1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json index 768854fb1b..58e04e6fb2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json index f23b8795e2..7fb48b6c2a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json index 7eab25c7c1..990f1e1dbc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json index 29492d3cea..c92a68f923 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json index 0061726a0a..82ad54867f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json index 79c9cba12c..0cc4cf0604 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json index a084a21af0..4eb343cab2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/cypress_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json index 8b68f2c5d9..081011e0d9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json index d219737f09..c218e9ccc1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json index dd9770a99d..77e6e79130 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json index 0396ea50c3..4ed9ef66ab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json index f8edc5c76c..fc98cbdf99 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json index 2f9d3bddb6..1f40e012f4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/cypress/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/cypress/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/cypress/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/cypress/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json index 6fb6476450..0d94622c84 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json index 60cd34e48f..8d16281ddd 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json index 6a0eb07bc4..f6f2d484f9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json index 5a80ee6a63..93cac4c7fd 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json index 2f81b12e1f..1773c1074d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json index 893e57855c..30e2e93971 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json index 3614945562..67139493f4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json index 18de81f9fe..ce71108876 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/ebony_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json index e975c5714f..42e219aac0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json index 385530337d..5e6c28dc92 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json index 616d80e1c9..b4b928e875 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json index a8fa9b892b..f9a1e2752a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json index 6f195d68fc..ecc45b6cd7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json index efec1785a8..f88f818be5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ebony/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ebony/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ebony/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ebony/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json index 481445003c..c5ef334059 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json index 6540dbec59..97ec64198a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json index 882e1ed12b..6467ca61df 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json index e9e14556cf..0c63070a6f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json index 891c36225a..d79884dc16 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json index 9f9b46ce06..aba97c22e3 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json index 33a6d3a9ce..5c369c7a2c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/embur_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json index 07446ffbec..9cbb28f636 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json index 762cbf2517..28051686d7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json index c2409f9007..0894327a26 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json index dbefa75032..a2d19d9728 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json index 2bbcc9c83e..d267928f3e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json index 388d22e26c..2aedf9f697 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/embur/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/embur/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/embur/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/embur/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json index d72855d470..2e851b9a99 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json index 6795ccd98f..1c7ee68724 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json index cdf7a7f22e..185ed413b7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json index 8abe858301..6aa693709d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json index 428ac9e24b..70574a577f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json index 64722f8d4c..b82213284f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json index 056514b75e..d0f8f5d9c7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/ether_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json index ae1bc5695c..da4ded290e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json index 6d04f92047..dfe1eaaa9c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json index 9986d2b869..4688606f53 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json index 57ef097921..71bd693261 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json index ea0dc12587..e1759b301f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json index ee32382ba8..a4b17e7289 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/ether/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/ether/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/ether/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/ether/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json index 2d52da910d..395fd18894 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json index 556377fa5e..407144901a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json index b045efe2e1..4addcab773 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json index c650379947..0ed54a8f19 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json index 778c0acc2c..afd06645cc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json index 1f87e6ad34..b39ce70ee4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json index c5e196f22e..1415f11310 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json index 3b029a381d..8fcc61635e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/fir_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json index 978a6e6c92..3a2ec55c99 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json index 1295967d18..7d3983aff2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json index 59a9741c0d..19e2972018 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json index 76be370ab3..5fca5f0565 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json index cd3f9f7101..a0a4de2fe6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json index 815e67e153..417bab2685 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/fir/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/fir/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/fir/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/fir/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json index c4e160d927..f0b6846ca6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json index a09ea9ebfc..8da425a414 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json index e58c5b232b..a79be75060 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json index ed1b081dd4..7b53dbfb30 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json index e78637cdbf..5a64fd18ee 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json index 91b320f65d..311cf7b1ab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json index ce620290c2..b3d555fa92 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json index eee3380e07..8644d4b0c7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/green_enchanted_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json index fbd2be1df8..925fbb7109 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json index 22e6679c88..4459176ca2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json index e91e591296..e2b7ab3bd3 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json index 819ab5798c..9babc87efa 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json index 06cfeedfb7..3cc6664f22 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json index a9c7690a04..b246764ffb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/green_enchanted/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/green_enchanted/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/green_enchanted/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/green_enchanted/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json index f2e9b97fb3..41d625ac8a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json index 57be866e54..fa1e65bb09 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json index 6048e7675d..93287d40ac 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json index 4ed8896080..c21a2c259b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json index 4615152d9d..a959d24fce 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json index e633bf27ae..31d805e088 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json index 26e224bebd..e6cea65f53 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json index 80968b5721..112a4de006 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/holly_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json index d17e034f0a..83ce30e7af 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json index 1f72afcb2f..e1e181cd75 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json index 71ee292aeb..a4aa0c2abe 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json index a7b9ad36ad..39beb8a3eb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json index ba861e1110..3f02db6e9f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json index d63e22068c..c74a1e7687 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/holly/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/holly/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/holly/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/holly/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json index bf95fa624c..dc0880ab5a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json index 748c2c05c4..d8e9951bc0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json index 3c90f1723c..3e890493a6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json index b557ad38d4..3ae24479ab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json index b07287fe97..96e54ce307 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json index 7cb4cbdc27..87a60b6018 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json index 7754385e8c..14f38720a1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/imparius_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json index bf11d9c01e..3b79ca1b70 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json index b472565461..f14120eed8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json index 4b0037d590..a5e140fbb5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json index 860698d99a..727bba0b18 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json index e9aaa1c973..2aacc53c08 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json index 3ccd9eafd3..38a8c14ae4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/imparius/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/imparius/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/imparius/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/imparius/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json index 8a513a66d0..58aeb49fbe 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json index 6dc5d01187..d1020ebde4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json index 7d6fe56f98..6bbfaab3c8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json index 5c8fd50310..1ba6e22e50 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json index d67c64e784..9e0eb594b5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json index ecef758b52..8541858a11 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json index 61632353f8..eb1060f8d4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json index fe7b46db5a..8f6eb326f7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/jacaranda_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json index 4640ae8272..b0cc783ccd 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json index 02ef65cbec..7fb8f37f9e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json index 06a9000dd6..3011230e99 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json index 9f0c71b6ec..ced7b6eade 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json index 74c0979f5e..3aabae4dd7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json index 3924f1a4cc..5f24c237c4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/jacaranda/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/jacaranda/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/jacaranda/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/jacaranda/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json index e1c0d01efd..945d3c5ba0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json index 10c19bfe13..cc29d83aaf 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json index a6b07cd168..2243f5c527 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json index e278c57bb0..7ca7cb972a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json index 23f4fba178..ce2525cc1c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json index dae5d9af93..84ff36642d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json index b366d38663..5e96c0f292 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/lament_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json index 5b16143e7e..971d4908fc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json index adf2dd0085..a47b5f7e5a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json index 58fcea9a36..6894521f33 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json index 991214565b..4f35fbc44c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json index dbb0fdfae3..5e23a6703f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json index 126550a380..33d03f9cf9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/lament/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/lament/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/lament/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/lament/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json index 6939eefc32..db8ae9e5cb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json index fe6b05399d..7fba1f77ee 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json index 0826ef189f..a11aa03684 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json index 03dd38b005..60f5c29033 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json index 91f4a7a810..bc33b3746b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json index ab891178b7..de338cbb8e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json index 9665c74e7e..831d16ca5b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json index f90ab4ed14..edd1e7067c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/mahogany_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json index 4f11b105bd..f10ecaa9a7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json index 0ccabb4de4..8b40ab7058 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json index 4c553179b7..9a08d7dd22 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json index 4ecb3e7fac..fc1579b798 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json index 1770d0fa2e..5acc658106 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json index b90dfdab45..4b56ccdcbe 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mahogany/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mahogany/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mahogany/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mahogany/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json index 5f23536de5..a536318180 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json index 872fcc3940..66502e54a3 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json index ba00ad9598..8e94f5ae77 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json index 36b6f8a7cd..394bc943cc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json index 1b2861ca2a..9d05a66b28 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json index a07fc86567..36bca52790 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json index 5dbcf74765..fb6e17b289 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json index 4e55442d44..3b86f7a185 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/mangrove_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json index 4869e23228..d9761cefc9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json index 2b5ad97172..5f30771c4b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json index f19332fd5b..400fe6990e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json index aaeb1ff312..531334b827 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json index 722bff044f..1a5c9a9f6c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json index e048e95316..03cd89b856 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/mangrove/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/mangrove/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/mangrove/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/mangrove/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json index e6caf93321..da174051fe 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json index f84e799ee2..fd183b4f14 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json index 2f7be167a4..7f5cb2a61f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json index eda31c77b0..ccba77411e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json index a5c3ccbd18..45bf406e75 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json index 5a61003b44..e97dd0567c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json index 4b190ea084..6a3f565bf6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json index baa19c5883..e43141fc55 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/maple_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json index ec03e64412..351637207a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json index 8c580f4903..01bde54bee 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json index b27e5a3b20..4cda59f573 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json index 8a5494b310..3b1d79fd62 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json index 2a5e63b62b..ae66f41d15 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json index d71c4cba05..1a05c2e9dc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/maple/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/maple/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/maple/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/maple/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json index 5d98ec2a86..f144e3049e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json index 74187c1560..e49c6e800f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json index 4c76e666f3..2ebdfb5eb8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json index a49d336114..007c7d7e37 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json index 49bd32dabd..2e63043efd 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json index 23fc38b851..986beda645 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json index 84b900eee8..34f9a04a96 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/nightshade_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json index 64dd2962df..787732b2c5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json index c2d616ec33..4128fdebac 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json index ef0276c3f2..fee2d99318 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json index 49272cbfa0..89e58adbc8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json index ee89dbdf6f..3748a680d4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json index 7043849f03..f273d8965f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/nightshade/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/nightshade/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/nightshade/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/nightshade/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json index 37d2e060b4..ba5956cdd5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json index 519cce6f68..2e5eba0e0c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json index 7107a1e62f..6641cc65eb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json index c3553843c7..b88c75a30c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json index e9b22e127e..a4dd683bd9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json index fb58626403..36ab311a2f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json index 74d02315db..51e81d4132 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json index 8d8bb33f13..63685d0bc7 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/palm_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json index f0b70e80f0..73abf96ed2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json index 3c4eb90305..d6366c3478 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json index 09bec7be22..c865f91c18 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json index 3a0bb26733..f1ca902bcd 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json index ec9f46a9c5..3e369aa67d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json index 33ec2608c1..aa94d86c88 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/palm/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/palm/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/palm/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/palm/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json index 2245bef6ca..b4caf43454 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json index f2e1792daf..8b31a24e48 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json index d112769bd8..407845d80b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json index a98048ee47..9631871a23 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json index ae7644a105..d2b0b4db07 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json index ad5a7252e1..49eb1d63bc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json index 4ab4e40a24..44c4129897 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json index 3ad0ce7c96..aede4ce948 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/pine_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json index 96ecfb186b..81efdd460f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json index b682245a3a..3247efe197 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json index 223ec02e24..c622057640 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json index 4be492d42c..1218ddfc27 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json index 299a14fe1a..acae2a4572 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json index d20fb3a314..a4f04e6664 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/pine/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/pine/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/pine/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/pine/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json index edfd67c532..e95e292bda 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json index 996f02ce93..93ddd04172 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json index bf275b8f76..e390fdae8b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json index 410e8f36e7..7463a8e9f4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json index 05f888c71b..021bb55b23 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json index 56c9a8fe87..aaa60fa5f1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json index 83b6689f65..60f7576e4f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json index dfec4f8003..c9c1ffef54 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/rainbow_eucalyptus_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json index 7f6c45e2f2..ff3aac030c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json index a3af42d8a0..656701d93f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json index a349977e07..c7c51912c8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json index a7d971c16a..6e40dd241b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json index 7373265b26..c24a039603 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json index 807a300a15..73bf5900ea 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/rainbow_eucalyptus/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/rainbow_eucalyptus/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/rainbow_eucalyptus/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/rainbow_eucalyptus/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json index dea4e8151e..d8b7585d5c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json index d10f509292..d7a2c1a4da 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json index 5cd8775877..9a878ac4aa 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json index 1cdda26e39..93fded2332 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json index f576cca481..fbf72d06ef 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json index f3d22e688d..13b2d4cac2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json index e17f5014f3..137255ab25 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json index fb1dd319a3..e5e2d2e358 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/redwood_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json index 697e74f637..a522d72b23 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json index 58e9b0b00b..a41bd69248 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json index d50d73c974..90569663f3 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json index 24b4df1037..33d97dd16c 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json index 14dd07db53..df8bcd1607 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json index 9b51ed4d04..537b7d0805 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/redwood/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/redwood/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/redwood/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/redwood/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json index db63c34b7e..07520855ec 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json index 09a198146d..94781dff42 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json index 005606ec03..5dd608796a 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json index e722ce814c..637b8d92c1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json index ac769606ba..ffdaeaf548 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json index 7092d6f07b..6df0518184 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json index ef9952ec5e..6ad09c0ad1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json index 9b760b337f..63d3d31a88 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/skyris_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json index a26d9a66d6..ecd3848e1d 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json index 9797799da1..da85212c5b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json index 59bd4e37bd..1d66d95fbf 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json index f3acb97d68..c0a9122cbb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json index f4fe5d28a6..a2635889c0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json index 4b8ebdd290..88db40e891 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/skyris/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/skyris/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/skyris/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/skyris/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json index 59c131ea52..eed4b11250 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json index 07165667b3..ec56eac066 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json index bc2a1b13a0..1291ca4d82 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json index 09e2f93e82..233890c76f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json index 14643a10e2..37ec8e2898 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json index 9caeb88b88..2ad97b9844 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json index 6492cc42dd..ebcaf75d23 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/sythian_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json index 912d45a1c9..65fc7478b4 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json index fa1772c49a..839b597450 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json index d03804886f..bda0da1784 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json index 84e953cea4..88ff81eb42 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json index 275f296b35..5b78d7bee9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json index 412dd2b325..5a92c5ea16 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/sythian/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/sythian/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/sythian/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/sythian/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json index 49113af163..15822e4326 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json index 10bef64b26..2dd27183b5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json index 8128a8b5fc..dfaa21d0b5 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json index 55eaeee42c..77608af53f 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json index ef756b64e9..207e277505 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json index 207a3baa4c..4cafeb2c3b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json index a53024994c..3be7509416 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json index 7808ef9432..f77c0e6683 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/willow_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json index 2d7832f85a..4d912aca09 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json index 31405ba33a..07de6c8b80 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json index 5203affa93..96a7e2e194 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json index 2d1b6f7cdf..ce48ab9a31 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json index b5e2e2a8c1..f70852c949 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json index e1e231decd..8fa3eca3f9 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/willow/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/willow/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/willow/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/willow/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json index 432a9bde08..19380985e1 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json index 76f5e688d1..abd8faaf76 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json index f28a49feb6..70b29bd9eb 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json index 643a92b008..8b791ca6af 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json index 2ebcfa4590..be68ca7ef2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json index 69b014b3a6..7b37270797 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json index 44bb5dfa26..9d6acbf8bc 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json index 0d418669ab..82080fbfa2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/witch_hazel_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json index a6a3453927..f647e187e8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json index 0cd81ced66..e5fe143fb8 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json index 5578b456a8..6ec1e3f872 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json index 303c0563d8..b3ee59f4c2 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json index 9db7121ad5..0dc8f16a09 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json index 4abb6bd90b..a7ee9d0791 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/witch_hazel/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/witch_hazel/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/witch_hazel/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/witch_hazel/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json index 5a208e5315..4ac92c7d36 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/boat.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/boat" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/boat" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/boat" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json index c60d2a4473..fc7167469e 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/bookshelf.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/bookshelf" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/bookshelf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/bookshelf" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json index 1be776ea1a..e61f24076b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/button.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/button" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/button" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/button" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json index 35316c4248..e2bc6b3a55 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/crafting_table.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/crafting_table" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/crafting_table" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/crafting_table" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json index 9b6adad3ef..6ecc493d12 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/door.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/door" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/door" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/door" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json index 875d6c9e35..7ce85d2225 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/fence" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/fence" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/fence" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json index 44b630d44f..65e3f38cf6 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/fence_gate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/fence_gate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/fence_gate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/fence_gate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json index 9b126b25b3..5a6d6a2322 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/planks.json @@ -1,26 +1,21 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/planks" - ] - }, "criteria": { "has_logs": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "tag": "byg:wood/zelkova_logs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/planks" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -28,5 +23,10 @@ "has_logs", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/planks" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json index 02eea726fc..f7baf79781 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/pressure_plate.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/pressure_plate" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/pressure_plate" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/pressure_plate" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json index f3f61c4c73..c8e35fdd60 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/sign.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/sign" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/sign" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/sign" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json index 3e95aff3d5..b20ce8f652 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/slab.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/slab" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/slab" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/slab" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json index a864265fe7..c2f483002b 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/stairs.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/stairs" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/stairs" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/stairs" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json index 0f946b6c9a..05086895e0 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/trapdoor.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/trapdoor" - ] - }, "criteria": { "has_planks": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/trapdoor" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_planks", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/trapdoor" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json index c8431d025f..eae96beeab 100644 --- a/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json +++ b/Common/src/generated/resources/data/byg/advancements/recipes/byg.byg/wood/zelkova/wood.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "byg:wood/zelkova/wood" - ] - }, "criteria": { "has_log": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "byg:wood/zelkova/wood" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_log", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "byg:wood/zelkova/wood" + ] + } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/advancements/root.json b/Common/src/generated/resources/data/byg/advancements/root.json index ec05ceb3d3..a58b372144 100644 --- a/Common/src/generated/resources/data/byg/advancements/root.json +++ b/Common/src/generated/resources/data/byg/advancements/root.json @@ -1,24 +1,24 @@ { + "criteria": { + "tick": { + "conditions": {}, + "trigger": "minecraft:tick" + } + }, "display": { - "icon": { - "item": "byg:byg_logo" - }, - "title": { - "translate": "byg.advancements.root.title" - }, + "announce_to_chat": false, + "background": "byg:textures/block/lush_dirt.png", "description": { "translate": "byg.advancements.root.description" }, "frame": "task", - "show_toast": false, - "announce_to_chat": false, "hidden": false, - "background": "byg:textures/block/lush_dirt.png" - }, - "criteria": { - "tick": { - "trigger": "minecraft:tick", - "conditions": {} + "icon": { + "item": "byg:byg_logo" + }, + "show_toast": false, + "title": { + "translate": "byg.advancements.root.title" } }, "requirements": [ diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json index 39ec743e0a..8fbe9a46c4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json index e7d8f935a9..e935421ee7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json index ee6f66a854..096a296cb1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json index c319e89504..80c03a0b2d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:aspen_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:aspen_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json index 1007b140c5..0d292f2796 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json index dc6f56d15d..294c1c8d0a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json index 4b69cf68ac..c1257db250 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:aspen_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json index 1b41e505af..a650731550 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json index 5306707569..fb50105d0b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json index dd3aeb6507..630e6a9689 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json index e6519d1ed7..90efa0b18f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json index adc1e8a8c1..09e55f737b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json index 24ac18c5e9..596275487b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:aspen_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:aspen_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json index 386e54df78..6829efca2e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json index 36ec3c0a6a..fe444ad300 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json index 4c9639b6b2..fea098f9d6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/aspen_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json index 174254c446..772bec2759 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json index 9eb36b6170..34e299767b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json index f50193aa95..3f1f7d504e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json index 5952fbe375..575a323d7f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:baobab_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:baobab_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json index 132c366fda..2923f0e765 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json index 94bde00019..56e86d1c3c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json index e1d78ed2ac..e615ddb153 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:baobab_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json index 404d16190f..b1999c0306 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json index f33ec73516..da7612d312 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json index 24daa28716..ba9c5d9202 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json index fd01e1be94..ca5cb3e2d4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json index 5ea6f18f8c..3b10ee59f5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json index 68ee0c1596..714beef84f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:baobab_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:baobab_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json index 844cf1a1b8..d2e1b23b13 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json index 5df84d8636..62f9aa4b1b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json index 89971c514b..bdebea979f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/baobab_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json index 56a9e3bb23..ab6671b420 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json index 54d83bc4b5..6e1d82da72 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json index 2e13e55ece..e7d74b3ab2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json index 0585b0ce7c..f606d9ab67 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:blue_enchanted_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:blue_enchanted_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json index b25ec19b06..7770bc6724 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json index 0b365ffa5f..8f0ea9e47c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json index 5c4c45604c..f7b20ba373 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:blue_enchanted_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json index 37325e225c..77f45b84ff 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json index 2bc7c05cf7..a3e5ba541b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json index fc44b7cc0d..4d177bb073 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json index 65ab2a28fa..6903db7b5a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json index 0405e689b6..ae724ec611 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json index d788eb77b3..83ef2c1812 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:blue_enchanted_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:blue_enchanted_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json index c983bb5f86..436044d929 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json index c0d7d5db1c..5910c9715f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json index 7647054fad..a89b65e734 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/blue_enchanted_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json index aad70603d0..37cd097643 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json index d667d2b942..6678c508de 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json index 8e9225ba2d..8072667c8e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json index 91a5a10b99..47fd3c7c4a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:bulbis_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:bulbis_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json index b5a8fe24c2..0a0d377976 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json index f158620932..d3bdcbc6c6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json index 11f625be42..23a295a6f3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_oddity.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_oddity" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json index d33a4f6bdd..55b1212d2a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json index 151fc8502d..c11a850f31 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json index f325a6b9ff..659192e359 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json index fcf3d75564..37a3519d26 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:bulbis_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:bulbis_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json index 6579ce0c7e..5267a1f04c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json index a0b8d89820..4c1b7e5395 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_stem.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_stem" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json index 6cf7d6112c..ccf34af528 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json index 75d33ba32b..5ac324c549 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/bulbis_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json index 7029db9db2..539e6efa79 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json index 45125306ce..46bdb024cf 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json index 0007c5b698..9cdcc65116 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json index 88c3702d79..0ce46d8230 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cherry_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:cherry_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json index 9b0347dac3..ce71c9db75 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json index 9559f72227..5c0adde7bd 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json index 107d0af7a3..891fc98e74 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json index c3aaf0944d..eb3590f3d3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json index 96b05ece3f..617dedf0a2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json index 9c74617f03..3416f56c69 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json index c89f62e582..5a78af988d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cherry_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:cherry_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json index b4edfc20a5..e28bab3f52 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json index 683777a15a..09c23046ee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json index b6ccb6a3a9..41ef9ef6e6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cherry_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cherry_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json index e2785087ad..b62d9107f7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json index f41faf9b49..0f880f98e7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json index ac57180b16..cd65b7271d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json index 1f5b4b880d..761d500a26 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cika_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:cika_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json index a17cbd7203..15dc1a963b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json index 8075ce9956..2a901071b8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json index 6536d5df5a..687cae62e6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:cika_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json index 00cddd98f7..b3767be22e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json index 22f9d9c6e7..124e0e617c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json index 26fd489a0b..2875e0899e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json index 733c36087d..e2a82f775b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json index b66727782c..0b099ee886 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json index 8557d6d2cd..df6360a871 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cika_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:cika_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json index 24944b665d..c581e5f150 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json index 03efa85a4f..a9107157b2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json index afd56ba03a..d994f29a38 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cika_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json index cda9218a8b..104b5d6c18 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json index 0a7a6e2216..10a4405405 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json index d5c342064b..0bc706003d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json index 498f59f01b..8c259759e0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cypress_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:cypress_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json index a178c4e644..53018d3b81 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json index a13da631fd..ac5dd320d2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json index 0d9599fbc5..7b2545a021 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:cypress_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json index 035ddb7eef..59e148d32c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json index 1447f7a03d..ea8ec772be 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json index 72d68d4799..f4746596d9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json index 36e1c97c80..aa3b6bcf4d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json index 0b54261e89..aea33b8aed 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json index 007bd6cb40..a14b7baf9e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:cypress_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:cypress_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json index e76d324aac..b889ae0276 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json index 71804ccca2..9c13f22475 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json index adfa2fd201..79f4a0b816 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/cypress_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json index 5207e7a16f..2e719bbe21 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json index 41db11b774..7fb78a8c10 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json index d71188bebf..28e73c0eba 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json index dc9729e72d..7b41e659d9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:ebony_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:ebony_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json index 6be7762899..eb7e13dbc3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json index 3b64683af8..f18417f881 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json index fe14a0d8fe..192e45c193 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:ebony_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json index 69a5ec24bd..a29baea477 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json index 6a6144e290..41a19f9b37 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json index 7ac105e286..727816635b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json index eca2d5f92d..958c62b542 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json index 1321aa0b44..668c61aeef 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json index 624d176eac..48e56e03e4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:ebony_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:ebony_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json index 985bb36908..9eb72a6396 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json index b72c85c3d2..56d381e9c0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json index 0a144ee608..cb5f8633a2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ebony_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json index 2813c60e49..f9f54b72bc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json index e2bfba4535..f124827e93 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json index ab4531bfd0..57ddcfdb53 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json index dc8af257fe..b5b6873001 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:embur_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:embur_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json index 75c799f0d3..8b4057bd5a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json index b40aa08e78..0e731b7fb2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json index 683fdca611..08ac2fd611 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_hyphae.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_hyphae" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json index 77d2ddc638..c9c004fc59 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pedu.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_pedu" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json index f4c81da917..fcf987f66e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json index 88394e090e..cafacb4a6e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json index 19c02543a1..26d4b6981e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json index c8905ee47b..02e8567dfe 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:embur_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:embur_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json index 48d4923d2f..03c84ef9a3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json index 0a914e4e93..0d8857dac7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json index 9704c258ff..3bf8759020 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/embur_wart.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_wart" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json index 29c2fba5c5..9fe2dd71fc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json index 74bc2161a2..b293607eec 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json index db72bb7926..0d002cd375 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json index faec67a7fd..460920600c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:ether_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:ether_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json index 0fec745633..be2f006984 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json index 3d6ed1369e..b88afe179c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json index bb33b01da5..f0b35cb46e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:ether_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json index cf7777000f..3c14d4a485 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json index cada090612..0f5907c7d5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json index 0dd9e651a1..b45c5fdbe4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json index 8349cfd79d..27de67c2e4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json index 22313eb3e2..008e27c97d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json index a629859a20..6e7ef0d26e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:ether_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:ether_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json index 0eeb9cc4e7..990bba94eb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json index 84b915e649..493f2d1de4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json index 51549f2e3c..0a35589af3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/ether_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json index 4e63ef2ee5..19e3a7d29d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json index 7dae51a76d..7ffbdad091 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json index b7d9ed28c7..e847851340 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json index c2ecab2fdb..12e19fafd4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:fir_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:fir_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json index fac2653670..50cb3bf80c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json index 92452d0b63..beacb47464 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json index 4267352ded..04bf70d590 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:fir_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json index a0e898bf5a..893e5690c7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json index 69990da37b..223a44b1ee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json index f4c5c08ba1..1ebe419bb7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json index 863e53dbc2..27422465a4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json index 330f883812..cc753e16ba 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json index 6b88d76278..97249c6eec 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:fir_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:fir_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json index c5e1a737e1..9f9a1f5699 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json index 3f3bd637d1..fc72ced88a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json index bc67eaf6cc..5108525bee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/fir_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json index 7107f4eb36..1e6b116680 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json index 548f64270a..f65a69e4c8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json index 9a5ceb4830..a988ec8ec0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json index 07c890f871..a9a071c67b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:green_enchanted_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:green_enchanted_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json index f555a68e40..ef49cb0550 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json index c11a44c378..8cf68eca51 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json index 63b44fdb40..aec3fb8ba4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:green_enchanted_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json index 3e6241aa3e..4dd5b7160d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json index 69a841f4df..3ca466819a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json index 676c4a6362..3f9b236ac5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json index aa3f852269..50930577f4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json index 632b235d28..d966c18fcc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json index 680c9282de..62c3f90e2d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:green_enchanted_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:green_enchanted_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json index 077e1161c4..9ef350784f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json index d1fc8c5134..a084cd4c72 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json index 569f78a82f..2d1cac1167 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/green_enchanted_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json index 5d500c8f15..80fd2b50a1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json index 3f328f6917..0413444587 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json index 3438f03394..785eb822a8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json index 2208983e26..70b2ff8f1f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:holly_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:holly_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json index f02d941899..01f24d2dc5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json index 1665448f78..472c0ee427 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json index 6fc07467ce..ccb4d1f68b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:holly_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json index 3374ed31a2..b898cda2b9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json index 867adcf5ed..1a90044cd2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json index fa3185e68f..5b5061efa4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json index f8b99b8c8f..b5357ff8ee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json index 08a6460250..569715acd8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json index 3e7e087908..7013d9e1e2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:holly_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:holly_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json index d87e579d06..ce9cfd41be 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json index 0443eec111..61f1c9f15f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json index 560a818004..6e5cc77bea 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/holly_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json index da7704eab9..ce66350128 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json index 1eb0fff9e6..7bdb5ba315 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json index b80886484d..35ec3681ef 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json index 5db9e307e9..c3fd0c37d6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:imparius_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:imparius_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json index dc41e5ea1d..8500db4430 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json index 1332eb6933..5d4dc78607 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json index 591d6c9b19..709ff58ac7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_hyphae.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_hyphae" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json index c82de50d0d..970fada479 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_mushroom.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json index 4b2e380780..9a50b81878 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json index 1a5e210f72..17c934f5a7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json index 3c82073471..b4bcc3f221 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json index 90fb2714cd..9467797bfc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:imparius_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:imparius_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json index d09cbe7f4f..af4c43ee50 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json index 6756c25b53..706fd19cf4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_stem.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_stem" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json index 729616efe2..78e9921c5f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/imparius_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json index 9c316fdc1d..e4a849c023 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json index 98616bd948..700372abe4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json index 45e25dfe2b..d0f5c5ec53 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json index cea329e3e9..29613c6123 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:jacaranda_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:jacaranda_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json index 6646d55439..4f25e0fd8f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json index 32bf40d76d..5043cbb636 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json index 280fd26250..f38ddfeafc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:jacaranda_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json index 0865005846..3386b54fee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json index 699046849f..b343f6a357 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json index bfa56c54b1..9b348d9416 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json index 8a3ac1eb62..88045dbb33 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json index fd9c076181..6102a2c63e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json index b1b1efed9b..4fa0f67d33 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:jacaranda_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:jacaranda_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json index 95f542d67d..eebcc76f06 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json index dbb32b1515..7a252dcf0c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json index de881b8359..d7af452f52 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/jacaranda_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json index 13c718997e..3b57b4d4b8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json index 37dc504861..07da382f86 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json index e7a0011c1e..6b9002d1ed 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json index 389652d5a9..7f3d1d7c44 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:lament_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:lament_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json index c4ee0c4cb1..5790760551 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json index efefcd3c71..0cf6b45179 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json index c27d067663..0b585dd5dd 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:lament_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json index 6e6e56dbf8..f986a29839 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json index 257996f109..818f5e6cd8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json index d24166b8e0..9644ad7286 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json index e6a84344d2..2ea0f190cd 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json index b963302826..105427847e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json index 08c2917710..a7f6389afa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:lament_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:lament_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json index a35fed9d75..e468401171 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json index ae7871cb6d..402a4bdb1f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json index 2ef237e7a0..1b24947361 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/lament_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json index d6a981af4c..7d54b0c2b2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json index cfc419586f..6b628ad6e2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json index a3d77cb5b2..62058fd58c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json index 1eb26d61a7..6b1c64feee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:mahogany_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:mahogany_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json index 47be00d7d1..6f81d78048 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json index 3d169e2685..118ed69870 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json index 6786503c49..5e7ad3cdee 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:mahogany_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json index 3e38c392fd..234f9f4e41 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json index cb4dfff0ff..ba4e7709e8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json index 88a1f95a7e..1f305e0b70 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json index bebf2c27f5..752b17293f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json index 9dea5f2e8b..43f08d7ba7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json index f6aa8c03ce..b834c268ae 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:mahogany_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:mahogany_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json index 74d8f732d6..096e08d0c8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json index 672dac06ed..306010b05a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json index faf510f791..d4baa549f4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mahogany_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json index 8b0d7087bc..88d4e778c1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json index f7f2c4ff5a..52ab8deea4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json index 52f0c6bdab..d827df94fc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json index 6cc4dbd3c2..7a9c560f8a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:mangrove_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:mangrove_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json index 5f2c79af7c..7ebb44878c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json index 4d1f4ebc08..6f6caba9e5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json index bdbe0f00e2..ac64638ba4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:mangrove_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json index 0fe530fae7..3d1e47b6a4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json index c9b3311230..f8df73112a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json index 8b30d3aa59..a3bf8a483d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json index aec6e5e59d..9123bdfa0f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json index 22ada4159e..06a8791f10 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json index d72007ece9..4416dfe19d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:mangrove_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:mangrove_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json index 2faad0c39c..360100fd4b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json index f26478ffbe..77d70b8ffe 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json index 4bb874e168..385b01756b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/mangrove_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json index f377b1a79f..aa88336fd1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json index cf9070d2c4..74f181a281 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json index 112bb0e8c1..b86e3f89a6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json index 9bb82727a2..79cb24d1d9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:maple_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:maple_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json index 8e020478e5..ae1cab04e8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json index 6d279dfcb3..cb4def7c23 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json index aa7bb1c258..a34140b6cf 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:maple_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json index 705758dd5d..0d0d00faaa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json index da4618ff14..7fac224c71 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json index 2ccff804aa..a3242a5482 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json index c0b5268073..5ad10c6a11 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json index 7d13cbfd18..07f4982215 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json index 9cd618cfbc..b75da2dce1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:maple_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:maple_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json index 1ee26c5001..0c49281ab7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json index 4be07bfe5c..b8e6925d6e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json index e981b442ca..708518f345 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/maple_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json index ec3b7c5975..c56521c90a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json index 42dac6d57a..774a5fe659 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json index 224c65d392..1f864fed97 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json index a9b6cd160a..c7a8be8145 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:nightshade_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:nightshade_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json index ad1a5cb9e9..a063426ab8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json index c82ed42bd2..79d00ebd8a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json index 094a8706f4..1ee432b6f7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:nightshade_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json index c954b8ef33..b67f2efeb2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json index c5a7a02ccf..136daa2793 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json index d48e80ec8d..29e33b764c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json index 8052a4865b..743140ef7d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json index 36800867c7..d0122d94fb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json index 8a20a157d9..1b45661f84 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:nightshade_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:nightshade_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json index 4c1730c8e1..cb8f7a4bfb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json index a314d883ca..1a1a658b64 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json index a62dba5f24..b721596d0c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/nightshade_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json index 5da41af356..5a99f5aa17 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json index 6c73257090..208274a049 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json index 7aeafc8815..e629cc7123 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json index 8eaf7ebd5a..5d70bd4945 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:palm_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:palm_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json index fea31bb891..983dc31839 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json index 4206ae0c08..7be527043c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json index 9e7c674c4e..71132bde5d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:palm_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json index 6332117412..266195020b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json index 9b47bf4d88..93bb78e894 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json index cd198b91d5..5f5b97c420 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json index 37a918823a..4b2eff0834 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json index 2f2bd4ac2b..83cb54e3a2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json index fbd987f20f..5f3ecd8841 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:palm_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:palm_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json index ca2067b391..84fb575fda 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json index cdb7c6f0cd..0fc7abd3f6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json index 94fc02223f..63488913e7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/palm_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json index 16d168b587..bde4a899aa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json index ab0e759713..7a23500892 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json index 2d9d04c265..2c0b94c6aa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json index 321fd1a997..89a6ba4f8d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:pine_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:pine_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json index 51826f67e0..1f44ca50fe 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json index ddef46cb85..dc27040ed5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json index a977792101..9ac73a8ed5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:pine_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json index 73c45b0e39..0c2fa2c4f1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json index 8f118e1b9f..314397b4d4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json index ae326f012f..6617defb43 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json index 6371ad2a67..d4c095280d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json index bb699b50bc..7983625626 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json index 57a620a126..f88c05d28f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:pine_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:pine_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json index ac409f5c03..9838294f41 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json index 114d3d6ff0..c8c9d4da41 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json index 4d677c86ba..34dfc50361 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/pine_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json index fb77c00ea3..8e87afa7c2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_aspen_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:aspen_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json index 30159fa7cb..511f8c47ac 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_baobab_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:baobab_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json index ac79c4394b..4899154aaa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_blue_enchanted_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json index 30347721e8..f47b1d88b9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_bulbis_oddity.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:bulbis_oddity" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json index 0ba7ef8729..b7ca8fb046 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cika_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cika_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json index 02b8193a93..85e3d813fc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_cypress_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:cypress_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json index 05df10f684..545b4495ab 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ebony_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ebony_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json index a4985bf1ab..8ea7cd5faa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_embur_wart.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:embur_wart" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json index 848f25bf57..35fbad4869 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_ether_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:ether_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json index 7baacd2842..fb4bd76c34 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_fir_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:fir_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json index 895d7ecab4..95b52635ec 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_green_enchanted_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json index 905b1bdd03..bd1bab74aa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_holly_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:holly_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json index 83c25a3772..f2b371c4e3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_imparius_mushroom.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:imparius_mushroom" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json index 4308456f8c..7c80b1d179 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_jacaranda_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json index ddd0551ccc..4d47dfe382 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_lament_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:lament_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json index 1f96348a09..8ece4c1717 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mahogany_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json index 91cf2f1962..aa6dc6f190 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_mangrove_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json index 4136a3ea59..421e19129d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_maple_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:maple_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json index af631749c3..5ed91607d4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_nightshade_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:nightshade_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json index f984a43e37..01c7f52990 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_palm_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:palm_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json index 711d4e3de2..0748327bd6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_pine_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:pine_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json index 5a2c66b89b..67f59773bb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_rainbow_eucalyptus_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json index de33cdb434..f3928e71c3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_redwood_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json index 32db15ef27..d828815ad5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_skyris_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json index 1518abd657..9325173853 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_sythian_fungus.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_fungus" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json index c29aefd615..55b7f89055 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_willow_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json index a4686c8e02..52bba433e2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_witch_hazel_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json index 8cb012ab51..3b392dad1d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/potted_zelkova_sapling.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_sapling" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json index 98f7c2dcba..2f975b62c6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json index 759c4e2449..34633ea79c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json index 4a0558f424..a4965cc92b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json index 4670dd31b4..36af34df78 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:rainbow_eucalyptus_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:rainbow_eucalyptus_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json index a159971516..6e71984fc9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json index 9bb7d726cc..b4be73f2ae 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json index a4eecbe40a..5c85875ea3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:rainbow_eucalyptus_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json index 87bb81855b..4d07a1cdc7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json index a49eee0092..3676f8af9d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json index 7eb9e9230a..60ca71b44d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json index 8e262c8133..3b63d49436 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json index 6e9519231e..161ae074ce 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json index 73c88177d7..4aac839c80 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:rainbow_eucalyptus_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:rainbow_eucalyptus_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json index e20a554d1e..5c9244cfc7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json index d614a8098e..93bbda096c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json index 45a36b3e17..03c2dc2e0a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/rainbow_eucalyptus_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json index 97e6e5cb88..278789233d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json index ddcb7f9b43..308f466d3f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json index d8fe969cc4..6ea79c0b8e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json index bd454869e9..35de810743 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:redwood_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:redwood_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json index a259965fe2..6597ac717f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json index 8432d4d03b..6e516d59be 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json index e4f9be8aa6..3879b50c8a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:redwood_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json index 264014f29e..130b936215 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json index a67bd075b3..bd0b98df00 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json index cc0e41fef2..22e8dd5c3e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json index c66a085348..814118ebe1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json index ea50d6ed52..98cfbebd35 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json index d41c935082..54ef01f4e8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:redwood_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:redwood_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json index 60c2d2dda1..09b3753a02 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json index e1d70ddc98..aa3178ceb8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json index a7540997a4..4549a89f63 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/redwood_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:redwood_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json index 8f79244356..b9021c2b32 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json index c6e5f1601e..cca34173d5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json index 75308c893a..e1c8648922 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json index 3bfe033975..3e90a7a6b1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:skyris_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:skyris_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json index 29eee3c4a0..8b45f6aed6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json index 282e6ebb97..82e081ee01 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json index 88767a76e6..503fa78f66 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:skyris_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json index 6295c21eb3..08612352a7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json index 0412dd4800..1234f5a87a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json index 3269dbc769..1d9ffadcbf 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json index e3c43375b4..b04855915a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json index e11cfe4efb..71ea0518a3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json index 16aefbd123..c404c4fd95 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:skyris_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:skyris_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json index 024eed7843..ea0bd662c8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json index 22496c9389..440c137f33 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json index b9028f9e66..68cda08b2b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/skyris_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:skyris_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json index dfeb8b6484..0775a04bef 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_aspen_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json index e8ba83c7c1..10873fc097 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_aspen_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_aspen_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json index 7965f598ab..b9c449e5b0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_baobab_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json index deb81ddbb4..8ad8b6ccef 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_baobab_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_baobab_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json index 0a33e3d30a..3a901d9ade 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_blue_enchanted_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json index f1392d9376..6297b89cae 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_blue_enchanted_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_blue_enchanted_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json index 4b0332ca9e..802a7f8456 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_stem.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_bulbis_stem" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json index fecadbe855..8db3532710 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_bulbis_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_bulbis_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json index 6cdec0f524..7cb4e88ce2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cherry_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json index 78fedeea07..dd74f43129 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cherry_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cherry_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json index c768fad8dd..cb4b4eae86 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cika_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json index dcdb77f6f1..5e4b12eeae 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cika_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cika_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json index d803764257..f99584d0d2 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cypress_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json index dee38abcd0..f69e72abe3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_cypress_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_cypress_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json index 563b0a1c70..40177b785d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_ebony_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json index 70d75aac32..3b9bf24360 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ebony_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_ebony_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json index dda7c135e8..69e262bcfa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_hyphae.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_embur_hyphae" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json index 5cd0c3cee2..2848bc7687 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_embur_pedu.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_embur_pedu" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json index ad1d199ab5..bde07dfb72 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_ether_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json index a604abda6c..11254e0667 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_ether_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_ether_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json index d38a68011e..5636c91bc9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_fir_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json index d3a563ea4f..65358cdaac 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_fir_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_fir_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json index 1cdbbbf50d..03f6493b86 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_green_enchanted_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json index c7dded76b0..a96cd3e9fb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_green_enchanted_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_green_enchanted_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json index f90cd3ebd2..de7ef210df 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_holly_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json index a96198b2cb..59da96acb6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_holly_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_holly_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json index abe5fe6093..f0ed9ef4dc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_jacaranda_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json index 44db28b55d..5b99d51786 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_jacaranda_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_jacaranda_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json index 301f33d637..c9df46eb81 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_lament_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json index 7437a2912e..c36fc896a5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_lament_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_lament_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json index c62419ba4d..deb79952b3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_mahogany_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json index c3a3d9e936..74e308f45b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mahogany_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_mahogany_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json index af925ee1b6..02bc012cbc 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_mangrove_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json index 8ab69821c6..2dbf118b98 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_mangrove_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_mangrove_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json index 65a756814f..8b5818e70c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_maple_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json index bef2a9f421..de4f88da30 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_maple_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_maple_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json index 78a6e5b4fd..c941bc3a96 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_nightshade_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json index 56d42ac1fd..c6c9d23f39 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_nightshade_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_nightshade_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json index e4d10f90d8..a8bf118923 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_palm_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json index b91076aad6..b571641d89 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_palm_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_palm_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json index 9eddd67b8a..3dbf92a7b4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_pine_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json index 3276972605..2297d55bd5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_pine_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_pine_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json index 3979db4a3b..720ab0dc9b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_rainbow_eucalyptus_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json index 24d584e7d6..d2c8167be1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_rainbow_eucalyptus_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_rainbow_eucalyptus_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json index 26332631b3..a305ea17ad 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_redwood_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json index c664ab1a01..64db4d6284 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_redwood_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_redwood_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json index c144131713..d65c06adfb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_skyris_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json index 298a44a773..82d9a7c163 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_skyris_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_skyris_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json index 90c855f65f..ec8612a2be 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_hyphae.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_sythian_hyphae" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json index 0b8d44a8b0..a2d6e88270 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_sythian_stem.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_sythian_stem" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json index 49c96e4e00..44eb40dc20 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_willow_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json index 14803e6f3e..85e529ab12 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_willow_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_willow_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json index a6fa10a5d0..02705fad39 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_witch_hazel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json index 1bc41e80ec..7380d5cc1a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_witch_hazel_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_witch_hazel_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json index c745d310e2..22a9ec6187 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_zelkova_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json index 37555b2cb2..5398bb4aed 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/stripped_zelkova_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:stripped_zelkova_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json index e1ea2e9cb2..23a3452561 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json index 4c71a41328..7048280fdd 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json index a812171cac..69299180e4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json index 1b20db3577..ef0ca32553 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:sythian_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:sythian_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json index 542dab9e6c..0ce3a21849 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json index afd05c114d..8427484916 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json index b33f3634d0..ee1d77ccdd 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_fungus.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_fungus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json index 7a15e2b250..b680c2e8f3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_hyphae.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_hyphae" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json index 898c346358..50c6d2714e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json index 22f78de967..5eff70d3b1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json index 38e5306aff..bc23637b4b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json index 9947aa894a..8c48ac365a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:sythian_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:sythian_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json index 98b5b61a7b..51731f3bc8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json index 1ca4a3368f..71a8324fa6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_stem.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_stem" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json index 2e8d0618df..2917c14223 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:sythian_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json index e0bf36ee1b..902bf66146 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/sythian_wart_block.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:sythian_fungus" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json index fdcb4ccd77..40728f5102 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json index c4a23fad50..146cc3ced5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json index 2a3a1a130b..d1165f0697 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json index b1a53c42b9..f4bdfffcce 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:willow_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:willow_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json index e80fc07d86..50064dc7eb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json index 558bb02d7b..a8837b655a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json index 814a90c9c1..b79c4f48cb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:willow_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json index 34e019481b..5f22340ed4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json index 6dab7c0e52..a48c3f1443 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json index ee4d03f5ad..2b65b77c5e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json index dc2c76370a..86c144fbc7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json index c8ae96a045..7952ce7930 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json index 97de486403..c60dcb9804 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:willow_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:willow_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json index 3503313845..a9be866605 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json index 76c4dc3183..023bc43cc3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json index fc92165782..86a3ff262c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/willow_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:willow_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json index fdd6359e65..a4e17f5862 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json index 8449b2ef6a..a9a71d4125 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json index 662b9ec798..efcf9523de 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json index 4854b31d1b..b4f9ceec7a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:witch_hazel_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:witch_hazel_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json index 4ecd5c4126..51b57fe83e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json index 1122a9b706..0b8d2bae0d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json index 035b089105..6fdaf081d5 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:witch_hazel_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json index 4ff747e460..0a31305db8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json index 87ab742daa..09aace6784 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json index 7d1f1a311f..f10fe41203 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json index d4169e0053..a9dbce33c7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json index 56efd6dd39..4253bd06c8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json index 644cb20385..d0b4558c4c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:witch_hazel_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:witch_hazel_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json index 94c019b339..8dcf160967 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json index d4eae99ce8..1f1efb7438 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json index 4b3fb5547d..26f2c88b36 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/witch_hazel_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json index 0c3ccd22da..03e0b7c632 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_bookshelf.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -31,9 +30,9 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": 3.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -43,7 +42,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json index 0dd0a3a2ab..b72cea32aa 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_button.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_button" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json index 1cd283ff91..b3269319f7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_crafting_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_crafting_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json index deeea34cf9..e526813987 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_door.json @@ -2,15 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:zelkova_door", + "condition": "minecraft:block_state_property", "properties": { "half": "lower" } @@ -19,11 +23,7 @@ "name": "byg:zelkova_door" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json index 2727385136..5e24badab4 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_fence" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json index f0704e8adb..1c742939f0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_fence_gate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_fence_gate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json index 45aa8ccd27..7b39973333 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_leaves.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -47,58 +46,25 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", "chances": [ 0.05, 0.0625, 0.083333336, 0.1 - ] + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" } ], "name": "byg:zelkova_sapling" } ] } - ] + ], + "rolls": 1.0 }, { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], "conditions": [ { "condition": "minecraft:inverted", @@ -129,7 +95,41 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json index fe175980ec..2f348f6b94 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json index 916bf62386..21d9dd7b6d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json index ad0eebdb18..a3df6e9a2c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_pressure_plate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_pressure_plate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json index 8c301c740f..c9bea23476 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json index ce34c4e103..d2357e9066 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_sign.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_sign" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json index ee1ab78c90..e6a734db1b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "byg:zelkova_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "byg:zelkova_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json index 5b79ebc6af..6ec33ce587 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json index 780e1d620b..b83f4cf317 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_trapdoor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_trapdoor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json index 9f9748e727..f4bab34359 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/blocks/zelkova_wood.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_wood" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json index 386e32e2d5..427f5c8bd9 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:aspen_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json index 1d02ce45aa..198322680d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/aspen_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:aspen_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json index 8bd90bf3a1..34f239585b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:baobab_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json index 3a14725f41..b2008638e1 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/baobab_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:baobab_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json index 8eebf625f8..72ba0f22f8 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json index 4ff3980f4a..21f1288e8f 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/blue_enchanted_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:blue_enchanted_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json index f52b00fd24..4bda4d7100 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cherry_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json index 6d5c60c3e3..dd5356756a 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cherry_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cherry_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json index 9a95f5cda8..2ba0c59e5d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cika.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cika_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json index 0dbc769253..fff4646d15 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cika_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cika_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json index bc3136d073..7b7b372288 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cypress_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json index aca7c548ff..4730aa7093 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/cypress_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:cypress_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json index aa6c974555..6a0412fa6c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:ebony_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json index ebcc567315..3fda82040d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/ebony_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:ebony_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json b/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json index 619009f06b..bf59ab737d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/fir.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:fir_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json index a9c75669c2..36735f48fe 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/fir_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:fir_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json index 34041a9a9e..a5ba58d568 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json index 6dadc2662f..77906eecf7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/green_enchanted_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:green_enchanted_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json b/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json index 26e143a32e..aaa09fd134 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/holly.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:holly_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json index 507ff2269a..5b64470734 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/holly_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:holly_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json index bbb3694a05..82dc76c8d7 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json index 14c4c70f6f..f3a8578d4e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/jacaranda_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:jacaranda_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json index 16885232ff..b2cf03bda6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json index ad6076eff1..eba61e67de 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mahogony_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:mahogany_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json index 5a2a283950..83fba09d4d 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json index 8c20064b01..3ff26ff7ec 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/mangrove_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:mangrove_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json b/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json index 67fb717c34..c53b759280 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/maple.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:maple_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json index 3a50613197..ca15469e60 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/maple_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:maple_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json b/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json index 0ea1b411cb..3ea176df56 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/palm.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:palm_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json index 83077b5711..0622883f3b 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/palm_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:palm_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json b/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json index 8bb61e5401..66d27bd0b0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/pine.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:pine_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json index 84be8e598c..5f5920e7f6 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/pine_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:pine_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json index 04fb72a644..cfbe00ac7c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json index 6745bd011e..5b85577431 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/rainbow_eucalyptus_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:rainbow_eucalyptus_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json index ab21dde9c7..d8439a8c12 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:redwood_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json index 09b77b069c..f4280d73b0 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/redwood_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:redwood_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json index a3c2058ca0..589693e66e 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:skyris_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json index 5147a8019e..fe6fa40731 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/skyris_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:skyris_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json b/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json index 1060478b68..b632476ef3 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/willow.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:willow_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json index b65865f303..a5c010b556 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/willow_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:willow_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json index af315aab1a..5b757751cb 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json index 6d51d9332b..7e29dce33c 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/witch_hazel_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:witch_hazel_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json index 14a482aec6..074e3b7110 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova.json @@ -2,14 +2,14 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_boat" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json index 9ca156292e..1754fa4970 100644 --- a/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json +++ b/Common/src/generated/resources/data/byg/loot_tables/boats/zelkova_fall.json @@ -2,24 +2,24 @@ "type": "minecraft:entity", "pools": [ { - "rolls": 2.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "minecraft:stick" } - ] + ], + "rolls": 2.0 }, { - "rolls": 3.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "byg:zelkova_planks" } - ] + ], + "rolls": 3.0 } ] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json index c8482a6dff..e3fad51c0d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:aspen_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json index 4dd3aefa7c..c8f9a73f47 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:aspen_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:aspen_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:aspen_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json index 2a66e488a1..f4e45f517a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:aspen_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json index 2ff545214b..7a2df27de3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:aspen_door", - "count": 3 + "count": 3, + "item": "byg:aspen_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json index 50332fcd1d..63b277d0ce 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:aspen_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:aspen_fence", - "count": 3 + "count": 3, + "item": "byg:aspen_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json index 0ef53cc809..9766369c25 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:aspen_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:aspen_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json index 1f10a00d40..6873c21874 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:aspen_planks", - "count": 4 + "count": 4, + "item": "byg:aspen_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json index 0c0100ab68..8251266e0d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:aspen_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json index cadeb59689..69dee42191 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:aspen_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:aspen_sign", - "count": 3 + "count": 3, + "item": "byg:aspen_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json index 3c962628bd..a01b6a333a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:aspen_slab", - "count": 6 + "count": 6, + "item": "byg:aspen_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json index abdc889abc..29b4ad7740 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:aspen_slab", - "count": 4 + "count": 4, + "item": "byg:aspen_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json index b5755b1ca9..aa5fbc678e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:aspen_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:aspen_trapdoor", - "count": 2 + "count": 2, + "item": "byg:aspen_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json index ff2cf613e6..82e398e1aa 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/aspen/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:aspen_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:aspen_wood", - "count": 3 + "count": 3, + "item": "byg:aspen_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json index 45a88ad27a..f4751c2af0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:baobab_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json index a73c2b3886..56315dffde 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:baobab_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:baobab_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:baobab_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json index 7799bd1dfd..0c573ff13a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:baobab_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json index f88d15219c..905be7d3e9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:baobab_door", - "count": 3 + "count": 3, + "item": "byg:baobab_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json index 20280badc0..a2eac9997f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:baobab_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:baobab_fence", - "count": 3 + "count": 3, + "item": "byg:baobab_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json index aad6c49a12..f3d6af49ab 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:baobab_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:baobab_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json index ed60434226..d233401557 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:baobab_planks", - "count": 4 + "count": 4, + "item": "byg:baobab_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json index 81420d5bf7..c03af7933d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:baobab_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json index a79ecc842d..466cf9a8e3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:baobab_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:baobab_sign", - "count": 3 + "count": 3, + "item": "byg:baobab_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json index 0fbfe71e03..794c7fd5bd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:baobab_slab", - "count": 6 + "count": 6, + "item": "byg:baobab_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json index f16d3756d9..eb9ef6bcff 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:baobab_slab", - "count": 4 + "count": 4, + "item": "byg:baobab_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json index 3b1f452d8e..b6f00468cc 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:baobab_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:baobab_trapdoor", - "count": 2 + "count": 2, + "item": "byg:baobab_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json index 642b1d66fc..f1d38b24fe 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/baobab/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:baobab_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:baobab_wood", - "count": 3 + "count": 3, + "item": "byg:baobab_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json index 6b32da2ff6..265fcb60e7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:blue_enchanted_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json index b8e82cef31..0c3dcadac5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:blue_enchanted_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:blue_enchanted_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json index 6d1590d86e..ceb5fd875f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:blue_enchanted_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json index 829f4c0690..3ba0dc3479 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:blue_enchanted_door", - "count": 3 + "count": 3, + "item": "byg:blue_enchanted_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json index 384fab2b8d..3c6cd3f395 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:blue_enchanted_fence", - "count": 3 + "count": 3, + "item": "byg:blue_enchanted_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json index 712de5810a..5193dc95c0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:blue_enchanted_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json index a0169150b5..af169af2b9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:blue_enchanted_planks", - "count": 4 + "count": 4, + "item": "byg:blue_enchanted_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json index d05a035e71..c9a80f1a20 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:blue_enchanted_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json index 153b94654a..0ab9bf55c0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:blue_enchanted_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:blue_enchanted_sign", - "count": 3 + "count": 3, + "item": "byg:blue_enchanted_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json index af456fe399..ce876a0642 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:blue_enchanted_slab", - "count": 6 + "count": 6, + "item": "byg:blue_enchanted_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json index 982da5af42..5460a0a89d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:blue_enchanted_slab", - "count": 4 + "count": 4, + "item": "byg:blue_enchanted_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json index 42076ffe8c..ea2336dd4d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:blue_enchanted_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:blue_enchanted_trapdoor", - "count": 2 + "count": 2, + "item": "byg:blue_enchanted_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json index 6f15833f95..f3e2d758d4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/blue_enchanted/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:blue_enchanted_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:blue_enchanted_wood", - "count": 3 + "count": 3, + "item": "byg:blue_enchanted_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json index 3544d419ad..54465a991a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:bulbis_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:bulbis_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:bulbis_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json index 24fe44ce0f..d52ca49fb5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:bulbis_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json index 638b761db4..bc5c4646eb 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:bulbis_door", - "count": 3 + "count": 3, + "item": "byg:bulbis_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json index 1557b4f241..6ea101d751 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:bulbis_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:bulbis_fence", - "count": 3 + "count": 3, + "item": "byg:bulbis_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json index df96bf82ba..b61e12dd8c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:bulbis_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:bulbis_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json index 60eaa7c302..60df87f897 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:bulbis_planks", - "count": 4 + "count": 4, + "item": "byg:bulbis_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json index d0280167d7..61e0fab53c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:bulbis_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json index d9e9f38cf0..924aaf6412 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:bulbis_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:bulbis_sign", - "count": 3 + "count": 3, + "item": "byg:bulbis_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json index fbeafefecd..2129c4301a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:bulbis_slab", - "count": 6 + "count": 6, + "item": "byg:bulbis_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json index 06a7a6f82c..1d90312930 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:bulbis_slab", - "count": 4 + "count": 4, + "item": "byg:bulbis_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json index 0fbb44b622..d38a635e55 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:bulbis_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:bulbis_trapdoor", - "count": 2 + "count": 2, + "item": "byg:bulbis_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json index bec7bf4c3f..9dbc518967 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/bulbis/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:bulbis_stem" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:bulbis_wood", - "count": 3 + "count": 3, + "item": "byg:bulbis_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json index edc2861480..7699815b7d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:cherry_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json index fcdde704bb..52b3a5381a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:cherry_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:cherry_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:cherry_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json index aaefa5bbed..20d34cc76c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:cherry_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json index f5cf1d83b7..238c74c3c6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:cherry_door", - "count": 3 + "count": 3, + "item": "byg:cherry_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json index 47fb1c6a95..f3e7bd299b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:cherry_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:cherry_fence", - "count": 3 + "count": 3, + "item": "byg:cherry_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json index 23a5059940..ae5c61236b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:cherry_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:cherry_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json index 18a58c1bef..a8b77e6398 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:cherry_planks", - "count": 4 + "count": 4, + "item": "byg:cherry_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json index d7bc76208a..d9075f7bc7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:cherry_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json index 07989aa85e..a854cbcfab 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:cherry_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:cherry_sign", - "count": 3 + "count": 3, + "item": "byg:cherry_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json index afbcd876a3..940f001408 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:cherry_slab", - "count": 6 + "count": 6, + "item": "byg:cherry_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json index 879c201719..dc7611df43 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:cherry_slab", - "count": 4 + "count": 4, + "item": "byg:cherry_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json index f1037f372c..9c5001cc26 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:cherry_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:cherry_trapdoor", - "count": 2 + "count": 2, + "item": "byg:cherry_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json index 6d3e953819..f5137e3e32 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cherry/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:cherry_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:cherry_wood", - "count": 3 + "count": 3, + "item": "byg:cherry_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json index ff6f966f1c..c8dcbacf86 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:cika_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json index 9dc2531623..fbb1310eec 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:cika_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:cika_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:cika_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json index aa1b5a1802..24c99c0ab4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:cika_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json index 17331a60a2..2b01bd157d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:cika_door", - "count": 3 + "count": 3, + "item": "byg:cika_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json index d1dc6fa4ac..dc534b8294 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:cika_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:cika_fence", - "count": 3 + "count": 3, + "item": "byg:cika_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json index 822c0c4c3e..cc32909a6c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:cika_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:cika_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json index 10ecdc315a..4941ac2ff9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:cika_planks", - "count": 4 + "count": 4, + "item": "byg:cika_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json index 9c4ac16185..9f298e5014 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:cika_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json index c8e14d9a65..a404cdcce8 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:cika_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:cika_sign", - "count": 3 + "count": 3, + "item": "byg:cika_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json index 1681894bb5..5a2611e7c2 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:cika_slab", - "count": 6 + "count": 6, + "item": "byg:cika_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json index 72bc735cac..3c227d84bf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:cika_slab", - "count": 4 + "count": 4, + "item": "byg:cika_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json index 48133ca973..f1f95e62bf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:cika_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:cika_trapdoor", - "count": 2 + "count": 2, + "item": "byg:cika_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json index 29918ceee4..00f2c245fe 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cika/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:cika_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:cika_wood", - "count": 3 + "count": 3, + "item": "byg:cika_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json index c4a11ff986..1169ff32db 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:cypress_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json index a3ea52446c..e104288f02 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:cypress_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:cypress_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:cypress_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json index e60766814d..3109f4fb27 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:cypress_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json index ad2afbc8ae..b48108cb5e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:cypress_door", - "count": 3 + "count": 3, + "item": "byg:cypress_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json index c7e1ef43dc..29f815bb0f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:cypress_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:cypress_fence", - "count": 3 + "count": 3, + "item": "byg:cypress_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json index 6f361cd322..83725cfa94 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:cypress_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:cypress_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json index 1deea807ee..04df2cd681 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:cypress_planks", - "count": 4 + "count": 4, + "item": "byg:cypress_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json index ea3d35012e..ae2c4a69a4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:cypress_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json index 64b7edfbd4..14d27c2a0f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:cypress_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:cypress_sign", - "count": 3 + "count": 3, + "item": "byg:cypress_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json index 3f348ddeb4..57296d2eb4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:cypress_slab", - "count": 6 + "count": 6, + "item": "byg:cypress_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json index 405f47f11f..39ee5ab28e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:cypress_slab", - "count": 4 + "count": 4, + "item": "byg:cypress_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json index 0cc2392f90..c1bd59eb44 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:cypress_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:cypress_trapdoor", - "count": 2 + "count": 2, + "item": "byg:cypress_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json index 61b784bbb6..fbe600a627 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/cypress/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:cypress_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:cypress_wood", - "count": 3 + "count": 3, + "item": "byg:cypress_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json index 2a9e5c26fc..87a276d41c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:ebony_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json index 3e206eb488..28c65990c9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:ebony_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:ebony_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:ebony_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json index 229d202452..1002610070 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:ebony_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json index d0fd483362..debb0de9d9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:ebony_door", - "count": 3 + "count": 3, + "item": "byg:ebony_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json index f4d2e1b255..c403397ad7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:ebony_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:ebony_fence", - "count": 3 + "count": 3, + "item": "byg:ebony_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json index bd7cd1c9ec..087b6949b5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:ebony_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:ebony_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json index 75a9283ff6..02f6b3449f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:ebony_planks", - "count": 4 + "count": 4, + "item": "byg:ebony_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json index 101cbf889b..a5b4c895bb 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:ebony_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json index e8aa38a1b9..5529d5cb46 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:ebony_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:ebony_sign", - "count": 3 + "count": 3, + "item": "byg:ebony_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json index 8932f57ceb..0029bdd8e1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:ebony_slab", - "count": 6 + "count": 6, + "item": "byg:ebony_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json index 4804ab1ecc..db968d2872 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:ebony_slab", - "count": 4 + "count": 4, + "item": "byg:ebony_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json index 2a884e31ef..4e9a79fe70 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:ebony_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:ebony_trapdoor", - "count": 2 + "count": 2, + "item": "byg:ebony_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json index 97570adf68..f6de892298 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ebony/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:ebony_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:ebony_wood", - "count": 3 + "count": 3, + "item": "byg:ebony_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json index e126ea598e..3ba1366aae 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:embur_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:embur_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:embur_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json index 6ad103ea61..6c9c91d6d0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:embur_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json index 38946c373d..31ab298869 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:embur_door", - "count": 3 + "count": 3, + "item": "byg:embur_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json index 53987691c3..3f14cdbad6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:embur_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:embur_fence", - "count": 3 + "count": 3, + "item": "byg:embur_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json index b313d74761..43de1041aa 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:embur_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:embur_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json index 4175a2b2cf..c8e21ca3e5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:embur_planks", - "count": 4 + "count": 4, + "item": "byg:embur_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json index 747e408297..2f6f902d22 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:embur_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json index c47b18a40e..b6c9c39a89 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:embur_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:embur_sign", - "count": 3 + "count": 3, + "item": "byg:embur_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json index ca9776171d..4014d2ea2c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:embur_slab", - "count": 6 + "count": 6, + "item": "byg:embur_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json index 30b67c3cf7..56288502c2 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:embur_slab", - "count": 4 + "count": 4, + "item": "byg:embur_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json index 30dd0f3be3..b2deb4c5b7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:embur_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:embur_trapdoor", - "count": 2 + "count": 2, + "item": "byg:embur_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json index 3ae0fdaed4..9088dfadaf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/embur/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:embur_pedu" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:embur_hyphae", - "count": 3 + "count": 3, + "item": "byg:embur_hyphae" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json index 91a5ea0111..a12c1bee08 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:ether_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:ether_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:ether_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json index d840ec0f6c..5d59ca5992 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:ether_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json index 5f49e1ed51..aeef5a4a94 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:ether_door", - "count": 3 + "count": 3, + "item": "byg:ether_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json index bebbda77dd..7cc5ae4c78 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:ether_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:ether_fence", - "count": 3 + "count": 3, + "item": "byg:ether_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json index 6367312e92..2b52c74543 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:ether_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:ether_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json index 78a9086971..6cf584da7a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:ether_planks", - "count": 4 + "count": 4, + "item": "byg:ether_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json index ff2e78b81e..5e8b794542 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:ether_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json index 45fc170d49..e56ec4901e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:ether_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:ether_sign", - "count": 3 + "count": 3, + "item": "byg:ether_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json index 86e2177ee2..67e721912a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:ether_slab", - "count": 6 + "count": 6, + "item": "byg:ether_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json index 17b5165765..27bb68ee21 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:ether_slab", - "count": 4 + "count": 4, + "item": "byg:ether_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json index 65b934e7af..b1c56512f4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:ether_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:ether_trapdoor", - "count": 2 + "count": 2, + "item": "byg:ether_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json index 239daf6a6a..6fed9719d5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/ether/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:ether_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:ether_wood", - "count": 3 + "count": 3, + "item": "byg:ether_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json index 73824468ee..8ded54346c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:fir_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json index 40ec4f8590..b8ec4ef825 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:fir_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:fir_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:fir_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json index 995a6d9d01..a772143184 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:fir_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json index 11ac8e4422..ea0788ebc6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:fir_door", - "count": 3 + "count": 3, + "item": "byg:fir_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json index 44115c0286..6fca4fef0a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:fir_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:fir_fence", - "count": 3 + "count": 3, + "item": "byg:fir_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json index 55f2835146..499c13fa3a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:fir_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:fir_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json index 7b1abf5ae2..bf9abaf0a4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:fir_planks", - "count": 4 + "count": 4, + "item": "byg:fir_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json index 15dc534a43..feee76e55d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:fir_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json index c14b1529e9..17d0e5899a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:fir_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:fir_sign", - "count": 3 + "count": 3, + "item": "byg:fir_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json index 44edc86c0d..9a6bb9d4dc 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:fir_slab", - "count": 6 + "count": 6, + "item": "byg:fir_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json index 54f2c8aad6..4ed36dbd8e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:fir_slab", - "count": 4 + "count": 4, + "item": "byg:fir_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json index 57d8c57a07..e400c93420 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:fir_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:fir_trapdoor", - "count": 2 + "count": 2, + "item": "byg:fir_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json index 88728451ee..7392a70fad 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/fir/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:fir_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:fir_wood", - "count": 3 + "count": 3, + "item": "byg:fir_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json index 6d06fe14e2..517443cbff 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:green_enchanted_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json index a1babb3940..3c38916a9b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:green_enchanted_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:green_enchanted_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json index 78e7e0d2b2..c50d0c99c7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:green_enchanted_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json index 8060d3ef4b..bc44b5238a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:green_enchanted_door", - "count": 3 + "count": 3, + "item": "byg:green_enchanted_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json index dd86a1c26b..9e6d270a47 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:green_enchanted_fence", - "count": 3 + "count": 3, + "item": "byg:green_enchanted_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json index 3f40082cd8..cc3dd95365 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:green_enchanted_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json index 45faafc92b..dccd83c524 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:green_enchanted_planks", - "count": 4 + "count": 4, + "item": "byg:green_enchanted_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json index 788384afaa..bcc18b22f9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:green_enchanted_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json index 192074ed04..601f5d5652 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:green_enchanted_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:green_enchanted_sign", - "count": 3 + "count": 3, + "item": "byg:green_enchanted_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json index 1d7acf34b7..2d83b1df06 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:green_enchanted_slab", - "count": 6 + "count": 6, + "item": "byg:green_enchanted_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json index 81d4cf4c0e..e748b78cc5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:green_enchanted_slab", - "count": 4 + "count": 4, + "item": "byg:green_enchanted_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json index 0c39412c72..d2117a0c47 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:green_enchanted_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:green_enchanted_trapdoor", - "count": 2 + "count": 2, + "item": "byg:green_enchanted_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json index efa2406a67..552f9510bf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/green_enchanted/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:green_enchanted_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:green_enchanted_wood", - "count": 3 + "count": 3, + "item": "byg:green_enchanted_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json index 401a789ef4..3f43f3dcb9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:holly_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json index 7c55b73a35..7931227e75 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:holly_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:holly_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:holly_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json index 19d17bc71c..614f4868d9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:holly_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json index c91e890ad4..0b4a228008 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:holly_door", - "count": 3 + "count": 3, + "item": "byg:holly_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json index 78881c3ecd..bf2874fd17 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:holly_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:holly_fence", - "count": 3 + "count": 3, + "item": "byg:holly_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json index c5189260d1..db3d60ab2d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:holly_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:holly_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json index 04e5e6a722..3d69a26f98 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:holly_planks", - "count": 4 + "count": 4, + "item": "byg:holly_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json index f19eaec542..232a59cff4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:holly_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json index fb78047e43..7dfaaeea18 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:holly_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:holly_sign", - "count": 3 + "count": 3, + "item": "byg:holly_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json index 367e128680..e08b55a5da 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:holly_slab", - "count": 6 + "count": 6, + "item": "byg:holly_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json index 7e3cfa336c..bd3d765e1d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:holly_slab", - "count": 4 + "count": 4, + "item": "byg:holly_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json index 7fa1b10b35..a11c03cb3c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:holly_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:holly_trapdoor", - "count": 2 + "count": 2, + "item": "byg:holly_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json index 9e99ecf6f5..006cc70a4e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/holly/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:holly_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:holly_wood", - "count": 3 + "count": 3, + "item": "byg:holly_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json index 285119a4e1..1484efc60f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:imparius_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:imparius_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:imparius_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json index 82da0e87b8..7d7903d7ba 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:imparius_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json index 4a9e55780c..2c9bf014e6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:imparius_door", - "count": 3 + "count": 3, + "item": "byg:imparius_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json index b47f501bdd..89b3485e0f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:imparius_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:imparius_fence", - "count": 3 + "count": 3, + "item": "byg:imparius_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json index 4ed1004b77..2a3a768d83 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:imparius_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:imparius_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json index ba3710075e..3a6f3a07f6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:imparius_planks", - "count": 4 + "count": 4, + "item": "byg:imparius_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json index c3b1c58a72..1f45e12ea3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:imparius_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json index 727a4d4499..aeeace0c9e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:imparius_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:imparius_sign", - "count": 3 + "count": 3, + "item": "byg:imparius_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json index b92a31bfa8..f106905be9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:imparius_slab", - "count": 6 + "count": 6, + "item": "byg:imparius_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json index 874b28a059..1fcd70bb76 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:imparius_slab", - "count": 4 + "count": 4, + "item": "byg:imparius_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json index 2cc7283927..cc5a47b6d2 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:imparius_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:imparius_trapdoor", - "count": 2 + "count": 2, + "item": "byg:imparius_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json index f554d5a63a..4220234cc3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/imparius/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:imparius_stem" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:imparius_hyphae", - "count": 3 + "count": 3, + "item": "byg:imparius_hyphae" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json index de9c588ec5..cd3f82a68a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:jacaranda_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json index e4ea733674..db80c8444f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:jacaranda_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:jacaranda_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json index f428435a2e..cf78e56e6c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:jacaranda_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json index 5d1f8f3ceb..c5e287ab85 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:jacaranda_door", - "count": 3 + "count": 3, + "item": "byg:jacaranda_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json index 6e0499c128..9f17319175 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:jacaranda_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:jacaranda_fence", - "count": 3 + "count": 3, + "item": "byg:jacaranda_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json index 1557256900..6ec874551b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:jacaranda_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:jacaranda_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json index 52a42bc766..9b6defb635 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:jacaranda_planks", - "count": 4 + "count": 4, + "item": "byg:jacaranda_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json index ceb73d2b12..327aa585e4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:jacaranda_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json index f9316263fd..b62d6a9fed 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:jacaranda_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:jacaranda_sign", - "count": 3 + "count": 3, + "item": "byg:jacaranda_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json index 8302ad1b73..3ff9c1982c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:jacaranda_slab", - "count": 6 + "count": 6, + "item": "byg:jacaranda_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json index c76193446d..fd3e1fa0eb 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:jacaranda_slab", - "count": 4 + "count": 4, + "item": "byg:jacaranda_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json index b6a8dd5b61..5655ff32b9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:jacaranda_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:jacaranda_trapdoor", - "count": 2 + "count": 2, + "item": "byg:jacaranda_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json index 8020b00144..89ef64aca7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/jacaranda/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:jacaranda_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:jacaranda_wood", - "count": 3 + "count": 3, + "item": "byg:jacaranda_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json index 9d6ff707d2..40b56006ff 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:lament_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:lament_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:lament_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json index 4111582edb..013ffd93cc 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:lament_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json index 93e3b3086e..b6cb205c72 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:lament_door", - "count": 3 + "count": 3, + "item": "byg:lament_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json index 496a1f32b1..f104c890a1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:lament_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:lament_fence", - "count": 3 + "count": 3, + "item": "byg:lament_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json index d9d2a4fad6..72899051ef 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:lament_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:lament_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json index ead5894f9f..6468fc0849 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:lament_planks", - "count": 4 + "count": 4, + "item": "byg:lament_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json index d9499c77ac..a4c957100c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:lament_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json index a601c6c441..e572ac14ec 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:lament_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:lament_sign", - "count": 3 + "count": 3, + "item": "byg:lament_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json index a867eee0fb..b167d53900 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:lament_slab", - "count": 6 + "count": 6, + "item": "byg:lament_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json index e875a52d18..7536b2dce7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:lament_slab", - "count": 4 + "count": 4, + "item": "byg:lament_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json index 1860c23682..ac87aeb6c5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:lament_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:lament_trapdoor", - "count": 2 + "count": 2, + "item": "byg:lament_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json index 9320cbeabc..32c13df4f4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/lament/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:lament_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:lament_wood", - "count": 3 + "count": 3, + "item": "byg:lament_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json index 34e253af8c..68932ecb96 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:mahogany_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json index 492b7292a0..272d63c931 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:mahogany_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:mahogany_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:mahogany_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json index 1dde55c90b..333d2be696 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:mahogany_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json index 44204409b5..688d55138a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:mahogany_door", - "count": 3 + "count": 3, + "item": "byg:mahogany_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json index 143bb873b6..6ad21b4bed 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:mahogany_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:mahogany_fence", - "count": 3 + "count": 3, + "item": "byg:mahogany_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json index 7d18716e4b..b31048deca 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:mahogany_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:mahogany_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json index 7ff07908d3..7f895f4340 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:mahogany_planks", - "count": 4 + "count": 4, + "item": "byg:mahogany_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json index 562bc70d2f..1b94ed5821 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:mahogany_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json index 565c168b00..3016316b6a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:mahogany_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:mahogany_sign", - "count": 3 + "count": 3, + "item": "byg:mahogany_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json index bdd768c800..9645ee90e7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:mahogany_slab", - "count": 6 + "count": 6, + "item": "byg:mahogany_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json index 4c286d5c17..232e56b3db 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:mahogany_slab", - "count": 4 + "count": 4, + "item": "byg:mahogany_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json index ee9ffe06cd..7e0dad9576 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:mahogany_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:mahogany_trapdoor", - "count": 2 + "count": 2, + "item": "byg:mahogany_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json index c4619a99c4..7e7814e46a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mahogany/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:mahogany_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:mahogany_wood", - "count": 3 + "count": 3, + "item": "byg:mahogany_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json index 455c7d3fa0..1aeb0e91bc 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:mangrove_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json index 0ca58135f8..ca91a90ef1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:mangrove_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:mangrove_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:mangrove_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json index 29ed115ac8..be50c5aaf3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:mangrove_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json index 96c7c36971..f2e35b4ffd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:mangrove_door", - "count": 3 + "count": 3, + "item": "byg:mangrove_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json index 30bd460ec1..73c7efda55 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:mangrove_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:mangrove_fence", - "count": 3 + "count": 3, + "item": "byg:mangrove_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json index e1d74e18b0..7132ddc15d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:mangrove_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:mangrove_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json index c462669e76..d0dcef1434 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:mangrove_planks", - "count": 4 + "count": 4, + "item": "byg:mangrove_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json index ed67dbd630..48cef39ff6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:mangrove_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json index 83a8fe19db..81db50a53c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:mangrove_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:mangrove_sign", - "count": 3 + "count": 3, + "item": "byg:mangrove_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json index bc42e9678d..5b0b21db28 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:mangrove_slab", - "count": 6 + "count": 6, + "item": "byg:mangrove_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json index 8754a8d222..acade1aca5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:mangrove_slab", - "count": 4 + "count": 4, + "item": "byg:mangrove_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json index e6eaf3e639..385aede53d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:mangrove_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:mangrove_trapdoor", - "count": 2 + "count": 2, + "item": "byg:mangrove_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json index e055e7e4cd..5ec5d6d278 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/mangrove/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:mangrove_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:mangrove_wood", - "count": 3 + "count": 3, + "item": "byg:mangrove_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json index b3ad4dba9b..da15ce1833 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:maple_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json index f6052b42ce..4013b4ab66 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:maple_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:maple_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:maple_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json index 737004159e..1858242fa5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:maple_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json index b59845ecd4..8a345e2758 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:maple_door", - "count": 3 + "count": 3, + "item": "byg:maple_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json index 1b1d49454e..33a60b76aa 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:maple_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:maple_fence", - "count": 3 + "count": 3, + "item": "byg:maple_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json index 23bee3ccd8..6ff95049a6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:maple_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:maple_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json index 25ccc0240b..e50d44c6e8 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:maple_planks", - "count": 4 + "count": 4, + "item": "byg:maple_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json index 59e05f09a1..0a9d8b59f6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:maple_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json index bfedeedc9b..b652ec6e4b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:maple_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:maple_sign", - "count": 3 + "count": 3, + "item": "byg:maple_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json index af65075cf4..e5d8309300 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:maple_slab", - "count": 6 + "count": 6, + "item": "byg:maple_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json index 75264ed9f8..ef5f541d6f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:maple_slab", - "count": 4 + "count": 4, + "item": "byg:maple_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json index eb686017d9..95ab3e4758 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:maple_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:maple_trapdoor", - "count": 2 + "count": 2, + "item": "byg:maple_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json index 08c06f8e65..f234e5d67a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/maple/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:maple_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:maple_wood", - "count": 3 + "count": 3, + "item": "byg:maple_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json index 93b8e5934a..9cb1ec67fb 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:nightshade_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:nightshade_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:nightshade_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json index 4444cc8068..9f6788d4bf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:nightshade_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json index e4fa277eef..4555afdeb5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:nightshade_door", - "count": 3 + "count": 3, + "item": "byg:nightshade_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json index 8e5e0b5055..ff8468d8d1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:nightshade_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:nightshade_fence", - "count": 3 + "count": 3, + "item": "byg:nightshade_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json index 5c9d1c59a4..b0ee29144a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:nightshade_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:nightshade_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json index 6b74663b44..38c51fb6f4 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:nightshade_planks", - "count": 4 + "count": 4, + "item": "byg:nightshade_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json index f8b40ecd45..244f334b06 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:nightshade_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json index f7f3e58f53..a656418e91 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:nightshade_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:nightshade_sign", - "count": 3 + "count": 3, + "item": "byg:nightshade_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json index c1463cb2b1..fdf6967dbb 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:nightshade_slab", - "count": 6 + "count": 6, + "item": "byg:nightshade_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json index b1eebe34ed..66ed3c4d44 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:nightshade_slab", - "count": 4 + "count": 4, + "item": "byg:nightshade_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json index e84edcb879..e523fba085 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:nightshade_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:nightshade_trapdoor", - "count": 2 + "count": 2, + "item": "byg:nightshade_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json index c2f23aa08f..51ce79ab3e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/nightshade/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:nightshade_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:nightshade_wood", - "count": 3 + "count": 3, + "item": "byg:nightshade_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json index b82399a315..80a96fda44 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:palm_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json index da7f2e9f5b..d4f7b29126 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:palm_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:palm_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:palm_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json index 675e637d6b..b96a5f1b4e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:palm_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json index 5009bc74f6..7c9db58995 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:palm_door", - "count": 3 + "count": 3, + "item": "byg:palm_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json index c500b9125e..fd8cc01b69 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:palm_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:palm_fence", - "count": 3 + "count": 3, + "item": "byg:palm_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json index 123b15d266..5cab0c4b26 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:palm_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:palm_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json index 4547630bf3..e4fd984f07 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:palm_planks", - "count": 4 + "count": 4, + "item": "byg:palm_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json index 77a8739017..c0442b7dd6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:palm_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json index 132fde1bef..6c5701162d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:palm_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:palm_sign", - "count": 3 + "count": 3, + "item": "byg:palm_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json index 3f5b06d78d..8bf8752060 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:palm_slab", - "count": 6 + "count": 6, + "item": "byg:palm_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json index f17251c039..73fafac604 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:palm_slab", - "count": 4 + "count": 4, + "item": "byg:palm_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json index 7123ea4b9e..bcb29c967e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:palm_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:palm_trapdoor", - "count": 2 + "count": 2, + "item": "byg:palm_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json index 0e80398554..b2f4822fc1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/palm/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:palm_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:palm_wood", - "count": 3 + "count": 3, + "item": "byg:palm_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json index 235b9142da..c8145aeefa 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:pine_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json index dc3664f944..e6f6dc7448 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:pine_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:pine_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:pine_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json index bafc88c64f..c29780c7ca 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:pine_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json index 502d2ae0a2..37c8f15069 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:pine_door", - "count": 3 + "count": 3, + "item": "byg:pine_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json index 2b7254b881..8bea350fc3 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:pine_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:pine_fence", - "count": 3 + "count": 3, + "item": "byg:pine_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json index 17b910984c..c335812fb6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:pine_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:pine_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json index 43550865c4..6b803eefa8 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:pine_planks", - "count": 4 + "count": 4, + "item": "byg:pine_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json index 5cb7fd0aea..5c89d2b0b0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:pine_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json index fc7824c759..9e8668da79 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:pine_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:pine_sign", - "count": 3 + "count": 3, + "item": "byg:pine_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json index 631df49a4c..eae30e1ad6 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:pine_slab", - "count": 6 + "count": 6, + "item": "byg:pine_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json index 4988c3114d..5e93fdd676 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:pine_slab", - "count": 4 + "count": 4, + "item": "byg:pine_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json index 2409148cfa..79d794b9d7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:pine_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:pine_trapdoor", - "count": 2 + "count": 2, + "item": "byg:pine_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json index 15a140efff..cf6bcf16f1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/pine/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:pine_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:pine_wood", - "count": 3 + "count": 3, + "item": "byg:pine_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json index 9e7ac23ee4..b6c41f9efe 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:rainbow_eucalyptus_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json index 83618fb973..6d45da51a0 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:rainbow_eucalyptus_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:rainbow_eucalyptus_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json index 230c5318bd..1d6e160926 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:rainbow_eucalyptus_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json index ef3a25cbb7..d236837e48 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:rainbow_eucalyptus_door", - "count": 3 + "count": 3, + "item": "byg:rainbow_eucalyptus_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json index c921ffbf8c..30bf4e8048 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:rainbow_eucalyptus_fence", - "count": 3 + "count": 3, + "item": "byg:rainbow_eucalyptus_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json index f10de2ff49..8a9966770c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:rainbow_eucalyptus_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json index 150b83dd7d..8954e0a60f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:rainbow_eucalyptus_planks", - "count": 4 + "count": 4, + "item": "byg:rainbow_eucalyptus_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json index 34a9edf5ce..1173f93e9f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:rainbow_eucalyptus_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json index 29099e8aee..36a70440f7 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:rainbow_eucalyptus_sign", - "count": 3 + "count": 3, + "item": "byg:rainbow_eucalyptus_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json index 9c166cb60c..048b3a3b23 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:rainbow_eucalyptus_slab", - "count": 6 + "count": 6, + "item": "byg:rainbow_eucalyptus_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json index d8b57246a0..3eb0facff1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:rainbow_eucalyptus_slab", - "count": 4 + "count": 4, + "item": "byg:rainbow_eucalyptus_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json index ebf9d200cd..3e00f3448a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:rainbow_eucalyptus_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:rainbow_eucalyptus_trapdoor", - "count": 2 + "count": 2, + "item": "byg:rainbow_eucalyptus_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json index c04166c66e..e247c5f660 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/rainbow_eucalyptus/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:rainbow_eucalyptus_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:rainbow_eucalyptus_wood", - "count": 3 + "count": 3, + "item": "byg:rainbow_eucalyptus_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json index 480f24b29e..f52c2acecd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:redwood_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json index 37cc6e57fa..08fb98bb3c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:redwood_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:redwood_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:redwood_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json index 112e23777e..dc7393f5c2 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:redwood_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json index ae9d25076f..57e6882d06 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:redwood_door", - "count": 3 + "count": 3, + "item": "byg:redwood_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json index 6e05b96fb6..b949f09a1c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:redwood_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:redwood_fence", - "count": 3 + "count": 3, + "item": "byg:redwood_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json index 442d397f0f..4c8fe1bc7a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:redwood_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:redwood_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json index dcef0e7a73..3bf9ece8ef 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:redwood_planks", - "count": 4 + "count": 4, + "item": "byg:redwood_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json index 3c20f6285c..6c8c67ecb1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:redwood_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json index 6533d1e21c..ae73546ebe 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:redwood_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:redwood_sign", - "count": 3 + "count": 3, + "item": "byg:redwood_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json index a013c5afc2..a61cd8ae56 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:redwood_slab", - "count": 6 + "count": 6, + "item": "byg:redwood_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json index 0f32a9e85a..980987487b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:redwood_slab", - "count": 4 + "count": 4, + "item": "byg:redwood_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json index f2dd585063..7f2358e880 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:redwood_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:redwood_trapdoor", - "count": 2 + "count": 2, + "item": "byg:redwood_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json index 302c337d96..b86e2eca4d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/redwood/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:redwood_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:redwood_wood", - "count": 3 + "count": 3, + "item": "byg:redwood_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json index 31bd13e86c..01691c1df9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:skyris_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json index b7edc4207a..703d2fb439 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:skyris_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:skyris_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:skyris_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json index b526765bde..d27bc6e1ab 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:skyris_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json index a94125f266..9ef559ba32 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:skyris_door", - "count": 3 + "count": 3, + "item": "byg:skyris_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json index e96480a1c4..9c0c3a114e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:skyris_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:skyris_fence", - "count": 3 + "count": 3, + "item": "byg:skyris_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json index 52be2c8716..efe5d78c0d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:skyris_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:skyris_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json index c2eab9ca2b..2e787beb5b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:skyris_planks", - "count": 4 + "count": 4, + "item": "byg:skyris_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json index 474ce3ffd7..1154ddc1e9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:skyris_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json index a453d90e91..4312b34e0b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:skyris_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:skyris_sign", - "count": 3 + "count": 3, + "item": "byg:skyris_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json index 40900770f4..e30d109de9 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:skyris_slab", - "count": 6 + "count": 6, + "item": "byg:skyris_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json index 5ada32cde5..4106de067e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:skyris_slab", - "count": 4 + "count": 4, + "item": "byg:skyris_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json index 512dd8f131..07ffdffd96 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:skyris_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:skyris_trapdoor", - "count": 2 + "count": 2, + "item": "byg:skyris_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json index bb867afee5..d08ae6e630 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/skyris/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:skyris_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:skyris_wood", - "count": 3 + "count": 3, + "item": "byg:skyris_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json index 62e15ece01..7ebe280385 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:sythian_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:sythian_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:sythian_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json index 5bb2b10233..803bced755 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:sythian_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json index 7c82bde292..cc16a9e17a 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:sythian_door", - "count": 3 + "count": 3, + "item": "byg:sythian_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json index ef60efc831..2f9cf87f57 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:sythian_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:sythian_fence", - "count": 3 + "count": 3, + "item": "byg:sythian_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json index 223e7ea02b..2d53cd5b8b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:sythian_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:sythian_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json index 0e576ad281..02cf694993 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:sythian_planks", - "count": 4 + "count": 4, + "item": "byg:sythian_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json index 403b590379..6c18d4b897 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:sythian_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json index e4c5c35225..859337b264 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:sythian_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:sythian_sign", - "count": 3 + "count": 3, + "item": "byg:sythian_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json index a263d5e56b..5006436676 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:sythian_slab", - "count": 6 + "count": 6, + "item": "byg:sythian_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json index e382234cf1..bac9e775da 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:sythian_slab", - "count": 4 + "count": 4, + "item": "byg:sythian_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json index d3ce47e6f9..882670b18c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:sythian_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:sythian_trapdoor", - "count": 2 + "count": 2, + "item": "byg:sythian_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json index e0c5cf4c0c..71b2e04968 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/sythian/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:sythian_stem" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:sythian_hyphae", - "count": 3 + "count": 3, + "item": "byg:sythian_hyphae" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json index 42b11bbe62..955020d968 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:willow_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json index ba572f0204..8cb7dcc35d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:willow_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:willow_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:willow_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json index 0661fe70d8..36003a05fe 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:willow_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json index fedce55e8d..39ce3cdbac 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:willow_door", - "count": 3 + "count": 3, + "item": "byg:willow_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json index 37bfdc583f..6aa95e6366 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:willow_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:willow_fence", - "count": 3 + "count": 3, + "item": "byg:willow_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json index 3d9f708db2..cf82b8ab6f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:willow_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:willow_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json index 78fd6a719a..92479ac72e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:willow_planks", - "count": 4 + "count": 4, + "item": "byg:willow_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json index e2e377b090..0fed936a86 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:willow_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json index 89ffd00ca0..112183473f 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:willow_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:willow_sign", - "count": 3 + "count": 3, + "item": "byg:willow_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json index 12e9972c35..bb1d11337d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:willow_slab", - "count": 6 + "count": 6, + "item": "byg:willow_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json index f661147d28..9f589a5c15 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:willow_slab", - "count": 4 + "count": 4, + "item": "byg:willow_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json index 5d6ee57465..bb1c086d97 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:willow_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:willow_trapdoor", - "count": 2 + "count": 2, + "item": "byg:willow_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json index 0bd51edf37..d954eca4bf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/willow/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:willow_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:willow_wood", - "count": 3 + "count": 3, + "item": "byg:willow_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json index 7d825192fa..8a20ba0145 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:witch_hazel_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json index 58cbe04f6b..20796240e5 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:witch_hazel_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:witch_hazel_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json index 05cdbb236e..3aa98a5a8e 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:witch_hazel_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json index db9f837c57..f0287ad012 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:witch_hazel_door", - "count": 3 + "count": 3, + "item": "byg:witch_hazel_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json index 186a9d0700..ceb37e9e03 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:witch_hazel_fence", - "count": 3 + "count": 3, + "item": "byg:witch_hazel_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json index ac25137f9d..ff8eb0ec05 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:witch_hazel_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json index 044f90dbe1..d9404116dd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:witch_hazel_planks", - "count": 4 + "count": 4, + "item": "byg:witch_hazel_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json index 8934d8fbb4..f843276d33 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:witch_hazel_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json index 03edd48a7a..ccb3568b3c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:witch_hazel_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:witch_hazel_sign", - "count": 3 + "count": 3, + "item": "byg:witch_hazel_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json index 4b035fe4d1..1a41dddd9c 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:witch_hazel_slab", - "count": 6 + "count": 6, + "item": "byg:witch_hazel_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json index d356b17f89..83373f6996 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:witch_hazel_slab", - "count": 4 + "count": 4, + "item": "byg:witch_hazel_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json index 3d977467fb..c646d68403 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:witch_hazel_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:witch_hazel_trapdoor", - "count": 2 + "count": 2, + "item": "byg:witch_hazel_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json index 5e2f8f0aaa..14f5651810 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/witch_hazel/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:witch_hazel_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:witch_hazel_wood", - "count": 3 + "count": 3, + "item": "byg:witch_hazel_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json index fbebadc0b4..3feea1292b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/boat.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "boat", - "pattern": [ - "P P", - "PPP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "P P", + "PPP" + ], "result": { "item": "byg:zelkova_boat" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json index 386f9a3cbc..5dd7cff615 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/bookshelf.json @@ -1,19 +1,19 @@ { "type": "minecraft:crafting_shaped", "group": "bookshelf", - "pattern": [ - "PPP", - "BBB", - "PPP" - ], "key": { - "P": { - "item": "byg:zelkova_planks" - }, "B": { "item": "minecraft:book" + }, + "P": { + "item": "byg:zelkova_planks" } }, + "pattern": [ + "PPP", + "BBB", + "PPP" + ], "result": { "item": "byg:zelkova_bookshelf" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json index e4fb7061af..969db34b36 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", "group": "crafting_table", - "pattern": [ - "PP", - "PP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "PP", + "PP" + ], "result": { "item": "byg:zelkova_crafting_table" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json index a7ffc58247..b92196047b 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/door.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_door", - "pattern": [ - "PP", - "PP", - "PP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "PP", + "PP", + "PP" + ], "result": { - "item": "byg:zelkova_door", - "count": 3 + "count": 3, + "item": "byg:zelkova_door" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json index 901778b61f..4385018177 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence", - "pattern": [ - "W#W", - "W#W" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,8 +9,12 @@ "item": "byg:zelkova_planks" } }, + "pattern": [ + "W#W", + "W#W" + ], "result": { - "item": "byg:zelkova_fence", - "count": 3 + "count": 3, + "item": "byg:zelkova_fence" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json index e03978bbee..fbe057befd 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/fence_gate.json @@ -1,10 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_fence_gate", - "pattern": [ - "#W#", - "#W#" - ], "key": { "#": { "tag": "byg:sticks" @@ -13,6 +9,10 @@ "item": "byg:zelkova_planks" } }, + "pattern": [ + "#W#", + "#W#" + ], "result": { "item": "byg:zelkova_fence_gate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json index 116651c562..852c04afdf 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/planks.json @@ -7,7 +7,7 @@ } ], "result": { - "item": "byg:zelkova_planks", - "count": 4 + "count": 4, + "item": "byg:zelkova_planks" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json index ad51d827ff..73da6edd22 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/pressure_plate.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_pressure_plate", - "pattern": [ - "PP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "PP" + ], "result": { "item": "byg:zelkova_pressure_plate" } diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json index 70175a3cc6..61c76ff115 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/sign.json @@ -1,11 +1,6 @@ { "type": "minecraft:crafting_shaped", "group": "sign", - "pattern": [ - "PPP", - "PPP", - " S " - ], "key": { "P": { "item": "byg:zelkova_planks" @@ -14,8 +9,13 @@ "tag": "byg:sticks" } }, + "pattern": [ + "PPP", + "PPP", + " S " + ], "result": { - "item": "byg:zelkova_sign", - "count": 3 + "count": 3, + "item": "byg:zelkova_sign" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json index 4a303e1963..d201fb97c1 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/slab.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_slab", - "pattern": [ - "PPP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "PPP" + ], "result": { - "item": "byg:zelkova_slab", - "count": 6 + "count": 6, + "item": "byg:zelkova_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json index a09bc85830..7dfe85a3ae 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/stairs.json @@ -1,18 +1,18 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_stairs", - "pattern": [ - "P ", - "PP ", - "PPP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "P ", + "PP ", + "PPP" + ], "result": { - "item": "byg:zelkova_slab", - "count": 4 + "count": 4, + "item": "byg:zelkova_slab" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json index 4d87b2e87b..403b39a86d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/trapdoor.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wooden_trapdoor", - "pattern": [ - "PPP", - "PPP" - ], "key": { "P": { "item": "byg:zelkova_planks" } }, + "pattern": [ + "PPP", + "PPP" + ], "result": { - "item": "byg:zelkova_trapdoor", - "count": 2 + "count": 2, + "item": "byg:zelkova_trapdoor" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json index a09ff1359c..b6405dce2d 100644 --- a/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json +++ b/Common/src/generated/resources/data/byg/recipes/wood/zelkova/wood.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", "group": "wood", - "pattern": [ - "LL", - "LL" - ], "key": { "L": { "item": "byg:zelkova_log" } }, + "pattern": [ + "LL", + "LL" + ], "result": { - "item": "byg:zelkova_wood", - "count": 3 + "count": 3, + "item": "byg:zelkova_wood" } } \ No newline at end of file diff --git a/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json b/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json index e2cde0a362..3e6f6a6aec 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/bookshelves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_bookshelf", "byg:baobab_bookshelf", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json b/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json index 064f2d1eb2..fa9b5388ee 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/end_stone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bulbis_phycelium", "byg:ether_stone", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/lush.json b/Common/src/generated/resources/data/byg/tags/blocks/lush.json index 929ac4cdde..3943ef31b7 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/lush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/lush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:lush_farmland", "byg:lush_grass_block", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/allium_flower_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/alpine_bellflower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/amaranth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/angelica.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/araucaria_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/aspen_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/baobab_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json index 3eb4811f63..3dd992bb3c 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/beach_grass.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:sand" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/begonia.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bistort.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/black_rose.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_enchanted_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_sage.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/blue_spruce_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_birch_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_oak_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/brown_zelkova_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json index 761a921370..4c271dfc4d 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/bulbis_oddity.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:end_stone", { diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/california_poppy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cika_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/clover_patch.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/crocus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cyan_amaranth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/cypress_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json index 2dc3d3d493..115273705b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/death_cap.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:nylium", "minecraft:mycelium", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/delphinium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ebony_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json index 2dc3d3d493..115273705b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/embur_wart.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:nylium", "minecraft:mycelium", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/ether_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json index 963c874b02..6aef53fc60 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fairy_slipper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt", "#minecraft:logs" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fir_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/firecracker_flower_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flower_patch.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_indigo_jacaranda_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/flowering_jacaranda_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/foxglove.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json index 761a921370..4c271dfc4d 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/fungal_imparius.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:end_stone", { diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json index 3eb4811f63..3dd992bb3c 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/golden_spined_cactus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:sand" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_enchanted_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json index cf820055e9..eec4973707 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_mushroom.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:base_stone_overworld", "#minecraft:dirt", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/green_tulip.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/guzmania.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/holly_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/horseweed.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/hydrangea_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json index 761a921370..4c271dfc4d 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/imparius_mushroom.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:end_stone", { diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/incan_lily.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/indigo_jacaranda_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/iris.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/jacaranda_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/japanese_orchid.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/joshua_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/kovan_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lament_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lazarus_bellflower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/lollipop_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_amaranth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/magenta_tulip.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mahogany_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json index 8267be7dcd..5119da02f7 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mangrove_tree.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt", "#minecraft:sand", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/maple_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json index 3eb4811f63..3dd992bb3c 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/mini_cactus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:sand" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/nightshade_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_amaranth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_birch_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_daisy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_oak_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orange_spruce_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/orchard_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/osiria_rose.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json index b0380bf71b..1501854ddb 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palm_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt", "#minecraft:sand" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/palo_verde_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/peach_leather_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pine_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_allium_bush.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_anemone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_cherry_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/pink_daffodil.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prairie_grass.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json index 3eb4811f63..3dd992bb3c 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/prickly_pear_cactus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:sand" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/protea_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_amaranth.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json index 761a921370..4c271dfc4d 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_bulbis_oddity.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:end_stone", { diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_sage.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/purple_tulip.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rainbow_eucalyptus_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_birch_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_maple_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_oak_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/red_spruce_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/redwood_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/richea.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/rose.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json index 761a921370..4c271dfc4d 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/shulkren_fungus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:end_stone", { diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_maple_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/silver_vase_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/skyris_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json index 2dc3d3d493..115273705b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/soul_shroom.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:nylium", "minecraft:mycelium", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json index 2dc3d3d493..115273705b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/sythian_fungus.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:nylium", "minecraft:mycelium", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_allium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json index 3eb4811f63..3dd992bb3c 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_beach_grass.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:sand" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_pink_allium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/tall_prairie_grass.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/torch_ginger.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/violet_leather_flower.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json index cf820055e9..eec4973707 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/weeping_milk_cap.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:base_stone_overworld", "#minecraft:dirt", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_anemone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_cherry_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/white_sage.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/willow_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/winter_succulent.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/witch_hazel_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json index 2dc3d3d493..115273705b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/withering_oak_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:nylium", "minecraft:mycelium", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json index cf820055e9..eec4973707 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/wood_blewit.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:base_stone_overworld", "#minecraft:dirt", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_birch_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_daffodil.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_spruce_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/yellow_tulip.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json index cb2c7cab6d..750a629858 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/may_place_on/zelkova_sapling.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:dirt" ] diff --git a/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json b/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json index 1abb5966cc..01475f097a 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/mushrooms.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bulbis_oddity", "byg:fungal_imparius", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json b/Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json index b7131ed398..8ef973c0c4 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/scaffolding.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:sythian_scaffolding", "minecraft:scaffolding" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/slabs.json b/Common/src/generated/resources/data/byg/tags/blocks/slabs.json index 94494c10a0..c93c1978cb 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/slabs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_slab", "byg:baobab_slab", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json index 77f4029245..75040a1d33 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/aspen_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_log", "byg:aspen_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json index 945a192dd4..214cc7e8c2 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/baobab_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:baobab_log", "byg:baobab_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json index 694ad5bad2..093806ecea 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/blue_enchanted_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:blue_enchanted_log", "byg:blue_enchanted_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json index 2a1e6751db..e44c3baa44 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/bulbis_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bulbis_stem", "byg:bulbis_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json index 777ae0f22d..0a9f631338 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cherry_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cherry_log", "byg:cherry_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json index 828a9932e9..721c469dfb 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cika_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cika_log", "byg:cika_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json index 07264a2e36..623f2ed54b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/cypress_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cypress_log", "byg:cypress_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json index 7892cf80c4..a63541eee6 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/ebony_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:ebony_log", "byg:ebony_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json index 73f0ef2813..f42b155d4a 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/embur_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:embur_hyphae", "byg:embur_pedu", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json index 7a3e09702d..0dc5522635 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/ether_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:ether_log", "byg:ether_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json index a047ac594d..4fb02b64c1 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/fir_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:fir_log", "byg:fir_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json index 51c0ddfd61..83bada21c9 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/green_enchanted_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:green_enchanted_log", "byg:green_enchanted_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json index 1152c46235..3cd8937ff5 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/holly_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:holly_log", "byg:holly_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json index 87dd26fd15..5527b0a445 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/imparius_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:imparius_hyphae", "byg:imparius_stem" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json index a5eccfd416..135f0cc2fc 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/jacaranda_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:jacaranda_log", "byg:jacaranda_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json index 1371ffb20c..1d31898dd4 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/lament_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:lament_log", "byg:lament_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json index 64556c0991..49b6559d98 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/mahogany_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:mahogany_log", "byg:mahogany_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json index cfb588ada2..4f2da732fd 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/mangrove_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:mangrove_log", "byg:mangrove_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json index cfbcc95457..baee316d0b 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/maple_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:maple_log", "byg:maple_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json index 6bff75fa77..d73c71a0ae 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/nightshade_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:nightshade_log", "byg:nightshade_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json index e479ac2263..ce729887e3 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/palm_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:palm_log", "byg:palm_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json index 655c0e63f5..b702581c19 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/palo_verde_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:palo_verde_log", "byg:palo_verde_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json index 0b1fdebcf7..6689214e81 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/pine_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:pine_log", "byg:pine_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json index 698520ab0c..7414f0e179 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/rainbow_eucalyptus_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:rainbow_eucalyptus_log", "byg:rainbow_eucalyptus_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json index 7027988498..984c7e156e 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/redwood_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:redwood_log", "byg:redwood_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json index 4a763046ba..1e3704df6f 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/skyris_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:skyris_log", "byg:skyris_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json index 00ce3fdb37..77d298b4c0 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/sythian_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_sythian_hyphae", "byg:stripped_sythian_stem", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json index e8903dcfb6..060fccdd92 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/willow_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_willow_log", "byg:stripped_willow_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json index 75dadab27a..a887a6dc21 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/witch_hazel_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_witch_hazel_log", "byg:stripped_witch_hazel_wood", diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json index 128286507c..6ec026a446 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/withering_oak_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:withering_oak_log", "byg:withering_oak_wood" diff --git a/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json b/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json index 5e4ee869e3..0b69483b52 100644 --- a/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json +++ b/Common/src/generated/resources/data/byg/tags/blocks/wood/zelkova_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_zelkova_log", "byg:stripped_zelkova_wood", diff --git a/Common/src/generated/resources/data/byg/tags/entity_types/boats.json b/Common/src/generated/resources/data/byg/tags/entity_types/boats.json index cf4bf3e20b..11e3a92cfa 100644 --- a/Common/src/generated/resources/data/byg/tags/entity_types/boats.json +++ b/Common/src/generated/resources/data/byg/tags/entity_types/boats.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:boat" ] diff --git a/Common/src/generated/resources/data/byg/tags/items/bookshelves.json b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json index e2cde0a362..3e6f6a6aec 100644 --- a/Common/src/generated/resources/data/byg/tags/items/bookshelves.json +++ b/Common/src/generated/resources/data/byg/tags/items/bookshelves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_bookshelf", "byg:baobab_bookshelf", diff --git a/Common/src/generated/resources/data/byg/tags/items/mushrooms.json b/Common/src/generated/resources/data/byg/tags/items/mushrooms.json index 1abb5966cc..01475f097a 100644 --- a/Common/src/generated/resources/data/byg/tags/items/mushrooms.json +++ b/Common/src/generated/resources/data/byg/tags/items/mushrooms.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bulbis_oddity", "byg:fungal_imparius", diff --git a/Common/src/generated/resources/data/byg/tags/items/sticks.json b/Common/src/generated/resources/data/byg/tags/items/sticks.json index ebe34b7fad..14ef1f164d 100644 --- a/Common/src/generated/resources/data/byg/tags/items/sticks.json +++ b/Common/src/generated/resources/data/byg/tags/items/sticks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ { "id": "#forge:rods/wooden", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json index 77f4029245..75040a1d33 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/aspen_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_log", "byg:aspen_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json index 945a192dd4..214cc7e8c2 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/baobab_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:baobab_log", "byg:baobab_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json index 694ad5bad2..093806ecea 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/blue_enchanted_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:blue_enchanted_log", "byg:blue_enchanted_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json index 2a1e6751db..e44c3baa44 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/bulbis_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bulbis_stem", "byg:bulbis_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json index 777ae0f22d..0a9f631338 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cherry_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cherry_log", "byg:cherry_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json index 828a9932e9..721c469dfb 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cika_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cika_log", "byg:cika_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json index 07264a2e36..623f2ed54b 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/cypress_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:cypress_log", "byg:cypress_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json index 7892cf80c4..a63541eee6 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ebony_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:ebony_log", "byg:ebony_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json index 73f0ef2813..f42b155d4a 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/embur_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:embur_hyphae", "byg:embur_pedu", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json index 7a3e09702d..0dc5522635 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/ether_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:ether_log", "byg:ether_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json index a047ac594d..4fb02b64c1 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/fir_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:fir_log", "byg:fir_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json index 51c0ddfd61..83bada21c9 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/green_enchanted_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:green_enchanted_log", "byg:green_enchanted_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json index 1152c46235..3cd8937ff5 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/holly_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:holly_log", "byg:holly_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json index 87dd26fd15..5527b0a445 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/imparius_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:imparius_hyphae", "byg:imparius_stem" diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json index a5eccfd416..135f0cc2fc 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/jacaranda_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:jacaranda_log", "byg:jacaranda_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json index 1371ffb20c..1d31898dd4 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/lament_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:lament_log", "byg:lament_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json index 64556c0991..49b6559d98 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mahogany_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:mahogany_log", "byg:mahogany_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json index cfb588ada2..4f2da732fd 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/mangrove_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:mangrove_log", "byg:mangrove_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json index cfbcc95457..baee316d0b 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/maple_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:maple_log", "byg:maple_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json index 6bff75fa77..d73c71a0ae 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/nightshade_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:nightshade_log", "byg:nightshade_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json index e479ac2263..ce729887e3 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palm_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:palm_log", "byg:palm_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json index 655c0e63f5..b702581c19 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/palo_verde_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:palo_verde_log", "byg:palo_verde_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json index 0b1fdebcf7..6689214e81 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/pine_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:pine_log", "byg:pine_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json index 698520ab0c..7414f0e179 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/rainbow_eucalyptus_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:rainbow_eucalyptus_log", "byg:rainbow_eucalyptus_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json index 7027988498..984c7e156e 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/redwood_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:redwood_log", "byg:redwood_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json index 4a763046ba..1e3704df6f 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/skyris_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:skyris_log", "byg:skyris_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json index 00ce3fdb37..77d298b4c0 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/sythian_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_sythian_hyphae", "byg:stripped_sythian_stem", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json index e8903dcfb6..060fccdd92 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/willow_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_willow_log", "byg:stripped_willow_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json index 75dadab27a..a887a6dc21 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/witch_hazel_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_witch_hazel_log", "byg:stripped_witch_hazel_wood", diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json index 128286507c..6ec026a446 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/withering_oak_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:withering_oak_log", "byg:withering_oak_wood" diff --git a/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json index 5e4ee869e3..0b69483b52 100644 --- a/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json +++ b/Common/src/generated/resources/data/byg/tags/items/wood/zelkova_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:stripped_zelkova_log", "byg:stripped_zelkova_wood", diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json index 88e6babf5d..f447ed85e5 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_badlands.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:red_rock_valley", "byg:sierra_badlands", diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json index f426a74dff..573f637b08 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_beach.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:rainbow_beach" ] diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json index 97c49f4183..01ed5f245f 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_dead.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:dead_sea" ] diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json index 97041cdf90..92dea87d6d 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_deep_ocean.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:dead_sea", "byg:lush_stacks" diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json index 69a0f7a808..4104b5b979 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_icy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:shattered_glacier" ] diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json index 97041cdf90..92dea87d6d 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_ocean.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:dead_sea", "byg:lush_stacks" diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json index 15001f56a4..5248b29325 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_sandy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:mojave_desert", "byg:windswept_dunes" diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json index e3c564203d..3296d9064f 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_snowy.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:frosted_coniferous_forest", "byg:frosted_taiga" diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json index ac422ec6fb..c7b0ede16d 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_spooky.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:weeping_witch_forest" ] diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json index 29426fc9bc..b68f24d8e3 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_swamp.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:bayou", "byg:cypress_swamplands" diff --git a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json index 97c49f4183..01ed5f245f 100644 --- a/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json +++ b/Common/src/generated/resources/data/byg/tags/worldgen/biome/is_wasteland.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:dead_sea" ] diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json b/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json index b5c38af1e6..e05eb18fa2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/buttons.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_button", "byg:baobab_button", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json b/Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json index 991274479a..c29c1ecde2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/campfires.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:boric_campfire", "byg:cryptic_campfire" diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/ice.json b/Common/src/generated/resources/data/minecraft/tags/blocks/ice.json index 739924e927..ed115bef70 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/ice.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/ice.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:black_ice", "byg:packed_black_ice" diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json b/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json index 9afa988a5c..5f33e7129f 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/leaves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:araucaria_leaves", "byg:aspen_leaves", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json index 18a5e30824..1a5eb98f11 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:wood/aspen_logs", "#byg:wood/baobab_logs", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json b/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json index ddec62fdde..38aae1bd2b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:wood/aspen_logs", "#byg:wood/baobab_logs", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 743e575e96..b7e618fe9f 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_bookshelf", "byg:aspen_button", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json index ce1b6c5a0f..0c236e39d9 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:black_sand", "byg:blue_petal_block", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json index 128286507c..6ec026a446 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/oak_logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:withering_oak_log", "byg:withering_oak_wood" diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json b/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json index cdb7689852..1dadffd664 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/planks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_planks", "byg:aspen_planks", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json b/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json index 05124eb859..eb364264f5 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/sand.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:black_sand", "byg:blue_sand", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json b/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json index 68b58cbf9e..8a63268de0 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/saplings.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:araucaria_sapling", "byg:aspen_sapling", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json index c82079ecd2..4b7a721193 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_stairs", "byg:baobab_stairs", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json index ad89b95828..3a4a5c872b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_trapdoor", "byg:baobab_trapdoor", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json index 462eeb7670..baaf01fb4f 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wart_blocks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:shulkren_wart_block", "byg:sythian_wart_block" diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json index b5c38af1e6..e05eb18fa2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_button", "byg:baobab_button", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json index ea5faa2ecc..187d1dd0ab 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_door", "byg:baobab_door", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json index 26142fb45f..193e9f5399 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_fence", "byg:baobab_fence", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json index b9432ae88e..230598fbbe 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_pressure_plate", "byg:baobab_pressure_plate", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json index 09afb700f7..8e80317693 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_slab", "byg:baobab_slab", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json index 7c447d1993..5c8486574e 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_stairs", "byg:baobab_stairs", diff --git a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json index ad89b95828..3a4a5c872b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_trapdoor", "byg:baobab_trapdoor", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json index b5c38af1e6..e05eb18fa2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/buttons.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_button", "byg:baobab_button", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json index 2876805537..676b12b833 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:araucaria_leaves", "byg:aspen_leaves", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs.json b/Common/src/generated/resources/data/minecraft/tags/items/logs.json index 18a5e30824..1a5eb98f11 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/logs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:wood/aspen_logs", "#byg:wood/baobab_logs", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json index ddec62fdde..38aae1bd2b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#byg:wood/aspen_logs", "#byg:wood/baobab_logs", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/planks.json b/Common/src/generated/resources/data/minecraft/tags/items/planks.json index cdb7689852..1dadffd664 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/planks.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/planks.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_planks", "byg:aspen_planks", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/generated/resources/data/minecraft/tags/items/sand.json index 05124eb859..eb364264f5 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/sand.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/sand.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:black_sand", "byg:blue_sand", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json index ee8c1e2de4..fba60ef41e 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/saplings.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/saplings.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:araucaria_sapling", "byg:aspen_sapling", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json index 5e8aecc986..f72d209df7 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,4 +1,3 @@ { - "replace": false, "values": [] } \ No newline at end of file diff --git a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json index c82079ecd2..4b7a721193 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_stairs", "byg:baobab_stairs", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json index ad89b95828..3a4a5c872b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/trapdoors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_trapdoor", "byg:baobab_trapdoor", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json index b5c38af1e6..e05eb18fa2 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_button", "byg:baobab_button", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json index ea5faa2ecc..187d1dd0ab 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_doors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_door", "byg:baobab_door", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json index 26142fb45f..193e9f5399 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_fences.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_fence", "byg:baobab_fence", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json index b9432ae88e..230598fbbe 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_pressure_plate", "byg:baobab_pressure_plate", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json index 09afb700f7..8e80317693 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_slab", "byg:baobab_slab", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json index 7c447d1993..5c8486574e 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_stairs", "byg:baobab_stairs", diff --git a/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json index ad89b95828..3a4a5c872b 100644 --- a/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ b/Common/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "byg:aspen_trapdoor", "byg:baobab_trapdoor", diff --git a/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java b/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java index 73046b1b48..89073d171d 100644 --- a/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java +++ b/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java @@ -35,6 +35,7 @@ public class BYGRegistry { public static void loadClasses() { BYGBlocks.loadClass(); BYGItems.loadClass(); + BYGFeatures.loadClass(); BYGMenuTypes.loadClass(); BYGEntities.loadClass(); @@ -46,6 +47,5 @@ public static void loadClasses() { BYGSounds.loadClass(); BYGStateProviders.loadClass(); BYGStructureTypes.loadClass(); - BYGFeatures.loadClass(); } } diff --git a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java index 8d2e5acad7..96952f0435 100644 --- a/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java +++ b/Forge/src/data/java/potionstudios/byg/datagen/providers/BYGWoodAssetsProvider.java @@ -6,6 +6,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ButtonBlock; import net.minecraft.world.level.block.CrossCollisionBlock; import net.minecraft.world.level.block.DoorBlock; @@ -17,8 +18,11 @@ import net.minecraft.world.level.block.StandingSignBlock; import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.WallSignBlock; +import net.minecraft.world.level.block.state.properties.DoorHingeSide; +import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.client.model.generators.ModelBuilder; @@ -92,27 +96,7 @@ protected void registerStatesAndModels() { configureTransform(item.withExistingParent(type.craftingTable().getId().getPath(), craftingTable.getLocation())); simpleBlock(type.craftingTable().get(), craftingTable); - final var doorBottomLeft = models().doorBottomLeft( - typeName + "/door_bottom", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") - ); - final var doorBottomRight = models().doorBottomRight( - typeName + "/door_bottom_hinge", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") - ); - final var doorTopLeft = models().doorTopLeft( - typeName + "/door_top", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") - ); - final var doorTopRight = models().doorTopRight( - typeName + "/door_top_hinge", - rl(typeLoc + "door_bottom"), - rl(typeLoc + "door_top") - ); - doorBlock((DoorBlock) type.door().get(), doorBottomLeft, doorBottomRight, doorTopLeft, doorTopRight); + door(typeName, type.door().get(), rl(typeLoc + "door_bottom"), rl(typeLoc + "door_top")); item.withExistingParent(type.door().getId().getPath(), generatedParent) .texture("layer0", rl(typeLocItem + "door")); @@ -240,6 +224,44 @@ protected void registerStatesAndModels() { } } + private void door(String typeLocation, Block door, ResourceLocation bottom, ResourceLocation top) { + final var bottomLeft = doorModel(typeLocation + "/door/bottom_left", "bottom_left", bottom, top); + final var bottomLeftOpen = doorModel(typeLocation + "/door/bottom_left_open", "bottom_left_open", bottom, top); + final var bottomRight = doorModel(typeLocation + "/door/bottom_right", "bottom_right", bottom, top); + final var bottomRightOpen = doorModel(typeLocation + "/door/bottom_right_open", "bottom_right_open", bottom, top); + + final var topLeft = doorModel(typeLocation + "/door/top_left", "top_left", bottom, top); + final var topLeftOpen = doorModel(typeLocation + "/door/top_left_open", "top_left_open", bottom, top); + final var topRight = doorModel(typeLocation + "/door/top_right", "top_right", bottom, top); + final var topRightOpen = doorModel(typeLocation + "/door/top_right_open", "top_right_open", bottom, top); + + getVariantBuilder(door) + .forAllStatesExcept(state -> { + int yRot = ((int) state.getValue(DoorBlock.FACING).toYRot()) + 90; + boolean rh = state.getValue(DoorBlock.HINGE) == DoorHingeSide.RIGHT; + boolean open = state.getValue(DoorBlock.OPEN); + boolean right = rh ^ open; + if (open) { + yRot += 90; + } + if (rh && open) { + yRot += 180; + } + yRot %= 360; + final var bottomModel = open ? (right ? bottomRightOpen : bottomLeftOpen) : (right ? bottomRight : bottomLeft); + final var topModel = open ? (right ? topRightOpen : topLeftOpen) : (right ? topRight : topLeft); + return ConfiguredModel.builder().modelFile(state.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER ? bottomModel : topModel) + .rotationY(yRot) + .build(); + }, DoorBlock.POWERED); + } + + private BlockModelBuilder doorModel(String name, String type, ResourceLocation bottom, ResourceLocation top) { + return models().withExistingParent(name, "block/door_" + type) + .texture("bottom", bottom) + .texture("top", top); + } + private BlockModelBuilder leaves(String name, ResourceLocation texture, ResourceLocation overlay) { return models().cube(name, texture, texture, texture, diff --git a/gradle.properties b/gradle.properties index 820afc06b3..b1e8b2e4da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ common_server_run_name=Common Server # Forge -forge_version=41.0.1 +forge_version=41.0.3 forge_ats_enabled=true # Fabric From 9d8d8c962ee4804c7304cbe87e49c42f3ecb0381 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 20:47:16 +0300 Subject: [PATCH 88/90] Fix another crash --- .../byg/common/world/structure/BYGStructureTypes.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructureTypes.java b/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructureTypes.java index 9436842b8c..255a2edf47 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructureTypes.java +++ b/Common/src/main/java/potionstudios/byg/common/world/structure/BYGStructureTypes.java @@ -13,12 +13,17 @@ public class BYGStructureTypes { - public static final RegistrationProvider PROVIDER = RegistrationProvider.get(Registry.STRUCTURE_TYPES, BYG.MOD_ID); + public static final RegistrationProvider> PROVIDER = RegistrationProvider.get(Registry.STRUCTURE_TYPES, BYG.MOD_ID); public static final RegistryObject> ARCH = register("arch", () -> ArchStructure.CODEC); private static RegistryObject> register(String id, Supplier> codec) { - return PROVIDER.register(id, codec); + return PROVIDER.register(id, () -> new StructureType() { + @Override + public Codec codec() { + return codec.get(); + } + }); } public static void loadClass() { From 62af33901bb59ecf2cd3daa491f43078b1b8e56c Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 22:11:47 +0300 Subject: [PATCH 89/90] Move some registries --- .../world/feature/BYGPlacedFeatures.java | 1 + .../feature/features/BYGFeaturesUtil.java | 4 +- .../features/BYGGlobalFeatureFeatures.java | 11 +- .../overworld/BYGOverworldTreeFeatures.java | 2 + .../BYGOverworldVegetationFeatures.java | 257 ++++++++++-------- .../potionstudios/byg/core/BYGRegistry.java | 4 + .../byg/util/lazy/LazySupplier.java | 13 +- 7 files changed, 165 insertions(+), 127 deletions(-) diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java index ae8a1a06f6..5cbedc511b 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/BYGPlacedFeatures.java @@ -338,4 +338,5 @@ public class BYGPlacedFeatures { public static final Holder MAGMA_PATCH_FIRE = createPlacedFeature("magma_patch_fire", BYGNetherFeatures.MAGMA_PATCH_FIRE, CountPlacement.of(UniformInt.of(30, 45)), InSquarePlacement.spread(), PlacementUtils.RANGE_4_4, BiomeFilter.biome()); public static final Holder NYLIUM_SOUL_PATCH_FIRE = createPlacedFeature("nylium_soul_patch_fire", BYGNetherFeatures.NYLIUM_SOUL_PATCH_FIRE, CountPlacement.of(UniformInt.of(5, 10)), InSquarePlacement.spread(), PlacementUtils.RANGE_4_4, BiomeFilter.biome()); + public static void loadClass() {} } diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGFeaturesUtil.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGFeaturesUtil.java index 88f8be738d..5342ce63f4 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGFeaturesUtil.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGFeaturesUtil.java @@ -33,10 +33,10 @@ public class BYGFeaturesUtil { public static final RegistrationProvider> CONFIGURED_FEATURES = RegistrationProvider.get(BuiltinRegistries.CONFIGURED_FEATURE, BYG.MOD_ID); public static > Holder> createConfiguredFeature(String id, Supplier feature, FC config) { + BYGGlobalFeatureFeatures.loadClass(); + BYGGlobalFeatures.loadClass(); return CONFIGURED_FEATURES.>register(id, () -> { // TODO: let's not do this... - BYGGlobalFeatureFeatures.loadClass(); - BYGGlobalFeatures.loadClass(); return new ConfiguredFeature<>(feature.get(), config); }).asHolder(); } diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGGlobalFeatureFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGGlobalFeatureFeatures.java index 95c4338d7d..aaaf795d11 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGGlobalFeatureFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/BYGGlobalFeatureFeatures.java @@ -3,16 +3,23 @@ import net.minecraft.core.Holder; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; import potionstudios.byg.common.block.BYGBlocks; import static net.minecraft.data.worldgen.features.OreFeatures.NATURAL_STONE; -import static potionstudios.byg.common.world.feature.features.BYGFeaturesUtil.createConfiguredFeature; +import static potionstudios.byg.common.world.feature.features.BYGFeaturesUtil.CONFIGURED_FEATURES; + +import java.util.function.Supplier; public class BYGGlobalFeatureFeatures { - public static final Holder> ORE_SOAPSTONE = createConfiguredFeature("ore_soapstone", () -> Feature.ORE, new OreConfiguration(NATURAL_STONE, BYGBlocks.SOAPSTONE.defaultBlockState(), 64)); + public static final Holder> ORE_SOAPSTONE = createConfiguredFeature("ore_soapstone", () -> Feature.ORE, () -> new OreConfiguration(NATURAL_STONE, BYGBlocks.SOAPSTONE.defaultBlockState(), 64)); public static void loadClass() { } + + public static > Holder> createConfiguredFeature(String id, Supplier feature, Supplier config) { + return CONFIGURED_FEATURES.>register(id, () -> new ConfiguredFeature<>(feature.get(), config.get())).asHolder(); + } } \ No newline at end of file diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java index 37d00666ee..6cafff4178 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldTreeFeatures.java @@ -2547,4 +2547,6 @@ public class BYGOverworldTreeFeatures { public static > Holder> createConfiguredFeature(String id, Supplier feature, Supplier config) { return BYGFeaturesUtil.CONFIGURED_FEATURES.>register(id, () -> new ConfiguredFeature<>(feature.get(), config.get())).asHolder(); } + + public static void loadClass() {} } diff --git a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldVegetationFeatures.java b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldVegetationFeatures.java index f896e7eaed..9ef0d5188c 100644 --- a/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldVegetationFeatures.java +++ b/Common/src/main/java/potionstudios/byg/common/world/feature/features/overworld/BYGOverworldVegetationFeatures.java @@ -1,17 +1,23 @@ package potionstudios.byg.common.world.feature.features.overworld; +import static potionstudios.byg.common.world.feature.placement.BYGPlacedFeaturesUtil.createPlacedFeature; +import static potionstudios.byg.mixin.access.VegetationFeaturesAccess.byg_invokeGrassPatch; import com.google.common.collect.ImmutableList; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; +import net.minecraft.data.worldgen.features.FeatureUtils; import net.minecraft.data.worldgen.features.VegetationFeatures; import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.WeightedPlacedFeature; import net.minecraft.world.level.levelgen.feature.configurations.*; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; +import net.minecraft.world.level.levelgen.feature.stateproviders.SimpleStateProvider; import net.minecraft.world.level.levelgen.placement.BlockPredicateFilter; import net.minecraft.world.level.material.Fluids; import potionstudios.byg.common.block.BYGBlocks; @@ -19,8 +25,11 @@ import potionstudios.byg.common.world.feature.BYGFeatures; import potionstudios.byg.common.world.feature.config.BYGMushroomConfig; import potionstudios.byg.common.world.feature.config.PumpkinConfig; +import potionstudios.byg.common.world.feature.features.BYGFeaturesUtil; + +import java.util.List; +import java.util.function.Supplier; -import static potionstudios.byg.common.world.feature.features.BYGFeaturesUtil.*; import static potionstudios.byg.common.world.feature.placement.BYGPlacedFeaturesUtil.createPlacedFeature; public class BYGOverworldVegetationFeatures { @@ -28,88 +37,88 @@ public class BYGOverworldVegetationFeatures { private static final BlockPredicateFilter ON_WATER_FILTER = BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(BlockPos.ZERO.below(), Fluids.WATER)); private static final BlockPredicateFilter IN_REPLACEABLE_FILTER = BlockPredicateFilter.forPredicate(BlockPredicate.replaceable()); - public static final Holder> ALLIUM_BUSH = createFlowerConfiguredFeature("allium_bush", BYGBlocks.ALLIUM_FLOWER_BUSH.get()); - public static final Holder> ALLIUM_PINK_BUSH = createFlowerConfiguredFeature("pink_allium_bush", BYGBlocks.PINK_ALLIUM_FLOWER_BUSH.get()); - public static final Holder> ALLIUM_TALL_BUSH = createPatchConfiguredFeature("tall_allium_bush", BYGBlocks.TALL_ALLIUM.get(), 15); - public static final Holder> ALLIUM_TALL_PINK_BUSH = createPatchConfiguredFeature("tall_pink_allium_bush", BYGBlocks.TALL_PINK_ALLIUM.get(), 15); - public static final Holder> ALOE_VERA = createPatchConfiguredFeature("aloe_vera", BYGBlocks.ALOE_VERA.get(), 6); - - public static final Holder> DUNE_TERRAIN = createConfiguredFeature("dune_terrain", BYGFeatures.DUNE_TERRAIN, FeatureConfiguration.NONE); - public static final Holder> AMARANTH = createFlowerConfiguredFeature("amaranth", BYGBlocks.AMARANTH.get()); - public static final Holder> AMARANTH_MAGENTA = createFlowerConfiguredFeature("magenta_amaranth", BYGBlocks.MAGENTA_AMARANTH.get()); - public static final Holder> AMARANTH_ORANGE = createFlowerConfiguredFeature("orange_amaranth", BYGBlocks.ORANGE_AMARANTH.get()); - public static final Holder> AMARANTH_PURPLE = createFlowerConfiguredFeature("purple_amaranth", BYGBlocks.PURPLE_AMARANTH.get()); - public static final Holder> AMARANTH_CYAN = createFlowerConfiguredFeature("cyan_amaranth", BYGBlocks.CYAN_AMARANTH.get()); - public static final Holder> FIRECRACKER_BUSH = createFlowerConfiguredFeature("firecracker_bush", BYGBlocks.FIRECRACKER_FLOWER_BUSH.get()); - public static final Holder> SHRUB = createPatchConfiguredFeature("shrub", BYGBlocks.SHRUB.get(), 4); - public static final Holder> MINI_CACTI = createPatchConfiguredFeature("mini_cacti", BYGBlocks.MINI_CACTUS.get(), 4); - public static final Holder> BARREL_CACTI = createPatchConfiguredFeature("barrel_cacti", BYGBlocks.BARREL_CACTUS.get(), 4); - public static final Holder> FLOWERING_BARREL_CACTI = createPatchConfiguredFeature("flowering_barrel_cacti", BYGBlocks.FLOWERING_BARREL_CACTUS.get(), 4); - public static final Holder> CLOVER_PATCH = createFlowerConfiguredFeature("clover_patch", BYGBlocks.CLOVER_PATCH.get()); - public static final Holder> FLOWER_PATCH = createFlowerConfiguredFeature("flower_patch", BYGBlocks.FLOWER_PATCH.get()); - public static final Holder> CALIFORNIA_POPPY = createFlowerConfiguredFeature("california_poppy", BYGBlocks.CALIFORNIA_POPPY.get()); - public static final Holder> WHITE_PUFFBALL = createFlowerConfiguredFeature("white_puffball", BYGBlocks.WHITE_PUFFBALL.get()); - public static final Holder> WEEPING_MILKCAP = createFlowerConfiguredFeature("weeping_milkcap", BYGBlocks.WEEPING_MILKCAP.get()); - public static final Holder> WOOD_BLEWIT = createFlowerConfiguredFeature("wood_blewit", BYGBlocks.WOOD_BLEWIT.get()); - public static final Holder> GREEN_MUSHROOM = createFlowerConfiguredFeature("green_mushroom", BYGBlocks.GREEN_MUSHROOM.get()); - public static final Holder> BEGONIA = createFlowerConfiguredFeature("begonia", BYGBlocks.BEGONIA.get()); - public static final Holder> BISTORT = createFlowerConfiguredFeature("bistort", BYGBlocks.BISTORT.get()); - public static final Holder> GUZMANIA = createFlowerConfiguredFeature("guzmania", BYGBlocks.GUZMANIA.get()); - public static final Holder> INCAN_LILY = createFlowerConfiguredFeature("incan_lily", BYGBlocks.INCAN_LILY.get()); - public static final Holder> LAZARUS_BELLFLOWER = createFlowerConfiguredFeature("lazarus_bellflower", BYGBlocks.LAZARUS_BELLFLOWER.get()); - public static final Holder> TORCH_GINGER = createFlowerConfiguredFeature("torch_ginger", BYGBlocks.TORCH_GINGER.get()); - public static final Holder> WINTER_SUCCULENT = createPatchConfiguredFeature("winter_succulent", BYGBlocks.WINTER_SUCCULENT.get(), 10); - public static final Holder> BEACH_GRASS = createPatchConfiguredFeature("beach_grass_patch", BYGBlocks.BEACH_GRASS.get(), 32); - public static final Holder> TALL_BEACH_GRASS_PATCH = createPatchConfiguredFeature("tall_beach_grass_patch", BYGBlocks.TALL_BEACH_GRASS.get(), 32); - public static final Holder> LEAF_PILE = createPatchConfiguredFeature("leaf_pile", BYGBlocks.LEAF_PILE.get(), 15); - public static final Holder> RICHEA = createFlowerConfiguredFeature("richea", BYGBlocks.RICHEA.get()); - public static final Holder> PRAIRIE_GRASS_PATCH = createPatchConfiguredFeature("prairie_grass_patch", BYGBlocks.PRAIRIE_GRASS.get(), 100); - public static final Holder> TALL_PRAIRIE_GRASS_PATCH = createPatchConfiguredFeature("tall_prairie_grass_patch", BYGBlocks.TALL_PRAIRIE_GRASS.get(), 100); - public static final Holder> ROSE_BUSH = createPatchConfiguredFeature("rose_bush", Blocks.ROSE_BUSH, 64); - public static final Holder> JAPANESE_ORCHID = createFlowerConfiguredFeature("japanese_orchid", BYGBlocks.JAPANESE_ORCHID.get()); - public static final Holder> FOXGLOVE = createFlowerConfiguredFeature("foxglove", BYGBlocks.FOXGLOVE.get()); - public static final Holder> FLOWERING_INDIGO_JACARANDA_BUSH = createPatchConfiguredFeature("flowering_indigo_jacaranda_bush", BYGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH.get(), 32); - public static final Holder> INDIGO_JACARANDA_BUSH = createPatchConfiguredFeature("indigo_jacaranda_bush", BYGBlocks.INDIGO_JACARANDA_BUSH.get(), 32); - public static final Holder> FLOWERING_JACARANDA_BUSH = createPatchConfiguredFeature("flowering_jacaranda_bush", BYGBlocks.FLOWERING_JACARANDA_BUSH.get(), 32); - public static final Holder> JACARANDA_BUSH = createPatchConfiguredFeature("jacaranda_bush", BYGBlocks.JACARANDA_BUSH.get(), 32); - public static final Holder> PRICKLY_PEAR_CACTI = createPatchConfiguredFeature("prickly_pear_cacti", BYGBlocks.PRICKLY_PEAR_CACTUS.get(), 5); - public static final Holder> GOLDEN_SPINED_CACTI = createPatchConfiguredFeature("golden_spined_cacti", BYGBlocks.GOLDEN_SPINED_CACTUS.get(), 5); - public static final Holder> PINK_CHERRY_FOLIAGE = createPatchConfiguredFeature("pink_cherry_foliage", BYGBlocks.PINK_CHERRY_FOLIAGE.get(), 15); - public static final Holder> WHITE_CHERRY_FOLIAGE = createPatchConfiguredFeature("white_cherry_foliage", BYGBlocks.WHITE_CHERRY_FOLIAGE.get(), 15); - public static final Holder> BLUE_BERRY_BUSH = createPatchConfiguredFeature("blue_berry_bush", BYGBlocks.BLUEBERRY_BUSH.defaultBlockState().setValue(BlueBerryBush.AGE, 3), 3); - public static final Holder> ROSE = createFlowerConfiguredFeature("rose", BYGBlocks.ROSE.get()); - public static final Holder> CROCUS = createFlowerConfiguredFeature("crocus", BYGBlocks.CROCUS.get()); - public static final Holder> IRIS = createFlowerConfiguredFeature("iris", BYGBlocks.IRIS.get()); - public static final Holder> ANEMONE_WHITE = createFlowerConfiguredFeature("white_anemone", BYGBlocks.WHITE_ANEMONE.get()); - public static final Holder> ANEMONE_PINK = createFlowerConfiguredFeature("pink_anemone", BYGBlocks.PINK_ANEMONE.get()); - public static final Holder> ROSE_WINTER = createFlowerConfiguredFeature("winter_rose", BYGBlocks.WINTER_ROSE.get()); - public static final Holder> ALLIUM_PINK = createFlowerConfiguredFeature("allium_pink", BYGBlocks.PINK_ALLIUM.get()); - public static final Holder> DAISY_ORANGE = createFlowerConfiguredFeature("orange_daisy", BYGBlocks.ORANGE_DAISY.get()); - public static final Holder> HYDRANGEA_BUSH = createFlowerConfiguredFeature("hydrangea_bush", BYGBlocks.HYDRANGEA_BUSH.get()); - public static final Holder> HYDRANGEA_HEDGE = createFlowerConfiguredFeature("hydrangea_hedge", BYGBlocks.HYDRANGEA_HEDGE.get()); - public static final Holder> SAGE_WHITE = createFlowerConfiguredFeature("white_sage", BYGBlocks.WHITE_SAGE.get()); - public static final Holder> SAGE_PURPLE = createFlowerConfiguredFeature("purple_sage", BYGBlocks.PURPLE_SAGE.get()); - public static final Holder> DAFFODIL_YELLOW = createFlowerConfiguredFeature("yellow_daffodil", BYGBlocks.YELLOW_DAFFODIL.get()); - public static final Holder> ALPINE_BELLFLOWER = createFlowerConfiguredFeature("alpine_bellflower", BYGBlocks.ALPINE_BELLFLOWER.get()); - public static final Holder> KOVAN_FLOWER = createFlowerConfiguredFeature("kovan_flower", BYGBlocks.KOVAN_FLOWER.get()); - public static final Holder> TULIP_GREEN = createFlowerConfiguredFeature("green_tulip", BYGBlocks.GREEN_TULIP.get()); - public static final Holder> TULIP_CYAN = createFlowerConfiguredFeature("cyan_tulip", BYGBlocks.CYAN_TULIP.get()); - public static final Holder> TULIP_MAGENTA = createFlowerConfiguredFeature("magenta_tulip", BYGBlocks.MAGENTA_TULIP.get()); - public static final Holder> TULIP_PURPLE = createFlowerConfiguredFeature("purple_tulip", BYGBlocks.PURPLE_TULIP.get()); - public static final Holder> TULIP_YELLOW = createFlowerConfiguredFeature("yellow_tulip", BYGBlocks.YELLOW_TULIP.get()); - public static final Holder> CATTAIL = createPatchConfiguredFeature("cattail", BYGBlocks.CATTAIL.get(), 32); - public static final Holder> LOLLIPOP_FLOWER = createFlowerConfiguredFeature("lollipop_flower", BYGBlocks.LOLLIPOP_FLOWER.get()); - public static final Holder> LEATHER_FLOWER_PEACH = createFlowerConfiguredFeature("peach_leather_flower", BYGBlocks.PEACH_LEATHER_FLOWER.get()); - public static final Holder> LEATHER_FLOWER_VIOLET = createFlowerConfiguredFeature("violet_leather_flower", BYGBlocks.VIOLET_LEATHER_FLOWER.get()); - public static final Holder> BLACK_ROSE = createFlowerConfiguredFeature("black_rose", BYGBlocks.BLACK_ROSE.get()); - public static final Holder> CYAN_ROSE = createFlowerConfiguredFeature("cyan_rose", BYGBlocks.CYAN_ROSE.get()); - public static final Holder> ROSE_OSIRIA = createFlowerConfiguredFeature("osiria_rose", BYGBlocks.ORSIRIA_ROSE.get()); - public static final Holder> FAIRY_SLIPPER = createFlowerConfiguredFeature("fairy_slipper", BYGBlocks.FAIRY_SLIPPER.get()); - public static final Holder> HORSEWEED = createPatchConfiguredFeature("horseweed", BYGBlocks.HORSEWEED.get(), 10); + public static final Holder> ALLIUM_BUSH = createFlowerConfiguredFeature("allium_bush", () -> BYGBlocks.ALLIUM_FLOWER_BUSH.get()); + public static final Holder> ALLIUM_PINK_BUSH = createFlowerConfiguredFeature("pink_allium_bush", () -> BYGBlocks.PINK_ALLIUM_FLOWER_BUSH.get()); + public static final Holder> ALLIUM_TALL_BUSH = createPatchConfiguredFeature("tall_allium_bush", () -> BYGBlocks.TALL_ALLIUM.get(), 15); + public static final Holder> ALLIUM_TALL_PINK_BUSH = createPatchConfiguredFeature("tall_pink_allium_bush", () -> BYGBlocks.TALL_PINK_ALLIUM.get(), 15); + public static final Holder> ALOE_VERA = createPatchConfiguredFeature("aloe_vera", () -> BYGBlocks.ALOE_VERA.get(), 6); + + public static final Holder> DUNE_TERRAIN = createConfiguredFeature("dune_terrain", BYGFeatures.DUNE_TERRAIN, () -> FeatureConfiguration.NONE); + public static final Holder> AMARANTH = createFlowerConfiguredFeature("amaranth", () -> BYGBlocks.AMARANTH.get()); + public static final Holder> AMARANTH_MAGENTA = createFlowerConfiguredFeature("magenta_amaranth", () -> BYGBlocks.MAGENTA_AMARANTH.get()); + public static final Holder> AMARANTH_ORANGE = createFlowerConfiguredFeature("orange_amaranth", () -> BYGBlocks.ORANGE_AMARANTH.get()); + public static final Holder> AMARANTH_PURPLE = createFlowerConfiguredFeature("purple_amaranth", () -> BYGBlocks.PURPLE_AMARANTH.get()); + public static final Holder> AMARANTH_CYAN = createFlowerConfiguredFeature("cyan_amaranth", () -> BYGBlocks.CYAN_AMARANTH.get()); + public static final Holder> FIRECRACKER_BUSH = createFlowerConfiguredFeature("firecracker_bush", () -> BYGBlocks.FIRECRACKER_FLOWER_BUSH.get()); + public static final Holder> SHRUB = createPatchConfiguredFeature("shrub", () -> BYGBlocks.SHRUB.get(), 4); + public static final Holder> MINI_CACTI = createPatchConfiguredFeature("mini_cacti", () -> BYGBlocks.MINI_CACTUS.get(), 4); + public static final Holder> BARREL_CACTI = createPatchConfiguredFeature("barrel_cacti", () -> BYGBlocks.BARREL_CACTUS.get(), 4); + public static final Holder> FLOWERING_BARREL_CACTI = createPatchConfiguredFeature("flowering_barrel_cacti", () -> BYGBlocks.FLOWERING_BARREL_CACTUS.get(), 4); + public static final Holder> CLOVER_PATCH = createFlowerConfiguredFeature("clover_patch", () -> BYGBlocks.CLOVER_PATCH.get()); + public static final Holder> FLOWER_PATCH = createFlowerConfiguredFeature("flower_patch", () -> BYGBlocks.FLOWER_PATCH.get()); + public static final Holder> CALIFORNIA_POPPY = createFlowerConfiguredFeature("california_poppy", () -> BYGBlocks.CALIFORNIA_POPPY.get()); + public static final Holder> WHITE_PUFFBALL = createFlowerConfiguredFeature("white_puffball", () -> BYGBlocks.WHITE_PUFFBALL.get()); + public static final Holder> WEEPING_MILKCAP = createFlowerConfiguredFeature("weeping_milkcap", () -> BYGBlocks.WEEPING_MILKCAP.get()); + public static final Holder> WOOD_BLEWIT = createFlowerConfiguredFeature("wood_blewit", () -> BYGBlocks.WOOD_BLEWIT.get()); + public static final Holder> GREEN_MUSHROOM = createFlowerConfiguredFeature("green_mushroom", () -> BYGBlocks.GREEN_MUSHROOM.get()); + public static final Holder> BEGONIA = createFlowerConfiguredFeature("begonia", () -> BYGBlocks.BEGONIA.get()); + public static final Holder> BISTORT = createFlowerConfiguredFeature("bistort", () -> BYGBlocks.BISTORT.get()); + public static final Holder> GUZMANIA = createFlowerConfiguredFeature("guzmania", () -> BYGBlocks.GUZMANIA.get()); + public static final Holder> INCAN_LILY = createFlowerConfiguredFeature("incan_lily", () -> BYGBlocks.INCAN_LILY.get()); + public static final Holder> LAZARUS_BELLFLOWER = createFlowerConfiguredFeature("lazarus_bellflower", () -> BYGBlocks.LAZARUS_BELLFLOWER.get()); + public static final Holder> TORCH_GINGER = createFlowerConfiguredFeature("torch_ginger", () -> BYGBlocks.TORCH_GINGER.get()); + public static final Holder> WINTER_SUCCULENT = createPatchConfiguredFeature("winter_succulent", () -> BYGBlocks.WINTER_SUCCULENT.get(), 10); + public static final Holder> BEACH_GRASS = createPatchConfiguredFeature("beach_grass_patch", () -> BYGBlocks.BEACH_GRASS.get(), 32); + public static final Holder> TALL_BEACH_GRASS_PATCH = createPatchConfiguredFeature("tall_beach_grass_patch", () -> BYGBlocks.TALL_BEACH_GRASS.get(), 32); + public static final Holder> LEAF_PILE = createPatchConfiguredFeature("leaf_pile", () -> BYGBlocks.LEAF_PILE.get(), 15); + public static final Holder> RICHEA = createFlowerConfiguredFeature("richea", () -> BYGBlocks.RICHEA.get()); + public static final Holder> PRAIRIE_GRASS_PATCH = createPatchConfiguredFeature("prairie_grass_patch", () -> BYGBlocks.PRAIRIE_GRASS.get(), 100); + public static final Holder> TALL_PRAIRIE_GRASS_PATCH = createPatchConfiguredFeature("tall_prairie_grass_patch", () -> BYGBlocks.TALL_PRAIRIE_GRASS.get(), 100); + public static final Holder> ROSE_BUSH = createPatchConfiguredFeature("rose_bush", () -> Blocks.ROSE_BUSH, 64); + public static final Holder> JAPANESE_ORCHID = createFlowerConfiguredFeature("japanese_orchid", () -> BYGBlocks.JAPANESE_ORCHID.get()); + public static final Holder> FOXGLOVE = createFlowerConfiguredFeature("foxglove", () -> BYGBlocks.FOXGLOVE.get()); + public static final Holder> FLOWERING_INDIGO_JACARANDA_BUSH = createPatchConfiguredFeature("flowering_indigo_jacaranda_bush", () -> BYGBlocks.FLOWERING_INDIGO_JACARANDA_BUSH.get(), 32); + public static final Holder> INDIGO_JACARANDA_BUSH = createPatchConfiguredFeature("indigo_jacaranda_bush", () -> BYGBlocks.INDIGO_JACARANDA_BUSH.get(), 32); + public static final Holder> FLOWERING_JACARANDA_BUSH = createPatchConfiguredFeature("flowering_jacaranda_bush", () -> BYGBlocks.FLOWERING_JACARANDA_BUSH.get(), 32); + public static final Holder> JACARANDA_BUSH = createPatchConfiguredFeature("jacaranda_bush", () -> BYGBlocks.JACARANDA_BUSH.get(), 32); + public static final Holder> PRICKLY_PEAR_CACTI = createPatchConfiguredFeature("prickly_pear_cacti", () -> BYGBlocks.PRICKLY_PEAR_CACTUS.get(), 5); + public static final Holder> GOLDEN_SPINED_CACTI = createPatchConfiguredFeature("golden_spined_cacti", () -> BYGBlocks.GOLDEN_SPINED_CACTUS.get(), 5); + public static final Holder> PINK_CHERRY_FOLIAGE = createPatchConfiguredFeature("pink_cherry_foliage", () -> BYGBlocks.PINK_CHERRY_FOLIAGE.get(), 15); + public static final Holder> WHITE_CHERRY_FOLIAGE = createPatchConfiguredFeature("white_cherry_foliage", () -> BYGBlocks.WHITE_CHERRY_FOLIAGE.get(), 15); + public static final Holder> BLUE_BERRY_BUSH = createPatchConfiguredFeatureState("blue_berry_bush", () -> BYGBlocks.BLUEBERRY_BUSH.defaultBlockState().setValue(BlueBerryBush.AGE, 3), 3); + public static final Holder> ROSE = createFlowerConfiguredFeature("rose", () -> BYGBlocks.ROSE.get()); + public static final Holder> CROCUS = createFlowerConfiguredFeature("crocus", () -> BYGBlocks.CROCUS.get()); + public static final Holder> IRIS = createFlowerConfiguredFeature("iris", () -> BYGBlocks.IRIS.get()); + public static final Holder> ANEMONE_WHITE = createFlowerConfiguredFeature("white_anemone", () -> BYGBlocks.WHITE_ANEMONE.get()); + public static final Holder> ANEMONE_PINK = createFlowerConfiguredFeature("pink_anemone", () -> BYGBlocks.PINK_ANEMONE.get()); + public static final Holder> ROSE_WINTER = createFlowerConfiguredFeature("winter_rose", () -> BYGBlocks.WINTER_ROSE.get()); + public static final Holder> ALLIUM_PINK = createFlowerConfiguredFeature("allium_pink", () -> BYGBlocks.PINK_ALLIUM.get()); + public static final Holder> DAISY_ORANGE = createFlowerConfiguredFeature("orange_daisy", () -> BYGBlocks.ORANGE_DAISY.get()); + public static final Holder> HYDRANGEA_BUSH = createFlowerConfiguredFeature("hydrangea_bush", () -> BYGBlocks.HYDRANGEA_BUSH.get()); + public static final Holder> HYDRANGEA_HEDGE = createFlowerConfiguredFeature("hydrangea_hedge", () -> BYGBlocks.HYDRANGEA_HEDGE.get()); + public static final Holder> SAGE_WHITE = createFlowerConfiguredFeature("white_sage", () -> BYGBlocks.WHITE_SAGE.get()); + public static final Holder> SAGE_PURPLE = createFlowerConfiguredFeature("purple_sage", () -> BYGBlocks.PURPLE_SAGE.get()); + public static final Holder> DAFFODIL_YELLOW = createFlowerConfiguredFeature("yellow_daffodil", () -> BYGBlocks.YELLOW_DAFFODIL.get()); + public static final Holder> ALPINE_BELLFLOWER = createFlowerConfiguredFeature("alpine_bellflower", () -> BYGBlocks.ALPINE_BELLFLOWER.get()); + public static final Holder> KOVAN_FLOWER = createFlowerConfiguredFeature("kovan_flower", () -> BYGBlocks.KOVAN_FLOWER.get()); + public static final Holder> TULIP_GREEN = createFlowerConfiguredFeature("green_tulip", () -> BYGBlocks.GREEN_TULIP.get()); + public static final Holder> TULIP_CYAN = createFlowerConfiguredFeature("cyan_tulip", () -> BYGBlocks.CYAN_TULIP.get()); + public static final Holder> TULIP_MAGENTA = createFlowerConfiguredFeature("magenta_tulip", () -> BYGBlocks.MAGENTA_TULIP.get()); + public static final Holder> TULIP_PURPLE = createFlowerConfiguredFeature("purple_tulip", () -> BYGBlocks.PURPLE_TULIP.get()); + public static final Holder> TULIP_YELLOW = createFlowerConfiguredFeature("yellow_tulip", () -> BYGBlocks.YELLOW_TULIP.get()); + public static final Holder> CATTAIL = createPatchConfiguredFeature("cattail", () -> BYGBlocks.CATTAIL.get(), 32); + public static final Holder> LOLLIPOP_FLOWER = createFlowerConfiguredFeature("lollipop_flower", () -> BYGBlocks.LOLLIPOP_FLOWER.get()); + public static final Holder> LEATHER_FLOWER_PEACH = createFlowerConfiguredFeature("peach_leather_flower", () -> BYGBlocks.PEACH_LEATHER_FLOWER.get()); + public static final Holder> LEATHER_FLOWER_VIOLET = createFlowerConfiguredFeature("violet_leather_flower", () -> BYGBlocks.VIOLET_LEATHER_FLOWER.get()); + public static final Holder> BLACK_ROSE = createFlowerConfiguredFeature("black_rose", () -> BYGBlocks.BLACK_ROSE.get()); + public static final Holder> CYAN_ROSE = createFlowerConfiguredFeature("cyan_rose", BYGBlocks.CYAN_ROSE::get); + public static final Holder> ROSE_OSIRIA = createFlowerConfiguredFeature("osiria_rose", BYGBlocks.ORSIRIA_ROSE::get); + public static final Holder> FAIRY_SLIPPER = createFlowerConfiguredFeature("fairy_slipper", BYGBlocks.FAIRY_SLIPPER::get); + public static final Holder> HORSEWEED = createPatchConfiguredFeature("horseweed", BYGBlocks.HORSEWEED::get, 10); public static final Holder> BEACH_GRASSES = createConfiguredFeature("beach_grasses", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(TALL_BEACH_GRASS_PATCH, SAND_FILTER), 0.33F)), createPlacedFeature(BEACH_GRASS, SAND_FILTER) ) @@ -118,7 +127,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> AMARANTH_FIELD_FLOWERS = createConfiguredFeature("amaranth_field_flowers", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(AMARANTH), 0.2F), new WeightedPlacedFeature(createPlacedFeature(AMARANTH_MAGENTA), 0.2F), new WeightedPlacedFeature(createPlacedFeature(AMARANTH_ORANGE), 0.2F), @@ -128,28 +137,28 @@ public class BYGOverworldVegetationFeatures { public static final Holder> TINY_LILY_PAD = createConfiguredFeature("tiny_lily_pad", () -> Feature.RANDOM_PATCH, - new RandomPatchConfiguration(10, 7, 3, - createPlacedFeature(createConfiguredFeature(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.TINY_LILYPADS.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) + () -> new RandomPatchConfiguration(10, 7, 3, + createPlacedFeature(createConfiguredFeature(() -> Feature.SIMPLE_BLOCK, () -> new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.TINY_LILYPADS.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) ) ); public static final Holder> FLOWERING_TINY_LILY_PAD = createConfiguredFeature("flowering_tiny_lily_pad", () -> Feature.RANDOM_PATCH, - new RandomPatchConfiguration(10, 7, 3, - createPlacedFeature(createConfiguredFeature(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.FLOWERING_TINY_LILY_PADS.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) + () -> new RandomPatchConfiguration(10, 7, 3, + createPlacedFeature(createConfiguredFeature(() -> Feature.SIMPLE_BLOCK, () -> new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.FLOWERING_TINY_LILY_PADS.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) ) ); public static final Holder> WATER_SILK = createConfiguredFeature("water_silk", () -> Feature.RANDOM_PATCH, - new RandomPatchConfiguration(10, 7, 3, - createPlacedFeature(createConfiguredFeature(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.WATER_SILK.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) + () -> new RandomPatchConfiguration(10, 7, 3, + createPlacedFeature(createConfiguredFeature(() -> Feature.SIMPLE_BLOCK, () -> new SimpleBlockConfiguration(BlockStateProvider.simple(BYGBlocks.WATER_SILK.get()))), ON_WATER_FILTER, IN_REPLACEABLE_FILTER) ) ); public static final Holder> ALLIUM_FIELD_FLOWERS = createConfiguredFeature("allium_field_flowers", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(ALLIUM_TALL_BUSH), 0.25F), new WeightedPlacedFeature(createPlacedFeature(ALLIUM_TALL_PINK_BUSH), 0.25F), new WeightedPlacedFeature(createPlacedFeature(ALLIUM_BUSH), 0.25F)), @@ -159,7 +168,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> ROSE_FIELD_FLOWERS = createConfiguredFeature("rose_field_flowers", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(ROSE_OSIRIA), 0.25F), new WeightedPlacedFeature(createPlacedFeature(ROSE), 0.25F)), createPlacedFeature(ROSE_BUSH)) @@ -167,7 +176,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> DESERT_VEGETATION = createConfiguredFeature("desert_vegetation", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(MINI_CACTI), 0.3F), new WeightedPlacedFeature(createPlacedFeature(PRICKLY_PEAR_CACTI), 0.3F), new WeightedPlacedFeature(createPlacedFeature(ALOE_VERA), 0.2F), @@ -178,7 +187,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> WINDSWEPT_DESERT_VEGETATION = createConfiguredFeature("windswept_desert_vegetation", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(MINI_CACTI, SAND_FILTER), 0.15F), new WeightedPlacedFeature(createPlacedFeature(PRICKLY_PEAR_CACTI, SAND_FILTER), 0.15F), new WeightedPlacedFeature(createPlacedFeature(VegetationFeatures.PATCH_CACTUS, SAND_FILTER), 0.15F), @@ -187,10 +196,9 @@ public class BYGOverworldVegetationFeatures { ) ); - // public static final Holder> DESERT_VEGETATION_ATACAMA = createConfiguredFeature("desert_vegetation_atacama", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(MINI_CACTI), 0.15F), new WeightedPlacedFeature(createPlacedFeature(PRICKLY_PEAR_CACTI), 0.15F), new WeightedPlacedFeature(createPlacedFeature(ALOE_VERA), 0.2F), @@ -201,14 +209,14 @@ public class BYGOverworldVegetationFeatures { public static final Holder> PRAIRIE_GRASS = createConfiguredFeature("prairie_grass", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(PRAIRIE_GRASS_PATCH), 0.75F)), createPlacedFeature(TALL_PRAIRIE_GRASS_PATCH)) ); public static final Holder> MUSHROOMS = createConfiguredFeature("mushrooms", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(WOOD_BLEWIT), 0.33F), new WeightedPlacedFeature(createPlacedFeature(WEEPING_MILKCAP), 0.33F)), createPlacedFeature(GREEN_MUSHROOM)) @@ -216,7 +224,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> JUNGLE_FLOWERS = createConfiguredFeature("jungle_flowers", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(BISTORT), 0.142F), new WeightedPlacedFeature(createPlacedFeature(GUZMANIA), 0.142F), new WeightedPlacedFeature(createPlacedFeature(BEGONIA), 0.142F), @@ -228,7 +236,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> JACARANDA_BUSHES = createConfiguredFeature("jacaranda_bushes", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(FLOWERING_INDIGO_JACARANDA_BUSH), 0.25F), new WeightedPlacedFeature(createPlacedFeature(FLOWERING_JACARANDA_BUSH), 0.25F), new WeightedPlacedFeature(createPlacedFeature(INDIGO_JACARANDA_BUSH), 0.25F)), @@ -237,49 +245,49 @@ public class BYGOverworldVegetationFeatures { public static final Holder> SWAMP_WATER_VEGETATION = createConfiguredFeature("swamp_water_vegetation", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(TINY_LILY_PAD, ON_WATER_FILTER), 0.50F)), createPlacedFeature(WATER_SILK, ON_WATER_FILTER)) ); public static final Holder> WHITE_MANGROVE_SWAMP_WATER_VEGETATION = createConfiguredFeature("white_mangrove_swamp_water_vegetation", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(TINY_LILY_PAD, ON_WATER_FILTER), 0.50F)), createPlacedFeature(FLOWERING_TINY_LILY_PAD, ON_WATER_FILTER)) ); public static final Holder> CHERRY_FOLIAGE = createConfiguredFeature("cherry_foliage", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(WHITE_CHERRY_FOLIAGE), 0.5F)), createPlacedFeature(PINK_CHERRY_FOLIAGE)) ); public static final Holder> ANEMONES = createConfiguredFeature("anemones", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(ANEMONE_PINK), 0.5F)), createPlacedFeature(ANEMONE_WHITE)) ); public static final Holder> SAGES = createConfiguredFeature("sages", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(SAGE_PURPLE), 0.5F)), createPlacedFeature(SAGE_WHITE)) ); public static final Holder> HYDRANGEAS = createConfiguredFeature("hydrangeas", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(HYDRANGEA_BUSH), 0.5F)), createPlacedFeature(HYDRANGEA_HEDGE)) ); public static final Holder> TULIPS = createConfiguredFeature("tulips", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(TULIP_MAGENTA), 0.2F), new WeightedPlacedFeature(createPlacedFeature(TULIP_YELLOW), 0.2F), new WeightedPlacedFeature(createPlacedFeature(TULIP_PURPLE), 0.2F), @@ -290,13 +298,13 @@ public class BYGOverworldVegetationFeatures { public static final Holder> PUMPKIN1 = createConfiguredFeature("pumpkin1", BYGFeatures.LARGE_PUMPKIN1, - new PumpkinConfig.Builder() + () -> new PumpkinConfig.Builder() .setPumpkinBlock(Blocks.PUMPKIN) .build() ); public static final Holder> PUMPKIN2 = createConfiguredFeature("pumpkin2", BYGFeatures.LARGE_PUMPKIN2, - new PumpkinConfig.Builder() + () -> new PumpkinConfig.Builder() .setPumpkinBlock(Blocks.PUMPKIN).setStemBlock(Blocks.DARK_OAK_LOG) .setLeavesBlock(Blocks.DARK_OAK_LEAVES) .build() @@ -304,21 +312,21 @@ public class BYGOverworldVegetationFeatures { public static final Holder> LARGE_PUMPKINS = createConfiguredFeature("large_pumpkin", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(PUMPKIN1), 0.5F)), createPlacedFeature(PUMPKIN2)) ); public static final Holder> LEATHER_FLOWERS = createConfiguredFeature("leather_flowers", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(LEATHER_FLOWER_PEACH), 0.5F)), createPlacedFeature(LEATHER_FLOWER_VIOLET)) ); public static final Holder> GREEN_MUSHROOM_HUGE = createConfiguredFeature("huge_green_mushroom", BYGFeatures.GREEN_MUSHROOM_HUGE, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(BYGBlocks.WHITE_MUSHROOM_STEM.get()) .setMushroomBlock(BYGBlocks.GREEN_MUSHROOM_BLOCK.get()) .setMinHeight(6) @@ -328,7 +336,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> WOOD_BLEWIT_HUGE = createConfiguredFeature("huge_wood_blewit", BYGFeatures.WOOD_BLEWIT_HUGE, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(BYGBlocks.BROWN_MUSHROOM_STEM.get()) .setMushroomBlock(BYGBlocks.BLEWIT_MUSHROOM_BLOCK.get()) .setMinHeight(6) @@ -338,7 +346,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> WEEPING_MILKCAP_HUGE = createConfiguredFeature("huge_weeping_milkcap", BYGFeatures.WEEPING_MILKCAP_HUGE, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(Blocks.MUSHROOM_STEM) .setMushroomBlock(BYGBlocks.MILKCAP_MUSHROOM_BLOCK.get()) .setMinHeight(6) @@ -348,7 +356,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> GREEN_MUSHROOM_MINI = createConfiguredFeature("mini_green_mushroom", BYGFeatures.MINI_GREEN_MUSHROOM, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(BYGBlocks.WHITE_MUSHROOM_STEM.get()) .setMushroomBlock(BYGBlocks.GREEN_MUSHROOM_BLOCK.get()) .setMinHeight(3) @@ -358,7 +366,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> WOOD_BLEWIT_MINI = createConfiguredFeature("mini_wood_blewit", BYGFeatures.MINI_WOOD_BLEWIT, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(BYGBlocks.BROWN_MUSHROOM_STEM.get()) .setMushroomBlock(BYGBlocks.BLEWIT_MUSHROOM_BLOCK.get()) .setMinHeight(2) @@ -368,7 +376,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> WEEPING_MILKCAP_MINI = createConfiguredFeature("mini_weeping_milkcap", BYGFeatures.MINI_WEEPING_MILKCAP, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(Blocks.MUSHROOM_STEM) .setMushroomBlock(BYGBlocks.MILKCAP_MUSHROOM_BLOCK.get()) .setMinHeight(2) @@ -378,7 +386,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> RED_MUSHROOM_MINI = createConfiguredFeature("mini_red_mushroom", BYGFeatures.MINI_RED_MUSHROOM, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(Blocks.MUSHROOM_STEM) .setMushroomBlock(Blocks.RED_MUSHROOM_BLOCK) .setMinHeight(2) @@ -388,7 +396,7 @@ public class BYGOverworldVegetationFeatures { public static final Holder> BROWN_MUSHROOM_MINI = createConfiguredFeature("mini_brown_mushroom", BYGFeatures.MINI_BROWN_MUSHROOM, - new BYGMushroomConfig.Builder() + () -> new BYGMushroomConfig.Builder() .setStemBlock(Blocks.MUSHROOM_STEM) .setMushroomBlock(Blocks.BROWN_MUSHROOM_BLOCK) .setMinHeight(2) @@ -399,11 +407,26 @@ public class BYGOverworldVegetationFeatures { public static final Holder> HUGE_MUSHROOMS = createConfiguredFeature("huge_mushrooms", () -> Feature.RANDOM_SELECTOR, - new RandomFeatureConfiguration(ImmutableList.of( + () -> new RandomFeatureConfiguration(ImmutableList.of( new WeightedPlacedFeature(createPlacedFeature(GREEN_MUSHROOM_HUGE), 0.35F), new WeightedPlacedFeature(createPlacedFeature(WOOD_BLEWIT_HUGE), 0.35F), new WeightedPlacedFeature(createPlacedFeature(WEEPING_MILKCAP_HUGE), 0.35F)), createPlacedFeature(GREEN_MUSHROOM_HUGE)) ); + public static > Holder> createConfiguredFeature(String id, Supplier feature, Supplier config) { + return BYGFeaturesUtil.CONFIGURED_FEATURES.>register(id, () -> new ConfiguredFeature<>(feature.get(), config.get())).asHolder(); + } + + public static > Holder> createFlowerConfiguredFeature(String id, Supplier flowerBlock) { + return createConfiguredFeature(id, () -> Feature.FLOWER, () -> byg_invokeGrassPatch(SimpleStateProvider.simple(flowerBlock.get().defaultBlockState()), 15)); + } + + public static > Holder> createPatchConfiguredFeature(String id, Supplier block, int tries) { + return createPatchConfiguredFeatureState(id, () -> block.get().defaultBlockState(), tries); + } + + public static Holder> createPatchConfiguredFeatureState(String id, Supplier state, int tries) { + return createConfiguredFeature(id, () -> Feature.RANDOM_PATCH, () -> FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(state.get())), List.of(), tries)); + } } diff --git a/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java b/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java index 89073d171d..e80e605373 100644 --- a/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java +++ b/Common/src/main/java/potionstudios/byg/core/BYGRegistry.java @@ -18,6 +18,8 @@ import potionstudios.byg.common.sound.BYGSounds; import potionstudios.byg.common.world.biome.BYGBiomes; import potionstudios.byg.common.world.feature.BYGFeatures; +import potionstudios.byg.common.world.feature.BYGPlacedFeatures; +import potionstudios.byg.common.world.feature.features.overworld.BYGOverworldTreeFeatures; import potionstudios.byg.common.world.feature.stateproviders.BYGStateProviders; import potionstudios.byg.common.world.structure.BYGStructureTypes; import potionstudios.byg.mixin.access.RegistryAccess; @@ -47,5 +49,7 @@ public static void loadClasses() { BYGSounds.loadClass(); BYGStateProviders.loadClass(); BYGStructureTypes.loadClass(); + BYGOverworldTreeFeatures.loadClass(); + BYGPlacedFeatures.loadClass(); } } diff --git a/Common/src/main/java/potionstudios/byg/util/lazy/LazySupplier.java b/Common/src/main/java/potionstudios/byg/util/lazy/LazySupplier.java index a851669609..d7cb59a63d 100644 --- a/Common/src/main/java/potionstudios/byg/util/lazy/LazySupplier.java +++ b/Common/src/main/java/potionstudios/byg/util/lazy/LazySupplier.java @@ -6,16 +6,17 @@ public class LazySupplier implements Supplier { private Supplier supplier; private T instance; - public LazySupplier(Supplier supplier) - { + public LazySupplier(Supplier supplier) { this.supplier = supplier; } + public static LazySupplier lazy(Supplier sup) { + return new LazySupplier<>(sup); + } + @Override - public final T get() - { - if (supplier != null) - { + public final T get() { + if (supplier != null) { instance = supplier.get(); supplier = null; } From ba23a004ac58c6e344d3fb7fa1837c00d6416339 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Wed, 8 Jun 2022 22:54:19 +0300 Subject: [PATCH 90/90] FIx invoker --- .../byg/mixin/access/StructuresAccess.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java b/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java index a4dec2d0b8..083ea3bca0 100644 --- a/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java +++ b/Common/src/main/java/potionstudios/byg/mixin/access/StructuresAccess.java @@ -17,17 +17,8 @@ public interface StructuresAccess { @Invoker("structure") - static Structure.StructureSettings byg_invokeStructure(TagKey p_236546_, Map p_236547_, GenerationStep.Decoration p_236548_, TerrainAdjustment p_236549_) { + static Structure.StructureSettings structure(TagKey p_236546_, Map p_236547_, GenerationStep.Decoration p_236548_, TerrainAdjustment p_236549_) { throw new Error("Mixin did not apply!"); } - @Invoker("structure") - static Structure.StructureSettings byg_invokeStructure(TagKey p_236539_, GenerationStep.Decoration p_236540_, TerrainAdjustment p_236541_) { - throw new Error("Mixin did not apply!"); - } - - @Invoker("structure") - static Structure.StructureSettings byg_invokeStructure(TagKey p_236543_, TerrainAdjustment p_236544_) { - throw new Error("Mixin did not apply!"); - } }

    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 diff --git a/Common/src/main/resources/assets/byg/textures/block/allium_flower_bush.png b/Common/src/main/resources/assets/byg/textures/block/allium_flower_bush.png index e9e5e5227cc2c4ab1362da37e1a9c4dbc2c938c2..4928c4af56b595166a1378503069a3f2c8aa15e3 100644 GIT binary patch delta 191 zcmV;w06_nu0*nHXB$0s?kt8C20002!&;HV;_PBWMre5Jwj4XRjpe$!5BTgL_IT;CG z1x5e>00DGTPE!Ct=GbNc003%9L_t(|0R_Q<0l**#1F#4<>i-Wf0RR910M!6Mof@bH z`qb&6P7N?UAARcd0Qpp#o)2)*oA;hP`2p1j0+*4Ghz0-v002ovPDHLkV1gUbP#gdN delta 211 zcmeBSTEsL#Wum2$#ieE6c2vB5asJ=3xQEq#3zYq2gL`yz($&N)B^ekPjMm++22xxl zL4LviVSr)N8J+VJ6(#D+JzX3_G=g(`9L1asIhYJNwZ88!Fx>xk(Rw|ed?Tj6XY3m) zo?8ouee>ma*I8rmv*_&&_g^1gK9KzTQ2fb@^c`;;RCO(W@*Zhqo%&Wsl&QMM=yPh| zzZpT6U6!w>{i>Mr#&UL0mrmMN^H!ngT#a38b2sc>dp50Ge?lYMx@X13yqZ9#F?hQA KxvXvX_3DacYcNOmaCnStB2f{#*b600DGTPE!Ct z=GbNc003V}L_t(|+I5Tx3Ist21JgPF|K%l)4a2|&@hFYJAMp#wi#PKSpazJO1f2y_ zb*8cgwlhuFL_$0UEYGTkqKr6WQmN%A7LA9*j^mlfoHVQ~c*vcXyg@%3RK5UNwf_OJ W&H>znvVA}R0000eVETdI^xF5r^`zQlj=ng~=Ku*qbDO}@Z4 fc=Cdt$aHr<;!y*ENeHB900000NkvXXu0mjf#s^Ck diff --git a/Common/src/main/resources/assets/byg/textures/block/alpine_bellflower.png b/Common/src/main/resources/assets/byg/textures/block/alpine_bellflower.png index 724fbde0cd13a6c1189514bc8f6052ae2e92829c..7459db8b07ce8f820da5df0cb761bc58f6759f98 100644 GIT binary patch delta 184 zcmV;p07w6k0{a1w7zqRe0002(-QrS_ei)G?B7Xn?0Q2(n!Lt9HiRDk9YkFqPKa5&w zR=+HNNg{GSz|<$S00001bW%=J06^y0W&i*HSxH1eRCwBBU?2`CD?n)G@L&kTwXn3o zfq{X+gw@=Xvy_3sD4ZcQfFa0~fwh2vp@o4xfWg3kfvtgoogJjwApvHP1B7Z|aey#0 mQXw)pK$4s+oiiqIG5`RW{tZ9f8KE@*0000N zRc*|Za|KddB|(0{|6zb((;1!f6BQ+@(>z@qLo|Zt`Z)?Q8*&6~k^1-lq1U9jb6;+h z5mIR|{P&>#;Gas%?aB{k%PI=acQEXK;8|gDqfypv!hwQAGHz#^C)MjbyOX=Rgza&j z_d4f${hEq7iElI?t_wYQN>lTwipl0(tJ^2W3!1PuB+Ll|x`Tni)78&qol`;+0JQK| A%m4rY diff --git a/Common/src/main/resources/assets/byg/textures/block/amaranth.png b/Common/src/main/resources/assets/byg/textures/block/amaranth.png index 7690c907b1d44ddf70f304e44f1c3ff963b627ec..ec523af9580f34946ca01aa16b4dacc1bd480741 100644 GIT binary patch delta 218 zcmV<0044vf0+#}iBoYa5NLh0L01m+b01m+cxRGn^ks&3200030vc><5r{!CBQ;aOk zJy5bEHY{f*BTgNe4;B_V8CUbdtpET30d!JMQvg8b*k%9#0CGu0K~#7F1;K#AI>@rJ!X1N@AM39){Zf)7qh#1cGs-=0XAF% U9eN13!vFvP07*qoM6N<$g3s<%Jpcdz delta 223 zcmbQvw2ogoBx}RK8-H_-?RLTZNN-^u}#Wm%6_uJJvut+YGRg>3=9lX$J1DW z6n9CGU+{l8VDR#1{4`NfqQ2hK#W6%9*ta)O%tevINn3d8U;T;;_l}oXWtd-Zef4kd z(b{j`)2&*#j0QPWZ&I=^t65P@nff*i*>f9-ah?2bZ5+8 z4Rz(2^JI(Fs(e=*Idfc~{U_VR--m diff --git a/Common/src/main/resources/assets/byg/textures/block/ametrine_block.png b/Common/src/main/resources/assets/byg/textures/block/ametrine_block.png index edaa115f2a88ac42ab6d931eabc83cafe34b5809..25c5978e60f27ad3128aa298dd43778f98b7d9bb 100644 GIT binary patch delta 563 zcmbV|+e^~{97kuC7z9E_5nU|Iu|lDTd?;zAZJ}mE-2~}LT^E*&VJJ8+{n|984E6U5 zkr7L?VP>%5rOl>fYb>*xHWw74HZQsCyS27jrhEA0-_UtK59jE&1-7>Bjg98M8h~Vov1cI-Gd?rjyoW5(sT-$BxES^491YIgg6Ctq*Jqsnyyo0 z1>Mf2n`+WZJ*|AItf$%{s<}wYW~wZv@>06eMwdBH^(j)6kz7S3<*xEnk}`De4hcC* zYiDXLw#ep@6BPv#>HGgcnK3)M>5pZLGGtXzg|_~j==@z`SKW^h`A(NEKRH=jdNn1= z|0^6*bN*TU7QR}$;}R!-TBfk2C#hKjbK{e$@?I{zjz YQ7?~V*-si%pKr$Svc(dSF|%0v4_#zjNB{r; delta 610 zcmV-o0-gQu1f2zt83+ad001BJ|6!3fAdw^#e*!W|L_t(IPn}asYZFlv{?bQ`eW0{c zS}BF@>LXRl^dE?b=u%v`5!?w`D)|Ru|CL&Q)3kMo$4hxSyC} ze>!zOJ#pmtIiRyN-*2nf92#(hCSKu$4Z$5tUo=1IP)OHBF_?d^W31! zVyI!NSpX>u{GPQhZ36Fp0dEP?d8^;jQK#EdY>!SLK(pIxHrpi9d3wY?Tj(ru#V(EO z%y0sYNwo^7UAA-Ifu}h>v;HjIWsATbLEq>~g29+Uoj|izqf~2W??jHODUL49f7EV{ zQs29{_QMJEqFMs-BvQB8FwD9F&J%pi(~Rf}Czfmin{>$VDg2BG+_6WE%DSzFsb<+; zr?S9vWAa5p0<}LR{UNZoA9%u!YRnM wlm#9=iNf6VF!5zR*+za6`Y{e0mF))p0{YM3>m*o6!2kdN07*qoM6N<$f^%Xbs{jB1 diff --git a/Common/src/main/resources/assets/byg/textures/block/ametrine_cluster.png b/Common/src/main/resources/assets/byg/textures/block/ametrine_cluster.png index 59c6cd313429a4a8cc8a57fd3c1cf474c2f1e4da..c237fcb73be368970b6719f11238f1298c1b8086 100644 GIT binary patch delta 458 zcmcc2(#|qLl7pFnfk8u;KX{^@_(Wy7`U3$zA+A87fB*jd{qpMXr#F8;y#4$B{oi*V z{=NP9@6D%wuRs5L_4VJ&Z$Gac|8@4l?~_-5AG`Vc=&j#J?)=&R;LpCt?{BC6-TwN+ zm9&o+vOXR!{&=+P(}C*GJK8>PYyYyT_shzuUsg>2HfQPgscXOYZTa4_{YTfXAB~59 z)g3>*hvD^tddoMn9DkKvcr(NK?L@D?sn6fFM82;}I6sf$eNEDboRaf>k{25_KZo{R zN%gpr?D^ex^|i?GpX!INyJy`ruf3(&eOGe+J%N?y6Rvy%dcvV3$S;`T3<;nfi`vH) zng4-?wRpNXhEylc>VR)YbL(t zH?#I>5S*L9!yV$EW}{+t_=caZ(6$RmdKI;Vst03cxv(f|Me delta 536 zcmV+z0_XjQ1k(hN83+ad001BJ|6!3fAdw^#e*x%8L_t(IPwkOSNK{c2$N%r?(_T&U zrAT5?il74n61*66Ax7b%gqGF9O)z6Lgp}%GE}HJxC~}nHMDYc?GV{C&fI~XPF<|6}c^uPsVYuGzF$-A+?6k6zYZCeH)_T#debNINROf z=VQtqsEsTu`FBYeL!&6fQxJ3y1h2cOe>*iOtbar5K`+`yQqJtDi`npF@?3F5w+=N;qxg0b+72%3ktXIGRT_9*N16XZgy2ZiPD*m${!bKwA( zTLV3J`UC&~002ovPDHLk0$_sbm;-bG diff --git a/Common/src/main/resources/assets/byg/textures/block/ametrine_ore.png b/Common/src/main/resources/assets/byg/textures/block/ametrine_ore.png index e9119acc3f51feac109cc291a4f22894b4072a31..cada33ca72c99dfdde1f6852019457d9350a0e9e 100644 GIT binary patch delta 377 zcmV-<0fzp+1GNK?BoYa5NLh0L01m#^{r~*^|I|p;S zf&XxXg_xMsbWGH1Q+R}h|1rMQLwKBTAJjm5oN6RtbaR|wEu3C1)GvyhTrr?mIiONK zph!oYMn#-|Lr9!IOrSbbR9;`4GFY51TbwOjpdf5PP*I=|dk~p+K>z>%qDe$SRCoae z!3QD)01yPh#mPA=!$>WiG{XA--&9qCO_G33N>0FPC0H(JWr5XBZAns@#chJk@v~(Y z!Jbzj2~crows&uWC7VKd*hW0P}sY_I_ol639$G&fl)ifWn?SG`+lRid;k6Y z|FLlYuW|oygw#NL|C@xIUM~N|U7TPo|B=oAn#Q0yQ=Bhb|DM5|Awx*iYg3#*O#gF% zoJK|em|y>_bkuZA|HxXLY9vRQcLk9l7=NruL_t(2Q#Fs*7Q!$LLuDtl3^NOqz4spf z|8L0cArFalY+X43L{<1e$|7h{h8Vm>rKlvX6=^l_KqaY_wt9mD3UOgg5$6=QMp&!e zaR3L{59s!?{$NOLMx?;<(ReVKvTL(BE$ITwRbdvaH;S;`m2NXnk5EryzU>c3jY3>6 zI9S9^=j?LjXb}$LZ}-Rb=_p?-eW}F!9X0q~{MP3yAdhIz`Y*_jh^YJkB5Vg`MtBMo P00000NkvXXu0mjf7;d=( diff --git a/Common/src/main/resources/assets/byg/textures/block/angelica.png b/Common/src/main/resources/assets/byg/textures/block/angelica.png index 08a18fbf321034a5f3ad9819f699cc27bbbc3ee3..526668d43b4e14ab27f5a5b79a8dab4c61192706 100644 GIT binary patch delta 192 zcmbQs^p|mhiV$akM`SSr1K(i~W;~w1B4whYYCQu3!~Z}3|NQ*(?82+dJ8$k=a%NHM zrr;hOopd#2KUpzLNw&$~8i0xzOM?7@862M7NCR>rJY5_^Di~Q0HZn3hvM_9@klFSB zfG<$Og@vJ`$A@9X35^B~D{EgoBx0QKfCbi^3I$4mYiACx=GAZ^3TsdI_YY`Jvz#MvJ4CiOTX-R z2&A}6g8YL2!vTYrKjWu~iW2pCo-U3d8o{x>oP383I9PTH9sc+KVC;s;VWyKL`xA73 zSoaH9elZcf>RWs`Bd250$*H9+D=r@q-B8`~)641LV%~5blbsEsGPVnCr@WY=oR+cR z=#&3k`7t^MDeDUs{%|`sd!oqS%h~~7&%Ou_z1zTVlgbf#EjUgZ=pqJBS3eh)bxsLQ E0OdDeZU6uP diff --git a/Common/src/main/resources/assets/byg/textures/block/anthracite_block.png b/Common/src/main/resources/assets/byg/textures/block/anthracite_block.png index 8f9f66707aa54d6bb4be527c714bcf082226a8ec..40b3b9fc84606518a0b8a532f55888afa2402770 100644 GIT binary patch delta 193 zcmV;y06zbi0{H=uBoYa5NLh0L01m?d01m?e$8V@)ks%;|5>QN3MJq2kASEps9w!qS zAPy571`89hiEeZN003}FL_t(|+6BSE5yCJG1i<_7&p=#2V(|yZE&xl{Kz!=I6?WnM zeK(pRdd?c0utn94LaOI%dqV5s8YUD!G^iiGY!R^>EtdPnfweN8=bn&;Y&zi#T|NTQ vgWiik^^g1{NQhAjTY+9`He}#g+~ysBo*^Do&Y58t00000NkvXXu0mjf4VX&5 delta 206 zcmey#ID=_|%0x?9OM?KP5LY&CVLoALVMzr^Iduh9U2T0!2E3q&PkX{dMTz=CPZ!4! ziOZsAF7h5S5MU0ljy+JG*wE7aKkgPI(~AFZ?0Fv^pSDK*@b7)CMv1beGqg5!JQiYH zrx~~U^!1yQX4Gx!G`A5+3zOM+NZ)h{({GvjGso8G?dU1b-!{+pp1R^U^}jK0X3LVA j^4;|KWiM~e`^Fr;ghy}J((o#f^E}yI{an^LB{Ts51Z70e diff --git a/Common/src/main/resources/assets/byg/textures/block/anthracite_ore.png b/Common/src/main/resources/assets/byg/textures/block/anthracite_ore.png index ddd8bfcda70e441015faadb3b25e913e1512861d..f2237e6db70762932bb5dbf3d870307e723fa595 100644 GIT binary patch delta 248 zcmVsKxc5VJ9`gJkz1llO zw;5IMLczo$5j6=k^IfiOTY+V##XLf&K?RxMD(w5Eg yt771{W8FQc4TR@{*u+3bseH*b%+lK+h5iG$YA=0;-?VN30000NklulB^#7PW-BuxP!sv=e5&>niI%D?ZWmsUtE5vquSNN5d?y;;1wwtKKDbxw15 z^WK{o=l#1h4jBLdkDDEUaPn!fxEAdLfPfRmDFCf(sp^0eH-8S9;2way(50%M+oQ$e z+V|OJ7XT<#on=)w4S;b5c+_9tVrIzwXN<)C3^20}(_lFARX;>(AeAvNSdT zjBRYwo*dEZ+kbq$UKyiLj;L)~GMj{lsStv$wuzK^9L4CJ{=6$`yUnu7>Uz+(gT6hR zGXON~8ko|d>PEVIh?C}-jR4coF89%Stp0i?{k|<<7pGsv`zhR6v zMwMlmWslo!el};rz24VbHw=TS(wn>;MGYCp{!Z6LUVl9)4}en27;TLH@Wv6`6P()J z_CB-5=(JxFfXpUg7xR8pcNzf4LnVY~Yy&tuT}PhwoGMBDB<__~$@!Rv^{8hYu8T-SJzR!dRHoG86e61`1!Ko{ii9^;k z|K$gh%6m#>q%4=qMOA4j%d1P)?Y`egsVq5}MR}o>s$JsD(#F^ZK-e?OwKhgyT{6L` zv5n`GBCmG3CZjpFlVl>uOzHp?oil}!@A^Ux`~cRP~* cmqADV0#;c~?}6wD2LJ#707*qoM6N<$f|`yly8r+H diff --git a/Common/src/main/resources/assets/byg/textures/block/araucaria_leaves.png b/Common/src/main/resources/assets/byg/textures/block/araucaria_leaves.png index 2b84836ba65464136839cdf2b1970634e06e3e1b..cc2775f39ddd843c387e413aaaf6738d2eda03be 100644 GIT binary patch delta 194 zcmeBU`ph^%LXL%*fq~)e-A6${inG8YvY3H^?=T269?xHqGEq^r9w?DksurClZ|x(j zZp^jnP5gVH5MxP@UoeBivm0qZPJ*Y4V@Sm<)`N|LhYWaF4pyIJ{nH_$a7@pEh0EiA z=*H8xj7~n-W^>g0geKY7zqdi0000eEe}(XHYFq{GYVT~A3IDFW_2b2004Zc)wlov00neX zPE-H?|Nj8{whmK~AsBymNklB&pzab}%e=z!EBAPCz?}og00koe_DWco5Si$c5Ei>UNud$GFhWDuzk}qK zV1!BUdnRU`vzZ95q(pt5D;3kM4?!9Xkfep1dF*+J^#bT>XekX#00000NkvXXu0mjf D56({- diff --git a/Common/src/main/resources/assets/byg/textures/block/araucaria_sapling.png b/Common/src/main/resources/assets/byg/textures/block/araucaria_sapling.png index 890274891868a57f6a6bdd5da92ba43db459d2f4..38abc3ee4678840083742e07b3237e4b35c1bcb8 100644 GIT binary patch delta 177 zcmV;i08amx0{#JzB$0s?kt8C20001ZYguM>CTdL24FfR@1i_Yg3@87D4Pya$^>7vc?A)7U zXJ$&d`P!K&$+o40Ov#4?$R36nV*~O)QM6}xR0L5F9BV}pi=P$M7Kex=#vJl0ZqeMT fn@dmg)-yalabp5g^?J*X00000NkvXXu0mjfq4+|S delta 200 zcmeyzIGt&N%0x>gi?mX;=rnn2A7OQ4E*DFqxL~IMSBtDT?~3e51_lQ96Eb>0imN2Z zFZe$UFl;)bbAFpRp1>_UX$=O6=y{a|GUny=lsMN{+sQ2k4UK?&^ZjAu6{1-oR|`t0G$U-8vpz;_|o`~d< zeBF+D&y050gKorrX}@4cvRXO6RZBudIx#FDDkK^bQbdoy00001bW%=J06^y0W&i*H zv`IukRCwCG(7_JFAP9irzqKNW+V_9k9UMtDJM6H`lL!d;;CY-iw7SNny&t>+RJ)?U ztpG$G@XMfoKig}2=9%?ZSsuE@jp{(1KNJJ(@>sFVwqkXTs8(VIt%JuPppCIC#%N=- z=Vo`mduKnp2e@n=Y4eaH3S83eamY6wM_N7Pqel`zj_@GOwj|*p=^q}tdF0JQ&nR%s yyT_^Dc$|6l(2pKj0X@TmJlnE{hvwgSyZ}_^2+$-C#N5pQ000061tmH&RiTWF!E{-7<{#z&9<~yRm;Uc(t zZTP?c`Q-<0Wz09bsiXg>(Cx&8HLbU~PJCoLA#biQN9j$|JhnOEi{3MHu&N7f-QD=1 zaKHb8UkUrzU1qHDh>+};-@{zMn8IP3^TI~VgzeT$hPB= z=yu=qhufIEexx$yO^L5uVst#{l-D&IuU~5YNnmrn*%UE(u%>Vr=e#h281mn=zbjtM z;q6rSx5YYFm!+Itd_Diui)YmiEhn?iFAiyD~9a=8}_C z*g4G3VTjl@&002ovPDHLkV1mXFTSx!^ delta 550 zcmV+>0@?lR0kZ^<7=H)`0000V^Z#K00004VQb$4nuFf3k0005)Nkl!lh8 zSggkwA{nx{90Sm9_5c`7`^4!S0NdOLV48l$Hup<-oX#=sb)M0<+hRO9qj&pJ&NW^- zeEjm7qsK3?_kU#0TfaagL)`i?hUR|IzJnils7Z=tnJAUw*d4}`GpxWY(F3q#hE>C8 zkZrtnLW^fvCNiGo`sfdZ^a&T|D3uaM11e7*KHn6%wwpZ`>v7Iim+tS*R8CL4jrLjd z1lYxjS%{Yoe&8{h_O}|ivJ0#V_6>9Uv_1sn7V4K&UVl7&zY)oHSZe^}YVY>KXt2$} z@Z#N;V-raDM+4o{c`5dct%*p6Sq`+v o#hg2KCm&xR;~8-}FWrK!zXLr^_SkE0F#rGn07*qoM6N<$f_5|q7XSbN diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/aspen/bookshelf.png index 568a9a76a6c5b7a9b47c7276b2789e8d4256537b..a828e5965669f491f1d933803f85cd7077cd48fc 100644 GIT binary patch delta 317 zcmV-D0mA;H1^a*i&<#yh){`A}-$N?#L;GjH)0@B28Wo0R4((d=>OL z7mQrpB%UyN`@9*&7l4wAEQx$8cyWLFSzst<(j^w?5({*SVqK|`2?Kxd88qHafWO8mt>;tA7vq>_yRV63FjH!`?pE)3KF z{E`=YFX$ib_>}5$L zJh+9fRmsdZ)al#vrUnOa*W_ky6g>>(Ok_#KJ@9~RWRe3R0jWV?C}$FqeS~Bm;lVB1 z&S->WAF?FU-cmt$^mL9Bv$K?=Q5M(UbELeB7T2;cEtZLd1ky>EpBTniN%4BMjBw?A zAFE?y_%6ep zM9?tk6h)F)yS#eI^F@$7-&aXjzYYFbh3)BRWVjl w97;sc{Y%yy*o26bum#2o%U$3;+NC zkx4{BRCoae!9i}rPz*!CM@mkSHjCc>nuQU6#}+%I-#x?6Eq_uw_+_HnRzV$Q8$&X4 z*h`3^X@X>|f{W(t3os|I_j71G-)CeBo(zrS5C}UIO$AG4%ON(J#bdb5XMhV+`MXlK z>jB2Z#Db6znk_+UDyr2q9|mJi>dyLV6q^_m7c^2v0wjQr5lN*LLH+?n?nq)V%@<(+ P0000!PWH^RT^W5{?sk;UGdp6nvp?Ow=Hy0yTmVdTC|7iFzeQ1K&s>LG>cR1nY$m zh=w^Oq>KfDH#V`gSmU;_wWD1_(q0^Q+kD;}_i*?5{l0&M(|^*bqc?Z1AWL43>S_SE zc6*xkhLfm;zW_AXoM0Al>Xc)i*SP)tA($ZLq&mUlByq|3GkZkdgso^$^oCbiFNdn;W2LNya zEQL&(TXX@S?|*9OMv2591Av_r=thZ+#RdCTy&YX;z+hh|KR#`6=0Yo#^ZA+gCaITlPD?8NnPasQP z(lOPJF&+(*j;XBQA1F(x?13zK+1uL#Kv5Lp(XgF+r5~b4Mp2ZiowKYl%umt92S7K> z+#}fn0Dqgi8g9{rZj{)(KETC$)4cnVC<8`&%=|5#Lf-uGcn{JsmHMV;&MFEcL*2}+ zZJGcrlSG!hRUH>SvfTpkA`XYZQYegWlx!cYaTquR{sZvb4O{LAta<{$N77ZB`3=s|p#2~aV0001rNklKiC76kQqI-{<2jii9v!Ivofi z44w72ra1zU;bhOM;slVPVyvQLgdw&Cgve$%67=AT*bMg$Qe5{&g*x0qTwGj>oQiR>30001xNkl+oS~GI7&Ir>pITkJP!cjXk$;#4IpQ7`*s?{NX)0b zDM_Ra;5?4E8*M+zFyiGqj5P=K>1&DUnT&LxwAGC<$Nx8=4FbSwsk-4%3`6!jRwMwM kVlza$qgN{%gL#+ps)b_(9Ve~ihyVZp07*qoM6N<$f&@Ect^fc4 diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/crafting_table_top.png index 73b6f35a4cd8a4fc5f367a0661aca9bf28a4d13e..53e6bf8cdc3cee63aaa086ff3900bcd32fb627e5 100644 GIT binary patch delta 210 zcmX@l{D^UaL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19O(d`5ZC<`{_W0c#g+=87AoG_ z5*CVLQlh+)B0PNDY}rNIHUgEEdb&7!{c$dk??6lNkKXcCfIAR<=6v{6!~)z`acuI~XJN9ROGk+zO*P8Tnii-D{v zLMm%sXe`QDacY8APEt-zjs)B0re;OPBu#1ONa+)jqHh_VN=n4H`UKwtx`4sc)z4*} HQ$iB}eltK5 delta 449 zcmV;y0Y3iX0nY=F7=H)`0000V^Z#K00004VQb$4nuFf3k0004rNkl zI$v@d2}04V6?iu%*uw1b4uHw?3-+n$e92_c{jnJ!6ip_BF4OtaeseBEne~0aWYA@m zq!^_UzO)5K>5_=>B_q!zUhjERhDP5P+(yC{41+eIa9JfOBhLjdV6i?P@*=(odb{NS!@rM*G;I_!7ykujslF*jH7^I(8egu$aC!^N&-8Rmi~4X`BbV?csD0@CdIkB z@Uv^#v5S;PsT0eQFVaRIaRRTI#ZUKkmH&cxy=V4tb2`2SDOv!`9&U)&`)^jOw)18H rDO%@Sa2&^;=(X(pdd_dkP(1%njx@9w_&p7+00000NkvXXu0mjf__NCL diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/aspen/door_bottom.png index 32412d1608088a195718808706d4d050bbc94886..e6e678080fd2b81c3c12f777484fa5c0d6b24f9d 100644 GIT binary patch delta 212 zcmV;_04x9d0^|XZ7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000XP)t-s-K~w+s-oVV zf6$tc$A@~ziDkcdPq$-InQ2yxU{8NnNU6FgJOBUyaY;l$RCoae!NCmyVHAbY@7{l` zEIiS`NE9%l0#)cmHP)J;0Wo_CkFA*JoOYTW@8A9H;1naZ!A%ALxdBv#iR@vJqhONo zj|6ymdH}j$42Cihz!ra60LTdUTxF6FEV>m<%$%SHNFRdsjS_d z-SK#xygbj2i}@7apYH&G*X0*xk58am4LQ020C>BHD-7ONOMfipQzW*8$uq3C2M9$H z4EJNgnaME}NhG$!?qd~V0ssw{lmYc%6aJVq@h&A1?OJloF72} zaJpCQNgqs}HDx{E<>2I{1~I}Ov{l5?+wx<>8x7h|=nB(&j)y6d^&Yf0(f)lbSC~NN zn8~v+Op(N(EuZ&*2{AYq8$JN)FU$psBsR`>%;em9dqCw*9{d8?Eu)uYPe7Ic0000< KMNUMnLSTXy)uMR- diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/door_top.png b/Common/src/main/resources/assets/byg/textures/block/aspen/door_top.png index fccf1493674366854d4860b5c047a7db499e5cf4..ad5b27b1365d4d2625f6d7755fae643b21ce25fd 100644 GIT binary patch delta 233 zcmVMA2M5*d4psmF0DVbBK~#9!1;Mcm z!axv3!M9(RBCUl;kpl`a4IpAtsvx8s5^A6k%Ps%}6ku)<0b&XEF=MA}m1pzxJs)rA zx=`S4Ykf&8NF`qPLe?AyYBURfK!fN3iYe9rBl-|EcB$kJ0D@q$74iUR(1-)S jNK>}~9hM0kO}qUcbWSNd-XE?m00000NkvXXu0mjf+qzjo delta 402 zcmV;D0d4;I0iXkr7=H)`0000V^Z#K00004VQb$4nuFf3k00046Nkl2a53?UG&T_;TG%V;1RD_>!A9~hmOg|J;6vD03K0|ni6m)4IHS4bie-xs zi*q-7Xa4v#3$ruxee=y^?wgkj0N1fmh=feM>;3_909O|cGJoNWL8ryb2oAH^__vV9 z#QS{C>46V`m;^laBssIQ?q0~_)#{0O*liODiC?J_jE7p4r4k06mJX_7r|jdDV@9u5 z$8~HLUJ)?~k|SioSzJ)^ai>#VYSj)3DNk z^kKo$&`3yqvATg$pp4mum0K`P*>(p2d;7iwSSH6pW3`oy+M3mer)Aun)R}YZTTt9l!$7%Tllh`e=Im-)zxBs1 cv3m34!WS457p+^a3^bU*)78&qol`;+03iNF`v3p{ delta 192 zcmaFC*v&LSWum35rF4K#h${mF!-!lRvl%8-FkHEK{>Z@tXHFgmieEOH7XqX> zOM?7@|3d*ouz!WnL`8|p6i*k&5RG8pK1ZPg1{_S?8K?fo$1GkpIp)xs2D@49Klu%s zr%EI!&51UBU{-Omut8RWL4#w;(uUbdANx{RR~0qPyj|<=cXFyLdq-39aXydp+@;yf pPfPeD54>1vA8@3DIgI%wb8IAAMsLrf{XkbRc)I$ztaD0e0stvNPnZAz diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/leaves.png b/Common/src/main/resources/assets/byg/textures/block/aspen/leaves.png index 53bd2bac60f35bf3c1b89bb64e85797d32898a40..f754dde1f9a87e2f149a0a28f07c1749a8c07bb5 100644 GIT binary patch delta 196 zcmV;#06YJb0)hgN7zqRe0002(-QrS_ZWxgy9e)o{OjJbx007jt0I!b#kaz%rYXD_9 zCc^*#00DGTPE!Ct=GbNc003`EL_t(|+6BRZ0mC2&1i+7B0MQPh&;dX)fT`?1Q}1AB zbxSM^db>$2*b&+0htOO%$3x(&;=~^y=Nfa-dw6c-FRG8 yFfHgPN)%8WTdW&p%68VoYAq4Jf$&P8pZ)=&DiDm!o`3ED0000`hJEh+d=FP^BjVK6kAD< zU+{krVA#BW$^MCo67`jyE{-7@!K(d?d<=#hhdN&T-(T}K@1~M7t8d<{ z<7#OtzmUwM{i469ml*EYnNKf+Rf01e!EK6J7wlR8*6uo1Ln?_X&#OTu!@kWP9#+ zzJFO=*CW59s^oc2jFCLg5fS`^5CDiVG7JL%D^=z5z( zs*1b&2SNyl2xVC&(99SZI*^t`gv;dukeK;n0NL$LHTuh*x~DwROfCbIWyz{-TSNp^WxZZcBJ*+C z1Mf+UaoI#$@_A!Gsybo2@)_IGT#l-us+>+ILI`xx=x%pOF6951J07*qoM6N<$g5=u#bpQYW diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/planks.png b/Common/src/main/resources/assets/byg/textures/block/aspen/planks.png index cccbfbac989b6db236eb7df252c63f04a53cdb43..0c7907f0d66d79ec9d6c4d8aa113d5cf491ff279 100644 GIT binary patch delta 199 zcmV;&067261J?nN7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-s-K~w@oqx!Q zWxse&nQ2yxU{8NnNWf98c>n+aa7jc#RCwA2!2tooAPfM(&t`zo8X%c~mDE9pgBAzG zzl7aU3l!KxuNPxyTsXjaN-SI;muP39+3J}<&69x3 pe%Bl-`hjB(Z1$oL+llQ#)-RDl`D;I_WT5~6002ovPDHLkV1isB&x`;7 diff --git a/Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/aspen/stripped_log.png index f1905eaffa0a54ce51566750fea0b22f1bd2d63c..5e3e8a62224d525740a3d19c45d9cf5552af9c27 100644 GIT binary patch delta 211 zcmV;^04)FK1LFaZ7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-s+^UD(oqy1d zV#tYQzH>{ZU^{$BEi1QHJOBUyd`Uz>RCwA2!9fnfAP@!6PrLv_(e-==y0?jYLxH_b z?Ey@C|10<&Orr~uGwKo@eID3q4%E_dE-g^+4g2~`La8X`lT6oG@i0%HtYcn<5^dmW zq8j-^v!F?Mpj%>k N002ovPDHLkV1nL-Tk-$^ delta 473 zcmV;~0Ve+A0p|md7=H)`0000V^Z#K00004VQb$4nuFf3k0004@Nkl8b&8rujBZ7LEd{w%^w zCsp*@Wai7f-@HG}%I(GZS2{0HT>W5ea~m;BdFtKJ+&@IjQhxxF=>VhLQ0q91sMM>( zVT6doh~nx8>Ab+(^8?GJgFn}csvn0DUB8bQjwb-TzrH8{fS9Fft@i;Wrd=}-!6+dP zBTBZbCjV8E4S-{rh<43T4AOallI^m!v#V~@0n(F$qZ0rs^(w;av>1*jRO(d#>Xeju3+lwAMr9wDjf+9g$eZ1Y^Cy$+dK00000NkvXXu0mjf Dose17 delta 412 zcmV;N0b~Bz0jdL#7=H)`0000V^Z#K00004VQb$4nuFf3k0004GNklFMJyMIkO&<`ghWMwL=6=ZH6;&2%VSWas`J#*}`K&AN>k(PG=*H>p?AdpS~w>K96wC!rAliz(b zp12xkK}8{LyV~*Dw3x&_R1~^%&{18IO0vZByRO+0+2_Ye?d*oAO@>_-j@2#;E>90? z3WU^G(otR7zJCSrDV?Wj&a@h$+%+vYg5N^q%CngVI|wgM4)KDnh|FZ=U{IuWA#gX_@d(c?2KtQB9qwxe4g;fXrrwVD*nm;~l z#1GWJv*i8{)gKH2_?*3M6*Pez)pZ2|=nsah?ZVwl?G-mtZo8Xo@-5*20000&bfQ1|)6pw*OV8vw*p&n}1O`Fve z{Esv9{mcwAlhtyu1<=N#jphFF1%UZ%hOgJn27sHZ3t}bdn19J?x!7uB$%Wt;t=krW zsShV0Te;3(FC9i>@Te QhX4Qo07*qoM6N<$g7W{DPyhe` diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/bookshelf.png b/Common/src/main/resources/assets/byg/textures/block/baobab/bookshelf.png index 5e71793a6fe60ff961030656e4f8acba3545b14b..20db663a2f41fec57cd6e88de9db951408e978a6 100644 GIT binary patch delta 331 zcmV-R0krSb5ptr$FaQ7muYXBIK~#7F1;N`+0s#y~ z(cSjUO(RBm!2ka`H3SF`$~e>3wJf{}zze`4HK}!HcS?UiUKb{&+-qPy2in*@V>?v zW;Y%-(zk6O^+fum7Xbd|o$EZA9kp&#t6LZSDD_0b9*nueGXDx?PWuB*Qph9T*P1=c dnqUbZ{{b%cPkm-jPT>Fm002ovPDHLkV1lc%hTH%E delta 679 zcmV;Y0$Baq0<;B?8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00M4FL_t(IjdhbvNEBfh z$A1p9?d-U^?dlL&v_fB|6cizmeR)VMFf6D;W?&>iRA(U~x&$5S(9J`5i3qv`K^PsP z^57xJYIQR)SNEG)U3Xn)XPsfU!?>fl^`2h-|L1vl-sktcRevuZca_w%hT@f}cGt4; zEa$TS)knTY5dj8YjM;`P2>@t%u|mt_OyuMDC@iHA0)w3E*p2voN=23gs+|r1x66Nx_*gYGk*&R#}00*NCH?q^awRm0AMM05ti>)#B{aqL{QV3Eu>c89rIh-nOjAY z5!3QEyKLQAQ*Y-8lc6-@hCxa%^4p~_ZWsU*)F8=-$-%YC{0yI zTVn}8@yP&qJre1Rj=Hec*?NCtjCk$Bew%YBoIvqffq(1S|7#aQ;RK`K;)rTmu{>f|+(*-vgXy@+8J@wi1h&LIk%I_gJ=rK~;g=Al1bB(mx~-+PvT5uo`%HR8L^ zLAuwmw>d9Z_YW(zG#Cag4hIn|#8)QYV$4OkGn24BQ<;5lGR()7AkLb4lzk%>jk!I< zHU(f-CK)lwYbM5YlpWz_vbA&89+VlE*(*L7uOLUVJ1R3*d~(Hp`~hA27xIjk#-IQI N002ovPDHLkV1mGyKGpyL diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_front.png b/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_front.png index 2885f56710aa1cae079f3704e12583715fdd9e61..5904658deb590dbf8eef45c79bbccedb91805be6 100644 GIT binary patch delta 256 zcmV+b0ssDw1(5=f8Gi!+001a04^sdD00DDSM?wIu&K&6g001*kOjJex|Nq$7*tNB_ zvzc3{jZKq$Lwaa9Y+N#1O)5q^AU`S{I3*e?91|!W3mX;<859f=4hRRt^Kk$G0E|gQ zK~#7F1;JTD0zni6!OZFhqJDV)d%6HKbQ$5-Z_E3Z<`4V~HF@(4mYAR_H%Q@hXM(TJ&8nUhaj<2ghYo9V$`8J zB=iUOpqP4yRTkG|*{xZ2*kNbgHKY#1d*jmg_U3(m-}k=X_kW#`84LftfAbWEuA+q_ z0NfjWj}cL+|JengdH+6ax5}gBB?P>R%bkaFGyxd8itSXfohs?9!?nIRv+vf49Bc-_ zcB|YP>?XTaklcLH1MmfGr;4GgQr*y1%t4K*7vBN6aQ+ziqK6sN8iu7nYB>*p-r9m# z+odYyogDz2a(|7rjS_WdR}LQOI1~t6@9SZHDZ}ZW4)$VfVh*tnFfumF?SWnR)Ma#!Nil#B+j;B#x(Lp4|ltc*cX_bP61%Xv_L?3`c)}m#*Q}-L?!@_r(Vl% z-`4JjHpjaXC0h!ts#TwGpiU;m6vxflTN1rcz>011A*az1OSW6o1E$Ky=mcy z%wVX$Q+7n4_oT_E`JX7lWBgo_*^i5KUm0g*-R8rWAGq7~h8&(IFG>MnTM^gJWHJC) zmW3J9u-bJ={<@Tt1D0h0;8u153u_xCoM$7l2O@*K>&Z31X3iyb^#sZB8P+yRfxu9I zr}Pbe&w6dAiu>C?Mf4!MRiORoVJypHcp$-z2XBHZ3#_c$fd7np{TsT9p{sZmw;_ur zkwGMU0D!Kz@n7G?A^D;wy$gPmqJ(hDHJoydg;l?CMpQ*_ZNaJ4QIwGUH;kx?T?%fi bC?WmO9 zsEtjNd_#I@IBZ-pTTLoPJ0L$Q9XKT#CLj_j91|!W3mX;<859f=4hW7!244UG0EbCL zK~#7F1;GJo12GT;!S2xpg9+sS4^6O7XHBa7`E7ZAr0Wm-4suJ zq^QFt2*al6#U{r-1|c-0RT)x_0xD&y(ylHm^dFi^L|p#KiMjv)002ovPDHLkV1m1m BU^V~% delta 633 zcmV-<0*3vJ0*3{V8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00KctL_t(Ijct?9OB7)o z#y>mSy3YR4S$4ur0wK1WlBWp4Izfkch}j^dCg$C@9EFk|A~w zG&_iGgOjW6x?}sY+ZGFn1)U~kpke( z+6#06yep3BXLGqeMkhK?fw91*Z;3oef2c=eZC05`Ez{~w|%micuTVa`1q*^fYB90uANGN zAM61jsx`i>RevzkI!+}BFG=f%0GCDvnP0RxGkAjLdN4JE+?R9zmw{aLu z%hN2blqonK^+tou@(vqYp87N`Ldo%2+o*;NZd@J$Ab)puf~7aNnRxty{QF6z!T4yu z%7`qxP~zSE`k@A06cP9%= zVN+X7V{iX}q#h-yNBLg%sqZ#e`T8SdAUy_fy2kMQ-fhW&T`19aya(TNi6>HAz4z)c%CeU84glFqyd?+He+k}_gH>CQN<;w| z$eI6mEiWl<`?y}nN}g}mvg|13{k72X%Y1{n%@F|rbYM-jKn?Y T3#S*@00000NkvXXu0mjf&N?g= diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/crafting_table_top.png index 26cd3506b985f66104fa9d5e8ccecc5ddb48c41f..a5d39fbc0e195817f2ea963c5489ee53f2e70c40 100644 GIT binary patch delta 216 zcmdnP{DN_UL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19Jv6W5ZBE!qf?#rqinQ14V3J) zWGz&sv}A;(M0q7ec=)*4-X#aM0aaFbx;TbZ+)92iXQGspR9NIegT}KrZ`@F6oSf*i zX(JFwsyokKxM;zoNd;`qT?;pFn7DC+wDX3A8-eV=4VpmKgawNPW+dw5Wb_;|2oh@Y zkhIjcZgdIanLD+2PU~HXQ#`FKtgNk<6T=FOL>zQd(=+Dt6}dgN!gdL0s3;E1D0B8!HI zBMd&4Tjq-mtGz@IEJ5G1s{^0kTWr%{(ChHA+yW4|7OUO95&){1me&>y+lnW$AkB+v zNb&kPuPx9|bAQ%jjG}H8q0Z|#6HvBQ)=RvO7XL)UK_UwR*Q%cDTt)j+0FGM#Snc+t zdBIJ$bG8MAR-DPkZJ$Dkoo*q`3*tt5Ji~s-t diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/baobab/door_bottom.png index 1fafe8f62a178e4bd7dfb20f482ffdb0f543480f..0e1b6fec46e9e1a54e8481d1ec3209b6e0dfaf93 100644 GIT binary patch delta 243 zcmey#+{`pVqMn7Bfq~)e-A6${im^Dz-HBn{IhmJ0j&y)eh^w2m0+6|RX7q|)-^n%3 zRT&mJF-Fn8T0rp~-*}9Ga!e&be!&b3Ws}cZ0C^prE{-7;w^$Eu zbFE#P1JpVq1z2or1&j?CjVCZJs$jnD;n5=UEXUSrfAFTHVBrem>ix5Jp85V(H?DV~ z1FMmBK-*%K%)+jo&g%>vS}(p_&*7nnAwtX{+^|4l$s#SXt6;MX1s=O&)UkVv05_9b)XO@g_gQ27law(VHd|X zs}WQHkR~x!uYbLzs7c~ZMhyC$N`X5Wy((Wdt&dq(XVjS-+bl1B+~C+Ij%{)_e_H~0 zziwaDsDByd7vi=XW>o_P|L#G1B2J2$p)yv!+&P|6XYhXB za&%y8N9AxVpAc8Q{q+3QxlUTc~zKdqg zzk8^<&8BYo;oXSeH&vo(pe9rkb;p2eVMhlxRN%?gHsf7No&cU4=Nj_1UqAo=002ovPDHLkV1iw0>1F@` diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/door_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/door_top.png index b5a4f9b6055162cd60edf1bb9940836e44c044ef..8b5363673b97c2ae95c0a793e8c1019da77592ff 100644 GIT binary patch delta 250 zcmV40*q$}K@4GpXsynvC&1xUMMY|0HBp&{6Alz{QSt#eV=_jzFgJs&+0Ixgxn zuX;F|{cK5LTkxqEn}vV2JZiqSUr)aP+*<-L5N0v0Im)$!eiwT{Qv*}07*qoM6N<$f>{J+ AZU6uP delta 550 zcmV+>0@?kF0<#2=7=H)`0000V^Z#K00004VQb$4nuFf3k0005)NklArzMmh1P4mq)Vp^ojUhl>C`<#A0n zaWF;(83_r=2vJZ6=dP0dmb?4z-uK@7-aF;<$Cm{_7-jgu27h6$qf@V|0Oa{!Y)j+* zAz;^3fPU||0;WlfA8zQI%(lLIyFDoFkh@haOLc@i)qvWxES0i7lS*c-#f-M>cUw8Xg3?!mPQT0 zTc@~=F4K>bynmvHz{DGX&Oz(H262)T@$$@#A`~0DS-Q zz8Fvaau*7bQBBk<*mr9#W1*x%wX42Vp^rE!i&VjJkFWQnh oO=2mY*dL2uI{3MrOxx1<2R^0)pNyGmY5)KL07*qoM6N<$f>HSaQUCw| diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage0.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage0.png index 019dd347089df10eba6d60bc4952653a421d582f..a50f06b19bc5635f810f7ff22dbcea0cc0374645 100644 GIT binary patch delta 136 zcmX@lxRr5&gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul@&yikBoh$~Pw!;>k= zjWN!NG18tf#F|kctJ(}G%2*QQ7tG-B>_!@pBk$?r7*cU7IROX^6B-zr6EvC~MUEx# fH5kp2c)`T5f{`(4_Uz&mpi%};S3j3^P6gTe~DWM4f>aHqt diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage1.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage1.png index 20cf9c415b7fe25b79d8a9c711394dc96e318579..aa61cf345f8feb25add418d7016f6b16daebc7e8 100644 GIT binary patch delta 236 zcmVRqeHr%I<%TSwVFAljX9`{C!>cYpn@8ke;t*7E17x`l6WMRcoBEBYGPfwdB%h$Yh#?_hl0#rn=zULyS=Y*K_ZUoAZg}D> sukcy#2;l>{_UFzAyT~f5e3hS}zf4VHFPEaJKF~=Fp00i_>zopr0RJ^}L;wH) diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage2.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage2.png index 978cfc9712f060c501ea57252a4b6336795cc881..3df7355c9026ce451059c0da2637fc50607143de 100644 GIT binary patch delta 374 zcmV-+0g3+j1FZv)BoYa5NLh0L01m?d01m?e$8V@)ks%;|s8CE)MF0Q*&aqC*uuaLX zOv$cG$gNDrtV_qNO2w;6!>LKas7b-6Nx`Q`z@|vRrboY}M!%&*y`nz7qCLE!LA#(n zx}QF|pFg>uKDL}ZwVOPyl{~GKI<1i|tdJ_Hk1wT&B&CQVqlX}%g)EwcEuexLpMn~l ze;Jy57n*#36qsbp!AJ zW)4F#Lvrr^@8$qh%QZODP`&Hj)4*9e56fix%IaIsQrJmve^7%C U%=jz59smFU07*qoM6N<$g5DCRcK`qY delta 436 zcmZ3>{DXOd%0x@q`qcqGA+8Jz43YMXaZZdO){GgROx@WGNp6gjN=27;s4VSJTF@jl zvr2GQjrihrg_ZsKhgNtVU*olRk=>dJS~DsIW>$-?ov62SzWx5CE+^OdoZjGja-H|y zMYgkQMCLb19bE2lZlmAvHQu}C+s$gxom48cZmP|JWggq+*t8U=&#kYQ+`rWA#9E)j zD?JY^bKg4KW>$^x?ge&7S9={??zv~7Hsu^vtXi{aQ#G27sn8dVBa%0g$^n3um*VZzIzmPaBbGwi0^m*{GZOr zXmxM;lX)kXH0cR`?q+Y>IK80p>W#BP6D&V62ox^pWmpiFZxXE{w&3o|uDE)GElCV+ zk5iPcmYDHx@R+tTX!X}NVTWy^K__kQXY&7kr111($u&m3>$7**&(nX!R`Knhy2!Sm p?fyIeO`FQFvol*w>|fIl<~M&db9RMpSpsw;gQu&X%Q~loCIB(x--7@E diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage3.png b/Common/src/main/resources/assets/byg/textures/block/baobab/fruit_stage3.png index 66c3b6de243c6db8b0419b88afbcdce762c5a4fb..ca3118bf6664a682446ce3ff8e0d07a904b2adc3 100644 GIT binary patch delta 215 zcmV;|04V>x0-pkqB$1&Nkt7{|Gf+%aMF0Q*(X>y?uua3MNxq~=w3#%lkusTpEsc38 ziF7H1a3_mv0BA`9VnzX8LIGJn0aQBy!V#9m00001bW%=J06^y0W&i*HXh}ptRCwB5 z&Or{tFbG6ZIxvnKij(`Fw!$uI5_bOyBt+I6LvAzVe29F`2gtaI`w@Oh&CQg(M7)s- zkX}tw04Q*pz5p28l)TSWV~+{5HG5w`g{>}_x%J8p%iAJY4_+H%N-%_C7S)vKla+Rf93rGo-1o;L3M+Xd#_U{*(s3=ii$of~tP)R|r>uV@;Hkctq%1@2 hy{W7L>vS0Gg^hS#e2WiZ1Uim^!_(EzWt~$(69BHRX-5D6 diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/grower_item.png b/Common/src/main/resources/assets/byg/textures/block/baobab/grower_item.png index 973defdbdc611ebd6ca3e4f08478fdac23da41df..a8f24b06a999f4bdd8841f701f97f6cd47285b13 100644 GIT binary patch delta 220 zcmdnUG?Qt9iV$akM`SSr1K(i~W;~w1B4whYYCQu3!^JKBr#JW>Ug=p_7@bzCmXhKh zohBa{;b!e4?Br--Vx*yN%q3=B^8=`qu_VYZn8D%MjWi%9&(p;*q=J$4AS2Tu0}hrA zE0V)C{@1VPbl_}I3ew_Q5#;I0sx`HwT-{S}>b$%6-uVT*++ALl9=zhq+_`tp-M!B~ z_1gm$Xu~=rnn2A7Lj)6Ln)Q6C;hoD?Kl6@sEsfJH5d-CB?t6Fq(mZ zq1S8o9w5bA666>B9|}%Wq7fY0=O}bQfrGg*!Q1qIeLmycg_8U? zCD>Y`o&NgRF6DCN59Hcn5&d+s&eD~4gPV6(rr+K0P+7S`tjJE1GtcVJuJXg}%#5F2 z>K56$h|IS>G5bi*Gua7ZtIz*tIvP_DeeL)%m1kTBPM00%*m;)o)A#MIM`b7Ix36Pw V5im@$QUyAY!PC{xWt~$(697K?UF!tOpqx4=eDn9N;&daEOJWzd`lL0givB zZ}}cEUv{V{OYCD3y7WlnklH;-zDuG<&7aI$HGfV<`WwN2P2W9h{x zy@K0O2lOvL(%ACrt*Hw8fxS6_7v=N!8@MKU6nx~L?8F006^nky!u$00neX zPE-H?|Nj8{whmK~AsBypNkl2!Y)NazQO*x(2 zO0(C7LwdQW?ip^1Mn#16APHH%JHm{p@BjquunL_3rIbeg=MD~i5H^K0YE2Ss$3UYR z%|+G22Gt)-4e3@Y{O~z!)FN!wQr*m+c)f&!uuDj7P)yn~u4M#gOa|1~nQCO%Dp&00000NkvXX Hu0mjfmD5b5 delta 471 zcmV;|0Vw|60p$ab7=H)`0000V^Z#K00004VQb$4nuFf3k0004>Nkl#$aS6kbtu(fowuneu=(Bp1OrXy>KlDgrpgxk+N_XlQWTA=mCM4IhX%( zX7={>{c<)P08MMK-9XzI0MaZ*B3gw0KTBh7;sr?(6C4ij0Ds)xuGti8pQN=x?rb-> zukQgk9V-CBXwGc6d%g_z!yf=V+!ubrIJ7pLO-Iu@gmtY6o}RV{g|c*=fBx9}hRbC# zfqfG%JW{O<0l=nMqqQMt_1WD`ZX3htSdnHiwyUsvM`5{4$WoUx+wGn&a_~RcBCsd;#p$^BcG|x8Q^$e_ky6;cC(l=&LXu1y z0Ypmia9>QQ00i5|yRXC&Y~OnuH^q9QxKPN_n5H#kX-sfE@!H0*>SCif=Uo_!6e)$E z8jB?%dttl5QMk5nylr)@oxn=@_i;K_6J&uD9}e%-^-wPWuXdWn-km&Oc|^7w$n%v$ z@O%Gf0{`0oi4%*^FHzeV!f5VRStbtl1KZE3Ydv`b+s8XUL{?bP`~_4i@)=Qq4_p8M N002ovPDHLkV1kID+UfuR diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/log_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/log_top.png index 15dffe441d411718338bdc9187deb9d565938636..ef749197d7f75dfd416586de3a5402e8dc4003ca 100644 GIT binary patch delta 260 zcmV+f0sH>U1e5}h7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000gP)t-svzc3=h)R=u zLve9idT2OgWKV2dGFezgTTLoTN;*P8G)6lhIyx;hGAJQEL2Cd20GLTcK~#9!V+gNY zdu!Fq>A?&W7*!O6oCI|k4({&ANK5OGVF=nFB&ebwp~?`_=zZei;v(kGa45;6Eu%%l zm*Gl_w~I@Qgbu@zBoDWg6gD4*C5awxEiD?J3?T^~E-on^?hGc49^GvzV$KXll0e!e zyci}WsVFiCX?QXeWMp)7babdQ91wC*5fD+(VK{sD%*@iz@|gh8M=gI%Ed+r80000< KMNUMnLSTaJ5nzJ= delta 575 zcmV-F0>J&00?Y)E7=H)`0000V^Z#K00004VQb$4nuFf3k00068NklYlYa50%?^?l?Iw9MOxk<6-|mfR+I-wmm*!H(1jF8BnsIDfr(go zurmg)DM$e`?1r3XMsqp;ch3AXx4pe}UFk~zic(WwHk5@1K!1h;6JFc3^H2(W(IyB4 z&dJFcZ?+x+kSm8$Psqj&Y2wpgSteKNcC8{!e56b~B>Tv&yAzP(=;EtIa+D&S0=csc(?qzTUKocS?8ahUnwxA*G%$7_8v{WaEl% zyhN@P`@WW65~g&x_sqSEs?dwT~wd-;G;HDQ zHfx&rGqyEl8G{)SxcMJWCU+42Uqr(j7^8E3#wXGDc zC0Xys#5hr8U1}^nJUV4`m@&7p@#MOxuWV-Hi%uu7o%TiB?oWSxfWPZ92L21#pMwAZ N002ovPDHLkV1h@!5}N=3 diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/planks.png b/Common/src/main/resources/assets/byg/textures/block/baobab/planks.png index 6d3d4348a7fbff901ee4a3e974a3f425ca90b53a..063ade9ed03a97cb1a4254db6f8b4cb9f9fa7879 100644 GIT binary patch delta 202 zcmV;*05$)X1lj?R7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000LP)t-svzc3{jZKq$ zLwaa9Y+N#1O)5q^AQFpxH2?qrb4f%&RCwA2!NC#3APfM(!!!9K#tk6F|3s#O7&@@& z0QFx&b}1P$?1)|}T25T5b+^X2M?5Pg`NNB3juvmOqFhyvT0^W6&xm;LN#2A62P)RT zdN$gn*8M$*d&C+uNI4yB34Zl7mtu4;O|3W9Tz#yFKhI|t;(%Fp`2YX_07*qoM6N<$ Eg4?f9LI3~& delta 521 zcmV+k0`~pd0hR=i7=H)`0000V^Z#K00004VQb$4nuFf3k0005dNkl-6jU_40HWXpsCbDy0FQu#3y@_{gaQIC zax7nT(H&Xsoy-Md3bV_ufh}idXa4`6e`>qW?=I53Bn&+Kc7KP}S19@4_^Z(r0T2cr zX24S8$2ov$s^b7sRS2mn z4yF=-V7&#va6BW;eoyQ!8-M(o5q3Q%o@OQD=HN1ZyTj|zXKoCxIy`q@j<|nk;PAE) zY+sM4y?AiNu$3#6(XJ#-ylG!a@fI|&f=d=93P&3@o~TGgO-d#As!xd!Vk z@{_sYY9@F8G`DNS!+Y1vp5sYkrrEpymlxtm!f-r8Xjoz3IXXx+HS62j2#F^NfPt@( z)Sf)rUPx7$Vp}jRs7j#5>BX`pl3FMoDUJbti4p`^oG?|V3&IX;Ld z3H>XV98KyMFEpO5wFKq-lt%rGw|j>iWhLjmCUtR+!zAbDkBUb941cY`Y4x2nFZm`F zAHEzdkIDAJ)<$RvS+Us5BVo3G}2EiH)$rg_Z00000NkvXX Hu0mjfM>kLZ delta 513 zcmV+c0{;Eo0gnWb7=H)`0000V^Z#K00004VQb$4nuFf3k0005WNkld`GS*m@S}#np&~#6W)J7oH zJ&!zzEHVHEH`0zf(jk0Rcbx-xGILkHS z)8hj33zusHz|+snPFT+6NVW_;t8|%41i)$$QC5xRuw4%c$J33X?AWd&+V0M;-`AmV zE>WQefOy`Y?SBimyUW5TG$6BFTMnWqJBsoRic8&<4Io4BwV7l&mjeS+ zA6@|1t|N-7wS&ws01+#nqH5VCiQVl?1<24NO#%xxRzAB;VmX-*+lL5U4~ds+Ls6aW z8drK-J?Q}>h&qyiMsAdlVG$)m%7WtG!{Rej(Q`r#LDN(=gohH$#QHnfa9OR z?!xUpQ^Ck>S+0qdPpo`5m@qs&PTxL00000NkvXXu0mjf DBa`%u diff --git a/Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/baobab/stripped_log_top.png index 15c3294e3035174443436d463cf0bb41c514288e..b6e86d27b2ade4e196fb353d7656dcbdf441b816 100644 GIT binary patch delta 264 zcmdnXGM#CHL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19IXJK5ZBE!qc=yZu)}Ls zll$Zv=l)8kj$-?|Y^$mai-LILoEW2MUoAIlh2uU^)j(adJzX3_DsC}OV95W^pyF1w zqC71{ks*OOGQf1IaRfv2-7|Z3?>=L}pnAd7I5NN{sGdRd@Jt}Ep2E<&booFPo9jK#-O=j&dixR=S*RcJUr*@>7CXSfoee7 zZKgA%ZjB6PFa@e{*t6#h5QH!^n9hteundS`=vvj0=A`73_BO-8I{xoV3!pn0JYD@< K);T3GHUR+W|7y7a delta 560 zcmV-00?+-I0=)!~7=H)`0000V^Z#K00004VQb$4nuFf3k0005^NklHKyrKE0FxQbhz0{~>za-5bJvR+b3$>%SJ0E|Kx zfVx@p{bxonv^8?wtdZ3cfY%2Jxok1^lMq?80K9*Dpb-^P7hN&>`YokyR_rGs20&KK z8HFyTlpLicDu36FteBG(Qzl7BFto{vIRneUI8ICA$fIu7)XfTjlk*xt(^s_jb_I2_ zLRL$JZ*e#+FzRN-pPRqPYN=84a>0w|V~s9+OBYqr;>aVHEq#>;hBk5J{nyC4S#Pij zgFs6F=&Lz*t9L`uS8IAY)B8Z!^dFD6_2n=KHXaM#Vt;Q}Y%u6H*Ko!Z@-}R%WGRCw z5V-pvhUb{XI}t~z)Yg^NQjZPN2U*0CcW0!t%PZoYh?mdC+P1>CG?PgZ5(a^Gsj_r> yI^*o}iYeZQcdu@{w6rgTtvl^H_oME9eSm**EC}u#W}6%U0000Dt9W*UvBoCp zChO)k6ADtddaT#x+WGtUK6d?yHmj40uD6%IZA$EH?bzyE!Q8NNW0uPNq`vcEyYB7d zk~z~E`JUr(x%u=Q2Z{5x(mw4|HCB4{-jBIgb^D3Mq<|pJf_DrFQaMhZd+Y?CpSraw f_JGrxGr!nvGE~mAWET|xUBlq%>gTe~DWM4f{g7N+ delta 470 zcmV;{0V)3Y0ptUa7=H)`0000V^Z#K00004VQb$4nuFf3k0004=Nkl|!F6dOr%w*<2zsa}{a4iYSyf zI=gA{2|F5W*CMe^A}>uD_IG==>%NFVsLqZywFRWMf%UZxKR1P+yDW09??aK-xjsHUg7#{D`0C_P(q%r%uz1n?rHF*K>KEH*KL1%T@ zLv#RvIk3M^C-Ym-S;g&x;%f3jxJsQ>zI!-=-vYq%Yfsq#^pPD6wrltAM6Q|(gq_`Z zPLcCTW&FKF4%*g_)H47YM-+l~$7Jv1tw4Crc`ZvX%Q diff --git a/Common/src/main/resources/assets/byg/textures/block/beach_grass.png b/Common/src/main/resources/assets/byg/textures/block/beach_grass.png index bdef79e8c7f78dff236aa8a5a1fbc765d136b9b5..544bca6dfbd4b1604d4200f994944a22da8206b9 100644 GIT binary patch delta 153 zcmeyz_>6Ia%EUs^i7HC<3=9l!U!Q(_d&8~si?1G;c5zpi71tvzpeSQWkY6x^!?PP{ zKu&&!g4EmeIP30002AEPH4G000JbQchF<|NsC0 z0JFcOzmXvrcwl#Q*>R07*qoM6N<$g5?fPDF6Tf diff --git a/Common/src/main/resources/assets/byg/textures/block/begonia.png b/Common/src/main/resources/assets/byg/textures/block/begonia.png index 7bc4284c68dbcef3d19a2ce39ce8ef9d5a5c965f..42f75790e339b26114f5b75d72a0ce2957bb5af9 100644 GIT binary patch delta 193 zcmV;y06zbg0{#JzBoYa5NLh0L01m?d01m?e$8V@)ks&3200030{QUXX<^P$mA0tj3`w1|g00001bW%=J06^y0W&i*HR!KxbRCwB*jxi3v zAPfVKLTViT|KAQ235G89l#6W3@K?R}lkaxt!L`)=(_6Vp%P+_3NJ5hokeMI^AQUh_ vo(5xqS73!Cr0_zpLe{?29`>=_W4zY`)t3SXV&M$)00000NkvXXu0mjf;xJLi delta 198 zcmeyzIE`t7%0x>ghcmVTx7~c7rZ+5=kpDk(!~Z{jeqMi?z0@hVM@QLDRwrGJfq`MG zjm;k*#ZwaG7yKUq7=-ShJ2z2Lq9WPT#W6%9xVP6^=zs!`)8qA>PyT(^6}7%x7#iau z&!Wr!mo07m;>@Mfw&gK}{dzH*<4R%gFV^&=@(PZY^lfhT6&w~GYWE`^x-_wE*$x8%&C)=j}ZIxgk9 zI_YZ4ezGdT*ZYCej3q&S!3+-1ZlnP@fu1goAr-fBdk^w57;+r;(OmM|zlOgnWXWg! zgA5GEQhqW;%$=TFydn4UjyUPJf2FqmlX@_VP2lemkHSA^CkmZ9#}cHad|dFL&Z_Kt f%ttND#r`mMUt~1D`cwHb&~ye*S3j3^P6U3Z!{l+A_sG=$eX|ZdlWoOZq`jmlUaCill!r1`Ma;> z_^M{-M$ArapBN|k@~_m#zh);IuW#^>^IY(t=>De0E~XYS0Vb})>=j48?Nf+oj7YFd d(5+Yd$*6pW%{SuIHhZA;44$rjF6*2UngD`AP0#=U diff --git a/Common/src/main/resources/assets/byg/textures/block/black_cut_sandstone.png b/Common/src/main/resources/assets/byg/textures/block/black_cut_sandstone.png index ca14c900cd1fa351457c0273cb5010e552328485..e51a9c8df64d16f663c7d6a8434a25b1fdc96b44 100644 GIT binary patch delta 138 zcmV;50CoSW0j2?vB!6v5L_t(|0X@N?5yU_Y1VP261O%528zgx7^Do!g-(BaiXJ3|( z2LwnenX9ilkIi0o9Yr7-!qk!QiCqf_Bmi~^i9$ruwE>V<*Ct#Eq-zNVB#?APPzVBc sttfw8@=1bInh}KzI@QzNJ=3or%pz0{FQZ~n00000NkvXXt^-0~g1h)Mvj6}9 delta 142 zcmV;90CE4O0jdFzB!6*9L_t(|+C_{p4!|G`19=x8$mlJbC&vDN?a+;cnhaDA=%Uc8)ktGlJu0)BS4yKCS$wZw& ztl_F)=i9ad`uEUc?OyECvU3f;nsh;;$2;&qb{g||X*YxXjz3A<9Oc`4080P>002ov JPDHLkV1f>hLY@Es delta 196 zcmV;#06YKA0rmlqDHbg)Ej&CtW@ctgOiVO1G;(rs-=GzQkv|oGjY&j7RCwBBU|aIEsicu(${^xCn|kFgOYt1J$?) zxBxXUFt|7hItnWTr5yzYT#O6_fYO2t%)vkzL16&~VL<^F24O=7MngdnMh0U+kl{dc yf<=JJL>vVffYu2k8j3iYG6*mTDhs+eD+2&_4z&D z&8rWjoGq=biOWwjBX(k&EOLG7mwKcVk;`MRu002ovPDHLkV1j=+Jgxu$ delta 134 zcmV;10D1qQ0iywsB!6m2L_t(|+9iso0R%7%#JruMn3zyt_UB*XdTov-`3?<=&~m)% znOr#PGaL(vBGJJsnJLRfp}nDoIq* z-a~0iNX+pJ)sti+;;DVMH)W$$ zo*Kfuk%otC##7Dpm9Lr6zHJij(p->P|B_idky6P0000-B!7EJL_t(|+AWSJfdxU3B&Rd+)IQsr zvi~5S8p6DhhKFqa^Ud{@wM@O@?n!%L{ginMbbo(Gz5(K0P!Y;v99};F0000{!fv`YoE*fH`| zd*!~UBw7dU0jn##na@_&L=&}cuSB!7Yp;B^(sp`5gLZ5_6XGQH66q}VM*D2XP$;_k fEJAU;jLL_8vGZBz6uG+|00000NkvXXu0mjfW4JoO delta 129 zcmV-{0Dk|P0iFSnBzk2@L_t(|+9l1Y4MQ;i1W|Wrwi@!#@4tsg4%~CjRlcf4JE>q6 zJB)v4x1293iPnL3fz>J8na`dv(L}BDo}yU~`<#DW+tCdgw8P$?5JzG+k&Zn*+GlTq jLeZ(uA{3{aQTfmhvGZBzNW1kF00000NkvXXu0mjf2bw#} diff --git a/Common/src/main/resources/assets/byg/textures/block/blanket_weed.png b/Common/src/main/resources/assets/byg/textures/block/blanket_weed.png index 9b81d7e569fad4af5fe54020b9b4d02478f59917..67105522ce5416dc7ceebd4f01b54ec479b88bfe 100644 GIT binary patch delta 218 zcmV<0044vC0)YaMFMp(@q=<-!hlhuSg@uEIgMWX2e0+R)d3kSdZ)$UjP6Ahe|`&@l%~ z(74H!B#ooULMKnaR=fw&Xgw!|v?gC(4J|x7wLmf+^n48*nNvoec|+Pu=XqVw%xhuE z5Rtq?HWatw2X|0ct6q{~DKt!+1Lbu4*khQ`KRGHjLwaMRdnj^na#hFAUb804e@;^} UQ=vtxF8}}l07*qoM6N<$g5$UjP6Amq|oHRCwBBU{p3XVi9CkW(YPi3N{mTHefI^HWe^sG%{vj zHV_n6E^IbtU>9U8Hgym*WMDQIVKo(Sc406wFm)6W3>IJr4r2}$FlPuhWDqem5HaO6 zHDzFAb#zoN0UGEc!YCXdC}7MWA{FRlut7M0fn}SZu_L3A0Ryu(Los8hu`+{zu^_Xl kva%_|A%leu%FG4=02V$Lvf%svb^rhX07*qoM6N<$f}c-Mh5!Hn diff --git a/Common/src/main/resources/assets/byg/textures/block/blazed_ash.png b/Common/src/main/resources/assets/byg/textures/block/blazed_ash.png index c55fea6b8f7869a7afce5882951d85d1dbac509f..c6ba7a31841451d39080306bf95cfdd8c4958103 100644 GIT binary patch delta 173 zcmaFLc$0C0gd7ty0|P_ST=7ppinG8YvY3H^?=T269?xHqGEq^Xo+rR3#5F%VFD5d^ z-p1a{#H_{ld<0N+n5T8}qk3Hg$e?r~S6%GVk+UNgvMK%{;ci?&Z6jwx8?e zuO3!Ob2a>Nt|s%ugtDD=Y==KB=iY7@a&N`2(+jr!duP*DdvWG6p7Wvp=Mqma}%Q~loCIF+rNSpuw delta 164 zcmV;V09*gr0p$UZ7zqRe0002(-QrS_HXs-eP)t-sPD@TdJU=!xHe6X;Z)@@t2n4{jklh#{)BsQe1pl7y1oShn0Z%ly5#e$hCX_?1T6h&s z-9V?>U4)L&I?q>j$#e%1e)DK!rPUe+QoeH?N5@~6fmRINf@RkuJ;+^MWAOtP^b(v+ S1#-Xu0000~2Sxj;{IawntCA{wd0004WQchCTKq+CD_F7g8Mg1o$Nj(efktBX6iSDLyPd67%4%L};|O_w!S zlHLC-MY0IXwt1~258cC%>Zk+Z5_b2Z5#XmsdWRtN)(0;00000NkvXXu0mjf DR5(&t delta 207 zcmZo;n#VLjWum2$$^TCcANSe%6j@qEDrfaX-drGGH?wfTrs)g}3|>JttAG?|NswRg ze<)xG_OB3{s3=ii?&;zfq7m%d&&bzcz`-o2_36KOwQF(;XLkR=Z4yd-bAp~_<{CUt zQT@s6BDPX|Li!Sy%*JU6C3_F--u#{KRPNNXk77zL7aJ3w??# zEhClxIx1fT$}yG%`2{mLJiCzw!lf#pYLNZhz>7jD7l-*c;R!Ngga2O-{QuPOai8tY1@e}W%5^gfeTpm@7#MW(TIGNgM@f)h@P7zk zxYxWla-yO{eUYb&V~9quZ@;HdivbVw$5sFTSKRXBYHQv&%Y&0T?bm6N}Jk#Ue~SjU~_-K3VnXf63w{M4IW-z1YY y`_A(7JXjPL8;~V7W5>&DXJ$sXA5;FzaJ_-mWbbdkOF$%|MB`mSx}^1olW97b{0wBK|m@y2Pireb?cv7r;3RizwIY_ZJk$;PFdxI%R$=& zSSb?#8sG#N73>V*E@v?sEG)9G7EJI)Knr@K$(4yjvOGGY3SIPVX_SU|ybK~=$#ta= zxAjf|e~P@`dpOhSV_&R}S+!~Ir9nW!(I@z6ba{l;^Z7r#sS7&?6TA@s@CH!cQ~;HL R88ZL?002ovPDHLkV1kX8caH!7 delta 638 zcmV-^0)hR{0*nQa8Gi-<001BJ|6u?C00DDSM?wIu&K&6g00KryL_t(Ijg^u=OcP-k z#($LS(YvGCBQz*fi3}JaQPaU7i;?J{i(znp=m0B=Lk9;FHusvY>e(+ zf(r1UR8>bxfvV~#09Nr^2*wN(fa;%L$KEvE#JG3^*RiR5dCQrhabF;2m}t6Bnky~? z@GNze9Z>_|>BH}=7h1e{HvzFEI5siEB%T-`0+6ZZnCx6)vU7>iXf*se5RLc00pm$1 z4$zoO0}zQP27eAU1!Y{B3PqgqUD$qnj02!JTcz+~yDb39gZoPh#;_9_k-hh>crWl5 zXRG9o@Wb=4-4+ecKLa!?t6}qcp%n@?E2{u_YbB%nl@{9{N%WRuL*Q=kV54^p7@5JTXAm%nUKlgXwEwQ+9C- zAq1xfS9cgKpX5=~qPT~>Jb#<4mt`T<*w4X1@BLl00eI!4>GyJsMxzw*Exz}20dJ$k z@Kz6slp^&0zE$A8P||9Df46so|ibZ-hoiros$d-t7%d!&$+MburSaGi}N%+T{xWL^`^x0N_gaJ}Uj zymxL3$KbNj-q%ZG;&CvsVctT?JdMo10W2)jC|s_-Np|i6%i+kQHc8h0000tt4iM)37xO122{zm5^N?7Jdz+j1pgr6F%Wws)0iNk zZyPltQ-?vB@n}Xgk3BdHL_g*RrU&zaQn1XB>20Z4v2Au$wpuEXnWEPR;uwLc1Sv1zy!DL^y2zAvKIS76ZdmPRcIj`HYMdZFtDSrcZ8{;wrm2m(7 N002ovPDHLkV1g5|mP-Ht diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_side.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/crafting_table_side.png index f3ef7ccaf7d24ca357461d34e22b1c8676d19385..19dceaba1187a795bb2563f211678c48fa2b39ab 100644 GIT binary patch delta 288 zcmV+*0pI?R1IPl9F@I4|OjJd)wzRUfw6V0bu(PqSvazkMtE{Z3tE{N1silyVly-f8 zOka$h@vSeKT3T#LU1xVVl6pQODh;BE>3?3C^#V&YXC1B77ZB`3=s|p(~Rp( z0001`Nkl~lNZ{C`yUjgd_}VCnSYcJ!R)QI)~AR@2?gi7 zx7OcNfhYlxS?N%%OT*%{+{vGoP;k`TcP!C?ge0000Q|^FvujkMG6XL zpD?ztS`CX1gkc~a)C!$nBT%74Tl2E$*wV3L+uWtT7GxH8&}EJQ9~7m-5AuNMTXo<6 zuCX?&(E-!khXaMPL}2T198eSw3O`2(P0s5UVU_zjrTqXJryMRby22U&0000rhf|w|NoiORz>oYC7;wI z`X`uVzeAF=K7*ezQr zX12d>je^p1R40F>Q&3COb&R{6Qls9YjrqSTzDwj0a*BkV{Qv*}07*qoM6N<$g33LO AhyVZp delta 327 zcmV-N0l5Cw0`CHlF@JJUOjJb~6budv25SH>qA4jF6%GIY|Ni>%`{vJ^1VZ}X&i?rE z{qpDb%($xsN%X+D{O#xd_wiH$CVL1dgA6T94IxAb8}q%m`PTocf1ONa4tA9yEK~xx(J&@}TgD?n% zL7I4pnpire;3doI`@iDYj1qp3lk%M&01%;~j~7(|0|1t@Zp0OmrtJy>o~0i|h(w05 zoCr|&Q)EuB7~?cA097+ENmex>9-0dLDT~^wdG$dE9LCx5zuDp7_@tUeeJi=yEvP&K zQ8df;tT;4oYCyW0UeL?d+;+QcLpx3!IVEPE_9FmxWxl_@mp4Kv=W>TT-o@j3<~#oH Z6kodh5}2Qf&EEh3002ovPDHLkV1f=don!z2 diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_bottom.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_bottom.png index cdfce1fb3d3528ab2c955872f59fa28b359b122e..7e283da58131d727549f8330cc07a6e81e88f05a 100644 GIT binary patch delta 224 zcmV<603ZLb1n>cn7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000RP)t-svbD63l$1K;q7Y1%k7H zQ|^#%(59y6#GzME<0@nG9vYkaVjjkA_DdmHu*s*LV6JA;=2=jO?IW8qx+Gjr(xFZ- zxAWqV_#4Bs-jRl13@>w7f-%L$(6JJ6iP$IE-k&s~AE}I41U73gy}}y7_~JEkZ;Ug>)+sOW&dc6GP`N9s3S!yZ|#praS=Z2p!p&lD0urk%NNN zICkXNLm6D(*o8aYd(L;hd%knNorA;Uhv4NK0NjSpUvd+oPBzb91jQYv;14v!xI z9OY@C+w5?Dc7FuGr_VD^Pxke_Bu(N4K+!=tZ7CJA$yWfbZ)S|fQ#`-VhmRM$f7jm* zRPNFC2S}+fM5QHwJX>>qcBG3}%Q>nMFd9!eJ=w3#B2DA^7FNr-{{4UF`es(!f|RQ6 zgL3bq@f1tCI#zaf@vSJdq^n~_maVa*yCr#)WLl2ysDCUf^QPr!{BEAD3-J9N((faL zO_oN4kE;~I*1A{scL-sVZxXUJDmnnTy}Bfc7kWi*vjafT9U|l&L3aqii&t+o5fnZ# z09sxTM|rgUL2b%XDzY@vdKdF4S+=I_4*+QU1B_C$+w2r>eByPt+0lAEf9r*|KOo;E lTPH%@jU2Fb+tYkC{ulg*+M4&OhhYE!002ovPDHLkV1n6w0l5GG diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/door_top.png index ca2e24b6a3f377127bf447673f827d357ebf3e33..3feda823d9ea3191e0c8811977eaea5318f43577 100644 GIT binary patch delta 272 zcmV+r0q_2h1)l6v4BWeHu00DGTPE!Ct=GbNc z005RrL_t(|+6BQe3c@fH2H+oi0`UkA&Q7jE39kbm|FimT9u@W5WgH3^~E zMIk(jUyWmXp9nO>SjU&RfrSUnK7NLn!Dqq8DF1AHdI96Zi z84KLhr`DIaLl9xLSz3WiX1-ofMy$qx#-MN#(aDem?wTJkzdcwbBKv+JDGsIQ@(;;~ WN07s@&zJxJ00{s|MNUMnLSTY}v}^eQ delta 643 zcmV-}0(||S0+0oe7=H)`0000V^Z#K00004VQb$4nuFf3k0006?Nkl1*H%j9npQ%Af+iYG8V7<4A;i%{rq0d`BrJxN#l_KunS{}WFc=3(a4;qY zR!U5jKWRxp=v~`)cS9Y@JzC@2-tYJO{=V<`{r+C;;nP<=ZhwzuXBj+guQ_y&@`LfX zE)v+O9EO<$pniHt?!hxIFRIKueu;b2z?Uvwt4@BROs%@l`1Cvgq2ERegAM@h^%=Th zp^L;2t9yN>nl~HADt^^CLN_epc_+bnF#UYoZ^w2zM1E`L=Nbvr{H!8~|nvG+UX$SA7PGz~o=2mUUCDXKthe3z> z>7m-Ps9bEziGEpU!Q5CsSD9;`b-w ze_9$N**j4H3^Pd}TSFjapGW`!S7%>{>jEtT{970V9g_D7WSm)qnd)z7I!73E5cVT7 dg#|QYioX|Y>6f0fYaRdq002ovPDHLkV1m^hE=~Xd diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/leaves.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/leaves.png index 08fb2c38a83ee3149a7b3b36acb2327894b43c32..0923b04dac8e0034a49fee5e08f4cdbdd17bffbf 100644 GIT binary patch delta 223 zcmZ3$G=XV?gd7Vq0|Ud`yN`l^6lZ})WHAE+-(e7DJf6QIWul^LJy2rvng8jtKN_{3 zG|OKq7uhE2TlG(lZz@oNu_VYZn8D%MjWi&q+|$J|q~aFq!P|mO1|qH(=f-eNXl8wK z(ZN7dLF>m_;}hmRf4@J7>bNq2e@W8gDGbr(zVX^;tdcCgK9RdQbMnM1^-mSu<+{E; zRFm=xt8I9-NcWoL`Z%-P5clb|+R1Bnz*#;E?>Z XnF5#c%e8EQZeZ|q^>bP0l+XkKt3X-H delta 219 zcmV<103`pA0-yqr7zqdi0000eEe}(XHYF^x%>QSb@iK+UHgBaKS%wu&dH?_bBqOhs z00007bW%=J|NsC0|Nj6QO9MucAsBywNkl3%SP-&7G zZvvX3juT5VKc3>fTaA1dJEA!+gZ_cmYBRalIfh!`^AK-ks6e$PW(}pH@)-J$rHM5@ z-mQ)Wv<>lsaHEKf!>7=swAs`yjbl&oz6VWfuJ+}6pKD*ye_l`emr=veHm<8WEhYf++S8xoH;jnQkFupNu&&g$%4 zg#GV43mNiAe0-OXafj!Y6+!sr@JzNG94)mDcNq3MrgX3wBZpS4eiKJv7ut%rGQ&((O6t%uv|K6Qb8ck8)5>Lb+R z>0SBXFU$OjHy-mVSUl@K#`ClFu;xjR>C;VpegUMzkc$|8dy@bF002ovPDHLkV1g#N Bq+I|2 delta 360 zcmV-u0hj)R1Be5V7zqdi0000dbp=0>Ar*f+HgqZ`Ojb{;8Ec41LXjI7I2lD`EiGIi zhM|XX8kqn90UJp~K~y-6wUgU!!!Qg(DN&a6|6e>h4UjnP8f-UwAsA?`Zx57=h2m(q1k=x8MX_W7JPmHGN;IT|V#-LU;x5RqT10>A zeI*b!IwW+t>R2LR9kWq|N)AexOzy3}m|0000AFCoWDZCQKU`ILv(p*#H0lm`OxIRCwBB zs1-Mn^<$h;%upH{7N(XO8q8qYac0e`RcEvrSesNs!$M=C8Gp=fgc z5PfylpRr9{ObMYBr9h-g1(ic`sgO9p@8HaZQ~wYreghW{aO#Ds6{0AzT+uqjPzy)i z^~O$8#9_oXK<4yzXLjbj*|)OS-_OTicD7#(M+b2)+&!^9uYdjNxN$!2OO5Jd%BF|!C1%Q|Y;g-Sx8k%8hCM)?5-Dm=6XbsnI z8K!HPuI&Vs%xx#QoKGv6udZ$Wl5>sT>4rmeNw+9c5>2BNB>>vSjUJW-aZpSM#Mj1b zX|?OO)MO4v4q)Fy}$VOEH9xKL->33LF%^8aTDfcfqnX=NmlOtI(% z0Jalc{pKLL(vT)cWQwJ#sNGh^nCG?SEW5t`01N+0V5$E!&cDsG$whSNRAG@sU$L;Nf`YpN!J7&JUv~ggFUuuJLM1kmP#E-dMEkkV7E2r0Eq6ewOJ~gj-A4 zQm{ra%QQT8H#YxZ|GW+P3PKlopNcqB-ZU90dA-&750pU~ix`_B=Kufz07*qoM6N<$ Ef~)>dnE(I) delta 439 zcmV;o0Z9JZ0mTE57=H)`0000V^Z#K00004VQb$4nuFf3k0004hNkll*2 z5QV=Arg)IZ$^i_>fVZGPxBis;;QoNj?T{(SWEYTuB8V-?AjKgaY_gP-yoos8y?giW zzI^|2_r?`&R<}&NVzEuji_=^7D(Dyx*77v>0l1i&^eMJxz@ zq(AIafpQ`_Wk&CM zY}0ZLRaTg%P`5f6<1`Xy_)8iV%^)A}8LeZ#P0jUn+1n4m~szC=le!W9PwtC21W>Y@SvG P00000NkvXXu0mjf;iOQ+ delta 450 zcmV;z0X_cZ0nh`G7=H)`0000V^Z#K00004VQb$4nuFf3k0004sNkl8n; z5QIMm-5+}}eynlJS2B5bsX0KVk|Lkkh z+ZH7=GO5s;8>-ju=xqzY{qB~;C#G2u$TTYuDY4cNqqi;Pe2Hl^sme+GD5lYr^ChXu z5h()~qh73Nn=P4CIJ@WUA!6J%1Ij91MU{Q3O@fc527C@_XnIj?*$ zR@^)CKbS^`|IT$s7kpQ}8InvhbRMr1o)HSUYRN8e{uJN<@Z2_q*GmM<&(u sEqLK#(P9nacyh||)Aby1!h3C=04E;f*->YQng9R*07*qoM6N<$f(pFTHvj+t diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log.png index e6b4e56092952554d53fbb9dfefea64027c86054..f0e2698153f685b8627209ced037d64f2d4294b2 100644 GIT binary patch delta 197 zcmV;$06PDZ1JwbL7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sNK}qLN_{my zX)-!uFgRZy`0C7n~K~#9!1;N`9!Y~X3z?-1~%iw>V9tDu00fN(jV)x$) zyZG6VE}2-z5VkDL%1(`iJa(tPHm>_^LMendYdQ+%jm><)Za$$5FT@tr!4J~An(#!p zvBXXooqOa$ejk##0&zaO)(k{BSyy3B6ZTktx2F{L2yztT00000NkvXXu0mjfa!5|l delta 388 zcmV-~0ek+{0h0re7=H)`0000V^Z#K00004VQb$4nuFf3k0003^Nkl)qmvoL?VhJ-Q0C91338J zo-loI5T#UzF`%kcX8voD8UTnfK=i?71w)^Rw)*|+^WhrDVNyW7-h#a|cWdR}2=YSG04%1GNGN@84Pp$F1#eBx zVf&n9=JEZlmu~ge%xa%maJHQ_K%kemk39R_ZYBUykQ~H+qT5rp diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log_top.png b/Common/src/main/resources/assets/byg/textures/block/blue_enchanted/stripped_log_top.png index 36796bc40a413c0347a499b155fa0fad18c13609..e931ce89821ac5c922ba0f543c287ec74d984ade 100644 GIT binary patch delta 193 zcmV;y06zbZ1JMDH7=Hu<0002(-QrRJ0004VQb$4nuFf3k0000IP)t-sNK}qLN_{v& za56e#EHqdrE>00r0`dR=0BuP`K~#9!1;N1$!Y~j7z)d>XRs83c+#iVsY%BhQiTiJb z8NeZ$#3pMG1>(KNb*&A4fno{hYuiVFE$=Z)K=WzOB;4}s{W=J^<~e6ET+{Ap=##&@ vAA!Bvb_r}v1WQ0;thE+lSPzqs!c_1NKok<<*8SaW00000NkvXXu0mjf6<|&6 delta 384 zcmV-`0e}9{0gnTa7=H)`0000V^Z#K00004VQb$4nuFf3k0003=Nkl?b95fmYW5CRG+YHCUjz`3|vEs|j+<$IX#7RcI{RCjw6ab8( zl*8W9RJj&ws+_~#0dW8LLhDLG+wt=HNiVmq^cY!&`Fe>o4&x-F?`n2ULF-D7z6~p5 z6s3xXr@*rKP#J*Io-ZD}y%y-Zn#0~{m&tTNl*~K^Qgmo&AiyX}6%-?zDpwPQjj)xx zz;+p@^CRs-*Ll*Gb>G!L68?(m>`K?dU}&!ptHe<2M*Nxr#z27Z5~FabEfxb<)wfdH*5PbSAn e=Ka>;D|`cchseh27baH#00000EpO1Hs%Z4$dO&Dh}R_Z3yO`((l8(NLzGKOlRTa(-;Uhw;4aij1u2{ zB71@|OJiv`n|B|`j<{Q9R+sU#s|n<;C~g}Z#f&m2vqr+yRiDUYJXBd!e|VXCIgrh$ o!`gMn-5xa+pC}RZD{Yo0e|w-ec2lKro&W#<07*qoM6N<$f}N9J1^@s6 delta 488 zcmVQ|XWBZ!I}D=Qd5jJ}6)aw$|24B6bhbZX~yP zAhbJ(dGqFt2A{6J?P;s3wgA-a+ZQ21gjChmVbLh=-Mw+NWq;?-04Pn4US~|tK3Yyn zlOyC2fmCFRJJj1#N|OWdwEWGmD0I^;hzO*juD19=gc>If3#951j>c1`aQL(y0-#qJ zeh}e{5Gh9vD^2bmfH+C1%MF242oW-P|KaQ2vK>~}i`Q`PBnc^=r^HE$F`8`tgY(%n z0L#Z;1XA^8o_}55kgpyA$QE~aMWI2o%;g4vKR>^_ZhD>dx*DUM7rqGbs@*ZFV^Uph znO)wvkLz;NQ_w9TLWUc?>@nN3F&ZgHZWB&XYc@2w@w$v^oRBSGet-L_afg_9l7#HQ ztqx!kU%0MTz8%4u4b2t?pRd2{Z5F!KRq(&=(8SuSc45a%;v>gAzrSS?UjR5vuQI2= zuF=N6XQCY=PEz6|g?6+!NnL!E|G@d_o_A+&8V|be>Q!^LK{@mQ;9>C$ylku&<-=ds eV!%JR_2w@ypZmYMRH9t~0000$LH_> diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_glowshroom_block.png b/Common/src/main/resources/assets/byg/textures/block/blue_glowshroom_block.png index 5ac31b902fa7962ced5028ec80048e41b3322f72..bae5b69b36a1baefd8bc3708f5c875397cf9c748 100644 GIT binary patch delta 174 zcmV;f08#((0nY)DDSu6Htwe34L}{u-YMf}p{|vY30Gj^|RNY+o&sMa+VpF zbWp8ND3EV2h(Brri=#Tg3>2=J{!Rsk{j(q|6=XWeL|#(0=O@slw&RYqziWF8th70I cESeKgf2RQu&RxRbxc~qF07*qoM6N<$g0^Bva{vGU delta 208 zcmX@l_>pmfX1z=95|_+XE?IMY3)W^F{?D`hCBv-$59QvKF)%Q&lmz(&uL1&f$H*H% ze!HiOV@SoVhV07O=54 zy09rk>jZjEnCPh3=y)cO diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_netherrack.png b/Common/src/main/resources/assets/byg/textures/block/blue_netherrack.png index f529ce8c3dbd8fe3b4c87a97a75480bbb525ee05..d10cead4fc0f8bd31abe5b8722f3d2e2bba78b30 100644 GIT binary patch delta 169 zcmV;a09OCe0m=c8DSu0Bi#%I-Gf-_TMqegCSs^`IA~#B0p6Jg2003}FL_t(|0R_Q< z0RS)zf-s@F|4&|$-D*Lf;^p-ED&5mAi1${nvyve85N_5GtRzD5GQ5$1Rm`Lh!A?TB zy^0&wBvx#v;3Spcs|Z_j2)+{NdyOr2uejH1CKlHYaXEyr_97%K6=JVXMAHhDdlmEp XU+e;sEO0M&00000NkvXXu0mjfUjs&x delta 176 zcmV;h08jtQ0nq`FDSsh7S}aCiCO}y;P;ES0c_KGTOKgh?NRY(<004JML_t(|+7-=- z5r9w(0?`fd?Z0HfJ8#wr9I_Jo+3|7q>B$ilLBik$DOs4?u(IrGNg z=*63Hb8>8lVafO5O%h&&gVuRb1;iE(%F%nGc`PdK;{<}ja00007!J diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_sand.png b/Common/src/main/resources/assets/byg/textures/block/blue_sand.png index 71805a7b6958ae0e1f4c779237eeefd88f5df318..41e76846d40325d5e220497d86770aff00cb1bf8 100644 GIT binary patch delta 159 zcmV;Q0AT;>0l)!}DSzeh_Sow2&gAXG-|4p4<=6lK N002ovPDHLkV1k!jP%Hod delta 201 zcmV;)05<=?0qOyeDSz1N@x$Ng&gAX3*yO9y;N|i50HtT)0001!NklU{G{65EK*^He?V|7FJd=5*B1I3^WoF5;PQI5EfKYG*lKeWH1mm zH8ge<76ys{^%)BYGZ-ognHU)=8Zs~%3L1+D3o0{+2nh=bDndF7F&GOf8Y&qZ8ZsCf z840s08VfNfDyj&9Ok@xe3Q|;5bP@!LCS7zqRe0002(-QrS_J{OTA9)A^3OjJb_6ckW*yiRqzM{BDzN^vkn zYAilngsUEp00001bW%=J06^y0W&i*HZAnByRCwA2!LbR%FbqJ^F9}?W6sdE>0|*^X ze_A062)zFe_a3q0V?y#X@!dz^yFI_JLWWj_qg5-%BcNhpHw=9DoEIy|-~tn^8VI{x zSux>c&|(5r_WJGv#ltfOA>+}ig<$tkG5VZyh3`MrGZ3lA!_Q6t0000uN67zqdl0000V^Z#LyHXxBC6n_C)Nklf0N=Xz|X;DDL$~(;D7l%Yg|WuVYy|9K?sKqhfA(UGT&qh}@oa zi+}l*ttge@iK%rC29Z82EVj0@K&@7`(At&yOhf(Z{%M>%4(0pnQzrM9iU|hxK#aU+ z!c+Gu$LHOm5-O4ciD7$t8cK7iqj?x#?k@D~$I%P8$t2;K-|vJN%c<0o&Cf;LN+I1z zP9^7p=Xig-CoFnOi^ nqvBYhvregr9c8l00000NkvXXu0mjf+19nn diff --git a/Common/src/main/resources/assets/byg/textures/block/blue_spruce_sapling.png b/Common/src/main/resources/assets/byg/textures/block/blue_spruce_sapling.png index 68aa6e0c842b219ea0d3bd3d09cd481aaf3be744..ffb106bc8566438757ca12f5f02587cf4e3f2e7c 100644 GIT binary patch delta 227 zcmV<90383>1EK_l3R7C&)078k(Kz_tLbh|rttU7b4 zIdZ5tX{0t`oHb#bF<*!>UWhPSfG<^jElhYRLvJQRTTnI{E*%OJ2m|{8zvKV_00DGT zPE!Ct=GbNc003f1L_t(|0d>Ja0>dB(1i%%kCMgw!|Npgz#*iF3gMS215`qVgg1f>l zO^hTgGenT4k4}!{+pd)a3-!b7O}KPDnwcVbZPSRcIPKG0FE|Mgon8qAOW#b#i;;#a dKDdj(&li)s1AvCR05Jdn002ovPDHLkV1hfiQlJ0; delta 413 zcmV;O0b>550@(wQ83+ad001BJ|6!3fAdw^#e*tbuL_t(IPh+4dFo#{XCU4dZ$$jLw7K4AFz zmG-j<5@UynX<-6$FG0e8KdWCzlys9$gJ)qXP^BPE3zsWW6<;fm_rV%-8y| zA54o|hhmKl3zFuvu+G1*}t=4j$tpyP>dGS2YQmc2La{_chp1~DLcSd+{ zwNe4Ubh>)KID0K;L!+StYRaS5Ks=&uqeYc=cRyPAEVgODUc!* z9%iH1Fr^)!5Y&-dq8llon)cX-+OV(~M-Fp^MGl95jbS!M`5zBH9<2o=Fmd7b(DV?2 zi{u$tLAWD5kRBp_aXMWuOuaoIb2>g)AEZa$^-@&7J-R|5=|SCBryZ0cAcQ?VlmbX0 z(roN4v_o>9+8>Y9!Ebv|f>SQJJ-G8hy6$|)3W~d=hwOZaUq}yLn7loNbGm$FedNi< zuI2V~h@SQ4+p~XPJ>R~R42|x53<9!+4(mViAx}P*sV2y8dw`*jN3D+ZP{OHqKEOXc zsD8Z^%F{2l^Kk4ukdH^6LbV?M;_(GfY9sF3 S0|D3o0000Nn~YUU}gyL32_w`5tEdblULSMQrA<{G1W1#(=l}x&gQl9i1)Eoi}%tli82dI zu8^4`qP<2n=|%L!LZ=xOp3PrtuK&LRG;x0spic?m!Q47I;J!GcfQS24TkI z`72U@nP--#i(`m||JKU~i<%91SOTJrwsB^-9{vA6JG{l`a-5Z|$xO~;H>AF7(mTFU zR$l)2wEcTzQmfaze!TH%4d3=d?9pqFtDUtdm1&(k`+%yH*qYa;q^!1Vea6RoUTQ^B zKx+q=R`!n9Nxr_vo6I7de>84irm=!`srOXF@*TT9-)=o~PDrlr#`2R>E-ioh*+RDO zV)e}54j=3UZaja&GCkqlokOD6in+6!x)Uz9#klV5xcY0};TS{J_S!PO$S?YG6`wx{ zEAs0<7MIe>C4%JJAUu^ v5>qhm&SxwA?V9^5DpN$+a!$OL+gs0cvRHl5>o@&{ptR@d>gTe~DWM4f@!kH} diff --git a/Common/src/main/resources/assets/byg/textures/block/boric_fire.png b/Common/src/main/resources/assets/byg/textures/block/boric_fire.png index 49d449d2623646821e42ffa7fdb62c54638a83ee..5b5dae5a970cd514a562c780777f9f4c0fa611b7 100644 GIT binary patch delta 637 zcmV-@0)qX!4Y&o67zqRe0002+yYvx}J{OTA9)B26OjJbx00960|Jwi5jrDwP=vz3( zBPz2K9FhoEU(C4x0004WQchC_&3`JSQWGy*AATitT z5R}tq1X^x0(W~{u65VpL5&io+1gIiWb%zh&@Z#D+2)SMbeX5^W9N?5!wuZ&Sk9QJr z9Dm+PtY+ZTQ>$$dLP)o0NQVwB0w(co;AKj+qcwV_GFa*prB-`c>Ax6^>hVs3|R4KL&ra;|6)5FvXP!n@+w0TRf zfm%1|)&iAD*Cm>rN4<&sslQps9r52I^M9;&_D2rW9N3@piNuDMn=Sw&iP&pP*Wv)w zU2VuhE&#Ok1V(r1`VDIB(hAl^2^a3M^9YeK!p;*FW2ldbE!%M5?g)Ha-9R&#M{KT4 zhL&C$(YBt>pat>=z!A@4YB(j~jA2)>E{-oj{QCCENuPQAlx^YsBa)p*KV}?bc(jC}Is+a1T_1@@VpULnlr2gdeqyYigOnSqDN`7)2@peSU7oOGO02+T{<+ zGc9Vd6hM{PApx%kHa%I$-~4oZI&$>g@+=0kvH-Jzrb7mbv5ak6R{{)RHVBdh)`4LV zHOtuqF+hyxq1Uj#U3rRqU)^2^2moBl`eP~p*|fGRiB=?a zfkA+!vnR&h5M$B__%h4Ltij$mUkl>0ox1qrv~l~orCT;{nST58!nF0KZPT%%$MR~F zOs0MI@UfDW_5iGj;(WzKKk{?MOfKEU% z$zO97dkC(FXo@^u!pscK#zn#G|KP@Qd@8A1HcKpcjd7{M$Iv~+bz(YQ0E zL6i)UKZyL%4_X&10m<$M5eTs=RO9fJ7RjyIfcrKE8|Q1uI(?3%yni2N9A8FwxIC)KI{jkaX4M3?Na`1g+%% z;*S%&8*fClB+d$D-31<(mpPdEvx(a}}0r^k0-^ zZOXY4F!R_C02S#faO7#t2fYQ0Kt&?po_(Su)yM*qh=IbA2Dn6i7+|p!fb2_VjOPRH zwFn_yz5Z~fQe1;syC6p3R*B6VysQ?60+9%~&(H}#EG93iuYYXmGco(^08|2H*2RpF zVo8sh2^hNIVVk@#|CxZl@?u6Mz#wOWxGdv2m>fQgiRdg~kiTFE5{&1ZP+D{XHWLQ3 z8v(M9-w(jbtqm{$H&_KuCzf?Pji`s|g~5Tm?W|D}}UpmZ1}HAS6oJszfjo>3>$i4HjbDP_s$|l>jpkG(;p* z&H^jiICL&BlV)4eie#~<1c)?b0vG!MzaJ>-3SARcm2;X%00KV8^vx1!WhR;n#~(N~ zoTv*Tz)#3zVOBs9oq(ArF)m#ehfW~w(94RPmo8g@)Phpd^I$FEdDhap2Qh$FB9{2C zl2)X%fO4hc4?^5nv8r5GrE)R98DKesD^??T{@{zn4NfHSd{F9O&WngjfEn;NmUKjx z6H5V2*IdZ49{^Tn7)00KGm@~BZLTf47`VMNyCuzi)(b%8f&(I1Ac}aM&eQZaZ&;b* TK6&sE00000NkvXXu0mjfPXq)h diff --git a/Common/src/main/resources/assets/byg/textures/block/boric_fire_0.png b/Common/src/main/resources/assets/byg/textures/block/boric_fire_0.png index 79f2827053adcce8280439606557fbe9e3d8a41c..37b5ddb632d34c7404e69584123c8d88f3c97da8 100644 GIT binary patch delta 8913 zcmV;?A}-zjYt%)MB#}WBks}>{B56rPK~#9!?VSm(Ex5+N!Os0trKz zLL!lh;EV&JR8SPPf}%pDiW7AX(c~rOB_t#y(TqS$VvLXqF(@R4Fo-e;h{zxyB4bE| z%)9INKj**Jy=Q&jdoOXJ7;@IS?|tum_wKvTxo6MAtsX-A``=*nMRCe|-YjeN-KT$JMdt8FlP6xsJW3*RjX=I(8jV0N7(f9fQaE zpH;Qjlsf+7r+*d0FRS7em(+2ZiuBzkO+( z_J`NSyYG5Qyyn`c#X&27>KJxW9s4gx7_|Tlzr2dqT)T4&y|9iU-%BSR@#|gUe;$5i zob=Fv@%CGuE1++>@mX==1N#UQ1JFW!X6>PI?Abj(yKgK&s)F)-ie0$Aa~|h;;hXl$JEWA@YhkXnxG77dQ58Shx7IW{Zb+EbK^vh?({`2d2 z?R9@0qc$9)-Ps>8^>#H zMf~8Em)G%z8=evS%q{@D?dIo*Oov^V0Dvl-==`d`)Uys?CX%9JxTPy z6h5=&&^YPA1LG@?zBS%)+Y5A|DUs<4z@VN)JciCffyI{}d5Zv?_J`MNAtCdjKd3d$ z{m!k8LE^xsJ~$5OUzy1l%)n&ArsMTD|Nl;$uFr6PZ2@3$zPe<{_}u=BcLUIR3spe%b7^qCzAPe4ur3>rYB z@wpW56?fqR2*g0R015q$+nz6~gp4@{TG(f%`A0p#8;r_h@jO`AV+S*ey0DdsnL$7{{ zP-FqY0ObPe1n?`bNDFB`U}Z}HSa|>-G~al`Go|Ky>5(^EHcH^4<}gOCKT0Id080Vj zZXbW}0I@JoL=Rw17RG3u2q`oF-c27AV3-WL69mP=3Ii4es@rE~QXm*N#pS}_owvPz z(2Q0J22)|N-+s&Uv~Mad_TZVrSQ+!<>v3ybBY6OpW-u)3NACakxH^_4a^?qGmFxl2d1|dGXeNX9Ur=P4-pb;fu4X+1#P}V&0(N_@?&`X zIOf>kNRJH7n`wwD&r8b1S06nhU$ko+eaDOAl!u2)8h_~C!D2M;yZdG0)WQIirOr)D z%Eh@`zAB9zW{QF>a-N;OV_)!Sc{;)XUhly|!P*$3)*ln2*1ua9030<3s)gK{8YaLU zaeY*`$1gfi+>N1KxG3#`|6V;zz_(}d4lh9RFkkOH)cul_+v0s>QsW_Qn5dO*h{yY1$K;Y9 zWb@zRN}Q-C{msQtAhaNvI5%y!!9AtAzp&ObhSp&$+=&a2Qt$!@i%n*KMWf^g6&69wk%3Ns48cIQT9;Yb2{S*jJJv1fNIfR!5S?>(91kcJOatx=065Vn zRv)BwL2Eze&X-8QR!|+(hzA321@o18bLCE2Or#TJD@`uT2>9b6KYMc0510=c3iQui z0LXxyv%%n#V>Y}`Q`AP9QEN?jBANoq6kG<#uxcJBOoIzyt~?cgzOz~<$u*<4r{nRg zAMkXfosaEI#(ndHk!jm%;bvvYJtp&n(OvX|=A96nJOKc(&7oGv8!GH*FK{<@8C*z? zhOy}acAYhOOKx^+NlX=FididaoRUyx6Y)qPV*ntvd3^F>lpamK5XYIBPzO~mfT7s0 zAU@FB=0+_5GHtSd!NFZ2U7I^#fPh5>03f@zCEl&hdexaPWQ<}BHNutHtpJ5PNyJ%O z=ZBoGQ_PL+d`PZP?rPf^ezETy+YSa0RfTT6G^Qmxd1)=j9HJdTYpnz<&?CGqUScey;yi^b6^rou^_3|~AazN{zX z?G0<=#&D*`mLK#*#{B`1dx-sENmQ!&1F{$7(Vt<-op@#$Z}7>9(z4J*Pv9|W_bp0< zg?xaNI}#Ircd|AD5VJFz0aEklr2lm^ICQt^zC!|HrCU0|%&dHj>Z0NRz-)_W4WY1= z(VGz_Oo1&gTOk|gB|p#*Sb;K+KMAwR_SCr zW9&zm34@JMd@$8ld2B@YygD;E=nhIg6Lsn zT0H5>3v9L24p3ATD-8WZ9Oy%K&LdpeIH1jE+l^Y}MSdaxn47$HoGAKVTuZ4k=aEBd znlDH~2eNlGs6rdD4;8fr%>LR-}0Yb#)<4s zNP0+)bnyHUZ9}rAYRS}oWT&TvvpbOO3<0r!KAKV%ZBm8CHqHO#iJ&}Zh0NduOYMkF zcjfMSDl^Scs>IGf6=BMSpo?sTT#?>M z%3%H0GL%v2DWD@*N9qPZ`=Pv(BL8QW_HsA>!N|7qFgSA~ZRIijX()xkVR3H?g_w9+ z3MuxK{sZ&B9=ko$U3uQngv{RAY2(;`Ay@hjN@GhWBAw(8ot62-*u0p%<^@fQFQ-WQDw8*vj^;0)*3n;0XYZ;1^i%Dt2*rGRo=nsH4mlf=$a?vSUvUNurA7UU`fHbGnEkq)Eup+HE z^Mum%+0P;>M3PNhIpLRol&KQ^05I>Dtu!%9>fXM&ahs)$DNH=;Kz2^_mfCv3P{;(5 z-{8{Z3bjiFBC|uzsbwWr`hjpov^%DX1SV~uIZn85ucYctux^k6u<|5vLRm)Dx(lsE&u$AbYicCu}@H&KYjAgs zqHnA_+Hr{OogcJFw_DzFpAn8G|KBPMoXl88Gx`J|`IvQ~fjD2v42UGMdXtT0U16IR z(OTJ7VbC)1&S={S0|Fqw!9v>$ImvrU?c9qNZ|n#Fc?S(h8_%vE2!?_7&Or1l!ZWI{ z+L)^%`&aB_s{i)n5xt>56q({O1km3 z0;mQe)>;7iV;ubfsGK%6xTo}7ZRHd?m0b)JKxIe#)=r^+vNO(t)k>AzptJk48#669 zt|;j{B}G7y+Rg;z?`~e*3Z?-C`ULdg=C~lvl6)j=>Qu}!i6cI{<}hpEDoH?lFUN7e zd%0YvoZoVRVD>jnd{`RfYRL>qlL?^Ojd{tx*i!dTSv_1AFOBIUXA}s=Yp;7+Y>rJ* z?^CAazO5U72>||7#&@Hqh3-iY4H3%e^MNYKIC=HZa#lO?l^-hr)wWXOpKA))n3i%e z(VBWY>d_wn5f4_o0ySAba+)ELK!mB?gB<~s$(xw}q#u*;%OKSdKnP)+b^vd4r1>dF z5&3U`XzGaLa}h228tKs`dG1pA8aoG982kK(>`JyW8CEk-OPX%fM#eA zEfqzR4Thj`D3PP|=A{7sd`sM+$M>UGQziKuEZ8SIi0Sbr z-phcT^G(XCiEa*vc4*K=(`f4MHlVbD@m)eB&AUL}&_ALKW1ILJ*@8;To?h~Ud`IpA z_1Tw5umTE1D!XhOMH^-_sLa8@$pEUP5-C%BK?)VPOw(n`ObZWfPd_u#>X0fgB078lZC2(3vs!Q$uhG~?|zfHu#FLC)>x6u&Zg}M01D);%>X^3 zOPyKhd9b9Na$5#0lRdD^2@JXa!+aM6I?cGYGp;O%O5t+0G;ud*-i6bUviSj+eC)yf zm7Y%_vFe#vVeX8ChCt-KUzuzI_Xa^GdLY3G9YSnM_LV#ElH_pM5RdAABp3_RXcCSG z)(Zl5{Kn&zc2o`fQR2Q+HlL(_ayL>9OAkhp&f|q4wVym0l_%O_nY8)Dq(qhE9HF{r z43BA>PibL=HKQlc94>k?V`XjT#R%yGJ?oEcoy$|&LC%jQ0M#$#N&yMfQCk`DnXI zaFR2E7TPdBa7Cd~E_0m|DlX?4K*gP*2lly(B3;7-pTPI-wEVFfkCS|4ZCVTkN&BrW zpVCS2LYxu+Z4Md;5SL5V{I03?pA%sqa2jfwzP|olN;^iGCR#05B!Z%uoz2XVw|<m6!@(7N%2Zpq#H z+gXF|jnFBf!5=Dr=Oa0xSD653y7Nf-48MT1OY7Z9&O+H*xv5ctW_lJj^DV`np`zke zjVJpb)}?yhg)WZDwT`#!qV5B($cJC30aLT03W~&5CJX=|^$fbWR#5+zxH{IyBg*H+ z!Uq6HDi+QO&(JukJ$HaNpxTs!YGk*00^?T3w8{{cIa|DcjxihFtBW3r-zy4;I|Pb^ z6M1l*060I9GHn-nH~|_<28{%54GqTKOK20vG^>Q#k>W(eR7fFktD~X0_eIlHSdPjj z4M7>WGFcAHv#*Q5;NJL+ZnC}e0|oQPY-2^0y;*MM(=FMrPYjfHJjWsR{t6(*wqxr? zAA(Z4VJ_K!?$}_-cXQUT%P}23RL0=MMAoVYzQ_(a^MfAKKu-2`xkYbMETB$^4Q&+_ z*j0wDjA^zkbdT2>9-x5TqU7C1F3#R^ns(<0e!rUl+Ga32Q?@Vw@Yu1XVHoHHTViu7 znFo&K9R8LALM>aCB-Vy@f&or|0{fUu;ZLqPSQLqWSjSm+SuA!kPo;(;@A>V&NcLOV za+QD`G4z#l&LU<3*ubSl&M*pc49NN$zv)AA0l2*jM>99+wz#fM&Q2M^^#KFHT5+R@ zZUdv_s<mm~bxj;tFxxvna0+f;X}5iw|6|>aU~AR= zW+B9Xm|T8vy3>)nbztamqOXJauDZ_vMkfk2$s1s+#hY9BxXS`)^M5FnO@n7kHIGXQ zegIlrjPo6nR+#{!)7`M<5ow5bEOuxDYIJFy^&tsXbYG;B7|VIJJl^ybyeodG9S8<) z2kH2v4J^q)mm`A#+Zkp;9}s?n1@;8?H7Wpq#D}FL0DM761oCx@JEnw!fn|b*P6!dz z28A3)K8!~ga0mWCxyFb<*y2Z3Ol3}*E8lx8wll)y%z}{VLnI#zP&8O^m?&KbI*o5_ z{*<^9Ha&?toLnTSD*Gk1^AEM+od)TD z7D|wQyyq*so@rYPB;CefOt(toftF;QK2Qb2D*vc%%p+G}k8gYU%c6&}IJ$B#1Rgc= z)9nv!JGA@<KqWIcLY~uj0xSCSBQ?oZZ!b)h*xT z5^kaiE9YXjw!xP0SQl%pko=|i54u$u|G6}jZsNUJbzPYFZnoqiAxHf>>IcxdGvoX} zH)3S(OUYiA=%kfOV~?ISQw1r{N`!=Z4*{|7UB_a6Q36PghBMsdIRz*j31d^a6{z|o zHQO73x~i*ZyZcCP`0_^MQ=MLx-`F|Fv=-^$R=m$h|K~h zGA4Pf{Ey^EdP3kUpaVWOg2$kq9r1;M0GDd?A5sR88Y;|o)1{{QKQ4D@nqi%g`|fB`fHE#P8)k^9$1*+y})zMf_}dz)`%3#ldK}&apQ81l%`Pz))`x zu;kuA);GqbqDHq@cmKr1&ZfB+SONeRXzpYUQrm+_Cu0cHN33mutBG<(6zYt9r>y#r z+ye84SlKasfastt7HMeBRAO%F#`aUL?E3ze$j_}! z++3rKzn311)Z#6N3fNTcXsOnCi`>1d1mHJ4jB?6xx~nc;l>ju`AU2~OEq>56GzRs! zi(~Gmn;WXAG4G;(y4}rGfrnYOqg<^fB615ZNJ%}&O56j8cNmO`sT$($D>IY9?b;@I zAZasLE0iR0Ag%DXvnDNvqzlA7M^@Y~bs>=tSqLdZGX(rw#Xz9S$?~I~Sv&tgJdhk5 z#CkLF57~)tu~l*HCd5#iT0-X@2=G6sa6_z9QV;2d5EIRR$P_NLItPp5%`cEC*r25` zPws??gNFmY2xoFMKp0@Y02yY9H^bwj5AG+QqB>ROZk}u+xRlEkz*@coG?7jrQs`YK z;GFbGVd>35nDvRm59AiKVLrAWe$XUU#o%ZA%?Gu+UdKS=jY(!^rSkx{L+veJuhdN| z$xYYXSj??|AjOqt6wS)rA5QwgxP+#SEg2#+?IwSEYKM49^60g^`#^PfXO}JOr9YP^ z>m6?%Av1QYdM;m3VBjKYHIJBRJ33jfuI+=g@g1e_c!T3~o#bMQnehryVS zODq`7w>j{gsQ6*s5elRJrR5{Jv)`xzb|-2&A1wB;Zu#7&`QIu3pxOGXTRYTlhh2nv zjBdn#sqkSZb>H>QW!|#ff|GLd_Dk9wpIhp_yRo@#3rdE1k1tLejXmOIA2}iBmi-g6 znPUybMh8v^wma4=hcYJT7yT2RLgi`L_;7Y0)Q5zI*zj^W#?S&lq6Tp`hzj)FXbxiH zA`EWcYlflWhJ|2Z0Ll_1ZIHXErOSAS43pu11;2ng(bB<2S%U6f$QSTFrxDwNXa0^m zJIMoS?SQ{bo_}hh2<$wXP;E#8HV6iu$Y%(@bYV2`Jkpp;J%TPu*SI<$uGU747H5k-? zV@Z`2a=(M2%tz|@Dha2Yu1sp4d+W7Iak?>48y$X$2ZvIPW|jfVqNSPp#epgp;gq9w zI)uaqD#L|#hso{f>;?yHK^Gl?_&Wx=y%|o9HUPbc!f${<)py^-1G8%obr?+r27}S< z76ww~xGQApCPQv2;#Wuby;bT(zob@wkrcAi*~032&mAbgYLn}e-L=kz)P8rHyBS3* zg$#||4hK`Ff4dw3702lV%8(>_s(-eb(yPUuD@s(9V`&kvw0@wMovzAr%vq96r=&wA zP@}uPJ3yhuK~&*4#Qp8eXg8kp;nZZ9ORJyiFu$iQ_ZcR&7zWBTY(H@x7t)zP!qwpc zhX_!hpw9c^&Ny|=Au9eM?*i?A1oQvyxLJRbVnwS1y*&|Q!Y{2T>zSc_a}L$^^1YaKHHBiKj^D( z(BmD0Ojx^ZD*ziE2p&@(zy|dU^aatQlS|CmKX#dSOZ`slnYt+LE@mb`eKNG25%LaavTm?DE7Fd zNN7qO3wJgUDHB`_5Mpce2>}RH%I}tb;P;Yofr0RugNqsb_M7L)h|pUn{r&~+1`xL~ z@x{Kofq(@@IG#;?n!dtDjl#~IQgtm+8>`VIvSuqc4J)fttP z9K>0T1^xsUSFckPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DHIqq1K~#8N?R^J) zT-CAucXy?gwCdIBvMgJ2lWn>8PBjKhZvjk8qr;Z!G`YgJ?hrihpextJkI5Z@0|$+pNHC2V~&#$ioYi{LV6^4_T({PnK~< z0=^)rmBFqDEVJ|O{aj1`Xql!j-6nCiL2MBao(6;^%VUtd&H_S&i9@yoa%o5cz&q@H z&N9hUJjhNPjJczaL~dRV;)aF8lLELS$L zh_;?qBu1tpIx-sJ(H;VH{_hme&F-*yX`6XWsH&>H>ng36Hy5AovTzkLbg z1G47CVBfk%Bn*$h!u%!p%b%Y7dS&`L8c-Jwg}!|TU)u-80w^xIjVn~%$Tau00eRQ% z2bew?Y`@DgQTg_3(*<a4k9uc#X z9DnPgUZ*EyCxQ{ zJFubr3zS#wMN>%+1j#Ua*pd2!7-9a=_P0^Gu>zen25uQn(=E+x)UScD0@r8l$yF6S zr+lcH`LSg__p9%9%?r%JHDTud?(ge+e*T=fRbS8j!fmVbQ5&PosRb9~{mK`xy=0q? zdsD z%Dkh`Q(m{s^mpk6*z{kGa}=o@`VJ2Uz=N_!WUiCF^gfk~WXXGf_f z2@@krjSG(nMMqN?Is~L?NPJ?Mdz!=){&+tFZ33MKDv+9RQD?HEK7@vb!W$O`kEk*= zFhahM8M9v#Ny;F4q})yJ8X9Yh$$8#Y4|H^NC>{(Rk_}I?=z%DZkvSG3%;@UyTDK?8 zGHFGzn3g{ed%L!48$;vdZmBMKyIwJlXLBZZMj*CkDfpMqOlmS|VB zHwL?#wj(+^TE(Tt^>q3K(vq;ZaTjVj_F?C~Vstk3sPE8GEmDZ@MAA;|+8AlNySvcd z+y$yPeV~G(Aqr_OY18(yV*Q-%4RwZ1>}iqCyx3SSr}s}C{UgLChy)`3(eoDLv9xUn z5iH-admD;|O~K0Jd^qu#Q?TI3`B=Twhv))cB@#?|%`#J_Pr~lno!Ga#8m3b;GA9;G zhy4Uga20N7ISh@RwJ3-gk2;aRUC^dWev}z86fdlP6xK+A^w@DS#uQE37CGGD!$}6k zScTgw&p}gL1Gax!t|%0lCpJO)z?)$qDKQzFo{=}x-q^3Ihp!7ai#EsT>*vkwW~W(e zricSVDaBjS&xu|?swpyS%)9ztul^8Et0P4^r6e5_QfK46ZOc%#x(y<|&W)VIV$jy! zhPFzXnKDPl%pQg>Un%Zi7Y>zlCVmt8#tiyx0xdMHF%2$+WVUZrRceDv-OBv7;r+kr7krFpFp}n&Wwe_{=7Fg>R z52ahABlMA!L3>jt>T4R%QESwNp~}W&c;S{FqdJ$D?L+f6pE@3F7W;}elw^;B+-}6M z(ISDMjr2pov>Y5;a4teaLQzv$hm4#wtUASqafjz)_`(d__v61HB1f-;HTDmd$z70u z=9Xr(?CsQXj?VI6ZvG*|$%)6|)_G4Nd1N$F(vvW6_%Zk$HX5tMY%r_vDu!YL z>QI5Zw_S?N#KG87wgI(kJJBg1L*PxC?v^>=6CaTgi$p6$i70-p2Che1{|h@i*W#M> zi}8HjZxzPxkN*M%S)=+9kakOa{sSospL&TwuObA1CqF0c~1-BSf zY9Sdpqzs5g6pif;p*oAsb85R|L_52>(bLl-QHxKtkp01jL&|{Gma5E&<3JZ7&5{lg zyMw0P9cU}H^?)Xh3g=K@7!$IiY_UbWq#_Cb^G8W+5Go$J4>4Kc_};1KB4bt*Qf7o= z*13f!`F#)~u@4$+o7L+eXtuRmh#7afndm;~&tEybW29&EqU zvRz$jB;lHn6(Qg{b@mi^1lP7zZ9rpFBkDHF1mK9sNHFZvU_(YDah^CB9Fo;%`|!n? zBB}&l9EoXhi_j^+ksOnXhRrs1<PzEp66?Nb57t*3N(S)Jja1%!o@N5)XZ>dDFH^Nx#kgq zNF`wUk4{8KxeXp-lsNte0!=h9Y z&PIAKqmIf({6v|;GNs$rh6Vad8H9<;qAt9MNjpdc4)=s(*0=?T861kx2)7v7Iz-1u zAu=gUP^t^D<9VgO6Bz^1{;_>T&YEV@nk1yLbys;CI1}zQZdcQ--Yc9K1QI1u=pCOtPCb)&?D`mN-GLc|K(G9CyX6PT{U74#L;G7^v1?OAJ8{Y zvE}X&+4gLsIuj!}_DM6`h?01j>kpN$@9zg?K+!1$ZNGzgpvmBvg*G9b2VuJg znUt7xta$e;xMk=v$0cc)+uGWy7qV}nMAexBVM3Oj8Y<{TTj`E1v`k#OjE{7UM*^$% z&UUnQwxX@7ORTfqflP}~GRHrn8$={YKSR`+A2hWzVaLwxXlQIea#lP(oZ^E!PJAW- zS|(>i?==)^7megIjSiclO&I^A*aQJoe#xPV94sGl2C_3n)K;z%h;;le?`mUlCUQa% zXyXe!u%0%*Fb}NwDZ(N=D9W9xp2?2N%_v#kfNtr)DxIXQHJQpBdW8YT{h`beTQbigCU!0dU# zGIU0`tjOy~%77-Fs!SZD=yWbPVPc27)fN(5sAObJm1a=Fjtwx#z1&!w<8)()Li`c? zq@$)sn@6kEEKVp*n>rfO9L?+rDTBI?ER%Iqgx%X;3 z>;z#f{zCf6f=GKe*WlyBe8?R-7-Q3>>QZ4(gN4*Nq1bS(5APgREAf-uNp4X0v1JJP z1X(7kNiJq)NcW|GhUK5XhRH8VfGMIKGx99`JPL7GKBfZC)lzAW8eQo;|HlVVfB|*A_np*M%8>G*8rKH}7;w&0nH(ZRwazl<+2gd# zeNlh`)z|?JPH$%LDFFj*s=8N(Z`b|egb3qcWC}2F;sS*-+CEWXUPL7#1I`1gwyr@) zzc>_NFhtOX&I9p4FA{a8*<%xEl{&WXOyq9Z53q`ZINOb=w33 zsCk-a6eXfkk=S2cDp3iDx^!*n<`R9Vx^%KNTD?>x6Pu`NET7X-6Xw)s5>f`dgE|;8 z5)8ibr)Dc~uvzRdVjvZZjy9jEtV|O#ac?i3ml?r$Q$eW z0^3T^49gI1@;i1GixbF{^%e|?Xo+(#GZu|cl*A(pk+LsfydZ7;{A3@}3ga;}Cm)wj zxm}n53Dba$*Zc6jlg`y)V+S&ENx!cHXkMrI1&$IiYFCA$RPt~Nz3e6kM=BIG zkcr6nac)IoC%hq~^Rp#Qmrs()Q&GK+4>7g+h z$Nq4D)fz4BTX(q+KWkltcRqPT5tto0e(G5KE@8F(E1^ewuEy_Q{f#;z9vS9AOZ-in z^0H-^lw?}aQRm>IroO1lbeQqtGxE2tlw-w$i4Ef#D~s3&Swgs^Zj#<0n10f71kTzs z7)!RM=w$P4iTRJNKVWorK>W}Tp!C}Z9B;({nT+N>7ooa4Tajg2edk});%-^N{Qw4mwaMW^G%51!I>h<86>X!lYhD^>=JNdr9qUSytXgnb5Oe^fvA@)asQBeCR zR!aRpVgZq-mm%$oR03+91{`uBBNck1^bZb&4w?rlzT8)p<`5(ZFwhWBl!zGUSYG>^ zfk_!Oe&I50rE+8GdE!CSI{89WchIyjG?#avc^i=P!@e0RgP1)zrmm?LRU4W$$v|~Y z8W)bYMz`Wc+<_DDUpQuSEXqD;vdbr==K>j>k8cmNLe#BvDk~X=;WohcDM{&t!w3Zl+sft&YYMcc!c+z*XirHl9%&gBW zv(N0(_pFvCov=OGyloyfH?9*G+&mOwcyOvKopRGcjT<3H{v9j4uuZr1I=E@-49iKk~V=RN{yz7PfVbH zK-Q53;<<~lWg@aaa0%#wuhVFbOc{w3T%Qd}(+oqL(&wutO)UOOuV?QZ_8mh0n zA&~F~72<%i9?_w<@i3Ov{Xt7C^Abkl!;NntW};6S*?k~jI&a!SO+Jw5p`26BMN69w z#|5}Aeigz(!?AMb2NK1ZfLEsy)P880k7nCQ*9J3|XT;IG<;|hm#34t=O z#G3RsbC*6lBo2mIT2bJCJ=J_^-ZYmtOw;$l6qt$sEFCbB{u%mDWpJoqLi+YcK_y@? z%~*&rGvfr-T+yjwDu4;-fzU}A>{})_PTp|6P0>ggv1q4YQjS&zhPXqqedQjco_H`L zZ36E?kA(X)sLot`xM=ZZ_-XpHcy4e7Mkh~3&V&@Ld~j_`FjRNFT1XiXi896|*tJM9sZC$PU$PS9rA5#W*<}F86UI{LJ`2<6&Tl!@c&hq3U zDm;d(d8ldHhw@!jXs@skE)seqNYiWiPxjbB$U_l6?s`$nNyncw1b3bI6e_CsqA+ec zc2yK3+!KM^{A_%2x(^>O^yxB^(uBWS<^%Jjxu@#_TR;88<-;>~=V-2AX+^&IW!nkn z;@XM+Z}$@(_uXKA-F}k)tueptTx!H0()C0>`XX-4Xf!p-_&YrKk6;iO#z2BWCbv`V zL{F3{uYvY>Dg*AzCPOlbH21Fv3M>uOqM5VIIT^Qq;g91#!%_%Qp z{)l4`l^UigQBBbJNt>|eFP1rK$zf;}IQrm~Pc@UlvVqJA35fB=N%Yo(+J+j`l{BMG zzSC`-Wztty`|~ofque+n@+NdjkFk^>{qQi%I&vCnYHQ#Pi$Ym>sW9;&AvanV?e0DG z1v@Yk(tP4k=g$@ta$#oFaafGY^o#H9&DDbMg@aGR`(-bwB=U1Sk|NH7pETol@~$-9 zkFef+sH#f6KYCNNne>vVvphaAFY4#P#NVti%fx^18Wc*vNnhZW)?@u&8;KWon(>cY z<`-?p`#(95u5O&I&l}B0-{FDKe*gm=Mn>+8muZl4I*mIxX1=9fx zoJ>BmcNz1;k)D)|!7&9`Rr&#HOB;1-7K!12 zHS`SR7Y^0fT4RbR{>mnmpyWZz3_UUlon4(MeXmhhH<(*Y92JIDT8AZk*0d8!F~~yKc>l2=n3(IbR|kHW%#b?xtJ2N7|%A|f!~x}j=CLfnid>VFbaQ2l29gye%ZbRDWTc+0xma1ow6(4T-h)~ zRh0Ck`I)XC(9Q3Qu4tI9&-54Ysd*_72QWuKy0T%WIlDYhUkB4NbFXgWJY#pZVg;95 zzr%z7RSbHkJQ;LwNu3Ywu=0O=5Cs^}KX!;|fVe3@>J+bT{)s8HOAI*wi4*>xDFqmC zRofwE^0=y*o|J`QiG>(5ya*{{BXu2~s~-nt_xVBMY#Vv%KeuyYy5vTLhKJb8C0?(_5!|lDZQYaN7h+jKJ$`!a&#~tz%Y?9( z6N*BRl{5rd-l5pq@D)DW`o5wM)wv)q6R#F*;C%vgeak`x8YT9@VQa(9dHd{0opfXK z;cA_^gxD9+9U$>K7t^6EHNGq5Lp+b$bWc;A0N;rD*}8-nOgsyL>kE~Q<@kPeA!^o$ z!$b+_P_&u`GgCY;Iu%SV1k-v6N$%=A+x){kt2K%a5kJ1egZ~c<2JA#l)C=`q-3q3D z8I(V3NAICgF0_>Sw8)P(vv*Q1(1hOWDRj8wQ)7^snuUzf;xh{-Q0aOv+yxl05}tSE zYdRS$wXfaXh}{)s>N7LTr}YP10SO{)0{3)r>mBR(nG)o3DRbwnav;!9bWQh(R0%^P z&{Wx`JBi3ZC7@{Bb`_T%g@Pl}Fy+`nEwkow8EY~4V98~8x|5D}ki@yhYF^zTK}|QFS^1FqKy3TR z^Y*7icVQh~>v;eXR+IwlEBST$`47(=2aE9n_b)m$;VGA*GdFxN^c$3#f>Q=xhAr(Y z;dRB}O3!2dUjma~a1A__4~4#cZT$8b^xKKF#7v3Nm{PG=i`JL7-me5Kr;W%lh|7sU zY@sFQPniDRGQAfv0u1OxIQ}n*dzaeFEi~7(p{vo}0Kl4r-YcNm1Of=F-B>>8><-|D z2oiS;XrUubpn&?z~Q!8-mOQwne5IYkc6bU-NgVLy|D+6O+P=6S%p7tNz@(Lt@<-tu*WM)T~pT1rJ!Cz!gB}R2F4GSBBzhNiCI3 zE+j6n$d~HOT0CMzs4(NQK~z)}YPL3mMRD2$-i`i%bM6s4jg?V6eI;BzA2K%y3zp0T z&j={Y8?W{Kl!T-VSa-mM%5lRc%T*S)aJCtqdz(Ua#n@ zo8dAH;^X7NGo+e38sPOrX)b}Mmu&9&1P}b-etUc3tsN)BEmLlZ=L)2W2f{4}5(1!p zcZ-^O9`W+ih?n)Q2hjzUBUP{e*mJp=^{Hhpub-xoNN|3!H+^89GF7Hj&r|AG7Y>!a zu{Qo|8BoFc+xXy6zkR@qna$!1)uLZfpuURz`jvogJuh^eYkKc}Q9uIST`AhRBm6vim?lgE)|upM+U+XK8|-@d5LP z$1gq($B#V+$LCyxn$B{>MJ2-JwgShxs5a6YiA=Y9sid}80frvSwX^OPPyJ$nLi;{f zbWYcL9F`P0TX<}BmhX9V)1J-Mf&EGoXN*G_ym$wHLRrryY;OA;)h*?^aq0*2ZbTj? z;G&0)vvr}U^=PxRVKZtQtFiloCfy)L;Gwe}8SB-P7dkrI5gOvrn#KFOe}L^RYw`BO zpV{hsaqUDs|AnOz5rQUXx^Ka8tJ2WE*B-42v&P`Tgs=2<2{s@Hqx7|sQ!>Q*0-E!4 z%ZHhTYdpH%*dH-1_@#Nv%w8p!I7Xbu*s%iR^hPDv$eS-vBsZ?BufrWhuSiSnjS!#V zB}~Qf`dTj3=W8b2*S{_tD)p-ihf3d=!GKL*M9XSyKmu<3qK47& zrY7=Y0tj~(v9Kp;j!gLzhv>4J{x(>hDHf3@YM6!WsR?S~y4QT%*Ob&pvi4j?O$AKTCQ6cSe7RF7b7$%4@WFe2}yc z80s)4qMkE4A+%+UPeM`J3`Dx)(9%OjFzv(>Je7g57gt$Wx;fd7J zp|r>xy!-K+_G*T}-H^$tdO`_l8SazdV}CvY%-pfkhb#H4Q|5k0s_98P2brhM&;1H~ zApNQ58eKx*&SPuj9hQlkVEcqDuZ%CU_j~flyYnYri_@*2!Gj3#QeML(EYh3KUmc3> z_8w$qNtDJu;5q?`xkR3qNFul}zt|UT6PZaotnJ&!g8?O=A4vN+P%>^n2~;2CGBW9p z24uiMo94ZDHC!+q&;*)vr%Jf5TmiqQ(vh43pMV5(WgK-T1~^2&flKQ=vLN*cw;uUN zRdzN-1tehpfa!l~X457+Yr#xj{6tIL`^fMpbab`rSwYUC9m|gNUhHk!dukz_3EkV2 zD>|?+K@T2WH1sSSlYOqM^tA8nRo+Fm`BvPQ*~ri?pQ4|+*e(J z$Z=hkMdQlYfM~=Yka(a{+3M;*v19VM2tA>MbVuiz80(pfX*dx#H7tU~YM{kS7Gd?C zPf%4>r^lVOH+Ja}n4@zh;J2}#9AwgO>pT^m(h19!Ewh`zh=uJYq;aK}3%K;q=8ZoR z$9R8;$pRtE@rd4aGd{sJtB*rReUH6Wg$$gsp-C^;%LB#cb5-TOHbRh`Q(ec){ID6w zg}cmp{g8A@NxELlbq6wHEa6bQY1U^tB%}eg@lYse(*ASwwG4u{B=trA{wDNm-bpm^ zM4{jln3$-eg{Fd0jWtCkZZ5a<^ZS4V>anMZXF60~`L$)$UB6Na%K5%#(Pu^BP@iD{b3?l9F9oT}@|9 z`+&++v?yOemF>(LpP*k>?ykYos9zyPyo2jJ&*0LKKWgYxSTGLf9seWsm6QRoF47aN zCpWWzkq0fQzbJij(Wf(TN5`4`nbI@nmpCWk=lHbpO)S1-u3rLyXr9u>B@hx1r>C2j zl97nHV~<2>>sD1~p7z{o8pYu_2LGM99Irm`zMa9~MHg0$LQ%pT{K)+~Wx~D9IT0i9 z*vI$kaW@P;8Ei69yJY4WxZ3j<-KG5>fCq=%1e$doPRiLC?8zU%fO^k49=t7&mYT+v zIW|r%+79Q)D}H|f17J_1mtIgdYM9HGeyA#DPoOkql1 zJ0&*GAtJQSJTE9^R5Vf(GEiEvQ=7xcw)%aa&7hLUg^T^?f+h7rl|(v|qGsj~(tvz= zhW*zNb~LZYuBu|ymzW7YJ7QsaQx6*xF*V^LM0AQscEcMMi3OP_VQ0%ml(iM3wzUe? zd+H@D(k}2TliV?Jnp^(@4u^^eOlPCLvIk?6W+2a9q_&W%e02KR$jBXpk@M|yUz7n$ zD&u40vF7_eTz=uzc0b5B?1R6pcmnUX{1sj35VQIrN;@}Wa@qntce!8Rlcx>LedO)-FmU+lzpa8d&oQ7%X zN8pOkKPk^k>L+Q^W!>s^y7tO#7Yy~N&Wom;i0i|i!-+dm>?2)>gVFJkczuL~EI~wl zf8&iew2#{MO6)Y(!uu0#{3KmkKl#v=sXwy&;2Y34W^hPNpy4ItYmQA6jwccLzdBF? z;(?|B{6s9^8G(`cqD0xY!u6(pC14dG!(V3Z=yY<|A(xXGFL2&CixvI$0h4XCmGnq? zSU)f3a-psO$gn$-ss!r72yBrvb%9YUT^a5q&_F~kVj#jad2?;6_66OXl*RsYw&^S| z)ZxiPRA**ws7wS7Z=OW&9uM*|@^zbDO>-rxYAVGs_aXUke*&UiW?6TQ-9Ew^KP8Yb zLC^ZcQ90wpn{U1U0y?LPZh)Oy{T_1Mw00k7gdJuESx zX+;4BOg`*t-+;04v+Ob|=?{iGF{xhcuG)or)?SUb_dcmRj~`6@3WY<)>lQ7GdBfbq z;aFGpIVKIBjh}m8SBBib(Ad&|eZ}>!#`jXn0(Ol$7%LtiqqV6%4`j;$LUuBDi~dR&I#t&I73OCWWm%g z16^;F@z)dkhy$YD)Ix^I!4<=SCTNf$f>E7=w;wS9!Hc;1N%*ICLL0&5L>~XA4CwAt z1D(G$L3fwWbZzwbQ+bY0kJj{gORH#Qb(gM7Wt{F;XTlQ^h`Cc@0Waoi2GPee$RIse zERX;M&0lx7c=hZ|VL%G>0bLp=R^s9%%{!STBqSgyIu)1a-;ME^Gmw%rNO6J*3Q~Xp zS2HG`I~3WAy>>2vO%ipk*jlIg!<8Mc3*z|@>JCM6dZNY?g!=#k`aHC}g9i=O&f?uU zd^~W8C!fE$?s=@)vqIE91V0{fhaTik`=G{k(6BgNoGZ*L!UG9kD#OKFzVBp2%1M>zBJ=}ApKCd(H>ody=NGvPZYF6rN%_s5&k7RhH`zj-miGJY_-#Z(n zdJ}6Dn2-JT@!)GEaLgVp6?feQC+bK8N#nFj0$~MEL>|1bZe9IVV5!q)(c69$L(5AZ9Z3z*eCE11AD; zhyY5hWY7_nD}J;`zLx)Kp|n{HOoRdqf{Qiud?=Zvod2F=3kh)vm|id+IT^WX!KiFh ze^P(}y%5$Ma&M1&!GdAnV*JdvRPwkA1cyODN&jjRbqqVJ28Kf zIXnf6bC%-H2X2Rp`?wfTG1xdK`v$$3#M4QY4|kZ54OclbqkKDPqrxNfyi zGvYj;N>epi-LuJjqT1$Yrt{3L%cQFsX9da!c(#&mSLWYkx~OWj{wcL!qVD&#zmYV5 zb*OGfQam7W53}<}oPx>m1stN3{G(6*-t$nXJbg`d($_Me_Hl%q%vEptS_Yg0IuGR0 z7yXa>fGGl6ES{;!_g~AvNk9-(_)JyStRGJ`6b&AbffIB%)c_ZaK!ikgcv zt)Kfp0X}CzG>UP@s>^gEIbJpQna$=ibKbt;<{#!6ztZlf22?P2|PC3DPkZ67?3loqIHvlvrsGlG63f@PveOh>ef{N zhCxmNLx2H2F`^H1hiaYuG<0Dy7EC=7jk~(gQO&+Ildgpp_$m$ zv=)WK$D(6U6|PEq2)VAY`Up)h*w;~t;^sBjwW8Ag0}hOrST-i zgm)XBL}BU_oDgy~l98p4RpwQ6_*$`Y^=GBQPCv zl1{)0VOQyU61N>BxY97nJ6%&mY8M#J-x&4+zQS@;qC~K$9d*VI$v&%p1NX;&uCHsb z2XC8)@qW$o`kqvtwB7vkeDJ{P|l^E@scb34)&dN5(pa71TvIZ&^+8H_zEQyr(+==cB=Pbe#T zfYV~G*R?esKNK4si;{{R`e!MXiICe9W0~kYH!?;ip{}t8qq4`tiniBDc=yp^vqX)y zDwBwK4_d-&_3t!2uvJ23)5m2=^sPo#caYJY|)EJZiHfe z$rsr4=?)1-^dmv&rF(Bqh);x9Ton34Rb9JrZP?R@lR%Mw-+Eimm+-lKD#g7!F2}yF znh{qJiq>);PeZ;%H#L!NXgbXBtYyCc%)G1*(h3PLxLt{dvGUvl)*tY}*Q&`pWQ_$% ze4MyrkRG07*qoM6N<$g20t( AC;$Ke diff --git a/Common/src/main/resources/assets/byg/textures/block/boric_fire_1.png b/Common/src/main/resources/assets/byg/textures/block/boric_fire_1.png index cba782bbbb850e63618932a53fc471709c3620fe..dc5d79aa08da82ccca0faf401c608506fb5acc64 100644 GIT binary patch delta 8565 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